diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index b12a063dd40d..adff696ab92b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -118,6 +118,10 @@ - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream. +- `lxde` scope has been removed, and its packages have been moved the top-level. + +- `pulsemeeter` has been updated to `2.0.0`. The configuration file from older versions has to be deleted. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/theRealCarneiro/pulsemeeter/releases/tag/v2.0.0). + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 55e22a0be120..a46d85828993 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11557,6 +11557,12 @@ githubId = 6789916; name = "Jason Odoom"; }; + jasonxue1 = { + email = "jason@xuechunxi.com"; + github = "jasonxue1"; + githubId = 103628493; + name = "jasonxue"; + }; jaspersurmont = { email = "jasper@surmont.dev"; github = "jaspersurmont"; diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 0cebc8254627..a60aca014672 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -58,7 +58,7 @@ let # TODO: Should this be RFC42-ised so that users can set additional options without modifying the module? postfixMtaConfig = pkgs.writeText "mailman-postfix.cfg" '' [postfix] - postmap_command: ${pkgs.postfix}/bin/postmap + postmap_command: ${lib.getExe' config.services.postfix.package "postmap"} transport_file_type: hash ''; diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index cbc184debf5b..d26682d33023 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -166,8 +166,8 @@ in }; preStart = '' ${concatMapLines (createList cfg.listDomain) cfg.mailLists} - ${pkgs.postfix}/bin/postmap /etc/postfix/virtual - ${pkgs.postfix}/bin/postmap /etc/postfix/transport + ${lib.getExe' config.services.postfix.package "postmap"} /etc/postfix/virtual + ${lib.getExe' config.services.postfix.package "postmap"} /etc/postfix/transport ''; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 0ea3599db615..e69ddcb30866 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -357,6 +357,8 @@ in description = "Whether to run the Postfix mail server."; }; + package = lib.mkPackageOption pkgs "postfix" { }; + enableSmtp = lib.mkOption { type = lib.types.bool; default = true; @@ -882,12 +884,12 @@ in etc.postfix.source = "/var/lib/postfix/conf"; # This makes it comfortable to run 'postqueue/postdrop' for example. - systemPackages = [ pkgs.postfix ]; + systemPackages = [ cfg.package ]; }; services.mail.sendmailSetuidWrapper = lib.mkIf config.services.postfix.setSendmail { program = "sendmail"; - source = "${pkgs.postfix}/bin/sendmail"; + source = lib.getExe' cfg.package "sendmail"; owner = "root"; group = setgidGroup; setuid = false; @@ -896,7 +898,7 @@ in security.wrappers.mailq = { program = "mailq"; - source = "${pkgs.postfix}/bin/mailq"; + source = lib.getExe' cfg.package "mailq"; owner = "root"; group = setgidGroup; setuid = false; @@ -905,7 +907,7 @@ in security.wrappers.postqueue = { program = "postqueue"; - source = "${pkgs.postfix}/bin/postqueue"; + source = lib.getExe' cfg.package "postqueue"; owner = "root"; group = setgidGroup; setuid = false; @@ -914,7 +916,7 @@ in security.wrappers.postdrop = { program = "postdrop"; - source = "${pkgs.postfix}/bin/postdrop"; + source = lib.getExe' cfg.package "postdrop"; owner = "root"; group = setgidGroup; setuid = false; @@ -948,7 +950,7 @@ in mv /var/postfix /var/lib/postfix fi - # All permissions set according ${pkgs.postfix}/etc/postfix/postfix-files script + # All permissions set according ${cfg.package}/etc/postfix/postfix-files script mkdir -p /var/lib/postfix /var/lib/postfix/queue/{pid,public,maildrop} chmod 0755 /var/lib/postfix chown root:root /var/lib/postfix @@ -956,20 +958,20 @@ in rm -rf /var/lib/postfix/conf mkdir -p /var/lib/postfix/conf chmod 0755 /var/lib/postfix/conf - ln -sf ${pkgs.postfix}/etc/postfix/postfix-files /var/lib/postfix/conf/postfix-files + ln -sf ${cfg.package}/etc/postfix/postfix-files /var/lib/postfix/conf/postfix-files ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf ${lib.concatStringsSep "\n" ( lib.mapAttrsToList (to: from: '' ln -sf ${from} /var/lib/postfix/conf/${to} - ${pkgs.postfix}/bin/postalias -o -p /var/lib/postfix/conf/${to} + ${lib.getExe' cfg.package "postalias"} -o -p /var/lib/postfix/conf/${to} '') cfg.aliasFiles )} ${lib.concatStringsSep "\n" ( lib.mapAttrsToList (to: from: '' ln -sf ${from} /var/lib/postfix/conf/${to} - ${pkgs.postfix}/bin/postmap -o -p /var/lib/postfix/conf/${to} + ${lib.getExe' cfg.package "postmap"} -o -p /var/lib/postfix/conf/${to} '') cfg.mapFiles )} @@ -979,7 +981,7 @@ in ln -sf /var/spool/mail /var/ #Finally delegate to postfix checking remain directories in /var/lib/postfix and set permissions on them - ${pkgs.postfix}/bin/postfix set-permissions config_directory=/var/lib/postfix/conf + ${lib.getExe' cfg.package "postfix"} set-permissions config_directory=/var/lib/postfix/conf ''; }; @@ -993,15 +995,15 @@ in "postfix-setup.service" ]; requires = [ "postfix-setup.service" ]; - path = [ pkgs.postfix ]; + path = [ cfg.package ]; serviceConfig = { Type = "forking"; Restart = "always"; PIDFile = "/var/lib/postfix/queue/pid/master.pid"; - ExecStart = "${pkgs.postfix}/bin/postfix start"; - ExecStop = "${pkgs.postfix}/bin/postfix stop"; - ExecReload = "${pkgs.postfix}/bin/postfix reload"; + ExecStart = "${lib.getExe' cfg.package "postfix"} start"; + ExecStop = "${lib.getExe' cfg.package "postfix"} stop"; + ExecReload = "${lib.getExe' cfg.package "postfix"} reload"; # Hardening PrivateTmp = true; @@ -1025,7 +1027,7 @@ in services.postfix.settings.main = (lib.mapAttrs (_: v: lib.mkDefault v) { - compatibility_level = pkgs.postfix.version; + compatibility_level = cfg.package.version; mail_owner = cfg.user; default_privs = "nobody"; @@ -1034,16 +1036,16 @@ in queue_directory = "/var/lib/postfix/queue"; # Default location of everything in package - meta_directory = "${pkgs.postfix}/etc/postfix"; - command_directory = "${pkgs.postfix}/bin"; + meta_directory = "${cfg.package}/etc/postfix"; + command_directory = "${cfg.package}/bin"; sample_directory = "/etc/postfix"; - newaliases_path = "${pkgs.postfix}/bin/newaliases"; - mailq_path = "${pkgs.postfix}/bin/mailq"; + newaliases_path = lib.getExe' cfg.package "newaliases"; + mailq_path = lib.getExe' cfg.package "mailq"; readme_directory = false; - sendmail_path = "${pkgs.postfix}/bin/sendmail"; - daemon_directory = "${pkgs.postfix}/libexec/postfix"; - manpage_directory = "${pkgs.postfix}/share/man"; - html_directory = "${pkgs.postfix}/share/postfix/doc/html"; + sendmail_path = lib.getExe' cfg.package "sendmail"; + daemon_directory = "${cfg.package}/libexec/postfix"; + manpage_directory = "${cfg.package}/share/man"; + html_directory = "${cfg.package}/share/postfix/doc/html"; shlib_directory = false; mail_spool_directory = "/var/spool/mail/"; setgid_group = cfg.setgidGroup; diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index 2d104e3ed90a..bf3af5af97ed 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -400,7 +400,7 @@ in }) // (lib.optionalAttrs (cfg.mta.type == "postfix") { sendmail_aliases = "${dataDir}/sympa_transport"; - aliases_program = "${pkgs.postfix}/bin/postmap"; + aliases_program = lib.getExe' config.services.postfix.package "postmap"; aliases_db_type = "hash"; }) // (lib.optionalAttrs cfg.web.enable { @@ -502,8 +502,8 @@ in ''} ${lib.optionalString (cfg.mta.type == "postfix") '' - ${pkgs.postfix}/bin/postmap hash:${dataDir}/virtual.sympa - ${pkgs.postfix}/bin/postmap hash:${dataDir}/transport.sympa + ${lib.getExe' config.services.postfix.package "postmap"} hash:${dataDir}/virtual.sympa + ${lib.getExe' config.services.postfix.package "postmap"} hash:${dataDir}/transport.sympa ''} ${pkg}/bin/sympa_newaliases.pl ${pkg}/bin/sympa.pl --health_check diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 213ad696d512..d09ad9d463e4 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -221,8 +221,7 @@ in sendmailPath = mkOption { type = path; - example = literalExpression ''"''${pkgs.postfix}/bin/sendmail"''; - # '' ; # fix vim + example = literalExpression ''lib.getExe' config.services.postfix.package "sendmail"''; description = '' Path to {file}`sendmail` program. The default uses the local sendmail wrapper diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 67fe6811a98a..82bd51e8ad17 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { pname = "mixxx"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - hash = "sha256-dKk3n3KDindnLbON52SW5h4cz96WVi0OPjwA27HqQCI="; + hash = "sha256-WmYoblIVygLnjNaFnRoEHmfnQcaBtIVOBZicEwD4NMw="; }; # Should be removed when bumping to 2.6.x diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f8806288592f..ac65bfd7509c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,8 +16,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2025.1.2.12"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Patch 1" - sha256Hash = "sha256-fLjCbB9Wwrx7siYQTmtWvce+8TdYTea+y6HTtSTYWAY="; + version = "2025.1.3.7"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3" + sha256Hash = "sha256-pet3uTmL4pQ/FxB2qKv+IZNx540gMC7hmfOaQ8iLQpQ="; }; betaVersion = { version = "2025.1.3.6"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3 RC 2" diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 240ff2e5333b..a73d2e14838c 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -16,17 +16,17 @@ buildGoModule rec { inherit pname; - version = "2.11.4"; + version = "2.11.5"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; tag = version; - hash = "sha256-vYZLcY2z4gqf/DmYUEatTd2QJzb53rIXpX/w4hnRWps="; + hash = "sha256-gNojkBMdTbBLnN5Xpbpm7chLfCT+7S8mJTilEABuVis="; }; - vendorHash = "sha256-ycHaNTtoPeY+DJef1L+3WRtlBLbRedDaCb/49aaN1So="; + vendorHash = "sha256-Sy67XRPob++DH+pKFY5lZOfc3f1MaP3nI1znnvjYB+M="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json index 32a3d7e79b02..726157c3583c 100644 --- a/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "6c788fede718e2956300456d0ef613ed6580ed2c23676082abb2afb3684d46d0" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "c10f3cc19a37702666270c30f4e42696b054e63c9f0d23d02404905a90036c8b" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "1ee8177930320a5e5d66a92d22ccff04afad0f096f255023ff927f3e950e94b8" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "6ba63ee01aa9f4e5d07dfc3f02a9665961cac47e5ff5121edb5c3c55cdef1989" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "e6b2f7f8e21bd5a13058d60b63382227e3f79d721c25be162efca1a09de911cf" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "d615557c7ed58155e2cbda620465635d7f6b4297660a83458b37cac3fddc5b52" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "18be964446d39f08a492823fcb8c0d1a0a4c7c22f8f396ad701580cc9e8a78d3" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "473582b2f3e2cb0b55fb6477c24d4fe5dd1ea965c8445d8ffe91a9a5a08ea5e6" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "979c17a92e20bf0f003182529a509b6ac705cd1b4f4d37a9241631d1ca94c711" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "b0a5e0f80d8d10604a00d73462f0a5792c9a9fa7e4a236243121804c5adfc48f" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "de92213addb8bd49a34a53ad60e740e6d34f728fb82c0e6bc8f0e71669c82b0c" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "1999d5d42397f6c78a55f79c6b3ddc7f91dd50d1038206d5c513c8691cce1b67" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "f3416d8358e466b6bacc7a9a540531a0d17f24e27a96c3d34ea1a4bb8a44a439" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "c431bc15cc130222a31a5edf5bbc5600bb4fb28ebd4c2aaa040cdac51d909dbb" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "bb1342a2d11109f645ea42d98e26d9a916a98aa9935254b12f45eb4156708450" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "203eff3588c6be74834d2f9f96d39285c8b3fa447f6e3a656250e05d9592d3c7" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "c62954631ad1b2f0bb266195f56fbb5f175a33cd8bd6ae1ab31f526bc6f435f6" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "7b62e18e0235c6af0f1215235352a493fc535904e3302c7794cdb88a281d581b" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "21b00f62e907a17896c32f115faa11e65f49e0bdc22cf589dd5e17880a1481cf" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "19dedf7d67b3d54519ae9c458e1b3a67535a282ba3ecb40d23352239f90a8146" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "df0fb3a5dd341b7cc62a993fc22bf1e379761a9f50117d064322f61049df1506" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "dc6d06744322dd8750efffba82914ee7dbb76d22762248fbdae77941ca38ebb5" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "aeba65039851a7454670d6645027fcd511f63302da67a07cec1067ac7ec9f070" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "10e4b6ba4ef381e0cd95be4a37df7a090956334459d00a54de5559fdb73ed9fd" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "47735438a076be0aa2db843d4af903395c0ca542e94b8ef4480fd401f756d596" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "a5e3bd13c6ebeca25e203a84749ee76c62eb7fcab271cf4ecebd4b3448bec47e" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "b622e068c6102b437b57ffd921b565e8c0edace396e468324263477bdeed54c0" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "6c18213b9cf97623bcc418c56b167e1b67187abefe6699ce6756245b3daf28e0" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "0e4ab1ff25eb8d3611180be0aef7c3b06294cfae81298dec69629335346d69f0" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "37118c56b2b6064a5496a807a4c9cef9622e5c31dc13e4a1486e7879f290d71f" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "3d94593d3b6cc35f9e723cbfd1540cafb6842d1b7eb66c42785952746def1bc3" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "d935a702d14e05c9571dfbd7f0010f229640c23140d44110e1b9de01465a825f" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "6202ccfeaf210273c87ffcf0bb4ccd2832ba6b5f9ef7c0cb3bd38530d3f379cf" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "e1454cfbeb79a2ee467a0f822ca19f45ab7fbdb9842709153b1383537206b2a6" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "204d7d7855fa404cb93c1ed553934edd91876ddf4e8a793ed809be1ffe8a252c" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "84f1d386437bd0070e70632da6575e461dbe695b269c8638f9a3f6545fdab8c1" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "72a377849fc0ecd84df2542b2420a18cf4aa1dfbe2e71a4855369bae8bdfc8ad" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "091decc4ca3352f79372c6ca66cb972c9eab0b30f0c93f932676faa6f09323de" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "eb4bee33ce6dc54c8e8d08e742cfc3f0c34c8774a3f1666fdf3ee01878beff69" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "76d38238a2c40acc3075d7c9ceb6ae045cf24d7a8fefff7af39cf495720c8445" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "a15bea59d65068ee778557ee5a363e922d3165bda7de092d0ab67e16a21d0202" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "e676d8f1f5ffe7614c1d920ee90e1186ed7176105e3cde21f7f11afd4aa5b78d" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "eee0abfc075c7666c4b736a9cf613652fe8b0cc51c663c1e857219a85ea8f411" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "5425055034714708e49e32b2bd1cf2b7aa5e4af7fea193c6689034a50521c7d7" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "54dee049476dc85087931639ade92d40ca56268bd7e5ddf75d6864ffb654b081" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "e43895b604b7090ff32b21bf91dbd0167ea9b6f16f35e9c8dc531333523f617a" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "81fca62544f6bbd3f38b3db704f9136099e3291adae51f2adf050b4516e75a43" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "707589c7bfc89d60ee143192b635ed77fb3e9f15267626a6b527bbefc89b4750" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "2fb7b1c3aabf06b976b66964c51abb48a81610de88cfa1bc35363c8051c53251" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "cd42054b9a7fb1ebfaed757f074822f61f1ccb87bd18236822e9f4cfcd1bb137" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "92e0f1d15116012f7e3582f49dcd1c405e02f3b701b96c7b9cd185b78802583d" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "a463a8262063e875cd0469ae347963e25d3bf60446bb57ec1fdd854d966f8c66" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "00e14b3c69e1238ba748ff780920d8250a14f370f1784687dd0a1c7f4cc45cd2" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "aa0f48a9c78f10f041d49dccefcd6d38bf96d78b8dbeee0aea439264ee1e13f9" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "379744d9011a9090ad950fae557770751b1f0c9927fb8a9a0a4c7aa0d937ce62" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "4e586d06fcee46b38a2cec900ae3c98743cc1c12896d690b53e41e2112cc8315" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "84baaa5cab336e8d160d1118eb8b9a17dd486d9f62ccffee7ff483d8ecc57b2c" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "7b4b0b183ade57a0ad59c84337b8ffa6b883b29da51685e166e5b8eb2016c03a" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "a976b4ec4d6670ad644dcea521dff5ba0acac5adb4cc5d382575f563a9cda133" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "c3b91061a1cae5972cd5c70203cc65254192f2839059e49b17b2707fc88865f6" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "7d8e0df702e0cf70cc043e193cc333a6d7751cc6181e8461f79e740ff64b1650" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "9481a4840b903bf3d5e02b011e59006e5f09a98d3459584c9b5616311a0ea594" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "01de699c30c0de147129610f879928d4a395b226191e5e18522b2fe2ae788d38" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "f20f33dba9454912688f4ae511ed6df050b6e5a1fae8887ec5d5d525aefc3c03" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "57278b09ea6bc4d5ca0c159110c26ff45c07da8f4782183e435df5dab37f2717" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "aa056d8f9c6094c7afa853e5cd9d83f600307a90e7bafaf32d254ce401ede328" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "889c1d37331c2543e07ef0b8ccf6c2391c48e5c3cff340b63dff5ab3da197cf9" + "url": "https://github.com/rancher/rke2/releases/download/v1.31.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "2a1eb46396f6b88cf4a285d8fca2b8098b69dbc5d8a8f62ce5b5916a88b49938" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix b/pkgs/applications/networking/cluster/rke2/1_31/versions.nix index 5131d0dcbb9e..cd914ff73839 100644 --- a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_31/versions.nix @@ -1,12 +1,12 @@ { - rke2Version = "1.31.7+rke2r1"; - rke2Commit = "7b18bda1c5ec1e110cec206f9163f6aba3a2154d"; - rke2TarballHash = "sha256-u7U5eGLTrm1mxatl3v4iCBzw/Rin8wlndSs/OKLWtiw="; - rke2VendorHash = "sha256-UiFpAZHic2GVvdW4RDJxH2j5N2x8ec43YFfvBDR4fyM="; - k8sImageTag = "v1.31.7-rke2r1-build20250312"; - etcdVersion = "v3.5.19-k3s1-build20250306"; + rke2Version = "1.31.11+rke2r1"; + rke2Commit = "48500b495b74b976f07ebd07a643e40e6c89f355"; + rke2TarballHash = "sha256-JPoeNB9jM4h+K5vKWi2KQfPJPTUftxwXYJY6eZN50Zs="; + rke2VendorHash = "sha256-CxNo9HcxuSS0LWawefF0VbtMDofQUzoCzTfBhWAUVrc="; + k8sImageTag = "v1.31.11-rke2r1-build20250716"; + etcdVersion = "v3.5.21-k3s1-build20250612"; pauseVersion = "3.6"; - ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016"; - dockerizedVersion = "v1.31.7-rke2r1"; + ccmVersion = "v1.31.9-rc1.0.20250516171836-812206503b28-build20250612"; + dockerizedVersion = "v1.31.11-rke2r1"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index a2768df39488..e5619ef61035 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.33.3"; + version = "1.33.4"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-nDBXXsvzoaJwbeLAXwCdJcxSZjo9Y7CcPBpkNTN2ey0="; + hash = "sha256-T/LPnm4rnNhvFWWiBAz1R4T5mtHW1CrWEfHQ3Ce/wYA="; }; vendorHash = null; diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix deleted file mode 100644 index 8dcedf453eb2..000000000000 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - undmg, - writeShellApplication, - curl, - common-updater-scripts, - xmlstarlet, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "arc-browser"; - version = "1.109.0-67185"; - - src = fetchurl { - url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-zVErRSKMd5xhIB5fyawBNEatenHnm+q7VLAE78PLkmY="; - }; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "Arc.app"; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/Applications/Arc.app" - cp -R . "$out/Applications/Arc.app" - - runHook postInstall - ''; - - dontFixup = true; - - passthru.updateScript = lib.getExe (writeShellApplication { - name = "arc-browser-update-script"; - runtimeInputs = [ - curl - common-updater-scripts - xmlstarlet - ]; - text = '' - latest_version_string="$(curl -s "https://releases.arc.net/updates.xml" | xmlstarlet sel -N sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" -t -v "//item[1]/sparkle:shortVersionString" -n)" - version_part="''${latest_version_string%% (*}" - build_part="''${latest_version_string##*\(}" - build_part="''${build_part%\)*}" - version="''${version_part}-''${build_part}" - - update-source-version arc-browser "$version" - ''; - }); - - meta = { - description = "Arc from The Browser Company"; - homepage = "https://arc.net/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ ]; - knownVulnerabilities = [ "unmaintained" ]; - platforms = [ - "aarch64-darwin" - "x86_64-darwin" - ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 2390004e2b07..8bd266429572 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.75.0"; + version = "2.77.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; tag = "azure-cli-${version}"; - hash = "sha256-u6umAqRUfiACt23mxTtfosLdxKSPvDVJMkVjPCtxr24="; + hash = "sha256-+AvfZIeGxQ+27gpg1y3fMMN7fBP4ATXr7By+dJpux3k="; }; # put packages that needs to be overridden in the py package scope @@ -154,7 +154,7 @@ py.pkgs.toPythonApplication ( ]; # Dependencies from: - # https://github.com/Azure/azure-cli/blob/azure-cli-2.62.0/src/azure-cli/setup.py#L52 + # https://github.com/Azure/azure-cli/blob/azure-cli-2.77.0/src/azure-cli/setup.py#L52 # Please, keep ordered by upstream file order. It facilitates reviews. propagatedBuildInputs = with py.pkgs; @@ -166,7 +166,6 @@ py.pkgs.toPythonApplication ( azure-cosmos azure-data-tables azure-datalake-store - azure-graphrbac azure-keyvault-administration azure-keyvault-certificates azure-keyvault-keys @@ -189,10 +188,8 @@ py.pkgs.toPythonApplication ( azure-mgmt-containerregistry azure-mgmt-containerservice azure-mgmt-cosmosdb - azure-mgmt-databoxedge azure-mgmt-datalake-store azure-mgmt-datamigration - azure-mgmt-dns azure-mgmt-eventgrid azure-mgmt-eventhub azure-mgmt-extendedlocation @@ -203,24 +200,29 @@ py.pkgs.toPythonApplication ( azure-mgmt-iothubprovisioningservices azure-mgmt-keyvault azure-mgmt-loganalytics - azure-mgmt-managedservices azure-mgmt-managementgroups azure-mgmt-maps azure-mgmt-marketplaceordering azure-mgmt-media azure-mgmt-monitor azure-mgmt-msi - azure-mgmt-mysqlflexibleservers azure-mgmt-netapp azure-mgmt-policyinsights azure-mgmt-postgresqlflexibleservers azure-mgmt-privatedns azure-mgmt-rdbms + azure-mgmt-mysqlflexibleservers azure-mgmt-recoveryservicesbackup azure-mgmt-recoveryservices - azure-mgmt-redis azure-mgmt-redhatopenshift - azure-mgmt-resource + azure-mgmt-redis + azure-mgmt-resource-all + # Added through azure-mgmt-resource-all package + # azure-mgmt-resource + # azure-mgmt-resource-deployments + # azure-mgmt-resource-deploymentscripts + # azure-mgmt-resource-deploymentstacks + # azure-mgmt-resource-templatespecs azure-mgmt-search azure-mgmt-security azure-mgmt-servicebus @@ -250,6 +252,7 @@ py.pkgs.toPythonApplication ( javaproperties jsondiff packaging + paramiko pycomposefile pygithub pynacl @@ -324,7 +327,6 @@ py.pkgs.toPythonApplication ( "azure.cli.telemetry" "azure.cosmos" "azure.datalake.store" - "azure.graphrbac" "azure.keyvault" "azure.mgmt.advisor" "azure.mgmt.apimanagement" @@ -344,7 +346,6 @@ py.pkgs.toPythonApplication ( "azure.mgmt.containerservice" "azure.mgmt.cosmosdb" "azure.mgmt.datamigration" - "azure.mgmt.dns" "azure.mgmt.eventgrid" "azure.mgmt.eventhub" "azure.mgmt.hdinsight" @@ -354,7 +355,6 @@ py.pkgs.toPythonApplication ( "azure.mgmt.iothubprovisioningservices" "azure.mgmt.keyvault" "azure.mgmt.loganalytics" - "azure.mgmt.managedservices" "azure.mgmt.managementgroups" "azure.mgmt.maps" "azure.mgmt.marketplaceordering" @@ -369,6 +369,8 @@ py.pkgs.toPythonApplication ( "azure.mgmt.recoveryservicesbackup" "azure.mgmt.redis" "azure.mgmt.resource" + "azure.mgmt.resource.deployments" + "azure.mgmt.resource.deployments.models" "azure.mgmt.search" "azure.mgmt.security" "azure.mgmt.servicebus" diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 13ab4f80d910..819a186f2d20 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -1,4 +1,5 @@ { + lib, stdenv, python3, fetchPypi, @@ -191,6 +192,41 @@ let overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.5.0" "tar.gz" "sha256-Uft0KcOciKzJ+ic9n4nxkwNSBmKZam19jhEiqY9fJSc="; + # azure.mgmt.resource will shadow the other azure.mgmt.resource.* packages unless we merge them together + azure-mgmt-resource-all = py.pkgs.buildPythonPackage { + pname = "azure-mgmt-resource-all"; + inherit version; + + format = "other"; # we're not building from sdist/wheel + + src = py.pkgs.azure-mgmt-resource.src; + + # No real build, just symlink all site-packages into one dir + installPhase = '' + runHook preInstall + + mkdir -p $out/${py.sitePackages} + for pkg in ${ + lib.concatStringsSep " " ( + map (p: "${p}") [ + py.pkgs.azure-mgmt-resource + py.pkgs.azure-mgmt-resource-deployments + py.pkgs.azure-mgmt-resource-deploymentscripts + py.pkgs.azure-mgmt-resource-deploymentstacks + py.pkgs.azure-mgmt-resource-templatespecs + ] + ) + }; do + # Copy recursively, keep symlinks, skip duplicates silently + cp -rs --no-preserve=mode "$pkg/${py.sitePackages}/." "$out/${py.sitePackages}/" || true + done + + runHook postInstall + ''; + + doCheck = false; + }; + # ImportError: cannot import name 'IPRule' from 'azure.mgmt.signalr.models' azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b2" "tar.gz" diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index 8e48483f611d..976f6208ca44 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.9.9"; + version = "7.9.10"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "bosh-cli"; rev = "v${version}"; - sha256 = "sha256-JfSZU+FgNseU8ZKlyPwiuE7Pplp0s0CKXELoTkIy7cc="; + sha256 = "sha256-yflJofBc5B/G8nWGTKkLseGUIK2Hyl/PKve96LSIyDw="; }; vendorHash = null; diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix index cd95e0dca2a7..d9625bd869e4 100644 --- a/pkgs/by-name/br/bruijn/generated.nix +++ b/pkgs/by-name/br/bruijn/generated.nix @@ -24,8 +24,8 @@ mkDerivation { pname = "bruijn"; version = "0.1.0.0"; src = fetchzip { - url = "https://github.com/marvinborner/bruijn/archive/d60ad52f135370635db3a2db3363005670af14b8.tar.gz"; - sha256 = "182v56vc71467q8x7bp83ch6wp3kv5wgxrm53l2vvnvfqyqswpi2"; + url = "https://github.com/marvinborner/bruijn/archive/512c4a517002f7d85838cef7e64ec1eb52f4dfa4.tar.gz"; + sha256 = "1xxmq5pij82vmivmf77chngb8w0n8d6n3497fadglr153byljih5"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/br/bruijn/version.txt b/pkgs/by-name/br/bruijn/version.txt index 8bac9139bd76..a246041b7cff 100644 --- a/pkgs/by-name/br/bruijn/version.txt +++ b/pkgs/by-name/br/bruijn/version.txt @@ -1 +1 @@ -0-unstable-2025-06-23 +0-unstable-2025-09-02 diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix index 2c9779a0fb1f..77dbca2a6e36 100644 --- a/pkgs/by-name/go/gonic/package.nix +++ b/pkgs/by-name/go/gonic/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gonic"; - version = "0.16.4"; + version = "0.17.0"; src = fetchFromGitHub { owner = "sentriz"; repo = "gonic"; rev = "v${version}"; - sha256 = "sha256-+8rKODoADU2k1quKvbijjs/6S/hpkegHhG7Si0LSE0k="; + sha256 = "sha256-/oQKlM8mJuFuIEAXwGuJtdS4mEZXvGPmOUD992Z08ww="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,7 +33,7 @@ buildGoModule rec { taglib zlib ]; - vendorHash = "sha256-6JkaiaAgtXYAZqVSRZJFObZvhEsHsbPaO9pwmKqIhYI="; + vendorHash = "sha256-EPl8qy8d7fs0GJ0b29nBqpg4JYF84Kd4my74ySlCwVA="; # TODO(Profpatsch): write a test for transcoding support, # since it is prone to break diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index ed834abe1a14..b114dfc8e426 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -1,25 +1,25 @@ { stdenv, lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, installShellFiles, buildPackages, testers, goreleaser, }: -buildGoModule rec { +buildGo125Module rec { pname = "goreleaser"; - version = "2.11.2"; + version = "2.12.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-rGlkzTIOG7CXivV3gq9TsYo9bVgznF/0Cln2+89175I="; + hash = "sha256-z3yYC6NQ6Y5NbsFsvYnx/+X1rU7Gs8dSXaQZ0KCyiis="; }; - vendorHash = "sha256-A9C0CXfICVU0lXDPA1XP/Tu9Fgq2qStybZR4nMrnIDs="; + vendorHash = "sha256-GcG/VkX9XkAkNAwt5XX14FWAZutSuSOOyl7/Yjwxrfk="; ldflags = [ "-s" diff --git a/pkgs/by-name/hc/hcl2json/package.nix b/pkgs/by-name/hc/hcl2json/package.nix index b239f80f1841..e2eff0890edb 100644 --- a/pkgs/by-name/hc/hcl2json/package.nix +++ b/pkgs/by-name/hc/hcl2json/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcl2json"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "tmccombs"; repo = "hcl2json"; rev = "v${version}"; - sha256 = "sha256-fgRrIJnl7lV3a2+d9/F141xCAKOj0WmeNlrtEwdl1qA="; + sha256 = "sha256-jE106vWj1uVPmN9iofg/sWZCpSYDyh2/SHwPg5xHatE="; }; - vendorHash = "sha256-qG7n8OLpCknjjTxi4ojsvz6D7JXIK5Ac9B/JS8vf9fg="; + vendorHash = "sha256-W5SKD0q3AdIE9Hihnwu6MGoXk1EgBo6ipZaQ73u2tLU="; subPackages = [ "." ]; diff --git a/pkgs/by-name/jo/joker/package.nix b/pkgs/by-name/jo/joker/package.nix index ed87d83771f4..9a4bbabf18eb 100644 --- a/pkgs/by-name/jo/joker/package.nix +++ b/pkgs/by-name/jo/joker/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "joker"; - version = "1.5.2"; + version = "1.5.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-pXeYVhm8lpwzn1IAwYquBMmuQsbAev06BzK4TvtNsLo="; + sha256 = "sha256-h0JUBGWnL0fWryY6+BUwcl8Liv7Xyw+ZiESjJpyQpCI="; }; vendorHash = "sha256-yH8QVzliAFZlOvprfdh/ClCWK2/7F96f0yLWvuAhGY8="; diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix index 767f103488d5..a40a14e11885 100644 --- a/pkgs/by-name/ky/kyverno/package.nix +++ b/pkgs/by-name/ky/kyverno/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-NGyNB+N80oXxgL3bg/E1DmeRYYNxKsDLIjfUwtVGk7A="; + hash = "sha256-tP+klX3FuVBci4SEr4IV0JnyMBnGUTXMsy1xjZ6eHSo="; }; ldflags = [ @@ -26,7 +26,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-AaQ4/yrLNqLFBVRuDVjRHiNE4Bxb0kTUG7WeNw+gpZo="; + vendorHash = "sha256-2qpZEHbBqGZsIizswJYmdJCjgIBhQsnYyHHIS4ZqZYQ="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch b/pkgs/by-name/lx/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch similarity index 100% rename from pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch rename to pkgs/by-name/lx/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/by-name/lx/lxappearance/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxappearance/default.nix rename to pkgs/by-name/lx/lxappearance/package.nix diff --git a/pkgs/desktops/lxde/core/lxmenu-data/default.nix b/pkgs/by-name/lx/lxmenu-data/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxmenu-data/default.nix rename to pkgs/by-name/lx/lxmenu-data/package.nix diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/by-name/lx/lxpanel/package.nix similarity index 96% rename from pkgs/desktops/lxde/core/lxpanel/default.nix rename to pkgs/by-name/lx/lxpanel/package.nix index c970ea9e4ac3..dd55e41bb898 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/by-name/lx/lxpanel/package.nix @@ -10,7 +10,7 @@ libxmlxx, keybinder, keybinder3, - gtk2, + gtk2-x11, gtk3, libX11, libfm, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ (if withGtk3 then keybinder3 else keybinder) - (if withGtk3 then gtk3 else gtk2) + (if withGtk3 then gtk3 else gtk2-x11) libX11 (libfm.override { inherit withGtk3; }) (if withGtk3 then libwnck else libwnck2) diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/by-name/lx/lxrandr/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxrandr/default.nix rename to pkgs/by-name/lx/lxrandr/package.nix diff --git a/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch b/pkgs/by-name/lx/lxrandr/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch rename to pkgs/by-name/lx/lxrandr/respect-xml-catalog-files-var.patch diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/by-name/lx/lxsession/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxsession/default.nix rename to pkgs/by-name/lx/lxsession/package.nix diff --git a/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch b/pkgs/by-name/lx/lxsession/repect-xml-catalog-file-var.patch similarity index 100% rename from pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch rename to pkgs/by-name/lx/lxsession/repect-xml-catalog-file-var.patch diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/by-name/lx/lxtask/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxtask/default.nix rename to pkgs/by-name/lx/lxtask/package.nix diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 5a2c90693b41..0d87b4816c6f 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -68,16 +68,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.55.1"; + version = "0.56.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bi5vHxKdl9eWWdTB7td+rHuvjt6Ic4kjytWzHJTpCtQ="; + hash = "sha256-1jBVBN1/4WVXV6g3L27B+goFHhGcLSHDsPoNnQwt+sU="; }; - vendorHash = "sha256-C9qw6VDh+q1UD+Bc+cFAUjIzIXpQAy46cPdyfXwgBSA="; + vendorHash = "sha256-kvcRCRa4KyHFat7fwVw2VJETWIHAYK+/yH1crBZukDU="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 5d64c5f081af..6b72eced3727 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,13 +14,13 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-FFJiw2OE5mTFyjOdMoau8Ix8Q+id5hIpCeQaUua1IKg="; + hash = "sha256-U8LP85Qpl6G1O2UcmlXxOTohPUts0IcmTLWNYOHrTlY="; }; vendorHash = null; diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index 2db2d3e0cb2c..0f257d61cfa9 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "piv-agent"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "smlx"; repo = "piv-agent"; rev = "v${version}"; - hash = "sha256-4oyIUE7Yy0KUw5pC64MRKeUziy+tqvl/zFVySffxfBs="; + hash = "sha256-NNgDkdsEN2LxgxTlH4rMkod2E0/BDkjcS8Pes2/ZFEs="; }; - vendorHash = "sha256-4yfQQxMf00263OKEXTWD34YifK7oDclvPk8JDz5N1I0="; + vendorHash = "sha256-k1PMHUGu3I8tLFeeHjV2ZO9R/sHbbPzNa5u/HxzdlYc="; subPackages = [ "cmd/piv-agent" ]; diff --git a/pkgs/by-name/pu/pulsemeeter/package.nix b/pkgs/by-name/pu/pulsemeeter/package.nix index 64211a9dbbd7..1d02788682a3 100644 --- a/pkgs/by-name/pu/pulsemeeter/package.nix +++ b/pkgs/by-name/pu/pulsemeeter/package.nix @@ -2,43 +2,48 @@ lib, python3Packages, fetchFromGitHub, - libpulseaudio, libappindicator, gobject-introspection, - wrapGAppsHook3, + wrapGAppsHook4, callPackage, bash, + pipewire, + gtk4, }: python3Packages.buildPythonApplication rec { pname = "pulsemeeter"; - version = "1.2.14"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "theRealCarneiro"; repo = "pulsemeeter"; tag = "v${version}"; - hash = "sha256-QTXVE5WvunsjLS8I1rgX34BW1mT1UY+cRxURwXiQp5A="; + hash = "sha256-hmQI+E6WmYOK7oN7zTmshFZgJ0UiN2KdZ6ZiXwxRpNs="; }; build-system = with python3Packages; [ setuptools + babel ]; dependencies = with python3Packages; [ - pulsectl pygobject3 + pydantic + pulsectl + pulsectl-asyncio ]; nativeBuildInputs = [ - wrapGAppsHook3 + wrapGAppsHook4 gobject-introspection ]; buildInputs = [ libappindicator - libpulseaudio + pipewire bash + gtk4 ]; makeWrapperArgs = [ @@ -52,7 +57,7 @@ python3Packages.buildPythonApplication rec { passthru.tests.version = callPackage ./version-test.nix { inherit version; }; meta = { - description = "Frontend of pulseaudio's routing capabilities, mimicking voicemeeter's workflow"; + description = "Pulseaudio and pipewire audio mixer inspired by voicemeeter"; license = lib.licenses.mit; homepage = "https://github.com/theRealCarneiro/pulsemeeter"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/pu/pulsemeeter/version-test.nix b/pkgs/by-name/pu/pulsemeeter/version-test.nix index 4561918f144c..9ac6f12cafd8 100644 --- a/pkgs/by-name/pu/pulsemeeter/version-test.nix +++ b/pkgs/by-name/pu/pulsemeeter/version-test.nix @@ -27,7 +27,7 @@ pkgs.testers.runNixOSTest { machine.wait_for_unit("default.target") machine.succeed("su -- root -c 'systemctl start pulseaudio'") machine.succeed("su -- alice -c 'mkdir -p /home/alice/.config/pulsemeeter'") - version = machine.execute("su -- alice -c 'pulsemeeter -s | head -n 4 | tail -n 1'") - assert version == (0, 'Pulsemeeter version: \x1b[1m${version}\x1b[0m\n') + version = machine.execute("su -- alice -c 'pulsemeeter -v'") + assert version == (0, '${version}\n') ''; } diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix index a785dcc428f3..68ae87c74759 100644 --- a/pkgs/by-name/rb/rbw/package.nix +++ b/pkgs/by-name/rb/rbw/package.nix @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.13.2"; + version = "1.14.1"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - hash = "sha256-ebLbdIF+BybK7ssNtZacGWmAEwdNZh8b94QYgvcwzmM="; + hash = "sha256-4wNDDMaz9zjNYahOZXARDbNdGKl0kS0pF3qQuM7fK4s="; }; - cargoHash = "sha256-xDb4shDHCbd0yuTSAt80i1aqyuhpkfd/fYF98CfXdcM="; + cargoHash = "sha256-H1DSP3Kyklv8ncn7zDP0njDlwB8Qh+h7mqWRAJcpWrE="; nativeBuildInputs = [ installShellFiles @@ -77,7 +77,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://crates.io/crates/rbw"; changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ albakham ]; + maintainers = with lib.maintainers; [ + albakham + jasonxue1 + ]; mainProgram = "rbw"; }; } diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 85f086fb699b..0030b0eccb32 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -14,7 +14,7 @@ python312Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.10.2"; + version = "8.11.2"; pyproject = true; @@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-klG+cT2vXo9v9tIJhJNCeGTiuV5C+oed0Vi9310PnqQ="; + hash = "sha256-Rc3OSRTTpYA7WKI/WEvCdq1SQnkO91FXzQscV2b93TI="; }; patches = [ @@ -59,7 +59,9 @@ python312Packages.buildPythonApplication rec { --replace-fail 'arch_linker_path = Path(arch_config.dynamic_linker)' \ 'return str(Path("${glibc}/lib/ld-linux-x86-64.so.2"))' - substituteInPlace pyproject.toml --replace-fail 'gnupg' 'python-gnupg' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools>=69.0,<80.9.0' 'setuptools' \ + --replace-fail 'gnupg' 'python-gnupg' ''; nativeBuildInputs = [ makeWrapper ]; @@ -113,6 +115,7 @@ python312Packages.buildPythonApplication rec { pythonRelaxDeps = [ "click" "craft-parts" + "craft-providers" "cryptography" "docutils" "jsonschema" @@ -175,6 +178,11 @@ python312Packages.buildPythonApplication rec { "test_snap_command_fallback" "test_validate_architectures_supported" "test_validate_architectures_unsupported" + # Disabled because we're uisng a later version of a library than + # specified which changes the behaviour in a non-breaking way, apart + # from when a test is looking for a specific error message + "test_esm_error[core]" + "test_esm_error[core18]" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_load_project" ]; diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix index d10e750ba484..72fff5363ebf 100644 --- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix +++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix @@ -17,13 +17,13 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "synapse-admin-etkecc"; - version = "0.11.1-etke46"; + version = "0.11.1-etke47"; src = fetchFromGitHub { owner = "etkecc"; repo = "synapse-admin"; tag = "v${finalAttrs.version}"; - hash = "sha256-jRz4yST/Uqo2lLNKU/5vtP9pw3kLtgi3Btq5LxO2xOA="; + hash = "sha256-pf8g61jKj7nQXgEED3RGZiLHSvoBsYNo+M1cMsRCWnw="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 2b22901bbc0d..51f159f4eb42 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "templ"; - version = "0.3.937"; + version = "0.3.943"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-S3mXVlPnL79BL9twuZpPG6c+TWEC68LZE9cvnGWTLwk="; + hash = "sha256-7owKjFrIHi5+RhWXzUTWwwxFLu9RNmq2g3SUf9RuDDc="; }; vendorHash = "sha256-pVZjZCXT/xhBCMyZdR7kEmB9jqhTwRISFp63bQf6w5A="; diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix index 729ffecf834a..8cade5d819ca 100644 --- a/pkgs/by-name/ve/verapdf/package.nix +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -10,7 +10,7 @@ }: maven.buildMavenPackage rec { pname = "verapdf"; - version = "1.26.5"; + version = "1.28.2"; mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; @@ -18,13 +18,13 @@ maven.buildMavenPackage rec { owner = "veraPDF"; repo = "veraPDF-apps"; rev = "v${version}"; - hash = "sha256-2g16PJdbC4OgFzLonfZgE7LRw2dKGjLCb2AYvrr8lxA="; + hash = "sha256-tv5iffIQkyjHyulnmagcJuSGbc4tXRYTwB3hSEGLQrc="; }; patches = [ ./stable-maven-plugins.patch ]; # FIXME: this hash keeps changing over time?? - mvnHash = "sha256-uFY92BFsIu9B6clwQV3l718DsBxvswANrKEBIFGNXN4="; + mvnHash = "sha256-+4ccnv0S7K/S2T7KryBJHJBEFrMZSFC7cNf3Kg/wN20="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix index 980a799e09f0..5ecae36274d5 100644 --- a/pkgs/by-name/wg/wgcf/package.nix +++ b/pkgs/by-name/wg/wgcf/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.28"; + version = "2.2.29"; src = fetchFromGitHub { owner = "ViRb3"; repo = "wgcf"; tag = "v${version}"; - hash = "sha256-Xl0XXg5m+IPkUmwhFrUZUWwbGAGhKwnHoA+YPw3p5ws="; + hash = "sha256-Ak6EG24U9goQb1tOLRXI5kQen24c4KlDVDKhuTfobbo="; }; subPackages = "."; - vendorHash = "sha256-shb5m0zWRa9sX0g0WOPpcNMgwpfn8R3c/2GiZGeKr9k="; + vendorHash = "sha256-lG0D0LJV9IMq9R8O4IuxTQeulBb4q0ToZTU+HaGmn68="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix deleted file mode 100644 index 3b701cadd12b..000000000000 --- a/pkgs/desktops/lxde/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, -}: - -lib.makeScope pkgs.newScope ( - self: with self; { - - inherit (pkgs) gtk2-x11; - - lxappearance = callPackage ./core/lxappearance { }; - - lxappearance-gtk2 = callPackage ./core/lxappearance { - gtk2 = gtk2-x11; - withGtk3 = false; - }; - - lxmenu-data = callPackage ./core/lxmenu-data { }; - - lxpanel = callPackage ./core/lxpanel { - gtk2 = gtk2-x11; - }; - - lxrandr = callPackage ./core/lxrandr { }; - - lxsession = callPackage ./core/lxsession { }; - - lxtask = callPackage ./core/lxtask { }; - } -) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index fc7f12a6bbef..0f3be653e510 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "25.2.1"; + version = "25.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-BlOjNdQc7RtFk0EvqbPg3nccsiAAbGMKuwNLn+HcyEU="; + hash = "sha256-9w/E5frSvCtPBI58ClXZyGyF59M+yVS4qi4khpfUZwk="; }; meta = { diff --git a/pkgs/development/python-modules/arro3/default.nix b/pkgs/development/python-modules/arro3/default.nix new file mode 100644 index 000000000000..db8406ad71e2 --- /dev/null +++ b/pkgs/development/python-modules/arro3/default.nix @@ -0,0 +1,122 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytestCheckHook, + geoarrow-types, + pyarrow, + numpy, + pandas, +}: +let + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "kylebarron"; + repo = "arro3"; + tag = "py-v${version}"; + hash = "sha256-RTr+mf5slfxxvXp9cwPuy08AZUswPtIIRz+vngdg/k0="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit version src; + pname = "arro3-vendor"; + hash = "sha256-YQA8Z86Ul8yAHncMgYrGmNe10KSpubHjaokCjaqTAxo="; + }; + + commonMeta = { + homepage = "https://github.com/kylebarron/arro3"; + changelog = "https://github.com/kylebarron/arro3/releases/tag/py-v${version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mslingsby ]; + }; + + buildArro3Package = + { + pname, + subdir, + description, + pythonImportsCheck, + dependencies ? [ ], + }: + buildPythonPackage rec { + inherit + pname + version + src + cargoDeps + dependencies + pythonImportsCheck + ; + pyproject = true; + + sourceRoot = "${src.name}/${subdir}"; + cargoRoot = ".."; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + env = { + CARGO_TARGET_DIR = "./target"; + }; + + # Avoid infinite recursion in tests. + # arro3-core tests depends on arro3-compute and arro3-compute depends on arro3-core + passthru.tests = { inherit arro3-tests; }; + + meta = commonMeta // { + inherit description; + }; + }; + + arro3-core = buildArro3Package { + pname = "arro3-core"; + subdir = "arro3-core"; + description = "Core library for representing Arrow data in Python"; + pythonImportsCheck = [ "arro3.core" ]; + }; + + arro3-compute = buildArro3Package { + pname = "arro3-compute"; + subdir = "arro3-compute"; + description = "Rust-based compute kernels for Arrow in Python"; + pythonImportsCheck = [ "arro3.compute" ]; + dependencies = [ arro3-core ]; + }; + + arro3-io = buildArro3Package { + pname = "arro3-io"; + subdir = "arro3-io"; + description = "Rust-based readers and writers for Arrow in Python"; + pythonImportsCheck = [ "arro3.io" ]; + dependencies = [ arro3-core ]; + }; + + arro3-tests = buildPythonPackage { + pname = "arro3-tests"; + version = arro3-core.version; + + format = "other"; + dontBuild = true; + dontInstall = true; + + inherit src; + + nativeCheckInputs = [ + pytestCheckHook + geoarrow-types + pandas + pyarrow + numpy + arro3-core + arro3-compute + arro3-io + ]; + }; +in +{ + inherit arro3-core arro3-io arro3-compute; +} diff --git a/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix new file mode 100644 index 000000000000..5eb6019ea839 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-resource-deployments/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + azure-mgmt-core, + azure-common, + isodate, + pythonOlder, + setuptools, + typing-extensions, + azure-cli, +}: + +buildPythonPackage rec { + pname = "azure-mgmt-resource-deployments"; + version = "1.0.0b1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "azure_mgmt_resource_deployments"; + inherit version; + hash = "sha256-c1m0JliCbn5/8T5tuwxJDpX8yV28oiTSuFz3GtdTXx0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + azure-common + azure-mgmt-core + isodate + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonNamespaces = [ + "azure.mgmt.resource.deployments" + ]; + + pythonImportsCheck = [ + "azure.mgmt.resource.deployments" + "azure.mgmt.resource.deployments.models" + ]; + + meta = with lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-deployments"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deployments_${version}/sdk/resources/azure-mgmt-resource-deployments/CHANGELOG.md"; + license = licenses.mit; + maintainers = azure-cli.meta.maintainers; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-resource-deploymentscripts/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-deploymentscripts/default.nix new file mode 100644 index 000000000000..3fbca5fec29b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-resource-deploymentscripts/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + azure-mgmt-core, + azure-common, + isodate, + pythonOlder, + setuptools, + typing-extensions, + azure-cli, +}: + +buildPythonPackage rec { + pname = "azure-mgmt-resource-deploymentscripts"; + version = "1.0.0b1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "azure_mgmt_resource_deploymentscripts"; + inherit version; + hash = "sha256-Vm2FWVPpSbsrNMtD4ecwVKqnkoHHRhO3Rf/duCyAI3U="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + azure-common + azure-mgmt-core + isodate + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonNamespaces = [ + "azure.mgmt.resource.deploymentscripts" + ]; + + pythonImportsCheck = [ + "azure.mgmt.resource.deploymentscripts" + ]; + + meta = with lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-deploymentscripts"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deploymentscripts_${version}/sdk/resources/azure-mgmt-resource-deploymentscripts/CHANGELOG.md"; + license = licenses.mit; + maintainers = azure-cli.meta.maintainers; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-resource-deploymentstacks/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-deploymentstacks/default.nix new file mode 100644 index 000000000000..7740e636ba4b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-resource-deploymentstacks/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + azure-mgmt-core, + azure-common, + isodate, + pythonOlder, + setuptools, + typing-extensions, + azure-cli, +}: + +buildPythonPackage rec { + pname = "azure-mgmt-resource-deploymentstacks"; + version = "1.0.0b1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "azure_mgmt_resource_deploymentstacks"; + inherit version; + hash = "sha256-Sbh25FwPW6uI7EfXxW6Ps0+9/P5bgxo6KiHoF/PZcy4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + azure-common + azure-mgmt-core + isodate + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonNamespaces = [ + "azure.mgmt.resource.deploymentstacks" + ]; + + pythonImportsCheck = [ + "azure.mgmt.resource.deploymentstacks" + ]; + + meta = with lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-deploymentstacks"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-deploymentstacks_${version}/sdk/resources/azure-mgmt-resource-deploymentstacks/CHANGELOG.md"; + license = licenses.mit; + maintainers = azure-cli.meta.maintainers; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-resource-templatespecs/default.nix b/pkgs/development/python-modules/azure-mgmt-resource-templatespecs/default.nix new file mode 100644 index 000000000000..75c261f3d5f8 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-resource-templatespecs/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + azure-mgmt-core, + azure-common, + isodate, + pythonOlder, + setuptools, + typing-extensions, + azure-cli, +}: + +buildPythonPackage rec { + pname = "azure-mgmt-resource-templatespecs"; + version = "1.0.0b1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "azure_mgmt_resource_templatespecs"; + inherit version; + hash = "sha256-D55zmrQ9sq2HDq5d8bXEv6BQC76hxuWKpeLpw4X6y8U="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + azure-common + azure-mgmt-core + isodate + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonNamespaces = [ + "azure.mgmt.resource.templatespecs" + ]; + + pythonImportsCheck = [ + "azure.mgmt.resource.templatespecs" + ]; + + meta = with lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource-templatespecs"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource-templatespecs_${version}/sdk/resources/azure-mgmt-resource-templatespecs/CHANGELOG.md"; + license = licenses.mit; + maintainers = azure-cli.meta.maintainers; + }; +} diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index 4c4242cca658..f48aa94ae967 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; @@ -26,15 +26,12 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; tag = version; - hash = "sha256-VjGoAsmdYyoU7ngU69HVNauEk2/vbcEz2tMCTmjheF4="; + hash = "sha256-NXMBaY4sZT47Qi3XS5yuiXJEMKENghiXkLXnXHHYpRI="; }; postPatch = '' substituteInPlace craft_archives/__init__.py \ --replace-fail "dev" "${version}" - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools==67.7.2" "setuptools" ''; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index 53c8a3691462..a464fd1f15d3 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "craft-grammar"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-grammar"; tag = version; - hash = "sha256-R1+8KuJmG12WhJyeOu5G43hcXPHBD6UOqcKRePQNiZM="; + hash = "sha256-URyc+N2WSXnjurqd1ieV2mN4Uf9m0zivupRuKmH6s8Q="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index c675d3d4834f..cc2f8c0c175f 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.20.0"; + version = "2.20.1"; pyproject = true; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-apuAV17IlxbkaQvCzyqEhQwTYvqHibwvWHUEPYUiCJQ="; + hash = "sha256-YTyoJzot7GkRp+szo+a3wx5mWWJcYj7ke7kcxri9n10="; }; patches = [ ./bash-path.patch ]; diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 1d0969cd9525..3d01c52ff743 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "2.4.0"; + version = "3.0.0"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; tag = version; - hash = "sha256-frcRv+19czsZ948SEKfYsMUP6n9MbJv6gxXUAdwFw4Y="; + hash = "sha256-8StnxyuvyK9HRl1smbhJFz1qZxyNOWnzELG0ku0dh8k="; }; patches = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==75.9.1" "setuptools" + --replace-fail "setuptools==80.9.0" "setuptools" ''; pythonRelaxDeps = [ "requests" ]; diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix index f5a342d66f1c..de3a13612a33 100644 --- a/pkgs/development/python-modules/django-htmx/default.nix +++ b/pkgs/development/python-modules/django-htmx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-htmx"; - version = "1.23.0"; + version = "1.23.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "django-htmx"; rev = version; - hash = "sha256-IgVkHgTk4hC0lL6LVM16QoT2xtPWxKNu+NrcyxZ5oVY="; + hash = "sha256-fteFMwfHuQdAIn5OMbpc52/18pkh8+O11KhvnKH6Jj8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 6383e937979a..fdb3597e7cd8 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.7.4"; + version = "4.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-z3n0BDhUXO5GFPT1zE2GI2Fx+xFDJgOfe4w5Swy80Lk="; + hash = "sha256-nU79v0n6Dx5YV4nWBtLYXU1oickdcS43Me5fd5QNb88="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index e78f220213c8..4c69dac2ac79 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "postfix_exporter"; - version = "0.12.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Hsn723"; repo = "postfix_exporter"; tag = "v${version}"; - sha256 = "sha256-3Sj9qRAK7lDLYShE0G1UkZsDPAMlk4KZBucDeWcnS4I="; + sha256 = "sha256-D6m0xWNkUMouubNjIaB/dHT1YIcDi/oJ6U+2lmKwBZM="; }; - vendorHash = "sha256-HCKJA7T5kCQX9ZEClHWgZgjN71YG3BGF8gXc1aDKDJ8="; + vendorHash = "sha256-kmZWQu26TBhEQo/SrPxhyeGo5yliCFUCTxIIkncCciw="; ldflags = [ "-s" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c5e565655942..3f8a2203967e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -461,6 +461,7 @@ mapAliases { appthreat-depscan = dep-scan; # Added 2024-04-10 arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12 arb = throw "'arb' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28 + arc-browser = throw "arc-browser was removed due to being unmaintained"; # Added 2025-09-03 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15 archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01 @@ -1489,6 +1490,25 @@ mapAliases { lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 + + lxde = { + gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; + + lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31 + + lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level. Use 'lxappearance-gtk2' directly"; # added 2025-08-31 + + lxmenu-data = throw "'lxmenu-data' has been moved to top-level. Use 'lxmenu-data' directly"; # added 2025-08-31 + + lxpanel = throw "'lxpanel' has been moved to top-level. Use 'lxpanel' directly"; # added 2025-08-31 + + lxrandr = throw "'lxrandr' has been moved to top-level. Use 'lxrandr' directly"; # added 2025-08-31 + + lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31 + + lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31 + }; + lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0748e9f15a69..62ad672607c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14320,17 +14320,10 @@ with pkgs; ### DESKTOPS/LXDE - lxde = recurseIntoAttrs (callPackage ../desktops/lxde { }); - # Backwards compatibility aliases - inherit (lxde) - lxappearance - lxappearance-gtk2 - lxmenu-data - lxpanel - lxrandr - lxsession - lxtask - ; + lxappearance-gtk2 = callPackage ../by-name/lx/lxappearance/package.nix { + gtk2 = gtk2-x11; + withGtk3 = false; + }; lxqt = recurseIntoAttrs ( import ../desktops/lxqt { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91a969d2e98f..e2e934c1be5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -907,6 +907,12 @@ self: super: with self; { arris-tg2492lg = callPackage ../development/python-modules/arris-tg2492lg { }; + arro3-compute = (callPackage ../development/python-modules/arro3 { }).arro3-compute; + + arro3-core = (callPackage ../development/python-modules/arro3 { }).arro3-core; + + arro3-io = (callPackage ../development/python-modules/arro3 { }).arro3-io; + arrow = callPackage ../development/python-modules/arrow { }; arsenic = callPackage ../development/python-modules/arsenic { }; @@ -1528,6 +1534,22 @@ self: super: with self; { azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; + azure-mgmt-resource-deployments = + callPackage ../development/python-modules/azure-mgmt-resource-deployments + { }; + + azure-mgmt-resource-deploymentscripts = + callPackage ../development/python-modules/azure-mgmt-resource-deploymentscripts + { }; + + azure-mgmt-resource-deploymentstacks = + callPackage ../development/python-modules/azure-mgmt-resource-deploymentstacks + { }; + + azure-mgmt-resource-templatespecs = + callPackage ../development/python-modules/azure-mgmt-resource-templatespecs + { }; + azure-mgmt-scheduler = callPackage ../development/python-modules/azure-mgmt-scheduler { }; azure-mgmt-search = callPackage ../development/python-modules/azure-mgmt-search { };