diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a844c0b45998b..f419fa734a094 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6881,14 +6881,6 @@ githubId = 873530; name = "Alexey Levan"; }; - expipiplus1 = { - email = "nix@monoid.al"; - matrix = "@ellie:monoid.al"; - github = "expipiplus1"; - githubId = 857308; - name = "Ellie Hermaszewska"; - keys = [ { fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; } ]; - }; exploitoverload = { email = "nix@exploitoverload.com"; github = "exploitoverload"; @@ -14283,6 +14275,12 @@ githubId = 38543128; name = "Miles Breslin"; }; + milescranmer = { + email = "miles.cranmer@gmail.com"; + github = "MilesCranmer"; + githubId = 7593028; + name = "Miles Cranmer"; + }; milibopp = { email = "contact@ebopp.de"; github = "milibopp"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6542675bbc982..b4f5551050511 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -449,7 +449,6 @@ with lib.maintainers; haskell = { members = [ cdepillabout - expipiplus1 maralorn ncfavier sternenseemann diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 644a93214516c..d6038055c05c6 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -10,15 +10,29 @@ let allowPositionsFile = !lib.hasPrefix "/var/cache/promtail" positionsFile; positionsFile = cfg.configuration.positions.filename; + + configFile = if cfg.configFile != null + then cfg.configFile + else prettyJSON cfg.configuration; + in { options.services.promtail = with types; { enable = mkEnableOption "the Promtail ingresser"; - configuration = mkOption { type = (pkgs.formats.json {}).type; description = '' Specify the configuration for Promtail in Nix. + This option will be ignored if `services.promtail.configFile` is defined. + ''; + }; + + configFile = mkOption { + type = nullOr path; + default = null; + description = '' + Config file path for Promtail. + If this option is defined, the value of `services.promtail.configuration` will be ignored. ''; }; @@ -42,14 +56,14 @@ in { stopIfChanged = false; preStart = '' - ${lib.getExe pkgs.promtail} -config.file=${prettyJSON cfg.configuration} -check-syntax + ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax ''; serviceConfig = { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index 1cc137341e113..bbd6bde5ebc18 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -308,7 +308,8 @@ in { description = "Authelia authentication and authorization server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; # Checks SMTP notifier creds during startup + wants = [ "network-online.target" ]; environment = (lib.filterAttrs (_: v: v != null) { X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 526678171d27d..109fec6702f28 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9930,6 +9930,18 @@ final: prev: meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; + one-small-step-for-vimkind = buildVimPlugin { + pname = "one-small-step-for-vimkind"; + version = "2024-10-15"; + src = fetchFromGitHub { + owner = "jbyuki"; + repo = "one-small-step-for-vimkind"; + rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f"; + sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM="; + }; + meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; + }; + openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; version = "2024-04-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 25e18fa88d7a0..aad3a46ecaf67 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -447,6 +447,7 @@ https://github.com/Darazaki/indent-o-matic/,, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, https://github.com/jbyuki/instant.nvim/,HEAD, +https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD, https://github.com/pta2002/intellitab.nvim/,HEAD, https://github.com/parsonsmatt/intero-neovim/,, https://github.com/keith/investigate.vim/,, diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cea5e51873676..e7616f5117448 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -206,6 +206,15 @@ "spdx": "MIT", "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, + "ccloud": { + "hash": "sha256-bGyVfB9eenE6QZZw0bAxnve0KW0ZQ54slTaaWZXDBOc=", + "homepage": "https://registry.terraform.io/providers/sapcc/ccloud", + "owner": "sapcc", + "repo": "terraform-provider-ccloud", + "rev": "v1.6.6", + "spdx": "MPL-2.0", + "vendorHash": "sha256-uftDCqDU0HeDj7rjAevulsFCVFFQt3eg8vcFM9YJrow=" + }, "checkly": { "hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 6131e64e91524..acadc87d9a3d6 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { binaryBytecode # deps ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index e3984dba77d8d..dbfeb69c6bfae 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { mainProgram = "fped"; homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; license = licenses.gpl2; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 7fc737eb1d38f..056a682d1c1cb 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -17,7 +17,7 @@ let shared_meta = lib: { homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with lib.maintainers; [ expipiplus1 wirew0rm ] ++ lib.teams.lumiguide.members; + maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; }; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 83781ea1cfcf0..dbfbf72ccd5ec 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.60.0"; + version = "2.61.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Tvyf58f/9bOUiUAG6R9nhOerZh5Yt3LyKx88oF3s0jI="; + hash = "sha256-zzcptg2hTQDRWFbC99q/Qy+Nk2vrhekYc5dMr3fjFD0="; }; - vendorHash = "sha256-nwGmYFWyAr34F4rmqFC3cK+fbUq6LRaqXhekx4Ab5sE="; + vendorHash = "sha256-b8HO4mevQcfX/VpJv1ZefXWAeXyhsy6074fvVNoH/8Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix index d69988eca0125..54af934bde8b6 100644 --- a/pkgs/applications/version-management/git-fame/default.nix +++ b/pkgs/applications/version-management/git-fame/default.nix @@ -15,7 +15,7 @@ bundlerEnv { ''; homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; mainProgram = "git-fame"; }; diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b289e4bf7ae74..25a7c78dee85f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -34,13 +34,6 @@ "hash": "sha256-Yd8jThB1npkWwdRHqwK4JjfeEP2XwxoXJS4fUYOFOIM=", "description": "Microsoft Azure Command-Line Tools DomainServicesResourceProvider Extension" }, - "adp": { - "pname": "adp", - "version": "0.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/adp-0.1.0-py3-none-any.whl", - "hash": "sha256-/WRRmDL0/TFEMfhxdlB+ECSbjRZVN/gdBcnqUYWuhOw=", - "description": "Microsoft Azure Command-Line Tools Adp Extension" - }, "aem": { "pname": "aem", "version": "0.3.0", @@ -57,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "9.0.0b6", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b6-py2.py3-none-any.whl", - "hash": "sha256-NqIV06L9tUuKl37KszDD9zwydGNoyXc2ThH9XLjgiaQ=", + "version": "9.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b8-py2.py3-none-any.whl", + "hash": "sha256-CYRK4Cug1Y+TaK43OPPUMR9cpyHtzBz3CIb8+KgMv7g=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { @@ -85,9 +78,9 @@ }, "amg": { "pname": "amg", - "version": "2.4.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.4.0-py3-none-any.whl", - "hash": "sha256-YkyoyEfOk+zIOe5CgRXQmyY8Ts58UtoKvvOIk2RREdY=", + "version": "2.5.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.0-py3-none-any.whl", + "hash": "sha256-yQAtjGU/VqixCGvzPpGPO6bzJ8yEAGvnWUB4QhiH9B0=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { @@ -99,9 +92,9 @@ }, "apic-extension": { "pname": "apic-extension", - "version": "1.0.0b5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.0.0b5-py3-none-any.whl", - "hash": "sha256-+8ofhEYBMULWdhWbgpL9fC0xdfOeG661xNE/ljcAMlQ=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.1.0-py3-none-any.whl", + "hash": "sha256-AeXrQi6EJoOW3bAlEjC907nUdfRj6BM/BBX7Dw4DJAs=", "description": "Microsoft Azure Command-Line Tools ApicExtension Extension" }, "appservice-kube": { @@ -111,6 +104,13 @@ "hash": "sha256-f9ctJ+Sw7O2jsrTzAcegwwaP6ouW1w+fyq0UIkDefQ0=", "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension" }, + "arcgateway": { + "pname": "arcgateway", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/arcgateway-1.0.0b1-py3-none-any.whl", + "hash": "sha256-Mw/R8ZdL7OFtySTjU3MbHw9EA6WONuM0dwXwHb2/A9E=", + "description": "Microsoft Azure Command-Line Tools Arcgateway Extension" + }, "astronomer": { "pname": "astronomer", "version": "1.0.0", @@ -169,9 +169,9 @@ }, "bastion": { "pname": "bastion", - "version": "1.3.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.0-py3-none-any.whl", - "hash": "sha256-FRqyXU3N4QtGxGk879rx0NWEHhXP4+xkwImqr1XmyMA=", + "version": "1.3.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.1-py3-none-any.whl", + "hash": "sha256-DMqkBnT8Mp/p+SV/hpwxnGTWyJwChmSm/1NOuu4dxek=", "description": "Microsoft Azure Command-Line Tools Bastion Extension" }, "billing-benefits": { @@ -225,9 +225,9 @@ }, "connectedmachine": { "pname": "connectedmachine", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0b2-py3-none-any.whl", - "hash": "sha256-i4xDQMTGVS44JiIP+5W/YZRHZ1sEaTBLcfqA4uTjHIE=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0-py3-none-any.whl", + "hash": "sha256-FJ7q1J0MBG93jqTZnXhEjzgVe4bqWR0e6lRfiJZZZRE=", "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" }, "connectedvmware": { @@ -237,18 +237,11 @@ "hash": "sha256-tzGoIcYJqui/q34EcLNCuReefgxlSC9KQypg2HpMOV8=", "description": "Microsoft Azure Command-Line Tools Connectedvmware Extension" }, - "connection-monitor-preview": { - "pname": "connection-monitor-preview", - "version": "0.1.0", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/connection_monitor_preview-0.1.0-py2.py3-none-any.whl", - "hash": "sha256-mnltUYdXGZDSf+ue/u3eOMGU8T6iHL+ewGExGWv9gh0=", - "description": "Microsoft Azure Command-Line Connection Monitor V2 Extension" - }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.0.1-py2.py3-none-any.whl", - "hash": "sha256-xUABi8XaElLsPj5WRVJlDWrwjzSfP/M5vjmKeYPK8qk=", + "version": "1.1.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.1.0b1-py2.py3-none-any.whl", + "hash": "sha256-D8EbL83XXEhoz8Q+xL4ZwhKP0de2FrYeM2TDwaDEwdo=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { @@ -316,9 +309,9 @@ }, "dataprotection": { "pname": "dataprotection", - "version": "1.5.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.3-py3-none-any.whl", - "hash": "sha256-RnHOieOQZWlfIWJjUN/K1UOL2+/HFM816F7l6rD5ZmE=", + "version": "1.5.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.4-py3-none-any.whl", + "hash": "sha256-vAyVrv0dte1KioEwriEF8oNqrEwN3WSKDC/hyTudQtg=", "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" }, "datashare": { @@ -328,6 +321,13 @@ "hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=", "description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension" }, + "deidservice": { + "pname": "deidservice", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/deidservice-1.0.0b1-py3-none-any.whl", + "hash": "sha256-FJw581LzrLlcttM70PuWJwMs8BoaoyCsud1xJ0RZfNA=", + "description": "Microsoft Azure Command-Line Tools Deidservice Extension" + }, "deploy-to-azure": { "pname": "deploy-to-azure", "version": "0.2.0", @@ -393,9 +393,9 @@ }, "dynatrace": { "pname": "dynatrace", - "version": "0.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-0.1.0-py3-none-any.whl", - "hash": "sha256-ESp+QjRh0bb3w4X+i3O08rhQ4lcMNaVKS7zC6Hr+xmE=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.0-py3-none-any.whl", + "hash": "sha256-CR9A2HZCRby5Zn5CLU3TchFMnwCnKggPnI75K0PFGNY=", "description": "Microsoft Azure Command-Line Tools Dynatrace Extension" }, "edgeorder": { @@ -421,9 +421,9 @@ }, "elastic-san": { "pname": "elastic-san", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.0.0b2-py3-none-any.whl", - "hash": "sha256-bS8SR6545DHUg0mJ31gc0hJB0WuXBxv2cvuLce461wI=", + "version": "1.2.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.2.0b1-py3-none-any.whl", + "hash": "sha256-UvtysdxQsTTOlkSI7exVTH2ESfhB5H2LNV2fGscQzmA=", "description": "Microsoft Azure Command-Line Tools ElasticSan Extension" }, "eventgrid": { @@ -435,10 +435,10 @@ }, "express-route-cross-connection": { "pname": "express-route-cross-connection", - "version": "0.1.1", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-0.1.1-py2.py3-none-any.whl", - "hash": "sha256-uD9yO6rg6gRVeofzWPohMbrxXUXNOrp6mrQtFOyA3zg=", - "description": "Manage customer ExpressRoute circuits using an ExpressRoute cross-connection" + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-1.0.0-py3-none-any.whl", + "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=", + "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension" }, "firmwareanalysis": { "pname": "firmwareanalysis", @@ -596,9 +596,9 @@ }, "k8s-extension": { "pname": "k8s-extension", - "version": "1.6.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.1-py3-none-any.whl", - "hash": "sha256-QYYdZbnYbgtiKYakmEznphH4e5LaV424wFJ+x0M08yw=", + "version": "1.6.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.2-py3-none-any.whl", + "hash": "sha256-hS2nusfLVQF8yEPgX1pw6juS6V3eJZLP6JL+1R41Co8=", "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" }, "k8s-runtime": { @@ -645,9 +645,9 @@ }, "maintenance": { "pname": "maintenance", - "version": "1.6.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.6.0-py3-none-any.whl", - "hash": "sha256-Orai2sSLpxsovI7gXSVNqnK2L4TdqVN0n6YhqAyjmuU=", + "version": "1.7.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b1-py3-none-any.whl", + "hash": "sha256-cZmLfV3nIjxeKuehwARFtBHROaAjh2+EeI9R8fUQsts=", "description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension" }, "managedccfs": { @@ -666,16 +666,23 @@ }, "managementpartner": { "pname": "managementpartner", - "version": "0.1.3", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/managementpartner-0.1.3-py2.py3-none-any.whl", - "hash": "sha256-It30sc3HfpkmLLYInE2WBABlgoodOKJwn9uUXTyFGDk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managementpartner-1.0.0-py2.py3-none-any.whl", + "hash": "sha256-pdSiZGR4GLShnNw1arXm+N0bCPpnE8AKFSl9LFoFlJQ=", "description": "Support for Management Partner preview" }, + "mcc": { + "pname": "mcc", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mcc-1.0.0b1-py3-none-any.whl", + "hash": "sha256-anNMf7Gdca1dIQFGSyR8e//doeWcJlHphUf/eesZ7U0=", + "description": "Microsoft Connected Cache CLI Commands" + }, "mdp": { "pname": "mdp", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0b2-py3-none-any.whl", - "hash": "sha256-BirQJtnq95G1koxPt5MUjUDGwpfO4y8XXNOhVesk2T8=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0-py3-none-any.whl", + "hash": "sha256-wKSuGBcQO1SPHZHX4chVKEFdoBaoPUgxVIWXI7+3jYE=", "description": "Microsoft Azure Command-Line Tools Mdp Extension" }, "microsoft-fabric": { @@ -708,18 +715,25 @@ }, "monitor-pipeline-group": { "pname": "monitor-pipeline-group", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b1-py3-none-any.whl", - "hash": "sha256-zzH54/qUWHFvDD0cFWmO95twfFvX0UZ3PSsq/kLmTCk=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b2-py3-none-any.whl", + "hash": "sha256-skfHQJ7vGnKZtaDmAGmjPLtuxNfyHE44pxi1Usl9X9s=", "description": "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension" }, "multicloud-connector": { "pname": "multicloud-connector", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0b1-py3-none-any.whl", - "hash": "sha256-rYQ1AWKuh3KH+KFRkgs8S9xjdd1BndYQHCcC22BqXRk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0-py3-none-any.whl", + "hash": "sha256-8Gb946+K7DwMm5s5GROUciYRkvYvxgB7rB5Y3MRn5t8=", "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" }, + "neon": { + "pname": "neon", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b1-py3-none-any.whl", + "hash": "sha256-JA3DOHznnpjq0nt30tAWLHSUyUv6ihfRt4Qa4l5Dajs=", + "description": "Microsoft Azure Command-Line Tools Neon Extension" + }, "network-analytics": { "pname": "network-analytics", "version": "1.0.0b1", @@ -729,16 +743,16 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "2.0.0b4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b4-py3-none-any.whl", - "hash": "sha256-BnB6AIQFc5pWOSMPP9CUAxCEpp+GdkhQOu1AOdEYrZ8=", + "version": "2.0.0b5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b5-py3-none-any.whl", + "hash": "sha256-rHLPxU7TWDTKbNXHJ6D91x5JQ7zWbmXND/YH6K5JXHo=", "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version" }, "new-relic": { "pname": "new-relic", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0b1-py3-none-any.whl", - "hash": "sha256-nOafFoTOoUrLoPL9tHPkfgoGdF44O7UUSVTF6F5BYZk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0-py3-none-any.whl", + "hash": "sha256-MQUxCuwjIdQp8GjnTf4WsLZMcQCqUervLBF2WXHqb1o=", "description": "Microsoft Azure Command-Line Tools NewRelic Extension" }, "next": { @@ -778,9 +792,9 @@ }, "oracle-database": { "pname": "oracle-database", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0b1-py3-none-any.whl", - "hash": "sha256-BYw95sHhA/8MYqGIscYGo1CXpmUst+tsPlt3934VtbE=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0-py3-none-any.whl", + "hash": "sha256-CtcW4Rc1noFCf4yRSC8lkgMYd5ZMaVLnaLZhSNtU284=", "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension" }, "orbital": { @@ -832,6 +846,13 @@ "hash": "sha256-cGzCVQ+9B7i2djRcLybFumZVCQW8jsIkxsTlY3xJcmY=", "description": "Microsoft Azure Command-Line Tools PurviewManagementClient Extension" }, + "quantum": { + "pname": "quantum", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b4-py3-none-any.whl", + "hash": "sha256-c8KlBVlkh2jxI95wOayCiMJlzuTYjpTDzthc7LzmtVI=", + "description": "Microsoft Azure Command-Line Tools Quantum Extension" + }, "qumulo": { "pname": "qumulo", "version": "1.0.0", @@ -848,9 +869,9 @@ }, "redisenterprise": { "pname": "redisenterprise", - "version": "1.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.0-py3-none-any.whl", - "hash": "sha256-bndtRkr6r2ZFbXuObTarGhLxkFRhdHnqjxNjPTpJ/6w=", + "version": "1.2.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.1b1-py3-none-any.whl", + "hash": "sha256-mBboVxqGiYZJczJ7YzHSQ3A9oxtAwFOe2JE2udv2yeA=", "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension" }, "reservation": { @@ -897,9 +918,9 @@ }, "scvmm": { "pname": "scvmm", - "version": "1.1.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.1-py2.py3-none-any.whl", - "hash": "sha256-fXBFeLxetguBBd4LSpJBdlgaTPL9FisIltgSRvf3Omg=", + "version": "1.1.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.2-py2.py3-none-any.whl", + "hash": "sha256-sbLmbA/wV5dtSPGKQ5YPT/WAK1UC6ebS1aXY8bTotvI=", "description": "Microsoft Azure Command-Line Tools SCVMM Extension" }, "self-help": { @@ -925,9 +946,9 @@ }, "spring": { "pname": "spring", - "version": "1.25.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.25.1-py3-none-any.whl", - "hash": "sha256-nrim8vd7Gcn5gJUmu3AQdlkN2zX2suxDHOMYuWzEBzM=", + "version": "1.26.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.26.0-py3-none-any.whl", + "hash": "sha256-6CxqOuyIoHNsdhR3B7ZOZM/ZuFRQM12eD6zHkOHnYbQ=", "description": "Microsoft Azure Command-Line Tools spring Extension" }, "spring-cloud": { @@ -946,16 +967,16 @@ }, "stack-hci-vm": { "pname": "stack-hci-vm", - "version": "1.3.0", - "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.3.0-py3-none-any.whl", - "hash": "sha256-GVU+UNWcr8wZFmvn6RvkPHJferrh2DOJFPjmBDhT/Ak=", + "version": "1.4.3", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.4.3-py3-none-any.whl", + "hash": "sha256-T1ulOOgw3O8ZUUfIunHHObK9SUy7moq1HoMcQLwfMyk=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, "standbypool": { "pname": "standbypool", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0b1-py3-none-any.whl", - "hash": "sha256-RMA+MgyLSfUjkOPBHWGyWmev7/wY1iuqUiw3MULeDhU=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0-py3-none-any.whl", + "hash": "sha256-WlY5U30m/7sG845ovWyTntkJBdmssYwHFhgjcy+yfPk=", "description": "Microsoft Azure Command-Line Tools Standbypool Extension" }, "staticwebapp": { @@ -1002,16 +1023,16 @@ }, "subscription": { "pname": "subscription", - "version": "0.1.5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-0.1.5-py2.py3-none-any.whl", - "hash": "sha256-/3iWrrxGhiptMKxfTPZL3UDLUOVDfOoplZCJbXXxAT4=", - "description": "Support for subscription management preview" + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-Pzu0+7dhF00ToPhjNit084i8ZI9/KW+bbiGRs1UHrk8=", + "description": "Microsoft Azure Command-Line Tools Subscription Extension" }, "support": { "pname": "support", - "version": "2.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.0-py2.py3-none-any.whl", - "hash": "sha256-Xd6X+PsS6qJYUw9o7CyuAKlX8wR5g16fXtBXlAMSdBo=", + "version": "2.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.1-py2.py3-none-any.whl", + "hash": "sha256-PwcBVPg5RkqiS1SZDYfS26mdbaYOw+8xSnS6IsJo/sQ=", "description": "Microsoft Azure Command-Line Tools Support Extension" }, "terraform": { @@ -1030,9 +1051,9 @@ }, "traffic-collector": { "pname": "traffic-collector", - "version": "0.1.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-0.1.3-py3-none-any.whl", - "hash": "sha256-oUSk/aO86E2yIne9hhEISuGuOeC7jHtQYZ7DeHEfV7o=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-1.0.0-py3-none-any.whl", + "hash": "sha256-RpWrtTcj6lCfD3oLxtT0vlzAOC/om3ZnHuB4WgUVffw=", "description": "Microsoft Azure Command-Line Tools TrafficCollector Extension" }, "trustedsigning": { diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index c9b907630e9b5..758f8c4de86ff 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -133,9 +133,20 @@ propagatedBuildInputs = with python3Packages; [ azure-core ]; meta.maintainers = with lib.maintainers; [ katexochen ]; }; + + vm-repair = mkAzExtension rec { + pname = "vm-repair"; + version = "2.0.0"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; + hash = "sha256-mBa0SgKyGdxrTtrSVDp78Z0yXUMywL/9o0osKeUbhdU="; + description = "Support for repairing Azure Virtual Machines"; + propagatedBuildInputs = with python3Packages; [ opencensus ]; + meta.maintainers = with lib.maintainers; [ ]; + }; } // lib.optionalAttrs config.allowAliases { # Removed extensions - blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 - vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 + adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 + blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370 + connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 } diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 3ba7c3636f400..74e58723a099b 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -101,6 +101,7 @@ def _write_extension_set(extensions_generated: Path, extensions: Set[Ext]) -> No ls.sort(key=lambda e: e.pname) with open(extensions_generated, "w") as f: json.dump({ext.pname: asdict(ext) for ext in ls}, f, indent=2) + f.write("\n") def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: @@ -113,11 +114,11 @@ def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: return f"sha256-{base64.b64encode(b).decode('utf-8')}" -def _commit(repo: git.Repo, message: str, files: List[Path]) -> None: +def _commit(repo: git.Repo, message: str, files: List[Path], actor: git.Actor) -> None: repo.index.add([str(f.resolve()) for f in files]) if repo.index.diff("HEAD"): logger.info(f'committing to nixpkgs "{message}"') - repo.index.commit(message) + repo.index.commit(message, author=actor, committer=actor) else: logger.warning("no changes in working tree to commit") @@ -248,6 +249,10 @@ def main() -> None: args = parser.parse_args() repo = git.Repo(Path(".").resolve(), search_parent_directories=True) + # Workaround for https://github.com/gitpython-developers/GitPython/issues/1923 + author = repo.config_reader().get_value("user", "name").lstrip('"').rstrip('"') + email = repo.config_reader().get_value("user", "email").lstrip('"').rstrip('"') + actor = git.Actor(author, email) index = get_extension_index(args.cache_dir) assert index["formatVersion"] == "1" # only support formatVersion 1 @@ -288,31 +293,31 @@ def main() -> None: for prev, new in updated: logger.info(f" {prev.pname} {prev.version} -> {new.version}") - for ext in removed: - extensions_local.remove(ext) - # TODO: Add additional check why this is removed - # TODO: Add an alias to extensions manual? - commit_msg = f"azure-cli-extensions.{ext.pname}: remove" - _write_extension_set(extension_file, extensions_local) - if args.commit: - _commit(repo, commit_msg, [extension_file]) - for ext in init: extensions_local.add(ext) commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}" _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) for prev, new in updated: extensions_local.remove(prev) extensions_local.add(new) commit_msg = ( - f"azure-cli-extension.{prev.pname}: {prev.version} -> {new.version}" + f"azure-cli-extensions.{prev.pname}: {prev.version} -> {new.version}" ) _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) + + for ext in removed: + extensions_local.remove(ext) + # TODO: Add additional check why this is removed + # TODO: Add an alias to extensions manual? + commit_msg = f"azure-cli-extensions.{ext.pname}: remove" + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file], actor) if __name__ == "__main__": diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 539571b4fb6d6..4744b7d109eed 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -380,6 +380,9 @@ py.pkgs.toPythonApplication ( ${lib.getExe az} --version || exit 1 touch $out ''; + + # Ensure the extensions-tool builds. + inherit (azure-cli) extensions-tool; }; generate-extensions = writeScriptBin "${pname}-update-extensions" '' diff --git a/pkgs/by-name/bl/blivet-gui/package.nix b/pkgs/by-name/bl/blivet-gui/package.nix new file mode 100644 index 0000000000000..efe4fe2de7856 --- /dev/null +++ b/pkgs/by-name/bl/blivet-gui/package.nix @@ -0,0 +1,73 @@ +# Notes for using this package outside of NixOS: +# 1. --pure cannot be used (as pkexec will be used from the path, +# and we can't use nixpkgs polkit due to lack of setuid bit) +# 2. You must prefix the blivet-gui command with "SHELL=/bin/bash" +# (otherwise your system polkit will reject the SHEL Lfrom nixpkgs). + +{ + lib, + python3, + fetchFromGitHub, + gtk3, + util-linux, + gobject-introspection, + adwaita-icon-theme, + hicolor-icon-theme, + wrapGAppsHook3, + pkexecPath ? "pkexec", + testers, + blivet-gui, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "blivet-gui"; + version = "2.5.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet-gui"; + rev = version; + hash = "sha256-fKd2Vj8clZ6Q7bZipfN5umyMW2rBXMUnpAuDE70p67U="; + }; + + postPatch = '' + substituteInPlace blivetgui/gui_utils.py --replace-fail /usr/share $out/share + substituteInPlace blivet-gui --replace-fail "pkexec blivet-gui-daemon" "pkexec $out/bin/blivet-gui-daemon" + substituteInPlace blivet-gui --replace-fail "pkexec" "${pkexecPath}" + ''; + + nativeBuildInputs = [ + util-linux + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ gtk3 ]; + + dependencies = [ + python3.pkgs.blivet + python3.pkgs.pyparted + python3.pkgs.pid + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share + ) + ''; + + passthru.tests.version = testers.testVersion { package = blivet-gui; }; + + meta = { + description = "GUI tool for storage configuration using blivet library"; + homepage = "https://fedoraproject.org/wiki/Blivet"; + license = lib.licenses.gpl2Plus; + mainProgram = "blivet-gui"; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index cf6226089097b..3c53faa425215 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -1,21 +1,24 @@ -{ lib -, fetchFromGitHub -, openssl -, pkg-config -, rustPlatform +{ + lib, + fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "hickory-dns"; - version = "0.24.1"; + version = "0.25.0-alpha.2"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; - rev = "v${version}"; - hash = "sha256-szq21RuRmkhAfHlzhGQYpwjiIRkavFCPETOt+6TxhP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-bEVApMM6/I3nF1lyRhd+7YtZuSAwiozRkMorRLhLOBY="; }; - cargoHash = "sha256-LcMjHHEuDlhSfDXGIrSMXewraSxEgRw2g2DOoH4i5RU="; + + cargoHash = "sha256-Rq4l1iV70nlhBaJ02hc+dmNZ/Q7qrHoF0Kp0MTmu22A="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -23,12 +26,17 @@ rustPlatform.buildRustPackage rec { # tests expect internet connectivity to query real nameservers like 8.8.8.8 doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Rust based DNS client, server, and resolver"; homepage = "https://hickory-dns.org/"; - maintainers = with maintainers; [ colinsane ]; - platforms = platforms.linux; - license = with licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ + asl20 + mit + ]; mainProgram = "hickory-dns"; }; } diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index bd395682cc145..5928f4c9a7edc 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -11,7 +11,7 @@ mpfr, pcre2, pkg-config, - python3, + python3Packages, stdenv, }: @@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc libxslt pkg-config - python3 + python3Packages.python + python3Packages.pythonImportsCheckHook ]; buildInputs = [ @@ -52,6 +53,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postInstall = '' + substituteInPlace $out/${python3Packages.python.sitePackages}/bytesize/bytesize.py \ + --replace-fail 'CDLL("libbytesize.so.1")' "CDLL('$out/lib/libbytesize.so.1')" + ''; + + pythonImportsCheck = [ "bytesize" ]; + meta = { homepage = "https://github.com/storaged-project/libbytesize"; description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index 337229c25db77..94644afff3fec 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; license = licenses.lgpl2; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix new file mode 100644 index 0000000000000..7bc0723a3044b --- /dev/null +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -0,0 +1,68 @@ +{ + cmake, + crocoddyl, + fetchFromGitHub, + lib, + llvmPackages, + pkg-config, + proxsuite, + python3Packages, + pythonSupport ? false, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mim-solvers"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "machines-in-motion"; + repo = "mim_solvers"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XV8EJqCOTYqljZe2PQvnhIaPUOJ+bBjRIoshdeqZycA="; + }; + + # eigenpy is not used without python support + postPatch = lib.optionalString (!pythonSupport) '' + substituteInPlace CMakeLists.txt --replace-fail \ + "add_project_dependency(eigenpy 2.7.10 REQUIRED)" \ + "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + propagatedBuildInputs = + lib.optionals pythonSupport [ + python3Packages.crocoddyl + python3Packages.osqp + python3Packages.proxsuite + python3Packages.scipy + ] + ++ lib.optionals (!pythonSupport) [ + crocoddyl + proxsuite + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PROXSUITE" true) + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'" + ); + + doCheck = true; + pythonImportsCheck = [ "mim_solvers" ]; + + meta = { + description = "Numerical solvers used in the Machines in Motion Laboratory"; + homepage = "https://github.com/machines-in-motion/mim_solvers"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 84719a4fa8bed..f65a83c3d6017 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = licenses.boost; - maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ]; + maintainers = with maintainers; [ Scrumplex prusnak ]; platforms = platforms.linux; mainProgram = "monado-cli"; }; diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 0ef76ad53e832..c8fac5e81d1d6 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { - version = "photos-v0.9.46"; + version = "0.9.53"; pname = "museum"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; - rev = version; - hash = "sha256-dJCZxQLnKb+mFG0iaYNrXyDSaslqKdPTXMK4KwvqBd8="; + rev = "photos-v${version}"; + hash = "sha256-aczWqK6Zymvl46fHN6QXT0f5V2lpC+8kpSbEoTiP+7k="; }; sourceRoot = "${src.name}/server"; diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix new file mode 100644 index 0000000000000..ae89601f8ce30 --- /dev/null +++ b/pkgs/by-name/op/opencommit/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "opencommit"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "di-sukharev"; + repo = "opencommit"; + rev = "v${version}"; + hash = "sha256-+uKb7qhQJEbuatPsewSGgVd5J6WtsrNO+hE59/KZIJI="; + }; + + npmDepsHash = "sha256-6tzV4iP7YzlbqOTgYf9XoTmIFPSBug0wYDelc6wcbCA="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "AI-powered commit message generator"; + homepage = "https://www.npmjs.com/package/opencommit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.matteopacini ]; + mainProgram = "oco"; + }; + +} diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix new file mode 100644 index 0000000000000..981fa635a30be --- /dev/null +++ b/pkgs/by-name/qu/quickder/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchFromGitLab, + python3, + cmake, + doxygen, + graphviz, + quickmem, + arpa2common, + arpa2cm, + ensureNewerSourcesForZipFilesHook, +}: + +let + python = + let + packageOverrides = self: super: { + pyparsing = super.pyparsing.overridePythonAttrs (old: rec { + version = "3.1.2"; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = "pyparsing"; + rev = "refs/tags/${version}"; + hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; + }; + }); + }; + in + python3.override { + inherit packageOverrides; + self = python; + }; +in +stdenv.mkDerivation rec { + pname = "quickder"; + version = "1.7.1"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "quick-der"; + rev = "v${version}"; + hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + ensureNewerSourcesForZipFilesHook + ]; + + buildInputs = [ + arpa2cm + arpa2common + (python.withPackages ( + ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ] + )) + quickmem + ]; + + postPatch = '' + substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' + ''; + + doCheck = true; + + meta = with lib; { + description = "Quick (and Easy) DER, a Library for parsing ASN.1"; + homepage = "https://gitlab.com/arpa2/quick-der/"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix new file mode 100644 index 0000000000000..eba6c5f814842 --- /dev/null +++ b/pkgs/by-name/ri/rip2/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "rip2"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "MilesCranmer"; + repo = "rip2"; + rev = "v${version}"; + hash = "sha256-9leLWfPilDQHzQRzTUjAFt9olTPEL4GcQgYFWZu3dug="; + }; + + cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8="; + + # TODO: Unsure why this test fails, but not a major issue so + # skipping for now. + checkFlags = [ "--skip=test_filetypes::file_type_3___fifo__" ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/rip"; + + meta = { + description = "Safe and ergonomic alternative to rm"; + homepage = "https://github.com/MilesCranmer/rip2"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ milescranmer ]; + mainProgram = "rip"; + }; +} diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index b9842ae0a66bd..c7d390e971fed 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; rev = "refs/tags/v${version}"; - hash = "sha256-uBhciNkDBXrME8YRztlUdm3oV2y8YiA9Fhib9KLVeBY="; + hash = "sha256-zlLpQZbjEJjgCxlHGaiDFGRZ/6tz5fpKVLVqtjO4pHM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix index 57ffd6d6b01e9..337122b218e78 100644 --- a/pkgs/by-name/sk/skeditor/package.nix +++ b/pkgs/by-name/sk/skeditor/package.nix @@ -3,6 +3,9 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, + makeDesktopItem, + copyDesktopItems, + iconConvTools, }: buildDotnetModule rec { pname = "skeditor"; @@ -22,6 +25,36 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; + nativeBuildInputs = [ + iconConvTools + copyDesktopItems + ]; + + postInstall = '' + icoFileToHiColorTheme SkEditor/Assets/SkEditor.ico skeditor $out + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "SkEditor"; + exec = meta.mainProgram; + icon = "SkEditor"; + startupWMClass = "SkEditor"; + genericName = "Skript Editor"; + keywords = [ + "skeditor" + "SkEditor" + ]; + categories = [ + "Utility" + "TextEditor" + "Development" + "IDE" + ]; + }) + ]; + passthru.updateScript = ./update.sh; meta = { @@ -29,6 +62,7 @@ buildDotnetModule rec { homepage = "https://github.com/SkEditorTeam/SkEditor"; changelog = "https://github.com/SkEditorTeam/SkEditor/releases/tag/v${version}"; license = lib.licenses.mit; + mainProgram = "SkEditor"; maintainers = with lib.maintainers; [ eveeifyeve ]; }; } diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix index 82a801a54be0c..96737ae7972ed 100644 --- a/pkgs/by-name/xr/xrgears/package.nix +++ b/pkgs/by-name/xr/xrgears/package.nix @@ -65,9 +65,6 @@ stdenv.mkDerivation { mainProgram = "xrgears"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - Scrumplex - ]; + maintainers = with maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 3efd526cb6bd0..059a2531fbbec 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -29,6 +29,7 @@ let lxqt-session = callPackage ./lxqt-session {}; lxqt-sudo = callPackage ./lxqt-sudo {}; lxqt-themes = callPackage ./lxqt-themes {}; + lxqt-wayland-session = callPackage ./lxqt-wayland-session {}; pavucontrol-qt = callPackage ./pavucontrol-qt {}; qtermwidget = callPackage ./qtermwidget {}; @@ -114,6 +115,7 @@ let lxqt-session lxqt-sudo lxqt-themes + lxqt-wayland-session pavucontrol-qt ### CORE 2 diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix index 62504bb33b543..5c4ac79a2d826 100644 --- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix +++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libdbusmenu-lxqt"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-fwYvU62NCmJ6HNrOqHPWKDas7LE1XF3squ0CBEFkNkk="; + hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 694c4452b45aa..6bfd1bafb5368 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -15,7 +15,7 @@ , qttools , wrapQtAppsHook , gitUpdater -, version ? "2.0.2" +, version ? "2.1.0" , qtx11extras ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; - "2.0.2" = "sha256-Ntj+yixGGGgL8ylRv2IJsWtapxE71JNl9cC9K0JToNU="; + "2.1.0" = "sha256-yH3lyOpmDWjA3bV6msjw7fShs1HnAFOmkGer2Z9N/Tg="; }."${version}"; }; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 430c33c03605f..83ed1106ff408 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "liblxqt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-ClAmREsPBb7i7T2aGgf0h3rk1ohUvWQvmSnrlprHzds="; + hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 5de096ee29e15..ebb4baa05ddda 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "4.0.1" +, version ? "4.1.0" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; - "4.0.1" = "sha256-h8uHIB0KuSHQVHI61h5BmpvpJHumloHMKN3GabH66EM="; + "4.1.0" = "sha256-Efn08a8MkR459Ww0WiEb5GXKgQzJwKupIdL2TySpivE="; }."${version}"; }; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index daaad022edf5d..09b8450740adf 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libsysstat"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-2rdhw67TPvy/QmyzbtStgiIuIgZ7ZSt07xjCvOywKF4="; + hash = "sha256-CwQz0vaBhMe32xBoSgFkxSwx3tnIHutp9Vs32FvTNVU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 6d0248e3e5944..4a6013f6eb1a1 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lximage-qt"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-I0DyC8i+OnHxHcpp/xPsKjr3UgvUHlVO8h9Tjhg7Pg8="; + hash = "sha256-08HEPTbZw4CCq3A9KxMKeT/X1notXwsV1sSSgtRFPO0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 73b49561d886b..eaf0d808df08d 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lxqt-about"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Y0OF4W0quQEet/QvntwGwFqaqJDDUchWYRh+OWZDS8w="; + hash = "sha256-BjtU63SD6y4LnjAr8QGMqo/aYkcQ0Y+vg3lAOf97ZY8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index e83b1788dc3a9..b194f6e09f6a4 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-admin"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Ps+XiCA6OmnsYj0D+pxpvRxfIZfRGFBbZ0t/IPZjlv8="; + hash = "sha256-7RyPUv/M8mMoRO+SopFuru+bY9ZwnKz2BkiLz1cW/wg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 9cef42cdb6294..0dabe275542c9 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-archiver"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - hash = "sha256-32Wq0Faphu0uSG0RdOqrDD/igrNaP6l1mtuV+HcsdcQ="; + hash = "sha256-a3NdU1OZI+BqtvpUhqhwylf5upFJxeg8B+1cPTAdDr4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 418738f5853bf..7c1a96cfe7841 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -9,7 +9,7 @@ , perl , wrapQtAppsHook , gitUpdater -, version ? "2.0.0" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; - "2.0.0" = "sha256-ZFvnIumP03Mp+4OHPe1yMVsSYhMmYUY1idJGCAy5IhA="; + "2.1.0" = "sha256-fZ5DbXnYm6oWDZdwiw2DpWFQMYd7VZ4oKkGIzQkaV94="; }."${version}"; }; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 3eb1c3a1013f0..a7a5d7df71917 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "lxqt-config"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-lFZTu6MqqWTjytYC7In/YJ38PYksZXduHvA/FRY4v0U="; + hash = "sha256-zAJD1p0iJUEN+pOW1nyVKrCBfew/uqVNqw9aCFq+JY4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index df6972bd80e19..8079df71267ee 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lxqt-globalkeys"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-24alERAnzlU/ZwIlRy9B+58zjRnF9eXunWeEO/lDVxM="; + hash = "sha256-jQdr3epezQtBoyC2hyMBceiqarruZLasSMYa2gDraCI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix index 84b4882f3643f..da2e761059395 100644 --- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix +++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lxqt-menu-data"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-CNY23xdFiDQKKJf9GccwDOuBWXwfc7WNI7vMv/zOM9U="; + hash = "sha256-Q9VPPGPyMueoFrTTdAMlIR+VnWVXu0J2uXhaOlJPTAs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 70cb087fcc15e..a88f3317b3eac 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-qmBHeXKBJD97Me2zNSn7bNr0UrObGmvj8Pn19GQGktI="; + hash = "sha256-Iu3U036ebh9lMxCn1gt29nCQxs7N2ZLQHfg9HP3FSm0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index e3e8d52977f10..2a42933d5c497 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-poTOXVvVUdM6m1mHBgQGS+mVHu6O4iBKQRs0JwpU8X0="; + hash = "sha256-oFN4FpTBxOcXtykkkrJvaoxhvwEJKBp+eusrrSBIXIU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 7d6da7e65f9fd..100f1e537dfec 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "lxqt-panel"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-m+LUG7hnkIJj48HJIy6pMyv3YZ/RfuSXbdBKJ9mi764="; + hash = "sha256-IlT7qXWMKFkmHNjXJYivawd4HnOBzILtIE6XaM/ZvkM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 9484a8e4b16dd..3d7ca3ec68a7e 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lxqt-policykit"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-oYKvQBilpD2RLhN1K6qgRNNAfohCOqmBrKcWy1fXZT8="; + hash = "sha256-wj9i09F9If5JZO6W358XcZ/rawt9Oj3QwDvLLRvS2Bc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index f9fae3718f6f4..dd46c72fdd90b 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lxqt-powermanagement"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-wtqVUXYQWIPhvHj7Ig9qR6sglCRQzcxG192DM3xq/mA="; + hash = "sha256-S60m8ixz6HnTZe0MTyvU0pXWWOS88KeXfDcQJ/I1Keo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index a496274c73b35..687846ba2e256 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -12,7 +12,7 @@ , qtsvg , qttools , wrapQtAppsHook -, version ? "2.0.0" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc="; - "2.0.0" = "sha256-o5iD4VzsbN81lwDZJuFj8Ugg1RP752M4unu3J5/h8g8="; + "2.1.0" = "sha256-F171IgAhRXJ9sTt8VVDVO9hrmyHbCElsskdDmFr3HB0="; }."${version}"; }; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 0ea4ab9dce0f9..fd2b586778a5e 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lxqt-runner"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-r9rz6rJX60+1/+Wd5APobyZRioXzD1xveFIMToTvpXQ="; + hash = "sha256-NsAlaoWMvisRZ04KkrQzwi5B2eXnaHqg0HtYG4NKLcs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index cdfd234a14d77..2519954c9dca2 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lxqt-session"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-IgpGtIVTcSs0O3jEniIuyIAyKBSkwN/jpGL6yZg3AVo="; + hash = "sha256-t3odaG9znMohROutoEquJ7JYsvPQPjPxOik+WD8WGSA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index f1fc740c7186b..91fd56c211f78 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-sudo"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-kDcOHqHuAyHTQ7ccsCelPOBieXdRLloEvSMjq9PIa30="; + hash = "sha256-ohB0LsEnDDe3wygRgvP5mFQ2hu1c9xv2RilSdqOQBxA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index f4283c1927ea8..50b814724c511 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lxqt-themes"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-bAdwC1YrXCT4eJUafTK6kcfQ/YnMbBLHyyWvsBLIisA="; + hash = "sha256-TUBcYQ7mWGVZKHNi4zQh8/ogSuMr20xIAoR+IGYQE0w="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix new file mode 100644 index 0000000000000..21f4ef2548d99 --- /dev/null +++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kwindowsystem, + liblxqt, + libqtxdg, + lxqt-build-tools, + pkg-config, + qtsvg, + qttools, + xdg-user-dirs, + xkeyboard_config, + gitUpdater, +}: + +stdenv.mkDerivation rec { + pname = "lxqt-wayland-session"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "lxqt"; + repo = "lxqt-wayland-session"; + rev = version; + hash = "sha256-5WdfwJ89HWlXL6y9Lpgs7H3mbN/wbf+9VbP9ERPasBM="; + }; + + nativeBuildInputs = [ + cmake + lxqt-build-tools + pkg-config + qttools + ]; + + buildInputs = [ + kwindowsystem + liblxqt + libqtxdg + qtsvg + xdg-user-dirs + ]; + + postPatch = '' + substituteInPlace startlxqtwayland.in \ + --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules + + substituteInPlace configurations/{labwc/autostart,lxqt-hyprland.conf,lxqt-wayfire.ini} \ + --replace-fail /usr/share/lxqt/wallpapers $out/share/lxqt/wallpapers + ''; + + dontWrapQtApps = true; + + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/lxqt/lxqt-wayland-session"; + description = "Files needed for the LXQt Wayland Session"; + license = with lib.licenses; [ + bsd3 + cc-by-sa-40 + gpl2Only + gpl3Only + lgpl21Only + mit + ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxqt.members; + }; +} diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 208d741a9a61c..0244300f3ed2f 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pavucontrol-qt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-dhFVVqJIX40oiHCcnG1166RsllXtfaO7MqM6ZNizjQQ="; + hash = "sha256-V3VYwDlTRd7q7EJhC4zHcX56AbUYJdfumqXaKlkLEfg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 2b52e53755e50..e375c20791c70 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pcmanfm-qt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-PyCtcn+QHwX/iy85A3y7Phf8ogdSRrwtXrJYGxrjyLM="; + hash = "sha256-3LdoJLlGoUsv0MdbxIOZrzLaPnZ2hI6m+bLp4GNonng="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index a162c7f21d440..c3cb608538a54 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qps"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Jit1CdFZyhKOjNytTBH9T4NqqmhxoifXGgPUyVdzJ+4="; + hash = "sha256-FJw1J4c8oLBo7adl1uhCuS+o/ZhJAOyLmbjUgtdt0ss="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 0155fdf5322a7..1ca75acdc36ce 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-KGghNa1tvxDFd9kEElCx9BoLfwnbeX5UvoksyPBfEjc="; + hash = "sha256-Nluw0waf+lqpbajsPv+HYhPD3y7XmgifSu2r7I/J4RI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 30fe20ebeefe4..90b1a561bdf28 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "2.0.1" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; - "2.0.1" = "sha256-dqKsYAtoJgtXYL/MI3/p3N5kzxC7JfyO4Jn6YMhaV78="; + "2.1.0" = "sha256-I8fVggCi9qN+Jpqb/EC5/DfwuhGF55trbPESZQWPZ5M="; }."${version}"; }; diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index 5243b6e6ef22f..4e1b5b4144d84 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qtxdg-tools"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-w9pFHG+q2oT33Lfg88MUzfWSyvHUgC0Fi2V8XcueJ/Q="; + hash = "sha256-I8HV7QwyyRssWB6AjC1GswjlXoYwPJHowE74zgqghX4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index a7e65d746b609..fa132756edcf0 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "screengrab"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-PMe2NyIoc12n4l/oWPi3GL6pemuHyxL2HFBLTIyD690="; + hash = "sha256-V5ulRkckeSX2EsYmhmA9phVssDtix31M5oZXkOgF660="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index f88f32fb11fc5..4e63d967ffbce 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-zXZ0Un56uz1hKoPvZitJgQpJ7ko0LrSSFxl+agiqZ4A="; + hash = "sha256-uII6elLoREc/AO6NSe9QsT+jYARd2hgKSa84NCDza10="; }; nativeBuildInputs = [ diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 6d43f107563a9..1dfc54e9c3c6a 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/adamgreig/ecpdap"; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 53acd512a0ef9..b1dc2492f8b93 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -223,16 +223,6 @@ package-maintainers: - tlynx - xmonad - xmonad-contrib - expipiplus1: - - VulkanMemoryAllocator - - autoapply - - exact-real - - language-c - - orbits - - update-nix-fetchgit - - vector-sized - - vulkan - - vulkan-utils erictapen: - hakyll evenbrenden: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 67ba06fe891df..d51851b2c4717 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22317,7 +22317,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "WAVE" = callPackage @@ -43471,7 +43470,6 @@ self: { description = "Template Haskell to automatically pass values to functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "autodocodec" = callPackage @@ -103828,7 +103826,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "exact-real-positional" = callPackage @@ -188180,7 +188177,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "language-c-comments" = callPackage @@ -229065,7 +229061,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "orc" = callPackage @@ -323122,9 +323117,7 @@ self: { description = "A program to update fetchgit values in Nix expressions"; license = lib.licenses.bsd3; mainProgram = "update-nix-fetchgit"; - maintainers = [ - lib.maintainers.expipiplus1 lib.maintainers.sorki - ]; + maintainers = [ lib.maintainers.sorki ]; }) {}; "update-repos" = callPackage @@ -326556,7 +326549,6 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-sized_1_6_1" = callPackage @@ -326576,7 +326568,6 @@ self: { description = "Size tagged vectors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-space" = callPackage @@ -328393,7 +328384,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -328427,7 +328417,6 @@ self: { description = "Utils for the vulkan package"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "waargonaut" = callPackage diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 7679aefe5b95a..6e0f9858f730e 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -40,12 +40,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" "python" ]; postPatch = '' patchShebangs scripts + substituteInPlace src/python/gi/overrides/Makefile.am \ + --replace-fail ''\'''${exec_prefix}' '@PYTHON_EXEC_PREFIX@' ''; + configureFlags = [ + "--with-python_prefix=${placeholder "python"}" + ]; + nativeBuildInputs = [ autoconf-archive autoreconfHook diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 1880b8310fceb..e52a0f83ad3c7 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lgpl21Plus # libgpiod lgpl3Plus # C++ bindings ] ++ lib.optional enable-tools gpl2Plus; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 53ebe6f18e411..4e5418de689aa 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 prusnak ]; + maintainers = with maintainers; [ prusnak ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 7b26f3f12fca9..f15a7dfe44900 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix deleted file mode 100644 index c3de383980841..0000000000000 --- a/pkgs/development/libraries/quickder/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, python3 -, cmake -, doxygen -, graphviz -, quickmem -, arpa2common -, arpa2cm -, ensureNewerSourcesForZipFilesHook -}: - -stdenv.mkDerivation rec { - pname = "quickder"; - version = "1.7.1"; - - src = fetchFromGitLab { - owner = "arpa2"; - repo = "quick-der"; - rev = "v${version}"; - hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; - }; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - ensureNewerSourcesForZipFilesHook - ]; - - buildInputs = [ - arpa2cm - arpa2common - (python3.withPackages (ps: with ps; [ - asn1ate - colored - pyparsing - setuptools - six - ])) - quickmem - ]; - - - postPatch = '' - substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' - ''; - - doCheck = true; - - meta = with lib; { - description = "Quick (and Easy) DER, a Library for parsing ASN.1"; - homepage = "https://gitlab.com/arpa2/quick-der/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ leenaars ]; - }; -} diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 624d239fa35c1..3063ccc3a1891 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { # Should be possible to support Darwin by changing the install phase with # 's/Linux/Darwin/' and 's/so/dylib/' or something similar. platforms = with platforms; linux; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix new file mode 100644 index 0000000000000..e3ca43c8cd225 --- /dev/null +++ b/pkgs/development/python-modules/blivet/default.nix @@ -0,0 +1,109 @@ +{ + lib, + pkgs, + python, + buildPythonPackage, + fetchFromGitHub, + pygobject3, + libblockdev, + bytesize, + pyudev, + dbus-python, + util-linux, + kmod, + libndctl, + nvme-cli, + dosfstools, + e2fsprogs, + hfsprogs, + xfsprogs, + f2fs-tools, + ntfs3g, + btrfs-progs, + reiserfsprogs, + mdadm, + lvm2, + gfs2-utils, + cryptsetup, + multipath-tools, + dracut, + stratisd, +}: + +let + libblockdevPython = (libblockdev.override { python3 = python; }).python; +in +buildPythonPackage rec { + pname = "blivet"; + version = "3.10.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet"; + rev = "blivet-${version}"; + hash = "sha256-Ooc63mf03ZO7zxm8s/Tm8jSQg5LWyKnHAqbyvn1UHB8="; + }; + + postPatch = '' + find blivet -name '*.py' | while IFS= read -r i ; do + substituteInPlace "$i" \ + --replace \ + 'gi.require_version("BlockDev",' \ + 'import gi.repository + gi.require_version("GIRepository", "2.0") + from gi.repository import GIRepository + GIRepository.Repository.prepend_search_path("${libblockdev}/lib/girepository-1.0") + gi.require_version("BlockDev",' + done + ''; + + propagatedBuildInputs = [ + pygobject3 + libblockdevPython + bytesize + pyudev + dbus-python + util-linux + kmod + libndctl + nvme-cli + pkgs.systemd + dosfstools + e2fsprogs + hfsprogs + xfsprogs + f2fs-tools + ntfs3g + btrfs-progs + reiserfsprogs + mdadm + lvm2 + gfs2-utils + cryptsetup + multipath-tools + dracut + stratisd + ]; + + pythonImportsCheck = [ "blivet" ]; + + # Even unit tests require a system D-Bus. + # TODO: Write a NixOS VM test? + doCheck = false; + + # Fails with: TypeError: don't know how to make test from: + # + dontUseSetuptoolsCheck = true; + + meta = { + description = "Python module for system storage configuration"; + homepage = "https://github.com/storaged-project/blivet"; + license = [ + lib.licenses.gpl2Plus + lib.licenses.lgpl2Plus + ]; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 95772d937b6c1..44a680f4f3dc2 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-cachalot"; - version = "2.6.3"; + version = "2.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "noripyt"; repo = "django-cachalot"; rev = "refs/tags/v${version}"; - hash = "sha256-q4w2goxdDqivGVZCRDGOvYARbzmx6P8Gnw9YlYn9Few="; + hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw="; }; patches = [ diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 6ec520c3ae470..12500e9fe8542 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -43,6 +43,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "notion_client" ]; + disabledTests = [ + # requires network access + "test_api_http_response_error" + ]; + meta = with lib; { description = "Python client for the official Notion API"; homepage = "https://github.com/ramnes/notion-sdk-py"; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 37d1763b264c2..afba3e93ddbd6 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -2,9 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, cython, oldest-supported-numpy, + requests, decorator, natsort, @@ -12,8 +14,10 @@ pandas, scipy, h5py, - hdmedians, biom-format, + statsmodels, + patsy, + python, pytestCheckHook, }: @@ -44,8 +48,9 @@ buildPythonPackage rec { pandas scipy h5py - hdmedians biom-format + statsmodels + patsy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +58,11 @@ buildPythonPackage rec { # only the $out dir contains the built cython extensions, so we run the tests inside there pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; + disabledTestPaths = [ + # don't know why, but this segfaults + "${placeholder "out"}/${python.sitePackages}/skbio/metadata/tests/test_intersection.py" + ]; + pythonImportsCheck = [ "skbio" ]; meta = { diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 092f8efe785c3..9c642123ee4d1 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 143034ecddee9..0b21bd539d1d5 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -48,7 +48,6 @@ buildGoModule rec { description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - expipiplus1 niklaskorz ma27 ]; diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index 254434a8ba3df..1d86bc472a368 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -44,7 +44,7 @@ in myNodePackages.package.override { description = "Discord puppeting bridge for matrix"; license = licenses.asl20; homepage = "https://gitlab.com/mx-puppet/discord/mx-puppet-discord"; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 11deeca44d06e..bd5d00aa50d11 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/microsoft/DirectXShaderCompiler"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ - expipiplus1 - Flakebi - ]; + maintainers = with lib.maintainers; [ Flakebi ]; }; }) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 2683539858893..4b03e4e098f23 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/"; platforms = platforms.linux; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 1d031d20c1bbb..08236ab39a2c1 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LunarG/VulkanTools"; platforms = platforms.linux; license = licenses.asl20; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/tools/misc/inav-blackbox-tools/default.nix index 228035108a816..4acfc4d4890ef 100644 --- a/pkgs/tools/misc/inav-blackbox-tools/default.nix +++ b/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Tools for working with blackbox flight logs"; homepage = "https://github.com/inavflight/blackbox-tools"; license = licenses.gpl3Only; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin }; diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 90590d01cfdce..9c9f7e97fa689 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -29,10 +29,7 @@ rustPlatform.buildRustPackage rec { description = "VR Lighthouse power state management"; homepage = "https://github.com/ShayBox/Lighthouse"; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - bddvlpr - ]; + maintainers = with maintainers; [ bddvlpr ]; mainProgram = "lighthouse"; }; } diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index c7e92770b7d63..e4e1791c8971f 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; mainProgram = "OpenCorsairLink.elf"; }; } diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index a2e1399a2fd98..04dcaa6304447 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -4,7 +4,7 @@ lib, makeWrapper, autoPatchelfHook, - openjdk17, + openjdk21, pam, makeDesktopItem, icoutils, @@ -28,12 +28,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.4"; - versiondate = "20230928"; + version = "11.2.1"; + versiondate = "20241105"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-IiAQ9OKmr8ZgqmGftuW0ITdG06fb9Lr30n2H9GArctk="; + hash = "sha256-w6FCAjF2ggFWH8eo7X8V6ZTbSptGkwRzoEMj9nGL5/M="; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ln -s "${pkg_path}/support/analyzeHeadless" "$out/bin/ghidra-analyzeHeadless" wrapProgram "${pkg_path}/support/launch.sh" \ - --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk21 ]} ''; meta = with lib; { @@ -78,7 +78,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/NationalSecurityAgency/ghidra"; platforms = [ "x86_64-linux" + "aarch64-linux" "x86_64-darwin" + "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 508cfafc69de3..d238ef3166c66 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sudo"; # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping # e.g. links to man pages, value constraints etc. - version = "1.9.15p5"; + version = "1.9.16"; __structuredAttrs = true; src = fetchurl { url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz"; - hash = "sha256-VY0QuaGZH7O5+n+nsH7EQFt677WzywsIcdvIHjqI5Vg="; + hash = "sha256-wNhNeX8GtzL8Vz0LeYroMSjCvDMFIFfwW1YOxry/oD0="; }; prePatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89bc58727ff53..b4f23a41deeee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22463,8 +22463,6 @@ with pkgs; quesoglc = callPackage ../development/libraries/quesoglc { }; - quickder = callPackage ../development/libraries/quickder { }; - quickmem = callPackage ../development/libraries/quickmem { }; quicksynergy = callPackage ../applications/misc/quicksynergy { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 842f4546bc9c5..dd40d57078120 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1711,6 +1711,8 @@ self: super: with self; { blis = callPackage ../development/python-modules/blis { }; + blivet = callPackage ../development/python-modules/blivet { }; + blobfile = callPackage ../development/python-modules/blobfile { }; blockchain = callPackage ../development/python-modules/blockchain { }; @@ -1950,6 +1952,8 @@ self: super: with self; { bytecode = callPackage ../development/python-modules/bytecode { }; + bytesize = toPythonModule (pkgs.libbytesize.override { python3Packages = self; }); + bytewax = callPackage ../development/python-modules/bytewax { }; bz2file = callPackage ../development/python-modules/bz2file { }; @@ -8007,6 +8011,11 @@ self: super: with self; { millheater = callPackage ../development/python-modules/millheater { }; + mim-solvers = toPythonModule (pkgs.mim-solvers.override { + python3Packages = self; + pythonSupport = true; + }); + minari = callPackage ../development/python-modules/minari { }; mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { };