From 715a1b1c49e10a665cdf6f659720b511c0bcd963 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:59:35 +0100 Subject: [PATCH 01/67] maintainers: add Anton-4 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0aaa79106c73..a928ca4b7d13 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1772,6 +1772,11 @@ githubId = 301546; name = "Antoine Roy-Gobeil"; }; + anton-4 = { + name = "Anton"; + github = "Anton-4"; + githubId = 17049058; + }; anton-dessiatov = { email = "anton.dessiatov@gmail.com"; github = "anton-dessiatov"; From 5d0142f09fc4fa99c5d14f443c15bae1597b92a2 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:33:13 +0100 Subject: [PATCH 02/67] maintainers: add rtfeldman --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a928ca4b7d13..26184279eb81 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21424,6 +21424,11 @@ githubId = 47790121; name = "Ryan Burns"; }; + rtfeldman = { + github = "rtfeldman"; + githubId = 1094080; + name = "Richard Feldman"; + }; rtimush = { email = "rtimush@gmail.com"; github = "rtimush"; From 265fde48bfa13ba43de59fac3a3db965553953f5 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:47:13 +0100 Subject: [PATCH 03/67] maintainers: add bhansconnect --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 26184279eb81..4cb12e164348 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3231,6 +3231,11 @@ githubId = 24254289; name = "Payas Relekar"; }; + bhansconnect = { + github = "bhansconnect"; + githubId = 8334696; + name = "Brendan Hansknecht"; + }; bhasherbel = { email = "nixos.maintainer@bhasher.com"; github = "BhasherBEL"; From cdddae6cd995a8f82c09825f58406fe67cb48d73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jun 2025 19:40:48 +0000 Subject: [PATCH 04/67] k3sup: 0.13.9 -> 0.13.10 --- pkgs/by-name/k3/k3sup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k3/k3sup/package.nix b/pkgs/by-name/k3/k3sup/package.nix index 3a9073f9f4e5..b992282f39e5 100644 --- a/pkgs/by-name/k3/k3sup/package.nix +++ b/pkgs/by-name/k3/k3sup/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.13.9"; + version = "0.13.10"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-3ySfLYeopz9PqxNmnao5m4Kymu5o5jcsOJdN8hz0Yss="; + sha256 = "sha256-0iYz2bxUBC+tnPZgH+QQo0ZNRktniw6gs9hWrLIjS+U="; }; nativeBuildInputs = [ From f0b4f33120d6cc49b295a8e9415060df99bd359f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Jun 2025 19:04:09 +0000 Subject: [PATCH 05/67] regsync: 0.8.3 -> 0.9.0 --- pkgs/by-name/re/regclient/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix index 919e154a60df..03cd1b939861 100644 --- a/pkgs/by-name/re/regclient/package.nix +++ b/pkgs/by-name/re/regclient/package.nix @@ -18,16 +18,16 @@ in buildGoModule rec { pname = "regclient"; - version = "0.8.3"; + version = "0.9.0"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-vuZPd51nzCasV3WWulbKCQnqVkupMu5jQhQypvTKGvk="; + sha256 = "sha256-FVXTEP1CNlKmuorNxRE2SeiA90u2rz8sXELBtfRm9z0="; }; - vendorHash = "sha256-ad7IPiOMG4G80BdAZz7IN0hBPJgUIVdO9oFlM7IDmp8="; + vendorHash = "sha256-MP/drjUbST5s3NKQ6omVOLSvl4rdPSfVaM0zlF/9Cq0="; outputs = [ "out" ] ++ bins; From b6bffc94209129d7695fa86f0b40a2f14dc68435 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Jul 2025 13:51:26 +0000 Subject: [PATCH 06/67] hclfmt: 2.23.0 -> 2.24.0 --- pkgs/by-name/hc/hclfmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hc/hclfmt/package.nix b/pkgs/by-name/hc/hclfmt/package.nix index a5770aef2aea..89865cbf3aeb 100644 --- a/pkgs/by-name/hc/hclfmt/package.nix +++ b/pkgs/by-name/hc/hclfmt/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-0RRvkOBPVrdbZo9zbVgZletKNXPBsN7pa7fsyfI9hXg="; + hash = "sha256-YWGd2rQXJ4AX8nhByYRdp+91PJeHrdCpxvKQntxzRhY="; }; - vendorHash = "sha256-F2i7ph9GL9Xo43da6jHPn9P9FdWC6eSgqCyHPBxdFJY="; + vendorHash = "sha256-5yGTuv19XyXsZcaHKXr/mYqKRufkJBaYMICFwMP/p3g="; # The code repository includes other tools which are not useful. Only build # hclfmt. From 95022acc72d3ee2f16b2227b50271403ed7df105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Jul 2025 14:54:30 +0000 Subject: [PATCH 07/67] summon: 0.10.4 -> 0.10.5 --- pkgs/by-name/su/summon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/summon/package.nix b/pkgs/by-name/su/summon/package.nix index 4c57b68d08c3..40af94611d3d 100644 --- a/pkgs/by-name/su/summon/package.nix +++ b/pkgs/by-name/su/summon/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "summon"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "cyberark"; repo = "summon"; rev = "v${version}"; - hash = "sha256-nAjaZh0bnGBZh2wK78M4gg8BGsM6kBQ8MNvfPI7TIOg="; + hash = "sha256-m4aLGEUXBakfp+KwUZBmNzFEHuG58ZuWQFF5TmUM7pM="; }; - vendorHash = "sha256-B6sbMKmuIQ+xoJspFCRtqe9IOLW+AFF5XQBDSLhM9cI="; + vendorHash = "sha256-QOCPATTs2vvww+ekt6HFg2IUA/NFmE8+2WkMby2f/OE="; subPackages = [ "cmd" ]; From 3e8f215df4400ada2a91ac0663073e94926abb15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Jul 2025 00:37:34 +0000 Subject: [PATCH 08/67] q: 0.19.2 -> 0.19.5 --- pkgs/tools/networking/q/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix index 6aac0616b554..89b76fcf2618 100644 --- a/pkgs/tools/networking/q/default.nix +++ b/pkgs/tools/networking/q/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "q"; - version = "0.19.2"; + version = "0.19.5"; src = fetchFromGitHub { owner = "natesales"; repo = "q"; rev = "v${version}"; - sha256 = "sha256-kfuf0iwRYNxd9TfIIHvAqLxXjesQh7jC0evT9DQrrzQ="; + sha256 = "sha256-Chvh+L1RV/T/blFjGS2wiJynXxbWE6eKbu4TRTFTb3o="; }; - vendorHash = "sha256-6kdf+LwMrIjwC3uZHlMdpEHvonxKfr86PQaMOgzgYOc="; + vendorHash = "sha256-7OknLdkJB3ujX/DL+DVdWFK5RcoEw5R9h/KY4OfKeCw="; ldflags = [ "-s" From 5b9157c88e341b1e33882350e963983a8862b79a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Jul 2025 22:37:05 +0000 Subject: [PATCH 09/67] geoipupdate: 7.1.0 -> 7.1.1 --- pkgs/by-name/ge/geoipupdate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix index bb7f6d485d11..2d9c1f5e5baa 100644 --- a/pkgs/by-name/ge/geoipupdate/package.nix +++ b/pkgs/by-name/ge/geoipupdate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-XfQ5W2JbPBIAh5iF4jj9UJ4eLhhRHRwFPs0VWrBQVNA="; + sha256 = "sha256-ATvQLN5i2Wc+kGBPsF0z3LrfjHkeGhjp6cwtgPFLRGk="; }; - vendorHash = "sha256-XQTZITuG9HjHnpYsSdwNLbdeDhH48+1kLCK32DMkppo="; + vendorHash = "sha256-0/F9jUaqWG6yn8ciXhzzTctQzw1EffsVIJiDLpWyHTQ="; ldflags = [ "-X main.version=${version}" ]; From 813f95d5cbdf9773b1a2a2383acb34d3c9aeb9b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Jul 2025 16:10:19 +0000 Subject: [PATCH 10/67] kubeone: 1.10.1 -> 1.11.0 --- pkgs/by-name/ku/kubeone/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index 5095e2d95309..44ff3ce47f5e 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-bRl2Yrg3fidytCt3stjTyNx7IdMpADgVzpd/7btQgY8="; + hash = "sha256-K33KKvGw4iF7aq/eumSFzYk3ij8pE8mUh4wN9TA9Q/4="; }; - vendorHash = "sha256-Ltrs86I5CAjx21BZZrG+UD5/YdLbaFwJqRQLvGwOA9E="; + vendorHash = "sha256-Wnnwp1GRlE1q8MSc23pOmSn9fKu5uHVzkivfuF2lnEk="; ldflags = [ "-s" From e7ee980f5e9cc997d00b164881d46f3609084b3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Jul 2025 18:45:26 +0000 Subject: [PATCH 11/67] do-agent: 3.17.1 -> 3.18.0 --- pkgs/by-name/do/do-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix index b22911ed1b7f..5cbcb7699a7e 100644 --- a/pkgs/by-name/do/do-agent/package.nix +++ b/pkgs/by-name/do/do-agent/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.17.1"; + version = "3.18.0"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-XzZ9UmEA45ipVU0AHLZ+HeW/rmlBtgLXgyyGF1O1nqE="; + sha256 = "sha256-sS6aBJVrF9NrAzizSBBXKM3iMAHa+j9rDw7hZSHgRFg="; }; ldflags = [ From e2fe34c798e4dd6bef8e7d8879647b74c9d3bd7a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 15 Jul 2025 10:03:20 +0100 Subject: [PATCH 12/67] xbase: mark `broken` for removal Fails to build on `gcc-14` as https://hydra.nixos.org/build/300549105: xbstring.cpp: In member function 'xbString& xbString::sprintf(const char*, ...)': xbstring.cpp:297:3: error: 'va_start' was not declared in this scope 297 | va_start(ap, format); | ^~~~~~~~ xbstring.cpp:314:3: error: 'va_end' was not declared in this scope 314 | va_end(ap); | ^~~~~~ --- pkgs/by-name/xb/xbase/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/xb/xbase/package.nix b/pkgs/by-name/xb/xbase/package.nix index cd512138b5d3..a1334c95d125 100644 --- a/pkgs/by-name/xb/xbase/package.nix +++ b/pkgs/by-name/xb/xbase/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/xdb/"; description = "C++ class library formerly known as XDB"; platforms = platforms.linux; + broken = true; # Fails to build against gcc-14, no upstream activity. license = licenses.lgpl2; }; } From f798530055345307760e89ed9629f9eec7403b0a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 16 Jul 2025 06:41:13 +0100 Subject: [PATCH 13/67] xorg.xf86videorendition: remove The package failed to build with a switch to `gcc-14`: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videorendition.x86_64-linux Instead of fixing it let's remove as it's unlikely anyone has the hardware on `NixOS` to use it. --- pkgs/servers/x11/xorg/default.nix | 38 ----------------------------- pkgs/servers/x11/xorg/tarballs.list | 1 - 2 files changed, 39 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5bcfd73888f9..72fa8f20b1b5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5887,44 +5887,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videorendition = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libpciaccess, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-rendition"; - version = "4.2.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; - sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libpciaccess - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videos3virge = callPackage ( { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index af52d9252054..ab2622766043 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -101,7 +101,6 @@ mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz -mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz From 5fa7b0683dee398baa3740c324be2d74410853d8 Mon Sep 17 00:00:00 2001 From: Diego Date: Tue, 15 Jul 2025 17:25:50 +0200 Subject: [PATCH 14/67] goimapnotify: 2.5.2 -> 2.5.3 --- pkgs/by-name/go/goimapnotify/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goimapnotify/package.nix b/pkgs/by-name/go/goimapnotify/package.nix index 1091247f6ea5..a31b424e539c 100644 --- a/pkgs/by-name/go/goimapnotify/package.nix +++ b/pkgs/by-name/go/goimapnotify/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; tag = version; - hash = "sha256-ZCcnAwkfU1EoCtbQiR76f8drcYqgxxsz2eJJr5mbr6A="; + hash = "sha256-sA2fXk7/xnPl8ogrF00fiRCZvhFoHWjNlugL6gTGHk0="; }; vendorHash = "sha256-5cZzaCoOR1R7iST0q3GaJbYIbKKEigeWqhp87maOL04="; From 181bc09fd792c490c08b88a2758e8926efdfa91d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 06:18:20 +0000 Subject: [PATCH 15/67] scalr-cli: 0.17.1 -> 0.17.4 --- pkgs/by-name/sc/scalr-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index efe605fbf45a..004e3549e544 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.17.1"; + version = "0.17.4"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-+ZwENhZF19VpJPGOVHnT4vMiWi8fzuJa3AhyOQ/S6w0="; + hash = "sha256-W8Ug/Y5vF604qT9U2SWfYQZMUP4JOFdWAQNU3Yiu5mE="; }; vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI="; From bbe3a7a9d74f5a218ddb9e660bdbbd24f514c21e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 00:33:17 +0000 Subject: [PATCH 16/67] frr: 10.3.1 -> 10.4.0 --- pkgs/by-name/fr/frr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 9dec87026de7..dd67f5047b0c 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -82,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "frr"; - version = "10.3.1"; + version = "10.4.0"; src = fetchFromGitHub { owner = "FRRouting"; repo = "frr"; rev = "frr-${finalAttrs.version}"; - hash = "sha256-54LMy2gBVp/BwTOlfQiE6TAMvx8Citn4QF6lvyvrFOo="; + hash = "sha256-62+WTabM+gx8CJDAb7LnTG45B1jcpWTTEouiQW3q468="; }; # Without the std explicitly set, we may run into abseil-cpp From e3307b5a0251592a8c82341d3d98ff78deba9b84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 00:47:01 +0000 Subject: [PATCH 17/67] eksctl: 0.210.0 -> 0.211.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index fc77b758e4b0..c818ebbd1f4f 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.210.0"; + version = "0.211.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "eksctl"; rev = version; - hash = "sha256-d5P9bfneUpyAB9cxnu7Hw4ZOykWf8/GSVclNtIjTe6g="; + hash = "sha256-WscHv+4IieE3G87/Iicw2CFpf73C2Og58N/a5fbf0kU="; }; - vendorHash = "sha256-vhYexIdkn8Y5U5YZewj/O8sJCt/VimZU4E4kn0/1lU4="; + vendorHash = "sha256-sUoidROptTEDqGdb30BFJazf/I2Ggmx3GUs6xE69nNI="; doCheck = false; From f768156e6451deea35fe6bb802ebab248cc59861 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 01:03:52 +0000 Subject: [PATCH 18/67] openfga-cli: 0.7.0 -> 0.7.2 --- pkgs/by-name/op/openfga-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index 59e6a1a8a8a0..133d08cbc58c 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.7.0"; + version = "0.7.2"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-hZS9aBHPrcLZd5oitFPAG7z0M5mxWAX2ErE3PL+EdN4="; + hash = "sha256-k/YDomfOn658j4XZKPV9BZZSQBnJdNJOUF6SONmESqY="; }; - vendorHash = "sha256-qVJBYLJ4YNNA8hkl4J2kEL1MR+MzrHMQnhNvs6EYV98="; + vendorHash = "sha256-v9zzPl80TsOfYfc764aVpuflj7I4eZOa9PTCjX7dL/4="; nativeBuildInputs = [ installShellFiles ]; From 663bdedb457ce009b2fd414178e027364292462d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 13:12:24 +0000 Subject: [PATCH 19/67] amazon-q-cli: 1.12.4 -> 1.12.6 --- pkgs/by-name/am/amazon-q-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index e793ec319dbb..c73135a64277 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "amazon-q-cli"; - version = "1.12.4"; + version = "1.12.6"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli-autocomplete"; tag = "v${finalAttrs.version}"; - hash = "sha256-juZuqZkBsIHhLOCZk+QpTaO1BsHj2RZyCvkvc0G5KbU="; + hash = "sha256-IjM9eFoFfy/WV6lPJB1mnRZYoXLIiVozjzmnXEnU2MA="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; - cargoHash = "sha256-BT3LNOkRf4gfBy5SwuAnMoJVF9PmwiLsS5phdtEgIrs="; + cargoHash = "sha256-XZX8EisHQ1vqbrV8VnXrah3o1h3iKCxzPsKk6Z+aKzU="; cargoBuildFlags = [ "-p" From eebe5b6863137aef68719cb88ef52a8b32cec5ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 17:00:16 +0000 Subject: [PATCH 20/67] saucectl: 0.195.2 -> 0.196.0 --- pkgs/by-name/sa/saucectl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index f697c368c431..6e5c88023893 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.195.2"; + version = "0.196.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-qBP2FXvx6E8f8/wwN+kVuN2f4QBfoG7ORGqmxlNYYtI="; + hash = "sha256-UqGz5pzhICHJ7zRHZYgtf44xUqd15FgtPuG1/6Nc0PQ="; }; ldflags = [ From 00055d5896e4cad9768d0c0b9cc4d5d4a8ec1f5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Jul 2025 05:14:23 +0000 Subject: [PATCH 21/67] kubectl: 1.33.2 -> 1.33.3 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 54b88925986b..16d9c8b4f46b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -22,13 +22,13 @@ buildGoModule (finalAttrs: { pname = "kubernetes"; - version = "1.33.2"; + version = "1.33.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ef/tpjM5RGQzO8rZxTad23DuM6VLlV3N54LOu7dtc6A="; + hash = "sha256-UZdrfQEEx0RRe4Bb4EAWcjgCCLq4CJL06HIriYuk1Io="; }; vendorHash = null; From 01803f657cac819813dff79fa090af2c97de7356 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Jul 2025 10:42:01 +0000 Subject: [PATCH 22/67] karlyriceditor: 3.3 -> 4.1.2 --- pkgs/by-name/ka/karlyriceditor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/karlyriceditor/package.nix b/pkgs/by-name/ka/karlyriceditor/package.nix index 399af098af05..84cfbc99a28e 100644 --- a/pkgs/by-name/ka/karlyriceditor/package.nix +++ b/pkgs/by-name/ka/karlyriceditor/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "karlyriceditor"; - version = "3.3"; + version = "4.1.2"; src = fetchFromGitHub { owner = "gyunaev"; repo = "karlyriceditor"; rev = finalAttrs.version; - hash = "sha256-i4uZtHxnreow7a5ZX6WCXMUSwgkUJS/1oDCJOgfFjHw="; + hash = "sha256-eW5sO1gjuwIighnlylJQd9QC+07s1MZX/oPyaHIi/Qs="; }; nativeBuildInputs = [ From ac416f34bafc30eeb5298011cbc6de337381c1d8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 22 Jul 2025 07:03:00 +0100 Subject: [PATCH 23/67] rust-analyzer-unwrapped: 2025-07-14 -> 2025-07-21 Changes: https://github.com/rust-lang/rust-analyzer/releases/tag/2025-07-21 --- pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index fbc5a9333530..7773ccb6c60a 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-07-14"; + version = "2025-07-21"; useFetchCargoVendor = true; - cargoHash = "sha256-bYJGlePqgcZ5ixdCJleJS0gjiKtiS1d2XJymhyUknas="; + cargoHash = "sha256-Of1agDo7/stiS58yTtL0rV/iCRMipO3bQC4xEsi7CGk="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg="; + hash = "sha256-KYavlyBR385om3AOEF+ABCjslJF7vi/Eufo2L56Hhfg="; }; cargoBuildFlags = [ From c5daa57822ac06785d4495633c00b4ad26e12fa8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 22 Jul 2025 10:49:46 +0200 Subject: [PATCH 24/67] fwupd: 2.0.12 -> 2.0.13 Diff: https://github.com/fwupd/fwupd/compare/refs/tags/2.0.12...refs/tags/2.0.13 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.0.13 --- pkgs/by-name/fw/fwupd/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 4707f56cca7b..901505481c22 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -76,8 +76,6 @@ efibootmgr, tpm2-tools, - fetchpatch2, - # passthru nixosTests, nix-update-script, @@ -135,7 +133,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.0.12"; + version = "2.0.13"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -153,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-AYPrQzk28CS4Yhj2+KARt3b1SC02YifEftsSF+fKJ+Y="; + hash = "sha256-iarQfen2MCgQUDST5c81+KBd8gxBqM9EO6f0fN4fZbI="; }; patches = [ @@ -174,11 +172,6 @@ stdenv.mkDerivation (finalAttrs: { # EFI capsule is located in fwupd-efi now. ./efi-app-path.patch - - (fetchpatch2 { - url = "https://github.com/fwupd/fwupd/pull/8959.diff?full_index=1"; - hash = "sha256-w4uf1CXSyy1pqqM4lzMZoOFhDxadcU3Tdnz0dJgLW7w="; - }) ]; postPatch = From d2c072bc05842967396df8274f8c10f19ae52436 Mon Sep 17 00:00:00 2001 From: Jakob Kukla Date: Tue, 22 Jul 2025 15:21:52 +0000 Subject: [PATCH 25/67] uhd: 4.7.0.0 -> 4.8.0.0 --- pkgs/by-name/uh/uhd/no-adapter-tests.patch | 17 -------------- pkgs/by-name/uh/uhd/package.nix | 27 +++------------------- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 pkgs/by-name/uh/uhd/no-adapter-tests.patch diff --git a/pkgs/by-name/uh/uhd/no-adapter-tests.patch b/pkgs/by-name/uh/uhd/no-adapter-tests.patch deleted file mode 100644 index af426dcc4d57..000000000000 --- a/pkgs/by-name/uh/uhd/no-adapter-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt -index bac599811..267f8e602 100644 ---- a/host/tests/CMakeLists.txt -+++ b/host/tests/CMakeLists.txt -@@ -517,12 +517,6 @@ UHD_ADD_NONAPI_TEST( - ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp - ) - --UHD_ADD_NONAPI_TEST( -- TARGET "xport_adapter_ctrl_test.cpp" -- EXTRA_SOURCES -- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp --) -- - UHD_ADD_NONAPI_TEST( - TARGET "custom_reg_test.cpp" - EXTRA_SOURCES diff --git a/pkgs/by-name/uh/uhd/package.nix b/pkgs/by-name/uh/uhd/package.nix index 100df1c58579..64aa72d39883 100644 --- a/pkgs/by-name/uh/uhd/package.nix +++ b/pkgs/by-name/uh/uhd/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true # - version = "4.7.0.0"; + version = "4.8.0.0"; outputs = [ "out" @@ -56,14 +56,14 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; # The updateScript relies on the `src` using `hash`, and not `sha256. To # update the correct hash for the `src` vs the `uhdImagesSrc` - hash = "sha256-TX1iLs941z8sZY0yQEXuy9jGgsn6HU4uqIdxJmNNahU="; + hash = "sha256-1HnXFeja4g1o64IPUkv/YyP/3upgYsjCVWal8t/hcuc="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; # Please don't convert this to a hash, in base64, see comment near src's # hash. - sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3"; + sha256 = "0i5zagajj0hzdnavvzaixbn6nkh8p9aqw1lv1bj9lpbdh2wy4bk0"; }; # This are the minimum required Python dependencies, this attribute might # be useful if you want to build a development environment with a python @@ -182,27 +182,6 @@ stdenv.mkDerivation (finalAttrs: { # Build only the host software preConfigure = "cd host"; - patches = [ - # fix for boost 187 remove on next update - (substitute { - src = fetchpatch { - name = "boost-187.patch"; - url = "https://github.com/EttusResearch/uhd/commit/adfe953d965e58b5931c1b1968899492c8087cf6.patch"; - hash = "sha256-qzxe6QhGoyBul7YjCiPJfeP+3dIoo1hh2sjgYmc9IiI="; - }; - # The last two hunks in client.cc will fail without these substitutions - substitutions = [ - "--replace-fail" - "[buffer, idx, func_name, p, this]" - "[=]" - "--replace-fail" - "[buffer, this]" - "[=]" - ]; - }) - # Disable tests that fail in the sandbox, last checked at version 4.6.0.0 - ./no-adapter-tests.patch - ]; postPhases = [ From ff22aa612812087a6bd02ae59d4884c8993c181e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 00:13:59 +0000 Subject: [PATCH 26/67] gitlab-runner: 18.1.1 -> 18.1.2 --- pkgs/by-name/gi/gitlab-runner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 1f5aafe26afb..77db18ccf2a2 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "18.1.1"; + version = "18.1.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-XJgGw+7jC0b/UBI3p7RoamOSHGswtPaO4f/apARVW2Y="; + hash = "sha256-zazDJBo6HiBh995nsYQvYCgcxyNaulV2ZrG7Kbwxb+0="; }; vendorHash = "sha256-G9qZKWI//ECG88Tu8zb8nEDSwNRabVMsrp7aQzVsxCY="; From 8122470daf10684a3d11000aa53fa123aeee4320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 07:54:17 +0000 Subject: [PATCH 27/67] databricks-cli: 0.259.0 -> 0.260.0 --- pkgs/by-name/da/databricks-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index e676f0e74c2e..d3f2b3beed2f 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "0.259.0"; + version = "0.260.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-UzfLtGwiyEnHRn54qAwcqMXag8k8GjpB5BGMYh/93O8="; + hash = "sha256-N3l7K+KQ7P7O4zooh3AgvAnLJM8Bsp4qJw9501SnO5c="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-veFhCZkkLnC6hVuHPiB+OjqsvUcxkp3B59lQikgjFbE="; + vendorHash = "sha256-jwEJ0Uoq6pVo1/a1mXj7n2BRiWAmhlxLE0WxSrqcL8w="; excludedPackages = [ "bundle/internal" From c81ebc88b6302b2a353e374a9cca701aed555750 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 5 Jul 2025 21:21:15 +0200 Subject: [PATCH 28/67] dynarmic: init at 6.7.0-unstable-2025-03-16 Signed-off-by: Marcin Serwin --- ...keLists-update-mcl-version-to-0.1.13.patch | 29 ++++ ...-Fix-tests-when-using-newer-versions.patch | 27 ++++ pkgs/by-name/dy/dynarmic/package.nix | 145 ++++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch create mode 100644 pkgs/by-name/dy/dynarmic/0001-xbyak-Fix-tests-when-using-newer-versions.patch create mode 100644 pkgs/by-name/dy/dynarmic/package.nix diff --git a/pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch b/pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch new file mode 100644 index 000000000000..8f28e58bff85 --- /dev/null +++ b/pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch @@ -0,0 +1,29 @@ +From cdbf3ba41ddce41d8ae375464e514f72d158ec0b Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 5 Jul 2025 22:26:49 +0200 +Subject: [PATCH] CMakeLists: update mcl version to 0.1.13 + +The mcl in externals is already at this version, but it wasn't bumped +here which makes it impossible to use prebuilt mcl. + +Signed-off-by: Marcin Serwin +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e95050da..edd153d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -145,7 +145,7 @@ set(TSL_ROBIN_MAP_ENABLE_INSTALL ON) + + find_package(Boost 1.57 REQUIRED) + find_package(fmt 9 CONFIG) +-find_package(mcl 0.1.12 EXACT CONFIG) ++find_package(mcl 0.1.13 EXACT CONFIG) + find_package(tsl-robin-map CONFIG) + + if ("arm64" IN_LIST ARCHITECTURE OR DYNARMIC_TESTS) +-- +2.49.0 + diff --git a/pkgs/by-name/dy/dynarmic/0001-xbyak-Fix-tests-when-using-newer-versions.patch b/pkgs/by-name/dy/dynarmic/0001-xbyak-Fix-tests-when-using-newer-versions.patch new file mode 100644 index 000000000000..020f1cfd497e --- /dev/null +++ b/pkgs/by-name/dy/dynarmic/0001-xbyak-Fix-tests-when-using-newer-versions.patch @@ -0,0 +1,27 @@ +From 40e8205b3efd126b9676a783c8306793e61d3f00 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sun, 6 Jul 2025 10:08:26 +0200 +Subject: [PATCH] xbyak: Fix tests when using newer versions + +Signed-off-by: Marcin Serwin +--- + src/dynarmic/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt +index 6f0813ca..21a5576c 100644 +--- a/src/dynarmic/CMakeLists.txt ++++ b/src/dynarmic/CMakeLists.txt +@@ -267,6 +267,9 @@ if ("x86_64" IN_LIST ARCHITECTURE) + xbyak::xbyak + Zydis::Zydis + ) ++ # Newer versions of xbyak (>= 7.25.0) have stricter checks that currently ++ # fail in dynarmic ++ target_compile_definitions(dynarmic PRIVATE XBYAK_STRICT_CHECK_MEM_REG_SIZE=0) + + target_architecture_specific_sources(dynarmic "x86_64" + backend/x64/abi.cpp +-- +2.49.0 + diff --git a/pkgs/by-name/dy/dynarmic/package.nix b/pkgs/by-name/dy/dynarmic/package.nix new file mode 100644 index 000000000000..00988dadc887 --- /dev/null +++ b/pkgs/by-name/dy/dynarmic/package.nix @@ -0,0 +1,145 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + ninja, + boost, + robin-map, + catch2_3, + fmt, + xbyak, + zydis, + nix-update-script, + azahar, + darwin, +}: +let + oaknut = stdenv.mkDerivation { + pname = "oaknut"; + version = "1.2.2-unstable-2024-03-01"; + + src = fetchFromGitHub { + owner = "merryhime"; + repo = "oaknut"; + rev = "94c726ce0338b054eb8cb5ea91de8fe6c19f4392"; + hash = "sha256-IhP/110NGN42/FvpGIEm9MgsSiPYdtD8kNxL0cAWbqM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + }; + + mcl = stdenv.mkDerivation { + pname = "mcl"; + version = "0.1.13-unstable-2025-03-16"; + + src = fetchFromGitHub { + owner = "azahar-emu"; + repo = "mcl"; + rev = "7b08d83418f628b800dfac1c9a16c3f59036fbad"; + hash = "sha256-uTOiOlMzKbZSjKjtVSqFU+9m8v8horoCq3wL0O2E8sI="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + fmt + ]; + + checkInputs = [ + catch2_3 + ]; + + doCheck = true; + checkPhase = '' + tests/mcl-tests + ''; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "dynarmic"; + version = "6.7.0-unstable-2025-03-16"; + + src = fetchFromGitHub { + owner = "azahar-emu"; + repo = "dynarmic"; + rev = "278405bd71999ed3f3c77c5f78344a06fef798b9"; + hash = "sha256-D7nXn5y0h8FV0V8Tc8uBlRoeEU+gcpt44afujZvG+1A="; + }; + + patches = [ + # https://github.com/azahar-emu/dynarmic/pull/2 + ./0001-CMakeLists-update-mcl-version-to-0.1.13.patch + # https://github.com/azahar-emu/dynarmic/pull/3 + ./0001-xbyak-Fix-tests-when-using-newer-versions.patch + ]; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + ninja + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.DarwinTools # sw_ver + darwin.bootstrap_cmds # mig + ]; + + buildInputs = + [ + boost + robin-map + mcl + fmt + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + oaknut + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + xbyak + zydis + ]; + + checkInputs = [ + catch2_3 + oaknut + ]; + + # This changes `ir/opt` to `ir/var/empty` in `CMakeLists.txt` + # making the build fail, as that path does not exist + dontFixCmake = true; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "DYNARMIC_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + env = lib.optionalAttrs stdenv.cc.isGNU { + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117063 + NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overread"; + }; + + doCheck = true; + + passthru = { + inherit mcl oaknut; + + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + tests = { inherit azahar; }; + }; + + meta = { + description = "Dynamic recompiler for ARM"; + homepage = "https://github.com/azahar-emu/dynarmic"; + maintainers = with lib.maintainers; [ marcin-serwin ]; + license = lib.licenses.bsd0; + platforms = with lib.platforms; x86_64 ++ aarch64; + }; +}) From a35da5b1b8b4bb9a295d0e5ad752a0fb34eba949 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 6 Jul 2025 01:37:19 +0200 Subject: [PATCH 29/67] azahar: use system xbyak and dynarmic Signed-off-by: Marcin Serwin --- pkgs/by-name/az/azahar/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 91f5d5517cd8..200143df1ec8 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -6,6 +6,7 @@ cryptopp, cpp-jwt, doxygen, + dynarmic, enet, fetchpatch, fetchzip, @@ -27,12 +28,14 @@ pipewire, pkg-config, portaudio, + robin-map, SDL2, sndio, spirv-tools, soundtouch, stdenv, vulkan-headers, + xbyak, xorg, zstd, enableQtTranslations ? true, @@ -73,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { catch2_3 cryptopp cpp-jwt + dynarmic enet fmt ffmpeg_6-headless @@ -89,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { openssl pipewire portaudio + robin-map qt6.qtbase qt6.qtmultimedia qt6.qttools @@ -98,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: { sndio spirv-tools vulkan-headers + xbyak xorg.libX11 xorg.libXext zstd @@ -121,10 +127,6 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # Fix "file not found" bug when looking in var/empty instead of opt - mkdir externals/dynarmic/src/dynarmic/ir/var - ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty - # We already know the submodules are present substituteInPlace CMakeLists.txt \ --replace-fail "check_submodules_present()" "" @@ -136,10 +138,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (cmakeBool "USE_SYSTEM_LIBS" true) - (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) (cmakeBool "DISABLE_SYSTEM_VMA" true) - (cmakeBool "DISABLE_SYSTEM_XBYAK" true) (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) (cmakeBool "ENABLE_CUBEB" enableCubeb) (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) From 25ce4c87c90437b5023f757a384ca56bdb33b05c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 6 Jul 2025 21:42:16 +0200 Subject: [PATCH 30/67] azahar: add marcin-serwin to maintainers Signed-off-by: Marcin Serwin --- pkgs/by-name/az/azahar/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 200143df1ec8..9178267fc4f2 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -150,7 +150,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Open-source 3DS emulator project based on Citra"; homepage = "https://github.com/azahar-emu/azahar"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ arthsmn ]; + maintainers = with lib.maintainers; [ + arthsmn + marcin-serwin + ]; mainProgram = "azahar"; }; }) From dbb72a538422be85d0d6e4de571ec7730e183f7a Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 19 Jul 2025 15:21:29 +0200 Subject: [PATCH 31/67] azahar: fix build on darwin Signed-off-by: Marcin Serwin --- pkgs/by-name/az/azahar/package.nix | 50 +++++++++++-------- .../az/azahar/update-cmake-lists.patch | 43 ++++++++++++++++ 2 files changed, 71 insertions(+), 22 deletions(-) create mode 100644 pkgs/by-name/az/azahar/update-cmake-lists.patch diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 9178267fc4f2..b27eb7adbb65 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -1,5 +1,4 @@ { - alsa-lib, boost, catch2_3, cmake, @@ -12,16 +11,14 @@ fetchzip, fmt, ffmpeg_6-headless, - gamemode, glslang, httplib, inih, lib, libGL, - libjack2, - libpulseaudio, libunwind, libusb1, + moltenvk, nlohmann_json, openal, openssl, @@ -30,7 +27,6 @@ portaudio, robin-map, SDL2, - sndio, spirv-tools, soundtouch, stdenv, @@ -45,10 +41,13 @@ useDiscordRichPresence ? true, rapidjson, enableSSE42 ? true, # Disable if your hardware doesn't support SSE 4.2 (mainly CPUs before 2011) + gamemode, + enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode, }: let inherit (lib) optionals + optionalString cmakeBool getLib ; @@ -71,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - alsa-lib boost catch2_3 cryptopp @@ -84,33 +82,35 @@ stdenv.mkDerivation (finalAttrs: { httplib inih libGL - libjack2 - libpulseaudio libunwind libusb1 nlohmann_json openal openssl - pipewire portaudio robin-map qt6.qtbase qt6.qtmultimedia qt6.qttools - qt6.qtwayland soundtouch SDL2 - sndio spirv-tools vulkan-headers xbyak - xorg.libX11 - xorg.libXext zstd ] ++ optionals enableQtTranslations [ qt6.qttools ] ++ optionals enableCubeb [ cubeb ] - ++ optionals useDiscordRichPresence [ rapidjson ]; + ++ optionals useDiscordRichPresence [ rapidjson ] + ++ optionals stdenv.hostPlatform.isLinux [ + pipewire + qt6.qtwayland + xorg.libX11 + xorg.libXext + ] + ++ optionals stdenv.hostPlatform.isDarwin [ + moltenvk + ]; patches = [ # Fix boost errors @@ -124,17 +124,22 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/5c4497d9b67fa6f2fa327b2f2ce4cb5be8c9f2f7/games-emulation/lime3ds/files/lime3ds-0003-boost-1.87-fixes.patch"; hash = "sha256-mwfI7fTx9aWF/EjMW3bxoz++A+6ONbNA70tT5nkhDUU="; }) + + # https://github.com/azahar-emu/azahar/pull/1165 + ./update-cmake-lists.patch ]; - postPatch = '' - # We already know the submodules are present - substituteInPlace CMakeLists.txt \ - --replace-fail "check_submodules_present()" "" - + postPatch = + '' + # We already know the submodules are present + substituteInPlace CMakeLists.txt \ + --replace-fail "check_submodules_present()" "" + '' # Add gamemode - substituteInPlace externals/gamemode/include/gamemode_client.h \ - --replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0" - ''; + + optionalString enableGamemode '' + substituteInPlace externals/gamemode/include/gamemode_client.h \ + --replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0" + ''; cmakeFlags = [ (cmakeBool "USE_SYSTEM_LIBS" true) @@ -155,5 +160,6 @@ stdenv.mkDerivation (finalAttrs: { marcin-serwin ]; mainProgram = "azahar"; + platforms = with lib.platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/az/azahar/update-cmake-lists.patch b/pkgs/by-name/az/azahar/update-cmake-lists.patch new file mode 100644 index 000000000000..4759d4c26d02 --- /dev/null +++ b/pkgs/by-name/az/azahar/update-cmake-lists.patch @@ -0,0 +1,43 @@ +From d9e7361a174f0f491c49fe78cd96a823c65e97dd Mon Sep 17 00:00:00 2001 +From: qr243vbi +Date: Sat, 7 Jun 2025 01:18:03 +0300 +Subject: [PATCH 1/2] Update CMakeLists.txt + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 54051a4ef2..531c46abbe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,6 +16,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") + include(DownloadExternals) + include(CMakeDependentOption) ++include(FindPkgConfig) + + project(citra LANGUAGES C CXX ASM) + + +From 679a4036e2fbb96d1d6a803f3f59ae8f01f9e691 Mon Sep 17 00:00:00 2001 +From: qr243vbi +Date: Sat, 7 Jun 2025 12:49:07 +0300 +Subject: [PATCH 2/2] Add missing find_package directive + +--- + src/citra_qt/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt +index 1b78605a0a..de00dc4609 100644 +--- a/src/citra_qt/CMakeLists.txt ++++ b/src/citra_qt/CMakeLists.txt +@@ -273,6 +273,7 @@ if (ENABLE_VULKAN) + endif() + + if (NOT WIN32) ++ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) + target_include_directories(citra_qt PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) + endif() + From f0dc3caaa43a94ab1432f2a5c9b6e207ebf523a8 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Wed, 23 Jul 2025 14:34:26 +0200 Subject: [PATCH 32/67] roc: init at alpha3 --- pkgs/by-name/ro/roc/package.nix | 113 ++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100755 pkgs/by-name/ro/roc/package.nix diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix new file mode 100755 index 000000000000..f65a958d3032 --- /dev/null +++ b/pkgs/by-name/ro/roc/package.nix @@ -0,0 +1,113 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libffi, + libxml2, + makeBinaryWrapper, + cmake, + glibc, + rustPlatform, + zig_0_13, + llvmPackages_18, + writableTmpDirAsHomeHook, + valgrind, + autoPatchelfHook, +}: + +let + llvmPackages = llvmPackages_18; + rocVersion = "alpha3"; +in + +rustPlatform.buildRustPackage rec { + pname = "roc"; + version = "0-${rocVersion}"; + + src = fetchFromGitHub { + owner = "roc-lang"; + repo = "roc"; + rev = "9a0238e0f34c09e27e3ca89e8fc5a684a21bf456"; + hash = "sha256-iM16DlTf+1yXBZVH7QqzhKuSkn1n/ZDosnZj3t+io0E="; + }; + + nativeBuildInputs = + [ + cmake + zig_0_13 + ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = + [ + libffi + libxml2 + llvmPackages.clang + llvmPackages.llvm.dev + makeBinaryWrapper + ] + ++ lib.optionals stdenv.isLinux [ + glibc + stdenv.cc.cc.lib + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-9cOJ79GrnrMEIhFikvCfXa2SI4O0fy50cr4Fb6p4Vho="; + + # prevents zig AccessDenied error github.com/ziglang/zig/issues/6810 + XDG_CACHE_HOME = "xdg_cache"; + + preBuild = + let + llvmVersion = builtins.splitVersion llvmPackages.release_version; + llvmMajorMinorStr = builtins.elemAt llvmVersion 0 + "0"; + in + '' + export LLVM_SYS_${llvmMajorMinorStr}_PREFIX=${llvmPackages.llvm.dev} + ''; + + postInstall = + lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/roc \ + --set NIX_GLIBC_PATH ${glibc.out}/lib \ + --set NIX_LIBGCC_S_PATH ${stdenv.cc.cc.lib}/lib \ + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} + '' + + lib.optionalString (!stdenv.isLinux) '' + wrapProgram $out/bin/roc --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} + ''; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + llvmPackages.clang + valgrind + ]; + + checkPhase = + lib.optionalString stdenv.isLinux '' + runHook preCheck + NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests + runHook postCheck + '' + + lib.optionalString (!stdenv.isLinux) '' + runHook preCheck + cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests + runHook postCheck + ''; + + meta = { + description = "Fast, friendly, functional programming language"; + mainProgram = "roc"; + homepage = "https://www.roc-lang.org/"; + changelog = "https://github.com/roc-lang/roc/releases/tag/${rocVersion}"; + license = lib.licenses.upl; + maintainers = [ + lib.maintainers.anton-4 + lib.maintainers.bhansconnect + lib.maintainers.rtfeldman + ]; + platforms = [ "x86_64-linux" ]; + }; +} From b0c26cff683bfc6775c20ab6f60286d2b2b27bf4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 23 Jul 2025 15:49:50 +0200 Subject: [PATCH 33/67] wannier90: unbreak build. Add patch to fix test code --- pkgs/by-name/wa/wannier90/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/wa/wannier90/package.nix b/pkgs/by-name/wa/wannier90/package.nix index 631fcd276de4..d21ff8146a3e 100644 --- a/pkgs/by-name/wa/wannier90/package.nix +++ b/pkgs/by-name/wa/wannier90/package.nix @@ -6,6 +6,7 @@ lapack, python3, fetchFromGitHub, + fetchpatch, }: assert (!blas.isILP64); assert blas.isILP64 == lapack.isILP64; @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { hash = "sha256-+Mq7lM6WuwAnK/2FlDz9gNRIg2sRazQRezb3BfD0veY="; }; + patches = [ + # upstream patch, fixes test runner. + (fetchpatch { + name = "replace-obsolete-pipes-module"; + url = "https://github.com/wannier-developers/wannier90/commit/8aef6edaa4f169d45b479dc5d5c5efb8b9385a49.patch"; + hash = "sha256-6ZfHd8CVTzfaj99AA3dsJJ/EOeCZmzACAM5pe2wBo8g="; + }) + ]; + # test cases are removed as error bounds of wannier90 are obviously to tight postPatch = '' rm -r test-suite/tests/testpostw90_{fe_kpathcurv,fe_kslicecurv,si_geninterp,si_geninterp_wsdistance} From 21bdd3714f639b91b4e26d01875201005459c98e Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 19 Jul 2025 11:38:01 -0700 Subject: [PATCH 34/67] python3Packages.gstools-cython: init at 1.1.0 --- .../python-modules/gstools-cython/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/gstools-cython/default.nix diff --git a/pkgs/development/python-modules/gstools-cython/default.nix b/pkgs/development/python-modules/gstools-cython/default.nix new file mode 100644 index 000000000000..b26692f51392 --- /dev/null +++ b/pkgs/development/python-modules/gstools-cython/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + extension-helpers, + numpy, + setuptools, + setuptools-scm, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "gstools-cython"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "GeoStat-Framework"; + repo = "GSTools-Cython"; + tag = "v${version}"; + hash = "sha256-Kzn/ThLjTGy3ZYIkTwCV1wi22c7rWo4u/L3llppC6wQ="; + }; + + build-system = [ + cython + extension-helpers + numpy + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + pythonImportsCheck = [ + "gstools_cython" + ]; + + meta = { + description = "Cython backend for GSTools"; + homepage = "https://github.com/GeoStat-Framework/GSTools-Cython"; + changelog = "https://github.com/GeoStat-Framework/GSTools-Cython/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9c97b2259a0..28aa7a7dddb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6294,6 +6294,8 @@ self: super: with self; { gstools = callPackage ../development/python-modules/gstools { }; + gstools-cython = callPackage ../development/python-modules/gstools-cython { }; + gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { }; gto = callPackage ../development/python-modules/gto { }; From aa565ae949b87b7babe0006152ab00f10576f234 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 9 Jul 2025 17:29:15 -0700 Subject: [PATCH 35/67] python3Packlages.gstools: 1.6.1 -> 1.7.0 --- .../python-modules/gstools/default.nix | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix index 73e748056632..d1084e8425e8 100644 --- a/pkgs/development/python-modules/gstools/default.nix +++ b/pkgs/development/python-modules/gstools/default.nix @@ -5,44 +5,47 @@ # build-system cython, - extension-helpers, - numpy, - setuptools, - setuptools-scm, + hatch-vcs, + hatchling, # dependencies - hankel, emcee, + gstools-cython, + hankel, meshio, + numpy, pyevtk, scipy, + # optional dependencies + matplotlib, + pyvista, + # tests pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "gstools"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "GeoStat-Framework"; repo = "GSTools"; tag = "v${version}"; - hash = "sha256-Aieuk0Xjlut8rTZoFHcBpPtyIj/fstMrHiiKyDOpQlg="; + hash = "sha256-rQ7mSa1BWAaRiiE6aQD6jl8BktihY9bjFJV+5eT9n/M="; }; build-system = [ - cython - extension-helpers - numpy - setuptools - setuptools-scm + hatch-vcs + hatchling ]; dependencies = [ emcee + gstools-cython hankel meshio numpy @@ -50,13 +53,23 @@ buildPythonPackage rec { scipy ]; + optional-dependencies = { + plotting = [ + matplotlib + pyvista + ]; + }; + pythonImportsCheck = [ "gstools" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = { description = "Geostatistical toolbox"; homepage = "https://github.com/GeoStat-Framework/GSTools"; - changelog = "https://github.com/GeoStat-Framework/GSTools/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ sigmanificient ]; }; From d6a9bae2976c121de9987a2014773e2b564d9520 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 20 Jul 2025 11:41:04 -0700 Subject: [PATCH 36/67] python3Packages.pykrige: relax numpy upper bound --- pkgs/development/python-modules/pykrige/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pykrige/default.nix b/pkgs/development/python-modules/pykrige/default.nix index 41e928f5587d..984847a47c0c 100644 --- a/pkgs/development/python-modules/pykrige/default.nix +++ b/pkgs/development/python-modules/pykrige/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { hash = "sha256-9f8SNlt4qiTlXgx2ica9Y8rmnYzQ5VarvFRfoZ9bSsY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0rc1,<2.3; python_version >= '3.9'" "numpy>=2.0.0"; + ''; + build-system = [ cython numpy From f01cd23d26d9638534c382f4672813caeda666c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 20:18:04 +0000 Subject: [PATCH 37/67] openasar: 0-unstable-2025-07-14 -> 0-unstable-2025-07-15 --- pkgs/by-name/op/openasar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index d17c378fabb2..fb9a69acdb16 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2025-07-14"; + version = "0-unstable-2025-07-15"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "e6991e30910b4019bff1ad6e1934534ad546831e"; - hash = "sha256-COz3X2sYSYnd436pOjiHgpYxQbn6hRCo8AefPzv5hTs="; + rev = "92abbb0e3efc39e553fd24e9125c42cdba1318ec"; + hash = "sha256-9PTseQdQ6YbeuBbcBnPr+OXP5wNYDJgv8s9sn8hGSgk="; }; postPatch = '' From 6405e6cdfd17f93ac62aaea09216a26f2ad6ff24 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 23 Jul 2025 21:34:17 +0100 Subject: [PATCH 38/67] fheroes2: 1.1.9 -> 1.1.10 Changes: https://github.com/ihhub/fheroes2/releases/tag/1.1.10 --- pkgs/by-name/fh/fheroes2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index b3065322c699..0ed17fff0a24 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-REZBez5R10kifIAnuoTxoyFlcfv5JufjX3mkItD6US4="; + hash = "sha256-dtc+/FvYJPgdtrDRq+fofrlXW3NjgtFMDd6rCmweiMw="; }; nativeBuildInputs = [ imagemagick ]; From 944bca59c62c36602384ca70d018087d5d3511a7 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 24 Jul 2025 05:05:12 +0800 Subject: [PATCH 39/67] mihomo: backport security patches --- pkgs/by-name/mi/mihomo/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index e891ba450bfe..7ac8cdbdb218 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, buildGoModule, nixosTests, + fetchpatch, }: buildGoModule rec { @@ -16,6 +17,19 @@ buildGoModule rec { hash = "sha256-nt2bnfKzGU+6gUaSqHfnbCnWLMDoAcISmlNYFeM4Xu8="; }; + patches = [ + # https://github.com/MetaCubeX/mihomo/pull/2178 + (fetchpatch { + url = "https://github.com/MetaCubeX/mihomo/commit/63ad95e10f40ffc90ec93497aac562765af7a471.patch"; + hash = "sha256-ZE2dlr0t//Q1CVy2ql/TWuLEALdF1ZCYTOVK87bKWQg="; + }) + # https://github.com/MetaCubeX/mihomo/pull/2177 + (fetchpatch { + url = "https://github.com/MetaCubeX/mihomo/commit/b06ec5bef810ec8d009f52428188440df0484ce4.patch"; + hash = "sha256-XQhlST4pa//+Bg5hWc2zADulz8FeEiHwB99Rw9o24b0="; + }) + ]; + vendorHash = "sha256-k/Zjnq07+Sg+dwwcAf+ziInaDvlXn3bEG+QuxZ5lcM8="; excludedPackages = [ "./test" ]; From 99290008d18e4af77911867429af056a57c02880 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 23 Jul 2025 11:23:08 -0700 Subject: [PATCH 40/67] python3Packages.gradio-client: 0.10.1 -> 0.11.0 https://github.com/gradio-app/gradio/releases/tag/gradio_client%401.11.0 --- pkgs/development/python-modules/gradio/client.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 222dd15797af..226084ae04a7 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "1.10.1"; + version = "1.11.0"; pyproject = true; # no tests on pypi @@ -41,7 +41,7 @@ buildPythonPackage rec { # not to be confused with @gradio/client@${version} tag = "gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-jIJkJvXy4mKQN0gVb4nm3hCzgk9qofBrXc3Tws2n2qw="; + hash = "sha256-dj8hJPXUBbFG9awP3o0vgyPt+gcCgzKKEQTEHkrEimA="; }; sourceRoot = "${src.name}/client/python"; From 72bd17311dc9fd0cac8c164f18d5504def5ec325 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 22:27:00 +0000 Subject: [PATCH 41/67] libretro.nestopia: 0-unstable-2025-04-24 -> 0-unstable-2025-07-20 --- pkgs/applications/emulators/libretro/cores/nestopia.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix index 7ae7303c7cad..5f919e60de4d 100644 --- a/pkgs/applications/emulators/libretro/cores/nestopia.nix +++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "nestopia"; - version = "0-unstable-2025-04-24"; + version = "0-unstable-2025-07-20"; src = fetchFromGitHub { owner = "libretro"; repo = "nestopia"; - rev = "d2eefab298b0b9152d2934d6f0227b6803c877b3"; - hash = "sha256-lmfyNi+E2SoCOAtXuJ3F5S3mm1OCta9FHtoqPpLgYk8="; + rev = "0e82a1642d4acafab4da9ce937954b85d846952b"; + hash = "sha256-/r1EUb3Z6RaEycGnkU4RtYr0JjohgQmru99DG45OWKo="; }; makefile = "Makefile"; From c77b9300dfed6e90d73f49ed3fc322438037f7d8 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 23 Jul 2025 10:57:18 -0700 Subject: [PATCH 42/67] python3Packages.gradio: 5.29.1 -> 5.38.0 --- .../development/python-modules/gradio/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 354bb0cd06c1..216992bd94af 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -20,6 +20,7 @@ setuptools, aiofiles, anyio, + brotli, diffusers, fastapi, ffmpy, @@ -36,6 +37,7 @@ packaging, pandas, pillow, + polars, pydantic, python-multipart, pydub, @@ -73,20 +75,20 @@ buildPythonPackage rec { pname = "gradio"; - version = "5.29.1"; + version = "5.38.0"; pyproject = true; src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; tag = "gradio@${version}"; - hash = "sha256-nL+m64JTLRS5UOB9WSl7lpsw8v0Vzkt7XWGl9a08Xko="; + hash = "sha256-NbVRbwqHUSwyG+v+cDKCrVtzjj6ThxGRfO+xjqXOy5I="; }; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; fetcherVersion = 1; - hash = "sha256-h3ulPik0Uf8X687Se3J7h3+8jYzwXtbO6obsO27zyfA="; + hash = "sha256-E6dBajJoKzaJF67KRrSB/LNAyLDmT78mCmTar5G6P6g="; }; pythonRelaxDeps = [ @@ -115,6 +117,7 @@ buildPythonPackage rec { setuptools # needed for 'pkg_resources' aiofiles anyio + brotli diffusers fastapi ffmpy @@ -131,6 +134,7 @@ buildPythonPackage rec { packaging pandas pillow + polars pydantic python-multipart pydub @@ -152,6 +156,7 @@ buildPythonPackage rec { [ altair boto3 + brotli docker ffmpeg gradio-pdf @@ -245,6 +250,10 @@ buildPythonPackage rec { # tests if pip and other tools are installed "test_get_executable_path" + + # Flaky test (AssertionError when comparing to a fixed array) + # https://github.com/gradio-app/gradio/issues/11620 + "test_auto_datatype" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # TypeError: argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'NoneType' From 54d0b1dd1b8a049c47ba7f225f8a6d1267cdcef2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 24 Jul 2025 01:09:58 +0200 Subject: [PATCH 43/67] python3Packages.timm: 1.0.17 -> 1.0.18 Diff: https://github.com/huggingface/pytorch-image-models/compare/refs/tags/v1.0.17...refs/tags/v1.0.18 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.18/README.md#whats-new --- pkgs/development/python-modules/timm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index eca27fbca2d1..11e38f6a74d0 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.17"; + version = "1.0.18"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; tag = "v${version}"; - hash = "sha256-NWWKDWcwRrQ2lrNSbkA2xepAoPP7+0G7g7eIjGLZSCw="; + hash = "sha256-/48gbsIS0bKbm98vzFKJQ8YD8H9z+iamN5keOYL5Lfk="; }; build-system = [ pdm-backend ]; From fc9f3a7fd9a9597db54b63bbc0cb33c28a8bd32e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 24 Jul 2025 01:10:32 +0200 Subject: [PATCH 44/67] python3Packages.chex: 0.1.89 -> 0.1.90 Diff: https://github.com/deepmind/chex/compare/refs/tags/v0.1.89...refs/tags/v0.1.90 Changelog: https://github.com/google-deepmind/chex/releases/tag/v0.1.90 --- pkgs/development/python-modules/chex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 8031710aad91..2318bc14e71e 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "chex"; - version = "0.1.89"; + version = "0.1.90"; pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "chex"; tag = "v${version}"; - hash = "sha256-eTEfmbpmwtCuphtOq0iHUT8zGfyQ4/aUorL4FQwcKBw="; + hash = "sha256-nZYfkK73p3HpUOMPyqkV4YR3BDGrpdZrl36dmfZt7Bk="; }; build-system = [ setuptools ]; From 041a2dddbc839d931fc6c6e1f28eb0448376f245 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 24 Jul 2025 01:14:03 +0200 Subject: [PATCH 45/67] python3Packages.pylance: 0.31.1 -> 0.32.0 Diff: https://github.com/lancedb/lance/compare/refs/tags/v0.31.1...refs/tags/v0.32.0 Changelog: https://github.com/lancedb/lance/releases/tag/v0.32.0 --- pkgs/development/python-modules/pylance/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index ec569b51efc7..98843676082a 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.31.1"; + version = "0.32.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${version}"; - hash = "sha256-EYohbu+zhR3cLXkhM4izP/pIaFyefxc64eF8UAQojRU="; + hash = "sha256-hVWyZv978hDjAOdk4S9S9RJOkxqhOL0ZBpi4wGk0h1c="; }; sourceRoot = "${src.name}/python"; @@ -51,7 +51,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-seYL4U/8Ac+V5NYJ3e2ji9BMkEnB+JxYX9coWFf7hGA="; + hash = "sha256-ZUNAZsOpLdpdsKhIp/6QD3Ys7MOeO6H3ve8au7g+riU="; }; nativeBuildInputs = [ From 5f3f1a21d29fdbdbd0b05075e3af39cd01cac56b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 24 Jul 2025 01:33:16 +0200 Subject: [PATCH 46/67] makemkv: use stdenv mkDerivation --- pkgs/by-name/ma/makemkv/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix index 776d387ac61c..83bfb1c94de4 100644 --- a/pkgs/by-name/ma/makemkv/package.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -5,7 +5,8 @@ fetchurl, ffmpeg, lib, - libsForQt5, + stdenv, + qt5, openssl, pkg-config, rubyPackages, @@ -34,7 +35,7 @@ let hash = "sha256-3Efu+x5o99U55LB5u5POZBRBBK0jPeVoGJOYEOzQO3s="; }; in -libsForQt5.mkDerivation { +stdenv.mkDerivation { pname = "makemkv"; inherit version; @@ -52,12 +53,13 @@ libsForQt5.mkDerivation { nativeBuildInputs = [ autoPatchelfHook pkg-config + qt5.wrapQtAppsHook ]; buildInputs = [ ffmpeg openssl - libsForQt5.qtbase + qt5.qtbase zlib ]; From 0b0fd79f9b1df551fb655ff7889e93ddb8ec2461 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 23:51:05 +0000 Subject: [PATCH 47/67] postgresqlPackages.pg_net: 0.19.1 -> 0.19.3 --- pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index d0c55edced2e..9186a6b4efa5 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_net"; - version = "0.19.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "supabase"; repo = "pg_net"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sy2PG1zCB6tNbcMNMWvl/Fe2Zu1stvEIqGrLsRF09GY="; + hash = "sha256-PZYIwkXp1rOzRCDZivJFMuEQBYJaaibUN/WkL+6crSg="; }; buildInputs = [ curl ]; From e9c64da6c2a7f497cfbb4e1be7256f8e73402b6c Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Wed, 23 Jul 2025 20:05:36 -0400 Subject: [PATCH 48/67] vscode-extensions.jasew.anki: init at 1.3.5 Signed-off-by: Ethan Carter Edwards --- .../editors/vscode/extensions/default.nix | 2 ++ .../vscode/extensions/jasew.anki/default.nix | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/jasew.anki/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index eaf0cc7f1b59..d9dd455ca14a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2515,6 +2515,8 @@ let }; }; + jasew.anki = callPackage ./jasew.anki { }; + jbockle.jbockle-format-files = buildVscodeMarketplaceExtension { mktplcRef = { name = "jbockle-format-files"; diff --git a/pkgs/applications/editors/vscode/extensions/jasew.anki/default.nix b/pkgs/applications/editors/vscode/extensions/jasew.anki/default.nix new file mode 100644 index 000000000000..ed1ed11256fd --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/jasew.anki/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jasew"; + name = "anki"; + version = "1.3.5"; + hash = "sha256-QPuafIelmhdno/E2zr6NQChv0qjfjMFwx7v0Xat/gDc="; + }; + + meta = { + description = "Extension for interacting and sending cards to Anki"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jasew.anki"; + homepage = "https://github.com/jasonwilliams/anki"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ethancedwards8 ]; + }; +} From 99f6d318cba368e6729a5792fb73e403df845436 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 29 Mar 2025 15:40:13 +0100 Subject: [PATCH 49/67] restique: unstable-2022-11-29 -> 0-unstable-2024-10-20 --- pkgs/applications/backup/restique/default.nix | 52 ------------------- pkgs/by-name/re/restique/package.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 52 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/backup/restique/default.nix create mode 100644 pkgs/by-name/re/restique/package.nix diff --git a/pkgs/applications/backup/restique/default.nix b/pkgs/applications/backup/restique/default.nix deleted file mode 100644 index 64625463c83e..000000000000 --- a/pkgs/applications/backup/restique/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitea, - cmake, - libsecret, - qtkeychain, - qttools, - restic, -}: - -mkDerivation { - pname = "restique"; - version = "unstable-2022-11-29"; - - src = fetchFromGitea { - domain = "git.srcbox.net"; - owner = "stefan"; - repo = "restique"; - rev = "906b0b1726c26988c910baea9665f540c37c99c4"; - hash = "sha256-EYoADtYX+gm8T3/3gxTtdFOFGJf2rXryiTu8NIO0Ez4="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - libsecret - qtkeychain - qttools - ]; - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ restic ]) - ]; - - meta = with lib; { - description = "Restic GUI for Desktop/Laptop Backups"; - homepage = "https://git.srcbox.net/stefan/restique"; - license = with licenses; [ - gpl3Plus - cc-by-sa-40 - cc0 - ]; - maintainers = with maintainers; [ dotlambda ]; - mainProgram = "restique"; - }; -} diff --git a/pkgs/by-name/re/restique/package.nix b/pkgs/by-name/re/restique/package.nix new file mode 100644 index 000000000000..1018f2d01156 --- /dev/null +++ b/pkgs/by-name/re/restique/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + qt5, + libsForQt5, + fetchgit, + cmake, + libsecret, + restic, +}: + +stdenv.mkDerivation { + pname = "restique"; + version = "0-unstable-2024-10-20"; + + # using fetchFromGitea returns 404 + src = fetchgit { + url = "https://git.srcbox.net/stefan/restique"; + rev = "340d8326c2a2221ec155512cc6ffb2c8a866c525"; + hash = "sha256-IBg8hRJ7nugHP+JLg0fTONgZ+oRdkJpeZzflrwSG20w="; + }; + + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsecret + libsForQt5.qtkeychain + qt5.qttools + ]; + + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ restic ]) + ]; + + meta = { + description = "Restic GUI for Desktop/Laptop Backups"; + homepage = "https://git.srcbox.net/stefan/restique"; + license = with lib.licenses; [ + gpl3Plus + cc-by-sa-40 + cc0 + ]; + maintainers = with lib.maintainers; [ dotlambda ]; + mainProgram = "restique"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 732cdf69d832..c75417234128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13643,8 +13643,6 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; - restique = libsForQt5.callPackage ../applications/backup/restique { }; - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; rgp = libsForQt5.callPackage ../development/tools/rgp { }; From 03eb460d0356ea92b1f78f471dba41ae1e660213 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 24 Jul 2025 02:54:04 +0200 Subject: [PATCH 50/67] ungoogled-chromium: 138.0.7204.157-1 -> 138.0.7204.168-1 https://chromereleases.googleblog.com/2025/07/stable-channel-update-for-desktop_22.html This update includes 3 security fixes. CVEs: CVE-2025-8010 CVE-2025-8011 --- .../networking/browsers/chromium/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index a41fc3d01dd6..7b7ff021579f 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -802,7 +802,7 @@ } }, "ungoogled-chromium": { - "version": "138.0.7204.157", + "version": "138.0.7204.168", "deps": { "depot_tools": { "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490", @@ -813,16 +813,16 @@ "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM=" }, "ungoogled-patches": { - "rev": "138.0.7204.157-1", - "hash": "sha256-KzxbyIdESyom6biHUYRJfQJuhA84YQ1KpUHEYncb8IU=" + "rev": "138.0.7204.168-1", + "hash": "sha256-QmHw0sLnVvMwVu/r4L2XS0S31vl+6NJb0zV63iihhkk=" }, "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "e533e98b1267baa1f1c46d666b120e64e5146aa9", - "hash": "sha256-LbZ8/6Lvz1p3ydRL4fXtd7RL426PU3jU01Hx+DP5QYQ=", + "rev": "3e8d82e86e9f508e88ed406c2a24657a6c691d30", + "hash": "sha256-6s9mkfckhibpb+L74oPZsgvOZZT58BeSo362t/s92UI=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1047,8 +1047,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "4cca0aa00c4915947f1081014d5cfa2e83d357fa", - "hash": "sha256-pVNr8NB5U/Uf688oOvPLpu81isCn/WmjJky01A000a4=" + "rev": "a718e86b3dc6f1ba3c8cc8092cd79b401d428cfc", + "hash": "sha256-50KQk54JwwRS3ENUjB0QedQYFuwmkv9oxytfuNDTVPo=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1597,8 +1597,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "de9d0f8b56ae61896e4d2ac577fc589efb14f87d", - "hash": "sha256-/T5fisjmN80bs3PtQrCRfH3Bo9dRSd3f+xpPLDh1RTY=" + "rev": "f5036f509b5e147cccb298a069c40827f3d5edd6", + "hash": "sha256-n4/Lf5ZawqUY0QHF2jYl3JPPx9Br/wzVmtqnMvq3Vzk=" } } } From d8cd941896247424c1b5b9001f9bb80a7c0d50e6 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sun, 20 Jul 2025 12:18:39 -0400 Subject: [PATCH 51/67] mongodb-7_0: 7.0.21 -> 7.0.22 --- pkgs/servers/nosql/mongodb/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index c91f99f7d65e..a08835c5b994 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.21"; - sha256 = "sha256-l/xXLauloxf4WwwdW+WGBAUArp2jdHHSFgEnzcCJYrc="; + version = "7.0.22"; + sha256 = "sha256-Je4vPG8tz1vqCEXzWyYi5KWQaxzlH0hOKSpWBgPs0Hs="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: From 41e9b384e12b6b0613a0e621a0ff817bb7cc1ec2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 01:31:41 +0000 Subject: [PATCH 52/67] fleet: 4.70.1 -> 4.71.0 --- pkgs/by-name/fl/fleet/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index 4a366fe43b3d..1424d5860612 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "fleet"; - version = "4.70.1"; + version = "4.71.0"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${finalAttrs.version}"; - hash = "sha256-YNb4gjHgIyCrKD/1kiJb6J+JHn/uyFb2PyoRtOGbohY="; + hash = "sha256-nkSW3209rI3pNK6WTB0HSg5XVs6ZtKfEf8hP5OKMN/4="; }; - vendorHash = "sha256-mlZO7wxZamI7xjvZ+ncTkiqTsXhNhjjE0JI5+8bPbv0="; + vendorHash = "sha256-UOY9W2ULh2eNIfUmyU38nZCVWNTWIDTf7GBBkptrlTQ="; subPackages = [ "cmd/fleet" From 1692738f8054b2605283ad658ce89eebf217f441 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 01:44:11 +0000 Subject: [PATCH 53/67] cargo-dist: 0.28.1-prerelease.2 -> 0.28.2 --- pkgs/by-name/ca/cargo-dist/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index a01fd252b716..43feb13321bd 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.28.1-prerelease.2"; + version = "0.28.2"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-aO8pQ1JTazHPVUOP7qNm2qZbXlL0n1MBsdD18UePTOs="; + hash = "sha256-Nlix74IvhUuWKJTslPajGHkGKxGPo1ucTEkuuA//zn0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7rt/E51D+ciIyVaX56tK82bbps9TKlesU0PP+aFS9iM="; + cargoHash = "sha256-GmzMmErEshYECMr7APhJ6uWqflHbG73bw/utMgq3dk0="; nativeBuildInputs = [ pkg-config From c4b491947388e94d5460c75101f30e29a37bfbe8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 01:44:11 +0000 Subject: [PATCH 54/67] obs-studio-plugins.obs-composite-blur: 1.5.1 -> 1.5.2 --- .../video/obs-studio/plugins/obs-composite-blur.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix b/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix index abb88ecb524b..12c477362b67 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-composite-blur"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "FiniteSingularity"; repo = "obs-composite-blur"; tag = "v${finalAttrs.version}"; - hash = "sha256-12wgzZxEoEUKqGGmccZKfcdE0libBJDZ1EzwxRPLURc="; + hash = "sha256-wT49bCxik8mrg+YleNelOPQQzqcYQR7ZSnzvPXA5D3g="; }; buildInputs = [ From a723f6f76d8bfec0ac4b5d14dbbcd3b66cb532f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 01:49:34 +0000 Subject: [PATCH 55/67] inkscape-extensions.textext: 1.11.1 -> 1.12.0 --- .../graphics/inkscape/extensions/textext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index 2d17a745202b..25d9fd64f23a 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -21,14 +21,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "textext"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "textext"; repo = "textext"; tag = version; - sha256 = "sha256-eqyS3P+FrwwO567GBBOLk53fC6ROG6mZKHL1RGDPLpM="; + sha256 = "sha256-Ka8NIvzhMZYPlc3q0U5Je7eXyBT61dJ3O++ETl+D7w0="; }; patches = [ From e623f4e6c50f294fb3850a0c18e17e7c385dcd85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 02:13:17 +0000 Subject: [PATCH 56/67] python3Packages.oelint-data: 1.0.20 -> 1.0.23 --- pkgs/development/python-modules/oelint-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index cf0bb7357f74..7564a2a0f8e5 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oelint-data"; - version = "1.0.20"; + version = "1.0.23"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = version; - hash = "sha256-Kfl/zYZ6PvYRn1E0MKzCZLvtqS6WV5U9hvOufFNKmPY="; + hash = "sha256-JN563FGxM9Z+2dKzLBlepN1x2oKlUq0nIBwB0Obe8yY="; }; build-system = [ From dc986051c9f6eeaceaf9a5e2838fbc56cf058db0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 04:23:36 +0000 Subject: [PATCH 57/67] src-cli: 6.5.0 -> 6.6.0 --- pkgs/by-name/sr/src-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index aca1fec9a9f5..6dbf68b07e89 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "src-cli"; - version = "6.5.0"; + version = "6.6.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-ysSFmOIraDqVVHiBcVI98qjFh+8W76sVs60vvwMyh6M="; + hash = "sha256-9jqlbqZ62wds+VOt5OT9XYu/v6ETaYGCqY7qJu3UsWg="; }; vendorHash = "sha256-bpfDnVqJoJi9WhlA6TDWAhBRkbbQn1BHfnLJ8BTmhGM="; From 9b7213a7887e5bddc29e1064c8da61bc684caf6e Mon Sep 17 00:00:00 2001 From: ilsubyeega Date: Thu, 24 Jul 2025 13:52:47 +0900 Subject: [PATCH 58/67] treewide: remove `ercao` from maintainer list As per https://github.com/NixOS/nixpkgs/pull/423149#issuecomment-3075285143 --- maintainers/maintainer-list.nix | 7 ------- pkgs/by-name/fi/figma-agent/package.nix | 2 +- pkgs/by-name/fi/figma-linux/package.nix | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 585dc6fbb230..25581a3c077a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7609,13 +7609,6 @@ githubId = 147284; name = "Jason Felice"; }; - ercao = { - email = "vip@ercao.cn"; - github = "O8888"; - githubId = 51725284; - name = "ercao"; - keys = [ { fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; } ]; - }; erdnaxe = { email = "erdnaxe@crans.org"; github = "erdnaxe"; diff --git a/pkgs/by-name/fi/figma-agent/package.nix b/pkgs/by-name/fi/figma-agent/package.nix index a342a7e56348..bd92b4474b9f 100644 --- a/pkgs/by-name/fi/figma-agent/package.nix +++ b/pkgs/by-name/fi/figma-agent/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neetly/figma-agent-linux"; description = "Figma Agent for Linux (a.k.a. Font Helper)"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ercao ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "figma-agent"; }; } diff --git a/pkgs/by-name/fi/figma-linux/package.nix b/pkgs/by-name/fi/figma-linux/package.nix index 8696d43cf162..7a8604b45c81 100644 --- a/pkgs/by-name/fi/figma-linux/package.nix +++ b/pkgs/by-name/fi/figma-linux/package.nix @@ -84,7 +84,6 @@ buildNpmPackage (finalAttrs: { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - ercao kashw2 ]; mainProgram = "figma-linux"; From b128b5b3da275f05d6195f84e4195fd365e53198 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 05:51:38 +0000 Subject: [PATCH 59/67] fabric-ai: 1.4.247 -> 1.4.264 --- pkgs/by-name/fa/fabric-ai/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 764d08a7433d..c792d59da678 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.247"; + version = "1.4.264"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-s1FlQIbHSCWUR9f3qWfYHOLYmG8GwJb3SAu6d9DAH1Q="; + hash = "sha256-x9dMO/6ZewMSobi4KcEW1CQ+r1Ngll+Bqlv+GRV7eYQ="; }; vendorHash = "sha256-/3+4oeKl+GQPmYt3yBt77ATm55pALa+62mC6lktSTiw="; From 27d2e5e3713f125fdd03bb34d491e9cd37d2f975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 07:03:20 +0000 Subject: [PATCH 60/67] azure-cli-extensions.storage-preview: 1.0.0b6 -> 1.0.0b7 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 56f3ff246ac7..da2ba038f1ec 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -130,9 +130,9 @@ storage-preview = mkAzExtension rec { pname = "storage-preview"; - version = "1.0.0b6"; + version = "1.0.0b7"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_preview-${version}-py2.py3-none-any.whl"; - hash = "sha256-467PbUh6rCPndvAXeZ5tMgCH34HL36Kzd9DzYlM63EA="; + hash = "sha256-wtf+4TBDzpWO55w5VXnoERAbksP2QaSc29FHL3MNOBo="; description = "Provides a preview for upcoming storage features"; propagatedBuildInputs = with python3Packages; [ azure-core ]; meta.maintainers = with lib.maintainers; [ katexochen ]; From ef8e51ef7a9bcbebed336f839105fd344e6004ad Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 24 Jul 2025 09:02:26 +0200 Subject: [PATCH 61/67] timoni: move to by-name --- .../networking/cluster/timoni/update.sh | 45 ------------------- .../ti/timoni/package.nix} | 31 ++++++++----- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 20 insertions(+), 58 deletions(-) delete mode 100755 pkgs/applications/networking/cluster/timoni/update.sh rename pkgs/{applications/networking/cluster/timoni/default.nix => by-name/ti/timoni/package.nix} (66%) diff --git a/pkgs/applications/networking/cluster/timoni/update.sh b/pkgs/applications/networking/cluster/timoni/update.sh deleted file mode 100755 index 10e4814f46ae..000000000000 --- a/pkgs/applications/networking/cluster/timoni/update.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix jq -set -euo pipefail - -PKG_DIR=$(dirname "${BASH_SOURCE[@]}") -FILE="$PKG_DIR/default.nix" -NIXPKGS_ROOT=$(cd $PKG_DIR && git rev-parse --show-toplevel) -ATTR="timoni" - -PREV_VERSION=$(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.version) -LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/stefanprodan/timoni/releases/latest | jq -r '.tag_name') -NEXT_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//') - -# update version -sed -i "s|$PREV_VERSION|$NEXT_VERSION|" "$FILE" - -# update hash -PREV_HASH=$(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.src.outputHash) -NEXT_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --unpack --type sha256 $(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.src.url))) -sed -i "s|$PREV_HASH|$NEXT_HASH|" "$FILE" - -# update vendor hash -PREV_VENDOR_HASH=$(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.vendorHash) -EMPTY_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" -sed -i "s|$PREV_VENDOR_HASH|$EMPTY_HASH|" "$FILE" - -set +e -NEXT_VENDOR_HASH=$(nix-build $NIXPKGS_ROOT --no-out-link -A $ATTR 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') -set -e - -if [ -z "${NEXT_VENDOR_HASH:-}" ]; then - echo "Update failed. NEXT_VENDOR_HASH is empty." >&2 - exit 1 -fi - -sed -i "s|$EMPTY_HASH|$NEXT_VENDOR_HASH|" "$FILE" - -cat < Date: Thu, 24 Jul 2025 09:30:42 +0200 Subject: [PATCH 62/67] python3Packages.timm: 1.0.18 -> 1.0.19 Diff: https://github.com/huggingface/pytorch-image-models/compare/refs/tags/v1.0.18...refs/tags/v1.0.19 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.19/README.md#whats-new --- pkgs/development/python-modules/timm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index 11e38f6a74d0..e453569909a0 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.18"; + version = "1.0.19"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; tag = "v${version}"; - hash = "sha256-/48gbsIS0bKbm98vzFKJQ8YD8H9z+iamN5keOYL5Lfk="; + hash = "sha256-IHppBCjyEZRdnPpPqL5VKIMov5lbHe9Wu9m9K9+am7o="; }; build-system = [ pdm-backend ]; From ffcfffb35892c33327a0ddf0255fe185db471df5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 07:12:18 +0000 Subject: [PATCH 63/67] inv-sig-helper: 0-unstable-2025-04-23 -> 0-unstable-2025-07-23 --- pkgs/by-name/in/inv-sig-helper/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix index 69757859c6cb..99cec84e735e 100644 --- a/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -16,16 +16,15 @@ rustPlatform.buildRustPackage { pname = "inv-sig-helper"; - version = "0-unstable-2025-04-23"; + version = "0-unstable-2025-07-23"; src = fetchFromGitHub { owner = "iv-org"; repo = "inv_sig_helper"; - rev = "5d3c7a4574fafe0bc5fbed9e7e33483889832fd4"; - hash = "sha256-WGh62tjKGe9OD19aq+lP9GfYs5PrGqkeT6VvmtNottQ="; + rev = "dcda9f16ae748639cec652ed504809b60f149e71"; + hash = "sha256-QVVCTM1gn/n6zDD6XdmwXdpVBlnBV9cHCvn8xfOq6E8="; }; - useFetchCargoVendor = true; cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q="; nativeBuildInputs = [ From 2063308dbb75167884b3bdfe0430b80ab5e584d0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 24 Jul 2025 08:47:39 +0100 Subject: [PATCH 64/67] man-pages: 6.14 -> 6.15 Changes: https://lore.kernel.org/linux-man/fmdgomr7g4qrj6vmaslvmwk7buyw3h7cdjemj6egjz7xcd35xy@bla7f5rxtiul/ --- pkgs/by-name/ma/man-pages/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix index c08e85b2ebcb..6670f8ee7897 100644 --- a/pkgs/by-name/ma/man-pages/package.nix +++ b/pkgs/by-name/ma/man-pages/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "man-pages"; - version = "6.14"; + version = "6.15"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/man-pages-${finalAttrs.version}.tar.xz"; - hash = "sha256-ceEwZ7eABEsvNy7sJfQgm8BBPMMq9xQUHvPSLSHq6OM="; + hash = "sha256-A9jr9hi9XfV8tL81Xvo/TNOgC3ce/WI9T9BCtdzrRGU="; }; nativeInstallCheckInputs = [ man ]; From bfb20b9feada22bfc00ade6d079d95ca71732cf7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 22 Jul 2025 14:12:49 +0200 Subject: [PATCH 65/67] workflows/build: build nixpkgs tarball This adds a build job for the tarball, which might help uncover eval issues on attributes not normally touched by Eval, aka those added in `pkgs/top-level/packages-config.nix`. --- .github/workflows/build.yml | 8 ++++++-- ci/default.nix | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ca140aee4c8..7c4d9ac48a9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: include: - runner: ubuntu-24.04 system: x86_64-linux - builds: [shell, manual-nixos, lib-tests] - desc: shell, docs, lib + builds: [shell, manual-nixos, lib-tests, tarball] + desc: shell, docs, lib, tarball - runner: ubuntu-24.04-arm system: aarch64-linux builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests] @@ -85,6 +85,10 @@ jobs: if: contains(matrix.builds, 'lib-tests') && !cancelled() run: nix-build untrusted/ci -A lib-tests + - name: Build tarball + if: contains(matrix.builds, 'tarball') && !cancelled() + run: nix-build untrusted/ci -A tarball + - name: Upload NixOS manual if: | contains(matrix.builds, 'manual-nixos') && !cancelled() && diff --git a/ci/default.nix b/ci/default.nix index 68fce29901a0..a33b023a6beb 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -89,7 +89,7 @@ let }; in -{ +rec { inherit pkgs fmt; requestReviews = pkgs.callPackage ./request-reviews { }; codeownersValidator = pkgs.callPackage ./codeowners-validator { }; @@ -113,4 +113,18 @@ in minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.minimum; }; }; shell = import ../shell.nix { inherit nixpkgs system; }; + tarball = import ../pkgs/top-level/make-tarball.nix { + # Mirrored from top-level release.nix: + nixpkgs = { + outPath = pkgs.lib.cleanSource ../.; + revCount = 1234; + shortRev = "abcdef"; + revision = "0000000000000000000000000000000000000000"; + }; + officialRelease = false; + inherit pkgs lib-tests; + # 2.28 / 2.29 take 9x longer than 2.30 or Lix. + # TODO: Switch back to nixVersions.latest + nix = pkgs.lix; + }; } From e1887c7bedfcfe5aec0b48da3a394066124bc686 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 08:12:12 +0000 Subject: [PATCH 66/67] python3Packages.whenever: 0.8.6 -> 0.8.7 --- pkgs/development/python-modules/whenever/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index ba7f70bba677..de4658b8ae3d 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-33h89pEEhfKE0P9VKRo/l9tisMa2c8Dy9oUai3OKtPA="; + hash = "sha256-SQtYoxvAoCdUDVi/jXSiSUMo+7Aa5GUX0dip9486Urg="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 172db2e61cebf7c26c8ce4d0bb4d946fb93c4ca7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 24 Jul 2025 13:18:28 +0200 Subject: [PATCH 67/67] linux-rpi: fix eval on darwin `meta.platforms` should only contain Linux platforms. --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index db13fbdf2426..ebb02db7ae23 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -43,12 +43,12 @@ lib.overrideDerivation extraMeta = if (rpiVersion < 3) then { - platforms = with lib.platforms; arm; + platforms = with lib.platforms; lib.intersectLists arm linux; hydraPlatforms = [ ]; } else { - platforms = with lib.platforms; arm ++ aarch64; + platforms = with lib.platforms; lib.intersectLists (arm ++ aarch64) linux; hydraPlatforms = [ "aarch64-linux" ]; }; ignoreConfigErrors = true;