diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 5e5a649bf5a5..82ec0a2a4991 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -1,4 +1,4 @@ -# Nixpkgs 25.11 ("Xantusia", 2025.11/??) {#sec-nixpkgs-release-25.11} +# Nixpkgs 25.11 ("Xantusia", 2025.11/30) {#sec-nixpkgs-release-25.11} ## Highlights {#sec-nixpkgs-release-25.11-highlights} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 51be88065fb9..54c6af756f33 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13574,9 +13574,9 @@ }; keyzox = { email = "nixpkgs@adjoly.fr"; - github = "Keyzox"; + github = "KeyZox71"; matrix = "@keyzox:matrix.org"; - githubId = 18579667; + githubId = 45126464; name = "Adam J."; }; kfiz = { @@ -14733,7 +14733,7 @@ name = "Levi Gross"; }; Levizor = { - email = "levizorri@protonmail.com"; + email = "levizor@disroot.org"; github = "Levizor"; githubId = 132144514; name = "Lev Sauliak"; diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index 06f3acabf14d..9bb391f0d26e 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -8,7 +8,7 @@ passed and a selection of packages has been built successfully (see `nixos/release-combined.nix` and `nixos/release-small.nix`). These channels are: -- *Stable channels*, such as [`nixos-25.05`](https://channels.nixos.org/nixos-25.05). +- *Stable channels*, such as [`nixos-25.11`](https://channels.nixos.org/nixos-25.11). These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not @@ -21,7 +21,7 @@ These channels are: radical changes between channel updates. It's not recommended for production systems. -- *Small channels*, such as [`nixos-25.05-small`](https://channels.nixos.org/nixos-25.05-small) +- *Small channels*, such as [`nixos-25.11-small`](https://channels.nixos.org/nixos-25.11-small) or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small). These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated @@ -40,8 +40,8 @@ supported stable release. When you first install NixOS, you're automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 25.05 ISO, you will be subscribed to -the `nixos-25.05` channel. To see which NixOS channel you're subscribed +instance, if you installed from a 25.11 ISO, you will be subscribed to +the `nixos-25.11` channel. To see which NixOS channel you're subscribed to, run the following as root: ```ShellSession @@ -59,13 +59,13 @@ To switch to a different NixOS channel, do use the NixOS 25.05 stable channel: ```ShellSession -# nix-channel --add https://channels.nixos.org/nixos-25.05 nixos +# nix-channel --add https://channels.nixos.org/nixos-25.11 nixos ``` If you have a server, you may want to use the "small" channel instead: ```ShellSession -# nix-channel --add https://channels.nixos.org/nixos-25.05-small nixos +# nix-channel --add https://channels.nixos.org/nixos-25.11-small nixos ``` And if you want to live on the bleeding edge: @@ -118,5 +118,5 @@ the new generation contains a different kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. ```nix -{ system.autoUpgrade.channel = "https://channels.nixos.org/nixos-25.05"; } +{ system.autoUpgrade.channel = "https://channels.nixos.org/nixos-25.11"; } ``` diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 62a06ed4e111..295b321f9cd8 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -1,4 +1,4 @@ -# Release 25.11 ("Xantusia", 2025.11/??) {#sec-release-25.11} +# Release 25.11 ("Xantusia", 2025.11/30) {#sec-release-25.11} ## Highlights {#sec-release-25.11-highlights} diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix index 7dad40fcec2c..c758831c759e 100644 --- a/nixos/modules/programs/ccache.nix +++ b/nixos/modules/programs/ccache.nix @@ -38,6 +38,11 @@ in default = "nixbld"; description = "Group owner of CCache directory"; }; + trace = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Trace ccache usage to see which derivations use ccache"; + }; }; config = lib.mkMerge [ @@ -73,7 +78,11 @@ in ( self: super: lib.genAttrs cfg.packageNames ( - pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; } + pn: + super.${pn}.override { + stdenv = + if cfg.trace then builtins.trace "with ccache: ${pn}" self.ccacheStdenv else self.ccacheStdenv; + } ) ) diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index 51761ea4e0ae..36070bb92477 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -38,6 +38,9 @@ in boot.kernelModules = [ "ddcci_backlight" ]; + boot.extraModulePackages = [ + config.boot.kernelPackages.ddcci-driver + ]; # Load the i2c-dev module hardware.i2c = { enable = true; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index e26600bd0e8e..8c58b0ba70d0 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1300,6 +1300,18 @@ in type = types.bool; }; }; + + plugins = { + preinstall_disabled = mkOption { + description = '' + When set to `true`, disables the Background Plugin Installer, which runs before Grafana starts. + This component causes issues with `declarativePlugins` and is disabled by default if those are used. + ''; + default = cfg.declarativePlugins != null; + defaultText = literalExpression "cfg.declarativePlugins != null"; + type = types.bool; + }; + }; }; }; }; diff --git a/nixos/tests/k3s/auto-deploy.nix b/nixos/tests/k3s/auto-deploy.nix index d8ca4822abf0..6539284b4e3e 100644 --- a/nixos/tests/k3s/auto-deploy.nix +++ b/nixos/tests/k3s/auto-deploy.nix @@ -11,7 +11,7 @@ import ../make-test-python.nix ( name = "k3s-pause-image-env"; paths = with pkgs; [ tini - (hiPrio coreutils) + (lib.hiPrio coreutils) busybox ]; }; diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index 4ce38f5ceef0..0a6f688afddc 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -11,7 +11,7 @@ import ../make-test-python.nix ( name = "k3s-pause-image-env"; paths = with pkgs; [ tini - (hiPrio coreutils) + (lib.hiPrio coreutils) busybox ]; }; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index b7c3fe5f7044..564e5b4bc82d 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { with each other, with the help of a P2P network to check for double-spending. ''; homepage = "https://groestlcoin.org/"; - downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v{version}/"; + downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v${version}/"; maintainers = with maintainers; [ gruve-p ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 012f0c7f20d9..c06757a8bc8b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1900,8 +1900,8 @@ let mktplcRef = { publisher = "github"; name = "codespaces"; - version = "1.18.0"; - hash = "sha256-D5Khohd1oV8c7uHT6zgiZsigtafAWdXinV2NTUF0EaM="; + version = "1.18.3"; + hash = "sha256-NcCVpRbFdfRaV7nwQgMNOJWvhrFZ/FCJpcVoivS+jVI="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index f99223e1360f..ce4ac58c1df6 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-11-21"; + version = "0-unstable-2025-11-29"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "e48a37173350b5aec2a6431add7c1a625d1f28bf"; - hash = "sha256-xxqSx199DI7nQ+3xq4CP8uhtmQ2UGxNG39kYvGPXdag="; + rev = "65cd61cc262a8685d4f29ebcb7df2a40ed988e26"; + hash = "sha256-QC4xGdZglsrbNjfGA+XQ/iD5eTFvDLtrAbWYCkb5z1s="; }; meta = { diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index e38374263361..2956977c914c 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -137,7 +137,7 @@ python3.pkgs.buildPythonApplication { of the blockchain. ''; homepage = "https://groestlcoin.org/"; - downloadPage = "https://github.com/Groestlcoin/electrum-grs/releases/tag/v{version}"; + downloadPage = "https://github.com/Groestlcoin/electrum-grs/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ gruve-p ]; diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json index 61f642c70b4a..a17aa3bd84cc 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "22972425bc5554ce4d9958a3b7b5b3c1d4d80d9e6dd9494e9853fc659b944724" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "d6a0e04f107d223795869aa839b1e504716c4d90f40411cc158bd565c4bef171" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "2b89cf256067bb292cc24e0a93688c2e4704387910a37cda38ef83727121c780" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "616b23148d7f81128861aa3793e972ffc8419f7f674eab6b248bd9e33d805696" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "2437c19cfe19a8d62097430e8f51cab2ed740b42b18ee060bc7a18a7421f8ac9" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "46519a25426c7db9ca8828fa518c7918d26c1088b48d5b309fd77e81a73e500d" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "e7ba4d17e439863f71f303d871f6c700fdafc3b96fb69323cb59f2319ab844d4" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "082c8b305b73b1a678c1d6549b77eae1d44b2f954d07d76acf9c13181a0b0718" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "90abbf66bae88eec6016c2a5053523dcbcdf94d215775b4bd773d322b236fc84" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "8ff705955f8c199b92a35554ed3c154c37920a5c6e6a46a9c18f884b979ea391" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "fd166a50cbe9be3e3a41d5e3292357168578622a5d1211642206b9afd6cf1ddc" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "b0968e1bf34d1109572e3795bae315ae7609be69b1c1f87dc0d6fce072790fe7" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index 49d730df7498..211e796b63d1 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.31.13+k3s1"; - k3sCommit = "a4ca1794628ec6d699b5768ef9fc1b99e1694efc"; - k3sRepoSha256 = "0zlvbkidan1jpdbcqqvpr46701rcnch4q7iczbpadbx7ixq7qmwj"; - k3sVendorHash = "sha256-wR4GNGd9QK/6IVdoXmcPDQwj0dvA/ofwVBgWXDmHz1U="; + k3sVersion = "1.31.14+k3s1"; + k3sCommit = "a2ef79f53538e58982857c1820469792d582e470"; + k3sRepoSha256 = "0rww4z63vf13g3rssqfmp9444bs1mzb1y6wddysqfxj8fm3kakwl"; + k3sVendorHash = "sha256-FBNHUk04m8El4oTyJMznv8eyT8DSt5Q3ypqL9qT/WDU="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; - k3sCNIVersion = "1.7.1-k3s1"; - k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.1.4-k3s1.32"; - containerdSha256 = "05dcyv5kxic99ghi8wb1b544kmq0ccc06yiln2yfh49h11hngw50"; + k3sCNIVersion = "1.8.0-k3s1"; + k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg"; + containerdVersion = "2.1.5-k3s1.32"; + containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn"; criCtlVersion = "1.31.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix index f511cbde3870..ae882e7da509 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz"; - sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz"; + sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz"; - sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz"; + sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json index 86876032dbbd..956cdbe87d17 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "50ba2c60c4541a2f09436e7fd91b8b782b2055f91b60ee668d70b29b9f6f1783" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.10%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "0bad9ede6ecd09461f9f73c44073e97f20e45c59556c0db61be93f8695fdf901" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "079ef47f09b80397402a818c748aeebd6ba41a405f04c81c80ef05fbffc11dee" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "4217e7a36bfecc66cd678e854175f740f6b97dda44b094a132bf751c7198bba9" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "7718b0be16c4cd336ca79df2bb1a0688fe1d76fdb83c584adb47a44ce70a630e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.10%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "7c21cafa273e4cf30fd43c7fccb147897084bb7eba21c9e99b3ae0246eef7a55" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "2dcb0dcbb9d50ceef87be1125b6d6ca7a7f7ac233c3715d67db0680153486ed6" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.10%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "a52d31f6dbc756ffe8a1701d3ad52d432a904d7b34932049d411f16bc3bb4e2c" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "dfe042271ed97ef15a418cb219d31952914b4e78027d8dd871382e5e6bdbc7d1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.10%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "d35f436ed082ccde1b3712617b05da4464832747bb41dcd14261237834d91296" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "b92d129d8e182fd8079be5fa1442116e47cb8e298f9a3ced0e401b2d02929675" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "a32df1ffd86eb63e5f91e1c69438ff4074020ca76976a293321e524bc1562fc0" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index f8c20d143a40..d60771de68b2 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.32.9+k3s1"; - k3sCommit = "062b953493abc18cbf3a85d76a71d70a9ea4b5cd"; - k3sRepoSha256 = "0hsdkrdqb9dbi60k8fczxg23n72mp191qmpd0kqa0x1s6hq2pjw2"; - k3sVendorHash = "sha256-ou169BNhsrY66iLVPufvOp1lYdiqR5e7mzNGDLOlW2I="; + k3sVersion = "1.32.10+k3s1"; + k3sCommit = "1c5d65cec8e24f5238e2e0b21f0dac8c2f8d5db5"; + k3sRepoSha256 = "0wfh2m55dxfvf3m74jrwvpc21xxc17gwbifnkl9nyd8kha271876"; + k3sVendorHash = "sha256-PedpbkyP3XZ8yLlFo/VGjPlImYGOk5ebPYGivPR2Izg="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; - k3sCNIVersion = "1.7.1-k3s1"; - k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.1.4-k3s1.32"; - containerdSha256 = "05dcyv5kxic99ghi8wb1b544kmq0ccc06yiln2yfh49h11hngw50"; + k3sCNIVersion = "1.8.0-k3s1"; + k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg"; + containerdVersion = "2.1.5-k3s1.32"; + containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn"; criCtlVersion = "1.31.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix index f511cbde3870..ae882e7da509 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz"; - sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz"; + sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz"; - sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz"; + sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index ad770df1ac81..d62353c580db 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "580c09a6f8c088de023ff8ce256371e807edb45d60db9e53505db263e8987110" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.6%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "9cc46db774c51e4195dfe3c2dafe1ecc18c7293bf08e7a81258aec07e60fc26d" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "c1d71ab864b6b7de087d0827a1810c5fd271134e317af8730ec9211eaf34b097" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1a852774a4cf27b24b1c60fc8fdc88e1f31841955dad99dfedd492a4ccfb6c08" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "940581b495178e35865db8bc7791052bfc3f62bc01fc960e7de27807b50473bd" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.6%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "4026e1da9f3f184e4d66474d278785c50276867e057376073504b63f06d48e7c" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "7a31e2d1d3bb220fe9073bf58051046745dfb871ca51230e56ec5789cb97d875" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.6%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "c1f1dc4e3a3f42ec1aad051b0d7a6ecb4853f5f428f043c318d1aab5ab73728d" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "2ea460f5c783cec0479e6cf8d82e11ed6b6fee6c8e7622243fadd5f8b7476beb" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.6%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "7bbe0b76621debfeaf8f50a931e833102d7cade1a65b7fd8ff83027aa8f5add5" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "b0408ae107ce0ddbd47b62242d8e2e97532b1cfeeef1a38cad0cc54dfd289edc" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "059a3595138d019c676b2753b144dab613c4ee1d3892a115a95e74d665009b1b" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index 5da897e2b304..83459b59dd75 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.33.5+k3s1"; - k3sCommit = "fab4a5c3de46748494cf7ad5dccc89b213965b08"; - k3sRepoSha256 = "0c0phxnx09gainay4cgbcc2j1ddci73a9i0q92zf32whkbp06112"; - k3sVendorHash = "sha256-v+tfVL9sDyiDRB3/IDDfyDekFAdjdUtTTChu6l5Qvg0="; + k3sVersion = "1.33.6+k3s1"; + k3sCommit = "b5847677be5afdc431f70afec6780679c3845d16"; + k3sRepoSha256 = "0pm8x121pb6pyn9rq9c5pbr7y293rzyp0q3c5mc1gb4glqwx7f8g"; + k3sVendorHash = "sha256-Cjacx5i1ahZ9RBXBTsUtmNDyyofw1fedpExTHuU8grA="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; - k3sCNIVersion = "1.7.1-k3s1"; - k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.1.4-k3s1"; - containerdSha256 = "0fg9py52hac5bdmrabvkcpc1aawxl5xc0ij9zx964qkkc7fa19ca"; + k3sCNIVersion = "1.8.0-k3s1"; + k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg"; + containerdVersion = "2.1.5-k3s1.33"; + containerdSha256 = "15iw6px3710rlsx7j933i07qd4a2r7caagfjbhhfcp33m9k19v7h"; criCtlVersion = "1.33.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix index f511cbde3870..ae882e7da509 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz"; - sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz"; + sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz"; - sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz"; + sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json index 1d838a36651c..5cbddbcf2378 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "076c53d96bbca9ed7aee5a4e398933787c55c59fd58e617581ce885e22759793" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.2%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "4bfa596bec42e8752d6f90e69e724ee438c2a8c3ba7827c3d4f30ca8ca30de35" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "27355d2838c727180f0a8ded8aec0ac14e2186bd50487a3c3f29500884121aa7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "24359781bd775f513691e98031853d79eac53e265f7d72d1e7325df4f3b18eb0" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "7292bafb04a8800b7efdc096a4e4f00d972dcf9a009f7ccca311a0bc9b23eda1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.2%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "ee792ad7b22a03567fd2dea4e16bf239667df50367f6b65070d5daf76e6054f8" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "64e166d1b037ed87566c444261365bdd54745de6cf8acf1ae4698ddf34ca69a7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.2%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "ae43b262c9d739a7b693670825160e9afab6b10fdb975659679de576b84ae286" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "b1f649125466251088aec6fcd56b86df29d7674eb3ae6ab596448ddfd60cc9e0" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.2%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "2e0383744babd5e801acdb2c6bd9cced8cf2d60c7b4a699ecf3311e200aeacdb" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "78380791cb61262b78d61c2b52fd77e0eedde6c0351e53d11e2cfb9034ec5937" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "41b34aab92bc5166135dc73217ead65766688fd3543166ce32ffff7e101bef46" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch b/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch deleted file mode 100644 index 7788762eaf2b..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/scripts/version.sh b/scripts/version.sh -index 37500a3b788d..96a6e6205472 100755 ---- a/scripts/version.sh -+++ b/scripts/version.sh -@@ -10,11 +10,11 @@ if [ -z "$NO_DAPPER" ]; then - fi - - get-module-version(){ -- go list -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1 -+ go list -mod=readonly -e -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1 - } - - get-module-path(){ -- go list -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1 -+ go list -mod=readonly -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1 - } - - PKG_CONTAINERD_K3S=$(get-module-path github.com/containerd/containerd/v2) diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix index 6dfebc63f175..6e7d8df7cd9e 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.34.1+k3s1"; - k3sCommit = "24fc436e6ea59c56ebc37727baa4e6c9a201ee01"; - k3sRepoSha256 = "0fjkjsmig7xdn1filph2wbp69jva0jdkv8ax68wymvbqq4rn3s0k"; - k3sVendorHash = "sha256-87YMUWhwfFwm5bzcL42b7JFJbVWsoRtubH4jjYH/7mc="; + k3sVersion = "1.34.2+k3s1"; + k3sCommit = "8dac81b2a24e78ce4cf951c7788ea6a8d4a59aa7"; + k3sRepoSha256 = "1nwh1aggxvjv99kz1zkklim7jqsn0d44g8905653gkfpk0givghq"; + k3sVendorHash = "sha256-IJi5gVxBsAjeQHi5rQpNRvWOXuNPx2Rtsy18VL+2Yxo="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; - k3sCNIVersion = "1.7.1-k3s1"; - k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "2.1.4-k3s2"; - containerdSha256 = "18z6i6mzvllhglarsc6npn4k0m4akg7wm1rqc4a926dag47mgh8j"; + k3sCNIVersion = "1.8.0-k3s1"; + k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg"; + containerdVersion = "2.1.5-k3s1"; + containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8"; criCtlVersion = "1.34.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 3ca67f10228b..b09cedc0b4e2 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -355,6 +355,13 @@ buildGoModule (finalAttrs: { GOARCH="${pkgsBuildBuild.go.GOARCH}" \ CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ "''${GO}" generate' + + # Add the -e flag to process "errornous" packages. We need to modify this because the upstream + # build-time version detection doesn't work with a vendor directory. + substituteInPlace scripts/version.sh \ + --replace-fail \ + "go list -mod=readonly -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' \$1" \ + "go list -mod=readonly -e -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' \$1" ''; # Important utilities used by the kubelet, see diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index aac1f555d094..9e9699fcd515 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -54,10 +54,6 @@ in ) extraArgs).overrideAttrs { patches = [ - # Sets -mod=readonly for go list commands in scripts/version.sh to prevent go from using - # the (intentional) incomplete vendor directory. Additionally, sets -e for go list to - # change handling of erroneous packages. - ./1_34/version_sh_go_list.patch # Adds explicit require of opencontainers/runc to go.mod before version.sh is called and # removes it afterwards so that later build commands don't complain about inconsistent # vendoring. diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix index 445f58cb98fb..cea7fc91adb2 100644 --- a/pkgs/applications/video/mpv/scripts/videoclip.nix +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -10,13 +10,13 @@ }: buildLua { pname = "videoclip"; - version = "0-unstable-2025-03-10"; + version = "0-unstable-2025-11-20"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "785eb86bc080c445e8feb947d7caa8f3a097bf2b"; - hash = "sha256-oanc9MggMjVDrSW42XrQwwWw2YTrifiCVrg/r42oGx8="; + rev = "1c6531b649d3ee526cc7aa360e726aeedf43beb9"; + hash = "sha256-lBXlvFrDC1Drz5JIiI6488UoFsXz18LAxqRpQmy1G0k="; }; patchPhase = '' @@ -30,7 +30,9 @@ buildLua { scriptPath = "."; passthru.scriptName = "videoclip"; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; meta = with lib; { description = "Easily create videoclips with mpv"; diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index 57ad7941c8a3..3e3f6c9adfb8 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -29,6 +29,11 @@ let ''; license = lib.licenses.cc-by-30; homepage = "https://durian.blender.org/"; + + # Reported in https://github.com/NixOS/nixpkgs/pull/458193#issuecomment-3575753211 that these + # tests are causing Hydra to spin for hours. They all pass locally, and we don't care too much + # about running them on Hydra. + hydraPlatforms = [ ]; }; # Via https://webtorrent.io/free-torrents diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix index db9ebd426a55..baf52c3163ce 100644 --- a/pkgs/by-name/ab/abctl/package.nix +++ b/pkgs/by-name/ab/abctl/package.nix @@ -8,22 +8,20 @@ buildGoModule rec { pname = "abctl"; - version = "0.29.0"; + version = "0.30.3"; src = fetchFromGitHub { owner = "airbytehq"; repo = "abctl"; tag = "v${version}"; - hash = "sha256-tb0KBATOitgFN49gJVrctxPKjrFY7w6AdBa2AN+scBU="; + hash = "sha256-pQvLFfj7/uZQUqtWAsTcw2RQ3KHFuoQCBP3lBvb2LTs="; }; checkFlags = let skippedTests = [ # network access - "TestManifestCmd" - "TestManifestCmd_Enterprise" - "TestManifestCmd_Nightly" + "TestResolveChartReference" # docker "TestValues_BadYaml" "TestInvalidHostFlag_IpAddr" diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 148ff39980c8..7c03c5d2da9a 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1763812881-gc5f191" + "@sourcegraph/amp": "^0.0.1764374502-g55c558" } }, "node_modules/@napi-rs/keyring": { @@ -228,9 +228,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1763812881-gc5f191", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1763812881-gc5f191.tgz", - "integrity": "sha512-lgiSK9liftvcT17BZFwSWOKHBsj9Bo9ZQZefIzB0jYpw6aOblDxFH5I7QdPQIyGS8bsJSUo8CA3so7Cb3sQJHw==", + "version": "0.0.1764374502-g55c558", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1764374502-g55c558.tgz", + "integrity": "sha512-YYJXFvE5a3kDmXWU4RjUHuIpwMehHXgiJOLmOuA/ztmLV9H5vRRlx4Nfk6BsOLWbN+HyF45hW/HZUzse3kJF8Q==", "license": "Sourcegraph Commercial License", "dependencies": { "@napi-rs/keyring": "1.1.9" diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index e01808d83232..d60561871b9d 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1763812881-gc5f191"; + version = "0.0.1764374502-g55c558"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-lsRQZM5OdQUnGAEn70k/IRgu0BcyAppgDCFvYkfbsmw="; + hash = "sha256-klsg2qYdrOCfYsTnLNEqXOJtbeGRKcJxQVyv7jGr77o="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-5FpZX1citPeT4nqORqxkPFWQUwtSwXBmrGXN8oyexy8="; + npmDepsHash = "sha256-l5z57KOyJst0OZIcYK4qS7+KuZkmJLrpXR3nAJKorfE="; propagatedBuildInputs = [ ripgrep diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix index 62e0ee9a8b33..6c6ff3b054ac 100644 --- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix +++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bash-pinyin-completion-rs"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "bash-pinyin-completion-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-fqrKaz46TYUYA2rcpChvFYZLISsxsMuxwWvbp2E4abU="; + hash = "sha256-npGcoCCuP48p4Bb3w3sM0Vo1km45/NVKb8hEO4KWrXY="; }; strictDeps = true; diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix index 938bb3b458ee..af7a03256718 100644 --- a/pkgs/by-name/bi/bitbox/package.nix +++ b/pkgs/by-name/bi/bitbox/package.nix @@ -5,7 +5,7 @@ runCommand, buildNpmPackage, clang, - go, + go_1_24, libsForQt5, qt6, udevCheckHook, @@ -21,14 +21,14 @@ let in stdenv.mkDerivation rec { pname = "bitbox"; - version = "4.48.6"; + version = "4.49.0"; src = fetchFromGitHub { owner = "BitBoxSwiss"; repo = "bitbox-wallet-app"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-qNcwBaJywWMo/Bb1QkOM9FQ76Sf2DqULUr+W583ufAk="; + hash = "sha256-pl7vtRQCxRwG58bBnT8iAi2qfsdeJrHbzDeHJsYwjnQ="; }; postPatch = '' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; sourceRoot = "${src.name}/frontends/web"; - npmDepsHash = "sha256-9NS85U4L5sLX3n/uN4p4CB5vfpWMMcnf6wESlFdQPlI="; + npmDepsHash = "sha256-J3jT286MZGTHgmRXKiXj7lod9wgoEVQrCfOGCtSyG/s="; installPhase = "cp -r build $out"; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { cp frontends/qt/build/BitBox $out/bin/bitbox cp frontends/qt/build/assets.rcc $out/bin cp frontends/qt/server/libserver.so $out/lib - install -Dt $out/lib/udev/rules.d ${./rules.d}/* + install -m 644 -Dt $out/lib/udev/rules.d ${./rules.d}/* runHook postInstall ''; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ clang - go + go_1_24 qt6.wrapQtAppsHook rcc udevCheckHook diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 854022c69459..ba3dbb6a1ea7 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.12.1"; + version = "4.12.2"; src = fetchFromGitHub { owner = "ccache"; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { exit 1 fi ''; - hash = "sha256-EfX5cLb23VpRbImXTfOTS+dHq6UTd6ecuPWdmz4nLDs="; + hash = "sha256-oWzVCrNgYtOeN4+KJmIynT3jiFZfxrsLkoIm0lK3MBo="; }; outputs = [ diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index 039ee73a3f0d..ae9985d61041 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "codex-acp"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "zed-industries"; repo = "codex-acp"; tag = "v${version}"; - hash = "sha256-PY8nEHH/Wu5K0V1A3DbgEYXjgh1noO2uGeb6eRsTzRw="; + hash = "sha256-fUY76RRvZ4Cri7diV1gL00KISlFeFuxqVQHbfXl2kQU="; }; - cargoHash = "sha256-mswFSCdo/QEPVoMTJRtdAzgI9mQmFqmRIUxhb5qV+OY="; + cargoHash = "sha256-3SSwfJgpe4+7wFqX6iST4zya9x1Op4bsmKQQwbs9l5s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 778573f040a0..9ff3679585b2 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -22,20 +22,20 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; - version = "0.2.27"; + version = "0.2.28"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-s8Wu9DOjfQDm4OONtocJCiklEZ775tFyzKIbKm3WfDc="; + hash = "sha256-Q8+HTDdeaqDroBZ1AS+jDxf0yq20jZ+raRCh7gEJYn8="; }; patches = [ ./use-shaka-by-default.patch ]; - cargoHash = "sha256-ycHKgQFgl8THoXT+3ccV8AC56VudHzObyTCu333MmT4="; + cargoHash = "sha256-YnA/LTw9xCLSnNuFDXlsGzAiTdsst2uIDewuohkkgDU="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/fr/fritzing/fix-stricter-types.patch b/pkgs/by-name/fr/fritzing/fix-stricter-types.patch index 49843e220535..ee8dc5fe1fef 100644 --- a/pkgs/by-name/fr/fritzing/fix-stricter-types.patch +++ b/pkgs/by-name/fr/fritzing/fix-stricter-types.patch @@ -1,8 +1,43 @@ -diff --git a/src/items/paletteitembase.cpp b/src/items/paletteitembase.cpp -index 49db343e..8760ba55 100644 ---- a/src/items/paletteitembase.cpp -+++ b/src/items/paletteitembase.cpp -@@ -626,7 +626,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLayerID viewLayerID, QHash(m_orientation)); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// +@@ -1830,7 +1830,7 @@ QString RotateFlipLabelCommand::getParamString() const { + } + + result += QString(" id:%1 degrees:%2 orientation:%3") +- .arg(m_itemID).arg(m_degrees).arg(m_orientation); ++ .arg(static_cast(m_itemID)).arg(m_degrees).arg(static_cast(m_orientation)); + + return result; + } +diff --git i/src/items/itembase.cpp w/src/items/itembase.cpp +index 431bab55..80b37cb1 100644 +--- i/src/items/itembase.cpp ++++ w/src/items/itembase.cpp +@@ -2006,7 +2006,7 @@ void ItemBase::debugInfo2(const QString & msg) const + .arg(this->instanceTitle()) + .arg(this->viewLayerID()) + .arg(this->viewLayerPlacement()) +- .arg(this->wireFlags()) ++ .arg(static_cast(this->wireFlags())) + .arg((long) dynamic_cast(this), 0, 16) + .arg(m_viewID) + .arg(this->zValue()) +diff --git i/src/items/paletteitembase.cpp w/src/items/paletteitembase.cpp +index 98676ccd..95e4bb2d 100644 +--- i/src/items/paletteitembase.cpp ++++ w/src/items/paletteitembase.cpp +@@ -653,7 +653,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLayerID viewLayerID, QHashsetSymbol(OhmSymbol); validator->setConverter(TextUtils::convertFromPowerPrefix); @@ -33,11 +68,24 @@ index e2a23fd8..3fb4c669 100644 focusOutComboBox->setValidator(validator); connect(focusOutComboBox->validator(), SIGNAL(sendState(QValidator::State)), this, SLOT(textModified(QValidator::State))); connect(focusOutComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(resistanceEntry(int))); -diff --git a/src/utils/textutils.cpp b/src/utils/textutils.cpp -index a1a28d51..3d3aa8e0 100644 ---- a/src/utils/textutils.cpp -+++ b/src/utils/textutils.cpp -@@ -79,7 +79,7 @@ const QString TextUtils::AdobeIllustratorIdentifier = "Generator: Adobe Illustra +diff --git i/src/sketch/sketchwidget.cpp w/src/sketch/sketchwidget.cpp +index f10e56b6..e2c0bd10 100644 +--- i/src/sketch/sketchwidget.cpp ++++ w/src/sketch/sketchwidget.cpp +@@ -1384,7 +1384,7 @@ long SketchWidget::createWire(ConnectorItem * from, ConnectorItem * to, + .arg(newID) + .arg(fromPos.x()).arg(fromPos.y()) + .arg(toPos.x()).arg(toPos.y()) +- .arg(wireFlags) ++ .arg(static_cast(wireFlags)) + .arg(from->attachedToTitle()).arg(from->connectorSharedID()) + .arg(to->attachedToTitle()).arg(to->connectorSharedID()) + .arg(m_viewID) +diff --git i/src/utils/textutils.cpp w/src/utils/textutils.cpp +index 9c6b3dee..5e89eb5b 100644 +--- i/src/utils/textutils.cpp ++++ w/src/utils/textutils.cpp +@@ -80,7 +80,7 @@ const QString TextUtils::AdobeIllustratorIdentifier = "Generator: Adobe Illustra QList PowerPrefixes; QList PowerPrefixValues; diff --git a/pkgs/by-name/go/go-hass-agent/package.nix b/pkgs/by-name/go/go-hass-agent/package.nix new file mode 100644 index 000000000000..f3d776d71fac --- /dev/null +++ b/pkgs/by-name/go/go-hass-agent/package.nix @@ -0,0 +1,115 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + writeShellScriptBin, + installShellFiles, + mage, + pkg-config, + writableTmpDirAsHomeHook, + libglvnd, + xorg, + go, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "go-hass-agent"; + version = "11.1.2"; + + src = fetchFromGitHub { + owner = "joshuar"; + repo = "go-hass-agent"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ahEeZdVTL9psd+TurRxDCz7EG4AK/xW94pYImYIMsrw="; + }; + + vendorHash = "sha256-02sWRWWadZFMaLjJV181bAioNyuN7mG0ZzrkrTdUTqU="; + + nativeBuildInputs = + let + # dont need to pull in actual git just need the build script + # to have this info + fakeGit = writeShellScriptBin "git" '' + if [[ $@ = "describe --tags --always --dirty" ]]; then + echo "v${finalAttrs.version}" + elif [[ $@ = "rev-parse --short HEAD" ]]; then + echo "" + elif [[ $@ = "log --date=iso8601-strict -1 --pretty=%ct" ]]; then + echo "0" + else + >&2 echo "Unknown command: $@" + exit 1 + fi + ''; + in + [ + fakeGit + installShellFiles + mage + pkg-config + writableTmpDirAsHomeHook + ]; + + buildInputs = [ + libglvnd + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + xorg.libXxf86vm + ]; + + desktopItems = [ "assets/go-hass-agent.desktop" ]; + + buildPhase = '' + runHook preBuild + + mage -d build/magefiles -w . build:full + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + mage -d build/magefiles -w . tests:test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + installBin dist/go-hass-agent-${go.GOARCH} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Home Assistant native app for desktop/laptop devices"; + mainProgram = "go-hass-agent"; + longDescription = '' + Go Hass Agent is an application to expose sensors, controls, and events + from a device to Home Assistant. You can think of it as something similar + to the Home Assistant companion app for mobile devices, but for your + desktop, server, Raspberry Pi, Arduino, toaster, whatever. If it can run + Go and Linux, it can run Go Hass Agent! + + Out of the box, Go Hass Agent will report lots of details about the system + it is running on. You can extend it with additional sensors and controls + by hooking it up to MQTT. You can extend it even further with your own + custom sensors and controls with scripts/programs. + + You can then use these sensors, controls, or events in any automations and + dashboards, just like the companion app or any other “thing” you've added + into Home Assistant. + ''; + license = lib.licenses.mit; + homepage = "https://github.com/joshuar/go-hass-agent"; + changelog = "https://github.com/joshuar/go-hass-agent/blob/v${finalAttrs.version}/CHANGELOG.md"; + maintainers = [ lib.maintainers.ethancedwards8 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index ea75787e3935..938cde7c5513 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -7,15 +7,15 @@ }: let - timestamp = "202511192211"; + timestamp = "202511261751"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.53.0"; + version = "1.54.0"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-PWjA4Pvwj4UvchiJNMxoA8yIuwehgk3d8ROSt89Ls7E="; + hash = "sha256-GikaJpvYizxASCGRIpYaUuyAhyr7x6PzQnCyznf3oUw="; }; sourceRoot = "."; diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 561c26574b3c..3f6d489521d0 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "k6"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${version}"; - hash = "sha256-CTXGRSGMVTrigmkmBuyGs66qVE2KFz8f2orYtxDKNEI="; + hash = "sha256-393Ld7V7KBW9ZnItqW9U/8XkDapwNh7T2ABeh2CikGc="; }; subPackages = [ "./" ]; diff --git a/pkgs/by-name/ka/kamal/Gemfile.lock b/pkgs/by-name/ka/kamal/Gemfile.lock index 725fa45275ce..2978804b7ad0 100644 --- a/pkgs/by-name/ka/kamal/Gemfile.lock +++ b/pkgs/by-name/ka/kamal/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - activesupport (8.0.2.1) + activesupport (8.1.1) base64 - benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + json logger (>= 1.4.2) minitest (>= 5.1) securerandom (>= 0.3) @@ -18,16 +18,16 @@ GEM bcrypt_pbkdf (1.1.1) bcrypt_pbkdf (1.1.1-arm64-darwin) bcrypt_pbkdf (1.1.1-x86_64-darwin) - benchmark (0.4.1) - bigdecimal (3.2.2) + bigdecimal (3.3.1) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) dotenv (3.1.8) drb (2.2.3) ed25519 (1.4.0) i18n (1.14.7) concurrent-ruby (~> 1.0) - kamal (2.7.0) + json (2.15.2) + kamal (2.8.2) activesupport (>= 7.0) base64 (~> 0.2) bcrypt_pbkdf (~> 1.0) @@ -39,7 +39,7 @@ GEM thor (~> 1.3) zeitwerk (>= 2.6.18, < 3.0) logger (1.7.0) - minitest (5.25.5) + minitest (5.26.0) net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) @@ -57,7 +57,7 @@ GEM thor (1.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (1.0.3) + uri (1.1.0) zeitwerk (2.7.3) PLATFORMS diff --git a/pkgs/by-name/ka/kamal/gemset.nix b/pkgs/by-name/ka/kamal/gemset.nix index b728374518d5..0e8be28100ba 100644 --- a/pkgs/by-name/ka/kamal/gemset.nix +++ b/pkgs/by-name/ka/kamal/gemset.nix @@ -2,12 +2,12 @@ activesupport = { dependencies = [ "base64" - "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" + "json" "logger" "minitest" "securerandom" @@ -18,10 +18,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184"; + sha256 = "0rzadiafj8llldqry9jjnzbw2rgavdlrqy0nddg8p2qcim7574jy"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.1.1"; }; base64 = { groups = [ "default" ]; @@ -43,25 +43,15 @@ }; version = "1.1.1"; }; - benchmark = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl"; - type = "gem"; - }; - version = "0.4.1"; - }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r"; + sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.1"; }; concurrent-ruby = { groups = [ "default" ]; @@ -78,10 +68,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; dotenv = { groups = [ "default" ]; @@ -124,6 +114,16 @@ }; version = "1.14.7"; }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09zss44bw5sx8c619qy1ci611r1h5nfd1biyjnpxrl6jcvcy2s0h"; + type = "gem"; + }; + version = "2.15.2"; + }; kamal = { dependencies = [ "activesupport" @@ -141,10 +141,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y5l2f1q484wbmlxiwdxsky0s44whj0y3xqp31m8hh57czcn7f36"; + sha256 = "1j22m04xhrpbqlqaf658x401b3qj96ml7ai719xypj45pskdg4si"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.2"; }; logger = { groups = [ "default" ]; @@ -161,10 +161,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; + sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm"; type = "gem"; }; - version = "5.25.5"; + version = "5.26.0"; }; net-scp = { dependencies = [ "net-ssh" ]; @@ -262,10 +262,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + sha256 = "09g6p7r8kl6ybhgm7xnpq1kcirw8z0bza5ihrjify979q5hj0fp2"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; zeitwerk = { groups = [ "default" ]; diff --git a/pkgs/by-name/ka/kaminpar/package.nix b/pkgs/by-name/ka/kaminpar/package.nix index b93eea19c8db..2f04f74165da 100644 --- a/pkgs/by-name/ka/kaminpar/package.nix +++ b/pkgs/by-name/ka/kaminpar/package.nix @@ -2,69 +2,43 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, cmake, numactl, mpi, sparsehash, onetbb, + kagen, + kassert, gtest, mpiCheckPhaseHook, }: -let - kassert-src = fetchFromGitHub { - owner = "kamping-site"; - repo = "kassert"; - rev = "988b7d54b79ae6634f2fcc53a0314fb1cf2c6a23"; - - fetchSubmodules = true; - hash = "sha256-CBglUfVl9lgEa1t95G0mG4CCj0OWnIBwk7ep62rwIAA="; - }; - - kagen-src = fetchFromGitHub { - owner = "KarlsruheGraphGeneration"; - repo = "KaGen"; - rev = "70386f48e513051656f020360c482ce6bff9a24f"; - - fetchSubmodules = true; - hash = "sha256-5EvRPpjUZpmAIEgybXjNU/mO0+gsAyhlwbT+syDUr48="; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "kaminpar"; - version = "3.5.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "KaHIP"; repo = "KaMinPar"; tag = "v${finalAttrs.version}"; - hash = "sha256-1azBj1DSEb7b8u+S51Sncn6EVMgu+SuFJcK4QVVhRk4="; + hash = "sha256-CkGVRJncQBrwDV7eoJ02jcpPDRWNukwibbWXVrx4P8g="; }; - patches = [ - # require gtest to be preinstalled by default if building tests - (fetchpatch2 { - url = "https://github.com/KaHip/KaMinPar/commit/9cb9883eea076d11cffcf4b0d14bf1f4f95a00e4.patch?full_index=1"; - hash = "sha256-aUO5E0HTZqjfu5BUzyRdSZgyQYcE4PGqZaJvLD40sn8="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.hostPlatform.isLinux numactl; propagatedBuildInputs = [ + kagen + kassert mpi - sparsehash onetbb + sparsehash ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "KAMINPAR_BUILD_DISTRIBUTED" true) (lib.cmakeBool "KAMINPAR_BUILD_WITH_MTUNE_NATIVE" false) - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_KASSERT" "${kassert-src}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_KAGEN" "${kagen-src}") ]; doCheck = true; diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 1b291d8c51ea..77256147da2c 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "a614d5226ceed4b4cdd4a3badbb0297ea0f987f65948e4eb828119a3b5ac0a4b"; + sha256 = "6f577c247ef870a55fe3377246bc1c2d643c673cd32de6c26231ff51d3fc7093"; }; outputs = [ diff --git a/pkgs/by-name/la/landrun/package.nix b/pkgs/by-name/la/landrun/package.nix index 4784d4fa3fe7..9396d9985a02 100644 --- a/pkgs/by-name/la/landrun/package.nix +++ b/pkgs/by-name/la/landrun/package.nix @@ -102,7 +102,7 @@ buildGoModule (finalAttrs: { Linux 5.13+ is required for file access restrictions, Linux 6.7+ for TCP restrictions. ''; homepage = "https://github.com/Zouuup/landrun"; - changelog = "https://github.com/Zouuup/landrun/releases/tag/{finalAttrs.src.tag}"; + changelog = "https://github.com/Zouuup/landrun/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.fliegendewurst ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 49c8a52c8c30..f0ecdca17f7a 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.1.15"; + version = "2.1.16"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-kb3t8fQmJogzyJ/LkqOGWhdWMFgPbfzjD6m5jDWk4Rg="; + hash = "sha256-+CjnVJGFR+UXnW6Cc+S8vVli9hECDrogOdraMRkHgqM="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ma/marvin/package.nix b/pkgs/by-name/ma/marvin/package.nix index dc1822bfa59d..25f155bba171 100644 --- a/pkgs/by-name/ma/marvin/package.nix +++ b/pkgs/by-name/ma/marvin/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "marvin"; - version = "23.17.0"; + version = "25.3.5"; src = fetchurl { name = "marvin-${version}.deb"; - url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${lib.versions.majorMinor version}.deb"; - hash = "sha256-zE/9EaOsNJwzE4Doasm9N8QG4t7wDOxqpV/Nhc4p7Ws="; + url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${version}.deb"; + hash = "sha256-OiTHMGKAuHadoKQMTTPRcYl/zKL+bc0ts/UNsJlHn0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index fdedcfed7937..bab5fe23e3b5 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.22.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meiliSearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-RWHu77/GoSMzRU7KyKmu23DFwWn6RD3MUWUc5ICY1d8="; + hash = "sha256-tA2EN739QNNhMG1okfwBgOQLVah/p3PCFF1LESafFdY="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-xKBYumdb1vJS+UQF3yD/p+7FvWRfBKbLjOFiT7DVJ+o="; + cargoHash = "sha256-na6FArvYMaIenc/h9dKAzIcWZuz8Q3L+2uun39T9LTI="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix index a03011d17c9a..e3de241ad2d6 100644 --- a/pkgs/by-name/ne/neothesia/package.nix +++ b/pkgs/by-name/ne/neothesia/package.nix @@ -2,7 +2,7 @@ rustPlatform, fetchFromGitHub, lib, - ffmpeg, + ffmpeg_7, pkg-config, alsa-lib, wayland, @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { inherit src version; buildInputs = [ - ffmpeg + ffmpeg_7 alsa-lib ]; diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index ae163564915b..4cbd26a18035 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -27,7 +27,7 @@ }: let pname = "nextcloud-talk-desktop"; - version = "2.0.3"; + version = "2.0.4"; # Only x86_64-linux is supported with Darwin support being universal sources = { @@ -35,7 +35,7 @@ let # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites linux = fetchzip { url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${version}/Nextcloud.Talk-linux-x64.zip"; - hash = "sha256-QKbg5vHLuxLpngrHom/odWw9RK43jhZsEg7Df5c7db0="; + hash = "sha256-Nky3ws1UV0F4qjbBog53BjXkZ/ttTER/32NlB2ONJaE="; stripRoot = false; }; darwin = fetchurl { diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix index 59b5100cad3c..56e628336b4f 100644 --- a/pkgs/by-name/ni/nixbit/package.nix +++ b/pkgs/by-name/ni/nixbit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixbit"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pbek"; repo = "nixbit"; tag = "v${finalAttrs.version}"; - hash = "sha256-EaL+ekvvnKZM7fdfuzNz9Ddq7k0HN3ZGW8JpyVyNV9c="; + hash = "sha256-HUnMqrEJp7sg20DIcIIDGMVKghxlo7bp3NB8llfA54k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nu/numcpp/package.nix b/pkgs/by-name/nu/numcpp/package.nix index 67d29cd3f5b1..ffcfe74331a0 100644 --- a/pkgs/by-name/nu/numcpp/package.nix +++ b/pkgs/by-name/nu/numcpp/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "dpilger26"; repo = "NumCpp"; tag = "Version_${finalAttrs.version}"; - hash = "sha256-+i4vUtd+UDP1e0Y+2Y31ldIWQenbtzssNrDazcU+tkQ="; + hash = "sha256-5HWemgBhTUvoeommFOChWOplfEZPOXwQktkCeO5FnSU="; }; patches = [ ./pytest-CMakeLists.patch ]; diff --git a/pkgs/by-name/pa/parallel-launcher/fix-paths.patch b/pkgs/by-name/pa/parallel-launcher/fix-paths.patch index 26dc04767845..c78ff7c6182a 100644 --- a/pkgs/by-name/pa/parallel-launcher/fix-paths.patch +++ b/pkgs/by-name/pa/parallel-launcher/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/core/retroarch.cpp b/src/core/retroarch.cpp -index c2a2c47..97fa782 100644 +index 7502922..c6a572b 100644 --- a/src/core/retroarch.cpp +++ b/src/core/retroarch.cpp -@@ -102,7 +102,7 @@ static void loadConfig( std::map &configs ) { +@@ -103,7 +103,7 @@ static void loadConfig( std::map &configs ) { const fs::path basePath = RetroArch::getBasePath(); configs["system_directory"] = (basePath / _NFS("system")).u8string(); @@ -11,7 +11,7 @@ index c2a2c47..97fa782 100644 configs["savefile_directory"] = (basePath / _NFS("saves")).u8string(); configs["savestate_directory"] = (basePath / _NFS("states")).u8string(); configs["libretro_info_path"] = (basePath / _NFS("info")).u8string(); -@@ -110,7 +110,7 @@ static void loadConfig( std::map &configs ) { +@@ -111,7 +111,7 @@ static void loadConfig( std::map &configs ) { #if defined(FLATPAK_VERSION) configs["assets_directory"] = "/app/share/libretro/assets/"; #elif defined(__linux__) @@ -20,7 +20,7 @@ index c2a2c47..97fa782 100644 configs["osk_overlay_directory"] = (BaseDir::data() / "retro-data" / "overlays" / "keyboards").u8string(); configs["overlay_directory"] = (BaseDir::data() / "retro-data" / "overlays").u8string(); configs["audio_filter_dir"] = (BaseDir::data() / "retro-data" / "filters" / "audio").u8string(); -@@ -845,13 +845,7 @@ fs::path RetroArch::getBasePath() { +@@ -866,13 +866,7 @@ fs::path RetroArch::getBasePath() { } fs::path RetroArch::getCorePath() { @@ -35,7 +35,7 @@ index c2a2c47..97fa782 100644 } fs::path RetroArch::getConfigPath() { -@@ -866,7 +860,7 @@ fs::path RetroArch::getExePath() { +@@ -887,7 +881,7 @@ fs::path RetroArch::getExePath() { #elif defined(FLATPAK_VERSION) return BaseDir::program() / "retroarch"; #else @@ -45,27 +45,41 @@ index c2a2c47..97fa782 100644 } diff --git a/src/main.cpp b/src/main.cpp -index 3ca39b2..f3c14ba 100644 +index fbd4c92..91ef84e 100644 --- a/src/main.cpp +++ b/src/main.cpp -@@ -200,6 +200,7 @@ int main( int argc, char **argv ) { +@@ -209,7 +209,7 @@ int main( int argc, char **argv ) { fs::path( "/usr/local/share/parallel-launcher/translations/" ), fs::path( "/usr/share/parallel-launcher/translations/" ) #else -+ fs::read_symlink( "/proc/self/exe" ).parent_path().parent_path() / "share/parallel-launcher/translations/", - fs::path( "/usr/share/parallel-launcher/translations/" ), +- fs::path( "/usr/share/parallel-launcher/translations/" ), ++ fs::path( "@sharePath@/translations/" ), fs::path( "/usr/local/share/parallel-launcher/translations/" ), BaseDir::program() / "lang" + #endif +diff --git a/src/plugins/discord-plugin.cpp b/src/plugins/discord-plugin.cpp +index 055c0ee..7ce44fb 100644 +--- a/src/plugins/discord-plugin.cpp ++++ b/src/plugins/discord-plugin.cpp +@@ -38,7 +38,7 @@ const DiscordPlugin &DiscordPlugin::tryLoad( bool *success ) noexcept { + return s_abi; + } + +- void *handle = dlopen( (BaseDir::data() / "plugins" / "libdiscord-rpc.so").u8string().c_str(), RTLD_NOW ); ++ void *handle = dlopen( "libdiscord-rpc.so", RTLD_NOW ); + if( !handle ) { + if( success != nullptr ) *success = false; + return s_stub; diff --git a/src/polyfill/base-directory.cpp b/src/polyfill/base-directory.cpp -index 720a754..db607ca 100644 +index 2dcc704..45970a4 100644 --- a/src/polyfill/base-directory.cpp +++ b/src/polyfill/base-directory.cpp -@@ -134,7 +134,7 @@ static Locations getLocations() { +@@ -146,7 +146,7 @@ static Locations getLocations() { #if defined(FLATPAK_VERSION) fs::path( "/app/share/parallel-launcher" ) #elif defined(__linux__) - fs::path( "/usr/share/parallel-launcher" ) -+ fs::read_symlink( "/proc/self/exe" ).parent_path().parent_path() / "share/parallel-launcher" ++ fs::path( "@sharePath@" ) #endif }; } diff --git a/pkgs/by-name/pa/parallel-launcher/fix-version-checks.patch b/pkgs/by-name/pa/parallel-launcher/fix-version-checks.patch index 92c9974a27dc..d7c793a2fcdd 100644 --- a/pkgs/by-name/pa/parallel-launcher/fix-version-checks.patch +++ b/pkgs/by-name/pa/parallel-launcher/fix-version-checks.patch @@ -1,8 +1,8 @@ diff --git a/src/core/updates.cpp b/src/core/updates.cpp -index 403290b..f7d6547 100644 +index cb9ca39..4dc5dfb 100644 --- a/src/core/updates.cpp +++ b/src/core/updates.cpp -@@ -30,8 +30,8 @@ +@@ -24,8 +24,8 @@ #endif const InstalledVersionsInfo InstalledVersionsInfo::Default { @@ -13,7 +13,7 @@ index 403290b..f7d6547 100644 /* lastUpdateCheck */ 0 }; -@@ -47,15 +47,7 @@ template<> void JsonSerializer::serialize( JsonWriter &jw, con +@@ -41,15 +41,7 @@ template<> void JsonSerializer::serialize( JsonWriter &jw, con } template<> RetroArchVersion JsonSerializer::parse( const Json &json ) { @@ -30,7 +30,7 @@ index 403290b..f7d6547 100644 } static constexpr char P_RETROARCH[] = "retroarch"; -@@ -73,47 +65,14 @@ template<> void JsonSerializer::serialize( JsonWriter &jw +@@ -67,44 +59,15 @@ template<> void JsonSerializer::serialize( JsonWriter &jw } template<> InstalledVersionsInfo JsonSerializer::parse( const Json &json ) { @@ -60,11 +60,7 @@ index 403290b..f7d6547 100644 -#if defined(__linux__) - const Json &vjson = json["linux_x64"]; -#elif defined(_WIN32) -- #ifdef _WIN64 -- const Json &vjson = json["windows_x64"]; -- #else -- const Json &vjson = json["windows_x86"]; -- #endif +- const Json &vjson = json["windows_x64"]; -#elif defined(__APPLE__) - const Json &vjson = AppleUtil::shouldUseArmCore() ? json["macos_arm64"] : json["macos_x64"]; -#else @@ -75,14 +71,16 @@ index 403290b..f7d6547 100644 return ParallelCoreVersion{ - JsonSerializer::parse( vjson["version"] ), - vjson["sha1"].get(), +- vjson["zipSignature"].get(), - vjson["url"].get() + InstalledVersionsInfo::Default.parallelVersion, + "", ++ "", + "" }; } -@@ -178,6 +137,7 @@ void RetroUpdater::checkForUpdates( +@@ -169,6 +132,7 @@ void RetroUpdater::checkForUpdates( bool waitForCoreUpdates, bool forceUpdate ) { diff --git a/pkgs/by-name/pa/parallel-launcher/package.nix b/pkgs/by-name/pa/parallel-launcher/package.nix index 9da8b75c3b34..c573e2906ee6 100644 --- a/pkgs/by-name/pa/parallel-launcher/package.nix +++ b/pkgs/by-name/pa/parallel-launcher/package.nix @@ -1,25 +1,27 @@ { - lib, - stdenv, callPackage, - fetchFromGitLab, - replaceVars, - qt5, - SDL2, - discord-rpc, - libgcrypt, - sqlite, - findutils, - xdg-utils, coreutils, + discord-rpc, dosfstools, + fetchFromGitLab, + findutils, + lib, + libgcrypt, + libgpg-error, + parallel-launcher, + qt6, + replaceVars, + retroarch-assets, + SDL2, + sqlite, + stdenv, vulkan-loader, wrapRetroArch, - retroarch-assets, - parallel-launcher, + xdg-utils, + zlib, # Allow overrides for the RetroArch core and declarative settings - parallel-n64-core ? parallel-launcher.passthru.parallel-n64-core, extraRetroArchSettings ? { }, + parallel-n64-core ? parallel-launcher.passthru.parallel-n64-core, withDiscordRpc ? false, }: let @@ -53,13 +55,13 @@ stdenv.mkDerivation ( in { pname = "parallel-launcher"; - version = "8.3.0"; # Check ./parallel-n64-next.nix for updates when updating, too + version = "9.0.2"; # Check ./parallel-n64-next.nix for updates when updating, too src = fetchFromGitLab { owner = "parallel-launcher"; repo = "parallel-launcher"; tag = reformatVersion finalAttrs.version; - hash = "sha256-Zp/QTPREfpOG0zgnP1Lg5FgT9u+OEhoqBgnxWMu451A="; + hash = "sha256-JrZy60xWgrUlFcyGNVBUfHg/diM5TG5mIbbOXpee/2U="; }; patches = @@ -73,6 +75,8 @@ stdenv.mkDerivation ( inherit retroArchAssetsPath retroArchCoresPath; retroArchExePath = lib.getExe retroarch'; parallelN64CorePath = "${retroArchCoresPath}/parallel_n64_next_libretro${suffix}"; + # Manually substituted later since we need to reference PL's $out + sharePath = null; }) # Bypass update checks and hardcode internal version checks to ours (replaceVars ./fix-version-checks.patch { @@ -82,40 +86,60 @@ stdenv.mkDerivation ( ]; nativeBuildInputs = [ - qt5.wrapQtAppsHook - qt5.qttools - qt5.qmake + qt6.wrapQtAppsHook + qt6.qttools + qt6.qmake ]; buildInputs = [ - SDL2 libgcrypt + libgpg-error + qt6.qtbase + qt6.qtsvg + SDL2 sqlite - qt5.qtbase - qt5.qtsvg - ] - ++ lib.optional withDiscordRpc discord-rpc; + zlib + ]; qtWrapperArgs = [ "--prefix PATH : ${ lib.makeBinPath [ - findutils - xdg-utils coreutils dosfstools + findutils + xdg-utils ] }" "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - vulkan-loader - ] + lib.makeLibraryPath ( + [ + vulkan-loader + ] + ++ lib.optional withDiscordRpc discord-rpc + ) }" ]; + qmakeFlags = [ + "DEFINES+=RETROARCH_XWAYLAND" + ]; + # Our patches result in unused params. # Ignoring the warning is easier to maintain than more invasive patching. env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-parameter"; + postPatch = + let + sharePath = "${placeholder "out"}/share/parallel-launcher"; + in + '' + substituteInPlace src/main.cpp \ + --replace-fail '@sharePath@' '${sharePath}' + + substituteInPlace src/polyfill/base-directory.cpp \ + --replace-fail '@sharePath@' '${sharePath}' + ''; + preConfigure = '' lrelease app.pro ''; diff --git a/pkgs/by-name/pa/parallel-launcher/parallel-n64-next.nix b/pkgs/by-name/pa/parallel-launcher/parallel-n64-next.nix index 1bcae54e051a..f81dfd342310 100644 --- a/pkgs/by-name/pa/parallel-launcher/parallel-n64-next.nix +++ b/pkgs/by-name/pa/parallel-launcher/parallel-n64-next.nix @@ -15,13 +15,13 @@ in # Based on the libretro parallel-n64 derivation with slight tweaks libretro.mkLibretroCore (finalAttrs: { core = "parallel-n64-next"; - version = "2.24.1"; + version = "2.27.1"; src = fetchFromGitLab { owner = "parallel-launcher"; repo = "parallel-n64"; tag = reformatVersion finalAttrs.version; - hash = "sha256-BeeKX78zozxx72cmJ3HI0nH/STvkltMBZs2+mb4ukM0="; + hash = "sha256-u4F6CbC1NEU3OWtcqMIi/teX+SS4Jq9v5M2qc9z5bXg="; }; extraNativeBuildInputs = [ diff --git a/pkgs/by-name/pa/parallel-launcher/update.sh b/pkgs/by-name/pa/parallel-launcher/update.sh index 0821a87454a7..588888a83287 100755 --- a/pkgs/by-name/pa/parallel-launcher/update.sh +++ b/pkgs/by-name/pa/parallel-launcher/update.sh @@ -8,7 +8,7 @@ packageDir="$nixpkgs/pkgs/by-name/pa/parallel-launcher" getLatestVersion() { curl -s "https://gitlab.com/api/v4/projects/parallel-launcher%2F$1/repository/tags" \ - | jq -r '.[0] | select(.) | .name' \ + | jq -r '.[0].name' \ | sed 's|v||' \ | sed 's|-|.|' } diff --git a/pkgs/by-name/qm/qmapshack/package.nix b/pkgs/by-name/qm/qmapshack/package.nix index a045c8e329bb..54f7ae79d30c 100644 --- a/pkgs/by-name/qm/qmapshack/package.nix +++ b/pkgs/by-name/qm/qmapshack/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmapshack"; - version = "1.18.2"; + version = "1.19.0"; src = fetchFromGitHub { owner = "Maproom"; repo = "qmapshack"; tag = "V_${finalAttrs.version}"; - hash = "sha256-vvpDjGFzkbsM/QUiU9EURuU0babWYL1gLzWTqJbHu0c="; + hash = "sha256-g/csg44pyjLCavRNu/WgNY3sXW0hncB1xpAPhvyuD60="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix index 95aa61b70b35..e330adf2eb01 100644 --- a/pkgs/by-name/re/rebels-in-the-sky/package.nix +++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebels-in-the-sky"; - version = "1.1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "ricott1"; repo = "rebels-in-the-sky"; tag = "v${finalAttrs.version}"; - hash = "sha256-F7UsJ5EJDuDlre/UBUcHR3zNk3cvlpPsOYPsAy/n8MI="; + hash = "sha256-gMT62Uy9rFdtt2LnU7A9bPwH6lRrHVhzXQ03qUoS0CM="; }; - cargoHash = "sha256-+OavpkMn2bQMLK7J3dzW0MnxVKdmpPoibpQG4cC4EvQ="; + cargoHash = "sha256-2Pn8QwviSgznchw56ZpU8J0+aGJOsGlr0OG0Uu5kpZs="; patches = lib.optionals (!withRadio) [ ./disable-radio.patch diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 1e2704d0ce4d..642f668a10c5 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.5.3"; + version = "1.5.5"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-5sGVVJ8Y90yJoikQnPeGbZhNlSR/d3EkMct9isSWies="; + hash = "sha256-xx/gge8A3jathSoHXOJ9DoIJG07uw/UTHh7uuHkOPl0="; }; - cargoHash = "sha256-+Yc7u6q4U4MwT5eHnxHC2DCG66SmEyRfNMeMqSO+GeQ="; + cargoHash = "sha256-yWxy+mLrg0VtWhrpRum1DufQCeB2HkbDRiscWOJOth8="; env = { PROTOC = lib.getExe protobuf; diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index 599a065c34df..0306750bd294 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.9.7.0"; + version = "3.10.0.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; tag = finalAttrs.version; - hash = "sha256-oJTRTcPQ3ByC2v9yM3yp7UVZqcX84StP4Ii96ZX/sIQ="; + hash = "sha256-vxiZeJByZGS7rXtvPMgNjb94E/oju+mmEuzJ7tA+hE4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 0a1166d42634..e8184a477f8e 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.91.3"; + version = "1.91.4"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-dmgWNdlGqI3kipNu9QEV8g3aArAgZb2qt5BkUhFNePk="; + hash = "sha256-h1FDCC6+KYkrtJoGuBnoVnLgumb3kk720XXm+Pd0koE="; }; - vendorHash = "sha256-ppBzTerPhcM225VL6JzE4ZerTFqwnGmSxVTYyD3ur8o="; + vendorHash = "sha256-3Y3GsVMImo0oCigAyQ2SPOucllrfkD9oj9o3ESk47eA="; excludedPackages = [ "scripts/jsonschema" ]; diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 5ce411e06bec..2b93984f3b44 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "tootik"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = "v${version}"; - hash = "sha256-WCv7cJUoD3+ZJQ9c63rtkEohtDkU5LgmwBwBcHmbVxw="; + hash = "sha256-zkKkHzgIBHg0FH07KNr7jGNZU4QUbl6udoD7hLaDOL0="; }; vendorHash = "sha256-UZQw63KPs7GzOv5Ls69DLqJqc/taWwC5UCYdNlq9fXc="; diff --git a/pkgs/by-name/tr/tray-tui/package.nix b/pkgs/by-name/tr/tray-tui/package.nix index 620de265d995..c20f3185fcf8 100644 --- a/pkgs/by-name/tr/tray-tui/package.nix +++ b/pkgs/by-name/tr/tray-tui/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tray-tui"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Levizor"; repo = "tray-tui"; tag = version; - hash = "sha256-iJ3793D6/yT63s4akdFvWIpe+5wgjWv29cwB5deID60="; + hash = "sha256-C/vF5dkY9eOL4RQTHuzi7F+mgHWOrVt6sv4eHqUNctg="; }; - cargoHash = "sha256-T5O37QuubTHp9a5iYrXN2Wrc+Xez+rGiAowcbSp33A4="; + cargoHash = "sha256-w5ZifkJ86OMiRdHE9f82pxlg7FBuoioD+hgI8CTJtmI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 357ad3cc39e2..316449b132ac 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.28"; + version = "0.0.1-alpha.29"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-TZcbW9CCdScfqyHjam+ToDgiIJwcR7EYZGllWL7gVjw="; + hash = "sha256-64/SE+B5fIaPS2qWHBNza8w14ID9xUVH8GhXSSB8Fbw="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-KW8GYxSOVqInQ8hJNyu4RpU/c/mERl7zrnLLjnhYvYo="; + cargoHash = "sha256-ySR1pe9zwihjTzr3qhv71LuJbrhBWgZ+z+n9qEEern4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix index 8ceead09e1a5..ae82952bdc4c 100644 --- a/pkgs/by-name/wa/wasm-language-tools/package.nix +++ b/pkgs/by-name/wa/wasm-language-tools/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-language-tools"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "g-plane"; repo = "wasm-language-tools"; tag = "v${version}"; - hash = "sha256-6lZBDBjqHIMLMrWsnFeGuaGZDe3LKyBbbMbyvS3i29M="; + hash = "sha256-ySY1AIgr5HwSrfebfDkKZvl/1LQpU64nCF6TEi//JuM="; }; - cargoHash = "sha256-npVrDGvTqKk9NkMiuWnSJRFEWfG9pGA7LEUrorNJ978="; + cargoHash = "sha256-veBxrnTRSI6kRy0bREBWCLEkbkPUWM7jGwlcFhG6FjU="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/wat_server"; diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index b6fb27dee5aa..7579c718e4b3 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,26 +6,28 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.239.0"; + version = "1.242.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${version}"; - hash = "sha256-XxP0T3nwhByG4wGknLVUCv38sUyFtEM7jrmVJlujohY="; + hash = "sha256-7TKodssE1obD7tIqrjrWoEdcCk3iSRwaecRHg7ddg6w="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-xIfTYJMVP47timzquEYEb9M8BHsj83NjgD44lbzgd+Y="; + cargoHash = "sha256-X9dDmHWBdh0znGvTWG+WyiXmf4wnz5mhxJWsZJJUYmI="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ - "--all" + "--workspace" + "--exclude" + "wit-dylib" ] ++ # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820 diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 9fc4e5f1d309..cd6e5c384c1a 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -20,6 +20,7 @@ qtwebengine, readline, qtwebsockets, + qtwayland, useSCEL ? false, emacs, gitUpdater, @@ -73,6 +74,7 @@ mkDerivation rec { libXt qtbase qtwebsockets + qtwayland readline ] ++ lib.optional withWebengine qtwebengine diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d82e218987b1..4d02a600246e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -814,15 +814,15 @@ final: prev: { }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.2311-1"; + version = "0.0.2314-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.2311-1.rockspec"; - sha256 = "0ldxn3v2bkjydnqcq5zz0rxxlv953azi6zvm8hl9vdsil1gg9vcz"; + url = "mirror://luarocks/fzf-lua-0.0.2314-1.rockspec"; + sha256 = "1540vfygbgc55nd3kl19bkz3rwgg9b04mn3w76krppnl45aq59gg"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/3170d98240266a68c2611fc63260c3ab431575aa.zip"; - sha256 = "0zlrzvwc29arf8y6x6niyglqgvj403mryffnwq18nmd6gabrjjx1"; + url = "https://github.com/ibhagwan/fzf-lua/archive/9a0704e8af8f8442110ff22a83b5608366b235df.zip"; + sha256 = "13ds1zl6hl8pllbs5ird4x87kjlj6g1i2zgzjdjkfzsdpc4fb4kd"; }; disabled = luaOlder "5.1"; @@ -880,8 +880,8 @@ final: prev: { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "cdafc320f03f2572c40ab93a4eecb733d4016d07"; - hash = "sha256-w2/osNJwbtmUxxQIXBsyqMYrvyNUaVzXrUNGYqGmzi4="; + rev = "5813e4878748805f1518cee7abb50fd7205a3a48"; + hash = "sha256-w3Q7nMFEbcjP6RmSTONg2Nw1dBXDEHnjQ69FuAPJRD8="; }; disabled = lua.luaversion != "5.1"; @@ -1414,7 +1414,6 @@ final: prev: { meta = { homepage = "https://www.inf.puc-rio.br/~roberto/lpeg.html"; description = "Parsing Expression Grammars For Lua"; - maintainers = [ ]; license.fullName = "MIT/X11"; }; } @@ -1571,7 +1570,6 @@ final: prev: { meta = { homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; - maintainers = [ ]; license.fullName = "MIT/X11"; }; } @@ -2044,17 +2042,17 @@ final: prev: { }: buildLuarocksPackage { pname = "lua-resty-session"; - version = "4.1.4-1"; + version = "4.1.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-session-4.1.4-1.rockspec"; - sha256 = "0ny09yvdvbm1lkhsn7c5c9klmsjdp62qy01a77bzvq49s8ma6mik"; + url = "mirror://luarocks/lua-resty-session-4.1.5-1.rockspec"; + sha256 = "1mapndwa260pk18v4nwnmz4bncqizfn1zc8k8aj1557pc1fj5ii6"; }).outPath; src = fetchFromGitHub { owner = "bungle"; repo = "lua-resty-session"; - rev = "v4.1.4"; - hash = "sha256-S9dMlbCQjLzAdvlNE1bBAtB02vZhF+Tx08zlU0WZYsM="; + rev = "v4.1.5"; + hash = "sha256-qwXNEWU0i3PUJK5cUChkcH43HnBCz4EEVPDQQ10Je+Q="; }; disabled = luaOlder "5.1"; @@ -2869,9 +2867,7 @@ final: prev: { meta = { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; - maintainers = with lib.maintainers; [ - lblasc - ]; + maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; }; } @@ -3196,7 +3192,6 @@ final: prev: { meta = { homepage = "https://lunarmodules.github.io/luasql/"; description = "Database connectivity for Lua (SQLite3 driver)"; - maintainers = [ ]; license.fullName = "MIT/X11"; }; } @@ -4902,7 +4897,6 @@ final: prev: { meta = { homepage = "http://lua-stdlib.github.io/lua-stdlib"; description = "General Lua Libraries"; - maintainers = [ ]; license.fullName = "MIT/X11"; }; } @@ -5005,8 +4999,8 @@ final: prev: { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "83a3a713d6b2d2a408491a1b959e55a7fa8678e8"; - hash = "sha256-6hrylUCc6KlcbnMgcJNJhbX2Cgu0YHKoMPOqpaKRljE="; + rev = "f0caedf064aa8c926325d7fe64c141d29b8e7853"; + hash = "sha256-RrA84O25MlXvnATjgzpIehoYXH/h11vG0Zv8KR5uyIM="; }; disabled = lua.luaversion != "5.1"; @@ -5198,15 +5192,15 @@ final: prev: { }: buildLuarocksPackage { pname = "tree-sitter-orgmode"; - version = "2.0.1-1"; + version = "2.0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tree-sitter-orgmode-2.0.1-1.rockspec"; - sha256 = "1g1xmvbxkpd4d7l8m02p02zh4x971k8fd4cvr617pk8vc9zcndps"; + url = "mirror://luarocks/tree-sitter-orgmode-2.0.2-1.rockspec"; + sha256 = "0ci1dgnvxxaf9vj2ipa6xcq80apl82yqr6a3r3a6wg2d88r0chkg"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/2.0.1.zip"; - sha256 = "00j5z07j2gixpmz17x5kd5g3cpiakbb189707a55bgc95kx3jn4k"; + url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/2.0.2.zip"; + sha256 = "1rqw8malf09vxbmkinfjwhs490xjw41gvaydg590y30qvrqmaa5l"; }; nativeBuildInputs = [ luarocks-build-treesitter-parser ]; @@ -5281,7 +5275,6 @@ final: prev: { meta = { homepage = "https://github.com/notomo/vusted"; description = "`busted` wrapper for testing neovim plugin"; - maintainers = [ ]; license.fullName = "MIT "; }; } diff --git a/pkgs/development/octave-modules/quaternion/default.nix b/pkgs/development/octave-modules/quaternion/default.nix index 3b0345034f5a..91e572da06d7 100644 --- a/pkgs/development/octave-modules/quaternion/default.nix +++ b/pkgs/development/octave-modules/quaternion/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "quaternion"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "040ncksf0xz32qmi4484xs3q01nappxrsvwwa60g04yjy7c4sbac"; + sha256 = "sha256-kY5mU7dJuUjprub+LTc1BH6YGdEnP9ydX0lRU0fmOYE="; }; # Octave replaced many of the is_thing_type check function with isthing. diff --git a/pkgs/development/python-modules/aioice/default.nix b/pkgs/development/python-modules/aioice/default.nix index da27c4b35d3d..b9a60e331219 100644 --- a/pkgs/development/python-modules/aioice/default.nix +++ b/pkgs/development/python-modules/aioice/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aioice"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "aiortc"; repo = "aioice"; tag = version; - hash = "sha256-KFYPzGPm+d1QrFAW9OhTDxroV/MnFusmfy5qcYCfDiM="; + hash = "sha256-UEXkTxcpe6mlA2FmMSfDmtcEYE9zwuitpi2Eh188xZc="; }; build-system = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 9c05cc8e3c6c..b28894a6c475 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.29.0"; + version = "0.29.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-D6GHTFohd2G2IlQ5PTq3r2v+qUfLqH044XEdV2/WPTE="; + hash = "sha256-j8MEr19vg+fnMJb7QutR1Khfp6kEVkZu8ihyCV1MpG8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 041a9c86c8c0..e1a176f6a1ee 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "40.1.0"; + version = "40.2.0"; pyproject = true; src = fetchPypi { pname = "azure_mgmt_containerservice"; inherit version; - hash = "sha256-iabK9QfTQN9HLcjc/iF8HgmM3Y5xNT24ku/ChDMOL44="; + hash = "sha256-rNVcrpW3aO/rA3fYPeoH1hDENO7AwIngKTX/MfDj4H0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index c31f520cf80a..c954dfbf14da 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, beautifulsoup4, boto3, @@ -19,17 +18,14 @@ buildPythonPackage rec { pname = "bx-py-utils"; - version = "113"; - - disabled = pythonOlder "3.10"; - + version = "114"; pyproject = true; src = fetchFromGitHub { owner = "boxine"; repo = "bx_py_utils"; tag = "v${version}"; - hash = "sha256-rpDRLiqcbg/aRzdmKwGJAGrhBJTA+7tXsjPUIeeC03I="; + hash = "sha256-AAn1e5HuSngEnCoCpOvVjxavZbiH2YL+38gXxhqLLBo="; }; postPatch = '' @@ -78,10 +74,6 @@ buildPythonPackage rec { "test_assert_html_snapshot_by_css_selector" # test accesses the internet "test_happy_path" - # test assumes a virtual environment - "test_code_style" - # AssertionError: Lists differ: ['my... - "test_import_all_files" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix index 037fbdec4550..109611ba7eba 100644 --- a/pkgs/development/python-modules/django-celery-results/default.nix +++ b/pkgs/development/python-modules/django-celery-results/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Celery result back end with django"; homepage = "https://github.com/celery/django-celery-results"; - changelog = "https://github.com/celery/django-celery-results/blob/v{version}/Changelog"; + changelog = "https://github.com/celery/django-celery-results/blob/v${version}/Changelog"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 88c7b42bd458..378b7086518b 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "gintas"; repo = "django-picklefield"; tag = "v${version}"; - hash = "sha256-/H6spsf2fmJdg5RphD8a4YADggr+5d+twuLoFMfyEac="; + hash = "sha256-SvKJGOSsTZhAYJkGO+slL81EjcJtXmaFN7YWCGSX6Ac="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 381f52cddf1a..75bd93bdcb9d 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.34"; + version = "0.2.36"; pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-gcqkSWyPSwkzykKSXhTPq363fi89TyP2DPQchSmGg/k="; + hash = "sha256-jbCp4R3Pg9idtIw5blEprf1wdewceA8YB62yht58jLI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix index f281bb362cd2..f7d5c5c8f6c2 100644 --- a/pkgs/development/python-modules/gftools/default.nix +++ b/pkgs/development/python-modules/gftools/default.nix @@ -62,14 +62,14 @@ let in buildPythonPackage rec { pname = "gftools"; - version = "0.9.97"; + version = "0.9.98"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "gftools"; tag = "v${version}"; - hash = "sha256-HMMPkX1jmQu1wBG/24svs3p8HPljykyvbZszGaEgb/8="; + hash = "sha256-MFBY54L0reo/z0pACaTN7k8MTuUKzmsXNTOd3/UhIXs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 9b40bbd1d2d1..82eb7e84db48 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202511291"; + version = "0.1.202511301"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-rzc44tJdvi9U2mWjxqb573OQb7x/pcWYvpCGQlIE1Og="; + hash = "sha256-NC9efzl6G7gFyCucpA9TEd3F0Sj94s7WHHlZKXQo+ew="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 99de3b541ab9..95406c5c8eba 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mdformat plugin to ensure frontmatter is respected"; homepage = "https://github.com/butler54/mdformat-frontmatter"; - changelog = "https://github.com/butler54/mdformat-frontmatter/blob/v{version}/CHANGELOG.md"; + changelog = "https://github.com/butler54/mdformat-frontmatter/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index 966f0a9d02ba..0c9067f29dd0 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.19.8"; + version = "2.19.12"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-WW/YETat7ayrAx9gP+javUVbz6/EW4MfrqoB5qr8iTI="; + hash = "sha256-f6TPWEaMv6lAS56T+6hi4u5d1DwwHZUmNXw0LpPaZLQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index 387183793107..c62832bd0989 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.33"; + version = "0.3.34"; pyproject = true; src = fetchFromGitHub { owner = "mitogen-hq"; repo = "mitogen"; tag = "v${version}"; - hash = "sha256-c3POiFLvCUMyYBh9tVCMLR+NkY8/ZLNVYNvitvh0v50="; + hash = "sha256-0g3wPpim7Il6eQ/R8C3DoKy5kRqHBdTlNden3cWNvks="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pcre2-py/default.nix b/pkgs/development/python-modules/pcre2-py/default.nix index 82ac9cf16d89..893ca748162f 100644 --- a/pkgs/development/python-modules/pcre2-py/default.nix +++ b/pkgs/development/python-modules/pcre2-py/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the PCRE2 library created by Philip Hazel"; homepage = "https://github.com/grtetrault/pcre2.py"; - changelog = "https://github.com/grtetrault/pcre2.py/releases/tag/v{version}"; + changelog = "https://github.com/grtetrault/pcre2.py/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ tochiaha ]; }; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 3de212992b14..87352a9e63ea 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20251126"; + version = "1.0.2.20251128"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4leRLqzBF326f4/VkOBhnQVhtDeUYAoqJ7ro5EkWsgg="; + hash = "sha256-JXOynB/jza+ELY1q2XEoLawZgyEt360GF98GRUMn3Do="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index b10afd027be9..90345deeecf2 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-fm0GoUThopt9SV9sxg/A9fylcyOi6l/dGx5rFi5MMIY="; + hash = "sha256-mGhMMXbiSCIXFfcMQuBdOFavqe025bStHnAy3q5gbBg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 3a010b5fe456..239a20e05a88 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -7,19 +7,20 @@ hatchling, httpx, pytest-random-order, + pytest-recording, pytestCheckHook, }: buildPythonPackage rec { pname = "pylast"; - version = "6.0.0"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pylast"; repo = "pylast"; tag = version; - hash = "sha256-mwPiHTLFvaCFPZGqi0+T223Ickbm5JP2MJj4gqaj/qo="; + hash = "sha256-u+wQxw0F/1oB8Kr4terSPo/8/RyPhiKxU0GruZo73H0="; }; build-system = [ @@ -30,9 +31,10 @@ buildPythonPackage rec { dependencies = [ httpx ]; nativeCheckInputs = [ - pytest-random-order - pytestCheckHook flaky + pytest-random-order + pytest-recording + pytestCheckHook ]; pythonImportsCheck = [ "pylast" ]; diff --git a/pkgs/development/python-modules/pyprobables/default.nix b/pkgs/development/python-modules/pyprobables/default.nix index accb2be4ea0a..d5982a5825f5 100644 --- a/pkgs/development/python-modules/pyprobables/default.nix +++ b/pkgs/development/python-modules/pyprobables/default.nix @@ -3,22 +3,19 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pyprobables"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "barrust"; repo = "pyprobables"; tag = "v${version}"; - hash = "sha256-yJUYGfy+d+Xfk1DUDvBeWk0EcNPuW4DcUHx3G3jzEdc="; + hash = "sha256-CxxpiYtqoAm81YjL6nTFIk4MnBG+1n3wbnW8u29lQlw="; }; build-system = [ setuptools ]; @@ -30,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Probabilistic data structures"; homepage = "https://github.com/barrust/pyprobables"; - changelog = "https://github.com/barrust/pyprobables/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/barrust/pyprobables/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 904f6cfb55e8..9e30af22525c 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "3.8.1"; + version = "3.8.5"; pyproject = true; src = fetchFromGitHub { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-ukFbD6RL6us3fSuTj52+PA5dkxeZNfxZCX/eeJL0aTc="; + hash = "sha256-5Xnf/NY9sA2u7bdcSPkVR6YFCS+35iTUACUAokAvcTA="; }; pythonRelaxDeps = [ "pycryptodome" ]; @@ -58,6 +58,8 @@ buildPythonPackage rec { syrupy ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "roborock" ]; meta = { diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 71b24c7d4d87..beb47c87e7ca 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -116,7 +116,7 @@ grpcio, }: let - version = "0.18.20"; + version = "0.18.21"; in buildPythonPackage rec { pname = "unstructured"; @@ -127,7 +127,7 @@ buildPythonPackage rec { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-BeoIjFhLu/EM0iAErW3eST5/D+TBuAOZ4lDPTXEqpzc="; + hash = "sha256-7AI23Sa2G1PJ6uvNbgMKuwbwyUvT4qDHoKDLvb2kbCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index bd8ec2229dec..2d7485dd851e 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "7.4.1"; + version = "8.1.2"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/${version}"; - hash = "sha256-QE3XTummNZCziZPKfFjTI0ell+bftGqbcG0hh+QHx9s="; + hash = "sha256-1LIb14Ovw1+Gi4d9t2rJAJojyncqEzQNriZl7bHgfpw="; }; passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; }; diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 992afd60d3cb..cf83d4254baa 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -24,10 +24,8 @@ unzip, wayland, libXNVCtrl, - nlohmann_json, spdlog, libxkbcommon, - glew, glfw, libXrandr, x11Support ? true, @@ -95,14 +93,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mangohud"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-FvPhnOvcYE8vVB5R+ZRmuZxrC9U4GA338V7VAuUlHCE="; + hash = "sha256-BZ3R7D2zOlg69rx4y2FzzjpXuPOv913TOz9kSvRN+Wg="; }; outputs = [ @@ -190,7 +188,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dbus - nlohmann_json spdlog ] ++ lib.optional waylandSupport wayland @@ -198,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional nvidiaSupport libXNVCtrl ++ lib.optional (x11Support || waylandSupport) libxkbcommon ++ lib.optionals mangoappSupport [ - glew glfw libXrandr ];