diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 811163df74ef..4994166ae8ce 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -120,6 +120,8 @@ - `pkgs.nextcloud28` has been removed since it's out of support upstream. +- `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration. + - `teleport` has been upgraded from major version 16 to major version 17. Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/) and [release notes for v17](https://goteleport.com/docs/changelog/#1701-11152024). @@ -283,6 +285,7 @@ - `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024. - Emacs 28 and 29 have been removed. +- Emacs 28 Macport has been removed, while CVEs of Emacs 29 Macport are patched. - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more diff --git a/lib/tests/nix-for-tests.nix b/lib/tests/nix-for-tests.nix index 96c01241773a..a9a5b2f8de54 100644 --- a/lib/tests/nix-for-tests.nix +++ b/lib/tests/nix-for-tests.nix @@ -14,7 +14,7 @@ builtins.mapAttrs ( attr: pkg: - if lib.versionAtLeast pkg.version "2.26" then + if lib.versionAtLeast pkg.version "2.29pre" then pkg.overrideScope (finalScope: prevScope: { aws-sdk-cpp = null; }) else pkg.override { withAWS = false; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3dcad318e6e0..2fa3bf7611ec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5006,6 +5006,12 @@ name = "Daniel McCarney"; keys = [ { fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; } ]; }; + cr0n = { + name = "cr0n"; + github = "n0rc"; + githubId = 355000; + email = "cr0n@cypherpunks.cc"; + }; Crafter = { email = "crafter@crafter.rocks"; github = "Craftzman7"; diff --git a/nixos/modules/services/networking/centrifugo.nix b/nixos/modules/services/networking/centrifugo.nix index 7b9a05069498..0f2a9f3e5f6a 100644 --- a/nixos/modules/services/networking/centrifugo.nix +++ b/nixos/modules/services/networking/centrifugo.nix @@ -65,6 +65,14 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + (lib.versionAtLeast cfg.package.version "6") -> (!(cfg.settings ? name) && !(cfg.settings ? port)); + message = "`services.centrifugo.settings` is v5 config, must be compatible with centrifugo v6 config format"; + } + ]; + systemd.services.centrifugo = { description = "Centrifugo messaging server"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/tests/centrifugo.nix b/nixos/tests/centrifugo.nix index 8ad44a011663..5867297c3d30 100644 --- a/nixos/tests/centrifugo.nix +++ b/nixos/tests/centrifugo.nix @@ -10,7 +10,10 @@ in { lib, ... }: { name = "centrifugo"; - meta.maintainers = [ lib.maintainers.tie ]; + meta.maintainers = [ + lib.maintainers.tie + lib.maintainers.valodim + ]; nodes = lib.listToAttrs ( lib.imap0 (index: name: { @@ -21,12 +24,15 @@ in services.centrifugo = { enable = true; settings = { - inherit name; - port = centrifugoPort; - # See https://centrifugal.dev/docs/server/engines#redis-sharding - engine = "redis"; - # Connect to local Redis shard via Unix socket. - redis_address = + node = { + inherit name; + }; + http_server.port = centrifugoPort; + http_api.insecure = true; + usage_stats.disabled = true; + + engine.type = "redis"; + engine.redis.address = let toRedisAddresses = map (name: "${name}:${toString redisPort}"); in @@ -35,8 +41,6 @@ in "unix://${config.services.redis.servers.centrifugo.unixSocket}" ] ++ toRedisAddresses (lib.drop (index + 1) nodes); - usage_stats_disable = true; - api_insecure = true; }; extraGroups = [ config.services.redis.servers.centrifugo.user diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 8640d64786b3..90189ee8b779 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -46,8 +46,6 @@ lib.makeScope pkgs.newScope ( withPgtk = true; }; - emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; - emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; } ) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index ef8a5d923822..b8156c5b3bcc 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -535,10 +535,10 @@ mkDerivation (finalAttrs: { }; }; - meta = meta // { + meta = { broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" ]; - }; + } // meta; }) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 952d8e5aeab7..c8bea20543b1 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -13,6 +13,7 @@ let patches ? _: [ ], rev, hash, + meta ? { }, }: { inherit @@ -98,7 +99,7 @@ let } .${variant}; mainProgram = "emacs"; - }; + } // meta; }; in { @@ -121,40 +122,26 @@ in ]; }); - emacs28-macport = import ./make-emacs.nix (mkArgs { - pname = "emacs-mac"; - version = "28.2"; - variant = "macport"; - rev = "emacs-28.2-mac-9.1"; - hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; - patches = fetchpatch: [ - # CVE-2022-45939 - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; - hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; - }) - - # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; - }) - ]; - }); - emacs29-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; - version = "29.1"; + version = "29.4"; variant = "macport"; - rev = "emacs-29.1-mac-10.0"; - hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; + rev = "emacs-29.4-mac-10.1"; + hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic="; + patches = fetchpatch: [ + # CVE-2024-53920 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4="; + }) + + # CVE-2025-1244 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w="; + }) + ]; + + meta.knownVulnerabilities = [ ]; }); } diff --git a/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix new file mode 100644 index 000000000000..3164d8dda54a --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "arepl"; + publisher = "almenon"; + version = "3.0.0"; + hash = "sha256-NadsB/6kUQ7/d9o3rUc7889jO+4MdvBhtyI4UUGpzqk="; + }; + + meta = { + description = "Preferred dark/light themes by John Papa"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=almenon.arepl"; + homepage = "https://github.com/Almenon/AREPL-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 71250f495667..e01c1bd7d952 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -241,6 +241,8 @@ let }; }; + almenon.arepl = callPackage ./almenon.arepl { }; + alygin.vscode-tlaplus = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tlaplus"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 50679b0bf8c9..c0f00af9e778 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-03-28"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "e2522914f72291ad7232d996e7eabdf167b1b414"; - hash = "sha256-uxnRNP5BRpabHLjuI4IiLzqCfRobETEMnwJ9mw+ZdaE="; + rev = "90c09d4b8e6923a22538c35f68ace2d9fead134d"; + hash = "sha256-eVoKmGE3N8uePcNpxWjAjgUjTIfEHZR3K2FLtQtLp+M="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index fe7a6f78ed78..3039615973f7 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2025-02-12"; + version = "0-unstable-2025-04-06"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "26f92531a95a9a74f45a8bf13fc9f3f48cde2976"; - hash = "sha256-XtSuZEfu03dFMQUX4VvpeFLzoWG3TeIBQG4cQkap+t8="; + rev = "b349f7f3e211bb7725f133d3818ab98da5059760"; + hash = "sha256-MNYpuipjnDl9GUl5qWGi5W5cFhUCd/weCKuTRdttKJ4="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index c60d72e1d021..2f28042aa697 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "4b3edb41d33e52b6d70c4e18bf0819a070991b66"; - hash = "sha256-8RmNDvUd64FqEgduNMHgbunu92SqMi+Pn//Ou2EQUFs="; + rev = "2910240a4100ccad68f935082b8bbce194673cb5"; + hash = "sha256-segz2SocZaNNgToNQOIEVIOD3CidyZIS81dStcdAsTs="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index ea811e7eece3..f286c792d223 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-03-08"; + version = "0-unstable-2025-04-04"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "1024afbcd77a7bf7c87972c7c86d3a7759877fc7"; - hash = "sha256-9Y3uzWpiYIRGTFApVGdLIONpBpPaO1sRgaGj1EVI3M4="; + rev = "32a4853c5fd352cc3054e83ed375476cf023aa5f"; + hash = "sha256-3r562/3WWWkibEKzPrA+lASY5Wpz8kuX5EQKqFKJdAA="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 82855f07f20f..587f11685853 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2025-03-06"; + version = "0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "40edadab2e445bfda9d206def9508b43b11fb96a"; - hash = "sha256-TrDx77VCdtLuihwhlz+sYkUvegTxsG8eAn3h6KYO3z0="; + rev = "a638be8510d061f435e2abd46e514bb6c7e41262"; + hash = "sha256-adMLJ3mm+02X07UwG3ojhdt1x5+FvCartxNc/EHz4CQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 876cc55cc95b..4c0f638580f3 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-04-07"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "4df08f409666e46a0a2d94c3cebcfbba72975ca9"; - hash = "sha256-Dp4f3j9Zm3BLMftEJSDSYrqPy1zJ8miStiUTI9mFdLw="; + rev = "2b5fc26ee64d963021bc266aa45f19d90b282f92"; + hash = "sha256-ZbebYUOUdaLVTh+VD8AQvAv/zQzr6tugJRl3iYSrUeo="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 29f084a35e29..4db78372a890 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "135.0.7049.52", + "version": "135.0.7049.84", "chromedriver": { - "version": "135.0.7049.42", - "hash_darwin": "sha256-CixR0TvndAgxvXYbetIqKg6NRu/z3pJe+USCZ0pyQd4=", - "hash_darwin_aarch64": "sha256-WKDi97j1F9+I6RYOsdiXVrgVibZ3ZoVPljo1XAtw0o8=" + "version": "135.0.7049.85", + "hash_darwin": "sha256-L4x/MSCbVt2UIQwbHREDV8br6DmdfuqTJ3//7opK2IU=", + "hash_darwin_aarch64": "sha256-vixXGqbc2UYpydg1RILhrtmr5DdbJ5I1sD8aNikejQU=" }, "deps": { "depot_tools": { @@ -20,8 +20,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173", - "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=", + "rev": "6c019e56001911b3fd467e03bf68c435924d62f4", + "hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=", "recompress": true }, "src/third_party/clang-format/script": { @@ -126,8 +126,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31", - "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ=" + "rev": "53dfda5e9d07d58b43cea66b8153c55dd751ff88", + "hash": "sha256-zXxJZz2C4eDJ8beHDXJe0UCNesDw5R0ogFcsdiF8VIc=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -616,8 +616,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c", - "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY=" + "rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb", + "hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -706,8 +706,8 @@ }, "src/third_party/wasm_tts_engine/src": { "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", - "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130", - "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U=" + "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", + "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -751,8 +751,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2", - "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk=" + "rev": "9e5db68b15087eccd8d2493b4e8539c1657e0f75", + "hash": "sha256-gXdBDo+fzp6hJB8qyhscV7ajwSfCUeYvSxhL10g56rU=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 2f9545fbdc6c..01528df8d729 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-vRngZigXOyxdx9bG2uWpeQ0ASTW+4tKuQWZ1Vm47Y+k="; + hash = "sha256-wnroUILQKVW+aMPhI8MHyzRMox3MhpRMtvYWm6siJqQ="; }; - vendorHash = "sha256-kotV3GC2ilq258cLVGOzBTHb0koWfn92Acl0L8rRi5I="; + vendorHash = "sha256-B4o67yVp7u9N/HNEkF7pbHC33a8fZJvayoPL+qovDeY="; ldflags = [ "-s" diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index aa41e3185c03..8ced7004f1a2 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "25.1.1"; + version = "25.1.2"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - hash = "sha256-H/iLCCX1fMozs/G8erX7cia7wRLjvLxofuiu6pGVJ58="; + hash = "sha256-+xPhHmuogNuolmMFcUAP2hMfJh1D+O4DrPkcuR6+mR8="; }; postPatch = '' diff --git a/pkgs/applications/video/mpv/scripts/twitch-chat.nix b/pkgs/applications/video/mpv/scripts/twitch-chat.nix index cdcadf2f9ead..bf6eab70d187 100644 --- a/pkgs/applications/video/mpv/scripts/twitch-chat.nix +++ b/pkgs/applications/video/mpv/scripts/twitch-chat.nix @@ -7,13 +7,13 @@ }: buildLua { pname = "twitch-chat"; - version = "0-unstable-2024-06-23"; + version = "0-unstable-2025-03-30"; src = fetchFromGitHub { owner = "CrendKing"; repo = "mpv-twitch-chat"; - rev = "bb0c2e84675f4f1e0c221c8e1d3516b60242b985"; - hash = "sha256-lnWYcr49koI60Su85OWbcxrARWTfXW2zIvfCZ6c3GtI="; + rev = "97c94ae58b4a898067b9c63c477716280327d8e1"; + hash = "sha256-KjlzVuj47zos2RQHbveijsyJoN2f7VGBboWolISom7M="; postFetch = "rm $out/screenshot.webp"; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix index 313fb67ecc5f..2f31975697ca 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-color-monitor"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-color-monitor"; tag = finalAttrs.version; - hash = "sha256-EIp1GQ5dKN43D7xodX/ucYcJm994eKsnidFlbLKWHuI="; + hash = "sha256-4Dagga9BgW1Fiaxqs9QlyTax+SgFyTiNiU3yP2GjIDs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix index 72c325b8297f..8ddb7c933f52 100644 --- a/pkgs/by-name/al/alioth/package.nix +++ b/pkgs/by-name/al/alioth/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "alioth"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "alioth"; tag = "v${version}"; - hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU="; + hash = "sha256-xFNX2cxmaw2H8D21qs6mnTMuSidmJ0xJ/b4pxdLTvow="; }; # Checks use `debug_assert_eq!` checkType = "debug"; useFetchCargoVendor = true; - cargoHash = "sha256-kW76EBlpzeSmIhW5UsYjPYp5KeH2mPuf3aAiTSM06g4="; + cargoHash = "sha256-x2Abw/RVKpPx0EWyF3w0kywtd23A+NSNaHRVZ4oB1jI="; separateDebugInfo = true; diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index f0ddc302125c..5e8c267dbf2d 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - nixForLinking, + nixVersions, nixosTests, boost, pkg-config, @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { buildInputs = [ - nixForLinking + nixVersions.nix_2_24 boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; ATTIC_DISTRIBUTOR = "nixpkgs"; - NIX_INCLUDE_PATH = "${lib.getDev nixForLinking}/include"; + NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include"; # Attic interacts with Nix directly and its tests require trusted-user access # to nix-daemon to import NARs, which is not possible in the build sandbox. diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 9dc855b9ded8..f1655fe44951 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "badger"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; rev = "v${version}"; - hash = "sha256-W3vPTLGI7YT7dFklJnOcpfYqQ9aBCsel9L6q4WNincY="; + hash = "sha256-R4nahpUuCjPas1NBnWmQ/KBTY+/yPSyo8AmTvgwhYVI="; }; - vendorHash = "sha256-UVdOiaj1FN0etB9F0kt+THfO0Aa1kgdGYVeSVv4GpxY="; + vendorHash = "sha256-x4+CHLmQhu7Y6n1qx2CBY6KzRIRLD7Gn+pzXQy3/5rA="; subPackages = [ "badger" ]; diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix index 56a3071df33a..cf01ae2ff834 100644 --- a/pkgs/by-name/ba/bao/package.nix +++ b/pkgs/by-name/ba/bao/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "bao"; - version = "0.13.0"; + version = "0.13.1"; src = fetchCrate { inherit version; pname = "${pname}_bin"; - hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI="; + hash = "sha256-8h5otpu3z2Hgy0jMCITJNr8Q4iVdlR5Lea2X+WuenWs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8="; + cargoHash = "sha256-B0wvJTcIRJxBU0G1DONnKeQYrmsmMIorhTLc73o4/kE="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index e96f82a984b6..9a74648e6efa 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -16,23 +16,23 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.9"; + version = "6.1.0"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI="; + hash = "sha256-7hh9wcM9cMfQ2W2PlDitTdJD9ftZt/KO/B+wV/c588U="; }; - vendorHash = "sha256-WfYN7bhtOPDp2UeB/WqtN3dD3+WO9lIxnXe2iTqn000="; + vendorHash = "sha256-hl1BznajnaOXMrlSqksqPdJih29yRDYW9IsyV9mSN20="; ldflags = [ "-s" "-w" - "-X=github.com/centrifugal/centrifugo/v5/internal/build.Version=${version}" - "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsEndpoint=${statsEndpoint}" - "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsToken=${statsToken}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.Version=${version}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsEndpoint=${statsEndpoint}" + "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsToken=${statsToken}" ]; excludedPackages = [ @@ -56,7 +56,10 @@ buildGoModule rec { homepage = "https://centrifugal.dev"; changelog = "https://github.com/centrifugal/centrifugo/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.tie ]; + maintainers = [ + lib.maintainers.tie + lib.maintainers.valodim + ]; mainProgram = "centrifugo"; }; } diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 28a46a64576a..eca5647ce705 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.399"; + version = "3.2.400"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-/ssPTHHW3AeQRjIDdBBZe6Jnoj/UvQXiLYFhuOJZI5o="; + hash = "sha256-R0u1O0az4LMrE7m3PVyLmNf1ru90ym5lbpWAd3T+0QU="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index d43c222385b8..d3d1bdd9ebb0 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -14,6 +14,7 @@ udev, xkeyboard_config, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -64,13 +65,23 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index a6fca5a62349..30dcddceb0ae 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -6,6 +6,7 @@ libcosmicAppHook, just, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -43,13 +44,23 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 240931718aab..dd6637c115f8 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -7,6 +7,7 @@ just, nasm, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -41,13 +42,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 2f3ae72a11c6..815b6d2deb87 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -13,6 +13,7 @@ udev, systemd, nix-update-script, + nixosTests, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: @@ -57,13 +58,23 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index f9077e2c283c..d30051be8245 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,6 +16,7 @@ wayland, xorg, vulkan-loader, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -84,6 +85,15 @@ rustPlatform.buildRustPackage (finalAttrs: { --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" ''; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-edit"; description = "Text Editor for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 7951c9f82d9d..2f94b8b9f533 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -7,6 +7,7 @@ libcosmicAppHook, glib, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -80,13 +81,23 @@ rustPlatform.buildRustPackage (finalAttrs: { runHook postCheck ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 90ca350a82c2..68a5ee7aa5ea 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -12,6 +12,7 @@ coreutils, xkeyboard_config, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -69,13 +70,23 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 3bf2c64eb330..18332385b9fc 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -11,6 +11,7 @@ just, bash, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -48,13 +49,23 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"' ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index ac55e2b38390..d852fefb31e3 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -6,6 +6,7 @@ just, libcosmicAppHook, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -41,13 +42,23 @@ rustPlatform.buildRustPackage (finalAttrs: { env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable"; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 99a85f7ee6a7..5fa93c6b17c5 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,6 +12,7 @@ appstream-glib, desktop-file-utils, intltool, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -62,6 +63,15 @@ rustPlatform.buildRustPackage (finalAttrs: { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" ''; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-notifications"; description = "Notifications for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 745f86f03891..31be64525d5e 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -6,6 +6,7 @@ pulseaudio, udev, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -31,13 +32,23 @@ rustPlatform.buildRustPackage (finalAttrs: { env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 279addbd48b7..56b193f96dbf 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -6,6 +6,7 @@ libcosmicAppHook, just, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -39,13 +40,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 4dc39cf83dfb..82e0bb86bd2f 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -13,6 +13,7 @@ libglvnd, libgbm, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -71,13 +72,23 @@ rustPlatform.buildRustPackage (finalAttrs: { libcosmicAppWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index e887e516cbec..7f6b46785e2a 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, wayland-scanner, nix-update-script, + nixosTests, }: stdenv.mkDerivation { @@ -20,11 +21,21 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ wayland-scanner ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "branch=HEAD" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 34444fe33e2c..e5605ace88ab 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -7,6 +7,7 @@ pkg-config, wayland, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -42,13 +43,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index df6a50a5ec12..4a5a6e4da84b 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -5,6 +5,7 @@ rustPlatform, just, pkg-config, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -37,6 +38,15 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-screenshot" ]; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-screenshot"; description = "Screenshot tool for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 3f3bf681c7b1..d92ff5c15e0c 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -7,6 +7,7 @@ dbus, stdenv, xdg-desktop-portal-cosmic, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -62,7 +63,17 @@ rustPlatform.buildRustPackage (finalAttrs: { fi ''; - passthru.providedSessions = [ "cosmic" ]; + passthru = { + providedSessions = [ "cosmic" ]; + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + }; meta = { homepage = "https://github.com/pop-os/cosmic-session"; diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index e63ca30c9c2c..1fea2c041514 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -7,6 +7,7 @@ geoclue2-with-demo-agent, libinput, udev, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -38,6 +39,15 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; + passthru.tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-settings-daemon"; description = "Settings Daemon for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 7305976a50ee..76a97c61c3e8 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -18,6 +18,7 @@ cosmic-randr, xkeyboard_config, nix-update-script, + nixosTests, }: let libcosmicAppHook' = (libcosmicAppHook.__spliced.buildHost or libcosmicAppHook).override { @@ -77,13 +78,23 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index e096b9cc2d03..9387581d4aa8 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -10,6 +10,7 @@ flatpak, openssl, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -51,6 +52,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; updateScript = nix-update-script { extraArgs = [ "--version" diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index f8efd682d3a4..c186673faf4a 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -10,6 +10,7 @@ freetype, libinput, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -57,13 +58,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 598ad84c8a36..824f3f960f85 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -9,6 +9,7 @@ libgbm, udev, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -45,13 +46,23 @@ rustPlatform.buildRustPackage (finalAttrs: { "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version" - "unstable" - "--version-regex" - "epoch-(.*)" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix index ceb56e9b4d12..ab135355eba8 100644 --- a/pkgs/by-name/el/elasticsearch-curator/package.nix +++ b/pkgs/by-name/el/elasticsearch-curator/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "8.0.20"; + version = "8.0.21"; pyproject = true; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; tag = "v${version}"; - hash = "sha256-oeQ36CvR/v0Mvo+aGL+dYHTgEsq9TesZoBMdoePmgnI="; + hash = "sha256-yVOZBz4AJNjmpxRp3t03KwDzp/3W8uJiHwuSRJbfLvk="; }; pythonRelaxDeps = [ "es-client" ]; diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 47f33ba813a8..f9fa72114747 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-04-07"; + version = "2025-04-08"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-cuKfuxgHD6aFsYSbcmLSaqz5z1EyOCgjBxsrvJFfuoU="; + hash = "sha256-xo9DhcQyigfAOF/yn46U09YMr8jlbJZp93wwJ4btr6Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix index 81edec825164..dbcd7a4f2b72 100644 --- a/pkgs/by-name/ff/ffizer/package.nix +++ b/pkgs/by-name/ff/ffizer/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "ffizer"; - version = "2.13.1"; + version = "2.13.2"; buildFeatures = [ "cli" ]; @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { owner = "ffizer"; repo = "ffizer"; rev = version; - hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw="; + hash = "sha256-GL1tdWOcbdybPayfShoGnxHsqYi8p+DZ6Eo/8bvWElE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JbCRD2P2jt2f+c2BUnb512p5ulein0guzgx4gj3SeVU="; + cargoHash = "sha256-5hsJ6eMiUPOqAzW1bdXTGTP5tY6VM2tTdySpkJl6pAY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index bbf6b3592832..30f90db82be6 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "17.2.0"; + version = "17.10.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-a2Igy4DS3fYTvPW1vvDrH/DjMQ4lG9cm/P3mFr+y9s4="; + hash = "sha256-pLmDWZHxd9dNhmbcHJRBxPuY0IpcJoXz/fOJeP1lVlA="; }; - vendorHash = "sha256-1MwHss76apA9KoFhEU6lYiUACrPMGYzjhds6nTyNuJI="; + vendorHash = "sha256-1NteDxcGjsC0kT/9u7BT065EN/rBhaNznegdPHZUKxo="; # For patchShebangs nativeBuildInputs = [ bash ]; @@ -33,32 +33,43 @@ buildGoModule (finalAttrs: { '' # Remove some tests that can't work during a nix build - # Requires to run in a git repo + # Needs the build directory to be a git repo sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go + rm shells/abstract_test.go # No writable developer environment - rm common/build_test.go rm common/build_settings_test.go + rm common/build_test.go rm executors/custom/custom_test.go - # No docker during build - rm executors/docker/terminal_test.go + # No Docker during build rm executors/docker/docker_test.go - rm helpers/docker/auth/auth_test.go rm executors/docker/services_test.go + rm executors/docker/terminal_test.go + rm helpers/docker/auth/auth_test.go + + # No Kubernetes during build + rm executors/kubernetes/feature_test.go + rm executors/kubernetes/kubernetes_test.go + rm executors/kubernetes/overwrites_test.go '' + lib.optionalString stdenv.buildPlatform.isDarwin '' + # Invalid bind arguments break Unix socket tests + sed -i "s/func TestRunnerWrapperCommand_createListener/func OFF_TestRunnerWrapperCommand_createListener/" commands/wrapper_test.go + # No keychain access during build breaks X.509 certificate tests - rm helpers/certificate/x509_test.go - rm network/client_test.go + sed -i "s/func TestCertificate/func OFF_TestCertificate/" helpers/certificate/x509_test.go + sed -i "s/func TestClientInvalidSSL/func OFF_TestClientInvalidSSL/" network/client_test.go ''; excludedPackages = [ - # CI helper script for pushing images to Docker and ECR registries + # Nested dependency Go module, used with go.mod replace directive # - # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139 - "./scripts/sync-docker-images" + # https://gitlab.com/gitlab-org/gitlab-runner/-/commit/57ea9df5d8a8deb78c8d1972930bbeaa80d05e78 + "./helpers/runner_wrapper/api" + # Helper scripts for upstream Make targets, not intended for downstream consumers + "./scripts" ]; ldflags = diff --git a/pkgs/by-name/go/go-toml/package.nix b/pkgs/by-name/go/go-toml/package.nix index d22898102778..f363710a18d8 100644 --- a/pkgs/by-name/go/go-toml/package.nix +++ b/pkgs/by-name/go/go-toml/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.2.3"; + version = "2.2.4"; in buildGoModule { pname = "go-toml"; @@ -14,10 +14,10 @@ buildGoModule { owner = "pelletier"; repo = "go-toml"; rev = "v${version}"; - sha256 = "sha256-+l89SvJ/4SxVItys1ROLOv2hZ5euU1MF21Yn0siQHUM="; + sha256 = "sha256-VKUrpSaGzkewNSyE0sB6PWVIQiraY7UxE5Wve+76UFk="; }; - vendorHash = "sha256-YkOcpzn5AKFMDWUYbKY8DzGMiIMSyaDfexFmXv5HNQI="; + vendorHash = null; excludedPackages = [ "cmd/gotoml-test-decoder" diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix index 6d1546d69f42..eb28baa3d818 100644 --- a/pkgs/by-name/go/goconst/package.nix +++ b/pkgs/by-name/go/goconst/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "goconst"; - version = "1.7.1"; + version = "1.8.0"; excludedPackages = [ "tests" ]; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "jgautheron"; repo = "goconst"; rev = "v${version}"; - sha256 = "sha256-GpOZJ5/5aNw1o8fk2RSAx200v6AZ+pbNu/25i8OSS1Y="; + sha256 = "sha256-pEkwEVnxZ7d10FE1CG5Ym9JBbzZl8mnabzdPg5gfKuo="; }; vendorHash = null; diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 951d7b453687..177d4fecddd3 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.9"; + version = "0.2.11"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${version}"; - hash = "sha256-ORyczdynAAr2hYzXove/IXRngkRIhKgXLQg5VbvvGS8="; + hash = "sha256-KHM/r4zDJrZMIC7+Kp+98xhV5r4zkpxc1ffqf0jgnLs="; }; - vendorHash = "sha256-UY79Fex8hwaXtFLefBUeyO7PxJevWWaQU5MEOAMLPkA="; + vendorHash = "sha256-g3/WuLDb4mAzklT+nxQ1U/l+JDzSubENMB5hWjIaIIU="; subPackages = [ "cmd/greenmask/" ]; diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index c1458d5b16b9..e8734388ad8c 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.46.6"; + version = "0.46.7"; src = fetchFromGitHub { owner = "kimono-koans"; repo = "httm"; rev = version; - hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM="; + hash = "sha256-GSYkgDDDkvQnuW8zeLL703L8tlgklhB3OKulJdmrRoY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dIF3Qi8rK+H07x4uhi8uXs1Pdr8p3KIkVUrXqEQpCsc="; + cargoHash = "sha256-UxOm6G0hQfi7L49YQEshfNkPMy7LPNX2VBg0F9uLMiY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 7e2c45fd4c40..84ae45ccbb6a 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -47,7 +47,6 @@ fetchFromGitHub, nixosTests, unstableGitUpdater, - nixVersions, }: let @@ -80,6 +79,7 @@ let CryptRandPasswd DBDPg DBDSQLite + DBIxClassHelpers DataDump DateTime DigestSHA1 @@ -122,34 +122,21 @@ let UUID4Tiny XMLSimple YAML - nix.perl-bindings + (nix.libs.nix-perl-bindings or nix.perl-bindings) git ]; }; - nix-eval-jobs' = - (nix-eval-jobs.override { - nix = nixVersions.nix_2_25; - }).overrideAttrs - (_: { - version = "2.25.0-unstable-2025-02-13"; - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nix-eval-jobs"; - rev = "6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7"; - hash = "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA="; - }; - }); in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2025-02-12"; + version = "0-unstable-2025-04-07"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "c6f98202cd1b091475ae51b6a093d00b4c8060d4"; - hash = "sha256-CEDUtkA005PiLt1wSo3sgmxfxUBikQSE74ZudyWNxfE="; + rev = "1c52c4c0ed596ea71de370562ed5af1604bd2183"; + hash = "sha256-pcZA2SA7nskxsvDYp3nzF5V258b67YrZONv9G3PhLCE="; }; outputs = [ @@ -182,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { subversion openssh nix - nix-eval-jobs' + nix-eval-jobs coreutils findutils pixz @@ -220,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales python3 libressl.nc - nix-eval-jobs' + nix-eval-jobs openldap postgresql ]; @@ -257,7 +244,7 @@ stdenv.mkDerivation (finalAttrs: { --set-default HYDRA_RELEASE ${finalAttrs.version} \ --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name or "unknown"} \ - --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs'.name or "unknown"} + --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs.name or "unknown"} done ''; diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index e230987a0e9e..01138c9e3517 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "n0-computer"; repo = "iroh"; rev = "v${version}"; - hash = "sha256-uavWluu7rVY2lZXDRsKApcZMB7TJsGuhJzieZPMXdvE="; + hash = "sha256-kOqmkuKOP2dWrUVaGwHckWjaFVZkSoXqqUgn+2KaWkc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7tQbfXVdgoxACF6qtesbUQ3AtVFAI2IbGO720PjwZCc="; + cargoHash = "sha256-O/j+/sRyMtqd4GaER2trn9SEFpZuSlc5q1MTXU+rwLg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index c99ebe9e3c4d..3de35f8e43a2 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "yamafaktory"; repo = "jql"; rev = "jql-v${version}"; - hash = "sha256-J+Zqmfev2DyD0SLFGaI0egVgmEC+a2nqBrNDGX4zNnE="; + hash = "sha256-0sQEC2kUnuuKp73DJsNBFB0VL0rkBkudmr7ZQpS1v04="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tMxy0bi3518VjzJuy4Agpq+UydMEyJRqavX5kIsBYjY="; + cargoHash = "sha256-10eM7tczFoQVYagyP1btsCp4PHm+zRoh2oAEVVxsROA="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index af32830388e7..9f419bb5e0ff 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kor"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-VK5G8J851rsIEt2ljrTWFPCxhIBTgLkMlEMVb9kJcOs="; + hash = "sha256-jqP2GsqliltjabbHDcRseMz7TOWl9YofAG/4Y7ADub8="; }; - vendorHash = "sha256-iJtZ/t4VCVPqMKwV7jCKwqxitkZ/pTlP6mz9ElGcSsY="; + vendorHash = "sha256-HZS1PPlra1uGBuerGs5X9poRzn7EGhTopKaC9tkhjlo="; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index f8ad9df8f55f..59306559958e 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -4,7 +4,13 @@ cmake, fetchFromGitHub, tbb_2021_11, - useTBB ? true, + + # Until we have a release with + # https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those + # PRs are patched onto this current release. Even then, I think we + # still need to disable for MinGW build because + # https://github.com/BLAKE3-team/BLAKE3/issues/467 + useTBB ? false, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index fce99820962a..95822525c670 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.158.0"; + version = "1.159.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-0po4nPCunq9cBaVFSsS1uo18dv6Y6IHGzL1zC2zwXdI="; + hash = "sha256-Pdrb2A4OhW2+XsBuwTQfIjZms9byaMg/KV2fGWD35/w="; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-k8TN6YtCVPR8RnFoiGX9APvKwpQzj7T53DlKMD9r/e0="; + hash = "sha256-5xihycfIdZ/DINoKZ7kiRB46xKyEB4aAQz2OkejoXJc="; }; nativeBuildInputs = diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index 18fe73e6260c..af215b99a4dd 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -10,7 +10,7 @@ nix-update-script, }: let - version = "0.6.0"; + version = "0.7.0"; in rustPlatform.buildRustPackage { pname = "manga-tui"; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage { owner = "josueBarretogit"; repo = "manga-tui"; rev = "v${version}"; - hash = "sha256-L5KZaBJDG0z6NUGPJfbOkKCp1xQEzqfJ9GREx189VqU="; + hash = "sha256-1WFg2hG3UnOO9+HpUcdPkZNhsNYa2QG1PhzLZ4bQiQM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gmG/gDozYizwjcm3SGs2m8oLiuWp6oxJPOB3FlHfW+4="; + cargoHash = "sha256-1nERwIZCR/afgfGdronpy145GnDkbsB7YjF6XyDcfEY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix index 403f29e54f9c..c8b151af3aba 100644 --- a/pkgs/by-name/mo/mockgen/package.nix +++ b/pkgs/by-name/mo/mockgen/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "mockgen"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "uber-go"; repo = "mock"; rev = "v${version}"; - sha256 = "sha256-1UlaM3IvKlplBW1pg5l+IXwirlierjDKqKsVwFt7EAw="; + sha256 = "sha256-xzPuy+KH40FDnjir/aROYlgWzLBY8qKDbYmkFMzHVkc="; }; vendorHash = "sha256-0OnK5/e0juEYrNJuVkr+tK66btRW/oaHpJSDakB32Bc="; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 5eb57965676d..439e618e584a 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "4.6.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-xHWiE0SCv5LbObAa4Ha/U1uTFe9z11nhpB/eMj5qYoA="; + hash = "sha256-B2arJ7m7q/vf1YcaYquhkBU3anekZAwRd1ZIvwvYnmM="; }; - vendorHash = "sha256-tgshaSrh5o28uiSMF7sv4AP57xYkaHq6B8sQTrnteqQ="; + vendorHash = "sha256-/LpBb0wbK7OP8HmL2/uMVeilIs4P51Pf+sg23zbPqtI="; subPackages = "."; diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix new file mode 100644 index 000000000000..49cffba090e0 --- /dev/null +++ b/pkgs/by-name/ne/necesse-server/package.nix @@ -0,0 +1,51 @@ +{ + fetchzip, + jre, + lib, + stdenvNoCC, +}: + +let + version = "0.31.1-17664948"; + urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; + +in +stdenvNoCC.mkDerivation { + pname = "necesse-server"; + inherit version; + + src = fetchzip { + url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip"; + hash = "sha256-H7/fc3zkuEMuv9Uq00TLSLF4rT8+UWsofnuCFrmUtjU="; + }; + + # removing packaged jre since we use our own + postUnpack = '' + rm -rf "$sourceRoot/jre" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r . $out + params='-nogui "$@"' + cat >$out/bin/necesse-server < enableAudio && enableEmulation && enableLibplayer; stdenv.mkDerivation (finalAttrs: { pname = "libvgm"; - version = "0-unstable-2024-10-17"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "7b694e53e42a75ce48b846c53d08e4a33f627842"; - hash = "sha256-u+mBzmEixJT3rwuipITktFI4iVswnXftfF7syBw4t/w="; + rev = "4464b6d59f1afe99a0f7679dff50c5ada4a31654"; + hash = "sha256-btKg65haGhuz+xh4eWlujzUIhjjdUg9RelLX/ouLx68="; }; outputs = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0737837d581f..8beb92b16a52 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.28"; + version = "1.37.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-+FkmPOdsszpMed6lRc1EdYjKI6H9CQg8FvjlhgX4lRU="; + hash = "sha256-NkRGBqfBwQyXAN3lkPevsTRUYGVVP3YfNiB8H+uEfgs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index f4a29c68f6a0..eca5c6af828d 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.28"; + version = "1.37.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-FsTll2y4O4Y4hHIDUOJF3d5zvTnP4slI1axXxwquyJ4="; + hash = "sha256-xZiYvx0Jv2qfSR9HBcVpbnS4MVa3ZqoXFoZ/EbigTqE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/dirsearch/default.nix b/pkgs/development/python-modules/dirsearch/default.nix index 74b97e1f9ce3..f29892dec108 100644 --- a/pkgs/development/python-modules/dirsearch/default.nix +++ b/pkgs/development/python-modules/dirsearch/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { ]; pythonRemoveDeps = [ # not available, see above - "ntlm-auth" + "ntlm_auth" ]; pythonRelaxDeps = [ # version checker doesn't recognize 0.8.0.rc2 as >=0.7.0 @@ -110,7 +110,7 @@ buildPythonPackage rec { # probably not but we don't have old charset-normalizer versions in nixpkgs # and requests also depends on it so we can't just override it with an # older version due to package duplication - "charset-normalizer" + "charset_normalizer" ]; meta = { diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix index 73a1d6ade3ad..995c7f552494 100644 --- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix +++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix @@ -16,11 +16,12 @@ langgraph-checkpoint-sqlite, postgresql, postgresqlTestHook, - psycopg-pool, psycopg, + psycopg-pool, pytest-asyncio, pytest-mock, pytestCheckHook, + xxhash, # passthru nix-update-script, @@ -55,19 +56,17 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ - pytestCheckHook - postgresql - postgresqlTestHook - ]; - - checkInputs = [ langgraph-checkpoint langgraph-checkpoint-postgres langgraph-checkpoint-sqlite + postgresql + postgresqlTestHook psycopg psycopg-pool pytest-asyncio pytest-mock + pytestCheckHook + xxhash ]; preCheck = '' diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 2716824e6d71..708da84981d8 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -23,7 +23,6 @@ langgraph-checkpoint-sqlite, langsmith, psycopg, - psycopg-pool, pydantic, pytest-asyncio, pytest-mock, @@ -115,10 +114,11 @@ buildPythonPackage rec { disabledTestPaths = [ # psycopg.errors.InsufficientPrivilege: permission denied to create database - "tests/test_pregel_async.py" - "tests/test_pregel.py" + "tests/test_checkpoint_migration.py" "tests/test_large_cases.py" "tests/test_large_cases_async.py" + "tests/test_pregel.py" + "tests/test_pregel_async.py" ]; passthru = { diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index af6971573fa7..e0f9c268ac28 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "mcp"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-Z2NN6k4mD6NixDON1MUOELpBZW9JvMvFErcCbFPdg2o="; + hash = "sha256-APm3x4tcDbp8D2ygW43wFyP0llJ6fXZiINHRYShp9ZY="; }; postPatch = '' @@ -98,6 +98,6 @@ buildPythonPackage rec { description = "Official Python SDK for Model Context Protocol servers and clients"; homepage = "https://github.com/modelcontextprotocol/python-sdk"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ josh ]; }; } diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index 76a433c60782..81cd5385ed8d 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mcpadapt"; - version = "0.0.19"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-CQK9Nv12E3jBcHI/RwJOaD2E6DbTWwVvTZ31kpsNGXg="; + hash = "sha256-hSmE53LfpLAZosVWHqy3795UPqqLdknMVfWrIxAxWBM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5c39b6079d78..c5f832f2a229 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -266,8 +266,8 @@ rec { "sha256-nVAeLXy2hjJZDjNTjFccKClY7DS0oLv9Q9QLlngkX6M="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.37.26" - "sha256-gHSdYTzGKq5U3L3kqNCtl6JW8zzIBTbQeHRmLsPIYGg="; + buildMypyBoto3Package "codebuild" "1.37.29" + "sha256-iUO4pxG9wJexwwnD3KUie9TeLP1D6Mu3RjP11zYxHp4="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.37.0" @@ -574,8 +574,8 @@ rec { "sha256-JSVZVCZ6P5A+EqjXHmbbDIdE1rKrdSwNcZvUbYxKpSA="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.37.13" - "sha256-FrJfuU55fUM3pxt4ey/KLmgXD3wTs6PlksCOBCQ1ibA="; + buildMypyBoto3Package "glue" "1.37.29" + "sha256-LL7zn9WjB7NyFYN2bs54X9v5i+ax2GpDDFzMcm6t5N0="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.37.0" @@ -866,8 +866,8 @@ rec { "sha256-Ltzv3h+NATTcKsyd1PfnUdjIhT3V0OS3woGsStyI/qA="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.37.26" - "sha256-fJHjUBVtXAeNth2fAzBdcLwaFNN6ma+3eQpwFnZU6B4="; + buildMypyBoto3Package "medialive" "1.37.29" + "sha256-X8jdJi7XRidW2DsyFRM+6jMUtu3jNJDNm0h7HMOxp/E="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.37.0" @@ -1014,8 +1014,8 @@ rec { "sha256-e9sP379VsbZeKUhLURtsMsSPxfIvCsYVNqZhUg67+MY="; mypy-boto3-personalize = - buildMypyBoto3Package "personalize" "1.37.0" - "sha256-qUtv4DOn0Hle7QGBr3cgphQXDNj9iC0xwOhCGHaayW8="; + buildMypyBoto3Package "personalize" "1.37.29" + "sha256-A7TLIG3TYVkSAAIRcn6OLoNSUpiwIEItwk4JI+f0nAc="; mypy-boto3-personalize-events = buildMypyBoto3Package "personalize-events" "1.37.0" @@ -1370,8 +1370,8 @@ rec { "sha256-UW0b40n+M8za5guDPxhU5cRvtbkqzX6G7M2UaxNq5ws="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.37.24" - "sha256-0+oRkebGHtwR7NXxXfdVMlF1+11+yFQyDBPJGuaz9k4="; + buildMypyBoto3Package "transfer" "1.37.29" + "sha256-sTjua+D1wGOa/8lod+/cafll9lk3NFI6vkE7NlGKmyU="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.37.0" diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index d814ad05ab5e..815964658c8c 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cryptography" + "docx2txt" "fastapi" "llama-index-core" "llama-index-readers-file" diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 677b89f0fe07..59c2ddfd32bd 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250329"; + version = "1.0.2.20250408"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HinLmgjEHCmoW3tNTQF8vKWSh7IExxaGbdcztQsPuSk="; + hash = "sha256-LDbUgmHbow6IRI0I2s2eyRv9l/hUpH9ubMxcz1rp4uI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index cfc4a2e8673b..32c92136fb16 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.74"; + version = "0.2.75"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-pQRyIv1wu78vNjxl5tt0kI34RvCEycEMMEtaOnlaa10="; + hash = "sha256-rQP9OuWK+kEyc5DipPo0tPagvHm1Rl1YVUiALL7OKvQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index c1fbf0c5b36d..c6f86a1eb3ed 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.27"; + version = "0.28"; pyproject = true; disabled = pythonOlder "3.9"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; tag = version; - hash = "sha256-aba2f+7I/Lo3Vr7u9VCDRXQ5BRbQpJlQCCnib+Wp9Vs="; + hash = "sha256-hzdgG2/bTkzTUPK/Rnch4q12R5kY+qlr6gRwx54vbcE="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix index acf4b9332b95..4dd13a0edaef 100644 --- a/pkgs/development/python-modules/scikit-base/default.nix +++ b/pkgs/development/python-modules/scikit-base/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "scikit-base"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "sktime"; repo = "skbase"; tag = "v${version}"; - hash = "sha256-UGYkYhgo6LzlZTg6YDehJXd4D5p8FfUgWPdlW4PPOdI="; + hash = "sha256-Bkvk3x76DuLr7Q3NkD7z0ycXK6+K+24hawWeBrX6t1w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 1aadc9635fef..cbc33570fbec 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1355"; + version = "3.0.1356"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-Sg6RU4rvagvFV5oyyDiCp/atdUlkCRYXoctIRaukfic="; + hash = "sha256-sxmrymOkZCfvb1THOHNOz0PLv5MigcJeZsZ4UylgTG0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 132bd67caea3..7b2eb68b21b4 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "torchmetrics"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; tag = "v${version}"; - hash = "sha256-OrNYkvaTU1Zm1634eaLQqESkmLmPGgIBN2mAd1xmMP0="; + hash = "sha256-pjUGv064xVOfXiLDMTaFu6Fu4kt/2tfg2l2YGKlhjfw="; }; dependencies = [ diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index f664f3142bd2..0bb1901cc4a8 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.24.2"; + version = "0.25.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-WCa69prV0px2vkn8ffACIigfoxsU+Z6ftEktceyY/qU="; + hash = "sha256-4RKYdQyZZH9/O5jW1tZIeQCWzTLURf0NSaYEGmMzbJo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix index f31733bd045d..450f3df1a06d 100644 --- a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix @@ -9,6 +9,7 @@ # dependencies dunamai, eval-type-backport, + jinja2, pydantic, returns, tomlkit, @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "uv-dynamic-versioning"; - version = "0.6.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { @@ -30,7 +31,7 @@ buildPythonPackage rec { tag = "v${version}"; # Tests perform mock operations on the local repo leaveDotGit = true; - hash = "sha256-rcvNQ6QrVu2pp1aWTalNK2R7CW/NfFGmu4Dea1EN2ZA="; + hash = "sha256-DO10OGij7koV5VYqywRR28pg0sEOAuGpqz1Ksf39MQo="; }; build-system = [ @@ -41,6 +42,7 @@ buildPythonPackage rec { dunamai eval-type-backport hatchling + jinja2 pydantic returns tomlkit diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index a56c47b59b31..6dc9ff0fb969 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -8,7 +8,7 @@ llvmPackages, meson, ninja, - nixForLinking, + nixVersions, nix-update-script, nixd, nixf, @@ -101,12 +101,12 @@ in ]; buildInputs = [ - nixForLinking + nixVersions.nix_2_24 gtest boost ]; - env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h"; + env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h"; passthru.tests.pkg-config = testers.hasPkgConfigModules { package = nixt; @@ -127,7 +127,7 @@ in sourceRoot = "${common.src.name}/nixd"; buildInputs = [ - nixForLinking + nixVersions.nix_2_24 nixf nixt llvmPackages.llvm @@ -137,7 +137,7 @@ in nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ]; - env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h"; + env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h"; # See https://github.com/nix-community/nixd/issues/519 doCheck = false; diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index fd8f627fa316..19ea2892e999 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk="; + hash = "sha256-U7uanUE/xdmXqtpvnG6b+oDKamNZkCH04OCy3Y5UIhQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8K4Jn2A9OREwLRyFddHREcylapoFr+/AMT7Wq4o2Ue4="; + cargoHash = "sha256-PR8HoHroHp5nBbRwR8TZ5NeBH4eDXGV46HkDLeydmAk="; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 3ce35050642e..074df2f75d76 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.19.10", - "uiVersion": "0.19.10", - "serverHash": "sha256-RKXub6mpsDjm7kA/B+kMzLb/BZM4NuVRA3bPIPmc+vg=", - "serverCargoHash": "sha256-E+rml4PGJ3b/6Z22eZlhcudl2hfAS7OV2h7hqpsBoKQ=", - "uiHash": "sha256-QALxc4tKsflRcVJ99JYs7SSbgBWU9Y7SPIwxvLoVvM0=", - "uiPNPMDepsHash": "sha256-sEN8NUlXWuvfmuAaoy/Vx3X+xG/TbeAdYG2LfctcOGc=" + "serverVersion": "0.19.11", + "uiVersion": "0.19.11", + "serverHash": "sha256-veF+fJTjsB543PyBnnBN4rmejTWrnlnLghnP6mLDP7U=", + "serverCargoHash": "sha256-H9Eu/nKxK27OXvzPi5ItTbKcHqISKAjN17MRWsw5xlc=", + "uiHash": "sha256-K8nNb/HQy/s5S5h9Ndt3t8F9/h1D2zOGrTEKhv+Z4Ks=", + "uiPNPMDepsHash": "sha256-SqU/kYadwszogaBErP2v1VXIMhJj9AHRKdrHLc99fMw=" } diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 33ef120c40bc..369eec6c9f88 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, - nixForLinking, + nixVersions, nlohmann_json, boost, graphviz, @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { doCheck = true; nativeCheckInputs = [ - nixForLinking + nixVersions.nix_2_24 graphviz ]; buildInputs = [ boost - nixForLinking + nixVersions.nix_2_24 nlohmann_json ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 623b17695ea7..d229bc50e301 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -14,24 +14,25 @@ stdenv.mkDerivation rec { pname = "nix-eval-jobs"; version = "2.28.0"; + src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; hash = "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA="; }; + buildInputs = [ boost nix curl nlohmann_json ]; + nativeBuildInputs = [ meson ninja pkg-config - # nlohmann_json can be only discovered via cmake files - cmake ]; # Since this package is intimately tied to a specific Nix release, we diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common-autoconf.nix similarity index 100% rename from pkgs/tools/package-management/nix/common.nix rename to pkgs/tools/package-management/nix/common-autoconf.nix diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix new file mode 100644 index 000000000000..d6d27f18ebd4 --- /dev/null +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -0,0 +1,287 @@ +{ + lib, + fetchFromGitHub, + version, + suffix ? "", + hash ? null, + src ? fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = version; + inherit hash; + }, + patches ? [ ], + maintainers ? lib.teams.nix.members ++ [ + lib.maintainers.lovesegfault + lib.maintainers.artturin + ], + self_attribute_name, +}@args: +assert (hash == null) -> (src != null); +{ + stdenv, + bison, + boehmgc, + boost, + brotli, + busybox-sandbox-shell, + bzip2, + callPackage, + cmake, + curl, + darwin, + doxygen, + editline, + flex, + git, + gtest, + jq, + lib, + libarchive, + libblake3, + libcpuid, + libgit2, + libsodium, + lowdown, + lowdown-unsandboxed, + toml11, + man, + meson, + ninja, + mdbook, + mdbook-linkcheck, + nlohmann_json, + nixosTests, + openssl, + perl, + python3, + pkg-config, + rapidcheck, + rsync, + Security, + sqlite, + util-linuxMinimal, + xz, + enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + enableStatic ? stdenv.hostPlatform.isStatic, + withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + aws-sdk-cpp, + withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, + libseccomp, + + confDir, + stateDir, + storeDir, + + # passthru tests + pkgsi686Linux, + pkgsStatic, + runCommand, + pkgs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nix"; + + version = "${version}${suffix}"; + VERSION_SUFFIX = suffix; + + inherit src patches; + + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals enableDocumentation [ + "man" + "doc" + ]; + + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; + + hardeningDisable = [ + "shadowstack" + ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify"; + + nativeCheckInputs = [ + git + man + ]; + + nativeBuildInputs = + [ + bison + cmake + flex + jq + meson + ninja + pkg-config + rsync + ] + ++ lib.optionals enableDocumentation [ + (lib.getBin lowdown-unsandboxed) + mdbook + mdbook-linkcheck + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + util-linuxMinimal + ] + ++ lib.optionals enableDocumentation [ + python3 + doxygen + ]; + + buildInputs = + [ + boost + brotli + bzip2 + curl + editline + libgit2 + libsodium + lowdown + openssl + sqlite + toml11 + xz + ] + ++ lib.optionals (lib.versionAtLeast version "2.26") [ + libblake3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + libcpuid + ] + ++ lib.optionals withLibseccomp [ + libseccomp + ] + ++ lib.optionals withAWS [ + aws-sdk-cpp + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + darwin.apple_sdk.libs.sandbox + ]; + + propagatedBuildInputs = [ + boehmgc + nlohmann_json + libarchive + ]; + + checkInputs = [ + gtest + rapidcheck + ]; + + postPatch = '' + patchShebangs --build tests + ''; + + preConfigure = + # Copy libboost_context so we don't get all of Boost in our closure. + # https://github.com/NixOS/nixpkgs/issues/45462 + lib.optionalString (!enableStatic) '' + mkdir -p $out/lib + cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib + rm -f $out/lib/*.a + ${lib.optionalString stdenv.hostPlatform.isLinux '' + chmod u+w $out/lib/*.so.* + patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.* + ''} + ''; + + dontUseCmakeConfigure = true; + + mesonFlags = + [ + (lib.mesonBool "bindings" false) + (lib.mesonOption "libstore:store-dir" storeDir) + (lib.mesonOption "libstore:localstatedir" stateDir) + (lib.mesonOption "libstore:sysconfdir" confDir) + (lib.mesonEnable "libutil:cpuid" stdenv.hostPlatform.isx86_64) + (lib.mesonEnable "libstore:seccomp-sandboxing" withLibseccomp) + (lib.mesonBool "libstore:embedded-sandbox-shell" ( + stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic + )) + (lib.mesonBool "doc-gen" enableDocumentation) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.mesonOption "libstore:sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") + # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 + ] + ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [ + # TODO: do we still need this? + # "--enable-lto" + ]; + + doCheck = true; + + # socket path becomes too long otherwise + preInstallCheck = + lib.optionalString stdenv.hostPlatform.isDarwin '' + export TMPDIR=$NIX_BUILD_TOP + '' + # See https://github.com/NixOS/nix/issues/5687 + + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' + echo "exit 0" > tests/functional/flakes/show.sh + '' + + '' + # nixStatic otherwise does not find its man pages in tests. + export MANPATH=$man/share/man:$MANPATH + ''; + + separateDebugInfo = stdenv.hostPlatform.isLinux && enableStatic; + + passthru = { + inherit aws-sdk-cpp boehmgc; + + # TODO: + perl-bindings = perl.pkgs.toPerlModule ( + callPackage ./nix-perl.nix { + nix = finalAttrs.finalPackage; + inherit Security; + } + ); + + tests = import ./tests.nix { + inherit + runCommand + version + src + lib + stdenv + pkgs + pkgsi686Linux + pkgsStatic + nixosTests + self_attribute_name + ; + nix = finalAttrs.finalPackage; + }; + }; + + # point 'nix edit' and ofborg at the file that defines the attribute, + # not this common file. + pos = builtins.unsafeGetAttrPos "version" args; + meta = with lib; { + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; + homepage = "https://nixos.org/"; + license = licenses.lgpl21Plus; + inherit maintainers; + platforms = platforms.unix; + outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + mainProgram = "nix"; + }; +}) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index de70aa46badf..6fd7f3e18dbf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -20,20 +20,35 @@ let # Called for Nix < 2.26 - common = + commonAutoconf = args: - nixDependencies.callPackage (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) { + nixDependencies.callPackage + (import ./common-autoconf.nix ({ inherit lib fetchFromGitHub; } // args)) + { + inherit + Security + storeDir + stateDir + confDir + ; + aws-sdk-cpp = + if lib.versionAtLeast args.version "2.12pre" then + nixDependencies.aws-sdk-cpp + else + nixDependencies.aws-sdk-cpp-old; + }; + + # Called for Nix == 2.28. Transitional until we always use + # per-component packages. + commonMeson = + args: + nixDependencies.callPackage (import ./common-meson.nix ({ inherit lib fetchFromGitHub; } // args)) { inherit Security storeDir stateDir confDir ; - aws-sdk-cpp = - if lib.versionAtLeast args.version "2.12pre" then - nixDependencies.aws-sdk-cpp - else - nixDependencies.aws-sdk-cpp-old; }; # https://github.com/NixOS/nix/pull/7585 @@ -140,7 +155,7 @@ lib.makeExtensible ( ( { nix_2_3 = - (common { + (commonAutoconf { version = "2.3.18"; hash = "sha256-jBz2Ub65eFYG+aWgSI3AJYvLSghio77fWQiIW1svA9U="; patches = [ @@ -155,48 +170,30 @@ lib.makeExtensible ( enableParallelChecking = false; }; - nix_2_24 = common { + nix_2_24 = commonAutoconf { version = "2.24.14"; hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY="; self_attribute_name = "nix_2_24"; }; - nix_2_25 = common { + nix_2_25 = commonAutoconf { version = "2.25.5"; hash = "sha256-9xrQhrqHCSqWsQveykZvG/ZMu0se66fUQw3xVSg6BpQ="; self_attribute_name = "nix_2_25"; }; - nixComponents_2_26 = nixDependencies.callPackage ./modular/packages.nix rec { + nix_2_26 = commonMeson { version = "2.26.3"; - inherit (self.nix_2_24.meta) maintainers; - otherSplices = generateSplicesForNixComponents "nixComponents_2_26"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY="; - }; + hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; + self_attribute_name = "nix_2_28"; }; - # Note, this might eventually become an alias, as packages should - # depend on the components they need in `nixComponents_2_26`. - nix_2_26 = addTests "nix_2_26" self.nixComponents_2_26.nix-everything; - - nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix rec { + nix_2_28 = commonMeson { version = "2.28.1"; - inherit (self.nix_2_24.meta) maintainers; - otherSplices = generateSplicesForNixComponents "nixComponents_2_28"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = version; - hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; - }; + hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; + self_attribute_name = "nix_2_28"; }; - nix_2_28 = addTests "nix_2_28" self.nixComponents_2_28.nix-everything; - nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { version = "2.29pre20250407_${lib.substring 0 8 src.rev}"; inherit (self.nix_2_24.meta) maintainers; @@ -231,7 +228,7 @@ lib.makeExtensible ( nix; # Read ./README.md before bumping a major release - stable = addFallbackPathsCheck self.nix_2_24; + stable = addFallbackPathsCheck self.nix_2_28; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs ( diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index 99ce5101265b..f3b42e4c7c2e 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -14,11 +14,13 @@ meson, ninja, bzip2, + libarchive, }: let atLeast223 = lib.versionAtLeast nix.version "2.23"; atLeast224 = lib.versionAtLeast nix.version "2.24"; + atLeast226 = lib.versionAtLeast nix.version "2.26"; mkConfigureOption = { @@ -39,21 +41,24 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = "sourceRoot=$sourceRoot/${lib.optionalString atLeast224 "src"}/perl"; # TODO: Remove this once the nix build also uses meson - postPatch = lib.optionalString atLeast224 '' + postPatch = lib.optionalString (atLeast224 && lib.versionOlder nix.version "2.27") '' substituteInPlace lib/Nix/Store.xs \ --replace-fail 'config-util.hh' 'nix/config.h' \ --replace-fail 'config-store.hh' 'nix/config.h' ''; - buildInputs = [ - boost - bzip2 - curl - libsodium - nix - perl - xz - ] ++ lib.optional (stdenv.hostPlatform.isDarwin) Security; + buildInputs = + [ + boost + bzip2 + curl + libsodium + nix + perl + xz + ] + ++ lib.optional (stdenv.hostPlatform.isDarwin) Security + ++ lib.optional atLeast226 libarchive; # Not cross-safe since Nix checks for curl/perl via # NEED_PROG/find_program, but both seem to be needed at runtime diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 42a048b78ca4..bba82db3d967 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -14,13 +14,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-9hUf6J3kTI0nvLExReUUovW8pZjlaoqgFmLd5mShZzU="; + hash = "sha256-QvU+JpIcE9EX+ehRWvs2bS2VGgGVekNX8f5+mITIwU0="; }; buildInputs = @@ -32,7 +32,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-jNRNjAecf84XzkPLWHjCYPxh1igUs7Yd0MSAmRcPtlc="; + vendorHash = "sha256-qIi+Pp4XZg1GxOhM9fCyD9rPaIiQHhoQudB50gzWgrM="; subPackages = [ "cmd/cosign" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 14b051cd6e2b..1a578c9a45bb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -546,6 +546,7 @@ mapAliases { emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 + emacs28-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06 emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b9680040aed..13a5b5f297d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -125,9 +125,7 @@ with pkgs; defaultPkgConfigPackages = # We don't want nix-env -q to enter this, because all of these are aliases. - dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs) // { - __attrsFailEvaluation = true; - }; + dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs); ### Nixpkgs maintainer tools @@ -9852,7 +9850,7 @@ with pkgs; hunspellWithDicts = dicts: callPackage ../by-name/hu/hunspell/wrapper.nix { inherit dicts; }; - hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_24; }; + hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_28; }; icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) @@ -14180,7 +14178,6 @@ with pkgs; emacs30-nox emacs30-pgtk - emacs28-macport emacs29-macport ; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 5705c8ad4c70..83885cd85cb5 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -395,7 +395,7 @@ }, "javascriptcoregtk-4.0": { "attrPath": [ - "webkitgtk" + "webkitgtk_4_0" ] }, "lapack": { @@ -837,12 +837,12 @@ }, "webkit2gtk-4.0": { "attrPath": [ - "webkitgtk" + "webkitgtk_4_0" ] }, "webkit2gtk-web-extension-4.0": { "attrPath": [ - "webkitgtk" + "webkitgtk_4_0" ] }, "x11": {