diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index e1508824a8d3..789e9a9b17d7 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -15,6 +15,8 @@ - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. +- `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias. + - `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree). - `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 828801264652..e34d0cdd91f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11711,6 +11711,12 @@ githubId = 7348004; name = "Benjamin Levy"; }; + iogamaster = { + email = "iogamastercode+nixpkgs@gmail.com"; + name = "IogaMaster"; + github = "IogaMaster"; + githubId = 67164465; + }; ionutnechita = { email = "ionut_n2001@yahoo.com"; github = "ionutnechita"; @@ -14374,12 +14380,6 @@ githubId = 451835; name = "Kirill Elagin"; }; - kirikaza = { - email = "k@kirikaza.ru"; - github = "kirikaza"; - githubId = 804677; - name = "Kirill Kazakov"; - }; kirillrdy = { email = "kirillrdy@gmail.com"; github = "kirillrdy"; @@ -18727,10 +18727,10 @@ keys = [ { fingerprint = "3B66 ACFA D10F 02AA B1D5  2CB1 8DD0 D81D 7D1F C61A"; } ]; }; mshnwq = { - email = "mshnwq.com@gmail.com"; + email = "hmachnouk@proton.me"; github = "mshnwq"; githubId = 68467027; - name = "Hayan Al-Machnouk"; + name = "Mshnwq"; }; msiedlarek = { email = "mikolaj@siedlarek.pl"; @@ -23375,12 +23375,6 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; - rht = { - email = "rhtbot@protonmail.com"; - github = "rht"; - githubId = 395821; - name = "rht"; - }; rhydianjenkins = { name = "Rhydian Jenkins"; github = "RhydianJenkins"; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 99858a55bb6e..2cebb908bd09 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -777,7 +777,25 @@ in openFirewall = mkOption { default = false; type = types.bool; - description = "Whether to open the firewall for the specified port."; + description = '' + Whether to open the firewall for the specified frontend port + + :::{.note} + For components specific ports see {option}`services.home-assistant.openFirewallForComponents`. + ::: + ''; + }; + + openFirewallForComponents = mkOption { + default = false; + type = types.bool; + description = '' + Whether to open required firewall ports for enabled components. + + :::{.note} + For the frontend see {option}`services.home-assistant.openFirewall`. + ::: + ''; }; blueprints = mergeAttrsList ( @@ -845,7 +863,13 @@ in } ]; - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.config.http.server_port ]; + networking.firewall.allowedTCPPorts = mkMerge [ + (mkIf cfg.openFirewall [ cfg.config.http.server_port ]) + (mkIf cfg.openFirewallForComponents + # https://www.home-assistant.io/integrations/sonos/#network-requirements + (optionals (useComponent "sonos") [ 1400 ]) + ) + ]; # symlink the configuration to /etc/home-assistant environment.etc = mkMerge [ diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix index 1dce42fdb2ad..37fb0935be87 100644 --- a/nixos/modules/services/networking/pangolin.nix +++ b/nixos/modules/services/networking/pangolin.nix @@ -9,7 +9,7 @@ let cfg = config.services.pangolin; format = pkgs.formats.yaml { }; - finalSettings = lib.attrsets.recursiveUpdate pangolinConf cfg.settings; + finalSettings = lib.attrsets.recursiveUpdate options.services.pangolin.settings.default cfg.settings; cfgFile = format.generate "config.yml" finalSettings; # override the type to allow for optionality nullOrOpt = t: lib.types.nullOr t // { _optional = true; }; @@ -33,25 +33,6 @@ let fi ''; }; - - pangolinConf = { - app.dashboard_url = "https://${cfg.dashboardDomain}"; - domains.domain1 = { - base_domain = cfg.baseDomain; - prefer_wildcard_cert = false; - }; - server = { - external_port = 3000; - internal_port = 3001; - next_port = 3002; - integration_port = 3003; - # needs to be set, otherwise this fails silently - # see https://github.com/fosrl/newt/issues/37 - internal_hostname = "localhost"; - }; - gerbil.base_endpoint = cfg.dashboardDomain; - flags.enable_integration_api = false; - }; in { options.services = { @@ -61,7 +42,50 @@ in settings = lib.mkOption { inherit (format) type; - default = { }; + default = { + app.dashboard_url = "https://${cfg.dashboardDomain}"; + domains.domain1 = { + base_domain = cfg.baseDomain; + prefer_wildcard_cert = false; + }; + server = { + external_port = 3000; + internal_port = 3001; + next_port = 3002; + integration_port = 3003; + # needs to be set, otherwise this fails silently + # see https://github.com/fosrl/newt/issues/37 + internal_hostname = "localhost"; + }; + gerbil.base_endpoint = cfg.dashboardDomain; + flags = { + disable_signup_without_invite = true; + enable_integration_api = false; + }; + }; + defaultText = lib.literalExpression '' + { + app.dashboard_url = "https://''${config.services.pangolin.dashboardDomain}"; + domains.domain1 = { + base_domain = cfg.baseDomain; + prefer_wildcard_cert = false; + }; + server = { + external_port = 3000; + internal_port = 3001; + next_port = 3002; + integration_port = 3003; + # needs to be set, otherwise this fails silently + # see https://github.com/fosrl/newt/issues/37 + internal_hostname = "localhost"; + }; + gerbil.base_endpoint = config.services.pangolin.dashboardDomain; + flags = { + disable_signup_without_invite = true; + enable_integration_api = false; + }; + } + ''; description = '' Additional attributes to be merged with the configuration options and written to Pangolin's {file}`config.yml` file. ''; diff --git a/nixos/tests/rancher/auto-deploy.nix b/nixos/tests/rancher/auto-deploy.nix index b9c2a80cbd5a..3da2fa7f1f9a 100644 --- a/nixos/tests/rancher/auto-deploy.nix +++ b/nixos/tests/rancher/auto-deploy.nix @@ -275,9 +275,16 @@ in k3s = '' machine.wait_until_succeeds("kubectl -n kube-system rollout status deployment traefik") ''; - rke2 = '' - machine.wait_until_succeeds("kubectl -n kube-system rollout status daemonset rke2-ingress-nginx-controller") - ''; + rke2 = + # Starting from v1.36, RKE2 also uses traefik as default load balancer + if lib.versionAtLeast rancherPackage.version "1.36" then + '' + machine.wait_until_succeeds("kubectl -n kube-system rollout status daemonset rke2-traefik") + '' + else + '' + machine.wait_until_succeeds("kubectl -n kube-system rollout status daemonset rke2-ingress-nginx-controller") + ''; } .${rancherDistro} } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b28476267150..2aad4186b645 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -15358,6 +15358,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + reactive-nvim = buildVimPlugin { + pname = "reactive.nvim"; + version = "1.2.1"; + src = fetchFromGitHub { + owner = "rasulomaroff"; + repo = "reactive.nvim"; + tag = "v1.2.1"; + hash = "sha256-LZCCboM/fw+Kw6wVskrPs6nr4SFLoD0pi6EMxSIGelw="; + }; + meta.homepage = "https://github.com/rasulomaroff/reactive.nvim/"; + meta.license = getLicenseFromSpdxId "Apache-2.0"; + meta.hydraPlatforms = [ ]; + }; + readline-vim = buildVimPlugin { pname = "readline.vim"; version = "0-unstable-2023-03-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f09f6a5ef4c7..9d98d2d27261 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1095,6 +1095,7 @@ https://github.com/winston0410/range-highlight.nvim/,, https://github.com/kelly-lin/ranger.nvim/,, https://github.com/rafaqz/ranger.vim/,, https://github.com/vim-scripts/rcshell.vim/,, +https://github.com/rasulomaroff/reactive.nvim/,, https://github.com/ryvnf/readline.vim/,, https://github.com/theprimeagen/refactoring.nvim/,, https://github.com/mawkler/refjump.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 1596e6753fec..e5255aeb0f35 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-cKQwDXdsaUI4pFF/DMa/8qLs9q3C1WwI47/otxKS+Ww="; + hash = "sha256-fiPj/rkwNevJC2bTjRBkuhwdI3Sqgj3xsQB1yp6KxEM="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-2hOK3Hl5GDspu0oU0w2kqH324nOafRsKEoRCk2N6Nmw="; + hash = "sha256-NZy2I3cNZBM2oXUJ/mf56QW1edvcKu0HICAZq6VVF6U="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-fw/WkYTeB7uh9ggEASmZIz636iuy0nDsIt/oU2DBfGo="; + hash = "sha256-admTed1OpngSd2BY368AkOQGWnVLX7KM4icgx2uNJYE="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-YwUoK12QEMasKl7GOTfHOnDgkg/NNBZMA29sx674XBc="; + hash = "sha256-l39oH4LOgFrZ5598+YWvArIHrZHSz0NU9wOAMop7kNw="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.156"; + version = "2.1.158"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3e1f1f6342e8..90e532d1ed90 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1007,8 +1007,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.14.5"; - hash = "sha256-08GsGOtgLhq5vLpQ9VDdVk/q5VSW6d7cXXflNQOpB50="; + version = "1.14.6"; + hash = "sha256-dABM44pSD0srzNl6J+1OsqugWb++soVFmtEIzliByDs="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; diff --git a/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json new file mode 100644 index 000000000000..b82d9e141d76 --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json @@ -0,0 +1,138 @@ +{ + "images-calico-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "bc9fb1ba72af6185de90e4e0f8a384993657c4b0fdedbb14e7ca5cf93bf2303d" + }, + "images-calico-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "38fc5ecd017e9a66e3831ece42efedcfedaafc000759eaa4fb9f19a68122ec51" + }, + "images-calico-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "e86ac7f4cf14e4f02fcdd0e3d74e832fa43654f592068c2b5d8c044c69e2b749" + }, + "images-calico-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "03df93db61bc54f351bb6131c632279c265d4b71af0a90e2a6898f9b99b453f4" + }, + "images-canal-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "5cce5314ed6ff237c646723456c81876e89517b9164368728a9df00697655858" + }, + "images-canal-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d" + }, + "images-canal-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "e8346348137747fbd626846e5b71d182c49e8a1dcb997ea9e91f50e7bd907129" + }, + "images-canal-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d" + }, + "images-cilium-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "8c52261340b4af54186f83d2913c676a2dcef820f25a1b42b8c51cfef1dcdbc6" + }, + "images-cilium-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "865913456dc55b2ba4748b0fe76489e4960a60990f207341c66bcbf9e93e95b3" + }, + "images-cilium-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "4170bfc7d0ebf9167a94d24e393fbff0fc7dce4da1443257709fdbe603ffc579" + }, + "images-cilium-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "016caf748e5c39460b9618d998d261c7db8fe8348f9fa43d35693a47d4913b86" + }, + "images-core-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "03a72f2c228131b7cb616c5b7758cd1c00b7f3e7d589573c5faf837e4e2ab764" + }, + "images-core-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "37acd15d183693fb0bb465840590593ed78d72415752a052d282a418fdb905cf" + }, + "images-core-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "4798bf3293e7b5b62e694bee8a811c3ace86bb5c7516c9f196a4ba48dc947c3f" + }, + "images-core-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "ff8c770fa2b17151e333a0a4449bc4dc3cd5c65662ec88b2ffc31fde6a40d0ed" + }, + "images-flannel-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "0e5c71c9ecd89f11bb1cc0ea72a0297090e7a44395efe5fd74e14af3db3581a8" + }, + "images-flannel-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137" + }, + "images-flannel-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "d9f75aaace63bcba2cbaeba2662d9877d39ec822621fd96824e9ec3fbe62a79c" + }, + "images-flannel-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7" + }, + "images-harvester-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "c9442d489c4170fc515d04c2c5c7c76ff3ca2fb4093a94aea0d0a6fb1719c5d3" + }, + "images-harvester-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "9551558d7baba1a78de7954f4801cf4329b5fb5ffd0cc3566b9fa32732ff950c" + }, + "images-harvester-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "11ea150625fc1a4700cec2859367692d533f7f9288f7196b331a77682766d742" + }, + "images-harvester-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "045db3938a0a11f6d5b4936f63471fec48fd76d29ef85e9cfe6bae5bddd8525e" + }, + "images-ingress-nginx-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.gz", + "sha256": "0af77531d170d30b844518bb4665b29f3f386cf160f7c2b955467516f4d04dc3" + }, + "images-ingress-nginx-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.zst", + "sha256": "d5b7d3f12de0799cebf84fc6260fc4f093f2837c5fef6fc84849d8f1da5cbc22" + }, + "images-ingress-nginx-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.gz", + "sha256": "8c5d5eea216102e5dd07621671f2e462dfade184f20c81adb8facbaa58e59c2c" + }, + "images-ingress-nginx-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.zst", + "sha256": "363f42d83118e3398e72996f6b42477230000ffd50d93fdda570140ea020539b" + }, + "images-multus-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "ec3d8557e36db43acd9a76c38242de6feea354e41ae3ff8b9ab55de82ee19026" + }, + "images-multus-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "8be7075092a5e179e50fb526ea730018103d9f8a609f22f0d1431482690a9d7f" + }, + "images-multus-linux-arm64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "caebabf77d9d3190d76156990d8eaa0c2df5cb563a8447f1e506b50f4104e1a0" + }, + "images-multus-linux-arm64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "39bd89d250894254f7c1f9b061401a574716574ab3f51cc3a82c03eb4e804825" + }, + "images-vsphere-linux-amd64-tar-gz": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "d07ed8b72db67fae9024540fca3eed7990b4a4b3a7ba6eef78a2eae8e6b3b4d3" + }, + "images-vsphere-linux-amd64-tar-zst": { + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "4cd43197b21bd1344c0a7e87a7f28c8766b3edfab8e2fb2bb6954d144f3b44a7" + } +} diff --git a/pkgs/applications/networking/cluster/rke2/1_36/versions.nix b/pkgs/applications/networking/cluster/rke2/1_36/versions.nix new file mode 100644 index 000000000000..0df94c7d70dd --- /dev/null +++ b/pkgs/applications/networking/cluster/rke2/1_36/versions.nix @@ -0,0 +1,13 @@ +{ + rke2Version = "1.36.1+rke2r1"; + rke2Commit = "b4a8e78038f35eb282a8d6e3c29797a1181fa961"; + rke2TarballHash = "sha256-SD7+lNYu6/5iMxEmHEpkD8g9UCgN6gjkFsGdQn9o1Cc="; + rke2VendorHash = "sha256-gUgRAC9yKDa8JYb/jdCxZdP6500XxjqHprmYlPv5A8c="; + k8sImageTag = "v1.36.1-rke2r1-build20260512"; + etcdVersion = "v3.6.7-k3s1-build20260512"; + pauseVersion = "3.6"; + ccmVersion = "v1.36.0-rc2.0.20260427154526-d239025e2a23-build20260429"; + dockerizedVersion = "v1.36.1-rke2r1"; + helmJobVersion = "v0.10.0-build20260513"; + imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); +} diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index c7d65fac7374..29b42d02e6b0 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -46,6 +46,7 @@ lib: nixosTests, }: buildGoModule (finalAttrs: { + __structuredAttrs = true; pname = "rke2"; version = rke2Version; diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index e48b0b94f63c..d0f035cc2fd1 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -11,7 +11,9 @@ rec { rke2_1_35 = common (import ./1_35/versions.nix) extraArgs; + rke2_1_36 = common (import ./1_36/versions.nix) extraArgs; + # Automatically set by update script, changes shouldn't be backported rke2_stable = rke2_1_35; - rke2_latest = rke2_1_35; + rke2_latest = rke2_1_36; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a4ec6bf3ec52..66ade5f84158 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1508,12 +1508,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-j2JFdTXcry5VHEKBK7VHIjAdmPePF9fnJ4fW5dXglaY=", + "hash": "sha256-JSF1Q0wNRg2oavZ1+67QfCxNz+JOHrG+rfKn/1T9cgc=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.204.0", + "rev": "v0.206.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ikUGcbJ1j/QrpPF5qn+ag2e7i1gxAK74h3nrUqR+azo=" + "vendorHash": "sha256-SpJ6wuzBzfI46C7MbNxs0gQpG62ODmB0WIZ8UpJjuPU=" } } diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index a42e2ad6eeaf..b41a170aee6e 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -11,7 +11,6 @@ inotify-tools, systemd, zlib, - pcre, rapidjson, small, libb64, @@ -24,7 +23,6 @@ miniupnpc, dht, libnatpmp, - libiconv, # Build options enableGTK3 ? false, gtkmm3, @@ -54,7 +52,6 @@ let libpsl miniupnpc openssl - pcre zlib ] ++ optionals enableSystemd [ systemd ] @@ -136,7 +133,6 @@ stdenv.mkDerivation (finalAttrs: { libutp miniupnpc openssl - pcre rapidjson small utf8cpp diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index af72e6a6e3e0..8d17cec5f610 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -2,7 +2,6 @@ lib, fetchurl, appimageTools, - gconf, imagemagick, }: diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 560681e4c4ae..01afb249d407 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -1100,12 +1100,11 @@ rec { pkgs.runCommandLocal name { inherit text; - passAsFile = [ "text" ]; + __structuredAttrs = true; nativeBuildInputs = [ gixy ]; } # sh '' - cp "$textPath" $out - ${lib.getExe pkgs.nginx-config-formatter} --max-empty-lines 0 $out + printf "%s" "$text" | ${lib.getExe pkgs.nginx-config-formatter} --max-empty-lines 0 - > $out ${lib.getExe pkgs.gnused} -i 's/ ;/;/g' $out gixy $out || (echo "\n\nThis can be caused by combining multiple incompatible services on the same hostname.\n\nFull merged config:\n\n"; cat $out; exit 1) ''; diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile b/pkgs/by-name/an/anystyle-cli/Gemfile similarity index 100% rename from pkgs/tools/misc/anystyle-cli/Gemfile rename to pkgs/by-name/an/anystyle-cli/Gemfile diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/pkgs/by-name/an/anystyle-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/anystyle-cli/Gemfile.lock rename to pkgs/by-name/an/anystyle-cli/Gemfile.lock diff --git a/pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec b/pkgs/by-name/an/anystyle-cli/anystyle-cli.gemspec similarity index 100% rename from pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec rename to pkgs/by-name/an/anystyle-cli/anystyle-cli.gemspec diff --git a/pkgs/tools/misc/anystyle-cli/gemset.nix b/pkgs/by-name/an/anystyle-cli/gemset.nix similarity index 100% rename from pkgs/tools/misc/anystyle-cli/gemset.nix rename to pkgs/by-name/an/anystyle-cli/gemset.nix diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/by-name/an/anystyle-cli/package.nix similarity index 100% rename from pkgs/tools/misc/anystyle-cli/default.nix rename to pkgs/by-name/an/anystyle-cli/package.nix diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index d4f8f2c97015..46633586a1f0 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "147"; + version = "148"; src = fetchzip { url = "https://github.com/ares-emulator/ares/releases/download/v${finalAttrs.version}/ares-source.tar.gz"; - hash = "sha256-KkcrcFshNesnSp5fl+as3HFXjytgODvMv8m73Ni2euw="; + hash = "sha256-LXLt4hYjpnLrzu+0dLfXr4lEF7drZwSRjgaCAaD79+g="; stripRoot = false; }; diff --git a/pkgs/by-name/aw/aws-sso-creds/package.nix b/pkgs/by-name/aw/aws-sso-creds/package.nix index 5dacccc81c1b..20b727d212e9 100644 --- a/pkgs/by-name/aw/aws-sso-creds/package.nix +++ b/pkgs/by-name/aw/aws-sso-creds/package.nix @@ -7,15 +7,15 @@ }: buildGoModule (finalAttrs: { pname = "aws-sso-creds"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jaxxstorm"; repo = "aws-sso-creds"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-QYE+HvvBEWPxopVP8QMqb4lNRyAtVDewuiWzja9XdM4="; + sha256 = "sha256-HFkPx/ptg/xXW2bbvZLSuuckj/SbuJQQcAbNfiTgTLM="; }; - vendorHash = "sha256-2EDpyw7Mqhvc0i6+UjWfNlvndRYJDaezRkOy9PBeD1Y="; + vendorHash = "sha256-GiloBizb8ec7PgXbzQEOKjyJP5doFnQ2ALH3Y1+AKZw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 856a8ee7ac0b..580885fb4d06 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -41,6 +41,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { pythonRelaxDeps = [ "botocore" "colorama" + "fabric" "pathspec" "packaging" "PyYAML" diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 1f85160412f3..497df9719dc9 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -71,7 +71,6 @@ buildNpmPackage' rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kalebpace - doronbehar ]; mainProgram = "balena"; }; diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix index 1645e8076947..0f4cdddd4fe9 100644 --- a/pkgs/by-name/bi/bitwuzla/package.nix +++ b/pkgs/by-name/bi/bitwuzla/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitwuzla"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; tag = finalAttrs.version; - hash = "sha256-3ThDKoXzCqDtiX3JXshqRtwri8V7lOFxmr+4IqQbUAQ="; + hash = "sha256-3uStLdDFhXVgqzremUPRbxPUcl0IqVg5MRLltgm8rCA="; }; strictDeps = true; diff --git a/pkgs/by-name/bl/blazesym-c/package.nix b/pkgs/by-name/bl/blazesym-c/package.nix index 6fe542c592df..c9f0035b5495 100644 --- a/pkgs/by-name/bl/blazesym-c/package.nix +++ b/pkgs/by-name/bl/blazesym-c/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "blazesym-c"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "libbpf"; repo = "blazesym"; tag = "capi-v${finalAttrs.version}"; - hash = "sha256-+wpKDxZgFkezvKzL0xA7FFS/sIx++kwSf32Kl4u0rAg="; + hash = "sha256-IdeY9FCGziYN9glnvQJu2oa5ogdXb6D9QcY2MRnq7vA="; }; - cargoHash = "sha256-J14dckx/t0BG+l6NOiBY/Kkq42C98dXIzP9e6LtpgVg="; + cargoHash = "sha256-fsvdhahTKxjrrH9z6m1k3cTkXfMUZXZNZlYRi3tgTlA="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 35c3ea7e109e..497820c9f4cf 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -299,7 +299,6 @@ stdenv.mkDerivation { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ uskudnik - rht jefflabonte nasirhm buckley310 diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 8e92fbdbe0f8..07b9e98b45c4 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-expand"; - version = "1.0.121"; + version = "1.0.122"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; tag = finalAttrs.version; - hash = "sha256-Mwc1toL3kF+ZSmSwE24FRHXtIGHB0IVBiKtHGEpsn2E="; + hash = "sha256-GhlVBpTkh4uCpfQdBl5ACbkXpH5UO5w/an/w9FA4dT4="; }; - cargoHash = "sha256-F5g70cQYSiz63DD4uQTYIQ6I7Xf6fXL4ZwfDzOYpXzQ="; + cargoHash = "sha256-CV+lfWLcyXoXPv8KLutJ819YIaKf3BHOZrj1eP3VMzo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 845d1ba03229..51f565fe996d 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.156", - "commit": "de3d672b5e8c35ae78d81c9dd83844d334ec63af", - "buildDate": "2026-05-28T18:38:44Z", + "version": "2.1.158", + "commit": "96d5f49347b9949c6a3e6287cbb62b8939b7e1c2", + "buildDate": "2026-05-29T23:34:41Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "9c1e8601031f5cbb3101e49dda22bf8ba31183692c705e267a6923585fa2ba09", - "size": 214986144 + "checksum": "536a0517fa64d48ddcbc8eb511a3d08027d47e06d148872332a8041d72c22768", + "size": 215233824 }, "darwin-x64": { "binary": "claude", - "checksum": "ccd608c694677324e24dec7d1253b51f887a7be838cdb75b22d5362c97351107", - "size": 217500304 + "checksum": "b7b33293702fb8e0a119b795d5af5178bd346fb46d4d7f161336d521f62d1451", + "size": 217747984 }, "linux-arm64": { "binary": "claude", - "checksum": "7ed95d0a93aeb40e2b98e234b760d9295b7044ef678c62db8d1f5e14bfd57878", - "size": 240301704 + "checksum": "98807675a3ed5b7b775f7eaa81eda32cba2810b97e9db9f6f98d7bd658cec00e", + "size": 240563848 }, "linux-x64": { "binary": "claude", - "checksum": "6d83cd2264450c5e54fc988be1032c288cf418ee604294acfb8fc4ac28f5f7a3", - "size": 240420560 + "checksum": "dd27008acd42700bac5762652ec83ff604bf9ae0786d4dde55d57a6866017fbe", + "size": 240666320 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "858aa70793d5ba6293ae64b0e351514040a6e1021e9b2bac7129a791216505ce", - "size": 233156440 + "checksum": "742329f43930cbb1122eb1fe7aca339cb3dfb67be83cd256867859fba1e79ce2", + "size": 233418584 }, "linux-x64-musl": { "binary": "claude", - "checksum": "a594c2a56f7333816b85f53ed0501399b49bd44c05f25b315869b5b102ff34c3", - "size": 234814512 + "checksum": "56d66c89bf8d3e8efdab965e1dcc840d993212b40a2e89c751567c4bc605beba", + "size": 235060272 }, "win32-x64": { "binary": "claude.exe", - "checksum": "188cc105e1caaed88f63ac2060283eb426ea17a69130810c10126b2c14f7dc7e", - "size": 236074144 + "checksum": "10fa305545b20baf6e074a086762bd252b89dfe7035848a5d41385503b1a6c74", + "size": 236306080 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "1e10b4fa9e8a4829cfdf77a9c55cfe0dd26c54f2afb4d3dd9d19ff9e99ca1887", - "size": 232039072 + "checksum": "9e0e303015eb3c9aba782b366b35194073ab8130ac6c091c2c46870798a20bdc", + "size": 232271008 } } } diff --git a/pkgs/by-name/cl/clementine/package.nix b/pkgs/by-name/cl/clementine/package.nix index 0b93d566a882..672eb96a2b53 100644 --- a/pkgs/by-name/cl/clementine/package.nix +++ b/pkgs/by-name/cl/clementine/package.nix @@ -20,7 +20,6 @@ libpulseaudio, gvfs, libcdio, - pcre, projectm_3, protobuf, pkg-config, @@ -83,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { gvfs libsForQt5.liblastfm libpulseaudio - pcre projectm_3 protobuf libsForQt5.qca-qt5 diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 5ce856190a1c..ee778a21ba1c 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "3.5.17", + "version": "3.6.21", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/linux/x64/Cursor-3.5.17-x86_64.AppImage", - "hash": "sha256-hOo7SIITt8GnzChwPCmAXIyOJBhiSV+fQ3ovLFAT49c=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/linux/x64/Cursor-3.6.21-x86_64.AppImage", + "hash": "sha256-6zIhSz5fxEMLA8zd6oZtwNDUMAW65bZu/fYMSV/Iuh0=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/linux/arm64/Cursor-3.5.17-aarch64.AppImage", - "hash": "sha256-sutJMIhZw45glApbzOrUXleIGkrYeC8lGarc7pckuTg=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/linux/arm64/Cursor-3.6.21-aarch64.AppImage", + "hash": "sha256-5DxmpvFUqNybbHSRB6RlM9yVzFKHSoXIkEDygg0b/5A=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-0sJSQJyhu2RZhHaU/nr7/whKt31vFq6Tmxr9NOWlJ2g=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-CHxaG3gNgAJSBpTGJcqX4LhfpW7BJI44nEbphDvoTDo=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/d5b2fc092e16007956c9e5047f76097b9e626cab/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-7POR+9pveTdR9WYx0/OdgOhF8yTkiZwhzg0jKEfWrfs=" + "url": "https://downloads.cursor.com/production/e7a7e93f4d75f8272503ecf33cedbaae10114a15/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-QproM1zUY3xpXKzzae+yAmb7yb5Os9zwJlvliwDKLc8=" } } } diff --git a/pkgs/by-name/cr/cross-seed/package.nix b/pkgs/by-name/cr/cross-seed/package.nix index 435a71191e64..d6410dc29279 100644 --- a/pkgs/by-name/cr/cross-seed/package.nix +++ b/pkgs/by-name/cr/cross-seed/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "cross-seed"; - version = "6.13.6"; + version = "6.13.7"; src = fetchFromGitHub { owner = "cross-seed"; repo = "cross-seed"; tag = "v${version}"; - hash = "sha256-E2tnlDU2/msNcSsoDXvwGWFhWpXEByloUmlVp2tckwo="; + hash = "sha256-+7A4UGIY75hvF0JvtIr6nGNdXkUE0XV9TFpEQz9OW+Y="; }; - npmDepsHash = "sha256-tR7zPoIX6yjlRx8QbRSxskvueQ1BsP3gGAlonKHH0RY="; + npmDepsHash = "sha256-HoIiO7cj4JNY+sJEuH1v0AgagDuBTySJaoVo/4SsfIc="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix index 9690ea77bfba..c3a29be27f6c 100644 --- a/pkgs/by-name/de/deezer-desktop/package.nix +++ b/pkgs/by-name/de/deezer-desktop/package.nix @@ -8,15 +8,15 @@ }: let - version = "7.1.200"; + version = "7.1.220"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz"; - hash = "sha256-FrAFUkxv4/GGhDO/2g+0Kym1LCV+YoIee7rmOAw17/Q="; + hash = "sha256-q4j4S88c7xsC+Ax7XY1EVbqRRJXH+JzLrZRRB6rfQOE="; }; aarch64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz"; - hash = "sha256-FcP4jAVvIA71GCtVoWEIA4AynsHOAn0/zt3rNB6Q25Y="; + hash = "sha256-g94qn+EHr8Dwn21L7z3W7Z5+LJoVSQcAEXHpJiAdbJg="; }; }; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/by-name/es/esbuild/package.nix similarity index 100% rename from pkgs/development/tools/esbuild/default.nix rename to pkgs/by-name/es/esbuild/package.nix diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/by-name/es/esbuild_netlify/package.nix similarity index 100% rename from pkgs/development/tools/esbuild/netlify.nix rename to pkgs/by-name/es/esbuild_netlify/package.nix diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index c789986a2c19..bc3ca4bbae15 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "9.3.17"; + version = "9.3.61"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-EYo65CerGE14kQadNIaVyANvyBig/yW1PfulAAE6dxo="; + hash = "sha256-QBiZR8wjhMsLguzBaM21mADlR1hKHdBuK66DcSzyVtQ="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index cdac22ff13a1..218b74325469 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -35,12 +35,14 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-manualupdatecheck" "--disable-autoupdatecheck" + "--with-wx-prefix=${wxwidgets_3_2}" ]; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 + xdg-utils ]; buildInputs = [ @@ -55,13 +57,19 @@ stdenv.mkDerivation (finalAttrs: { pugixml sqlite tinyxml - wxwidgets_3_2 gtk3 - xdg-utils ]; + strictDeps = true; + enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=( + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" + ) + ''; + meta = { homepage = "https://filezilla-project.org/"; description = "Graphical FTP, FTPS and SFTP client"; diff --git a/pkgs/by-name/fl/flint/package.nix b/pkgs/by-name/fl/flint/package.nix index 2f26e91bd5a4..27d9b48f0940 100644 --- a/pkgs/by-name/fl/flint/package.nix +++ b/pkgs/by-name/fl/flint/package.nix @@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fast Library for Number Theory"; license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.smasher164 ]; + maintainers = [ + lib.maintainers.smasher164 + lib.maintainers.wegank + ]; teams = [ lib.teams.sage ]; platforms = lib.platforms.all; homepage = "https://www.flintlib.org/"; diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index 3ef6ce28353a..a0f51ed11bd2 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fselect"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = finalAttrs.version; - sha256 = "sha256-2YLWFUDwmurQAkoYB0KNjCEhwDNAUIAkgw6+lpU7DDA="; + sha256 = "sha256-eu2OAxdhDaKewMKL02rj8ED6tfB9OI3br7g0WoKOejk="; }; - cargoHash = "sha256-7dyMzlrlhU4yuEd9sNce2QoIB8dWjpcNr0mnIZxjC3U="; + cargoHash = "sha256-6XV8O3Ko4NKw5PaVbazrh6LQ0eQpbiPh/cB3Y9dkcb8="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch b/pkgs/by-name/gr/grantlee/grantlee-nix-profiles.patch similarity index 100% rename from pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch rename to pkgs/by-name/gr/grantlee/grantlee-nix-profiles.patch diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/by-name/gr/grantlee/grantlee-no-canonicalize-filepath.patch similarity index 100% rename from pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch rename to pkgs/by-name/gr/grantlee/grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/by-name/gr/grantlee/package.nix similarity index 89% rename from pkgs/development/libraries/grantlee/5/default.nix rename to pkgs/by-name/gr/grantlee/package.nix index b0818c670a05..a32612b986e7 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/by-name/gr/grantlee/package.nix @@ -1,13 +1,12 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - qtbase, - qtscript, + qt5, cmake, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "grantlee"; version = "5.3.1"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; @@ -20,10 +19,13 @@ mkDerivation rec { }; buildInputs = [ - qtbase - qtscript + qt5.qtbase + qt5.qtscript + ]; + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook ]; - nativeBuildInputs = [ cmake ]; patches = [ ./grantlee-nix-profiles.patch @@ -63,6 +65,6 @@ mkDerivation rec { homepage = "https://github.com/steveire/grantlee"; maintainers = [ lib.maintainers.ttuegel ]; license = lib.licenses.lgpl21; - inherit (qtbase.meta) platforms; + inherit (qt5.qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/by-name/gr/grantlee/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/grantlee/5/setup-hook.sh rename to pkgs/by-name/gr/grantlee/setup-hook.sh diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 41c00d5de92b..8a9a72457091 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "greenmask"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${finalAttrs.version}"; - hash = "sha256-SnljUU0GDtTlHKjbMeD7yZYh+IZM2zWuMk0wck0zJb0="; + hash = "sha256-QlNw2kCh5Rd8kwuA/BiNHXaw0p5qCfn4hzo9dgN45lU="; }; - vendorHash = "sha256-SB71/Tf9Bw8AlTYGXOaRR8sdiwx8l9wQba93p6vAbAk="; + vendorHash = "sha256-zVbSppCgLil0qS4WYhkzQZxbBx6L/0gbexY//I+GzwQ="; subPackages = [ "cmd/greenmask/" ]; diff --git a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix index 9b45a6d213b0..7ed0b5a4068e 100644 --- a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix +++ b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix @@ -8,16 +8,18 @@ fetchPnpmDeps, makeWrapper, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-assistant-matter-hub"; - version = "2.0.43"; + version = "2.0.45"; src = fetchFromGitHub { owner = "RiDDiX"; repo = "home-assistant-matter-hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dls5TglEIFvVGpg8ENTb6IhCwJermmREHuJnalF4kJ4="; + hash = "sha256-fEPcUq0OejfJXhzxfxXzQMIZ+L6nYEjoflA2GZdu3hg="; }; # The bundled cli.js imports transitive dependencies (e.g. @noble/curves) @@ -33,8 +35,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmInstallFlags pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; - hash = "sha256-1DaR4q1QH07UR+EchfDI92bTdRY4C2IaGIRj426DURI="; + hash = "sha256-n/LQhY6HWFlkslodO6ERuTcm5ux+vd+8CwzX19oC7c8="; }; __structuredAttrs = true; @@ -47,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm_10 + pnpm pnpmConfigHook makeWrapper ]; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index f1f4fa6d7ed6..e3fb27c5845d 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.161.1"; + version = "0.162.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-TmsXtsH3NgxrAvYzyMKGK+DZRAPjvo/Uy3zXw0lWss8="; + hash = "sha256-n3BL09Aqq/sL2d0idzxKhRv/chEComNbIp/e4euqKL4="; }; - vendorHash = "sha256-pgyJMdiifwqft29wG36TAYY1LlW4P21LIWKfepeDmYg="; + vendorHash = "sha256-Wm2CMGhpVSL9K5pMdkQwH4HwI2uV9f7gq9wr/NHNLOI="; checkFlags = let diff --git a/pkgs/by-name/in/inconsolata-lgc/package.nix b/pkgs/by-name/in/inconsolata-lgc/package.nix index 0cb86795a25d..8888a4e91e03 100644 --- a/pkgs/by-name/in/inconsolata-lgc/package.nix +++ b/pkgs/by-name/in/inconsolata-lgc/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/MihailJP/Inconsolata-LGC"; maintainers = with lib.maintainers; [ avnik - rht ]; }; } diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix index 449db34605ee..9f824a4779a5 100644 --- a/pkgs/by-name/ku/kubefwd/package.nix +++ b/pkgs/by-name/ku/kubefwd/package.nix @@ -29,7 +29,10 @@ buildGoModule (finalAttrs: { description = "Bulk port forwarding Kubernetes services for local development"; homepage = "https://kubefwd.com"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cjimti ]; + maintainers = with lib.maintainers; [ + cjimti + iogamaster + ]; mainProgram = "kubefwd"; }; }) diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index e4410ae667b8..b789c8b1a8c2 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -9,18 +9,18 @@ }: buildGoModule (finalAttrs: { pname = "kubescape"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; tag = "v${finalAttrs.version}"; - hash = "sha256-QWPMWUT8Hv6240yEtcaoLXmgtySHNOZpzBw2soHCW8A="; + hash = "sha256-BkBRRrYs551bGnT00EvVSzaNQM8GfcltEl8xLb/AKd8="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-tObBMdIjW8JUEv7tKdmhXZuB+kQryP+B856MXtsKp5U="; + vendorHash = "sha256-GQTk12dHSNLWdLcb0VedK1Ex1uJOZtL3+XOnh527p/8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/la/lauti/frontend.nix b/pkgs/by-name/la/lauti/frontend.nix index 96ce091dc19d..fed4f33c5632 100644 --- a/pkgs/by-name/la/lauti/frontend.nix +++ b/pkgs/by-name/la/lauti/frontend.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-8+bAqWg6sqWQcjEdhS/tDZ1farY6VQ++lvbAfpwOeRE="; + hash = "sha256-RKalgQ6dXNOxMeC6pSKe9Lo0KXN0gfeX0I/pkcv2FXs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lauti/package.nix b/pkgs/by-name/la/lauti/package.nix index bc25d3f0f0c8..ce9193d23564 100644 --- a/pkgs/by-name/la/lauti/package.nix +++ b/pkgs/by-name/la/lauti/package.nix @@ -7,12 +7,12 @@ }: let - version = "1.1.0"; + version = "1.2.0"; src = fetchFromCodeberg { owner = "Klasse-Methode"; repo = "lauti"; tag = "v${version}"; - hash = "sha256-eYIKVQG+Vj2qld/xKbxx0JpNqKhnGSjIOXXc7400BYo="; + hash = "sha256-llmXXaCy6V4DE0B1a0K0rRCb6XSvC1+EaG9legx0u4I="; }; frontend = callPackage ./frontend.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { pname = "lauti"; inherit version src; - vendorHash = "sha256-4LQ3PvwWAg+/KBQHroj2ZVQZst7jPq99XwLTHClDPCU="; + vendorHash = "sha256-XO2Fo4rH6YDlj8x9f0847OEBLLpLlzFpK72uOEgW65o="; ldflags = [ "-s" diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix index a7c2b7901ec1..f5b46f1d68b3 100644 --- a/pkgs/by-name/li/libglycin-gtk4/package.nix +++ b/pkgs/by-name/li/libglycin-gtk4/package.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ build-aux/crates-version.py + substituteInPlace libglycin/meson.build --replace-fail \ + "cargo_output = cargo_target_dir / rust_target" \ + "cargo_output = cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target" ''; postFixup = '' @@ -86,6 +89,10 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + + strictDeps = true; + meta = { description = "C-Bindings to convert glycin frames to GDK Textures"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index b2eeab914a7f..9ee9bb5df921 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -94,6 +94,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ build-aux/crates-version.py + substituteInPlace libglycin/meson.build --replace-fail \ + "cargo_output = cargo_target_dir / rust_target" \ + "cargo_output = cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target" ''; postFixup = '' @@ -101,6 +104,10 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + + strictDeps = true; + passthru = { updateScript = let diff --git a/pkgs/by-name/li/libmsgraph/package.nix b/pkgs/by-name/li/libmsgraph/package.nix index ee212f31c957..52e4b01fc4bb 100644 --- a/pkgs/by-name/li/libmsgraph/package.nix +++ b/pkgs/by-name/li/libmsgraph/package.nix @@ -7,7 +7,7 @@ meson, ninja, pkg-config, - uhttpmock_1_0, + uhttpmock, libxml2, glib, gnome-online-accounts, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - uhttpmock_1_0 + uhttpmock libxml2 ]; diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix index 1c64f5602cf3..b92aaa6a742f 100644 --- a/pkgs/by-name/lu/luastatus/package.nix +++ b/pkgs/by-name/lu/luastatus/package.nix @@ -16,7 +16,6 @@ libxau, libxdmcp, pcre2, - pcre, util-linux, libselinux, libsepol, @@ -61,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { glib udev pcre2 - pcre util-linux lua5 docutils diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix index b9ecc5730be3..63bf47b0d4d6 100644 --- a/pkgs/by-name/ma/manix/package.nix +++ b/pkgs/by-name/ma/manix/package.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ lecoqjacob + iogamaster ]; mainProgram = "manix"; }; diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 6bd63425dcad..32d614997e6c 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.49.7"; + version = "1.49.8"; selectSystem = attrs: @@ -67,9 +67,9 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-qd05VAGDDmB/CMea+/NSPpmdHnTNms1LttwaA1bhgaU="; - x86_64-darwin = "sha256-9gIqtPE1qAKHSGE49FxrpbvYGchJNBqPMiq/0hUNkjE="; - aarch64-darwin = "sha256-zlbXep67u9F+BSynYp4+czDbkW7/VCPV/JafghLf3Xs="; + x86_64-linux = "sha256-5SmMFzQploo1EkXYmLDL4XdM+vKlIWkaIh1fFrIgrqY="; + x86_64-darwin = "sha256-2GgyiH7Bhm1MbjmgMvo8CuLQEsVCZkALiy1mtH/Zl1Q="; + aarch64-darwin = "sha256-a1nWzTR1dZhm/rVURl0kK2qTyHEnAZeQKiYKzRO6MqY="; }; }; diff --git a/pkgs/by-name/mo/moolticute/package.nix b/pkgs/by-name/mo/moolticute/package.nix index dbcfa3829f0a..6f355da890e7 100644 --- a/pkgs/by-name/mo/moolticute/package.nix +++ b/pkgs/by-name/mo/moolticute/package.nix @@ -54,10 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/mooltipass/moolticute"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - kirikaza - hughobrien - ]; + maintainers = with lib.maintainers; [ hughobrien ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index f56610f03041..d6e132537610 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -56,6 +56,7 @@ gnome-settings-daemon, xorg-server, python3, + python3Packages, wayland-scanner, wrapGAppsHook4, gi-docgen, @@ -117,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 - python3.pkgs.argcomplete # for register-python-argcomplete + python3Packages.argcomplete # for register-python-argcomplete wayland-scanner wrapGAppsHook4 gi-docgen diff --git a/pkgs/by-name/n6/n64recomp/package.nix b/pkgs/by-name/n6/n64recomp/package.nix index 73f99962aa96..f8f8a39cbf1c 100644 --- a/pkgs/by-name/n6/n64recomp/package.nix +++ b/pkgs/by-name/n6/n64recomp/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "n64recomp"; - version = "0-unstable-2026-05-17"; + version = "0-unstable-2026-05-27"; src = fetchFromGitHub { owner = "N64Recomp"; repo = "N64Recomp"; - rev = "70a894aad8d3491ca0fccee1f94dae8190845686"; - hash = "sha256-4y1Cb2lmVZi+IoIBY9AZuWa+XPoBejdd1rL/uTjM07E="; + rev = "ffb39cdad1da5de07eaaa48bd1db4a89a7986771"; + hash = "sha256-/MmRvLWxh/uaFXp0eiNdrnMKrrYQvjxmw/+/o5lXyFU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 414f6ffd1322..c97bcf8f9141 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -48,13 +48,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "2.0.11"; + version = "2.0.14"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-XZPyzIiqf2UG1gE6uHiYSVPCP6G/lrKK+Y3vRgkPk20="; + hash = "sha256-dSFwU1p2lAI8CaNoQgdX/pkumIumZpdLgnn1XCkoeKU="; }; proxyVendor = true; @@ -94,7 +94,7 @@ buildGoModule (finalAttrs: { GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs ''; - vendorHash = "sha256-x347CkS4nw8hFUhmuewvrqNDE2a2lT3KmIQ1hc98NJE="; + vendorHash = "sha256-y7XvvpLrmoaU1gLtaN38T9rsS3Rpi313XAKaVcia6Q4="; ldflags = [ "-s" diff --git a/pkgs/by-name/ng/nginx-config-formatter/package.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix index bc33bd6c786c..f1db50e0e47f 100644 --- a/pkgs/by-name/ng/nginx-config-formatter/package.nix +++ b/pkgs/by-name/ng/nginx-config-formatter/package.nix @@ -12,12 +12,16 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "slomkowski"; repo = "nginx-config-formatter"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-HB1knL/q1G2z6RyVCsOyIKpp4O6x68/93ccvox1FKGQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-HB1knL/q1G2z6RyVCsOyIKpp4O6x68/93ccvox1FKGQ="; }; buildInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; + + strictDeps = true; + doCheck = true; checkPhase = '' python3 $src/test_nginxfmt.py @@ -28,6 +32,13 @@ stdenv.mkDerivation (finalAttrs: { install -m 0755 $src/nginxfmt.py $out/bin/nginxfmt ''; + doInstallCheck = true; + # We can't do a version check because there is no version command + # but we do want to check that python3 is available + installCheckPhase = '' + $out/bin/nginxfmt --help + ''; + meta = { description = "Nginx config file formatter"; maintainers = with lib.maintainers; [ Baughn ]; diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix index 7bda93b3c434..8b4aa462b4e9 100644 --- a/pkgs/by-name/nt/ntfs3g/package.nix +++ b/pkgs/by-name/nt/ntfs3g/package.nix @@ -8,14 +8,13 @@ mount, libuuid, kmod, - macfuse-stubs, crypto ? false, libgcrypt, + macfuse-stubs, gnutls, - fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntfs3g"; version = "2026.2.25"; @@ -29,19 +28,19 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tuxera"; repo = "ntfs-3g"; - rev = version; - sha256 = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c="; + tag = finalAttrs.version; + hash = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c="; }; buildInputs = [ gettext libuuid - fuse ] ++ lib.optionals crypto [ gnutls libgcrypt - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ macfuse-stubs ]; # Note: libgcrypt is listed here non-optionally because its m4 macros are # being used in ntfs-3g's configure.ac. @@ -65,12 +64,17 @@ stdenv.mkDerivation rec { "--enable-xattr-mappings" "--${if crypto then "enable" else "disable"}-crypto" "--enable-extras" - "--with-mount-helper=${mount}/bin/mount" - "--with-umount-helper=${mount}/bin/umount" - "--with-fuse=external" + "--with-mount-helper=${lib.getExe' mount "mount"}" + "--with-umount-helper=${lib.getExe' mount "umount"}" + + # Use bundled FUSE as fuse2 is being deprecated + # https://github.com/tuxera/ntfs-3g/issues/54#issuecomment-3058178016 + # Darwin doesn't support internal FUSE, so we use the external macFUSE stubs instead. + # https://github.com/tuxera/ntfs-3g/issues/8#issuecomment-920700418 + "--with-fuse=${if stdenv.hostPlatform.isLinux then "internal" else "external"}" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "--with-modprobe-helper=${kmod}/bin/modprobe" + "--with-modprobe-helper=${lib.getExe' kmod "modprobe"}" ]; postInstall = '' @@ -83,7 +87,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/tuxera/ntfs-3g"; description = "FUSE-based NTFS driver with full write support"; - maintainers = [ ]; + maintainers = [ lib.maintainers.ryand56 ]; mainProgram = "ntfs-3g"; platforms = with lib.platforms; darwin ++ linux; license = with lib.licenses; [ @@ -91,4 +95,4 @@ stdenv.mkDerivation rec { lgpl2Plus # fuse-lite ]; }; -} +}) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 62d536461c80..304c0212f67b 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -18,6 +18,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; version = "1.15.12"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; @@ -134,7 +137,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { sysctl ] ) - } + } \ + --set OPENCODE_DISABLE_AUTOUPDATE true install -Dm644 config.json $out/share/opencode/config.json install -Dm644 tui.json $out/share/opencode/tui.json diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index 7aa3f87e9f7d..ede4beff9bcd 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.41"; + version = "0.1.42"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-SY97Mpzd+tuhNnRdUNk7/J8aZZRSmdvbkRj3OjyMqms="; + hash = "sha256-X0UsaToKHWAZzDA/xBoBqtpFSlFdso3tMwci3SD80/I="; }; - cargoHash = "sha256-8edaOyZ3i7aSpg+6GOCSoQduFMlsuNnjAqa70RQu2Xw="; + cargoHash = "sha256-6iWmNqlUoRLi9HxsX7Vhpu+KIsNrakzG97/Orwt3LOU="; # Hardcoded paths for C compiler and linker postPatch = '' diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix index c0f01addce5e..6618d990f540 100644 --- a/pkgs/by-name/pl/plantuml-server/package.nix +++ b/pkgs/by-name/pl/plantuml-server/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "plantuml-server"; - version = "1.2026.3"; + version = "1.2026.5"; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${finalAttrs.version}/plantuml-v${finalAttrs.version}.war"; - hash = "sha256-zn5Xkysncam27MlHkLp5ncf2jx9zfKj/ZgmW2JOO2dc="; + hash = "sha256-Ub6Ao+m1hC+tEerkVnMXN2CMRf8CKg9XcB9E8JsunvY="; }; dontUnpack = true; diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index f1cfa51d6133..c13cfc0afe79 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -8,17 +8,24 @@ jq, keyutils, libgcc, + makeBinaryWrapper, versionCheckHook, writeShellScript, }: stdenv.mkDerivation (finalAttrs: { pname = "proton-pass-cli"; - version = "2.1.0"; + version = "2.1.2"; + + __structuredAttrs = true; + strictDeps = true; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + nativeBuildInputs = [ + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -37,6 +44,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + postFixup = '' + wrapProgram $out/bin/pass-cli --set PROTON_PASS_NO_UPDATE_CHECK 1 + ''; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook @@ -46,19 +57,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64"; - hash = "sha256-5FQSl6Xqipm6MWq2kza2FVXSajX4xCB4gqaAed40NoI="; + hash = "sha256-KuW98gL2fkt/eIbdukTSZyQvzTXMuGGmGs+GAjXeIlA="; }; "aarch64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; - hash = "sha256-4UgcR9yV/iQaQoQUFDRa+yzSCFIIk/SaPCOJdTgpMQI="; + hash = "sha256-BWJiWBL5QL1Ler1mSzu8/v3q950vmxLy0Kc74f/FUf8="; }; "x86_64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-iT53cCskSY8+AvLXWQGcqFklQJJBO1d7AFMEIYEDllo="; + hash = "sha256-XZAtgly95dAANK4G4VKUKeOJ3ssIkdhgT9RrD7DGdQA="; }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; - hash = "sha256-WnddX4Ov+9jBvL8VF8ONGhV8FgEz5xNrANUxG6/oupM="; + hash = "sha256-UpHt0h2F0iJTi5E0E0WuOwoUeeJU1Ckgwru9NAEsYkM="; }; }; updateScript = writeShellScript "update-proton-pass-cli" '' diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index fa7e6302ef07..d4916b436fdc 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rasm"; - version = "3.0.9"; + version = "3.2.4bis"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; tag = "v${finalAttrs.version}"; - hash = "sha256-QlFdp/Cju28yOoqoQzM1JiZqRcxKjX7RgJPyz0VJYJ0="; + hash = "sha256-D9V9CqCCy0EYRIX0nr+kwxPH7W2KIIq67jabP7ZzETE="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index 22c6dc8bfba5..26cf244add10 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -15,16 +15,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "samrewritten"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "PaulCombal"; repo = "SamRewritten"; tag = "v${finalAttrs.version}"; - hash = "sha256-5SXek64kccyUs+vSyA8QCX+UpRSm0aDEZwULYZgmIUw="; + hash = "sha256-y8ByD/dGjc+QJCbhy519fBHDXRh+m4sIC7ew17sj03g="; }; - cargoHash = "sha256-sL6kIkYWnD7QKw/RGMDS9ZZK/LcKtYjFr5pQ6758IuQ="; + cargoHash = "sha256-anV5tiXgX9DviKe8ZlnbBrQw5vCnpgQ1xKUki8/f+20="; # Tests require network access and a running Steam client. Skipping. doCheck = false; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 79e01553cf1c..2b6a404a8663 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -20,18 +20,19 @@ let television = rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.15.6"; + version = "0.15.7"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-0oWgVfybsSLHDeAqTQP2ijJ/84XdcdqD0eqxIv6jk9o="; + hash = "sha256-VfCD3qXgueXqJbImOQbnY5JtAFVmzazBQ5Tgh4YIw4s="; }; - cargoHash = "sha256-GoFDGNZYVD3/qGKs1LpkhMLDApAqQUds64+ibWy6juQ="; + cargoHash = "sha256-tChehWQhCwmM3JPfJrtE3J5zQ1gPSqlQJn85DPqHKTI="; - strictDeps = true; nativeBuildInputs = [ installShellFiles writableTmpDirAsHomeHook diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index cebd3311ac44..8830f9d8ca01 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -222,5 +222,6 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.hostPlatform.isDarwin; # Prevent a store collision. priority = 4; + mainProgram = "vncviewer"; }; }) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/by-name/ti/tinc/package.nix similarity index 82% rename from pkgs/tools/networking/tinc/default.nix rename to pkgs/by-name/ti/tinc/package.nix index 85722207bea4..90a633dd49a4 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/by-name/ti/tinc/package.nix @@ -7,13 +7,13 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0.36"; pname = "tinc"; src = fetchurl { - url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0"; + url = "https://www.tinc-vpn.org/packages/tinc-${finalAttrs.version}.tar.gz"; + hash = "sha256-QPc7s/rMSA7/4OdxRCpwb/BIjt6npfJQXUzLKqgWMQg="; }; buildInputs = [ @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { mainProgram = "tincd"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/by-name/ti/tinc_pre/package.nix similarity index 80% rename from pkgs/tools/networking/tinc/pre.nix rename to pkgs/by-name/ti/tinc_pre/package.nix index 254021b801a2..093076844a38 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/by-name/ti/tinc_pre/package.nix @@ -12,14 +12,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinc"; version = "1.1pre18"; src = fetchFromGitHub { owner = "gsliepen"; repo = "tinc"; - rev = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-1anjTUlVLx57FlUqGwBd590lfkZ2MmrM1qRcMl4P7Sg="; }; @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { # needed so the build doesn't need to run git to find out the version. prePatch = '' - substituteInPlace configure.ac --replace UNKNOWN ${version} - echo "${version}" > configure-version - echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${version}" > ChangeLog - sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac + substituteInPlace configure.ac --replace UNKNOWN ${finalAttrs.version} + echo "${finalAttrs.version}" > configure-version + echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${finalAttrs.version}" > ChangeLog + sed -i '/AC_INIT/s/m4_esyscmd_s.*/${finalAttrs.version})/' configure.ac ''; configureFlags = [ @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { mic92 ]; }; -} +}) diff --git a/pkgs/by-name/uh/uhttpmock/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix index d52050bb6cdc..8e75049d775c 100644 --- a/pkgs/by-name/uh/uhttpmock/package.nix +++ b/pkgs/by-name/uh/uhttpmock/package.nix @@ -11,12 +11,12 @@ gtk-doc, docbook-xsl-nons, glib, - libsoup_2_4, + libsoup_3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uhttpmock"; - version = "0.5.5"; + version = "0.11.0"; outputs = [ "out" @@ -28,11 +28,12 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "pwithnall"; repo = "uhttpmock"; - rev = version; - sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; + rev = finalAttrs.version; + hash = "sha256-itJhiPpAF5dwLrVF2vuNznABqTwEjVj6W8mbv1aEmE4="; }; strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -46,16 +47,16 @@ stdenv.mkDerivation rec { mesonEmulatorHook ]; - buildInputs = [ + propagatedBuildInputs = [ glib - libsoup_2_4 + libsoup_3 ]; meta = { description = "Project for mocking web service APIs which use HTTP or HTTPS"; homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; license = lib.licenses.lgpl21Plus; - maintainers = [ ]; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock_1_0/package.nix deleted file mode 100644 index 8e75049d775c..000000000000 --- a/pkgs/by-name/uh/uhttpmock_1_0/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - mesonEmulatorHook, - ninja, - pkg-config, - gobject-introspection, - vala, - gtk-doc, - docbook-xsl-nons, - glib, - libsoup_3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "uhttpmock"; - version = "0.11.0"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pwithnall"; - repo = "uhttpmock"; - rev = finalAttrs.version; - hash = "sha256-itJhiPpAF5dwLrVF2vuNznABqTwEjVj6W8mbv1aEmE4="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - propagatedBuildInputs = [ - glib - libsoup_3 - ]; - - meta = { - description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; - license = lib.licenses.lgpl21Plus; - teams = [ lib.teams.gnome ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix index 1e8beb5fef6d..2f7a23143f85 100644 --- a/pkgs/by-name/ve/vectorscan/package.nix +++ b/pkgs/by-name/ve/vectorscan/package.nix @@ -9,7 +9,6 @@ python3, boost, sqlite, - pcre, enableShared ? !stdenv.hostPlatform.isStatic, }: @@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost sqlite - pcre ]; # FAT_RUNTIME bundles optimized implementations for different CPU extensions and uses CPUID to diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index 976b33b25689..493aacf57bda 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "wakatime-cli"; - version = "2.14.5"; + version = "2.14.12"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-C5d0E4+NSZsy+GiolLEGBjRJBHlc/XKNCNZNFz46qVQ="; + hash = "sha256-bfDaIJweh8RMXey0AypHEsZZO9eqToKjbLQR9//J0yc="; }; - vendorHash = "sha256-OfnXj6X2JIN/lLCvB8LLYeqNj1aW3GuA1hCiw+219QQ="; + vendorHash = "sha256-xrIvtUfOFOgcKJ+2VgUgOzF2Cwp3NPBf39yXgAHN/cQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/wa/wappalyzergo/package.nix b/pkgs/by-name/wa/wappalyzergo/package.nix index 5b7c55ece1c8..aca1cf3ff4e4 100644 --- a/pkgs/by-name/wa/wappalyzergo/package.nix +++ b/pkgs/by-name/wa/wappalyzergo/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "wappalyzergo"; - version = "0.2.80"; + version = "0.2.82"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "wappalyzergo"; tag = "v${finalAttrs.version}"; - hash = "sha256-m293HQoZRpKoKPlddQntjLJ4/6hCS7P0V4+A9bAulAU="; + hash = "sha256-2gnlyYQup9CneyTZTbt7gCO/XXiQfDVcMgFyY1yW7fk="; }; - vendorHash = "sha256-kcg5XaI06UOkOTo803aTJCAt8lUE9QW9jSTbOflTTEo="; + vendorHash = "sha256-9MUhivdlbxAhcdbLALdt6vhxvMLzm+WincF3iG9pR1A="; ldflags = [ "-s" ]; diff --git a/pkgs/by-name/wi/wireless-regdb/package.nix b/pkgs/by-name/wi/wireless-regdb/package.nix index 84c66f27810c..d1a453329f16 100644 --- a/pkgs/by-name/wi/wireless-regdb/package.nix +++ b/pkgs/by-name/wi/wireless-regdb/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2026.02.04"; + version = "2026.05.30"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-${version}.tar.xz"; - hash = "sha256-D/SKXNnpz+joFaJOAjc0kZ6aO3rS8DkkOtEhz1qr9sY="; + hash = "sha256-iie/wIG6/tjCTdcPqw2W8JjloL/NCNPaZyWV8iWriZM="; }; dontBuild = true; diff --git a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix index 674dcc547a1b..49c5d473eceb 100644 --- a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix +++ b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "woodpecker-pipeline-transform"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromCodeberg { owner = "lafriks"; repo = "woodpecker-pipeline-transform"; rev = "v${finalAttrs.version}"; - hash = "sha256-5bdNtVjk7TBoS0Z026th674ZXCRRc3DbtVOLl+acKhQ="; + hash = "sha256-UXQ+b3SI+MO0T993hslQaRVMdHdPt9RnjyhfmLtooAU="; }; - vendorHash = "sha256-4JRSrkxH8/NlSwUk6KagC5+mx+UXSLvo1thSRciAewc="; + vendorHash = "sha256-NE4KUbYA19YJPQW9quSYgm0exj3lToj9Zkiv05TgyOI="; meta = { description = "Utility to convert different pipelines to Woodpecker CI pipelines"; diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix index 4343f0acf839..d04f54d121cc 100644 --- a/pkgs/by-name/xa/xandikos/package.nix +++ b/pkgs/by-name/xa/xandikos/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; tag = "v${version}"; - hash = "sha256-udKhJUsWFcyapEzYJOoujpq/VioFLGCCKq5WAlXsHnU="; + hash = "sha256-lVxbqgxBhHJHxG3QozX9xvCZAOPSa85ATSE88i3zayA="; }; build-system = with python3Packages; [ @@ -24,12 +24,12 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ aiohttp aiohttp-openmetrics + aiosmtpd dulwich defusedxml icalendar jinja2 multidict - pytz vobject ]; diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix index b7005cb3a63d..9b3884c3d47e 100644 --- a/pkgs/by-name/xo/xournalpp/package.nix +++ b/pkgs/by-name/xo/xournalpp/package.nix @@ -11,7 +11,6 @@ adwaita-icon-theme, alsa-lib, - binutils, glib, gsettings-desktop-schemas, gtk3, @@ -20,7 +19,6 @@ libsndfile, libxml2, libzip, - pcre, poppler, portaudio, qpdf, @@ -59,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libxml2 libzip - pcre poppler portaudio qpdf diff --git a/pkgs/by-name/zc/zcash/package.nix b/pkgs/by-name/zc/zcash/package.nix index 2fb2eed14c55..f62290dfe9c0 100644 --- a/pkgs/by-name/zc/zcash/package.nix +++ b/pkgs/by-name/zc/zcash/package.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Peer-to-peer, anonymous electronic cash system"; homepage = "https://z.cash/"; maintainers = with lib.maintainers; [ - rht tkerber centromere ]; diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix index a2eb9719205e..1339d09f18f6 100644 --- a/pkgs/by-name/zo/zoneminder/package.nix +++ b/pkgs/by-name/zo/zoneminder/package.nix @@ -15,7 +15,7 @@ mp4v2, libmysqlclient, mariadb, - pcre, + pcre2, perl, perlPackages, polkit, @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { mp4v2 libmysqlclient mariadb - pcre + pcre2 perl polkit x264 diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix deleted file mode 100644 index 2704d3a718f5..000000000000 --- a/pkgs/development/libraries/grantlee/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - qtbase, - cmake, - wrapQtAppsHook, -}: - -stdenv.mkDerivation rec { - pname = "grantlee"; - version = "5.3.1"; - - src = fetchFromGitHub { - owner = "steveire"; - repo = "grantlee"; - rev = "v${version}"; - hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY="; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - buildInputs = [ qtbase ]; - - meta = { - description = "Libraries for text templating with Qt"; - longDescription = '' - Grantlee is a set of Free Software libraries written using the Qt framework. Currently two libraries are shipped with Grantlee: Grantlee Templates and Grantlee TextDocument. - The goal of Grantlee Templates is to make it easier for application developers to separate the structure of documents from the data they contain, opening the door for theming and advanced generation of other text such as code. - The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee. - ''; - - homepage = "https://github.com/steveire/grantlee"; - license = lib.licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index be5857afbb37..6bc82851f106 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioharmony"; - version = "1.0.3"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "Harmony-Libs"; repo = "aioharmony"; tag = "v${version}"; - hash = "sha256-163L2ilmfMRL6qsD4RgWEX3kdKK6rnvjw9c78vKBtuE="; + hash = "sha256-7K/I71yonmAqLp12Hk8e72BBfF/sez1cFdQbnixDdbg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 8a59fd24fbec..362c3c016b96 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -7,21 +7,24 @@ pytest-aiohttp, pytest-mock, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolookin"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ANMalko"; repo = "aiolookin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; doCheck = false; # all tests are async and no async plugin is configured @@ -37,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Python client for interacting with LOOKin devices"; homepage = "https://github.com/ANMalko/aiolookin"; - changelog = "https://github.com/ANMalko/aiolookin/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ANMalko/aiolookin/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix index 15e2b8707774..f5103948c5e5 100644 --- a/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -3,23 +3,26 @@ buildPythonPackage, fetchFromGitHub, numpy, + setuptools, sqlitedict, websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiopylgtv"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bendavid"; repo = "aiopylgtv"; - rev = version; + tag = finalAttrs.version; hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy sqlitedict websockets @@ -36,4 +39,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 46bed2e857c5..369149444880 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2026-03-03"; + version = "0.1a-unstable-2026-05-23"; pyproject = true; # from `pdm show` realVersion = @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "99d0837fd44ddaeacd9d81db6a6c5087b41ea998"; - hash = "sha256-eQqsshIyu70XkYqTREGQ/HnOOIMJSG6STHSLJTNUcfs="; + rev = "3e3d8b7241c1c7e80e0cd12937d288d0ad4a6cba"; + hash = "sha256-GuunBRGQpMSJWWU6ukr9FYTpPDIxsTyLz7j9iQgN900="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index ea9cd651a335..3678bca77297 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -23,12 +23,12 @@ buildPythonPackage (finalAttrs: { pname = "apprise"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-t2jzLZnkXtX0w+7x9nkD6APJf5e6YaUxpdCkXUDfkKg="; + hash = "sha256-Ox5vU2WzAtH64nDAyAB5WOVCJLm3gIrOxpAG6if1uKI="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 4715b96c9d06..b2d758528cc1 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -2,29 +2,34 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "btrfs"; version = "15"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FBmRT/FB3+nhb9BHfZVI1L6nM+zXdYjoy3JVzhetoQs="; }; - # no tests (in v12) + build-system = [ setuptools ]; + + # currently no tests doCheck = false; + pythonImportsCheck = [ "btrfs" ]; meta = { description = "Inspect btrfs filesystems"; homepage = "https://github.com/knorrie/python-btrfs"; + changelog = "https://github.com/knorrie/python-btrfs/blob/v${finalAttrs.version}/CHANGES"; license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ Luflosi ]; }; -} +}) diff --git a/pkgs/development/python-modules/caldav/2.nix b/pkgs/development/python-modules/caldav/2.nix new file mode 100644 index 000000000000..f96cff3b0806 --- /dev/null +++ b/pkgs/development/python-modules/caldav/2.nix @@ -0,0 +1,85 @@ +{ + buildPythonPackage, + dnspython, + fetchFromGitHub, + hatch-vcs, + hatchling, + icalendar, + icalendar-searcher, + lib, + lxml, + manuel, + niquests, + proxy-py, + pyfakefs, + pytest-asyncio, + pytestCheckHook, + python, + python-dateutil, + pyyaml, + radicale, + recurring-ical-events, + toPythonModule, + tzlocal, + vobject, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "caldav"; + version = "2.2.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-caldav"; + repo = "caldav"; + tag = "v${version}"; + hash = "sha256-xtxWDlYESIwkow/YdjaUAkJ/x2jdUyhqfSRycJVLncY="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + dnspython + lxml + niquests + icalendar + icalendar-searcher + recurring-ical-events + python-dateutil + pyyaml + ]; + + pythonImportsCheck = [ "caldav" ]; + + nativeCheckInputs = [ + manuel + proxy-py + pyfakefs + pytestCheckHook + (toPythonModule (radicale.override { python3 = python; })) + tzlocal + vobject + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # test contacts CalDAV servers on the internet + "test_rfc8764_test_conf" + # succeeds with Xandikos but fails with Radicale + "testConfigfile" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + changelog = "https://github.com/python-caldav/caldav/blob/${src.tag}/CHANGELOG.md"; + description = "CalDAV (RFC4791) client library"; + homepage = "https://github.com/python-caldav/caldav"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 2ad6b596042d..057a14eb3a5f 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -16,6 +16,7 @@ hatch-vcs, proxy-py, pyfakefs, + pytest-asyncio, python-dateutil, pyyaml, toPythonModule, @@ -27,14 +28,14 @@ buildPythonPackage rec { pname = "caldav"; - version = "2.2.6"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "caldav"; tag = "v${version}"; - hash = "sha256-xtxWDlYESIwkow/YdjaUAkJ/x2jdUyhqfSRycJVLncY="; + hash = "sha256-SCqc0MVxKaHpES+NkDcaItHlkk0kCFj6kFqH8k08vdA="; }; build-system = [ @@ -57,6 +58,7 @@ buildPythonPackage rec { manuel proxy-py pyfakefs + pytest-asyncio pytestCheckHook (toPythonModule (radicale.override { python3 = python; })) tzlocal @@ -65,11 +67,6 @@ buildPythonPackage rec { (toPythonModule (xandikos.override { python3Packages = python.pkgs; })) ]; - disabledTests = [ - # test contacts CalDAV servers on the internet - "test_rfc8764_test_conf" - ]; - __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "caldav" ]; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 9c2b224a4289..07662468c005 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "4.3.1"; + version = "5.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-seHGvuuNmPY7/gocuodPxOIuAAvMSQVE+VbGibO1slg="; + hash = "sha256-3PXLS1T1Q7AApoCVKXvMFqnGGLmMCXR9e3jlnj2GUpI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/coinbase-advanced-py/default.nix b/pkgs/development/python-modules/coinbase-advanced-py/default.nix index 3d46ac84cff9..e8f6450de417 100644 --- a/pkgs/development/python-modules/coinbase-advanced-py/default.nix +++ b/pkgs/development/python-modules/coinbase-advanced-py/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coinbase-advanced-py"; - version = "1.8.2"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "coinbase"; repo = "coinbase-advanced-py"; tag = "v${version}"; - hash = "sha256-1XJ4QnFJVSbSCfkB16+UTARXqhlsy36Db3S6ju6nJUY="; + hash = "sha256-iGSe0OSCrmglaVzzJOIWwoz9DXLIE82EqK9R2QiTEUw="; }; build-system = [ diff --git a/pkgs/development/python-modules/fabric/default.nix b/pkgs/development/python-modules/fabric/default.nix index ada40a9ba905..b2f7013432be 100644 --- a/pkgs/development/python-modules/fabric/default.nix +++ b/pkgs/development/python-modules/fabric/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fabric"; - version = "3.2.2"; + version = "3.2.3"; pyproject = true; src = fetchFromGitHub { owner = "fabric"; repo = "fabric"; tag = version; - hash = "sha256-7qC2UuI0RP5xlKIYSz1sLyK/nQYegXOou1mlJYFk7M0="; + hash = "sha256-GbZQ6rFKQyJZXYfe9b4j6yjKgAB0ct8AD1xYG0yGZl8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix index 1b1e8a24835f..8d85fd7f72d4 100644 --- a/pkgs/development/python-modules/groq/default.nix +++ b/pkgs/development/python-modules/groq/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "groq"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; tag = "v${version}"; - hash = "sha256-Y+cF4yKDZ+brXLgPqBmh2RgvU52dB2ujTnZPXsMVShw="; + hash = "sha256-U6548+2dpRV2e0cnFCoGmvXiQgp7LuMUhMKZKoHJlzo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/icalendar-compatibility/default.nix b/pkgs/development/python-modules/icalendar-compatibility/default.nix index b5969bcca32b..0bd535a1d91f 100644 --- a/pkgs/development/python-modules/icalendar-compatibility/default.nix +++ b/pkgs/development/python-modules/icalendar-compatibility/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { git ]; + disabledTests = [ + # https://github.com/niccokunzmann/icalendar_compatibility/issues/5 + "test_geo_location_is_also_escaped" + ]; + pythonImportsCheck = [ "icalendar_compatibility" ]; # env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index c6523be27e13..418342da74c9 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -9,25 +9,18 @@ tzdata, hypothesis, pytestCheckHook, - sphinxHook, - sphinx-copybutton, - pydata-sphinx-theme, }: buildPythonPackage rec { - version = "6.3.2"; + version = "7.1.2"; pname = "icalendar"; pyproject = true; - outputs = [ - "out" - "doc" - ]; src = fetchFromGitHub { owner = "collective"; repo = "icalendar"; tag = "v${version}"; - hash = "sha256-EnG6zPaKKTgLw2DxWOyBkxlFuqtURpBlxy1aoZjX/TQ="; + hash = "sha256-y6t27/l2jnNr6/VlGuXlE2BcNDPOd0wscyCMpRY4+MM="; }; patches = [ @@ -46,12 +39,6 @@ buildPythonPackage rec { tzdata ]; - nativeBuildInputs = [ - sphinxHook - sphinx-copybutton - pydata-sphinx-theme - ]; - nativeCheckInputs = [ hypothesis pytestCheckHook @@ -61,8 +48,6 @@ buildPythonPackage rec { # AssertionError: assert {'Atlantic/Jan_Mayen'} == {'Arctic/Longyearbyen'} "test_dateutil_timezone_is_matched_with_tzname" "test_docstring_of_python_file" - # AssertionError: assert $TZ not in set() - "test_add_missing_timezones_to_example" ]; enabledTestPaths = [ "src/icalendar" ]; diff --git a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch index 4754b6441a5f..0703c6126cbc 100644 --- a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch +++ b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch @@ -1,17 +1,15 @@ diff --git a/pyproject.toml b/pyproject.toml -index 9730e46..9834686 100644 +index 50aa183b..3a190385 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -34,11 +34,7 @@ maintainers = [ - { name="Christian Geier" }, +@@ -36,9 +36,7 @@ maintainers = [ { name="Jaca", email="vitouejj@gmail.com" }, ] --# These attributes are dynamically generated by hatch-vcs + # These attributes are dynamically generated by hatch-vcs -dynamic = [ -- "urls", - "version" -] +version = "@version@" - description = "iCalendar parser/generator" + description = "RFC 5545 compatible parser and generator of iCalendar files" readme = { file = "README.rst", content-type = "text/x-rst" } diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index bcdde4021d10..a68a4d0f75f1 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -24,7 +24,6 @@ mpfr, nlohmann_json, opencascade-occt_7_6, - pcre, zlib, # python deps @@ -101,7 +100,6 @@ buildPythonPackage rec { mpfr nlohmann_json opencascade-occt - pcre ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix index 95a1eceb2ed9..499ed171c790 100644 --- a/pkgs/development/python-modules/jh2/default.nix +++ b/pkgs/development/python-modules/jh2/default.nix @@ -11,20 +11,20 @@ buildPythonPackage (finalAttrs: { pname = "jh2"; - version = "5.0.11"; + version = "5.0.13"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "h2"; tag = "v${finalAttrs.version}"; - hash = "sha256-k69U8O0c7z1TJASOWcndZA/LYTsX7nVfelhaS6FlN5g="; + hash = "sha256-zlc0R+DeE9bd5daD7sUrGHXU3NR5tRiiFvBrccSKCTI="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-ELZD3CIAv70DGoCgdK8T2yVLtib9ylSvoZPFOge6nIQ="; + hash = "sha256-BPTgGc/qH101ZBlqiqwBe5KXXpnpDGe5K6GLqG99GSI="; }; build-system = [ diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 964032a0981a..243b7b086786 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -8,18 +8,19 @@ glibcLocales, mock, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "libarchive-c"; version = "5.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Changaco"; - repo = "python-${pname}"; - tag = version; - sha256 = "sha256-JqXTV1aD3k88OlW+8rT3xsDuW34+1xErG7hkupvL7Uo="; + repo = "python-libarchive-c"; + tag = finalAttrs.version; + hash = "sha256-JqXTV1aD3k88OlW+8rT3xsDuW34+1xErG7hkupvL7Uo="; }; patches = [ @@ -37,6 +38,8 @@ buildPythonPackage rec { "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; + build-system = [ setuptools ]; + pythonImportsCheck = [ "libarchive" ]; nativeCheckInputs = [ @@ -50,4 +53,4 @@ buildPythonPackage rec { description = "Python interface to libarchive"; license = lib.licenses.cc0; }; -} +}) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix index 405c3529c5b6..aa9770764983 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-multipart"; - version = "1.9.8"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-multipart-v${version}"; - hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA="; + hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; }; sourceRoot = "${src.name}/packages/serialization/multipart/"; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index 1363980d0474..6094582d51d0 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-text"; - version = "1.9.8"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-text-v${version}"; - hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA="; + hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; }; sourceRoot = "${src.name}/packages/serialization/text/"; diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index a18670d33498..a41d79a32489 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "proxmoxer"; version = "2.3.0"; pyproject = true; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "proxmoxer"; repo = "proxmoxer"; - rev = "cf1bcde696537c74ef00d8e71fb86735fb4c2c79"; - hash = "sha256-h5Sla7/4XiZSGwKstyiqs/T2Qgi13jI9YMVPqDcF3sA="; + tag = finalAttrs.version; + hash = "sha256-v/QqNCzkcYk2pqr9tTeyvEEeXt4nzqooHAQEIiJitZ4="; }; build-system = [ setuptools ]; @@ -53,8 +53,8 @@ buildPythonPackage rec { meta = { description = "Python wrapper for Proxmox API v2"; homepage = "https://github.com/proxmoxer/proxmoxer"; - changelog = "https://github.com/proxmoxer/proxmoxer/releases/tag/${version}"; - license = with lib.licenses; [ bsd3 ]; + changelog = "https://github.com/proxmoxer/proxmoxer/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index b2ec99d38e46..4796bd67d042 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -5,20 +5,23 @@ fetchFromGitHub, gdb, pytest, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pygdbmi"; version = "0.11.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cs01"; repo = "pygdbmi"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JqEDN8Pg/JttyYQbwkxKkLYuxVnvV45VlClD23eaYyc="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ gdb pytest @@ -27,7 +30,7 @@ buildPythonPackage rec { # tests require gcc for some reason doCheck = !stdenv.hostPlatform.isDarwin; - postPatch = '' + preCheck = '' # tries to execute flake8, # which is likely to break on flake8 updates echo "def main(): return 0" > tests/static_tests.py @@ -36,7 +39,8 @@ buildPythonPackage rec { meta = { description = "Parse gdb machine interface output with Python"; homepage = "https://github.com/cs01/pygdbmi"; + changelog = "https://github.com/cs01/pygdbmi/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mic92 ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index e5fd9da0bd59..704f0a62bfd4 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.3.2"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "nkgilley"; repo = "python-ecobee-api"; tag = version; - hash = "sha256-6uZc022C3EgEgsPGD302qAtFqubwQSETQr3SQSYXeb8="; + hash = "sha256-Gr0aLAX5Qv8COMjwvoqyhc7yBNMu6nbMCSBVT5FcX1Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 0ac6c2b31550..5d831b6951d8 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -9,24 +9,27 @@ poetry-core, requests, requests-toolbelt, + freezegun, + pytest-asyncio, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-keycloak"; - version = "7.0.2"; + version = "7.1.1"; pyproject = true; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; - tag = "v${version}"; - hash = "sha256-3JHmVfGd5X5aEZt8O7Aj/UfYpLtDsI6MPwWxLo7SGBs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3BrXSktN0OYQJRRZ234z06pGHicJOIBUzSdMd6y95L4="; }; postPatch = '' # Upstream doesn't set version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ poetry-core ]; @@ -40,16 +43,34 @@ buildPythonPackage rec { requests-toolbelt ]; - # Test fixtures require a running keycloak instance - doCheck = false; + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + ]; + + # conftest.py requires these variables to be set, + # even if the respective tests are disabled + preCheck = '' + export KEYCLOAK_{HOST,PORT,ADMIN{,_PASSWORD}}= + ''; + + disabledTestPaths = [ + # these tests require a running keycloak instance + "tests/test_keycloak_openid.py" + "tests/test_keycloak_admin.py" + "tests/test_keycloak_uma.py" + # requires docker + "tests/test_pkce_flow.py" + ]; pythonImportsCheck = [ "keycloak" ]; meta = { description = "Provides access to the Keycloak API"; homepage = "https://github.com/marcospereirampj/python-keycloak"; - changelog = "https://github.com/marcospereirampj/python-keycloak/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/marcospereirampj/python-keycloak/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 205d7963d500..6ef8bd15fd87 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.16.1"; + version = "5.16.2"; pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; tag = "v${version}"; - hash = "sha256-fUxwQHbtr8skjxYC/KfqLkhPMs/D7LNkFCyvRmUxFmw="; + hash = "sha256-YZuNXaO+zvdKWe3A+G4nhEuYlUKf/3EAy0GyG/UkuIg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 267d8040c762..f7975cfbb389 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -9,15 +9,16 @@ hypothesis, docutils, stdenvNoCC, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyudev"; version = "0.24.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-54i7mDcAsahO/C6IhisKUa8qmV1bhryZl1RlBc97Nrw="; }; @@ -26,13 +27,9 @@ buildPythonPackage rec { --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; - nativeCheckInputs = [ - pytest - mock - hypothesis - docutils - ]; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; checkPhase = '' py.test @@ -42,10 +39,18 @@ buildPythonPackage rec { # https://github.com/pyudev/pyudev/issues/187 doCheck = false; + nativeCheckInputs = [ + pytest + mock + hypothesis + docutils + ]; + meta = { homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; + changelog = "https://github.com/pyudev/pyudev/blob/v${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ frogamic ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 1836be024dab..7808b5486e57 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pyvlx"; - version = "0.2.34"; + version = "0.2.35"; pyproject = true; src = fetchFromGitHub { owner = "Julius2342"; repo = "pyvlx"; tag = finalAttrs.version; - hash = "sha256-QROewaUCvZ4wTCdi/TB5FTr58lytaViac9oOUGRp5Tw="; + hash = "sha256-NdS1Arx2XaHCltpE3VPwghRTGQcskUmXoEuauyAmMUU="; }; build-system = [ diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 561923f7ea5e..254be50c8641 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -21,15 +21,15 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "remarshal"; version = "1.3.0"; # test with `nix-build pkgs/pkgs-lib/format` pyproject = true; src = fetchFromGitHub { - owner = "dbohdan"; + owner = "remarshal-project"; repo = "remarshal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/K8x6ij23pk5O1+XJdFHaGbZ47nFMbXzp+4UMO5dGp4="; }; @@ -50,11 +50,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${src.tag}"; + changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${finalAttrs.src.tag}"; description = "Convert between TOML, YAML and JSON"; license = lib.licenses.mit; - homepage = "https://github.com/dbohdan/remarshal"; + homepage = "https://github.com/remarshal-project/remarshal"; maintainers = [ ]; mainProgram = "remarshal"; }; -} +}) diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 8f5a3c0d62fa..963fd89bd650 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -8,16 +8,16 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "rich-click"; - version = "1.9.7"; + version = "1.9.8"; pyproject = true; src = fetchFromGitHub { owner = "ewels"; repo = "rich-click"; - tag = "v${version}"; - hash = "sha256-HT82Dk3dYNMVU4lKJodKtn2KfEH7HUAORpa2RKSmg68="; + tag = "v${finalAttrs.version}"; + hash = "sha256-FjtwlWYFqI7vQ7JtpCtTIi90mbEkmHSKH8SROy9d+vU="; }; build-system = [ setuptools ]; @@ -36,9 +36,9 @@ buildPythonPackage rec { meta = { description = "Module to format click help output nicely with rich"; homepage = "https://github.com/ewels/rich-click"; - changelog = "https://github.com/ewels/rich-click/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/ewels/rich-click/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "rich-click"; }; -} +}) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 7c308bd2a216..88fd47ee21c9 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.31.0"; + version = "0.31.1"; pyproject = true; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; tag = "v${version}"; - hash = "sha256-Tuh+ycH2czTZHNw5p02NtCfBDuqshMiJAuzPAfcCaTE="; + hash = "sha256-YxIpTFGB82aBvRxfntou2dUZm7T0KSj7yhX3gcdAO7U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 55f883a1e659..30d9aae86b52 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -2,7 +2,6 @@ lib, aiohttp-retry, aiohttp, - aiounittest, buildPythonPackage, cryptography, django, @@ -29,6 +28,9 @@ buildPythonPackage (finalAttrs: { hash = "sha256-CQWP8QujDvV5+Z5JDUcWhQ4mJZqaXnxpScS9sBxIX4Q="; }; + # https://github.com/twilio/twilio-python/pull/919 + patches = [ ./remove-aiounittest.patch ]; + build-system = [ setuptools ]; dependencies = [ @@ -41,7 +43,6 @@ buildPythonPackage (finalAttrs: { ]; nativeCheckInputs = [ - aiounittest cryptography django mock diff --git a/pkgs/development/python-modules/twilio/remove-aiounittest.patch b/pkgs/development/python-modules/twilio/remove-aiounittest.patch new file mode 100644 index 000000000000..1f7df32c3a98 --- /dev/null +++ b/pkgs/development/python-modules/twilio/remove-aiounittest.patch @@ -0,0 +1,120 @@ +From 62378b10ea8124435fbaf8c70f4c77f36f79ab7f Mon Sep 17 00:00:00 2001 +From: Santiago Arteta +Date: Tue, 21 Apr 2026 01:44:58 -0300 +Subject: [PATCH] tests: drop aiounittest in favor of stdlib + IsolatedAsyncioTestCase + +Fixes #916. aiounittest hasn't had a release since 2022 and doesn't +support Python 3.14 (kwarunek/aiounittest#28), which was breaking the +test suite build on 3.14. + +unittest.IsolatedAsyncioTestCase has been in the stdlib since Python 3.8 +and is a drop-in replacement for aiounittest.AsyncTestCase, so this is +just an import swap. + +Changes: +- tests/requirements.txt: remove aiounittest +- tests/unit/http/test_async_http_client.py +- tests/unit/rest/test_client.py +- tests/unit/base/test_version.py + +Tested locally on Python 3.13 (Windows): 620 unit tests pass, including +the 71 previously-async tests in the three files touched. +--- + tests/requirements.txt | 1 - + tests/unit/base/test_version.py | 3 +-- + tests/unit/http/test_async_http_client.py | 8 ++++---- + tests/unit/rest/test_client.py | 4 +--- + 4 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/tests/requirements.txt b/tests/requirements.txt +index 679f8e13d0..a6224c9827 100644 +--- a/tests/requirements.txt ++++ b/tests/requirements.txt +@@ -2,7 +2,6 @@ Sphinx>=1.8.0 + mock + pytest + pytest-cov +-aiounittest + flake8 + wheel>=0.22.0 + cryptography +diff --git a/tests/unit/base/test_version.py b/tests/unit/base/test_version.py +index 94c0ad496f..85b9fdd16b 100644 +--- a/tests/unit/base/test_version.py ++++ b/tests/unit/base/test_version.py +@@ -1,7 +1,6 @@ + import unittest + from unittest.mock import Mock + +-import aiounittest + from tests import IntegrationTestCase + from tests.holodeck import Request + from twilio.base.version import Version +@@ -791,7 +790,7 @@ def test_fetch_with_response_info_returns_tuple(self): + self.assertIsInstance(headers, dict) + + +-class AsyncVersionTestCase(aiounittest.AsyncTestCase): ++class AsyncVersionTestCase(unittest.IsolatedAsyncioTestCase): + def setUp(self): + from tests.holodeck import AsyncHolodeck + from twilio.rest import Client +diff --git a/tests/unit/http/test_async_http_client.py b/tests/unit/http/test_async_http_client.py +index 23df35dc02..bbb89eda05 100644 +--- a/tests/unit/http/test_async_http_client.py ++++ b/tests/unit/http/test_async_http_client.py +@@ -1,4 +1,4 @@ +-import aiounittest ++import unittest + + from aiohttp import ClientSession + from mock import patch, AsyncMock +@@ -20,7 +20,7 @@ async def text(self): + return self._text + + +-class TestAsyncHttpClientRequest(aiounittest.AsyncTestCase): ++class TestAsyncHttpClientRequest(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.session_mock = AsyncMock(wraps=ClientSession) + self.session_mock.request.return_value = MockResponse("test", 200) +@@ -59,7 +59,7 @@ async def test_invalid_request_timeout_raises_exception(self): + await self.client.request("doesnt matter", "doesnt matter", timeout=-1) + + +-class TestAsyncHttpClientRetries(aiounittest.AsyncTestCase): ++class TestAsyncHttpClientRetries(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.session_mock = AsyncMock(wraps=ClientSession) + self.session_mock.request.side_effect = [ +@@ -92,7 +92,7 @@ async def test_request_retries_until_max(self): + self.assertEqual(response.text, "Error") + + +-class TestAsyncHttpClientSession(aiounittest.AsyncTestCase): ++class TestAsyncHttpClientSession(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.session_patcher = patch("twilio.http.async_http_client.ClientSession") + self.session_constructor_mock = self.session_patcher.start() +diff --git a/tests/unit/rest/test_client.py b/tests/unit/rest/test_client.py +index f2e2affc02..6053120f7b 100644 +--- a/tests/unit/rest/test_client.py ++++ b/tests/unit/rest/test_client.py +@@ -1,7 +1,5 @@ + import unittest + +-import aiounittest +- + from mock import AsyncMock, Mock + + from twilio.http.response import Response +@@ -108,7 +106,7 @@ def test_set_user_agent_extensions(self): + self.assertEqual(user_agent_extensions, expected_user_agent_extensions) + + +-class TestClientAsyncRequest(aiounittest.AsyncTestCase): ++class TestClientAsyncRequest(unittest.IsolatedAsyncioTestCase): + def setUp(self): + self.mock_async_http_client = AsyncMock() + self.mock_async_http_client.request.return_value = Response(200, "test") diff --git a/pkgs/development/python-modules/unidic-lite/default.nix b/pkgs/development/python-modules/unidic-lite/default.nix index 77463f4c839c..c2530aa94334 100644 --- a/pkgs/development/python-modules/unidic-lite/default.nix +++ b/pkgs/development/python-modules/unidic-lite/default.nix @@ -2,18 +2,21 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unidic-lite"; version = "1.0.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "0idj4yp0sl27ylr2wzkybbh0wj7c843lp7cljw5d1m7xv5r4b7fv"; }; + build-system = [ setuptools ]; + # no tests doCheck = false; @@ -25,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.mit; teams = [ lib.teams.tts ]; }; -} +}) diff --git a/pkgs/development/python-modules/upnpclient/default.nix b/pkgs/development/python-modules/upnpclient/default.nix new file mode 100644 index 000000000000..abfc739ee2b8 --- /dev/null +++ b/pkgs/development/python-modules/upnpclient/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + requests, + python-dateutil, + lxml, + ifaddr, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage (finalAttrs: { + pname = "upnpclient"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "flyte"; + repo = "upnpclient"; + tag = finalAttrs.version; + hash = "sha256-bT7oNCYAKJvhCaSczLWnDAy+ULqhjP+3ZvFnIGAb+Ww="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + requests + python-dateutil + lxml + ifaddr + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + pythonImportsCheck = [ "upnpclient" ]; + + meta = { + description = "Python 3 library for accessing UPnP devices"; + homepage = "https://github.com/flyte/upnpclient"; + changelog = "https://github.com/flyte/upnpclient/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eana ]; + }; +}) diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 0f23df1e6ef1..bbb23a1aa7b5 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "3.1.0"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "remcohaszing"; repo = "pywakeonlan"; tag = version; - hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io="; + hash = "sha256-AQjecGfcxI+zzUR6IO/iG/49QH1jClNYJFBEOABek5U="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index f8c287c4297d..5adb61200356 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-7X/I52jvcKtaLU01sa+oZ7n9wIJ9qNemiBUgEj5lRNQ="; + hash = "sha256-uLEFbYG+3+f+LNfJlLi06v75StLBsHdJTiHxA/tNwj4="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/dreo/package.nix b/pkgs/servers/home-assistant/custom-components/dreo/package.nix index 0c362286109a..e10888a251d0 100644 --- a/pkgs/servers/home-assistant/custom-components/dreo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dreo/package.nix @@ -12,13 +12,13 @@ buildHomeAssistantComponent rec { owner = "JeffSteinbok"; domain = "dreo"; - version = "1.9.0"; + version = "1.9.5"; src = fetchFromGitHub { inherit owner; repo = "hass-dreo"; tag = "v${version}"; - hash = "sha256-JF1n6a33qA6HN0JQ5ULT87Pnj3tp7ZrIwLfhLrWx+6I="; + hash = "sha256-YGzGDEgPifF6KcD8cCEE7PqGHGo/wG/H3V0dnGEa/Tc="; }; dependencies = [ websockets ]; diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix index fbd3497d1b82..658bbf83bc0f 100644 --- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "BottlecapDave"; domain = "octopus_energy"; - version = "18.2.1"; + version = "18.3.0"; src = fetchFromGitHub { inherit owner; repo = "HomeAssistant-OctopusEnergy"; tag = "v${version}"; - hash = "sha256-wEVD1Ixriv4C6TbG+IrQoEl9f+tIfV/OysXRytVQ8FE="; + hash = "sha256-V26sdgzA7i16SbAKTLiUgdRVTKJo23kgsRxaJsEtbyw="; }; dependencies = [ pydantic ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e930d470b54a..ec971815ffd5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -86,6 +86,8 @@ let ]; }); + caldav = self.caldav_2; + gspread = super.gspread.overridePythonAttrs (oldAttrs: rec { version = "5.12.4"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 45ac3ca16a9c..6e724d605ade 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2167,6 +2167,7 @@ mapAliases { udisks2 = udisks; # Added 2025-10-30 ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07 ugarit-manifest-maker = throw "'ugarit-manifest-maker' has been removed because it is unmaintained"; # Added 2026-05-07 + uhttpmock_1_0 = warnAlias "'uhttpmock_1_0' has been renamed to 'uhttpmock'" uhttpmock; # Added 2026-05-30 unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27 unixODBC = warnAlias "'unixODBC' has been renamed to 'unixodbc'" unixodbc; # Added 2026-02-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7916b58e07d..b8e2d1280902 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1476,10 +1476,6 @@ with pkgs; dkimpy = with python3Packages; toPythonApplication dkimpy; - esbuild = callPackage ../development/tools/esbuild { }; - - esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; - libfx2 = with python3Packages; toPythonApplication fx2; foxdot = with python3Packages; toPythonApplication foxdot; @@ -1899,8 +1895,6 @@ with pkgs; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; - anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; - bzip2 = callPackage ../tools/compression/bzip2 { }; bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; @@ -3201,10 +3195,6 @@ with pkgs; extraFonts = true; }; - tinc = callPackage ../tools/networking/tinc { }; - - tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; - tldr-hs = haskellPackages.tldr; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); @@ -6204,8 +6194,6 @@ with pkgs; gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { }); - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; - glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc; # Not moved to aliases while we decide if we should split the package again. @@ -9470,9 +9458,7 @@ with pkgs; mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; }; mediaelch-qt6 = mediaelch; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { - gconf = gnome2.GConf; - }; + mendeley = callPackage ../applications/office/mendeley { }; mercurialFull = mercurial.override { fullBuild = true; }; @@ -9784,6 +9770,7 @@ with pkgs; rke2_1_33 rke2_1_34 rke2_1_35 + rke2_1_36 rke2_stable rke2_latest ; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47db72e8d5be..f8b09738955a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2472,6 +2472,8 @@ self: super: with self; { caldav = callPackage ../development/python-modules/caldav { }; + caldav_2 = callPackage ../development/python-modules/caldav/2.nix { }; + callee = callPackage ../development/python-modules/callee { }; calmjs = callPackage ../development/python-modules/calmjs { }; @@ -20920,6 +20922,8 @@ self: super: with self; { uploadserver = callPackage ../development/python-modules/uploadserver { }; + upnpclient = callPackage ../development/python-modules/upnpclient { }; + upnpy = callPackage ../development/python-modules/upnpy { }; uproot = callPackage ../development/python-modules/uproot { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 2432f157d63c..b6af4b4bcc4e 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -74,7 +74,7 @@ makeScopeWithSplicing' { qgpgme = callPackage ../development/libraries/qgpgme { }; - grantlee = callPackage ../development/libraries/grantlee/5 { }; + grantlee = pkgs.grantlee; herqq = callPackage ../by-name/he/herqq/package.nix { };