From c07877286bbd80d7b3eb9d82e31cfd4780d814f4 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Mon, 23 Jun 2025 13:53:03 +0200 Subject: [PATCH 001/152] libirecovery: fix udevrule The many layers of escaping causes this udevrule to not be created properly. --- pkgs/by-name/li/libirecovery/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libirecovery/package.nix b/pkgs/by-name/li/libirecovery/package.nix index dadfb5496ead..72bb2d167b7b 100644 --- a/pkgs/by-name/li/libirecovery/package.nix +++ b/pkgs/by-name/li/libirecovery/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # without further configuration). configureFlags = [ "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" - ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' + ''--with-udevrule=OWNER="root",GROUP="myusergroup",MODE="0660"'' ]; meta = with lib; { From 7c06d0575d440742ed61640b5ca8fda658eae00c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Jul 2025 11:31:14 +0000 Subject: [PATCH 002/152] python3Packages.softlayer: 6.2.6 -> 6.2.7 --- pkgs/development/python-modules/softlayer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 1d188cd39cde..0d4751413232 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.2.6"; + version = "6.2.7"; pyproject = true; src = fetchFromGitHub { owner = "softlayer"; repo = "softlayer-python"; tag = "v${version}"; - hash = "sha256-qBhnHFFlP4pqlN/SETXEqYyre/ap60wHe9eCfyiB+kA="; + hash = "sha256-mlC4o39Ol1ALguc9KGpxB0M0vhWz4LG2uwhW8CBrVgg="; }; build-system = [ @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = { description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; - changelog = "https://github.com/softlayer/softlayer-python/releases/tag/v${version}"; + changelog = "https://github.com/softlayer/softlayer-python/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny ]; }; From 06782187cd9e39374a9f96e23bb33c382a409933 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Jul 2025 09:34:25 +0000 Subject: [PATCH 003/152] gdbgui: 0.15.2.0 -> 0.15.3.0 --- pkgs/development/tools/misc/gdbgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index c988bad2c7f8..ac4450076f54 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "gdbgui"; - version = "0.15.2.0"; + version = "0.15.3.0"; format = "setuptools"; buildInputs = [ gdb ]; @@ -27,7 +27,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - hash = "sha256-vmMlRmjFqhs3Vf+IU9IDtJzt4dZ0yIOmXIVOx5chZPA="; + hash = "sha256-/HyFE0JnoN03CDyCQCo/Y9RyH4YOMoeB7khReIb8t7Y="; }; postPatch = '' From 1b88d69bfeed4f8618766e5a8adc9eff6a0e326f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Jul 2025 16:35:33 +0000 Subject: [PATCH 004/152] znc: 1.10.0 -> 1.10.1 --- pkgs/applications/networking/znc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index dff22b594a30..478325dd720c 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "znc"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://znc.in/releases/archive/znc-${finalAttrs.version}.tar.gz"; - hash = "sha256-vmWtm2LvVFp+lIby90E07cU7pROtQ6adnYtHZgUzaxk="; + hash = "sha256-Tm52hR2/JgYYWXK1PsXeytaP5TtjpW5N+LizwKbEaAA="; }; postPatch = '' From 6c7298d549dc62151f669a8eebeab1250731e08b Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 11 Jul 2025 22:50:30 +0200 Subject: [PATCH 005/152] python3Packages.pyqt6-sip: 13.8.0 -> 13.10.2 --- pkgs/development/python-modules/pyqt/pyqt6-sip.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/pyqt6-sip.nix b/pkgs/development/python-modules/pyqt/pyqt6-sip.nix index 6dd6a350ffea..48ce7df0fd9a 100644 --- a/pkgs/development/python-modules/pyqt/pyqt6-sip.nix +++ b/pkgs/development/python-modules/pyqt/pyqt6-sip.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyqt6-sip"; - version = "13.8.0"; + version = "13.10.2"; format = "setuptools"; src = fetchPypi { - pname = "PyQt6_sip"; + pname = "pyqt6_sip"; inherit version; - hash = "sha256-L3TPPW2cq1FSvZ9J1XCy37h1U+u1xJGav94n9bn9adQ="; + hash = "sha256-RkrRVr9SZQDOa9BcrHqCKAr2MJl02BZzm0qaYnFW+v4="; }; # There is no test code and the check phase fails with: From 697dc0603745678dd375831db13c2e9496edc999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Jul 2025 05:52:30 +0000 Subject: [PATCH 006/152] lefthook: 1.11.15 -> 1.12.2 --- pkgs/by-name/le/lefthook/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 8cc96536a045..eecc4baa4ac1 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -7,7 +7,7 @@ let pname = "lefthook"; - version = "1.11.15"; + version = "1.12.2"; in buildGoModule { inherit pname version; @@ -16,7 +16,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-rfOsk8yMVCbTCk6CFL7qbp5oKQ21E9qD4ioyDBML7gw="; + hash = "sha256-7q6dlkvECsZWW8w31xokoD/Pwo2P189MB+7H3oh0+MI="; }; vendorHash = "sha256-kB12J6b6EbYur1QeLkwqrrzCf51rPF+7Hns1H7m4X9M="; From cd46515e72e1075120d4b9774640864b349308b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Jul 2025 07:15:09 +0000 Subject: [PATCH 007/152] git-quick-stats: 2.6.2 -> 2.7.0 --- pkgs/by-name/gi/git-quick-stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix index 3749c5ff8b29..57724f925fe9 100644 --- a/pkgs/by-name/gi/git-quick-stats/package.nix +++ b/pkgs/by-name/gi/git-quick-stats/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-OSEX9S6Q4R7fT2ic72GkUI5mW8wC5Hy2GQVeENlTm5E="; + sha256 = "sha256-utY3oD0IqnqyyDJv7i4hLkLCXukNcYSdZcaj8NUwRu0="; }; nativeBuildInputs = [ makeWrapper ]; From 536d3a238870bdad7c154711afb899ba764a6c2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Jul 2025 08:34:52 +0000 Subject: [PATCH 008/152] ocenaudio: 3.15 -> 3.15.2 --- pkgs/by-name/oc/ocenaudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/ocenaudio/package.nix b/pkgs/by-name/oc/ocenaudio/package.nix index 63ca23d4e6e0..98c86efc7d2c 100644 --- a/pkgs/by-name/oc/ocenaudio/package.nix +++ b/pkgs/by-name/oc/ocenaudio/package.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "ocenaudio"; - version = "3.15"; + version = "3.15.2"; src = fetchurl { name = "ocenaudio.deb"; url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian12.deb?version=v${finalAttrs.version}"; - hash = "sha256-MZjgdCBE+3dG6Ov+wwDKa/0Y8XIihwM50Gc/cgEf2FQ="; + hash = "sha256-sAsa/stC+OF7g7fNQGRT5x0GO0YKzH/lOPzWIZA0YsY="; }; nativeBuildInputs = [ From 31dcccb074647ddb7a681ea41cfdac2a430d6faf Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Tue, 15 Jul 2025 22:00:49 +0200 Subject: [PATCH 009/152] nixos/lasuite-meet: fix preStart script for backend - Use Systemd bind mount instead of symlinking the static directory - Perfom migrations after generating secret key Thanks @networkException and @Ma27 --- nixos/modules/services/web-apps/lasuite-meet.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/lasuite-meet.nix b/nixos/modules/services/web-apps/lasuite-meet.nix index 8dc060c39d8b..bd937f22f9b4 100644 --- a/nixos/modules/services/web-apps/lasuite-meet.nix +++ b/nixos/modules/services/web-apps/lasuite-meet.nix @@ -230,7 +230,7 @@ in type = types.str; default = if cfg.enableNginx then "localhost,127.0.0.1,${cfg.domain}" else ""; defaultText = lib.literalExpression '' - if cfg.enableNginx then "localhost,127.0.0.1,$${cfg.domain}" else "" + if cfg.enableNginx then "localhost,127.0.0.1,''${cfg.domain}" else "" ''; description = "Comma-separated list of hosts that are able to connect to the server"; }; @@ -327,16 +327,10 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' - ln -sfT ${cfg.backendPackage}/share/static /var/lib/lasuite-meet/static - if [ ! -f .version ]; then touch .version fi - if [ "${cfg.backendPackage.version}" != "$(cat .version)" ]; then - ${getExe cfg.backendPackage} migrate - echo -n "${cfg.backendPackage.version}" > .version - fi ${optionalString (cfg.secretKeyPath == null) '' if [[ ! -f /var/lib/lasuite-meet/django_secret_key ]]; then ( @@ -345,11 +339,17 @@ in ) fi ''} + if [ "${cfg.backendPackage.version}" != "$(cat .version)" ]; then + ${getExe cfg.backendPackage} migrate + echo -n "${cfg.backendPackage.version}" > .version + fi ''; environment = pythonEnvironment; serviceConfig = { + BindReadOnlyPaths = "${cfg.backendPackage}/share/static:/var/lib/lasuite-meet/static"; + ExecStart = utils.escapeSystemdExecArgs ( [ (lib.getExe' cfg.backendPackage "gunicorn") From 845dba92186f1710dc1696749247c697197dc49c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Jul 2025 09:43:31 +0000 Subject: [PATCH 010/152] kubevpn: 2.8.0 -> 2.8.1 --- pkgs/by-name/ku/kubevpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 0f7ff25cef6f..3691f3b93050 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-iVQzdYWmJOsLP2Za8nGZbxlbgxJdSkKWMXnl4Tijmkg="; + hash = "sha256-+TyaujgbeQXApxmjYvLnmhBZZUeIZMidzS7mL+Ach3o="; }; vendorHash = null; From b0fc2fe5936de1483ff92998d5450d75d54d2ff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Jul 2025 13:39:09 +0000 Subject: [PATCH 011/152] lesspipe: 2.18 -> 2.19 --- pkgs/by-name/le/lesspipe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index 862d3119052b..b4a572b3e606 100644 --- a/pkgs/by-name/le/lesspipe/package.nix +++ b/pkgs/by-name/le/lesspipe/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "lesspipe"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "wofr06"; repo = "lesspipe"; rev = "v${version}"; - hash = "sha256-GCtcIXGrMH6LOKxjnB2SkUSChQnMj5d939i2atvqK+Q="; + hash = "sha256-V+fB5KkbBRhVSDgB/e7oVEyMKQ7HbR82XQYlqxcLZyQ="; }; nativeBuildInputs = [ From ed9b5119c4dbdc714de0125b73eb575d9371a2fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Jul 2025 08:00:53 +0000 Subject: [PATCH 012/152] termius: 9.25.1 -> 9.26.0 --- pkgs/by-name/te/termius/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 64af84f4b28c..b444503e9f94 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.25.1"; - revision = "231"; + version = "9.26.0"; + revision = "232"; src = fetchurl { # find the latest version with @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-l9ShxjAzreVU3XinBDCNUQjCgXGdyDFdOMkcQgxrowhtu4KfmRioGORSnJeCCPWqIBureWSa5b572wMxCerTCQ=="; + hash = "sha512-PBwZS1CcvGFfodM3bqM/YWDJxoF/thZvTWIIPQI1ShjVWbvJUq29J/xeaNyncgQCfowgR8xWIOVpmAjCjjyQ0A=="; }; desktopItem = makeDesktopItem { From e9cc071eb53b18b9ea925f3461e44337049ce83e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 18:48:05 +0000 Subject: [PATCH 013/152] jellyseerr: 2.7.0 -> 2.7.2 --- pkgs/by-name/je/jellyseerr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 7351676250ce..52f7428e5aa5 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -17,19 +17,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jellyseerr"; - version = "2.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; tag = "v${finalAttrs.version}"; - hash = "sha256-JzJYRwrwDk8LQZAfWwym+SFTn8YhALghpZb2Dd+3nP4="; + hash = "sha256-MaLmdG98WewnNJt7z6OP9xv6zlNwwu/+YnPM0Iebxj4="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-Ym16jPHMHKmojMQOuMamDsW/u+oP1UhbCP5dooTUzFQ="; + hash = "sha256-3df72m/ARgfelBLE6Bhi8+ThHytowVOBL2Ndk7auDgg="; }; buildInputs = [ sqlite ]; From ee7377d5d96019946d53b601279be873180f7e34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 22:23:46 +0000 Subject: [PATCH 014/152] qgis-ltr: 3.40.8 -> 3.40.9 --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index b3e5764e1f3a..c9123c7c47a7 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.40.8"; + version = "3.40.9"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-3zVZP+cRln896nV/uPbaqauJaxv7aFsKWUXfvjMqAh8="; + hash = "sha256-R2qj6PnCq4uuZP/iFiJh8bFcyPHG7bix9Oc6Re4ixU4="; }; passthru = { From 8be3373abb60373d8ea6857ead72537709375633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 23:54:04 +0000 Subject: [PATCH 015/152] qgis: 3.44.0 -> 3.44.1 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 8ced638ea860..7b52744ff711 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.44.0"; + version = "3.44.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-9TJNqHvYgCoMTChL3CrOJ7Qr/okSuvj09uzdHuNMZUw="; + hash = "sha256-WUXYjMCq95S5GHcn3pR45kpP3Us1HG4sS+EmjCBYOrM="; }; passthru = { From cf113828ccb314c219dd67969de28114c68c1769 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 23 Jul 2025 11:52:59 +0200 Subject: [PATCH 016/152] go-httpbin: init at 2.18.3 --- pkgs/by-name/go/go-httpbin/package.nix | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/go/go-httpbin/package.nix diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix new file mode 100644 index 000000000000..752c5b0a643e --- /dev/null +++ b/pkgs/by-name/go/go-httpbin/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "go-httpbin"; + version = "2.18.3"; + + src = fetchFromGitHub { + owner = "mccutchen"; + repo = "go-httpbin"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ixEbmppQ+4Udc5ytV4YPOpOT/iEbhjQIYGoOGL0dIw8="; + }; + + vendorHash = null; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + ]; + + # tests are flaky + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/go-httpbin --help &> /dev/null + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Reasonably complete and well-tested golang port of httpbin, with zero dependencies outside the go stdlib"; + homepage = "https://github.com/mccutchen/go-httpbin"; + changelog = "https://github.com/mccutchen/go-httpbin/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "go-httpbin"; + }; +}) From 224dc30d39666971172f070541145ac865e35e89 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 23 Jul 2025 12:17:58 +0200 Subject: [PATCH 017/152] nixos/go-httpbin: init module --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/web-apps/go-httpbin.nix | 111 ++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 nixos/modules/services/web-apps/go-httpbin.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index eb17c8f20d9a..c662f12568a0 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -38,6 +38,8 @@ - [Chhoto URL](https://github.com/SinTan1729/chhoto-url), a simple, blazingly fast, selfhosted URL shortener with no unnecessary features, written in Rust. Available as [services.chhoto-url](#opt-services.chhoto-url.enable). +- [go-httpbin](https://github.com/mccutchen/go-httpbin), a reasonably complete and well-tested golang port of httpbin, with zero dependencies outside the go stdlib. Available as [services.go-httpbin](#opt-services.go-httpbin.enable). + - [tuwunel](https://matrix-construct.github.io/tuwunel/), a federated chat server implementing the Matrix protocol, forked from Conduwuit. Available as [services.matrix-tuwunel](#opt-services.matrix-tuwunel.enable). - [Broadcast Box](https://github.com/Glimesh/broadcast-box), a WebRTC broadcast server. Available as [services.broadcast-box](options.html#opt-services.broadcast-box.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9c9d49c09ad4..1450ae8439c6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1575,6 +1575,7 @@ ./services/web-apps/gerrit.nix ./services/web-apps/glance.nix ./services/web-apps/glitchtip.nix + ./services/web-apps/go-httpbin.nix ./services/web-apps/goatcounter.nix ./services/web-apps/gotify-server.nix ./services/web-apps/gotosocial.nix diff --git a/nixos/modules/services/web-apps/go-httpbin.nix b/nixos/modules/services/web-apps/go-httpbin.nix new file mode 100644 index 000000000000..f751b93244ef --- /dev/null +++ b/nixos/modules/services/web-apps/go-httpbin.nix @@ -0,0 +1,111 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.go-httpbin; + + environment = lib.mapAttrs ( + _: value: if lib.isBool value then lib.boolToString value else toString value + ) cfg.settings; +in + +{ + meta.maintainers = with lib.maintainers; [ defelo ]; + + options.services.go-httpbin = { + enable = lib.mkEnableOption "go-httpbin"; + + package = lib.mkPackageOption pkgs "go-httpbin" { }; + + settings = lib.mkOption { + description = '' + Configuration of go-httpbin. + See for a list of options. + ''; + example = { + HOST = "0.0.0.0"; + PORT = 8080; + }; + + type = lib.types.submodule { + freeformType = + with lib.types; + attrsOf (oneOf [ + str + int + bool + ]); + + options = { + HOST = lib.mkOption { + type = lib.types.str; + description = "The host to listen on."; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; + + PORT = lib.mkOption { + type = lib.types.port; + description = "The port to listen on."; + example = 8080; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.go-httpbin = { + wantedBy = [ "multi-user.target" ]; + + inherit environment; + + serviceConfig = { + User = "go-httpbin"; + Group = "go-httpbin"; + DynamicUser = true; + + ExecStart = lib.getExe cfg.package; + + # hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SocketBindAllow = "tcp:${toString cfg.settings.PORT}"; + SocketBindDeny = "any"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; + }; + }; + }; +} From e1b8c6c49379913cf22cbcabd9a0d0dade2cfa03 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 23 Jul 2025 12:24:19 +0200 Subject: [PATCH 018/152] nixos/tests/go-httpbin: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/go-httpbin.nix | 38 ++++++++++++++++++++++++++ pkgs/by-name/go/go-httpbin/package.nix | 6 +++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/go-httpbin.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5fdeacd8e59b..add87e2d7ea6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -607,6 +607,7 @@ in gnupg = runTest ./gnupg.nix; goatcounter = runTest ./goatcounter.nix; go-camo = runTest ./go-camo.nix; + go-httpbin = runTest ./go-httpbin.nix; go-neb = runTest ./go-neb.nix; gobgpd = runTest ./gobgpd.nix; gocd-agent = runTest ./gocd-agent.nix; diff --git a/nixos/tests/go-httpbin.nix b/nixos/tests/go-httpbin.nix new file mode 100644 index 000000000000..318fd8886c58 --- /dev/null +++ b/nixos/tests/go-httpbin.nix @@ -0,0 +1,38 @@ +{ lib, ... }: + +{ + name = "go-httpbin"; + meta.maintainers = with lib.maintainers; [ defelo ]; + + nodes.machine = { + services.go-httpbin = { + enable = true; + settings.PORT = 8000; + }; + }; + + interactive.nodes.machine = { + services.go-httpbin.settings.HOST = "0.0.0.0"; + networking.firewall.allowedTCPPorts = [ 8000 ]; + virtualisation.forwardPorts = [ + { + from = "host"; + host.port = 8000; + guest.port = 8000; + } + ]; + }; + + testScript = '' + import json + + machine.wait_for_unit("go-httpbin.service") + machine.wait_for_open_port(8000) + + resp = json.loads(machine.succeed("curl localhost:8000/get?foo=bar")) + assert resp["args"]["foo"] == ["bar"] + assert resp["method"] == "GET" + assert resp["origin"] == "127.0.0.1" + assert resp["url"] == "http://localhost:8000/get?foo=bar" + ''; +} diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix index 752c5b0a643e..9a77b98f4619 100644 --- a/pkgs/by-name/go/go-httpbin/package.nix +++ b/pkgs/by-name/go/go-httpbin/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nixosTests, nix-update-script, }: @@ -35,7 +36,10 @@ buildGoModule (finalAttrs: { runHook postInstallCheck ''; - passthru.updateScript = nix-update-script { }; + passthru = { + tests = { inherit (nixosTests) go-httpbin; }; + updateScript = nix-update-script { }; + }; meta = { description = "Reasonably complete and well-tested golang port of httpbin, with zero dependencies outside the go stdlib"; From 7fbb1d8719b69931b8a5a444a5a67b19ad6af30b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 19:50:17 +0000 Subject: [PATCH 019/152] shopify-cli: 3.82.1 -> 3.83.0 --- .../sh/shopify-cli/manifests/package-lock.json | 12 ++++++------ pkgs/by-name/sh/shopify-cli/manifests/package.json | 4 ++-- pkgs/by-name/sh/shopify-cli/package.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json index 772386febedf..316c59ab0610 100644 --- a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json +++ b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json @@ -1,14 +1,14 @@ { "name": "shopify", - "version": "3.82.1", + "version": "3.83.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "shopify", - "version": "3.82.1", + "version": "3.83.0", "dependencies": { - "@shopify/cli": "3.82.1" + "@shopify/cli": "3.83.0" }, "bin": { "shopify": "node_modules/@shopify/cli/bin/run.js" @@ -579,9 +579,9 @@ } }, "node_modules/@shopify/cli": { - "version": "3.82.1", - "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.82.1.tgz", - "integrity": "sha512-iIABwasf+aMSBIjaPsKlVSaLp3vcOIPcfiitdoMUJKQhjIVbq8KdwaAa/MLUMe5B+l230zjq/xGB8U3JeJY0eg==", + "version": "3.83.0", + "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.83.0.tgz", + "integrity": "sha512-xdSrGV8FZAqyvtyj1fXeNbBhb9qH76l11vVhoCXKgorSCjmnYlJu9Ugffv3KqkseTR5PZsDzVJ5P6jL3f3iAXQ==", "license": "MIT", "os": [ "darwin", diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json index f8fef2a1630d..3d9a98404740 100644 --- a/pkgs/by-name/sh/shopify-cli/manifests/package.json +++ b/pkgs/by-name/sh/shopify-cli/manifests/package.json @@ -1,11 +1,11 @@ { "name": "shopify", - "version": "3.82.1", + "version": "3.83.0", "private": true, "bin": { "shopify": "node_modules/@shopify/cli/bin/run.js" }, "dependencies": { - "@shopify/cli": "3.82.1" + "@shopify/cli": "3.83.0" } } diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index 1b64c8313477..e94b15147477 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -5,7 +5,7 @@ shopify-cli, }: let - version = "3.82.1"; + version = "3.83.0"; in buildNpmPackage { pname = "shopify"; @@ -13,7 +13,7 @@ buildNpmPackage { src = ./manifests; - npmDepsHash = "sha256-s0wlJxA3DUXRGBlLvyesLr9H/nbDc9yHBBWBLjQd8vE="; + npmDepsHash = "sha256-hnIpsPle7L8BrHZONH6vJjlFrTu2w1TsslDj0u8Ot3M="; dontNpmBuild = true; passthru = { From 54a5a0eb5bfa6562fb6f473794dbe2291c5d9cd4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 24 Jul 2025 01:29:08 +0200 Subject: [PATCH 020/152] beebeep: use stdenv mkDerivation --- pkgs/by-name/be/beebeep/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/be/beebeep/package.nix b/pkgs/by-name/be/beebeep/package.nix index 42a6dd4dc932..ed9138531aaa 100644 --- a/pkgs/by-name/be/beebeep/package.nix +++ b/pkgs/by-name/be/beebeep/package.nix @@ -2,10 +2,11 @@ lib, fetchzip, autoPatchelfHook, - libsForQt5, + stdenv, + qt5, }: -libsForQt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "beebeep"; version = "5.8.6"; @@ -15,11 +16,11 @@ libsForQt5.mkDerivation rec { }; nativeBuildInputs = [ - libsForQt5.wrapQtAppsHook + qt5.wrapQtAppsHook autoPatchelfHook ]; - buildInputs = with libsForQt5; [ + buildInputs = with qt5; [ qtbase qtmultimedia qtx11extras From 5ddb0a51e667ddff7e2c9979a35ae11225f81ba2 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 24 Jul 2025 11:15:46 +0200 Subject: [PATCH 021/152] piper-{tts, train}: move to by-name --- .../train.nix => by-name/pi/piper-train/package.nix} | 0 .../default.nix => by-name/pi/piper-tts/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) rename pkgs/{tools/audio/piper/train.nix => by-name/pi/piper-train/package.nix} (100%) rename pkgs/{tools/audio/piper/default.nix => by-name/pi/piper-tts/package.nix} (91%) diff --git a/pkgs/tools/audio/piper/train.nix b/pkgs/by-name/pi/piper-train/package.nix similarity index 100% rename from pkgs/tools/audio/piper/train.nix rename to pkgs/by-name/pi/piper-train/package.nix diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/by-name/pi/piper-tts/package.nix similarity index 91% rename from pkgs/tools/audio/piper/default.nix rename to pkgs/by-name/pi/piper-tts/package.nix index deb718b916ae..7e7782e81328 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/by-name/pi/piper-tts/package.nix @@ -19,7 +19,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "piper"; + pname = "piper-tts"; version = "2023.11.14-2"; src = fetchFromGitHub { @@ -65,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: { inherit piper-train; }; - meta = with lib; { + meta = { changelog = "https://github.com/rhasspy/piper/releases/tag/v${finalAttrs.version}"; description = "Fast, local neural text to speech system"; homepage = "https://github.com/rhasspy/piper"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; mainProgram = "piper"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5929c845e691..cc2594cae007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4094,9 +4094,6 @@ with pkgs; pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; - piper-train = callPackage ../tools/audio/piper/train.nix { }; - piper-tts = callPackage ../tools/audio/piper { }; - phosh = callPackage ../applications/window-managers/phosh { }; phosh-mobile-settings = From 410752a882c51ad35562eb161625ffbad7c0ceaa Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 24 Jul 2025 18:03:43 +0200 Subject: [PATCH 022/152] ntfy-sh: Add meta.mainProgram Signed-off-by: Matthias Beyer --- pkgs/by-name/nt/ntfy-sh/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix index 17a97a464f87..04bf3d69699b 100644 --- a/pkgs/by-name/nt/ntfy-sh/package.nix +++ b/pkgs/by-name/nt/ntfy-sh/package.nix @@ -86,6 +86,7 @@ buildGoModule ( arjan-s fpletz ]; + mainProgram = "ntfy"; }; } ) From 31cc9ad85e40a8ad1ba94b9910990bebaee85f6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 17:32:47 +0000 Subject: [PATCH 023/152] rqlite: 8.39.1 -> 8.41.0 --- pkgs/by-name/rq/rqlite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index eae9df1c9deb..84668d194e72 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "8.39.1"; + version = "8.41.0"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-x/J8W+lAC7d6rE3Zzc7vXVvbonCXn33Of2pKljuWpq0="; + hash = "sha256-3jzQ6Kby/v/cBxc1+ejm5PdmhZVVWvBrDEeuf7hqVKw="; }; - vendorHash = "sha256-fj4YyxCIZG6ttmNVZm12xKk3+OcownrqXKc9LCAWk7U="; + vendorHash = "sha256-8Oejfec9QAYRkFGyEB9R/msiwzV+pgDFS+UNfvvTie4="; subPackages = [ "cmd/rqlite" From 1d5ae6c537d9e10fa5c2595cf40dd7aaf0b3c0c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 18:35:39 +0000 Subject: [PATCH 024/152] sitespeed-io: 37.8.0 -> 38.0.0 --- pkgs/by-name/si/sitespeed-io/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix index 629c83878b9b..0183e0380531 100644 --- a/pkgs/by-name/si/sitespeed-io/package.nix +++ b/pkgs/by-name/si/sitespeed-io/package.nix @@ -26,13 +26,13 @@ assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; buildNpmPackage rec { pname = "sitespeed-io"; - version = "37.8.0"; + version = "38.0.0"; src = fetchFromGitHub { owner = "sitespeedio"; repo = "sitespeed.io"; tag = "v${version}"; - hash = "sha256-0bXkVqCen0kUHP8YeFkpdxTd+4Hx6YMZVTjwgWWg6nQ="; + hash = "sha256-PLzUpTvgyE9uxIxejU0qTChTM392+euhUtu3IND5kzw="; }; postPatch = '' @@ -50,7 +50,7 @@ buildNpmPackage rec { dontNpmBuild = true; npmInstallFlags = [ "--omit=dev" ]; - npmDepsHash = "sha256-ZWjlueRZkH5lsalUY/xoOO/22P9Ta5CnmK0UKjapyU8="; + npmDepsHash = "sha256-mjFTE6k0MaGsRagC0Zk7CKTpNn2ow8WXa6KGbLuSVzc="; postInstall = '' mv $out/bin/sitespeed{.,-}io From 3abf0233464fd2f32f61fbdd34dec7b15437d0a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 18:43:17 +0000 Subject: [PATCH 025/152] python3Packages.posthog: 6.1.0 -> 6.3.1 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index c7513cadeaf2..f937004b80da 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "6.1.0"; + version = "6.3.1"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-u4qCQYCpMfM/JCyyKOfTTN7vwh3EvlGnxuslUy/d9Bs="; + hash = "sha256-kUIgZJdX+IdMEkIK0DoKYOiv9GSaI+RhOeg9+zK4yvc="; }; build-system = [ setuptools ]; From 89a699050b488d292e04e6f66dcbc463253f0552 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 11:07:15 +0000 Subject: [PATCH 026/152] cloudflare-warp: 2025.5.893 -> 2025.5.943 --- pkgs/by-name/cl/cloudflare-warp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index d8ce8fe7d008..01414529df10 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -23,15 +23,15 @@ }: let - version = "2025.5.893"; + version = "2025.5.943"; sources = { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb"; - hash = "sha256-oWpt6QdGRZJBjxQgrULWTzd0liEOp4q0gHH4Oi7GEKs="; + hash = "sha256-d4H3w+X3i3Hqqz8jbGx8eZ7ZuKrYJScbpFgeXKK71yI="; }; aarch64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb"; - hash = "sha256-yV2N8qT0gDQpvQl5MxnrmYvk+L98+L6kPNQIOazSUsQ="; + hash = "sha256-E6+vSUSVNEd4+fNYsWcflk1fZb4dzNcjG8Mep7ZHw84="; }; }; in From 479d59e0fa13ef2229968e2b443aa288755a80b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 13:33:34 +0000 Subject: [PATCH 027/152] ngtcp2-gnutls: 1.13.0 -> 1.14.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index f8cc5a4031de..66d343bac07d 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-SvxGZoV4N9wNAsI5pOjjGECgk2vV0FifzHi1gbGjqnc="; + hash = "sha256-TpfCfVhguFbTqQiY+zl6Kn7fsIQHR1tvNC4YLkxmBis="; }; outputs = [ From e9172282fda667dcb055b1a2bd5036174a2413ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 15:37:15 +0000 Subject: [PATCH 028/152] scalingo: 1.35.1 -> 1.36.0 --- pkgs/by-name/sc/scalingo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 17a8e54adfcd..3c39ab617fdb 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.35.1"; + version = "1.36.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-cs7LyK9QyjuaLRvvC3M9T12faWSk8xADuYGxbzptY6Q="; + hash = "sha256-M2Q7+fWq/jjjKGynjEyQc8ykwILiIBe0eELS2DnU5To="; }; vendorHash = null; From 966957b5d26957849fd8dc3f6a52bf17d4920484 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 25 Jul 2025 09:33:22 -0700 Subject: [PATCH 029/152] python3Packages.openai: 1.97.0 -> 1.97.1 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.97.0...refs/tags/v1.97.1 Changelog: https://github.com/openai/openai-python/blob/v1.97.1/CHANGELOG.md --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index faeae18bc9c6..6a12d443ffc1 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "openai"; - version = "1.97.0"; + version = "1.97.1"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-q+GUEHducm71Zqh7ZfRF217awFKQIsOSEWoe04M3DFM="; + hash = "sha256-ANY74P3tM8VVPh9m6hOdZSkMhcQphi72bKNcLrsLEq8="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; From 5c69af230ba1184c880a53c772167e5c1d0542d0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 26 Jul 2025 00:18:21 +0400 Subject: [PATCH 030/152] =?UTF-8?q?python3Packages.pystac-client:=200.8.6?= =?UTF-8?q?=20=E2=86=92=200.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/pystac-client/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystac-client/default.nix b/pkgs/development/python-modules/pystac-client/default.nix index fe8cfca42d5e..661e8969bf3e 100644 --- a/pkgs/development/python-modules/pystac-client/default.nix +++ b/pkgs/development/python-modules/pystac-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pystac-client"; - version = "0.8.6"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "stac-utils"; repo = "pystac-client"; tag = "v${version}"; - hash = "sha256-rbRxqR6hZy284JfQu5+dukFTBHllqzjo0k9aWhrkRAU="; + hash = "sha256-+DOWf1ZAwylicdSuOBNivi0Z7DxaymZF756X7fogAjc="; }; build-system = [ setuptools ]; @@ -52,6 +52,12 @@ buildPythonPackage rec { "-m 'not vcr'" ]; + # requires cql2 + disabledTests = [ + "test_filter_conversion_to_cql2_json" + "test_filter_conversion_to_cql2_text" + ]; + pythonImportsCheck = [ "pystac_client" ]; meta = { From beffdea9ee3f00c0160831878579cefb72425820 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Jul 2025 11:00:12 +0000 Subject: [PATCH 031/152] lug-helper: 4.1 -> 4.2 --- pkgs/by-name/lu/lug-helper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 6a5b637f46e2..c2586c8fe782 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -15,12 +15,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { name = "lug-helper"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; tag = "v${finalAttrs.version}"; - hash = "sha256-Pj0jReezB/0yCl5EC+EQ7CVtmgGQrJwVR6pvaP/gtWg="; + hash = "sha256-W8GwDXYHfGdruAMdBei53V5UPYE6yks0+FW48pARknY="; }; buildInputs = [ From eb4af751b3af8ff7ed8d6f1959f26c6fb76b9945 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Sat, 26 Jul 2025 21:47:48 +0200 Subject: [PATCH 032/152] kubernetes: move to by-name --- .../ku}/kubernetes/fixup-addonmanager-lib-path.patch | 0 .../kubernetes/default.nix => by-name/ku/kubernetes/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 deletion(-) rename pkgs/{applications/networking/cluster => by-name/ku}/kubernetes/fixup-addonmanager-lib-path.patch (100%) rename pkgs/{applications/networking/cluster/kubernetes/default.nix => by-name/ku/kubernetes/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/kubernetes/fixup-addonmanager-lib-path.patch b/pkgs/by-name/ku/kubernetes/fixup-addonmanager-lib-path.patch similarity index 100% rename from pkgs/applications/networking/cluster/kubernetes/fixup-addonmanager-lib-path.patch rename to pkgs/by-name/ku/kubernetes/fixup-addonmanager-lib-path.patch diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/by-name/ku/kubernetes/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubernetes/default.nix rename to pkgs/by-name/ku/kubernetes/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index affa0ae81764..faffed8b9dc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12808,7 +12808,6 @@ with pkgs; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; From 5d06cce58c3acfde5e889d88a8bc7851aa979049 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Sat, 26 Jul 2025 21:48:46 +0200 Subject: [PATCH 033/152] kubectl: move to by-name --- .../kubernetes/kubectl.nix => by-name/ku/kubectl/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/networking/cluster/kubernetes/kubectl.nix => by-name/ku/kubectl/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/by-name/ku/kubectl/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubernetes/kubectl.nix rename to pkgs/by-name/ku/kubectl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faffed8b9dc5..3c0409acfed3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12808,7 +12808,6 @@ with pkgs; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; kubectl-view-allocations = From 06c34b005f1cb5c3bf850459da0371629e6ecd4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 02:06:52 +0000 Subject: [PATCH 034/152] wakatime-cli: 1.118.0 -> 1.124.1 --- pkgs/by-name/wa/wakatime-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index d8d8ce3a40f2..8cd17e34dcf8 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "wakatime-cli"; - version = "1.118.0"; + version = "1.124.1"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; tag = "v${version}"; - hash = "sha256-f17dSfS+6jF1wsLEP5UdzYbqK6DVD5nflMpz8oQzZ+Q="; + hash = "sha256-Fr3ROi8OXZqyN3lXPkAtelkN47X+MXHGAhr5FQvPSqQ="; }; vendorHash = "sha256-jyFUauK+CAuSv+dKUyVtuoTizeGkKnNquZLA96oq1BM="; From e422223c767e22ac8f01bfe5c1ad47a0fd3ee36e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 04:48:48 +0000 Subject: [PATCH 035/152] jdd: 0.4.3 -> 0.4.4 --- pkgs/by-name/jd/jdd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jd/jdd/package.nix b/pkgs/by-name/jd/jdd/package.nix index 3b46cde42d43..0c09cd3ce2c3 100644 --- a/pkgs/by-name/jd/jdd/package.nix +++ b/pkgs/by-name/jd/jdd/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "jdd"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "mahyarmirrashed"; repo = "jdd"; tag = "v${finalAttrs.version}"; - hash = "sha256-7iHoLv3DeqjXvcB7Nih+TMKwWYuausIP2Nhv00pfz0A="; + hash = "sha256-JeF6dsExfQ+d5F8RWmfGbr7CIl6akOTlLI2jxx/dES0="; }; - vendorHash = "sha256-qwrmiVvmsi1uxHVIKuoMBPUK/Y5aYdUR3fUa5tOpNRY="; + vendorHash = "sha256-KEg5X2wHx7KPHEL1zJd/DeDnR69FyB6pajpHIYdep2k="; ldflags = [ "-X=main.version=${finalAttrs.version}" ]; From 91524d133088739f9573e97f88b326f1fe004f5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 08:48:25 +0000 Subject: [PATCH 036/152] corsix-th: 0.68.0 -> 0.69.0 --- pkgs/by-name/co/corsix-th/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/corsix-th/package.nix b/pkgs/by-name/co/corsix-th/package.nix index 6ae3ea109013..394d52233c85 100644 --- a/pkgs/by-name/co/corsix-th/package.nix +++ b/pkgs/by-name/co/corsix-th/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corsix-th"; - version = "0.68.0"; + version = "0.69.0"; src = fetchFromGitHub { owner = "CorsixTH"; repo = "CorsixTH"; rev = "v${finalAttrs.version}"; - hash = "sha256-D8ks+fiFJxwClqW1aNtGGa5UxAFvuH2f2guwPxOEQwI="; + hash = "sha256-U8rl24EBjSRJrK2VmCI3YKeEM7U8ynaufEghgVfqrp0="; }; patches = [ From 7c886e98609084947c3ddeefc1ee848a75cd7180 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Sat, 26 Jul 2025 20:33:05 -0700 Subject: [PATCH 037/152] mandelbrot-cli: init at 0-unstable-2025-07-16 --- pkgs/by-name/ma/mandelbrot-cli/package.nix | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/ma/mandelbrot-cli/package.nix diff --git a/pkgs/by-name/ma/mandelbrot-cli/package.nix b/pkgs/by-name/ma/mandelbrot-cli/package.nix new file mode 100644 index 000000000000..0ea9f1369927 --- /dev/null +++ b/pkgs/by-name/ma/mandelbrot-cli/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mandelbrot-cli"; + version = "0-unstable-2025-07-16"; + + src = fetchFromGitHub { + owner = "IronstoneInnovation"; + repo = "mandelbrot_cli"; + rev = "36a43d4feace4ac346c6da78262278d4deb6bb94"; + hash = "sha256-RGv/B2Zi2hqHWPbo67vTlJIIci3a0tyIgD5+Tnf0yiY="; + }; + + cargoHash = "sha256-nOhg3nDWGA+0g499EnsX5TNwnZM2NcpqHiyQujOM3OI="; + + meta = { + description = "A CLI for generating images of the Mandelbrot Set"; + homepage = "https://github.com/IronstoneInnovation/mandelbrot_cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yiyu ]; + mainProgram = "mandelbrot-cli"; + }; +}) From c4968b978ae4d8b4ee2f5e270fccea3d9b65d415 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 27 Jul 2025 16:58:34 -0700 Subject: [PATCH 038/152] python3Packages.anthropic: 0.55.0 -> 0.59.0 https://github.com/anthropics/anthropic-sdk-python/releases/tag/v0.59.0 --- pkgs/development/python-modules/anthropic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 01fa791b7ec4..8f4ff4d62bb3 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.55.0"; + version = "0.59.0"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-2IdsWNQdp4Cr6xP1MDnj5EN/jyGcxuc5bTKg349DpI8="; + hash = "sha256-JUgJB0+9zfmj3asjn7FOozNB9STkKEvObbTP3KLDV+M="; }; postPatch = '' From 45f261041539785076258319a62216737f6c44e6 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 27 Jul 2025 14:17:09 -0400 Subject: [PATCH 039/152] nixos/lemurs: Fix test > machine.wait_until_succeeds("pgrep -f 'lemurs.*tty1'") This was guaranteed to succeed whether the desired process existed or not, because it was matching the 'bach -c ...' command the test driver uses to run the command. Let's wait for evidence on screen instead. --- nixos/tests/lemurs/lemurs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/lemurs/lemurs.nix b/nixos/tests/lemurs/lemurs.nix index 803f74bfc681..e1b4ef40f983 100644 --- a/nixos/tests/lemurs/lemurs.nix +++ b/nixos/tests/lemurs/lemurs.nix @@ -11,6 +11,8 @@ ]; }; + enableOCR = true; + nodes.machine = _: { imports = [ ../common/user-account.nix ]; services.displayManager.lemurs.enable = true; @@ -20,7 +22,7 @@ machine.start() machine.wait_for_unit("multi-user.target") - machine.wait_until_succeeds("pgrep -f 'lemurs.*tty1'") + machine.wait_for_text("Login") machine.screenshot("postboot") with subtest("Log in as alice on a virtual console"): From 423d736158d919e90a312a0e401690a6a2de4911 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Jul 2025 10:04:15 +0000 Subject: [PATCH 040/152] runme: 3.14.2 -> 3.15.0 --- pkgs/by-name/ru/runme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix index 9caec27e0ca8..07184a263f4d 100644 --- a/pkgs/by-name/ru/runme/package.nix +++ b/pkgs/by-name/ru/runme/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "runme"; - version = "3.14.2"; + version = "3.15.0"; src = fetchFromGitHub { owner = "runmedev"; repo = "runme"; rev = "v${version}"; - hash = "sha256-s+GhfbxPLiIE0PT08srj+McUAhhhlG0JOOoWJyiMAeo="; + hash = "sha256-mVqDCHCZn0hbhNZjMyD+B52ZjG5GTplz9FNJoA8DY8A="; }; - vendorHash = "sha256-ixAd+ItQ1kLZZxQQNKcRH2dxQvnX/gpja930SSREzzA="; + vendorHash = "sha256-AXjU0nhSSdyfdYofjRI0wtF+nEsZmqLjr5j7FzY+x94="; nativeBuildInputs = [ installShellFiles From 676c5d37e1a9fc4bf7f91e31725b0e0411184770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 04:03:28 +0000 Subject: [PATCH 041/152] cargo-binstall: 1.14.1 -> 1.14.2 --- pkgs/by-name/ca/cargo-binstall/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index f7bc180dff10..88d9d565bdc7 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-E+Vyup0HNDbHVQ43Dq5U77TxXqDRSPAs0Kw0RsvEggs="; + hash = "sha256-elpTBFt9w6J4xLY+ykzhQnj+4MF5bVgzerxTTpevTxk="; }; - cargoHash = "sha256-VsgiD/k6Kd02t3HnXax9GdvPsymTOBjvdJivpoGxrXc="; + cargoHash = "sha256-9VERKo5GU1gK0rLNx+wq+mnKrwY1DVsmdH+aRSzIOew="; nativeBuildInputs = [ pkg-config From 1af42c491031aae7738cb914cd3acf450ecf1f95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Jul 2025 20:31:31 +0000 Subject: [PATCH 042/152] oxlint: 1.3.0 -> 1.6.0 --- pkgs/by-name/ox/oxlint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 783547b110f9..2ee5a4f40e92 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "1.3.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${version}"; - hash = "sha256-+K8hc6uU/p/hT3bkaGPZpVcK9itSGJM9Mdhfw3DSZJw="; + hash = "sha256-URgz9k89WgYfCu9OlNCZk5wRt8upt58rIxFWa90L+OQ="; }; - cargoHash = "sha256-D0YEodCzBpf7g3VnKyydEDtjzGUu+XsGc2BpXU4CR6Q="; + cargoHash = "sha256-s1UXL+y/BISOnPJmdpQFztYRd5je9C8jcc+e+iWtRuU="; buildInputs = [ rust-jemalloc-sys From 61bcf6429340b303791eca41b19f36a1681b4768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ha=CC=88cker?= Date: Tue, 15 Jul 2025 09:57:15 +0200 Subject: [PATCH 043/152] =?UTF-8?q?mailmap:=20add=20Martin=20H=C3=A4cker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This removes the unicode line direction character from my username. Some earlier commits by me still had them, and this causes issues with UIs that cannot handle that propperly. --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 9dc0ba7a17d5..78903382ab3c 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,7 @@ Jörg Thalheim Lin Jian Lin Jian <75130626+jian-lin@users.noreply.github.com> Martin Weinelt +Martin Häcker moni R. RyanTM Robert Hensing From c7a6f489ae35c3541e6374cffb85a01a5b94a09f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Jul 2025 20:35:26 +0000 Subject: [PATCH 044/152] cargo-hack: 0.6.36 -> 0.6.37 --- pkgs/by-name/ca/cargo-hack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index e5aacf2b6450..9edcf25632bb 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.36"; + version = "0.6.37"; src = fetchCrate { inherit pname version; - hash = "sha256-AO4bB+aqAzGxFyPhuwaEQDAbL+fCIWY2rv3QFdBAq7s="; + hash = "sha256-OlWSyp3et/48x5lRE14pIny8HHQcgOV2f9mI9hcj8K4="; }; - cargoHash = "sha256-fWKrHo5WdeEhnPxATbZ9Cjv+aiSxOh0pRDeeHHDk8u4="; + cargoHash = "sha256-1FgFHnNCEGoBUbH+Uk67W9ufsGtr9uGdzJz0xZuPQ9U="; # some necessary files are absent in the crate version doCheck = false; From 660ef4d559830b6ea3cffb009c91096b9c0417a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 13:10:23 +0000 Subject: [PATCH 045/152] cargo-mutants: 25.2.0 -> 25.2.2 --- pkgs/by-name/ca/cargo-mutants/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index 1a983965546f..f9eedb7aff23 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "25.2.0"; + version = "25.2.2"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-//OUOf4RUM69tHBB17p4OSs/cCvv0HnDjyRUzUZc8KE="; + hash = "sha256-VDXI/pR7lmIMrsHx9E+oWp0PPUcl83Hc98z6Sh18Hsc="; }; - cargoHash = "sha256-QZrpH0nJ6a9AQAKNp/tkT1hpkUMWa2kh8kek2rY8wO4="; + cargoHash = "sha256-fTGIFD6V7L3erzi2RexR9XJNIV/UTu8vwFnrNpeFE4A="; # too many tests require internet access doCheck = false; From db607f1a01520c415c807b8dd64e7a6bf1276a47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Jul 2025 00:30:35 +0000 Subject: [PATCH 046/152] argc: 1.22.0 -> 1.23.0 --- pkgs/by-name/ar/argc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index a689a8eee95f..5492ae34eab8 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "argc"; rev = "v${version}"; - hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50="; + hash = "sha256-in2ymxiSZbs3wZwo/aKfu11x8SLx4OHOoa/tVxr3FyM="; }; - cargoHash = "sha256-uyUwmTDa1RcgQbc/6wMwRK6932CatuGMr0FPd2rAufk="; + cargoHash = "sha256-2UmI9CMa130T7ML9iVNQ8Zh/stiFg05eBtF1sprmwk8="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; From 5e5df3f3a32dcee4142742e85e612cb49741b160 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Jul 2025 02:45:54 +0000 Subject: [PATCH 047/152] stu: 0.7.2 -> 0.7.3 --- pkgs/by-name/st/stu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix index cd77d9c17386..1bbc3e5d63a3 100644 --- a/pkgs/by-name/st/stu/package.nix +++ b/pkgs/by-name/st/stu/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stu"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "lusingander"; repo = "stu"; rev = "v${version}"; - hash = "sha256-taxXk6GJ7ulPVPL4nUZwY+ln7Te54kM2xcLsRd7kpK0="; + hash = "sha256-2vnyRTdRr6Y8YlwBSXqcOir5xdu5msPSU3EbsB0Ya34="; }; - cargoHash = "sha256-qc2FvlMjPp0X6EQyxNwJdpB8D1i+QzxFv9qYf/F+gXg="; + cargoHash = "sha256-Us4rQYq+1Akq3i31sPBIC1Df0moicnHF0J5++M8tC2U="; passthru.tests.version = testers.testVersion { package = stu; }; From 0f76b3d2c6fcd7b9587040341db0cfdc181bfbb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Jul 2025 05:38:06 +0000 Subject: [PATCH 048/152] cargo-bolero: 0.13.3 -> 0.13.4 --- pkgs/by-name/ca/cargo-bolero/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index a673292503de..987017fdde30 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bolero"; - version = "0.13.3"; + version = "0.13.4"; src = fetchCrate { inherit pname version; - hash = "sha256-xU7a5xEFSrFsQ1K5DIYgACuf+34QeCvGmWvlSSwI03I="; + hash = "sha256-lfBpHaY2UCBMg45S4IW8fcpkGkKJoT4qqR2yq5KiXuE="; }; - cargoHash = "sha256-FMpM42D3h42NfDzH+EVs6NB2RVehFNFAYTMvzRQVt/s="; + cargoHash = "sha256-2URFqLg2aQF7MOpwG6fEPBXyBsLENWpdiXgxW/DJxQE="; buildInputs = [ libbfd From b3e47fdddbd20047eff317ceb28ec456d7f4c709 Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Mon, 28 Jul 2025 08:30:31 +0200 Subject: [PATCH 049/152] blanket: 0.7.0 -> 0.8.0 --- pkgs/by-name/bl/blanket/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix index e83a89c6e3d5..a81239eb5f10 100644 --- a/pkgs/by-name/bl/blanket/package.nix +++ b/pkgs/by-name/bl/blanket/package.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "blanket"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "blanket"; - rev = version; - hash = "sha256-mY7c5i0me7mMbD8c6eGJeaZpR8XI5QVL4n3M+j15Z1c="; + tag = version; + hash = "sha256-LnHL/1DJXiKx9U+JkT4Wjx1vtTmKLpzZ8q6uLT5a2MY="; }; nativeBuildInputs = [ @@ -49,13 +49,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 ]; - format = "other"; - - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace-fail gtk-update-icon-cache gtk4-update-icon-cache - ''; + pyproject = false; dontWrapGApps = true; @@ -69,6 +63,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Listen to different sounds"; + changelog = "https://github.com/rafaelmardojai/blanket/releases/tag/${version}"; homepage = "https://github.com/rafaelmardojai/blanket"; license = lib.licenses.gpl3Plus; mainProgram = "blanket"; From 1b069079496cac762589dae20019579b94ec884f Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 18 Jun 2025 01:04:29 +0800 Subject: [PATCH 050/152] vtk: 9.2.6 -> 9.5.0 --- pkgs/by-name/ex/exhibit/package.nix | 2 +- pkgs/by-name/f3/f3d/package.nix | 7 +- pkgs/development/libraries/vtk/9.x.nix | 5 - pkgs/development/libraries/vtk/default.nix | 30 ++ pkgs/development/libraries/vtk/generic.nix | 418 +++++++++++++++----- pkgs/development/libraries/vtk/vtk.egg-info | 5 - pkgs/top-level/aliases.nix | 4 + pkgs/top-level/all-packages.nix | 20 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 14 +- 10 files changed, 359 insertions(+), 147 deletions(-) delete mode 100644 pkgs/development/libraries/vtk/9.x.nix create mode 100644 pkgs/development/libraries/vtk/default.nix delete mode 100644 pkgs/development/libraries/vtk/vtk.egg-info diff --git a/pkgs/by-name/ex/exhibit/package.nix b/pkgs/by-name/ex/exhibit/package.nix index 73fe81102632..79b0f4742ea4 100644 --- a/pkgs/by-name/ex/exhibit/package.nix +++ b/pkgs/by-name/ex/exhibit/package.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ pygobject3 - f3d_egl + f3d ]; dontWrapGApps = true; diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix index 28b9e4dbf253..b24c155673d9 100644 --- a/pkgs/by-name/f3/f3d/package.nix +++ b/pkgs/by-name/f3/f3d/package.nix @@ -9,10 +9,7 @@ libXt, openusd, tbb, - # There is a f3d overridden with EGL enabled vtk in top-level/all-packages.nix - # compiling with EGL enabled vtk will result in f3d running in headless mode - # See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. - vtk_9, + vtk, autoPatchelfHook, python3Packages, opencascade-occt, @@ -50,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - vtk_9 + vtk opencascade-occt assimp fontconfig diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix deleted file mode 100644 index 3734c20f0e05..000000000000 --- a/pkgs/development/libraries/vtk/9.x.nix +++ /dev/null @@ -1,5 +0,0 @@ -import ./generic.nix { - majorVersion = "9.2"; - minorVersion = "6"; - sourceSha256 = "sha256-BvyNScTlb0mMQPyzilY+2NTsMTWNAQHomI8LtNU53RI="; -} diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix new file mode 100644 index 000000000000..5418f6f97dee --- /dev/null +++ b/pkgs/development/libraries/vtk/default.nix @@ -0,0 +1,30 @@ +{ + callPackage, + fetchpatch2, +}: +let + mkVtk = initArgs: callPackage (import ./generic.nix initArgs) { }; +in +{ + vtk_9_5 = mkVtk { + version = "9.5.0"; + sourceSha256 = "sha256-BK6GJGuVV8a2GvvFNKbfCZJE+8jzk3+C5rwFcJU6+H0="; + patches = [ + # https://gitlab.kitware.com/vtk/vtk/-/issues/19699 + (fetchpatch2 { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/6b4f7b853675c63e4831c366ca8f78e320c1bfb5.diff"; + hash = "sha256-hWJc5RxW6iK+W/rTxp2GUWKcm/2+oxbP5nVZ0EUSKHE="; + }) + # https://gitlab.kitware.com/vtk/vtk/-/issues/19705 + (fetchpatch2 { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/ce10dfe82ffa19c8108885625a6f8b3f980bed3b.diff"; + hash = "sha256-kyPM0whL4WeaV27sNM1fbbs5kwMYn+9E561HtvnwHRc="; + }) + # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/12262 + (fetchpatch2 { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/c0e0f793e6adf740f5b1c91ac330afdbc2a03b72.diff"; + hash = "sha256-BinSv8sPqpAEcgkn8trnCPv2snR9MGcA8rkVflAhc5w="; + }) + ]; + }; +} diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 02f3606f63cd..85d60a996121 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -1,145 +1,347 @@ { - majorVersion, - minorVersion, + version, sourceSha256, - patchesToFetch ? [ ], + patches ? [ ], }: { - stdenv, lib, + newScope, + stdenv, fetchurl, cmake, - libGLU, - libGL, - libX11, - xorgproto, - libXt, + pkg-config, + + # common dependencies + tk, + mpi, + python3Packages, + catalyst, + cli11, + boost, + eigen, + verdict, + double-conversion, + + # common data libraries + lz4, + xz, + zlib, + pugixml, + expat, + jsoncpp, + libxml2, + exprtk, + utf8cpp, + libarchive, + nlohmann_json, + + # filters + openturns, + openslide, + + # io modules + cgns, + adios2, + libLAS, + libgeotiff, + laszip_2, + gdal, + pdal, + alembic, + imath, + openvdb, + c-blosc, + unixODBC, + postgresql, + libmysqlclient, + ffmpeg, + libjpeg, libpng, libtiff, - fetchpatch, - enableQt ? false, - qtx11extras, - qttools, - qtdeclarative, - qtEnv, - enablePython ? false, - python ? throw "vtk: Python support requested, but no python interpreter was given.", - enableEgl ? false, + proj, + sqlite, + libogg, + libharu, + libtheora, + hdf5, + netcdf, + opencascade-occt, + + # threading + tbb, + llvmPackages, + + # rendering + viskores, + freetype, + fontconfig, + libX11, + libXfixes, + libXrender, + libXcursor, + gl2ps, + libGL, + qt5, + qt6, + + # custom options + qtVersion ? null, + # To avoid conflicts between the propagated vtkPackages.hdf5 + # and the input hdf5 used by most downstream packages, + # we set mpiSupport to false by default. + mpiSupport ? false, + pythonSupport ? false, + + # passthru.tests + testers, }: - let - inherit (lib) optionalString optionals; - - version = "${majorVersion}.${minorVersion}"; - pythonMajor = lib.substring 0 1 python.pythonVersion; + qtPackages = + if (isNull qtVersion) then + null + else if (qtVersion == "6") then + qt6 + else if (qtVersion == "5") then + qt5 + else + throw ''qtVersion must be "5", "6" or null''; + vtkPackages = lib.makeScope newScope (self: { + inherit + tbb + mpi + mpiSupport + python3Packages + pythonSupport + ; + hdf5 = hdf5.override { + inherit mpi mpiSupport; + cppSupport = !mpiSupport; + }; + openvdb = self.callPackage openvdb.override { }; + netcdf = self.callPackage netcdf.override { }; + catalyst = self.callPackage catalyst.override { }; + adios2 = self.callPackage adios2.override { }; + cgns = self.callPackage cgns.override { }; + viskores = self.callPackage viskores.override { }; + }); + vtkBool = feature: bool: lib.cmakeFeature feature "${if bool then "YES" else "NO"}"; in -stdenv.mkDerivation { - pname = "vtk" + optionalString enableEgl "-egl" + optionalString enableQt "-qvtk"; - inherit version; +stdenv.mkDerivation (finalAttrs: { + pname = "vtk"; + inherit version patches; src = fetchurl { - url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz"; - sha256 = sourceSha256; + url = "https://www.vtk.org/files/release/${lib.versions.majorMinor finalAttrs.version}/VTK-${finalAttrs.version}.tar.gz"; + hash = sourceSha256; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config # required for finding MySQl + ] + ++ lib.optional pythonSupport python3Packages.python + ++ lib.optional ( + pythonSupport && stdenv.buildPlatform == stdenv.hostPlatform + ) python3Packages.pythonImportsCheckHook; buildInputs = [ + libLAS + libgeotiff + laszip_2 + gdal + pdal + alembic + imath + c-blosc + unixODBC + postgresql + libmysqlclient + ffmpeg + opencascade-occt + fontconfig + openturns + libarchive + libGL + vtkPackages.openvdb + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libXfixes + libXrender + libXcursor + ] + ++ lib.optional (!(isNull qtPackages)) qtPackages.qttools + ++ lib.optional mpiSupport mpi + ++ lib.optional pythonSupport tk; + + # propagated by vtk-config.cmake + propagatedBuildInputs = [ + eigen + boost + verdict + double-conversion + freetype + lz4 + xz + zlib + expat + exprtk + pugixml + jsoncpp + libxml2 + utf8cpp + nlohmann_json + libjpeg libpng libtiff + proj + sqlite + libogg + libharu + libtheora + cli11 + openslide + vtkPackages.hdf5 + vtkPackages.cgns + vtkPackages.adios2 + vtkPackages.netcdf + vtkPackages.catalyst + vtkPackages.viskores + vtkPackages.tbb ] - ++ optionals enableQt [ - (qtEnv "qvtk-qt-env" [ - qtx11extras - qttools - qtdeclarative - ]) + ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp ] - ++ optionals stdenv.hostPlatform.isLinux [ - libGLU - xorgproto - libXt - ] - ++ optionals enablePython [ - python - ]; - propagatedBuildInputs = optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 - libGL + gl2ps + ] + # create meta package providing dist-info for python3Pacakges.vtk that common cmake build does not do + ++ lib.optionals pythonSupport [ + (python3Packages.mkPythonMetaPackage { + inherit (finalAttrs) pname version meta; + dependencies = + with python3Packages; + [ + numpy + wslink + matplotlib + ] + ++ lib.optional mpiSupport (mpi4py.override { inherit mpi; }); + }) ]; - # see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254 - patches = map fetchpatch patchesToFetch; - - # GCC 13: error: 'int64_t' in namespace 'std' does not name a type - postPatch = '' - sed '1i#include ' \ - -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \ - -i IO/Image/vtkSEPReader.h - '' - + optionalString stdenv.hostPlatform.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + # wrapper script calls qmlplugindump, crashes due to lack of minimal platform plugin + # Could not find the Qt platform plugin "minimal" in "" + preConfigure = lib.optionalString (qtVersion == "5") '' + export QT_PLUGIN_PATH=${lib.getBin qt5.qtbase}/${qt5.qtbase.qtPluginPrefix} ''; + env = { + CMAKE_PREFIX_PATH = "${lib.getDev openvdb}/lib/cmake/OpenVDB"; + NIX_LDFLAGS = "-L${lib.getLib libmysqlclient}/lib/mariadb"; + }; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + + # vtk common configure options + (lib.cmakeBool "VTK_DISPATCH_SOA_ARRAYS" true) + (lib.cmakeBool "VTK_ENABLE_CATALYST" true) + (lib.cmakeBool "VTK_WRAP_SERIALIZATION" true) + (lib.cmakeBool "VTK_BUILD_ALL_MODULES" true) + (lib.cmakeBool "VTK_VERSIONED_INSTALL" false) + (lib.cmakeBool "VTK_SMP_ENABLE_OPENMP" true) + (lib.cmakeFeature "VTK_SMP_IMPLEMENTATION_TYPE" "TBB") + + # use system packages if possible + (lib.cmakeBool "VTK_USE_EXTERNAL" true) + (lib.cmakeBool "VTK_MODULE_USE_EXTERNAL_VTK_fast_float" false) # required version incompatible + (lib.cmakeBool "VTK_MODULE_USE_EXTERNAL_VTK_pegtl" false) # required version incompatible + (lib.cmakeBool "VTK_MODULE_USE_EXTERNAL_VTK_ioss" false) # missing in nixpkgs + (lib.cmakeBool "VTK_MODULE_USE_EXTERNAL_VTK_token" false) # missing in nixpkgs + (lib.cmakeBool "VTK_MODULE_USE_EXTERNAL_VTK_fmt" false) # prefer vendored fmt + (lib.cmakeBool "VTK_MODULE_USE_EXTERNAL_VTK_scn" false) # missing in nixpkgs + (lib.cmakeBool "VTK_MODULE_USE_EXTERNAL_VTK_gl2ps" stdenv.hostPlatform.isLinux) # external gl2ps causes failure linking to macOS OpenGL.framework + + # Rendering + (vtkBool "VTK_MODULE_ENABLE_VTK_RenderingRayTracing" false) # ospray + (vtkBool "VTK_MODULE_ENABLE_VTK_RenderingOpenXR" false) # openxr + (vtkBool "VTK_MODULE_ENABLE_VTK_RenderingOpenVR" false) # openvr + (vtkBool "VTK_MODULE_ENABLE_VTK_RenderingAnari" false) # anari + + # qtSupport + (vtkBool "VTK_GROUP_ENABLE_Qt" (!(isNull qtPackages))) + (lib.cmakeFeature "VTK_QT_VERSION" "Auto") # will search for Qt6 first + + # pythonSupport + (lib.cmakeBool "VTK_USE_TK" pythonSupport) + (vtkBool "VTK_GROUP_ENABLE_Tk" pythonSupport) + (lib.cmakeBool "VTK_WRAP_PYTHON" pythonSupport) + (lib.cmakeBool "VTK_BUILD_PYI_FILES" pythonSupport) + (lib.cmakeFeature "VTK_PYTHON_VERSION" "3") + + # mpiSupport + (lib.cmakeBool "VTK_USE_MPI" mpiSupport) + (vtkBool "VTK_GROUP_ENABLE_MPI" mpiSupport) + ]; + + # byte-compile python modules since the CMake build does not do it + postInstall = lib.optionalString pythonSupport '' + python -m compileall -s $out $out/${python3Packages.python.sitePackages} + ''; + + pythonImportsCheck = [ "vtk" ]; + dontWrapQtApps = true; - # Shared libraries don't work, because of rpath troubles with the current - # nixpkgs cmake approach. It wants to call a binary at build time, just - # built and requiring one of the shared objects. - # At least, we use -fPIC for other packages to be able to use this in shared - # objects. - cmakeFlags = [ - "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC" - "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON" - "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1" - "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - "-DOPENGL_INCLUDE_DIR=${lib.getInclude libGL}/include" - (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl) - ] - ++ [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_BINDIR=bin" - "-DVTK_VERSIONED_INSTALL=OFF" - ] - ++ optionals enableQt [ - "-DVTK_GROUP_ENABLE_Qt:STRING=YES" - ] - ++ optionals enablePython [ - "-DVTK_WRAP_PYTHON:BOOL=ON" - "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" - ]; + postFixup = + # Remove thirdparty find module that have been provided in nixpkgs. + '' + rm -rf $out/lib/cmake/vtk/patches + rm $out/lib/cmake/vtk/Find{EXPAT,Freetype,utf8cpp,LibXml2,FontConfig}.cmake + '' + # libvtkglad.so will find and load libGL.so at runtime. + + lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf --add-rpath ${lib.getLib libGL}/lib $out/lib/libvtkglad.so + ''; - env = { - # Lots of warnings in vendored code… - NIX_CFLAGS_COMPILE = - if stdenv.cc.isClang then - "-Wno-error=incompatible-function-pointer-types" - else - "-Wno-error=incompatible-pointer-types"; + passthru = { + inherit + pythonSupport + mpiSupport + ; + + vtkPackages = vtkPackages.overrideScope ( + final: prev: { + vtk = finalAttrs.finalPackage; + } + ); + + tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "VTK" ]; + + package = finalAttrs.finalPackage; + + nativeBuildInputs = lib.optionals (!(isNull qtPackages)) [ + qtPackages.qttools + qtPackages.wrapQtAppsHook + ]; + }; + }; }; - postInstall = optionalString enablePython '' - substitute \ - ${./vtk.egg-info} \ - $out/${python.sitePackages}/vtk-${version}.egg-info \ - --subst-var-by VTK_VER "${version}" - ''; + requiredSystemFeatures = [ "big-parallel" ]; - meta = with lib; { + meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ - tfmoraes - ]; - platforms = platforms.unix; - badPlatforms = optionals enableEgl platforms.darwin; + changelog = "https://docs.vtk.org/en/latest/release_details/${lib.versions.majorMinor finalAttrs.version}.html"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ qbisi ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/vtk/vtk.egg-info b/pkgs/development/libraries/vtk/vtk.egg-info deleted file mode 100644 index c932fce54070..000000000000 --- a/pkgs/development/libraries/vtk/vtk.egg-info +++ /dev/null @@ -1,5 +0,0 @@ -Metadata-Version: 2.1 -Name: vtk -Version: @VTK_VER@ -Summary: VTK is an open-source toolkit for 3D computer graphics, image processing, and visualization -Platform: UNKNOWN diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ae05201e429..0e079cf71cbd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -666,6 +666,7 @@ mapAliases { ### F ### + f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18 factor-lang-scope = throw "'factor-lang-scope' has been renamed to 'factorPackages'"; # added 2024-11-28 fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 @@ -2121,6 +2122,9 @@ mapAliases { vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12 void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 + vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18 + vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18 + vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead." vtkWithQt5; # Added 2025-07-18 vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22 vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8aac496ba84..a20e94613b5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2112,8 +2112,6 @@ with pkgs; waylandSupport = !stdenv.hostPlatform.isDarwin; }; - f3d_egl = f3d.override { vtk_9 = vtk_9_egl; }; - fast-cli = nodePackages.fast-cli; ### TOOLS/TYPESETTING/TEX @@ -9635,17 +9633,19 @@ with pkgs; wine = wineWowPackages.staging; }; - vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv; + inherit (callPackage ../development/libraries/vtk { }) vtk_9_5; + + vtk = vtk_9_5; + + vtk-full = vtk.override { + qtVersion = "6"; + mpiSupport = true; + pythonSupport = true; }; - vtk_9_withQt5 = vtk_9.override { enableQt = true; }; + vtkWithQt5 = vtk.override { qtVersion = "5"; }; - vtk = vtk_9; - - vtk_9_egl = vtk_9.override { enableEgl = true; }; - - vtkWithQt5 = vtk_9_withQt5; + vtkWithQt6 = vtk.override { qtVersion = "6"; }; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 477ae39ee372..fc86c50cf5a4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -240,6 +240,7 @@ mapAliases ({ ev3dev2 = python-ev3dev2; # added 2023-06-19 evernote = throw "evernote is intended for use with Python 2.X"; eyeD3 = eyed3; # added 2024-01-03 + f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18 Fabric = fabric; # addedd 2023-02-19 face_recognition = face-recognition; # added 2022-10-15 face_recognition_models = face-recognition-models; # added 2022-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c334e2c6269..1a7e0d922c3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4870,13 +4870,6 @@ self: super: with self; { } ); - f3d_egl = toPythonModule ( - pkgs.f3d_egl.override { - withPythonBinding = true; - python3Packages = self; - } - ); - f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { }; f5-sdk = callPackage ../development/python-modules/f5-sdk { }; @@ -19389,12 +19382,7 @@ self: super: with self; { vtjp = callPackage ../development/python-modules/vtjp { }; - vtk = toPythonModule ( - pkgs.vtk_9.override { - inherit python; - enablePython = true; - } - ); + vtk = toPythonModule (pkgs.vtk-full.override { python3Packages = self; }); vttlib = callPackage ../development/python-modules/vttlib { }; From 6b8187ff255816cef743ae9012aa5dfa7213b3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Jul 2025 21:07:29 +0200 Subject: [PATCH 051/152] diffoscope: convert to pyproject = true --- pkgs/by-name/di/diffoscope/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index a3712886f8db..7d47b5b345c7 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -107,7 +107,7 @@ in python.pkgs.buildPythonApplication rec { pname = "diffoscope"; version = "302"; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; @@ -135,6 +135,8 @@ python.pkgs.buildPythonApplication rec { installShellFiles ]; + build-system = with python.pkgs; [ setuptools ]; + # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # From 884794e7769cbcc56531c7abbccc3b15a7aad9d3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 28 Jul 2025 15:09:21 +0200 Subject: [PATCH 052/152] nixVersions.latest: nix_2_29 -> nix_2_30 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 66cb191ed063..19e86764f900 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -231,7 +231,7 @@ lib.makeExtensible ( git = addTests "git" self.nixComponents_git.nix-everything; - latest = self.nix_2_29; + latest = self.nix_2_30; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, From 9b615580583a072b1fb8018fe92f622554afc11a Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 28 Jul 2025 21:25:41 +0800 Subject: [PATCH 053/152] python3Packages.pyvista: relax dependency of vtk --- pkgs/development/python-modules/pyvista/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 28717a49bfc1..f969cde19663 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -25,6 +25,9 @@ buildPythonPackage rec { hash = "sha256-9N1dF/zwjzoxX4xYIr5084M9pAk3YK3T48OUnCoC0NU="; }; + # remove this line once pyvista 0.46 is released + pythonRelaxDeps = [ "vtk" ]; + build-system = [ setuptools ]; dependencies = [ @@ -43,7 +46,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyvista" ]; meta = with lib; { - broken = pythonAtLeast "3.13"; # segfault description = "Easier Pythonic interface to VTK"; homepage = "https://pyvista.org"; changelog = "https://github.com/pyvista/pyvista/releases/tag/${src.tag}"; From 6977180caaf209250cf876812b4ed161828dc736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 13:35:42 +0000 Subject: [PATCH 054/152] snort: 3.9.1.0 -> 3.9.2.0 --- pkgs/by-name/sn/snort/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index 8ea13297dd28..cf46356b6a79 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.9.1.0"; + version = "3.9.2.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; tag = finalAttrs.version; - hash = "sha256-Ciseo0mYmgyfZB44zeudEst98XnM8E2vTG5J6snA3q0="; + hash = "sha256-LVAsCps5XLsj4acYWI42qdbvX6h9JTJJfM33FvVfWK0="; }; nativeBuildInputs = [ From 9093a19b61f317e812a124fa651cb58fc499245a Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 27 Jul 2025 23:59:07 -0700 Subject: [PATCH 055/152] rustc: un-mark broken for LLVM stdenv Essentially reverts ebbcb003f9082e54f68d02c5da596811e56a142d since 6814b2f572ca851a9142b2f2f34db0a14838ee49 fixes it. --- pkgs/development/compilers/rust/rustc.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 9b09dddad71b..5b6db40575c3 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -461,10 +461,5 @@ stdenv.mkDerivation (finalAttrs: { # If rustc can't target a platform, we also can't build rustc for # that platform. badPlatforms = rustc.badTargetPlatforms; - # Builds, but can't actually compile anything - # https://github.com/NixOS/nixpkgs/issues/311930 - # https://github.com/rust-lang/rust/issues/55120 - # https://github.com/rust-lang/rust/issues/82521 - broken = stdenv.hostPlatform.useLLVM; }; }) From 198535659e3bb8075c84207fbefe6368840f18ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 15:06:22 +0000 Subject: [PATCH 056/152] harper: 0.52.0 -> 0.53.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 09bd65f65d25..9adaa9c4f6a1 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-Mwgdombfc01Ss8Sy/pMwHNWeI1lxC1riFql9FtqaBmY="; + hash = "sha256-huAwuUiSaKaw0689AmYq0/usEq2p+cX73Oy5O0CaCVM="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-aOajrh2NZShP1vXSUEDzY1ULTeMs8dY+BDIspCi1BfY="; + cargoHash = "sha256-4ppwbOv+8a4d9v6zbIFkhNWp1s3yMTfX1oNCYAccB3w="; passthru.updateScript = nix-update-script { }; From f2e2e99ef4aa5d2a70ca12cd8bf27d2e91d01b83 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 28 Jul 2025 17:22:09 +0200 Subject: [PATCH 057/152] ripasso-cursive: switch to `finalAttrs` pattern --- pkgs/by-name/ri/ripasso-cursive/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 76ff51e97c61..482d62fdfc58 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -19,14 +19,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { version = "0.7.0"; pname = "ripasso-cursive"; src = fetchFromGitHub { owner = "cortex"; repo = "ripasso"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; }; @@ -81,4 +81,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ sgo ]; platforms = lib.platforms.unix; }; -} +}) From 63eee198a63516dd2dc09c6a10664777340d206b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 28 Jul 2025 17:24:14 +0200 Subject: [PATCH 058/152] ripasso-cursive: use `writableTmpDirAsHomeHook` --- pkgs/by-name/ri/ripasso-cursive/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 482d62fdfc58..b3ea8c3a235c 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -9,6 +9,7 @@ installShellFiles, pkg-config, python3, + writableTmpDirAsHomeHook, # buildInputs libgpg-error, @@ -44,6 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config python3 rustPlatform.bindgenHook + writableTmpDirAsHomeHook ]; buildInputs = [ @@ -54,10 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { xorg.libxcb ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Fails in the darwin sandbox with: # Attempted to create a NULL object. From b45665ef20c4101a4d5f0a9b95bee9e14a213b25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 16:22:55 +0000 Subject: [PATCH 059/152] tui-journal: 0.16.0 -> 0.16.1 --- pkgs/by-name/tu/tui-journal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 6311b8b6a84f..c2014418fbae 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-hZpS0r3ky18XtDj4x8croKAZ+css1NmVy98NUuhtR/s="; + hash = "sha256-crrh7lV5ZMKaxsrFmhXsUgBMbN5nmbf8wQ6croTqUKI="; }; - cargoHash = "sha256-XsrHNzTiYWqTDV9+soY5oC4UoE5OBC7Ow7qir2dKV/A="; + cargoHash = "sha256-PmQDLGOXvI0OJ+gMsYa/XLc0WgSH6++23X/b1+iU3JQ="; nativeBuildInputs = [ pkg-config From acaa5e5a195e8188001e485dbc9a16175c07872a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 16:54:00 +0000 Subject: [PATCH 060/152] thunderbird-esr-bin-unwrapped: 140.0.1esr -> 140.1.0esr --- .../thunderbird-bin/release_esr_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index ea56b90297f6..f089cd1c1bcc 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,1193 +1,1193 @@ { - version = "140.0.1esr"; + version = "140.1.0esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/af/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/af/thunderbird-140.1.0esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "06f915e75f3a2b5854ca5291b2996c6829044ba5c951b5e0589afba0cee3165c"; + sha256 = "0949364bab751990fc5d02354a0352c8c919f8606594bd0302f30ae1fb931cd1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ar/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ar/thunderbird-140.1.0esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f9e977ea29c2323477e689dd245fea48b6986bbfc5cb5bf1c11ff1816129a6ec"; + sha256 = "5a3ecef8ffcabbbc60123ba3745b1b1fcf1d37af68b7132ab6e85b8e7dc34c07"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ast/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ast/thunderbird-140.1.0esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bfb135159eace51cebca93a67a04b26bb8193ca74380bf91925e44b8f5f35062"; + sha256 = "90bdf01ef3ca297f83e94829f8357a899c036e8c8bad32d1ab81730e14c8539c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/be/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/be/thunderbird-140.1.0esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "87e4805cb4d75c099933fe130b2e9e49cce6d4ffcae96a5db4e7063f15015c0e"; + sha256 = "c8db05ebd470c2850519cc69c6b6aec72e1e1a9586807ef73e6e4522064f669f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/bg/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/bg/thunderbird-140.1.0esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "73070f8fd509855e168f9017e0a055c2fc82491672defc5254628493739bc172"; + sha256 = "f0aef122695b374b8d5d9aa645510e829c3980305892121a11ed35e9646fd08b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/br/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/br/thunderbird-140.1.0esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0bc1e74090f65343bb02693192dc2e089bbf794f24779260ec1e9b0b38bfaca2"; + sha256 = "b63fe552f4dd1696b0ded0be712d3277d297ab884321229bac0aff578dfb0b8a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ca/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ca/thunderbird-140.1.0esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "165c01a14e5cb97ef930061c91b35359de51f34099726d4e41cf36daa01997c7"; + sha256 = "19247cbb6f6994fb1c97cafdadcbec72eb3c3c9e4cbc848ae2ba3ed1227c0a9d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cak/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cak/thunderbird-140.1.0esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fe15b4171d98d5c4efc5fb3ec1900acb1a2b3e5d95352b16f6447845fe346d7b"; + sha256 = "8c029d10efac92d8b8482770cebf6347199c6dd5a4f96fd2e8cf29a32a6a6cf0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cs/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cs/thunderbird-140.1.0esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6d352b072fc5c8a30c1bea470ece25f02e4e28819252beb3315d5a25310050a8"; + sha256 = "be900224dc75df6ce962daabadcc0e9efc170baead516b746af5ed7e98337190"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/cy/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/cy/thunderbird-140.1.0esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "9850cab77ccb9f190e891d54b41870027f954fe0d7181125ed561fb8bd8a25c6"; + sha256 = "f2fc6503cc88c1719ba1524dd031d05aac225bee7f6785f239530ce5192be322"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/da/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/da/thunderbird-140.1.0esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b5d83580e2a47f47294eb1c44b99e76ff3197a452c0bf0d6b43aa0b8a9304cec"; + sha256 = "55d06c3117b26098f17edda9deb84706ba38bd4a6c22adc7270bf6e431a15949"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/de/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/de/thunderbird-140.1.0esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d2350a93bb8dee76c66b803938f03f26e090a6f0a8479cd3caaa6ce53cd971ed"; + sha256 = "83125097e4c240b3a230d4f1915deaba9e356509eb3f100f8deba7d352d32e20"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/dsb/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/dsb/thunderbird-140.1.0esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "22bd1b90d9f66935c36bd401fb26f06e4e9058efffd57b11497b562c64c33232"; + sha256 = "528346d87600d87f25aadfc22a568fb6b5d80ed879905f623fa778daf4f40430"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/el/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/el/thunderbird-140.1.0esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d76b19a19955894a8c5e41c141462ee461777dc835f3f0521b0002b72a5e69ee"; + sha256 = "2cb9aea9ed1830294506c3622ade8af3f368405f91bd15157a6149548e8ed77d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-CA/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-CA/thunderbird-140.1.0esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9640f19005a7edab422d8f6ae8f30ff5972e7ba4d2ea3a4e33327af179ac3bb8"; + sha256 = "9e213ae92ddd13118e3b17b9ec55b078e4386d14b4c003af6a4ec33bcaf1eb53"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-GB/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-GB/thunderbird-140.1.0esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "aad201099bfc714adf49a2c48f6014d032aa0b769a5fc36a79b1c69d45e7214a"; + sha256 = "9d81bc9585e787ccc86a49793a8d68763527685472974fb6bd48d8af849982d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/en-US/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/en-US/thunderbird-140.1.0esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "80cf82ad997397830e740dd9d9434251339ac070330bf733117b465b659151f3"; + sha256 = "94a7e55b8b072150d7195b3fd83a1dfb92c4cc459f4f1584025cdf55fdcbb9b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-AR/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-AR/thunderbird-140.1.0esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d08a3bcd79614df769d394ab26adca2aa2af9555b81cc21907e5427a06688998"; + sha256 = "bb7636ef599eec8055030092faac2edfd5c54ad1b50e3520d93b7b379e138b8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-ES/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-ES/thunderbird-140.1.0esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e5c869674940aa0d250709e3e7f863c63fc16441fb3d42b2eb4748700407c1c9"; + sha256 = "810b48fa291c0d19c1a0d3a3cf1b4edf646cd7f5f7e4bf6712a414262dac45fa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/es-MX/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/es-MX/thunderbird-140.1.0esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "56b7a598b06101368f30ff3e6af79f6a14fdeb42eb2f4480c4c01cdf586528e3"; + sha256 = "cce7a9edfb6ff43376c328c7013ef50c2da23b8ab91e6c61e39100089259b9e7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/et/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/et/thunderbird-140.1.0esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c15efe7a3ee01ac382647f6fae52cda012e8164246eabe9ce70e099d3984de2d"; + sha256 = "77bb2e7ee0201c546fba6e06008aada446c5c69d1afe8e459845e1fb49cde5dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/eu/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/eu/thunderbird-140.1.0esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6c6731ad5e8fb00495029d281063bb2d66f7a76fe4ff827019c2647ffe8da223"; + sha256 = "96c6423c9621b0cf1e701067ff0e03f9039fca140fe96da98f025a0256142324"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fi/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fi/thunderbird-140.1.0esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d9f7a2c19e1982a043b8cdcdfff935541810744fda6128a2049bb1594dedfbae"; + sha256 = "b882e094df72799ad134687f71f3c90a367413664c91005b7da1ec408d8a953f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fr/thunderbird-140.1.0esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "369acae933d265958e9d5fcfdba0acffa7bd439ec37e7b5fb374653f2ad04522"; + sha256 = "ae57f0fd421c0e21f274c56f7a1ef4ab28a2721a48c1a19394ec6a19b937e0f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/fy-NL/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/fy-NL/thunderbird-140.1.0esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "046e818ec7a8beeaaaf09446f8d8696dd76ac2e8b77c81a64e5c1dac55253fef"; + sha256 = "5a9a57ff7688a83cabbff454058907ebda160b744766878b097de7622bf4e565"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ga-IE/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ga-IE/thunderbird-140.1.0esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "37c56eb7e5b5d954ff410195e215c2c0027a3bbec9a48a33385ec11d77cef8f1"; + sha256 = "39143e0a585cd77adb7d3389c3f0bfda2201461f591612712af992bf9c803b3c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gd/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gd/thunderbird-140.1.0esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "79f15b5de5d952bd8bcafa04bad730dcff9c9acbdec4ebf0bdadb8cffe6822f5"; + sha256 = "5628e78b0ebb53b1d3c176c0f73561a388c040e96f22ad50032ccd40033f9385"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/gl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/gl/thunderbird-140.1.0esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "91ff57794a1c65c972568e15a1f9052b191ed326587043988199a4fa725fcd5e"; + sha256 = "312750092889dc23ea3f4bc96e17096984523ac22317b119dff93ce3aa3a5a0b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/he/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/he/thunderbird-140.1.0esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "3cbed1bb7a7b90badf41f54babc59303e8a3d63eb891a19a0e6c93199798404e"; + sha256 = "12414b9fe4173bc6f36b6bd806fde3155031c09cb3e04b278985610a05fe6420"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hr/thunderbird-140.1.0esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5635413f7f86d8bf5ccec7ef98b5a72e724b96e41d7079851e1bac2cf57d8062"; + sha256 = "52438992ef99f56aa7bbf1b9d9e57c430bcb217cf5f2f9513bc0822da3f6ac8e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hsb/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hsb/thunderbird-140.1.0esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6aba8d1ebfa2fb886477a5250f4ce16bb216f7c475ab56faa1bcc2598e3e360c"; + sha256 = "b69f099a5849568965cf8b6e2104c367327b376f68772e3b3aac4d1687b733aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hu/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hu/thunderbird-140.1.0esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "97274a67e2632130a081f25836068ed1d629b0e24ef65a86b85e2f1dc50314a3"; + sha256 = "01436c7fbd357cb222b573722bba0515fbfb91e6784f414d22b0a575ef57b5b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/hy-AM/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/hy-AM/thunderbird-140.1.0esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b3cc90a46dd5a0604ecc6dba3129dc999f6ccdafbf559dc6abad476b9f644ff6"; + sha256 = "4f8ed268403590398836fa2410fdb07217e8065e7ab908e5c692d37587bce82c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/id/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/id/thunderbird-140.1.0esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "015e2ac23a0129ee0bb4f8c078f6d604361b2b08cecb54e0ecd98e82f8c87606"; + sha256 = "8dd3c99050f1da269fc90ee70723443c52b2fdc8730c959541dc84c3caa55ca8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/is/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/is/thunderbird-140.1.0esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5d74a5b1e80540e3bdc031752ba0f16257e46c196ba20f34575c900cc741e184"; + sha256 = "8ad1ec0dbbc85dfdf76ec593bdd377b8bc74c70ba0692736c69348365cba06a2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/it/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/it/thunderbird-140.1.0esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "36a257fe9b13ac7c95e64c2e16610e50e3faccce3d2e26d1b0c509d898360507"; + sha256 = "51672db7ad0976a9964bdbaf64a10e749a972b813c48512c342160cf48633502"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ja/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ja/thunderbird-140.1.0esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ffa7cd70028112a691066b8dee3903a0404bf57c02751d687ef1bc8e906169f4"; + sha256 = "50fb4726f63397bfe15c7c8d3272b35fc6190fedfddb5b43b761c70bf22433d1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ka/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ka/thunderbird-140.1.0esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2c70ef901bb85e4355a4a86cde4dc4dc3822f198fc39e9abfc47393e9909d813"; + sha256 = "57acefd6fecf702ac89d0f35c852578dcf8e8d44bc357f403e408cb634e3776e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kab/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kab/thunderbird-140.1.0esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ed4cf54f5673e2ad33942bb2125bed7aece909ec31d6ad9986ed584708b618ea"; + sha256 = "803ba9ca63fff30fe3287565156678936b677d7afb45f7d59c63f012f53282ba"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/kk/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/kk/thunderbird-140.1.0esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "5f5381e871f17921d4978bbce055239bd2358da555a5d4e897b57bc5a47cc2de"; + sha256 = "447396b9d5a4ce9b110d9dad0ebe8357cfdfee65258911ac6192b6c3e7970946"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ko/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ko/thunderbird-140.1.0esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "34c1c3271dea3484d7c30bf61b2a5c5c6229dcb36f36a7aed48bd9264012bd77"; + sha256 = "468d1eb467665b84915ca3c57689abc9cd62cda51afc61a7ed4d63b28748da47"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lt/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lt/thunderbird-140.1.0esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b5399800a2963d2971ad6b2af9d6120c4360dd036bd615a8d9c6a49d6eb4287a"; + sha256 = "87b5832b108358903736bfa0cfb013e295b72006c17b552590349261afc4565d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/lv/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/lv/thunderbird-140.1.0esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "0d52d2b6fc148acba6e539af0b0341567cfcae88759778674838a964bac65755"; + sha256 = "14cf11465692c14239a0076752010b7ff54d302493f5bfef58920ad1cbbde6fa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ms/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ms/thunderbird-140.1.0esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a6d87b019565474c1bae994ff194721d1e8c17edcf457b597480e0a8c499add0"; + sha256 = "2b0721f403a74f8be55005d12d94285eaf91987ce5825226229d1b46d3253487"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nb-NO/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nb-NO/thunderbird-140.1.0esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "83e87a53ac6ffca086a900d019a5665e956e80488f46696d61f81d895a80172d"; + sha256 = "ad58811895a5d76e06747c042f71c73985316be4461f21c72508b571281d0aae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nl/thunderbird-140.1.0esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "eac0552dc429559d307b10e5013adcf1f1d0d1d0d71a97f027feabe71d29d76e"; + sha256 = "31dc88fdddd5c5d1e57eb4af966e3422dae1576dcc02c37ef8bff1c8537eef85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/nn-NO/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/nn-NO/thunderbird-140.1.0esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6b3ed73a3d497f50b3fdf7c3f9b7152b9714763946626bea650066fd53145804"; + sha256 = "9f9a0c43cccd2deca4427202b65a950eb6e36d9023cad37db8aa6ab69c5bb0db"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pa-IN/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pa-IN/thunderbird-140.1.0esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "0cd1f8377484fb87e63e73f449dd619d840b2cc7b0565e68b14603f6bda74131"; + sha256 = "98c87b5a49884e4672b82b2ef8df347437dd73ff5c4f8b69a4449b34c0c79862"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pl/thunderbird-140.1.0esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4931970272d598f0467ccfd3c657d69d10a001d24c0121dc499933adba3d803f"; + sha256 = "aa6a633d3311ef1973a0150244ebc57bc6503e8ac7993aa351633d3af5f1b98d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-BR/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-BR/thunderbird-140.1.0esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "657d43ddbff163876149d16fd5bd5e0533f0d62a173b23a98b7460cdae97b43b"; + sha256 = "67d348c101be5f0e94420f754e4461c9df7f01ac530363c80805cd5046cd5deb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/pt-PT/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/pt-PT/thunderbird-140.1.0esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "bf302b47797df158b7ca39ed1742449fbcfc11ad91142f4ffb6d6df07a1dcf00"; + sha256 = "22e6c640ae2bc2b5051a0859160b2352a066b82cef47d1552581a526e26c134d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/rm/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/rm/thunderbird-140.1.0esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "983c2a44a00438316599d8b209a58d321203d85744b1988aeb291801f5b42cfe"; + sha256 = "38336e796e173197c97d25ff9d929937ab7970a8b45fa69194354877b29bbef5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ro/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ro/thunderbird-140.1.0esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "da1382badfe2064384e5b2d510188821e75de8395ec01a3ddc59498337af4219"; + sha256 = "58fb4e078e97b5a8429ba5fbc2b1d519d222acc45684688d0007225647a293b2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/ru/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/ru/thunderbird-140.1.0esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6bafdaf08f950c287abc3db13293066f9a3a5f98db8b4672b68d78ad672c4e48"; + sha256 = "3c9a8de3c90f5c15d80a408d91dfa3cb32fb6cee4ba0361459322e75edcdab39"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sk/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sk/thunderbird-140.1.0esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2b6c7d5eb509fe7e5612845fe2c45ee5d2ef1d2b08dc0480318745f8a1cf4ad8"; + sha256 = "2a3e892f97bc8510c259dd321cfaf56278cffbbb2c0384708be4c39c1ffd3655"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sl/thunderbird-140.1.0esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "34f4ae90f269199af655b1b2a1952ae2f68daa42de3f2b25c4ab82f75ed4149c"; + sha256 = "fe6924dcaa38c6c2c0d1cd15e7a5d1377cb84d0fc012a2f5287df293e1af082b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sq/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sq/thunderbird-140.1.0esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "13a4006da9be23a80dc5d6ec89557f2b020995f2ffc632f4b6e1c7f8dff45f23"; + sha256 = "dcbdf0dc98cb36014af7aa6eed992a0f59aa675187aca18654087ec89af567bc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sr/thunderbird-140.1.0esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "415878b0a7f4c2502fac2ece43d9d49337b503614e7d95e260bd959fd165bbec"; + sha256 = "4c1fb26634504c25f90d9f7ef068fe24a6b45e74b71fc0f1ea286d76a9a6a237"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/sv-SE/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/sv-SE/thunderbird-140.1.0esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6fd2dab46a7b9714b7f0610e200998a7fd200ff4f001dcae730fd91d683da2e5"; + sha256 = "bb5050a394dd02fdbf2ec66a81b0743df1fd222ff4d3739ac15783e55a253076"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/th/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/th/thunderbird-140.1.0esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "8569643967a75a6b1652d59a2123b51a01dd14f362d824b1729c2bb46c6ef016"; + sha256 = "45ce34a41fd4c791d0908e5cbce8c40dbd0cf6afe91092afc6b1220da4e7a622"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/tr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/tr/thunderbird-140.1.0esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a3b1b7c06217902d7db6564ae026aadf834cbb6c5c5fd05666db2bca31b2cc9c"; + sha256 = "517376a8eb347f46122ed145fd3ea857f54848055777dad9fa1e0747086300c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uk/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uk/thunderbird-140.1.0esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "94c217a00eb176a590529b25acc57202dfe1062d8b2f265756848a14789ff76a"; + sha256 = "ac4b3d55d37d372accc01ff898aeb9b63567c896ca26cf11ab3e6a606b4be502"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/uz/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/uz/thunderbird-140.1.0esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9f09d983e072cccf4368fcf9211ad15c0fdffe3d90b80dca7ecd4548d5241c94"; + sha256 = "c6dd141c2a3287c67d9a8d0291e229b0959c5d60fc2a1f364e27a4cca5b5e9e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/vi/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/vi/thunderbird-140.1.0esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c9e71aec1ef7189742c6ea7de163ccdc000d67b5bbe9eb8e3154775b4516a283"; + sha256 = "10c501d1f7c7b19419c93e96e1d16b979a716a413e95dc564f716d3a17e4e57c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-CN/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-CN/thunderbird-140.1.0esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "6a8e5d7a11bf0a590bbaa3ccfb4ca5fd05eb8d681a3bf954b3cac76d02ae30a6"; + sha256 = "4c03277dffdb5fad1746a25084a1acd1c5598385b7637a814cbd50a451367a0c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-x86_64/zh-TW/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-x86_64/zh-TW/thunderbird-140.1.0esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dd48a7ab83a0dac285d7bd3d5f933b14d5373957076d55d987562c05a05a6690"; + sha256 = "4caa008fd9db5a8857235dec756b65e699cae7fab055891fb18815bae3208097"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/af/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/af/thunderbird-140.1.0esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "143e125ad9ed1ca18bba8fab8297164715117287681f2cd2ea1b6ce554af90a0"; + sha256 = "5f4b14c25933ec409fb3d9572e014dac2684e5ca22453154906d51a3eae9c40c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ar/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ar/thunderbird-140.1.0esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "2d76124a2fe46ada9654195f4b2d496e7a26b703ed5fa5343bf85dc5942db033"; + sha256 = "6b750f6fc7cfbbf1d31c9abba2eb6cf0e5dea5b453e00321ecdf2cbf37003580"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ast/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ast/thunderbird-140.1.0esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "dae431fb2da2f9cc4d7be363251c59475e3fb1701f0568fb84dd0241d1f41989"; + sha256 = "0ece544cfd1ef3ed853292a301571617ef2713997f79ef4085fecfdfb3fcb574"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/be/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/be/thunderbird-140.1.0esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "110e8a26ab3f753684587afddd21edaef554fa4b7d72147f86ae185eeed37a17"; + sha256 = "8445c73f54a103d9877e88bc6e84488519a2b8505e079c13f3b76debe68dce63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/bg/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/bg/thunderbird-140.1.0esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "3e12c93255d5baa3fe27688fa6c0fd2dcf7995745be02ddf8a5c400b258e216e"; + sha256 = "47761fd0d34f933752805e5cc9dc3f7442a3cce39935b286f5fcd0ecab843fad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/br/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/br/thunderbird-140.1.0esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "49c155f4c024df6481ee659e616a69754265ae1edc556ef1965d0de91f1e4443"; + sha256 = "d020d8b0ab7d8c074ce039ed74ef99e9165019fd4133411c6cf3f265bcc307a1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ca/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ca/thunderbird-140.1.0esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "8cf4c59c12310f50b99c8df1a2ee75f4de7d40e199432e6f072966d07e63367b"; + sha256 = "7c180bb8e449d82a572c278e454ab7a1f5d46df2da2c24bffedd688b8bfeb1d9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cak/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cak/thunderbird-140.1.0esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "b88442ccb6d83e76dca13a8c8cafa23fcd3a7e08d5ff22f10a455c4b3cca2e80"; + sha256 = "c9b24186d006890348c41ede9d2dfce402ccbc2cb2ba5185a238fb59d1197c6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cs/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cs/thunderbird-140.1.0esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "6a77983dc65c55f2b01a6ed2d748f98c62a7a65e0e084476718705a9e139c94a"; + sha256 = "bbcca13731b5c39176703339b60085660bc16e282cff3741fbfa413f06cafc15"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/cy/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/cy/thunderbird-140.1.0esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "5829ab3e5ea00e1e4a6e4eb99c48ce4aa1ba2ab57804ac0d3dab532c340ff5a3"; + sha256 = "583351d8a8f03abc2d3fe3cac92f7ddf28c3fc5d718970361a168d223e46574a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/da/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/da/thunderbird-140.1.0esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "9d7a91f3571d90ac5117d449f6f423ef055034407607a2d44e51bc649c2f2bdc"; + sha256 = "27952731923609b9572b57376dc8da178dcda0b79a40bae31602a17da34ae9ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/de/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/de/thunderbird-140.1.0esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "c79adc6a1524a2fcfd0d98aafb6a7428be0be24418ea1a607f36756a040d1594"; + sha256 = "1800c1ca5215096e32a7df7a24186658630a57b493e9a44e4f74bbadb40aaaae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/dsb/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/dsb/thunderbird-140.1.0esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "7696c03fd836ba11be4f0229f43d1400ca56e6b527bd522a89ac5638f9c16bb3"; + sha256 = "eedd3e40313857803179ca96b748a533d7065cf259f9d124c780269a61629918"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/el/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/el/thunderbird-140.1.0esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "3c52933ceda31577743d01f2aaca2439ffc6662d0448f2d6945e0ce88aff5ee9"; + sha256 = "84de3cd0f556c594ebe6e10dd899b366715f7000f9e73353c24514b70b35bd8e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-CA/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-CA/thunderbird-140.1.0esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "46fdc08166c617771130b51b82ccb231a23b5e962690c3a1ea91c42227269b4b"; + sha256 = "92e186709974e6d8bdc60d0045c25cb2bd7bdaab3ccdcb3421c30fa2e26dfc16"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-GB/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-GB/thunderbird-140.1.0esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "192b445f7bd7188d931693a68dd21e39f27e57267f8b148ef8c2b5f88597b53d"; + sha256 = "7d1d61600099a211b44a2fe4b7c3995ca5965a501b1ae3326b513dbc26595072"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/en-US/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/en-US/thunderbird-140.1.0esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d7bdc8f114f7024cafc1a771afc21d90b14b446e9f79eebadaa647ca4d138088"; + sha256 = "4623dcd577de6a7bf1c27d62511577a92fb385fff78d1b6e3b8833ff33cd76e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-AR/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-AR/thunderbird-140.1.0esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3ad413761708129505305bb1f066c88725871202df0715dc882c8992829e7205"; + sha256 = "850acfc9a555c1f2804e97da30f49ef0d9fa599cb105607576a9667f2b21e5ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-ES/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-ES/thunderbird-140.1.0esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "be4931a361054890dce062f72828a579d6021b0cac71bdd65cc02d3e53377b8b"; + sha256 = "d7a020c404ac8410dd0e3232dd5b3e86678cffd6daf7f0426257450530b3e454"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/es-MX/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/es-MX/thunderbird-140.1.0esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "4d53d2eaec30078c36c38b7d623abb57110f574f2a094371d6bf0a3da5264d4a"; + sha256 = "6061acc4ef2d31807b05c040a6fcc6ff7ee4163fe2b7f1c2b2c328ddddf7f49a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/et/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/et/thunderbird-140.1.0esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "b385f7934ec821251128ff699bc665b8db7736c8be9b59b2945ce52297748039"; + sha256 = "7d89492e8a4163f5a2ed0af2076dfe8cfbb61a0d520c857852d6b2a16a4c5d63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/eu/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/eu/thunderbird-140.1.0esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "908cb758760d5a1de57295846b2d31ef2dc6c5e1da9eea3ed1ee0c14fdb6908e"; + sha256 = "a7d9a8587dbd66998640f4acf14ca68804007abc974beb6ce41f301e2a3a80bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fi/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fi/thunderbird-140.1.0esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "f6c4df7c3d51bedde4ad2cc78285459a1dd720f6d7fdeb1f27008e5fee2cfa0c"; + sha256 = "b73eece96944a0a2f1b09ba60669e38228fe70a936052c4c1c65373a6348bdfc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fr/thunderbird-140.1.0esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "964513460ddd7931b633936e1c6f391b2c4abdedd631be4798ba78f20021fa8d"; + sha256 = "c5fd675249401d7fff4edf40b96359fbac733ab27001932e1adbb67f386d77d9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/fy-NL/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/fy-NL/thunderbird-140.1.0esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1b66630411b6f61df03ca4a798cdd685dff6555c9a18d4c804767308e20530a8"; + sha256 = "3f3c6b9114b3c41a543a9314a1157adb796480dec492c3db6445d93ca4cd111e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ga-IE/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ga-IE/thunderbird-140.1.0esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0b4a6a69b9c523370295750836a9a28a27d285e60c08915dfe7bf9523c655a15"; + sha256 = "f81b5f741586d19b9e501b26ec4f3a1e132a730d2368add86b25df10a152eabf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gd/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gd/thunderbird-140.1.0esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "1126f7ab5793e277395fdad38d13ae80dacff108c0fb69c4aefde63ffc75cd71"; + sha256 = "330524b234f42f3828362a31e7daafd021cef7abe800e3c5a12829d7f91b22eb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/gl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/gl/thunderbird-140.1.0esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "cd032ca7c57c616a442f40595a7d77879a44929ab7dccca331b536215a896c3b"; + sha256 = "2be9e30b796eba8a282abbd8cc94fc311f0a9d5501e7a30c6112ceccaaa67a58"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/he/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/he/thunderbird-140.1.0esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "3a17bece9f535d164af2c8da64df4291408b6e8a1ba31d8561ee3b559e43d148"; + sha256 = "3c47ebe0dd8597b126215fd19b491cc9aa88287f8626832f0ce2fd7dcd65790f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hr/thunderbird-140.1.0esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "d4452b7da20056aa6d628464824ff33c4ce07ce2955475b8c23cdc10dca41e6c"; + sha256 = "86d4e30f4079e7582bf14d01e83a91585095dd0b5fccd95e169a8496d720d8f4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hsb/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hsb/thunderbird-140.1.0esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "394c0368199eaaf12457797158362fbaef05847c8de20052d47df3b66f4be403"; + sha256 = "45b75eab27d8a74f5f7be211c7382612d37dcf9a9ad33d838648883b96a510bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hu/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hu/thunderbird-140.1.0esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "c7947f866700ecacdc75569ce906403d2c641bd70963bf1885aa78f1987e3a5f"; + sha256 = "c621ad7ff9a01e22cde05394a68ac4b54393bb58650b7763efe95617e0cd7242"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/hy-AM/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/hy-AM/thunderbird-140.1.0esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "971c420bdd12abfcdb04b776f68083bb9074c1b19e9d42db84b8172ad1188948"; + sha256 = "ec2afa8ac29bab5ff0c67fd1abfde2404db43c087ef860637ca0a933b2fef159"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/id/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/id/thunderbird-140.1.0esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "bc3d8f898c6470b31cf5633c04d2f582f42732f3fd5bde14fe0f6b38215f57fa"; + sha256 = "aa0a1398aca929c4a9f2bced462434e05ae5d0562c0fba833d16c0961e9a1150"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/is/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/is/thunderbird-140.1.0esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "623158002114770da3868e58a9c90d6e6cd8738ad2da0ebcb7b5b48c79e7d116"; + sha256 = "70ebc00f1bf1743c07abda9bf98df1c737753a27cd760b5d6a222a96b4043fcd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/it/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/it/thunderbird-140.1.0esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "729ff0a4999e13deef4f275939719931db868e89c87947e7f189395ed96c61ab"; + sha256 = "b23d8e005269f0ea3d4c97dca1fc21214265cf457ae2f8cba87db0cc60366302"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ja/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ja/thunderbird-140.1.0esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "a06d34c19b166da06de2c807710e36547f09702f29fa35d1a67cc41f5ff8cf7e"; + sha256 = "8fbe63e06fd43c465e7619a819fa14de7b6d50fd04c58f2f3dde90d62cbfe5c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ka/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ka/thunderbird-140.1.0esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "f67a7115bbfc19e9b41b7dabfe32fb62ecc20e5884c0b3e9b443351dae66c1c6"; + sha256 = "8c6ecc716720492d4c466129954cf3ec83ed9ea8cff062a38cdb4b0a1712a697"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kab/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kab/thunderbird-140.1.0esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "01d8c9170990e175cf2452a428dafea95f0fe77e0b73001d644ebcdfb164ea61"; + sha256 = "bf3c6d10f74e3c02f5a17e92835218c4bd3130a1262902953bef49e767179c2a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/kk/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/kk/thunderbird-140.1.0esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "885540419072b130288a05b7f7c199bb19a5fac31b6455e11a95f36fc3239c76"; + sha256 = "6da2e59a7cbd4e57f69e2a22b1bcd1afb502bfa10dd81c7b6190107c18bece02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ko/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ko/thunderbird-140.1.0esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "daf94b5f16730691736296457ca41d64d53fe93d910c72116db5393319b1b9d9"; + sha256 = "b96b273d2dbaa51180a8c308b72a564a967b2fb0dc08497fdf1ac71354c16c55"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lt/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lt/thunderbird-140.1.0esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "d2bf636a9ad18e093f645f401bdc9d4b9cc972f3b096bc136f5893a26fe9dec9"; + sha256 = "db3a83fe0de9072d81710a0b8c1db55086a5d93cb3a10bfee9ec92e484a8310b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/lv/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/lv/thunderbird-140.1.0esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "01f975e034eb580a7b754cc612a46814f6c54d85a8fe6193caf9f8df7028c2cd"; + sha256 = "e5aec4225d1390edc4d69d1a4f501eda93b6ca282f37e229d82461ecf42d1eb5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ms/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ms/thunderbird-140.1.0esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "38f637dd2de942b1f679421bfac608abf502cbc95f5dba921307dda860c38fd7"; + sha256 = "aaf32b80d7aa529ac7fa9aad46ad7cbd0c037f1cc6185f47b1a7ee4fd77bbcbf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nb-NO/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nb-NO/thunderbird-140.1.0esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2e6ad92a8cc928dc05386051a373076fe3228e94705e79d5a3b5acc7a71dbbaa"; + sha256 = "720568948fd135e9d28631fa726ce3975c1a2c40f6f82081b9fb7b2b726861ad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nl/thunderbird-140.1.0esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "7b3ff0bf8193e1d7624f9415e84e32a508a8a9d075a7ed44f0a818ff14bd86a8"; + sha256 = "dc1859071f8c0dc792adc4782c13d09a05524b300ab3727a3bddc84526264271"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/nn-NO/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/nn-NO/thunderbird-140.1.0esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "78a602eff2211f403e1805d3afb2e8acf017a3c81270b07810387d97b697227d"; + sha256 = "3efdaafa510c361ecf86ebe39b2ebf8cf43abeed88722021bdd1260e011c2257"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pa-IN/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pa-IN/thunderbird-140.1.0esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c83252f5d19c16a93e7e5017a2d1737d080d855f9fba011006f726828005e8dc"; + sha256 = "d7897851dc39898ad4a37c14cd972dc05f8fd9b86d9ccda941e796ae396992c3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pl/thunderbird-140.1.0esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "8b8aa69ddd5545aefd35cd15b6ee5d58306540ba72d347cef921fb12cf739249"; + sha256 = "39d97c41476c2d15e8c6ec0f965faa0b7b5119a052478809f3f3fe6c65813169"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-BR/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-BR/thunderbird-140.1.0esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "55f3c32096812e12dbe2b52c940b582f018a685c949f1e73bab9a0123ee56ec7"; + sha256 = "66118eeba5eed2de5cf39e98433d15f73ea3762560947d4f2c85eb7239cf5b7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/pt-PT/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/pt-PT/thunderbird-140.1.0esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8f6063ab557b81853bebc335181bed3271f10df0cc212986f850e8bb65fa7534"; + sha256 = "d66ffea15d43ca7f13b8d66f73e2ea25c16e1ad193f2ba3bdd1f59e5a1c3a65d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/rm/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/rm/thunderbird-140.1.0esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "99c2aeaec4b24f1b4622138196d2cb35fe32d4babe56557b5909331a262e6df2"; + sha256 = "bb483f454a245c6ccca2b50703f434b08a88399ce2f1f9377dcaada2421d5bdc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ro/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ro/thunderbird-140.1.0esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "2043faa14a64ec209e753a7a28b718295bad75fe32c88760818400d6b62ab6e3"; + sha256 = "6434fdf0b2deab3cff6a30247fa2157e385507f24ee8fee00b765b9291f7ec35"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/ru/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/ru/thunderbird-140.1.0esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "d50ab6a8217ace9105bdc68694d748ebe5ac84053bd6bcf7608963e63ccb6875"; + sha256 = "17165a4d397223f0e5e5f36d1c7c16cc4deb8d45a0f8589b557375ba2d2c9f77"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sk/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sk/thunderbird-140.1.0esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "0353ffaef431ea0ad6c279be383078643689320ef429230f087d49b5f28a9fd2"; + sha256 = "c698c16229b53cb9f5551a4fff8373ba5d21568aff3d9cfd32bd5dff4aac5697"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sl/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sl/thunderbird-140.1.0esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "6e812718af66575f3cfb6287d544935a22180aa02ff3e62e61a7dd7570e81c0d"; + sha256 = "a391ba43c7bec4542d7e1ba5d79de802cb48622ce03548b8e275b38b8c6f683d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sq/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sq/thunderbird-140.1.0esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "288fa156ab80da4f2476970886fae43e349503e2f3125b4ec48118bacfc51ded"; + sha256 = "19ceb1b451813da0b8583b9d22a1ad26fcec5abec1bad67add1ba6665eff8903"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sr/thunderbird-140.1.0esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "61b39b6abbcff45c4f0b7816310c87377aba5cc6d30bf44659a7ee6fbd09d128"; + sha256 = "717184b8698347eff1eff74e16ca8bb3e2d92ad98b511b12778291237aea5e8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/sv-SE/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/sv-SE/thunderbird-140.1.0esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3783d139fb9e9947852d173f2f6fe142a0a7ff337f8288f96f1506f099a41ef5"; + sha256 = "9b4d6b8ab51492a70551dcdd3483672300b6d831e5c960033d8aa259fba1343e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/th/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/th/thunderbird-140.1.0esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "7cad4d217e5b9e82e9b841a71e96ca390f2b400086703f3bdbf0e09897757455"; + sha256 = "c3f534415fd18e98d38c91062abcc6e63d72dd32eed8dc28d28f51cec0f101b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/tr/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/tr/thunderbird-140.1.0esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "f49f042d6e86bcc40b1edd73d4241a8bb73dbdf320c1a417a20c3ef282557933"; + sha256 = "7f7a2f6f6e4e33bbbf5ccc7fc1913681ba1e15c1a79eb334896b10bec3e37c55"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uk/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uk/thunderbird-140.1.0esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "3058636ce20f2744413f23bfeb82206b265e7f625643b274ccb1dfebcfc03ec8"; + sha256 = "90d4e6a42842549c7ae9e4a70ee268d66b1f0b9ce1554d293db6eaf727f4c01a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/uz/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/uz/thunderbird-140.1.0esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "9d26d9154909b30d7fd335e3ab9a1d7a5614064568e03a21d10004dfce22dcf2"; + sha256 = "01cc8b145ce5e583ee8c466a0a6a206bf31c52034ee3c78f7383f4ee6f14877f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/vi/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/vi/thunderbird-140.1.0esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "0d50d6a2b8b7a7f0b7dfafa1e72c1187ca1fc195aae5736f8e4eda9ee84b66b9"; + sha256 = "1d6e07c6c0bbb8a49d5b99215161820b1d4a88c429d21833eaa24b3d16c4267d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-CN/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-CN/thunderbird-140.1.0esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7e2a01674ab8ef493f6a01aa4b5d5cc122b950bc0eca2bbd0ad6bf293b9fbc21"; + sha256 = "abcc3eec1c94cbae0f8018cf9c1969d2eb130fbf047e5b1e2800b0ec5331025f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/linux-i686/zh-TW/thunderbird-140.0.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/linux-i686/zh-TW/thunderbird-140.1.0esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "bdcfa911639dc193d7f9b38cadda371b3599beddfcd30a0cbb8fe8540520b1b6"; + sha256 = "4d4eac590f9daa34b8b3fd0f9f5301c229c588bc0d21387e12da8e2abc061817"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/af/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/af/Thunderbird%20140.1.0esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "95d5b1481ca80568c3229a9bfb0dfe9fa0eee09b5264e553e6e7588c7f2b4caa"; + sha256 = "6a797be943da6f43fc98d37d5ee736889289944e1d45f45a5d1b3d5945cc4717"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ar/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ar/Thunderbird%20140.1.0esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "38fa8d2d6051c580aafb11442af3d6948a5444a2d21b52f5f14a4f641cd164a4"; + sha256 = "c455e6854aa0a469b936f8522de9b597218d7beeb2216c740ff612118f9dbc24"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ast/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ast/Thunderbird%20140.1.0esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "08a420005f06a040bd5aeb05548276eb3dc0cbeaeaae4797a4a085a72eb94e47"; + sha256 = "80be9a5ca8052196a3aee5ee7700500128f56bb056f923909657b8d143a3ecc3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/be/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/be/Thunderbird%20140.1.0esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "37c2080dd55ad5c31c730d9be6bc1580c51ebc0482ab89d2a198fd14df2b136f"; + sha256 = "70203fb88a2bf57c58e6377c3155aa1ce1654f70e81063fd97255957839b5e16"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/bg/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/bg/Thunderbird%20140.1.0esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "053765ee4d6b385de034fb65961df15f514621eee8b989211fae46bd19f34efb"; + sha256 = "355ec61efbc0bd6ecf3b9a3f67d9a7580409c731b34b24a13838f143c35d0f33"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/br/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/br/Thunderbird%20140.1.0esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "77ee4106a4e5378a289a26a443698a8a19c5758af901c3d73ef75548d1428c25"; + sha256 = "e5e815a56e0f18e9ab9b1c6eb294b91a92331485ad192f4b1852384dc8563586"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ca/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ca/Thunderbird%20140.1.0esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "a5eaa6152a22227fff0171825606fad9dfa2235526835d4a3479176fbdb5d420"; + sha256 = "227a1f0c6116b84b983e049fee9b0d522262fec59e0803499fd1f1868bf64ceb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cak/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cak/Thunderbird%20140.1.0esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "da81389041f93401ad3baad47fb96936b49fa32f59ab92d37e3d8c6ce7e9a88a"; + sha256 = "0dba62df1d3f0a9365980dd07898b8ae1bde285b17873eaa8464814430de6565"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cs/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cs/Thunderbird%20140.1.0esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "1a72eff467b93fe13f917c0a5c1e41057bf5e2ec1bc1897a0a1e58cf59389185"; + sha256 = "e748f567c80162960b4331f53701feafae1ecb40c039e021083cc2abcc67560c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/cy/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/cy/Thunderbird%20140.1.0esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "b4c4eac9cbd977362fed93ef8378012e1c8db06c941fef58ea0f39712fbff5c6"; + sha256 = "eca67c8a05a65fd06f449f84ea5975ac0b59caaa077857da14b9a4f0fd098297"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/da/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/da/Thunderbird%20140.1.0esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "865cf7ae8bf2deaac3e80a91529321477202f749da03252e3a2cc3bb1e7fcedf"; + sha256 = "b6d2941d048312759f22dfb955cd1801253d7e2a45c233959f5e98f9eb5287ec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/de/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/de/Thunderbird%20140.1.0esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "ca21ea80983beec307b2e7cb1df443c60f5f44ccc956baa367f5793f638f7324"; + sha256 = "006d50345a36eadde5f0bf5f0ff6261ee36d8131c400da96dc9204c0a2a8b38e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/dsb/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/dsb/Thunderbird%20140.1.0esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "cc93a1d5447ed0df64d89cdc28ef506458d53459a4f75f0126a018d3e6f125ee"; + sha256 = "43504f37d0354e41487fdf46ee7b195088cc8e2f0cab3d09f13c9d536aded828"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/el/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/el/Thunderbird%20140.1.0esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "7c9a536a8a3b92d955fb520f857b57f57890dc08870cc77de51e8733aad73b76"; + sha256 = "a674fdb18f0eaff4ee79f487d24255342871c4d2a29bccdb2a18657f223b91ed"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-CA/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-CA/Thunderbird%20140.1.0esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "bb674b60e80673d4460707dd4022949e457ad4d3915127872cc55bc1eb6d8e6b"; + sha256 = "f73ca1b9d7ac6298b4fe0fe4f5acc24cce1a8364753770d2b7377f0d6fcbefe9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-GB/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-GB/Thunderbird%20140.1.0esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "43c1a3466df45aa98894c8d2f01488faabc1bfcc11a62d2c81dee951c48e9377"; + sha256 = "595835f5feb16c4ab8d750a9e3f789938251b6a9d96a49f52259970e3c8186fa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/en-US/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/en-US/Thunderbird%20140.1.0esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "0df7e445f71283e1f385d7920408ac0035baa937165d51e1b7d2f4c6515e8b80"; + sha256 = "024189d914d2c9a53394eb05028774cca6abe99d47e8e300021e34db64887c22"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-AR/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-AR/Thunderbird%20140.1.0esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "a0865f3d19d212e79666d4e90b8a18516d0c44d35f7f320bbd631cc9845844cc"; + sha256 = "1943196f84d02b9babd1533b6e92f8b5ad9d9806a4788ba8ff26c6e1214dc692"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-ES/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-ES/Thunderbird%20140.1.0esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "242afdcc031130e3b3c16413242cf0a95e2f1520e73c403c358f6d5fc2f1a46e"; + sha256 = "2d0cf209cfe79f4475cb3b7c04a35c44a1b4ebb1d48389a35e27916b588261ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/es-MX/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/es-MX/Thunderbird%20140.1.0esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "61e58ababdd693de00fb404edea2e2a986180a49dd0a33ad3840700eb081bbed"; + sha256 = "0a481830400bef485fd6ac940ea316d1f9369392a982a87e96d8107118fe43d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/et/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/et/Thunderbird%20140.1.0esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "d68a7b08b4559e11efc5160c4f886f2174e108ac857e3ec41844c64dfe5ca1ca"; + sha256 = "dca18e1de621d50a755bbefbdfacad15d31b004b110c1e76005c1e83cfc64eb6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/eu/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/eu/Thunderbird%20140.1.0esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "e8083e2da49168c1e5e52392a8e8cf1ec6190b48797d47fddcc0e0310f1390a5"; + sha256 = "aecbb212b8cc978e7b419f4abef61bd8229658ddc8ce460c3cf32d6b9985db08"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fi/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fi/Thunderbird%20140.1.0esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "1cab5d0c6a18a1975fb9010e3c83ad34abbe9888e592ca4e0b87a6b45e7266e8"; + sha256 = "e1bda1196cce483e4f00dfbdf89bce2c2ca90a42dedce17530db2e4f8cfa9b10"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fr/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fr/Thunderbird%20140.1.0esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "7c5bc6b3d2d797ed40ca89f96668a359fd00344219db9942ab3f64e9a06e8a74"; + sha256 = "15d1952adb3602e2edbde88d5098b13153e5dc6161cd66578fa87252fccd25d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/fy-NL/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/fy-NL/Thunderbird%20140.1.0esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "b20d55d3887f546131dbc2d7440f0bc68cd90662366f761b57ff59cfb3680401"; + sha256 = "09d087f3d90c9ce4848d19e510e6edc03b11299c539f0ea943a15dc8e7fcac7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ga-IE/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ga-IE/Thunderbird%20140.1.0esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "6500a32d0212883b059f7f8049c08534c346b271353f9c66e056b69f550501b9"; + sha256 = "c216dbf1ff5e7a58aac7296415080b60ab7f6e691e4471799dba2850cfed93c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gd/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gd/Thunderbird%20140.1.0esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "f27079d598d662c9d46857a742ff6ea455d2b0cfc63f9f11b8c075e79713f1e1"; + sha256 = "67c768d8f1968a2555456a9cb7a1c6775c12288ded166e53d438f9b6103d95e7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/gl/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/gl/Thunderbird%20140.1.0esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "d29ad1cf5ec3b1b189c21a73fe689c01b21e60dd80fa6c6aad2dc04f77312fab"; + sha256 = "9865f2fe16c50f270b5c4c40982a4fc76f560f53520eac37f59d3a7826856799"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/he/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/he/Thunderbird%20140.1.0esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "3c39fe2417ab58098b43ee07d9cb562254c529d9777d520852000e368baa1234"; + sha256 = "1073db739302522833fbfc9c0601365df0c5c6a4f65cc599d35b103fc377daf0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hr/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hr/Thunderbird%20140.1.0esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "c13f505713795fb6df640ab080f52096735c7374ba0826e2d3cd3f6dbc0e9390"; + sha256 = "e9097a7cdef7dca442ec139edc157e24639d54016345ef1551867a57351f3460"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hsb/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hsb/Thunderbird%20140.1.0esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "46c80d63f7453876366db864ee14b80a9b52987a8af3bc8a24d8735d7691d3a4"; + sha256 = "eafc388354c38c70ceee314f185707f042c870a4fccbe0241af6f47873a67348"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hu/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hu/Thunderbird%20140.1.0esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "6b48415df64d8c3ac80d8ce2b75712335948455f1d380ce1f3b4d38b7980a9d1"; + sha256 = "f2ad45f85a4a50bcdb954459e5eeeae334d014b00365d48d0043b506f329d3ad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/hy-AM/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/hy-AM/Thunderbird%20140.1.0esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "4d342cfd00c5ffe34877600d6c475603fa961c6862bcc9b27f666aebb877a624"; + sha256 = "32db776e1ac01f9adc25e307099b0b17f381954a9929e58d7e1b6f101287aa74"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/id/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/id/Thunderbird%20140.1.0esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "8fb14ee5415c8a7bf468e422c18b4dba35fdb0c78b57aae2058f50ad94fe386c"; + sha256 = "67e73e22fae4c379cb51caf399b2f2b867751ffb2156d2548be8af8ad13a09b8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/is/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/is/Thunderbird%20140.1.0esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "e34a22ee6896606ccb29e28d80da8ab30bb060804d210f4a3eafa0437846b297"; + sha256 = "1f85b717feab1c85fdac4287cee002b81b215328955dee9ccf579dc004173d19"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/it/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/it/Thunderbird%20140.1.0esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "1ec0efcf85cf0c277cd219a206e947ae970b6b3397b3a8da24beee96ac0d8d34"; + sha256 = "2946891e2ccc87cdb74a60e25f27248d11ffa061c5890d2b02f8a6230ea9c851"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ja-JP-mac/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ja-JP-mac/Thunderbird%20140.1.0esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "c583039cff073b0a6f94a73f120c26d6f43c86ab53fb0c545d66ab927ea76049"; + sha256 = "2d53d41264d37c697a6c1730588197ac0fc0a91c835975473fccce8e46c8bca0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ka/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ka/Thunderbird%20140.1.0esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "743c09456f1e37df56f642e4f25c432c02518250e3e675c2e59e44682f42e3cc"; + sha256 = "764825a8f1254b4d59fcbabca0a7850fbfb520ff116eff85c5dc48eca10743ad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kab/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kab/Thunderbird%20140.1.0esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "b2827daeb5582a8d7df1d0fd2a1263e306d2ffebec00f49f9bb7b36ec3f1f13e"; + sha256 = "0e01d710f1bb3ac4441748f967a475f1c12444647d6d6eb67ed9605c2a77156d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/kk/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/kk/Thunderbird%20140.1.0esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "cda4811b48bc59a731b9db326385a6e24b5cde15170f67f7e66b035642ab6301"; + sha256 = "afcc4d61b0a4733ed9addd694aca7e770c5db534b3a8bca905482dd45c2f03c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ko/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ko/Thunderbird%20140.1.0esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "b66634a71ccf6010025e395326227d900e70f41ac6d4aefadb87ed863268be8b"; + sha256 = "2ddf7356e8f4e974a6b39599ca534334b651ba2ecf4f7617754e1245cce71083"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lt/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lt/Thunderbird%20140.1.0esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "344bfe5819f26f494243bee9051b2b6cef79e15377dcd3b0c3462feba09a4899"; + sha256 = "e3f5cdfcd01dd8b4f393a46cc5244acca057f0b149b36740ae08120721ea49eb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/lv/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/lv/Thunderbird%20140.1.0esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "e9a5cc498ae57a76fd8e8dfe58e9f5faebbd7c50f53f50909b091f822dccc366"; + sha256 = "43ad9897e00bf8c45cfcdd52f8a92cff6227802ae7d7127e712153540d6a1b9f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ms/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ms/Thunderbird%20140.1.0esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "17e553a159ca6e020ee24cc4293f1d4ad144dc0b2dc505aefa7acac7a1b2874c"; + sha256 = "893260d2fbfd0d86d0242237c015eeba0d10ddbfab273df6249be2ea6cf1617b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nb-NO/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nb-NO/Thunderbird%20140.1.0esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "fba0b9ae7a9809e4ee8181c387c74a54dc3dd73e39b25931675d1f3251f5cba4"; + sha256 = "7f2237f0497b12b586e925e884e9759c1f973e3a59e24fb4cd79f113a2a10373"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nl/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nl/Thunderbird%20140.1.0esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "4c114373ca9760c588187d440301c9f5f5c3ba955f212ece78ffc6e095347d01"; + sha256 = "5326cb77442d6c547fb0e2010947f3433056d1f241f8eed8430b1af18ab7dc5b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/nn-NO/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/nn-NO/Thunderbird%20140.1.0esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "46f358d2437f74f6feb7c508b844325cd15ef61c230bf0af3338a3e754c5ad99"; + sha256 = "0d6f2dbe354e679d4feb02a4cb56769435a20c25fc62730e5c0ec366c860510a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pa-IN/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pa-IN/Thunderbird%20140.1.0esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "f5ae52be91e9e74a20a865603ab70650015cd052dd3524f40d547a725182514d"; + sha256 = "e6170af13789dccc75a8ecb157f5b0eafb98bffc0963e10232a477e04a82aaef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pl/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pl/Thunderbird%20140.1.0esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "68c481bed5cdb529e294d6d6c4a96897f0f26205910e5f53cedbd28674042f04"; + sha256 = "3ded93a7e935f40384ffabd539db653b1333537340c543ab672d8f2bd752a79b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-BR/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-BR/Thunderbird%20140.1.0esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "5d7df81759e99ba5c1ce321641450963443ebe8fa0dba62a1305cbc65228ad4c"; + sha256 = "483f1ca184263e15183b69e723c1bb0d91e44460eeb2610dc9e01534dd7a6fcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/pt-PT/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/pt-PT/Thunderbird%20140.1.0esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "ed4d5f4f0c3574cade3cc8df470cec5b41a63daa60cfefd18650f87bc1a5e857"; + sha256 = "3f151d6ace1296689a9e799ba603aa0c3d7f4a9d403d850697f620402b165626"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/rm/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/rm/Thunderbird%20140.1.0esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "e7cf689884d0a39f718bf17752600cb837d2cd88b1636c139c94aa98b080a8cd"; + sha256 = "c6cf94d2a41ebdb82f6ff3fb8afd0f288f4333608f8d4134ccbf3a2fb4b9a97c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ro/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ro/Thunderbird%20140.1.0esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "304c225dba0e4f4e6014ab791eb4950072a15b61bf88d0dc277e6eb2aaaa3531"; + sha256 = "815fa90ea0140a295e22e0c96c8fad12e65588cd1c3c63d045d65a29f408438c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/ru/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/ru/Thunderbird%20140.1.0esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "d53d2c8ec5112d3e3f94391ffc8323451ed0f39abbc3f1548f29989eb1a94e7c"; + sha256 = "0e1e7ad53e63cb7aa861324fc501d3e49748168bcce0da3f943f7de18233c57c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sk/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sk/Thunderbird%20140.1.0esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "f7083412a1e2a067b37a0bbbf5366c40b558a8f0b04f3435caed1753f551e05b"; + sha256 = "1f9b5b10cbecc8654722ea31d75a5c5ff64a5b894b27fa14d3ec749a57f9c276"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sl/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sl/Thunderbird%20140.1.0esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "a2f163298c4653cbf5615cc77b32f7e05ec6f99b0448ddcdb2d0e4e326918c9e"; + sha256 = "10a132922864f0762c8efa63740227d2a3c6f9cb19ddfffd405690ecaa2e9765"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sq/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sq/Thunderbird%20140.1.0esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "383328a54e6155e813d1e328658903cfc1836e640032182a40446455df52b00f"; + sha256 = "51fdc11dec939d838afedf1c4d11b713c7c92e67338c2bcbe900f95fbd104614"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sr/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sr/Thunderbird%20140.1.0esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "5fd5564f871656f491b7a55b459ad22ad465f6d683ceec660e0c894bd059411e"; + sha256 = "b31f2a1b388176288af887966e94dd01ff4b8e1f130b4dd3f4abf83118b016ad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/sv-SE/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/sv-SE/Thunderbird%20140.1.0esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "a3bda6773dd565a4d613e97f78648bf461f44b6237b941ae1711cfd0e098d357"; + sha256 = "eb0fb0c40ca617a81955056f127ad39f859e4fde4af2ac41e1fc3aaed4a082f1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/th/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/th/Thunderbird%20140.1.0esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "8d2b8dc11ce8532a09cda982f1625877e9a1d634678811760be5529500641bb1"; + sha256 = "38284a1aee298b6882fa421a5db528a8471f9878752fa159845fce2a724d9b67"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/tr/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/tr/Thunderbird%20140.1.0esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "ee2848ad6bb3bd0c5d367cde7c5a010dce7e6f28b25b42b036297c199ff45ed7"; + sha256 = "9c2744698829c19651c3de84cee70ad2ce1652d2c42519ab29b5ab18ff9d9805"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uk/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uk/Thunderbird%20140.1.0esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "65e3c31b51773f089266db704c2c128c222e05a5593088b8d0a0f6b3e65844a1"; + sha256 = "b2b1854ba1695fbdc66e14a8dd98409a20becc48e0ddefeda94fd3ed8a63953a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/uz/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/uz/Thunderbird%20140.1.0esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "baa2ed186c708f03fa8df0dd60ba8c0ee1157661e7a871b48526541bfeaa1e7f"; + sha256 = "8ba55a0821749f09d2ff038a30a9a8a0e75266b3c6bc327daed02e3060c21953"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/vi/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/vi/Thunderbird%20140.1.0esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "710a9b52e6343d27a9412cc6296b0f7fe2dd0b5fe322a25ff09ea7da5e6cc30f"; + sha256 = "db2b83dc7e7fec6792aa0a6749e516e1e75f7fe9253a59ab74289bd55b4307c0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-CN/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-CN/Thunderbird%20140.1.0esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "ea22275ae0bc0e0adce8228f798101ca699016577519a94a008ea409fa59497c"; + sha256 = "0546cc58f6dedb258e6c01562099c93e373ba9f8b31c861976a8c99ab0776244"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0.1esr/mac/zh-TW/Thunderbird%20140.0.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.1.0esr/mac/zh-TW/Thunderbird%20140.1.0esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "8fece4e313a472671567de0c2346db969d04aa870d7985a29c252848685bf2c6"; + sha256 = "ac8e771b637cf67ac40644bb55945c09c6affd6292a925410368c5bc243d1782"; } ]; } From 46781694fe05103a17da4a0ce5047f355a26df56 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:07:03 -0400 Subject: [PATCH 061/152] forgejo-runner: 8.0.0 -> 8.0.1 changelog: https://code.forgejo.org/forgejo/runner/releases/tag/v8.0.1 --- pkgs/by-name/fo/forgejo-runner/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 530dd6000e5b..074651c946b2 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -17,17 +17,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-ORFmCvKFbNQ1MGHifNhPmrPDep+WE603+xkIqMF/w6g="; + hash = "sha256-6FTJYs1dqIAHPxMzRNOHHZQv4be9LaR1wxMJsW3t5kg="; }; - vendorHash = "sha256-4TX1ol2WwvZ4WYIzLFfVlYkcT5eLduESc+jg4Ysas2o="; + vendorHash = "sha256-NykeBR2dnWQaqJuY73i9KLIqehLHniaMqf9oTqUDstQ="; # See upstream Makefile # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile @@ -39,7 +39,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X runner.forgejo.org/internal/pkg/ver.version=${src.rev}" + "-X code.forgejo.org/forgejo/runner/internal/pkg/ver.version=${src.rev}" ]; checkFlags = [ @@ -49,7 +49,7 @@ buildGoModule rec { postInstall = '' # fix up go-specific executable naming derived from package name, upstream # also calls it `forgejo-runner` - mv $out/bin/runner.forgejo.org $out/bin/forgejo-runner + mv $out/bin/runner $out/bin/forgejo-runner # provide old binary name for compatibility ln -s $out/bin/forgejo-runner $out/bin/act_runner ''; From 1be93ae1cf2a41b30dfdef5c448522413fc74957 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 17:33:50 +0000 Subject: [PATCH 062/152] gosmee: 0.26.1 -> 0.27.0 --- pkgs/by-name/go/gosmee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index 1721bd8675f4..91ae45ec3f46 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-qNO7mY03aWabTeUm8rXojy2Ek2IKNG6wimVhwZKxh9g="; + hash = "sha256-MoSfEnciYn+Lv695aZUl27o8VtmmKf0KbELLJb06hqY="; }; vendorHash = null; From ae98bf924626863a533f5b4a2354b50df82ce0ba Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 28 Jul 2025 10:35:10 -0700 Subject: [PATCH 063/152] formats.xml: fix cross compilation `python3.pkgs` does not splice, so with a package-set setup to cross-compile, we end up building xmltodict for the host platform. By using `python3Packages.xmltodict` instead, we only use xmltodict for the build platform, which is all that is needed for generating XML documents at build-time. --- pkgs/pkgs-lib/formats.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 0836519c203d..25bdbdc8a08f 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -952,14 +952,13 @@ optionalAttrs allowAliases aliases pkgs.callPackage ( { runCommand, - python3, libxml2Python, + python3Packages, }: runCommand name { nativeBuildInputs = [ - python3 - python3.pkgs.xmltodict + python3Packages.xmltodict libxml2Python ]; value = builtins.toJSON value; From 22747d183287358661933c576848c45488c14bcb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 26 Jul 2025 11:10:55 +0200 Subject: [PATCH 064/152] glasgow: add myself to maintainers --- pkgs/by-name/gl/glasgow/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index f6da1724b064..53567312e05d 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -100,7 +100,10 @@ python3.pkgs.buildPythonApplication rec { description = "Software for Glasgow, a digital interface multitool"; homepage = "https://github.com/GlasgowEmbedded/Glasgow"; license = licenses.bsd0; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ + flokli + thoughtpolice + ]; mainProgram = "glasgow"; }; } From 599f47fc1e47995d841338f927d98d4b3a760cfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 18:11:46 +0000 Subject: [PATCH 065/152] thunderbird-latest-unwrapped: 140.0.1 -> 141.0 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index de69fec16b69..466cb3f2e694 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -94,8 +94,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "140.0.1"; - sha512 = "fbef1d0228c49fc9c11425b6be03bb7e44e6abc6f2027ee23317270ca2c6b0a935bb41b38667acf014bd9e1166cbe62754f1e919e04f2355dc4c833e015c78b8"; + version = "141.0"; + sha512 = "cd747c0831532f90685975567102d1bdb90a780e21209fe4b7bddf2d84ac88576766706e95e22043a30a8a89b6d3daffb56a68c3ccc4a300b8236b20d4fca675"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; From 02204a0834ce43aa4ea11e4d61c24203d9cf7871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 18:22:35 +0000 Subject: [PATCH 066/152] aaaaxy: 1.6.257 -> 1.6.271 --- pkgs/by-name/aa/aaaaxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 1ccc5b39015e..331a6f1c98d6 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -22,17 +22,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.6.257"; + version = "1.6.271"; src = fetchFromGitHub { owner = "divVerent"; repo = "aaaaxy"; tag = "v${version}"; - hash = "sha256-l+4nlL8gUnLoBbKWlwOiis3s8svKMq9IjrbKyaBE0kk="; + hash = "sha256-/nSJ1FT9FE856yrupbouRzqpRzZhKfYAq1fVBBvMVmY="; fetchSubmodules = true; }; - vendorHash = "sha256-iP/7WQZ+BNqtoigRADKlYGEAEZpzSKttY4lVq7v8gR8="; + vendorHash = "sha256-DJvlyfCynz+M5BQ4XDYcdzb3QP5ycDPcF4B+fQ4FRRA="; buildInputs = [ alsa-lib From 570ae8423df2865a8c7a4c0af3a37daf27c7dd56 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 19:26:02 -0400 Subject: [PATCH 067/152] nixos/autovt: Pull in autovt@tty1 in Nix, not generateUnits --- nixos/lib/systemd-lib.nix | 3 --- nixos/modules/services/ttys/getty.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 3b68d56d4541..97a797b47b0f 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -526,9 +526,6 @@ rec { ln -s ${cfg.ctrlAltDelUnit} $out/ctrl-alt-del.target ln -s rescue.target $out/kbrequest.target - mkdir -p $out/getty.target.wants/ - ln -s ../autovt@tty1.service $out/getty.target.wants/ - ln -s ../remote-fs.target $out/multi-user.target.wants/ ''} ''; # */ diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 709bbff233d6..8fed34e73932 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -148,6 +148,8 @@ in "container-getty@.service" ]; + systemd.targets.getty.wants = [ "autovt@tty1.service" ]; + systemd.services."getty@" = { serviceConfig.ExecStart = [ # override upstream default with an empty ExecStart From 878c68dad3494190e4b1d56f73f829100087e4ca Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 21:52:43 -0400 Subject: [PATCH 068/152] nixos/xserver: Remove tty option Note about sddm: The MinimumVT option has been documented as unavailable since v0.20. --- nixos/modules/services/display-managers/gdm.nix | 1 - nixos/modules/services/display-managers/lemurs.nix | 3 +-- nixos/modules/services/display-managers/ly.nix | 3 +-- nixos/modules/services/display-managers/sddm.nix | 4 +--- .../services/x11/display-managers/lightdm.nix | 1 - nixos/modules/services/x11/xserver.nix | 12 +++++------- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index 11675e914286..5e18c42889da 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -190,7 +190,6 @@ in users.groups.gdm.gid = config.ids.gids.gdm; # GDM needs different xserverArgs, presumable because using wayland by default. - services.xserver.tty = null; services.xserver.display = null; services.xserver.verbose = null; diff --git a/nixos/modules/services/display-managers/lemurs.nix b/nixos/modules/services/display-managers/lemurs.nix index d395c946983b..bae768ab95a2 100644 --- a/nixos/modules/services/display-managers/lemurs.nix +++ b/nixos/modules/services/display-managers/lemurs.nix @@ -70,8 +70,7 @@ in # Required for wayland with setLoginUid = false; seatd.enable = true; xserver = { - # To enable user switching, allow lemurs to allocate TTYs/displays dynamically. - tty = null; + # To enable user switching, allow lemurs to allocate displays dynamically. display = null; }; displayManager = { diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 76047c3942a7..16d5a952e8a0 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -118,8 +118,7 @@ in }; xserver = { - # To enable user switching, allow ly to allocate TTYs/displays dynamically. - tty = null; + # To enable user switching, allow ly to allocate displays dynamically. display = null; }; }; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index d8ce1e231b3c..bbadb0573553 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -93,7 +93,6 @@ let } // optionalAttrs xcfg.enable { X11 = { - MinimumVT = if xcfg.tty != null then xcfg.tty else 7; ServerPath = toString xserverWrapper; XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr"; SessionCommand = toString dmcfg.sessionData.wrapper; @@ -419,8 +418,7 @@ in services = { dbus.packages = [ sddm ]; xserver = { - # To enable user switching, allow sddm to allocate TTYs/displays dynamically. - tty = null; + # To enable user switching, allow sddm to allocate displays dynamically. display = null; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 8034e779f5b8..8549b32988c9 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -336,7 +336,6 @@ in ]; users.groups.lightdm.gid = config.ids.gids.lightdm; - services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves.. services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there }; } diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 8df96f40106d..e90d51b19ffe 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -277,6 +277,11 @@ in "dir" ]; }) + (lib.mkRemovedOptionModule [ + "services" + "xserver" + "tty" + ] "'services.xserver.tty' was removed because it was ineffective.") ]; ###### interface @@ -675,12 +680,6 @@ in ''; }; - tty = mkOption { - type = types.nullOr types.int; - default = 7; - description = "Virtual console for the X server."; - }; - display = mkOption { type = types.nullOr types.int; default = 0; @@ -886,7 +885,6 @@ in "${cfg.xkb.dir}" ] ++ optional (cfg.display != null) ":${toString cfg.display}" - ++ optional (cfg.tty != null) "vt${toString cfg.tty}" ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" ++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}" ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}" From f8929b7381d3cf07257882cdee12ca927ce70241 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 21:52:43 -0400 Subject: [PATCH 069/152] nixos/lemurs: TTYVTDisallocate to clear VT Otherwise, when on VT1, the systemd status is still visible. --- nixos/modules/services/display-managers/lemurs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/display-managers/lemurs.nix b/nixos/modules/services/display-managers/lemurs.nix index bae768ab95a2..f4d418161f39 100644 --- a/nixos/modules/services/display-managers/lemurs.nix +++ b/nixos/modules/services/display-managers/lemurs.nix @@ -113,6 +113,8 @@ in TTYPath = "/dev/tty${toString cfg.vt}"; TTYReset = "yes"; TTYVHangup = "yes"; + # Clear the console before starting + TTYVTDisallocate = true; }; # Don't kill a user session when using nixos-rebuild restartIfChanged = false; From 431a9761829604e71130790ff6f95e71d4013174 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 21:52:43 -0400 Subject: [PATCH 070/152] nixos/display-managers: tty1 everywhere --- doc/release-notes/rl-2511.section.md | 2 ++ .../services/display-managers/default.nix | 10 ++++++++ .../modules/services/display-managers/gdm.nix | 2 -- .../services/display-managers/greetd.nix | 20 ++++++++-------- .../services/display-managers/lemurs.nix | 23 +++++++++---------- .../modules/services/display-managers/ly.nix | 8 +++---- .../services/display-managers/sddm.nix | 4 ---- .../services/x11/display-managers/lightdm.nix | 9 +------- .../display-managers/sddm/unwrapped.nix | 4 +--- pkgs/by-name/gd/gdm/package.nix | 5 +--- 10 files changed, 40 insertions(+), 47 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c7cfe224b1a5..8802d4b733f6 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -54,6 +54,8 @@ - `go-mockery` has been updated to v3. For migration instructions see the [upstream documentation](https://vektra.github.io/mockery/latest/v3/). If v2 is still required `go-mockery_v2` has been added but will be removed on or before 2029-12-31 in-line with it's [upstream support lifecycle](https://vektra.github.io/mockery/ +- NixOS display manager modules now strictly use tty1, where many of them previously used tty7. Options to configure display managers' VT have been dropped. A configuration with a display manager enabled will not start `getty@tty1.service`, even if the system is forced to boot into `multi-user.target` instead of `graphical.target`. + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index d6ab8cbef811..7d518cb501fa 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -267,12 +267,22 @@ in in lib.mkIf noDmUsed (lib.mkDefault false); + # We can't just rely on 'Conflicts=autovt@tty1.service' because + # 'switch-to-configuration switch' will start 'autovt@tty1.service' + # and kill us. + systemd.services."autovt@tty1".enable = + lib.mkIf config.systemd.services.display-manager.enable false; + systemd.services.display-manager = { description = "Display Manager"; after = [ "acpid.service" "systemd-logind.service" "systemd-user-sessions.service" + "autovt@tty1.service" + ]; + conflicts = [ + "autovt@tty1.service" ]; restartIfChanged = false; diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index 5e18c42889da..583fdae1aad9 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -259,12 +259,10 @@ in "rc-local.service" "systemd-machined.service" "systemd-user-sessions.service" - "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" "plymouth-start.service" ]; systemd.services.display-manager.conflicts = [ - "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" ]; systemd.services.display-manager.onFailure = [ diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index bb1e45c8adfe..8d0580187d0e 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -6,10 +6,18 @@ }: let cfg = config.services.greetd; - tty = "tty${toString cfg.vt}"; + tty = "tty1"; settingsFormat = pkgs.formats.toml { }; in { + imports = [ + (lib.mkRemovedOptionModule [ + "services" + "greetd" + "vt" + ] "The VT is now fixed to VT1.") + ]; + options.services.greetd = { enable = lib.mkEnableOption "greetd, a minimal and flexible login manager daemon"; @@ -41,14 +49,6 @@ in ''; }; - vt = lib.mkOption { - type = lib.types.int; - default = 1; - description = '' - The virtual console (tty) that greetd should use. This option also disables getty on that tty. - ''; - }; - restart = lib.mkOption { type = lib.types.bool; default = !(cfg.settings ? initial_session); @@ -62,7 +62,7 @@ in }; config = lib.mkIf cfg.enable { - services.greetd.settings.terminal.vt = lib.mkDefault cfg.vt; + services.greetd.settings.terminal.vt = 1; services.greetd.settings.default_session.user = lib.mkDefault "greeter"; security.pam.services.greetd = { diff --git a/nixos/modules/services/display-managers/lemurs.nix b/nixos/modules/services/display-managers/lemurs.nix index f4d418161f39..fdf9458b6d5c 100644 --- a/nixos/modules/services/display-managers/lemurs.nix +++ b/nixos/modules/services/display-managers/lemurs.nix @@ -9,6 +9,15 @@ let settingsFormat = pkgs.formats.toml { }; in { + imports = [ + (lib.mkRemovedOptionModule [ + "services" + "displayManager" + "lemurs" + "vt" + ] "The VT is now fixed to VT1.") + ]; + options.services.displayManager.lemurs = { enable = lib.mkEnableOption "" // { description = '' @@ -36,14 +45,6 @@ in See [lemurs configuration documentation](https://github.com/coastalwhite/lemurs/blob/main/extra/config.toml) for available options. ''; }; - - vt = lib.mkOption { - type = lib.types.ints.positive; - default = 2; - description = '' - The virtual console (tty) that lemurs should use. - ''; - }; }; config = lib.mkIf cfg.enable { assertions = [ @@ -82,7 +83,7 @@ in desktops = config.services.displayManager.sessionData.desktops; in { - tty = lib.mkDefault cfg.vt; + tty = 1; system_shell = lib.mkDefault "${pkgs.bash}/bin/bash"; initial_path = lib.mkDefault "/run/current-system/sw/bin"; x11 = { @@ -101,16 +102,14 @@ in Wants = [ "systemd-user-sessions.service" ]; After = [ "systemd-user-sessions.service" - "getty@tty${toString cfg.vt}.service" "plymouth-quit-wait.service" ]; - Conflicts = [ "getty@tty${toString cfg.vt}.service" ]; }; serviceConfig = { Type = "idle"; # Defaults from lemurs upstream configuration StandardInput = "tty"; - TTYPath = "/dev/tty${toString cfg.vt}"; + TTYPath = "/dev/tty1"; TTYReset = "yes"; TTYVHangup = "yes"; # Clear the console before starting diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 16d5a952e8a0..3dded8ed0624 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -36,7 +36,6 @@ let defaultConfig = { shutdown_cmd = "/run/current-system/systemd/bin/systemctl poweroff"; restart_cmd = "/run/current-system/systemd/bin/systemctl reboot"; - tty = 2; service_name = "ly"; path = "/run/current-system/sw/bin"; term_reset_cmd = "${pkgs.ncurses}/bin/tput reset"; @@ -115,6 +114,10 @@ in displayManager = { enable = true; execCmd = "exec /run/current-system/sw/bin/ly"; + + # Set this here instead of 'defaultConfig' so users get eval + # errors when they change it. + ly.settings.tty = 1; }; xserver = { @@ -130,11 +133,8 @@ in after = [ "systemd-user-sessions.service" "plymouth-quit-wait.service" - "getty@tty${toString finalConfig.tty}.service" ]; - conflicts = [ "getty@tty7.service" ]; - serviceConfig = { Type = "idle"; StandardInput = "tty"; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index bbadb0573553..06516fb76b7a 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -430,13 +430,9 @@ in services.display-manager = { after = [ "systemd-user-sessions.service" - "getty@tty7.service" "plymouth-quit.service" "systemd-logind.service" ]; - conflicts = [ - "getty@tty7.service" - ]; }; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 8549b32988c9..8226f2cf0be5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -42,6 +42,7 @@ let lightdmConf = writeText "lightdm.conf" '' [LightDM] + minimum-vt = 1 ${optionalString cfg.greeter.enable '' greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} @@ -234,19 +235,11 @@ in exec ${lightdm}/sbin/lightdm ''; - # Replaces getty - systemd.services.display-manager.conflicts = [ - "getty@tty7.service" - # TODO: Add "plymouth-quit.service" so LightDM can control when plymouth - # quits. Currently this breaks switching to configurations with plymouth. - ]; - # Pull in dependencies of services we replace. systemd.services.display-manager.after = [ "rc-local.service" "systemd-machined.service" "systemd-user-sessions.service" - "getty@tty7.service" "user.slice" ]; diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix index 517cfddd881d..2e2bb8710280 100644 --- a/pkgs/applications/display-managers/sddm/unwrapped.nix +++ b/pkgs/applications/display-managers/sddm/unwrapped.nix @@ -72,9 +72,7 @@ stdenv.mkDerivation (finalAttrs: { "-DUID_MIN=1000" "-DUID_MAX=29999" - # we still want to run the DM on VT 7 for the time being, as 1-6 are - # occupied by getties by default - "-DSDDM_INITIAL_VT=7" + "-DSDDM_INITIAL_VT=1" "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 92a9a025f234..75ecc584896e 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgdm-xsession=true" # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6 - "-Dinitial-vt=${finalAttrs.passthru.initialVT}" + "-Dinitial-vt=1" "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d" "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" @@ -185,9 +185,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gdm"; }; - # Used in GDM NixOS module - # Don't remove. - initialVT = "7"; dconfDb = "${finalAttrs.finalPackage}/share/gdm/greeter-dconf-defaults"; dconfProfile = "user-db:user\nfile-db:${finalAttrs.passthru.dconfDb}"; From ea86aa9af0754ed3cef9cc202ae2e885b91aafdd Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 28 Jul 2025 09:31:53 +0200 Subject: [PATCH 071/152] glasgow: 0-unstable-2025-01-26 -> 0-unstable-2025-07-28 In addition to bringing all the new features since then, upstream now uses the same sdcc version, and with an additional normalization phase, we come up with exactly the same firmware as them (and validate this). We previously had both the committed firmware blob from upstream, as well as our built firmware in our output, and only used the upstream one due to a packaging bug (changed path). Dependencies were slightly reordered, instead of propagatedBuildInputs we now use dependencies, and build-system is used instead of nativeBuildInputs to more align with python package style. I also documented why pytestCheckHook cannot be used. --- pkgs/by-name/gl/glasgow/package.nix | 43 ++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index 53567312e05d..ed41e2e22f30 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -11,54 +11,71 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "0-unstable-2025-01-26"; + version = "0-unstable-2025-07-28"; # from `pdm show` realVersion = let tag = builtins.elemAt (lib.splitString "-" version) 0; rev = lib.substring 0 7 src.rev; in - "${tag}.1.dev2085+g${rev}"; + "${tag}.1.dev2611+g${rev}"; + # the latest commit ID touching the `firmware` directory, can differ from rev! + firmwareGitRev = "4fe35360"; pyproject = true; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "2a67f79d6025a06e98277956cbb036c4237960f1"; - sha256 = "sha256-THunn3Oz+eldjQ72TGuq4Egnn6fiMiGG/UtYVRc/tfU="; + rev = "18442e9684cdda4bb2cbd2be9c31b3c6dffc625a"; + hash = "sha256-b0kpgCHMk5Ylj4hY29sHRzY/zI1JXReHioHxHSO4h5E="; }; nativeBuildInputs = [ - python3.pkgs.pdm-backend sdcc ]; - propagatedBuildInputs = with python3.pkgs; [ - typing-extensions + build-system = [ + python3.pkgs.pdm-backend + ]; + + dependencies = with python3.pkgs; [ + aiohttp amaranth + cobs + fx2 + importlib-resources + libusb1 packaging platformdirs - fx2 - libusb1 pyvcd - aiohttp + typing-extensions ]; nativeCheckInputs = [ + # pytestCheckHook discovers way less tests python3.pkgs.unittestCheckHook - yosys icestorm nextpnr + yosys ]; + unittestFlags = [ "-v" ]; + enableParallelBuilding = true; __darwinAllowLocalNetworking = true; preBuild = '' - make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2 - cp firmware/glasgow.ihex software/glasgow + make -C firmware GIT_REV_SHORT=${firmwareGitRev} LIBFX2=${python3.pkgs.fx2}/share/libfx2 + + # Normalize the .ihex file, see ./software/deploy-firmware.sh. + ${python3.withPackages (p: [ p.fx2 ])}/bin/python firmware/normalize.py \ + firmware/glasgow.ihex firmware/glasgow.ihex + + # Ensure the compiled firmware is exactly the same as the one shipped in the repo. + cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex + cd software export PDM_BUILD_SCM_VERSION="${realVersion}" ''; From e509766da30d71f161ef8e49cb7fd6455f0c34dc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 28 Jul 2025 17:55:40 +0200 Subject: [PATCH 072/152] glasgow: simplify PDM_BUILD_SCM_VERSION Remove one manual step when updating, we don't need to maintain the commit counter, as discussed in the glasgow IRC channel. --- pkgs/by-name/gl/glasgow/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index ed41e2e22f30..2094b0078281 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -12,13 +12,13 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; version = "0-unstable-2025-07-28"; - # from `pdm show` - realVersion = + # Similar to `pdm show`, but without the commit counter + pdmVersion = let tag = builtins.elemAt (lib.splitString "-" version) 0; rev = lib.substring 0 7 src.rev; in - "${tag}.1.dev2611+g${rev}"; + "${tag}.1.dev0+g${rev}"; # the latest commit ID touching the `firmware` directory, can differ from rev! firmwareGitRev = "4fe35360"; @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex cd software - export PDM_BUILD_SCM_VERSION="${realVersion}" + export PDM_BUILD_SCM_VERSION="${pdmVersion}" ''; # installCheck tries to build_ext again From 33b088b7c3c1d3b7d8fa818e8af4c40ecd6b99af Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 28 Jul 2025 17:43:25 +0200 Subject: [PATCH 073/152] glasgow: remove passthru.updateScript This cannot be updated automatically, as we need to manually update the commit ID of the latest commit in the `firmware/` subdirectoy. --- pkgs/by-name/gl/glasgow/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index 2094b0078281..b453c54e792a 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -6,7 +6,6 @@ yosys, icestorm, nextpnr, - unstableGitUpdater, }: python3.pkgs.buildPythonApplication rec { @@ -109,10 +108,6 @@ python3.pkgs.buildPythonApplication rec { "${nextpnr}/bin/nextpnr-ice40" ]; - passthru.updateScript = unstableGitUpdater { - hardcodeZeroVersion = true; - }; - meta = with lib; { description = "Software for Glasgow, a digital interface multitool"; homepage = "https://github.com/GlasgowEmbedded/Glasgow"; From c24e3d433be2ffad763dcbf9aaa85f25be3ec0fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 19:15:02 +0000 Subject: [PATCH 074/152] patch2pr: 0.36.0 -> 0.37.0 --- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 5cb7ae1ff519..7c87662cc6d9 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-KaU77UYJJqcTJZrFPiqcdzYIVoih6oSeaPWiQdDiZ2s="; + hash = "sha256-dijSa6BXV8hXuRDeXIHcijPzQKFkmATrlAX0uiDDYjo="; }; - vendorHash = "sha256-MO6LrUvSu7pYidtjaDgjIEAxoIKM/U9hcePZr336Mbw="; + vendorHash = "sha256-QEgGq5/JQUIWWmJKoQ832eKhiF5xF8Jivpn1uFDERTA="; ldflags = [ "-X main.version=${version}" From 92bb5cb2261cfba09c977078e2ede7ddbf70487b Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Mon, 28 Jul 2025 21:32:44 +0200 Subject: [PATCH 075/152] teams/systemd: add grimmauld --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 8e1dac52dfd2..fd3302b291d1 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -1230,6 +1230,7 @@ with lib.maintainers; arianvp elvishjerricco aanderse + grimmauld ]; githubTeams = [ "systemd" ]; scope = "Maintain systemd for NixOS."; From c5131e683e82074fdf839bf7156102e090b227c5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 28 Jul 2025 22:15:42 +0200 Subject: [PATCH 076/152] dash-mpd-cli: deprecate phases --- pkgs/by-name/da/dash-mpd-cli/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 4300318c1832..778573f040a0 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -9,19 +9,16 @@ libxslt, shaka-packager, nix-update-script, + runCommand, }: let # dash-mpd-cli looks for a binary named `shaka-packager`, while # shaka-packager provides `packager`. - shaka-packager-wrapped = stdenvNoCC.mkDerivation { - name = "shaka-packager-wrapped"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${lib.getExe shaka-packager} $out/bin/shaka-packager - ''; - }; + shaka-packager-wrapped = runCommand "shaka-packager-wrapped" { } '' + mkdir -p $out/bin + ln -s ${lib.getExe shaka-packager} $out/bin/shaka-packager + ''; in rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; From 0755fa944d5242ee92a92bbc7d95695a388de431 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 20:21:10 +0000 Subject: [PATCH 077/152] cargo-shuttle: 0.56.0 -> 0.56.6 --- pkgs/by-name/ca/cargo-shuttle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index b1e4097a4672..0a6b16bff04f 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.56.0"; + version = "0.56.6"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-Fr31BNTI8pVXHSSu46XPvlb0ic/S011OLWsLEfAZI4M="; + hash = "sha256-IBQExHPJUE16syyRkPOgh7jHONp1XDsAfCYLvZ6CLPs="; }; - cargoHash = "sha256-2YnwBAt2M2MkMhraKlk+BXxaNQ+iZSKzlUER1GBPbCI="; + cargoHash = "sha256-i6Xof5uzVOmdDFZw/J/x8eOqH/iAt2ZJXkOABLSR8Ss="; nativeBuildInputs = [ pkg-config ]; From 380c3f6114a020b9bfa3282a13246c108533f2f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 21:18:39 +0000 Subject: [PATCH 078/152] gitmux: 0.11.2 -> 0.11.3 --- pkgs/by-name/gi/gitmux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitmux/package.nix b/pkgs/by-name/gi/gitmux/package.nix index 4a74e082ca86..34d9b718e0cd 100644 --- a/pkgs/by-name/gi/gitmux/package.nix +++ b/pkgs/by-name/gi/gitmux/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gitmux"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "arl"; repo = "gitmux"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-0Cw98hTg8qPu7BUTBDEgFBOpoCxstPW9HeNXQUUjgGA="; + sha256 = "sha256-Jw2yl95vCQ5JcRGvBeLlGuAagTHUf+IEF7XvzehcMvU="; }; - vendorHash = "sha256-PHY020MIuLlC1LqNGyBJRNd7J+SzoHbNMPAil7CKP/M="; + vendorHash = "sha256-MvvJGB9KPMYeqYclmAAF6qlU7vrJFMPToogbGDRoCpU="; nativeCheckInputs = [ git ]; From 9da58efd016673614cda08bb17de184bcfe78c75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 22:06:19 +0000 Subject: [PATCH 079/152] aiken: 1.1.17 -> 1.1.19 --- pkgs/by-name/ai/aiken/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index dd33f445f630..368820cad5e4 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.17"; + version = "1.1.19"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; tag = "v${version}"; - hash = "sha256-bEsBLihMqYHJa5913Q434xKVufxTrcaxwcANPV9u37U="; + hash = "sha256-S3KIOlOz21ItWI+RoeHPYROIlMbKAoNi7hXwHHjHaJs="; }; - cargoHash = "sha256-Ob4UuBLD6HFbghv4E2XMj+xVeUSFtc9qPUNuUDgZeQA="; + cargoHash = "sha256-RrcP23p3KVIGKiW1crDDn5eoowjX3nTPUWBYtT9qdz0="; buildInputs = [ openssl ]; From 9e3c9602a0494101ea6de35fd873f49d7bf9a74b Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Mon, 28 Jul 2025 18:37:02 -0400 Subject: [PATCH 080/152] guile-curl: fix build with gettext Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/gu/guile-curl/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/gu/guile-curl/package.nix b/pkgs/by-name/gu/guile-curl/package.nix index a990544b7600..740d88a2c8d4 100644 --- a/pkgs/by-name/gu/guile-curl/package.nix +++ b/pkgs/by-name/gu/guile-curl/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, + gettext, guile, pkg-config, texinfo, @@ -34,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: { curl ]; + # error: possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS + preAutoreconf = '' + cp ${gettext}/share/gettext/m4/lib-{ld,link,prefix}.m4 m4 + ''; + meta = { description = "Bindings to cURL for GNU Guile"; homepage = "https://github.com/spk121/guile-curl"; From 992621a27058f50db56cab4741b4641d7260c140 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 22:52:00 +0000 Subject: [PATCH 081/152] sticky: 1.24 -> 1.25 --- pkgs/by-name/st/sticky/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index 43788cc9ea15..42c8ad6666ad 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "linuxmint"; repo = "sticky"; rev = version; - hash = "sha256-Mj14S4M7NMQE17SN8uED4UIJN6nwTo3E+D3j0tGKXc4="; + hash = "sha256-lM9R89CNj8ZXeOciwn/ax9wcsf3J4yPmzrgAntp8Fsg="; }; postPatch = '' From 6451cf7f4559173b1e29ab3e55e2c40ab36194eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 20:21:56 +0000 Subject: [PATCH 082/152] telegraf: 1.35.2 -> 1.35.3 --- pkgs/by-name/te/telegraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 6dcdf7a3e66d..f0808cbad3b0 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.35.2"; + version = "1.35.3"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-x1PUDe5sMtg7VjFmjZ1rtk1SjglkEtbhVOfDYL/kikA="; + hash = "sha256-EwO7dvPJkLCxO9xZCW7gX57tCO7RIpJ23vqwOkMOVnw="; }; - vendorHash = "sha256-pTJqf00JdF+6ixU23zBLrNZquB02fP+BBX6JXgxthSw="; + vendorHash = "sha256-DHtgN8yf+4YYrDJKnFasICScYqq65iPGi7pFoxQawv8="; proxyVendor = true; ldflags = [ From c5ed5e8ab2c142d39cd5775e1abf5076a019aa08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 00:35:36 +0000 Subject: [PATCH 083/152] cerberus: 0-unstable-2025-06-29 -> 0-unstable-2025-07-25 --- pkgs/by-name/ce/cerberus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix index 58e4b988930b..73454ad04917 100644 --- a/pkgs/by-name/ce/cerberus/package.nix +++ b/pkgs/by-name/ce/cerberus/package.nix @@ -8,13 +8,13 @@ }: ocamlPackages.buildDunePackage { pname = "cerberus"; - version = "0-unstable-2025-06-29"; + version = "0-unstable-2025-07-25"; src = fetchFromGitHub { owner = "rems-project"; repo = "cerberus"; - rev = "61700b301f0f1fbc1940db51c50240c397759057"; - hash = "sha256-QpgHOQqiJMlMf2RH5/TI3AirdqYPS7HwE9YIlxgorqg="; + rev = "9f8f2d375366e8c6c3c60dcf2da757344d877b14"; + hash = "sha256-wwc2XXQ3AdXBhBX7FPhpm56w3g9rrC8tESelcXSwjPE="; }; minimalOCamlVersion = "4.12"; From eb25dc645fccbbfe8f7be843a80c29b906bd551b Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Mon, 28 Jul 2025 21:36:59 -0400 Subject: [PATCH 084/152] vscode-extensions.esbenp.prettier-vscode: don't block local module --- .../extensions/esbenp.prettier-vscode/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix index 5272f895e38f..50a8fe24498a 100644 --- a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -1,8 +1,5 @@ { - jq, lib, - moreutils, - prettier, vscode-utils, }: @@ -14,18 +11,6 @@ vscode-utils.buildVscodeMarketplaceExtension { hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; }; - nativeBuildInputs = [ - jq - moreutils - ]; - - buildInputs = [ prettier ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."prettier.prettierPath".default = "${prettier}"' package.json | sponge package.json - ''; - meta = { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; description = "Code formatter using prettier"; From 66e035f4117b6b51e3ee00f1b5c5d93bd6ae18b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Jul 2025 04:16:11 +0200 Subject: [PATCH 085/152] kea: 2.6.3 -> 3.0.0 https://gitlab.isc.org/isc-projects/kea/-/wikis/Release-Notes/release-notes-3.0.0 --- nixos/modules/services/networking/kea.nix | 74 +++++++++----- .../ke/kea/dont-create-system-paths.patch | 15 +++ pkgs/by-name/ke/kea/dont-create-var.patch | 34 ------- pkgs/by-name/ke/kea/package.nix | 97 +++++++++++-------- 4 files changed, 125 insertions(+), 95 deletions(-) create mode 100644 pkgs/by-name/ke/kea/dont-create-system-paths.patch delete mode 100644 pkgs/by-name/ke/kea/dont-create-var.patch diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index 9d19b9ec3d06..9f3e5aec5c74 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: let @@ -34,11 +35,11 @@ let DhcpDdns = cfg.dhcp-ddns.settings; } ); - - package = pkgs.kea; in { options.services.kea = with lib.types; { + package = lib.mkPackageOption pkgs "kea" { }; + ctrl-agent = lib.mkOption { description = '' Kea Control Agent configuration @@ -60,7 +61,7 @@ in type = nullOr path; default = null; description = '' - Kea Control Agent configuration as a path, see . + Kea Control Agent configuration as a path, see . Takes preference over [settings](#opt-services.kea.ctrl-agent.settings). Most users should prefer using [settings](#opt-services.kea.ctrl-agent.settings) instead. @@ -71,7 +72,7 @@ in type = format.type; default = null; description = '' - Kea Control Agent configuration as an attribute set, see . + Kea Control Agent configuration as an attribute set, see . ''; }; }; @@ -99,7 +100,7 @@ in type = nullOr path; default = null; description = '' - Kea DHCP4 configuration as a path, see . + Kea DHCP4 configuration as a path, see . Takes preference over [settings](#opt-services.kea.dhcp4.settings). Most users should prefer using [settings](#opt-services.kea.dhcp4.settings) instead. @@ -136,7 +137,7 @@ in ]; }; description = '' - Kea DHCP4 configuration as an attribute set, see . + Kea DHCP4 configuration as an attribute set, see . ''; }; }; @@ -164,7 +165,7 @@ in type = nullOr path; default = null; description = '' - Kea DHCP6 configuration as a path, see . + Kea DHCP6 configuration as a path, see . Takes preference over [settings](#opt-services.kea.dhcp6.settings). Most users should prefer using [settings](#opt-services.kea.dhcp6.settings) instead. @@ -202,7 +203,7 @@ in ]; }; description = '' - Kea DHCP6 configuration as an attribute set, see . + Kea DHCP6 configuration as an attribute set, see . ''; }; }; @@ -230,7 +231,7 @@ in type = nullOr path; default = null; description = '' - Kea DHCP-DDNS configuration as a path, see . + Kea DHCP-DDNS configuration as a path, see . Takes preference over [settings](#opt-services.kea.dhcp-ddns.settings). Most users should prefer using [settings](#opt-services.kea.dhcp-ddns.settings) instead. @@ -255,7 +256,7 @@ in }; }; description = '' - Kea DHCP-DDNS configuration as an attribute set, see . + Kea DHCP-DDNS configuration as an attribute set, see . ''; }; }; @@ -266,9 +267,10 @@ in config = let commonEnvironment = { - KEA_CONTROL_SOCKET_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; - KEA_PIDFILE_DIR = "/run/kea"; + # Allow hook scripts only when they originate from the system configuration + KEA_HOOK_SCRIPTS_PATH = lib.mkDefault "/nix/store"; + # Allow hooks to originate from the configured package + KEA_HOOKS_PATH = lib.mkDefault "${cfg.package}/lib/kea/hooks"; }; commonServiceConfig = { @@ -291,7 +293,7 @@ in lib.mkIf (cfg.ctrl-agent.enable || cfg.dhcp4.enable || cfg.dhcp6.enable || cfg.dhcp-ddns.enable) ( lib.mkMerge [ { - environment.systemPackages = [ package ]; + environment.systemPackages = [ cfg.package ]; users.users.kea = { isSystemUser = true; @@ -314,7 +316,7 @@ in description = "Kea Control Agent"; documentation = [ "man:kea-ctrl-agent(8)" - "https://kea.readthedocs.io/en/kea-${package.version}/arm/agent.html" + "https://kea.readthedocs.io/en/kea-${cfg.package.version}/arm/agent.html" ]; wants = [ @@ -337,7 +339,14 @@ in ]; serviceConfig = { - ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.ctrl-agent.extraArgs}"; + ExecStart = utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "kea-ctrl-agent") + "-c" + "/etc/kea/ctrl-agent.conf" + ] + ++ cfg.ctrl-agent.extraArgs + ); KillMode = "process"; Restart = "on-failure"; } @@ -359,7 +368,7 @@ in description = "Kea DHCP4 Server"; documentation = [ "man:kea-dhcp4(8)" - "https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp4-srv.html" + "https://kea.readthedocs.io/en/kea-${cfg.package.version}/arm/dhcp4-srv.html" ]; after = [ @@ -380,7 +389,14 @@ in ]; serviceConfig = { - ExecStart = "${package}/bin/kea-dhcp4 -c /etc/kea/dhcp4-server.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}"; + ExecStart = utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "kea-dhcp4") + "-c" + "etc/kea/dhcp4-server.conf" + ] + ++ cfg.dhcp4.extraArgs + ); # Kea does not request capabilities by itself AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" @@ -409,7 +425,7 @@ in description = "Kea DHCP6 Server"; documentation = [ "man:kea-dhcp6(8)" - "https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp6-srv.html" + "https://kea.readthedocs.io/en/kea-${cfg.package.version}/arm/dhcp6-srv.html" ]; after = [ @@ -430,7 +446,14 @@ in ]; serviceConfig = { - ExecStart = "${package}/bin/kea-dhcp6 -c /etc/kea/dhcp6-server.conf ${lib.escapeShellArgs cfg.dhcp6.extraArgs}"; + ExecStart = utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "kea-dhcp6") + "-c" + "/etc/kea/dhcp6-server.conf" + ] + ++ cfg.dhcp6.extraArgs + ); # Kea does not request capabilities by itself AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" @@ -457,7 +480,7 @@ in description = "Kea DHCP-DDNS Server"; documentation = [ "man:kea-dhcp-ddns(8)" - "https://kea.readthedocs.io/en/kea-${package.version}/arm/ddns.html" + "https://kea.readthedocs.io/en/kea-${cfg.package.version}/arm/ddns.html" ]; wants = [ "network-online.target" ]; @@ -476,7 +499,14 @@ in ]; serviceConfig = { - ExecStart = "${package}/bin/kea-dhcp-ddns -c /etc/kea/dhcp-ddns.conf ${lib.escapeShellArgs cfg.dhcp-ddns.extraArgs}"; + ExecStart = utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "kea-dhcp-ddns") + "-c" + "/etc/kea/dhcp-ddns.conf" + ] + ++ cfg.dhcp-ddns.extraArgs + ); AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/pkgs/by-name/ke/kea/dont-create-system-paths.patch b/pkgs/by-name/ke/kea/dont-create-system-paths.patch new file mode 100644 index 000000000000..a22ee8815ce0 --- /dev/null +++ b/pkgs/by-name/ke/kea/dont-create-system-paths.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index 24ab9b5bd7..8f44076cf7 100644 +--- a/meson.build ++++ b/meson.build +@@ -1118,10 +1118,6 @@ top_docs = [ + ] + install_data(top_docs, install_dir: DATADIR / 'doc/kea') + +-install_emptydir(LOGDIR) +-install_emptydir(RUNSTATEDIR) +-install_emptydir(SHAREDSTATEDIR) +- + # Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not. + # So we revert what it does.. + # In case prefix is default, install to hardcoded path. diff --git a/pkgs/by-name/ke/kea/dont-create-var.patch b/pkgs/by-name/ke/kea/dont-create-var.patch deleted file mode 100644 index 9b7c451e1878..000000000000 --- a/pkgs/by-name/ke/kea/dont-create-var.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index a81f4cc..5d61407 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -173,18 +173,6 @@ cppcheck: - docs: - $(MAKE) -C doc/sphinx - -- --# These steps are necessary during installation. chmod is for reinstallation/upgrade. --install-exec-hook: -- mkdir -m 750 -p "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}" -- chmod 750 "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}" -- mkdir -m 750 -p "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}" -- chmod 750 "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}" -- mkdir -m 750 -p "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}" -- chmod 750 "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}" -- mkdir -m 750 -p "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}" -- chmod 750 "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}" -- - EXTRA_DIST = tools/path_replacer.sh - EXTRA_DIST += tools/mk_cfgrpt.sh - -diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am -index 7e0f3c4..08c53d8 100644 ---- a/src/lib/dhcpsrv/Makefile.am -+++ b/src/lib/dhcpsrv/Makefile.am -@@ -420,6 +420,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ - parsers/shared_networks_list_parser.h \ - parsers/simple_parser4.h \ - parsers/simple_parser6.h -- --install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix index 7a1e38448ea7..f31dfb6f12b9 100644 --- a/pkgs/by-name/ke/kea/package.nix +++ b/pkgs/by-name/ke/kea/package.nix @@ -4,87 +4,108 @@ fetchurl, # build time - autoreconfHook, + bison, + flex, + meson, + ninja, pkg-config, python3Packages, # runtime - withMysql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, - withPostgres ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, - boost186, - libmysqlclient, + boost, log4cplus, openssl, - libpq, python3, + withKrb5 ? true, + krb5, + withMysql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, + libmysqlclient, + withPostgresql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, + libpq, # tests nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kea"; - version = "2.6.3"; # only even minor versions are stable + version = "3.0.0"; # only even minor versions are stable src = fetchurl { - url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-ACQaWVX/09IVosCYxFJ/nX9LIDGIsnb5o2JQ3T2d1hI="; + url = "https://ftp.isc.org/isc/kea/${finalAttrs.version}/kea-${finalAttrs.version}.tar.xz"; + hash = "sha256-v5Y9HhCVHYxXDGBCr8zyfHCdReA4E70mOde7HPxP7nY="; }; patches = [ - ./dont-create-var.patch + ./dont-create-system-paths.patch ]; postPatch = '' - substituteInPlace ./src/bin/keactrl/Makefile.am --replace-fail '@sysconfdir@' "$out/etc" - # darwin special-casing just causes trouble - substituteInPlace ./m4macros/ax_crypto.m4 --replace-fail 'apple-darwin' 'nope' + patchShebangs \ + scripts/grabber.py \ + doc/sphinx/*.sh.in ''; outputs = [ "out" "doc" - "man" + "python" ]; - configureFlags = [ - "--enable-perfdhcp" - "--enable-shell" - "--localstatedir=/var" - "--with-openssl=${lib.getDev openssl}" - ] - ++ lib.optional withPostgres "--with-pgsql=${libpq.pg_config}/bin/pg_config" - ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"; + mesonFlags = [ + (lib.mesonOption "crypto" "openssl") + (lib.mesonEnable "krb5" withKrb5) + (lib.mesonEnable "mysql" withMysql) + (lib.mesonEnable "netconf" false) # missing libyang-cpp, sysinfo, libsysrepo-cpp + (lib.mesonEnable "postgresql" withPostgresql) + (lib.mesonOption "localstatedir" "/var") + (lib.mesonOption "runstatedir" "/run") + ]; postConfigure = '' # Mangle embedded paths to dev-only inputs. - sed -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i config.report + for file in config.report meson-info/intro*.json; do + sed -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i "$file" + done ''; nativeBuildInputs = [ - autoreconfHook + bison + flex + meson + ninja pkg-config + python3 ] ++ (with python3Packages; [ - sphinxHook + sphinx sphinx-rtd-theme ]); - sphinxBuilders = [ - "html" - "man" - ]; - sphinxRoot = "doc/sphinx"; - buildInputs = [ - boost186 # does not build with 1.87 yet, see https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2523 - libmysqlclient + boost log4cplus openssl python3 + ] + ++ lib.optionals withMysql [ + libmysqlclient + ] + ++ lib.optionals withPostgresql [ + libpq + ] + ++ lib.optionals withKrb5 [ + krb5 ]; - enableParallelBuilding = true; + postBuild = '' + ninja doc + ''; + + postFixup = '' + mkdir -p $python/lib + mv $out/lib/python* $python/lib/ + ''; passthru.tests = { kea = nixosTests.kea; @@ -98,9 +119,7 @@ stdenv.mkDerivation rec { }; meta = { - # error: implicit instantiation of undefined template 'std::char_traits' - broken = stdenv.hostPlatform.isDarwin; - changelog = "https://downloads.isc.org/isc/kea/${version}/Kea-${version}-ReleaseNotes.txt"; + changelog = "https://gitlab.isc.org/isc-projects/kea/-/wikis/Release-Notes/release-notes-${finalAttrs.version}"; homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' @@ -117,4 +136,4 @@ stdenv.mkDerivation rec { hexa ]; }; -} +}) From 168fc4582594e16fedbbf10cd6ee33284f03ff2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 01:50:53 +0000 Subject: [PATCH 086/152] hellwal: 1.0.4 -> 1.0.5 --- pkgs/by-name/he/hellwal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/hellwal/package.nix b/pkgs/by-name/he/hellwal/package.nix index 3fff51a71cb1..e66194776e66 100644 --- a/pkgs/by-name/he/hellwal/package.nix +++ b/pkgs/by-name/he/hellwal/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hellwal"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "danihek"; repo = "hellwal"; tag = "v${finalAttrs.version}"; - hash = "sha256-M+b49KhbzvwpMvnfiNe4yy50aUjrGXEajLMmiXEOCgE="; + hash = "sha256-RIg2l2lFPkmbk9Dh4uKoo7kcl+/InZZ1oYXt2ih8zKs="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 92c0c77c85d054ba574ec1dcd3ac085284f90cba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 02:06:10 +0000 Subject: [PATCH 087/152] neatvnc: 0.9.4 -> 0.9.5 --- pkgs/by-name/ne/neatvnc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index a500f7e1d0f6..c30eaf0fa0e6 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${version}"; - hash = "sha256-D9dwD5i9mScc5vn0mUxe7+0cxMI65F7LyivXn9J0aic="; + hash = "sha256-wAIifLw2rlu44jXMu/k31B7qePdJt6pT6TOhNxcyfLw="; }; strictDeps = true; From 1c43eed59fe1dfb0ac8878839ef473af586e2763 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 02:41:29 +0000 Subject: [PATCH 088/152] trayscale: 0.18.0 -> 0.18.1 --- pkgs/by-name/tr/trayscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix index 2553c7a813f5..10dbcda3d9ea 100644 --- a/pkgs/by-name/tr/trayscale/package.nix +++ b/pkgs/by-name/tr/trayscale/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; tag = "v${version}"; - hash = "sha256-c6SZjkRuyf+3YEdZYLz2qe7ThNZhOk6vAKC/P90CCE0="; + hash = "sha256-zbqn0BBL/r03lpZsHszooFkLolS4FdXM8JC6mSlNlVg="; }; - vendorHash = "sha256-4ilgRX820VuOYAtFpPVU0AGLkC6SSUcoweA1BWHhIws="; + vendorHash = "sha256-FifYgTWDfUFQShon4PyiiA0UgSQPmwwRaLdEKJrOZcc="; subPackages = [ "cmd/trayscale" ]; From 6a1bee7a29c5b1f5c3f4c33505ef5a06e706c6f0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Jul 2025 10:21:41 +1000 Subject: [PATCH 089/152] nix-eval-jobs: 2.29.0 -> 2.30.0 Diff: https://github.com/nix-community/nix-eval-jobs/compare/v2.29.0...v2.30.0 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 7a9e4772917a..05eec1673097 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.29.0"; + version = "2.30.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-eval-jobs"; tag = "v${version}"; - hash = "sha256-AJ22q6yWc1hPkqssXMxQqD6QUeJ6hbx52xWHhKsmuP0="; + hash = "sha256-urOFgqXzs+cgd1CKFuN245vOeVx7rIldlS9Q5WcemCw="; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e946deefeeb..b495db757c3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16050,7 +16050,7 @@ with pkgs; ); nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_29; + nix = nixVersions.nix_2_30; }; nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate; From c7a9ebc430e388a7f2911d643789502e31f4c04e Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 29 Jul 2025 11:29:33 +0800 Subject: [PATCH 090/152] gdcm: remove unused patch --- pkgs/development/libraries/gdcm/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 561bf5d697e7..9bbd2f7600c7 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -34,13 +34,6 @@ stdenv.mkDerivation (finalAttrs: { # Fix vtk deprecated api, See https://docs.vtk.org/en/latest/release_details/9.3.html#id13. # Upstream mailing list: https://sourceforge.net/p/gdcm/mailman/message/59197515. ./fix-vtk-deprecated-api.patch - ] - ++ lib.optionals (lib.versionOlder vtk.version "9.3") [ - (fetchpatch2 { - url = "https://github.com/malaterre/GDCM/commit/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch?full_index=1"; - hash = "sha256-Yt5f4mxhP5n+L0A/CRq3CxKCqUT7LZ8uKdbCf9P71Zc="; - revert = true; - }) ]; cmakeFlags = [ From 8dad559f943a699961efd895eb29fc1f159c260a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 04:37:46 +0000 Subject: [PATCH 091/152] makejinja: 2.8.0 -> 2.8.1 --- pkgs/by-name/ma/makejinja/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/makejinja/package.nix b/pkgs/by-name/ma/makejinja/package.nix index 3f4dab4e7dcb..94ef333a4ddb 100644 --- a/pkgs/by-name/ma/makejinja/package.nix +++ b/pkgs/by-name/ma/makejinja/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "makejinja"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; src = fetchFromGitHub { owner = "mirkolenz"; repo = "makejinja"; tag = "v${version}"; - hash = "sha256-Y6R+nVwIuviYhvLp5Aqb+BUCaAD6fF+GH8zmJrWNxFc="; + hash = "sha256-vK5MJb4n3/NmkohpJ1shEexvjHlEAfwZJWy2oL+rzRk="; }; build-system = with python3Packages; [ setuptools ]; From d4eef99f392956a3355afc590e0fecc0fca67e97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 05:41:01 +0000 Subject: [PATCH 092/152] snx-rs: 4.4.5 -> 4.5.0 --- pkgs/by-name/sn/snx-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index ded856bd4795..f4da1773fcc4 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -14,13 +14,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "4.4.5"; + version = "4.5.0"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-iJAeZj1tnd03qF3vvr+VKC5El0sVAFvl901biNvaAp4="; + hash = "sha256-24zklkFczsp7fhvka3T3Nz3bL61Owyrs8eHt7F9CQM8="; }; passthru.updateScript = nix-update-script { }; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - cargoHash = "sha256-XBiwLpmqm1QgdTkaTJ7R+llRpTM7Wf8NX2Ar+//5l5w="; + cargoHash = "sha256-uDQzUl1q6mlDzs5D3b1/Q53Sz//BFeJZrE88HfMrXIk="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; From f3e66e6ccad6be4d2d0c3b277044a969cf4257e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 05:54:09 +0000 Subject: [PATCH 093/152] monkeysAudio: 11.21 -> 11.22 --- pkgs/by-name/mo/monkeysAudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index b4c00396a67a..aa441fec1e73 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.21"; + version = "11.22"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-nMxGrOjgjxJAHWJdJMGJl+QEwOZtuYsJlkzlpM0hnd0="; + hash = "sha256-O60fNcz3/CsinL7NbEprtMhEcFK0NNZIuIG3hfqOW3Y="; stripRoot = false; }; From fa11c3e9d0bca9bc547888553e393aca1910c463 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 29 Jul 2025 02:17:58 -0400 Subject: [PATCH 094/152] nixos/tests/systemd: Reuse intentional settings, not the entire Manager section --- nixos/modules/testing/test-instrumentation.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 89d3b9d5277c..5afdcc868a3f 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -72,6 +72,14 @@ let serviceConfig.KillSignal = "SIGHUP"; }; + managerSettings = { + # Don't clobber the console with duplicate systemd messages. + ShowStatus = false; + # Allow very slow start + DefaultTimeoutStartSec = 300; + DefaultDeviceTimeoutSec = 300; + }; + in { @@ -115,7 +123,7 @@ in MaxLevelConsole=debug ''; - settings.Manager = config.systemd.settings.Manager; + settings.Manager = managerSettings; } (lib.mkIf cfg.initrdBackdoor { @@ -210,13 +218,7 @@ in MaxLevelConsole=debug ''; - systemd.settings.Manager = { - # Don't clobber the console with duplicate systemd messages. - ShowStatus = false; - # Allow very slow start - DefaultTimeoutStartSec = 300; - DefaultDeviceTimeoutSec = 300; - }; + systemd.settings.Manager = managerSettings; systemd.user.extraConfig = '' # Allow very slow start DefaultTimeoutStartSec=300 From 9fd3a3d6e763059072289368e743f9f3cf219dfa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 07:19:48 +0000 Subject: [PATCH 095/152] libretro.gambatte: 0-unstable-2025-06-27 -> 0-unstable-2025-07-25 --- pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index 7585e73cf5ea..bb9be68937e3 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-06-27"; + version = "0-unstable-2025-07-25"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "9f591132e67f101780495a43df8da9bca43e08db"; - hash = "sha256-wauSnUlZRAtZwheONd+NusM0D1q2pLwha6H90R4R1aU="; + rev = "13b7af780e9893ae62cc24d567591b5eb6a6dd72"; + hash = "sha256-bTNZrXp+kMIq/tnPs73tpYRxlrZfCGCmE0EUlJFtUnY="; }; meta = { From 0dbbc747887730bee2d7f97151dc10fdabc2b73c Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Mon, 28 Jul 2025 15:15:22 +0200 Subject: [PATCH 096/152] kubevpn: fix tests on sandboxed darwin Signed-off-by: Paul Meyer --- pkgs/by-name/ku/kubevpn/package.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 3691f3b93050..4a0e22496604 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, go, @@ -32,10 +33,25 @@ buildGoModule rec { export HOME=$(mktemp -d) ''; - # Disable network tests - checkFlags = [ - "-skip=^Test(Route|Functions|ByDumpClusterInfo|ByCreateSvc|Elegant)$" - ]; + checkFlags = + let + skippedTests = [ + # Disable network tests + "TestRoute" + "TestFunctions" + "TestByDumpClusterInfo" + "TestByCreateSvc" + "TestElegant" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Not sure why these test fail on darwin with __darwinAllowLocalNetworking. + "TestHttpOverUnix" + "TestConnectionRefuse" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + __darwinAllowLocalNetworking = true; doInstallCheck = true; From 3860892dc896e1515a76c889ad30a2db730a285a Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Mon, 28 Jul 2025 15:34:24 +0200 Subject: [PATCH 097/152] kubevpn: renew Signed-off-by: Paul Meyer --- pkgs/by-name/ku/kubevpn/package.nix | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 4a0e22496604..6d225d4078fd 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -4,16 +4,17 @@ buildGoModule, fetchFromGitHub, go, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kubevpn"; version = "2.8.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+TyaujgbeQXApxmjYvLnmhBZZUeIZMidzS7mL+Ach3o="; }; @@ -24,7 +25,7 @@ buildGoModule rec { ]; ldflags = [ - "-X github.com/wencaiwulue/kubevpn/v2/pkg/config.Version=v${version}" + "-X github.com/wencaiwulue/kubevpn/v2/pkg/config.Version=v${finalAttrs.version}" "-X github.com/wencaiwulue/kubevpn/v2/cmd/kubevpn/cmds.OsArch=${go.GOOS}/${go.GOARCH}" ]; @@ -54,20 +55,16 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "version"; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/kubevpn help - $out/bin/kubevpn version | grep -e "Version: v${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${src.rev}"; + meta = { + changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${finalAttrs.src.rev}"; description = "Create a VPN and connect to Kubernetes cluster network, access resources, and more"; mainProgram = "kubevpn"; homepage = "https://github.com/KubeNetworks/kubevpn"; - license = licenses.mit; - maintainers = with maintainers; [ mig4ng ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mig4ng ]; }; -} +}) From 3c6bb6e8c79ff56a70cd5eead8c46d8b815a5fc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 08:29:29 +0000 Subject: [PATCH 098/152] railway: 4.5.5 -> 4.5.6 --- pkgs/by-name/ra/railway/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 17d8fe822e0f..8fdc51f28bcf 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "4.5.5"; + version = "4.5.6"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-l+HbtJyP6mygIh+H6MzfRoyz4RTgtF9B4hbQBHVRwhg="; + hash = "sha256-xoBGYdcef1xBlPlUOPudhX0t59OBbNavcg5CeRJiQIY="; }; - cargoHash = "sha256-jzql0ndlQlDHYhfXO5pAKlnQr79QG/MCK+som2qwTfY="; + cargoHash = "sha256-o/wbBp2gIl+Dyxnee7mChVzv5qmrVAcG95i9YMxd5AI="; nativeBuildInputs = [ pkg-config ]; From b380fd43564c114da2f56c15e46813638ab1904c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Jul 2025 09:59:07 +0200 Subject: [PATCH 099/152] tinymist: 0.13.14 -> 0.13.16 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.13.14...refs/tags/v0.13.16 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.13.16/editors/vscode/CHANGELOG.md --- .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index da533b10b780..ba99d9eee2f7 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-QhME94U4iVUSXGLlGqM+X8WbnnxGIVeKKJYEWWAMztg="; + hash = "sha256-9F/+IuX/5IMIEa8zXYBZsK3QNZCCuCDvXQ7C7WbwuFo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index d63a4fd5d4d8..90aba4cc78b6 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.13.14"; + version = "0.13.16"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-CTZhMbXLL13ybKFC34LArE/OXGfrAnXKXM79DP8ct60="; + hash = "sha256-4ffFIqF+UYFKTl4dQadr2mCKDYnpIdaKKBQ/tXonfAA="; }; - cargoHash = "sha256-aD50+awwVds9zwW5hM0Hgxv8NGV7J63BOSpU9907O+k="; + cargoHash = "sha256-cQTfyzvnrxdcYOnmJGAqwLN4Ueqh9PkYZsiGljmcrY8="; nativeBuildInputs = [ installShellFiles From c62495665e645b8fbd869c9ef2477e7eec01d3ba Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Jul 2025 19:08:54 -0500 Subject: [PATCH 100/152] claude-code: 1.0.61 -> 1.0.62 Signed-off-by: Austin Seipp --- pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++---- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index a80dbd637ee3..708ec10ab132 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.61" + "@anthropic-ai/claude-code": "^1.0.62" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.61", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.61.tgz", - "integrity": "sha512-+gjKzY1hsWfHoH52SgKR6E0ujCDPyyRsjyRShtZfS0urKd8VQq3D/DF3hvT3P4JJeW0YuWp5Dep0aSRON+/FFA==", + "version": "1.0.62", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.62.tgz", + "integrity": "sha512-uWjIvjtOudC/knp7QMJhICdIcvEP8Nuz+0Rj3DeZc5eYyHgtiYTsb5mVTou2P7OTsCfwc3ajFdbFbtyq/LwYSw==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index bf48ac6ccfc9..42a771ab54c7 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.61"; + version = "1.0.62"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-K10rlFGi2KH65VE0kiBY1lU16xkMPV24/GSD6OjU3v0="; + hash = "sha256-bzbnLVAtMXr4XHmHqSOn3jxB+6BsFCd3gd/j34Zkwi0="; }; - npmDepsHash = "sha256-8Wt8+ZVMSESULguBME/TMMbTUXH3Soha3RTHWs1rBow="; + npmDepsHash = "sha256-2SBm0RRptnMrmDRdXzm6QokTnMeIrpJMIcMt+R0ZVM8="; postPatch = '' cp ${./package-lock.json} package-lock.json From 2ecfbc99986d25dba8d0552d5ca25a1f749cd34c Mon Sep 17 00:00:00 2001 From: "@norpol" <2230917+norpol@users.noreply.github.com> Date: Tue, 29 Jul 2025 00:30:04 +0100 Subject: [PATCH 101/152] stalwart-mail: v0.13.1 -> v0.13.2 --- pkgs/by-name/st/stalwart-mail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index f22a683eefc3..2f873540b2f9 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-6zoI+yvE1Ep5jh9XthDqphm2zBA4UzhfK7VCKRWIH8g="; + hash = "sha256-VdeHb1HVGXA5RPenhhK4r/kkQiLG8/4qhdxoJ3xIqR4="; }; - cargoHash = "sha256-t4BLko8vIVHZ44yeQoAhss3OxOlxJCErHm9h+FGG+28="; + cargoHash = "sha256-Wu6skjs3Stux5nCX++yoQPeA33Qln67GoKcob++Ldng="; nativeBuildInputs = [ pkg-config From 8469831d17360556121ebfadbaabd0badc4b11b0 Mon Sep 17 00:00:00 2001 From: "@norpol" <2230917+norpol@users.noreply.github.com> Date: Tue, 29 Jul 2025 00:30:23 +0100 Subject: [PATCH 102/152] stalwart-mail-webadmin: v0.1.31 -> v0.1.32 --- pkgs/by-name/st/stalwart-mail/webadmin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 881942373b62..818314de323d 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "webadmin"; - version = "0.1.31"; + version = "0.1.32"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; tag = "v${finalAttrs.version}"; - hash = "sha256-4+R7QQT0cbKYe6WzgvzreOFULBnWdNcbPC27f4r+M0g="; + hash = "sha256-HmQBMU7o0A20SY4tBw4SPVfHFfw8e0JsNQDNdZcex24="; }; npmDeps = fetchNpmDeps { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; - cargoHash = "sha256-Q05+wH9+NfkfmEDJFLuWVQ7wuDeEu9h1XmOMN6SYdyU="; + cargoHash = "sha256-a2+3uNNSLfb81QXjZfftbwpgjORPRSgC056U3FINP4o="; postPatch = '' # Using local tailwindcss for compilation From 5e512bbd9129852404d9c14e2bb6ce56c74a59c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 09:18:23 +0000 Subject: [PATCH 103/152] python3Packages.scikit-base: 0.12.3 -> 0.12.4 --- pkgs/development/python-modules/scikit-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix index 01c97949a8f3..29e4b9385bd3 100644 --- a/pkgs/development/python-modules/scikit-base/default.nix +++ b/pkgs/development/python-modules/scikit-base/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "scikit-base"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; src = fetchFromGitHub { owner = "sktime"; repo = "skbase"; tag = "v${version}"; - hash = "sha256-UaAzEw/crkHg7Gyu0xWdQwlqP8M/00Pv82+G3fXQ9hs="; + hash = "sha256-gyI/UCPAIH3gtW/e93w0D5e/HDdLA7GpSml/IJE8ipM="; }; build-system = [ setuptools ]; From 568c44465a4d0764d32c3ecd96837d473da186a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 05:03:21 +0000 Subject: [PATCH 104/152] foot: 1.23.0 -> 1.23.1 --- pkgs/by-name/fo/foot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index 3655b5f10494..878844ddd09a 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.23.0"; + version = "1.23.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -104,7 +104,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; tag = version; - hash = "sha256-B7EKEIb6qA9UTRq0jdj1ShLhnldU0pwQPlkq6JrHWmI="; + hash = "sha256-jPHr47ISAp9vzytCEiz/Jx5l8JTkYhtc02hEaiKKQOc="; }; separateDebugInfo = true; From 0b77a66eb7517ba7035710b0b8eb682322b3e4c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 09:39:13 +0000 Subject: [PATCH 105/152] libretro.dosbox-pure: 0-unstable-2025-07-10 -> 0-unstable-2025-07-28 --- pkgs/applications/emulators/libretro/cores/dosbox-pure.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index d6d031c1ba2c..e3b12570912f 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2025-07-10"; + version = "0-unstable-2025-07-28"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "92894e7bdb6304d23278dc77f8a9fa7212450f6e"; - hash = "sha256-uA/pm3DyT0VCyq85DzZGXjSGrKQ9uoEIfrs839ta97s="; + rev = "4b5f6c964aa56357e19632bf73d1875c2496fdd1"; + hash = "sha256-J1NSt2Q4+lWUVqROv5yAM/rXI5COl0FRux3xqFLw20g="; }; hardeningDisable = [ "format" ]; From 5d989da69ca2ba4aaaadc29abd4e4cc56ef9b8ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 09:46:14 +0000 Subject: [PATCH 106/152] amnezia-vpn: 4.8.8.3 -> 4.8.9.1 --- pkgs/by-name/am/amnezia-vpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 3ff760bffdf0..97a68660a69b 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.8.3"; + version = "4.8.9.1"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-hDbrp6eT+avFepJL55Vl2alOD+IMnyy8MPXZQTEmLJo="; + hash = "sha256-docQqOVzmgqWPhKzOmKeXhssjyhtfYy1fNn0ZGXjsZ0="; fetchSubmodules = true; }; From 525c887fbc66432d698683dcdfa5940f61a75f60 Mon Sep 17 00:00:00 2001 From: Daniel Laing Date: Tue, 29 Jul 2025 11:44:35 +0100 Subject: [PATCH 107/152] calibre-web: fix build by relaxing `unidecode` dependency --- pkgs/by-name/ca/calibre-web/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix index c89c1a3307d3..a11ab1aeacf9 100644 --- a/pkgs/by-name/ca/calibre-web/package.nix +++ b/pkgs/by-name/ca/calibre-web/package.nix @@ -6,7 +6,6 @@ nixosTests, python3Packages, }: - python3Packages.buildPythonApplication rec { pname = "calibre-web"; version = "0.6.24"; @@ -134,6 +133,7 @@ python3Packages.buildPythonApplication rec { "pypdf" "regex" "tornado" + "unidecode" ]; nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies); From f463fe3071138d58c06a06e2cad38044d08acbea Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 29 Jul 2025 12:53:25 +0200 Subject: [PATCH 108/152] tui-journal: Remove openssl dependency Signed-off-by: Matthias Beyer --- pkgs/by-name/tu/tui-journal/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index c2014418fbae..57b72915a3fc 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, libgit2, - openssl, zlib, }: @@ -27,7 +26,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 - openssl zlib ]; From b04d12bfe0ad5cf635a2006a07e5ed9ea7149ee4 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Tue, 29 Jul 2025 13:14:18 +0200 Subject: [PATCH 109/152] sizelint: 0.1.2 -> 0.1.3 --- pkgs/by-name/si/sizelint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sizelint/package.nix b/pkgs/by-name/si/sizelint/package.nix index 745b2a6ca18c..ffc3c74757e6 100644 --- a/pkgs/by-name/si/sizelint/package.nix +++ b/pkgs/by-name/si/sizelint/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "sizelint"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "a-kenji"; repo = "sizelint"; tag = "v${version}"; - hash = "sha256-RwiopJHVyQE+WwiB5Bd89kfQxLl7TROZSB3aanf3fB0="; + hash = "sha256-06RJrE0w1Xhj364dUUuYadxleX12mkB8yO+h1QLZhH0="; }; - cargoHash = "sha256-Kf6QreDGYM0ndmkOND4zhcDdx6SsXHuj7rcwy6tGyQk="; + cargoHash = "sha256-1kg1xfgzqrbZvazRavM4aW7oyRei9jKW0a+a6z2HLnc="; meta = { description = "Lint your file tree based on file sizes"; From caace6c3215966f6db7ca54fcc6d15c5d413520b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 11:39:21 +0000 Subject: [PATCH 110/152] enzyme: 0.0.186 -> 0.0.187 --- pkgs/by-name/en/enzyme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 6fe2cf916ea0..1749c5c7d787 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.186"; + version = "0.0.187"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-s9YGKHPk4/xy3Re3NdWe1Srjg+inPft0vrQMWaRcGpA="; + hash = "sha256-vdLt7LtVkgcgoUzzl5jb7ERIyQMpY+iSwJpdQpWxoJw="; }; postPatch = '' From 0aa6de12b417c589c93b62aeeb16f6acea7818e8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 29 Jul 2025 13:47:09 +0200 Subject: [PATCH 111/152] mongodb-ce: refactor update script --- pkgs/by-name/mo/mongodb-ce/package.nix | 77 +++++++++++++------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index f7c0ad3e98b7..1993ef12c2e5 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -7,43 +7,21 @@ openssl, versionCheckHook, writeShellApplication, + common-updater-scripts, + gitMinimal, jq, nix-update, - gitMinimal, pup, nixosTests, }: -let - version = "8.0.11"; - - srcs = version: { - "x86_64-linux" = { - url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-${version}.tgz"; - hash = "sha256-XErxsovZyMR1UmwClxn5Bm08hoYHArCtn8TSv/8eDYo="; - }; - "aarch64-linux" = { - url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2204-${version}.tgz"; - hash = "sha256-p1eBobdnJ/uPZHScWFs3AOB7/BJn/MZQ8+VpOHonY2A="; - }; - "x86_64-darwin" = { - url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${version}.tgz"; - hash = "sha256-RLq+aFJixSt3EginpgIHWnR4CGk0KX5cmC3QrbW3jJ8="; - }; - "aarch64-darwin" = { - url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${version}.tgz"; - hash = "sha256-kNzByPEXi5T3+vr6t/EJuKIDEfGybrsbBqJ8vaEV5tY="; - }; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "mongodb-ce"; - inherit version; + version = "8.0.11"; - src = fetchurl ( - (srcs version).${stdenv.hostPlatform.system} - or (throw "unsupported system: ${stdenv.hostPlatform.system}") - ); + src = + finalAttrs.passthru.sources.${stdenv.hostPlatform.system} + or (throw "Unsupported platform for mongodb-ce: ${stdenv.hostPlatform.system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontStrip = true; @@ -59,29 +37,49 @@ stdenv.mkDerivation (finalAttrs: { install -Dm 755 bin/mongod -t $out/bin install -Dm 755 bin/mongos -t $out/bin + runHook postInstall ''; - nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${placeholder "out"}/bin/mongod"; - versionCheckProgramArg = "--version"; # Only enable the version install check on darwin. # On Linux, this would fail as mongod relies on tcmalloc, which # requires access to `/sys/devices/system/cpu/possible`. # See https://github.com/NixOS/nixpkgs/issues/377016 doInstallCheck = stdenv.hostPlatform.isDarwin; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/mongod"; + versionCheckProgramArg = "--version"; passthru = { + sources = { + "x86_64-linux" = fetchurl { + url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz"; + hash = "sha256-XErxsovZyMR1UmwClxn5Bm08hoYHArCtn8TSv/8eDYo="; + }; + "aarch64-linux" = fetchurl { + url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz"; + hash = "sha256-p1eBobdnJ/uPZHScWFs3AOB7/BJn/MZQ8+VpOHonY2A="; + }; + "x86_64-darwin" = fetchurl { + url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz"; + hash = "sha256-RLq+aFJixSt3EginpgIHWnR4CGk0KX5cmC3QrbW3jJ8="; + }; + "aarch64-darwin" = fetchurl { + url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz"; + hash = "sha256-kNzByPEXi5T3+vr6t/EJuKIDEfGybrsbBqJ8vaEV5tY="; + }; + }; updateScript = let script = writeShellApplication { name = "${finalAttrs.pname}-updateScript"; runtimeInputs = [ + common-updater-scripts curl + gitMinimal jq nix-update - gitMinimal pup ]; @@ -92,16 +90,15 @@ stdenv.mkDerivation (finalAttrs: { # Check if the new version is available for download, if not, exit curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION" - if [[ "${version}" = "$NEW_VERSION" ]]; then + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then echo "The new version same as the old version." exit 0 fi - '' - + lib.concatStrings ( - map (system: '' - nix-update --system ${system} --version "$NEW_VERSION" ${finalAttrs.pname} - '') finalAttrs.meta.platforms - ); + + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "mongodb-ce" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; }; in { @@ -125,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { (mongos). ''; maintainers = with lib.maintainers; [ drupol ]; - platforms = lib.attrNames (srcs version); + platforms = lib.attrNames finalAttrs.passthru.sources; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From 8b91f4be1df64b446fa205be1dcd357244fd295c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 29 Jul 2025 13:48:23 +0200 Subject: [PATCH 112/152] mongodb-ce: 8.0.11 -> 8.0.12 Done with `nix-shell maintainers/scripts/update.nix --argstr package mongodb-ce -v` --- pkgs/by-name/mo/mongodb-ce/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 1993ef12c2e5..f3c0e0fd0339 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mongodb-ce"; - version = "8.0.11"; + version = "8.0.12"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -54,19 +54,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz"; - hash = "sha256-XErxsovZyMR1UmwClxn5Bm08hoYHArCtn8TSv/8eDYo="; + hash = "sha256-dmXt+OxvDaJRXEn3hNoiYZ9ob//tmQp2lsU2XunTNLM="; }; "aarch64-linux" = fetchurl { url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz"; - hash = "sha256-p1eBobdnJ/uPZHScWFs3AOB7/BJn/MZQ8+VpOHonY2A="; + hash = "sha256-9FdODnUqzquSKk86BN5OL+fEO07hGYg1VAtytp7ehFM="; }; "x86_64-darwin" = fetchurl { url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz"; - hash = "sha256-RLq+aFJixSt3EginpgIHWnR4CGk0KX5cmC3QrbW3jJ8="; + hash = "sha256-LUUhqfgP1tIupe517TdLL97jUvBZsCvzMey3JtMVTmg="; }; "aarch64-darwin" = fetchurl { url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz"; - hash = "sha256-kNzByPEXi5T3+vr6t/EJuKIDEfGybrsbBqJ8vaEV5tY="; + hash = "sha256-9SFfRbIWVXPupxvqmQlkacmcthycu840VIupCNBf7Ew="; }; }; updateScript = From d2bfdf546dc401343256d9e07f6ce27fda7c8e6c Mon Sep 17 00:00:00 2001 From: Georgi Ivanov Date: Tue, 29 Jul 2025 13:21:37 +0200 Subject: [PATCH 113/152] terraform-providers.awscc: init at 1.50.0 add awscc provider to the list of terraform providers --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a340b2ac46be..fae33cbcbc95 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -134,6 +134,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-low0aq3i3pmqbadYg1VZra+ZzoV6nqyGutf8xzaces0=" }, + "awscc": { + "hash": "sha256-9/z8Al6JRsWyBgrcz53EuI9Quco9LAVMLrWWqmhEyMk=", + "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", + "owner": "hashicorp", + "repo": "terraform-provider-awscc", + "rev": "v1.50.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-WnKUdHVmLTWy+WMMbvI646KzJPGnmWv5NPoePsyP3yg=" + }, "azuread": { "hash": "sha256-lNjU/206yS+smSe1SYlz0TOqHRlvSQKqhJ67fswNlIQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", From a1f49393943deb9c6cdb05cbf3fe037cbe4d9da7 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 28 Jul 2025 10:47:16 +0300 Subject: [PATCH 114/152] llvmPackages_20.llvm: fix test failure on riscv64 --- .../compilers/llvm/common/llvm/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index b25272ba5aad..5d8506627aa7 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -294,7 +294,18 @@ stdenv.mkDerivation ( ++ lib.optional (lib.versionAtLeast release_version "15") # Just like the `llvm-lit-cfg` patch, but for `polly`. - (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch"); + (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch") + ++ + lib.optional (lib.versions.major release_version == "20" && stdenv.hostPlatform.isRiscV) + # Test failure on riscv64, fixed in llvm 21 + # https://github.com/llvm/llvm-project/issues/150818 + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/bd49bbaaafc98433a2cb4e95ce25b7a201baf5a5.patch"; + hash = "sha256-3hkbYPUVRAtWpo5qBmc2jLZLivURMx8T0GQomvNZesc="; + stripLen = 1; + } + ); nativeBuildInputs = [ cmake From 4965a358b19647194580c09da7fbf1ae3d017217 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 29 Jul 2025 06:00:53 -0600 Subject: [PATCH 115/152] audacity: unbreak --- pkgs/by-name/au/audacity/package.nix | 5 +++++ pkgs/by-name/au/audacity/rapidjson.patch | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/by-name/au/audacity/rapidjson.patch diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 563324bd94c4..60a0ce057c2a 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -70,6 +70,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kESKpIke9Xi4A55i3mUu1JkDjp8voBJBixiAK8pUkKA="; }; + patches = [ + # Introduced by https://github.com/Tencent/rapidjson/commit/b1c0c2843fcb2aca9ecc650fc035c57ffc13697c#diff-2f1bcf2729ff7c408adb0c2cc2cfa01602bd5646b05b3e4bc7e46b606035d249R21 + ./rapidjson.patch + ]; + postPatch = '' mkdir src/private substituteInPlace scripts/build/macOS/fix_bundle.py \ diff --git a/pkgs/by-name/au/audacity/rapidjson.patch b/pkgs/by-name/au/audacity/rapidjson.patch new file mode 100644 index 000000000000..66a64088e014 --- /dev/null +++ b/pkgs/by-name/au/audacity/rapidjson.patch @@ -0,0 +1,18 @@ +diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake +index ba95962..66a96a8 100644 +--- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake ++++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake +@@ -2,8 +2,11 @@ + + if(NOT ${_OPT}use_rapidjson STREQUAL "off") + if(NOT TARGET rapidjson::rapidjson) +- if(TARGET rapidjson) +- add_library( rapidjson::rapidjson ALIAS rapidjson ) ++ if(TARGET RapidJSON) ++ if(NOT TARGET rapidjson) ++ add_library(rapidjson ALIAS RapidJSON) ++ endif() ++ add_library( rapidjson::rapidjson ALIAS RapidJSON ) + else() + # At least on Arch RapidJSONConfig.cmake does not define a target at all + # so we have to do it ourselves From 87c2d987006e723ab51e9fbe32d0938e696f8020 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 12:15:54 +0000 Subject: [PATCH 116/152] rainfrog: 0.3.3 -> 0.3.4 --- pkgs/by-name/ra/rainfrog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 41ed10fbb1a1..88e8260022fd 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ rainfrog, }: let - version = "0.3.3"; + version = "0.3.4"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-nGUk+997TBx/2U3QMF4OpRqzwNzC0ILRraz3kOzzoBw="; + hash = "sha256-uERAYdDM2yKowl8WH6FB1XEbjSO/S79Fdib2QQE95N4="; }; - cargoHash = "sha256-8RvZmQI1WXfM2Sh5bMAkeJVNvOUp8fmM0MznZzCpxgY="; + cargoHash = "sha256-drL2rLuJExJI799Rvh0X/c6kTqJ+3wnqaDSRiz63Nuo="; passthru = { tests.version = testers.testVersion { From 6f2ad75d742ee1d5ec1c7be267ff261404c1b2d7 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 23 Apr 2025 22:17:57 +0200 Subject: [PATCH 117/152] linux_xanmod, linux_xanmod_latest: add update script Co-authored-by: Mathias Zhang --- .../os-specific/linux/kernel/update-xanmod.sh | 86 +++++++++++++++++++ .../linux/kernel/xanmod-kernels.nix | 7 ++ 2 files changed, 93 insertions(+) create mode 100755 pkgs/os-specific/linux/kernel/update-xanmod.sh diff --git a/pkgs/os-specific/linux/kernel/update-xanmod.sh b/pkgs/os-specific/linux/kernel/update-xanmod.sh new file mode 100755 index 000000000000..fd786872fd3c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/update-xanmod.sh @@ -0,0 +1,86 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style + +set -euo pipefail + +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" +FILE_PATH="$SCRIPT_DIR/xanmod-kernels.nix" + +get_old_version() { + local file_path="$1" + local variant="$2" + + grep -A 2 "$variant = {" "$file_path" | grep "version =" | cut -d '"' -f 2 +} + +VARIANT="${1:-lts}" +OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$(get_old_version "$FILE_PATH" "$VARIANT")} + +RELEASES=$(curl --silent https://gitlab.com/api/v4/projects/xanmod%2Flinux/releases) + +# list of URLs. latest first, oldest last +RELEASE_URLS=$(echo "$RELEASES" | jq '.[].assets.links.[0].name') + +while IFS= read -r url; do + # Get variant, version and suffix from url fields: + # 8 9 NF + # | | | + # https://...//- + release_variant=$(echo "$url" | awk -F'[/-]' '{print $8}') + release_version=$(echo "$url" | awk -F'[/-]' '{print $9}') + + # either xanmod1 or xanmod2 + suffix=$(echo "$url" | awk -F'[/-]' '{print $NF}') + + if [[ "$release_variant" == "$VARIANT" ]]; then + if [[ "$release_version" == "$OLD_VERSION" ]]; then + echo "Xanmod $VARIANT is up-to-date: ${OLD_VERSION}" + exit 0 + else + NEW_VERSION="$release_version" + SUFFIX="$suffix" + break + fi + fi +done < <(echo "$RELEASE_URLS" | jq -r) + +echo "Updating Xanmod \"$VARIANT\" from $OLD_VERSION to $NEW_VERSION ($SUFFIX)" + +URL="https://gitlab.com/api/v4/projects/xanmod%2Flinux/repository/archive.tar.gz?sha=$NEW_VERSION-$SUFFIX" +HASH="$(nix-prefetch fetchzip --quiet --url "$URL")" + +update_variant() { + local file_path="$1" + local variant="$2" + local new_version="$3" + local new_hash="$4" + local suffix="$5" + + # ${variant} = { <- range start + # version = ... + # hash = ... + # suffix = ... + # }; <- range end + range_start="^\s*$variant = {" + range_end="^\s*};" + + # - Update the version and hash using sed range addresses + # - Remove suffix line, if it exists + sed -i -e "/$range_start/,/$range_end/ { + s|^\s*version = \".*\";| version = \"$new_version\";|; + s|^\s*hash = \".*\";| hash = \"$new_hash\";|; + /^\s*suffix = /d + }" "$file_path" + + # Add suffix, if it's different than xanmod1 (the default) + if [[ "$suffix" != "xanmod1" ]]; then + sed -i -e "/$range_start/,/$range_end/ { + s|$range_end| suffix = \"$suffix\";\n };|; + }" "$file_path" + fi + + # Apply proper formatting + nixfmt "$file_path" +} + +update_variant "$FILE_PATH" "$VARIANT" "$NEW_VERSION" "$HASH" "$SUFFIX" diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 065eceed4008..5b68f009e3d8 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -13,10 +13,12 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit variants = { + # ./update-xanmod.sh lts lts = { version = "6.12.40"; hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0="; }; + # ./update-xanmod.sh main main = { version = "6.15.8"; hash = "sha256-P4DpTS0RhvsgBrNDsZMiA1NvCQucuPmJ4GDyF9mZ7ZU="; @@ -70,6 +72,11 @@ let RCU_EXP_KTHREAD = yes; }; + extraPassthru.updateScript = [ + ./update-xanmod.sh + variant + ]; + extraMeta = { branch = lib.versions.majorMinor version; maintainers = with lib.maintainers; [ From 6972e985953e4b04c4b1c03c22c2064276261c3c Mon Sep 17 00:00:00 2001 From: ulucs Date: Tue, 29 Jul 2025 14:19:34 +0200 Subject: [PATCH 118/152] awscli2: 2.27.50 -> 2.27.61 --- pkgs/by-name/aw/awscli2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 972a638c10ec..dd92d4bec69e 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -65,14 +65,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.27.50"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.27.61"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-ITiZ144YFhwuRcfhulLF0jxpp1OgznEE8frx4Yn4V+A="; + hash = "sha256-2lcPqNrGAHvPPVZIQaDbI54sQQ7OsOiMxUx6qg6WeNU="; }; postPatch = '' @@ -81,7 +81,7 @@ py.pkgs.buildPythonApplication rec { --replace-fail 'awscrt==' 'awscrt>=' \ --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ - --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' \ + --replace-fail 'prompt-toolkit>=3.0.24,<3.0.52' 'prompt-toolkit>=3.0.24' \ --replace-fail 'ruamel.yaml.clib>=0.2.0,<=0.2.12' 'ruamel.yaml.clib>=0.2.0' \ substituteInPlace requirements-base.txt \ From 8b309157eb21cfced4564999985d83feede778f4 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 29 Jul 2025 14:30:48 +0200 Subject: [PATCH 119/152] gopls: 0.19.1 -> 0.20.0 (#429336) Diff: https://github.com/golang/tools/compare/refs/tags/gopls/v0.19.1...gopls/v0.20.0 Changelog: https://github.com/golang/tools/releases/tag/gopls/v0.20.0 --- pkgs/by-name/go/gopls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix index bf31ed9b5e94..989467a30011 100644 --- a/pkgs/by-name/go/gopls/package.nix +++ b/pkgs/by-name/go/gopls/package.nix @@ -11,17 +11,17 @@ buildGoLatestModule (finalAttrs: { pname = "gopls"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; tag = "gopls/v${finalAttrs.version}"; - hash = "sha256-QJnLJNgFtc/MmJ5WWooKcavnPPTYuM4XhUHcbwlvMLY="; + hash = "sha256-DYYitsrdH4nujDFJgdkObEpgElhXI7Yk2IpA/EVVLVo="; }; modRoot = "gopls"; - vendorHash = "sha256-P5wUGXmVvaRUpzmv/SPX8OpCXOCOg6nBI544puNOWCE="; + vendorHash = "sha256-J6QcefSs4XtnktlzG+/+aY6fqkHGd9MMZqi24jAwcd0="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${finalAttrs.version}" ]; From 8d8abd38c710d3d8fd8ce9339237b13a7dc6c594 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 29 Jul 2025 15:35:15 +0300 Subject: [PATCH 120/152] comma: 2.3.0 -> 2.3.3 Diff: https://www.github.com/nix-community/comma/compare/v2.3.0...v2.3.3 --- pkgs/by-name/co/comma/package.nix | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix index 8a17f78a76a3..779537f11180 100644 --- a/pkgs/by-name/co/comma/package.nix +++ b/pkgs/by-name/co/comma/package.nix @@ -1,6 +1,7 @@ { comma, fetchFromGitHub, + installShellFiles, fzy, lib, nix-index-unwrapped, @@ -11,16 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "2.3.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-JogC9NIS71GyimpqmX2/dhBX1IucK395iWZVVabZxiE="; + hash = "sha256-dNek1a8Yt3icWc8ZpVe1NGuG+eSoTDOmAAJbkYmMocU="; }; - cargoHash = "sha256-Cd4WaOG+OkCM4Q1K9qVzMYOjSi9U8W82JypqUN20x9w="; + cargoHash = "sha256-SJBfWjOVrv2WMIh/cQbaFK8jn3oSbmJpdJM7pkJppDs="; + + nativeBuildInputs = [ installShellFiles ]; postPatch = '' substituteInPlace ./src/main.rs \ @@ -33,20 +36,21 @@ rustPlatform.buildRustPackage rec { postInstall = '' ln -s $out/bin/comma $out/bin/, - mkdir -p $out/etc/profile.d - mkdir -p $out/etc/nushell - mkdir -p $out/etc/fish/functions + mkdir -p $out/share/comma - cp $src/etc/comma-command-not-found.sh $out/etc/profile.d - cp $src/etc/comma-command-not-found.nu $out/etc/nushell - cp $src/etc/comma-command-not-found.fish $out/etc/fish/functions + cp $src/etc/command-not-found.sh $out/share/comma + cp $src/etc/command-not-found.nu $out/share/comma + cp $src/etc/command-not-found.fish $out/share/comma - patchShebangs $out/etc/profile.d/comma-command-not-found.sh + patchShebangs $out/share/comma/command-not-found.sh substituteInPlace \ - "$out/etc/profile.d/comma-command-not-found.sh" \ - "$out/etc/nushell/comma-command-not-found.nu" \ - "$out/etc/fish/functions/comma-command-not-found.fish" \ + "$out/share/comma/command-not-found.sh" \ + "$out/share/comma/command-not-found.nu" \ + "$out/share/comma/command-not-found.fish" \ --replace-fail "comma --ask" "$out/bin/comma --ask" + + "$out/bin/comma" --mangen > comma.1 + installManPage comma.1 ''; passthru.tests = { From a1ed19f38db723e340d7e9f051b86baf7cdbc2d0 Mon Sep 17 00:00:00 2001 From: Benedikt von Blomberg Date: Wed, 9 Jul 2025 21:29:35 +0200 Subject: [PATCH 121/152] nixos/services.ddclient: add secretsFile option --- .../modules/services/networking/ddclient.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 54e8423ebb74..282641f636df 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -19,11 +19,15 @@ let ${lib.optionalString (cfg.use == "" && cfg.usev4 != "") "usev4=${cfg.usev4}"} ${lib.optionalString (cfg.use == "" && cfg.usev6 != "") "usev6=${cfg.usev6}"} login=${cfg.username} - password=${ + ${ if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" + else if (cfg.passwordFile != null) then + "password=@password_placeholder@" + else if (cfg.secretsFile != null) then + "@secrets_placeholder@" else - "@password_placeholder@" + "" } protocol=${cfg.protocol} ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} @@ -49,6 +53,10 @@ let '' "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf" '' + else if (cfg.secretsFile != null) then + '' + "${pkgs.replace-secret}/bin/replace-secret" "@secrets_placeholder@" "${cfg.secretsFile}" "/run/${RuntimeDirectory}/ddclient.conf" + '' else '' sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf @@ -126,6 +134,16 @@ in ''; }; + secretsFile = lib.mkOption { + default = null; + type = nullOr str; + description = '' + A file containing the secrets for the dynamic DNS provider. + This file should contain lines of valid secrets in the format specified by the ddclient documentation. + If this option is set, it overrides the `passwordFile` option. + ''; + }; + interval = lib.mkOption { default = "10min"; type = str; From 38a03fc48059fd2420519d037e648b4110343f2a Mon Sep 17 00:00:00 2001 From: Benedikt von Blomberg Date: Wed, 9 Jul 2025 23:02:44 +0200 Subject: [PATCH 122/152] nixos/services.ddclient: make username optional --- nixos/modules/services/networking/ddclient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 282641f636df..17fa7a2f7f6e 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -18,7 +18,7 @@ let ${lib.optionalString (cfg.use != "") "use=${cfg.use}"} ${lib.optionalString (cfg.use == "" && cfg.usev4 != "") "usev4=${cfg.usev4}"} ${lib.optionalString (cfg.use == "" && cfg.usev6 != "") "usev6=${cfg.usev6}"} - login=${cfg.username} + ${lib.optionalString (cfg.username != "") "login=${cfg.username}"} ${ if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" From 4f6691c9fffa5fb20817b4bbbfeeaed570c59317 Mon Sep 17 00:00:00 2001 From: Benedikt von Blomberg Date: Fri, 25 Jul 2025 20:27:21 +0200 Subject: [PATCH 123/152] nixos/ddclient: added assertions for passwordFile and secretsFile nix fmt --- nixos/modules/services/networking/ddclient.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 17fa7a2f7f6e..fed65ee8ec16 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -262,6 +262,17 @@ in lib.optional (cfg.use != "") "Setting `use` is deprecated, ddclient now supports `usev4` and `usev6` for separate IPv4/IPv6 configuration."; + assertions = [ + { + assertion = !((cfg.passwordFile != null) && (cfg.secretsFile != null)); + message = "You cannot use both services.ddclient.passwordFile and services.ddclient.secretsFile at the same time."; + } + { + assertion = !(cfg.protocol == "nsupdate") || (cfg.passwordFile == null && cfg.secretsFile == null); + message = "You cannot use services.ddclient.passwordFile and or services.ddclient.secretsFile when services.ddclient.protocol is \"nsupdate\"."; + } + ]; + systemd.services.ddclient = { description = "Dynamic DNS Client"; wantedBy = [ "multi-user.target" ]; From 5b0c037b12fa8cd42b10328735362772066f23c0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 29 Jul 2025 15:28:43 +0200 Subject: [PATCH 124/152] vscode-extensions.dbaeumer.vscode-eslint: 3.0.13 -> 3.0.15 Also remove the obsolete code similar to https://github.com/NixOS/nixpkgs/pull/429239 --- .../dbaeumer.vscode-eslint/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix index 1e4a7d7069a1..f491c138677b 100644 --- a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -1,31 +1,16 @@ { - jq, lib, - moreutils, vscode-utils, - eslint, }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "3.0.13"; - hash = "sha256-l5VvhQPxPaQsPhXUbFW2yGJjaqnNvijn4QkXPjf1WXo="; + version = "3.0.15"; + hash = "sha256-oeudNCBrHO3yvw3FrFA4EZk1yODcRRfF/y3U5tdEz4I="; }; - nativeBuildInputs = [ - jq - moreutils - ]; - - buildInputs = [ eslint ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."eslint.nodePath".default = "${eslint}/lib/node_modules"' package.json | sponge package.json - ''; - meta = { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; description = "Integrates ESLint JavaScript into VS Code"; From e186d064fee9b9fdec57710e4dae17cae3b1c823 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 13:48:09 +0000 Subject: [PATCH 125/152] knot-dns: 3.4.7 -> 3.4.8 --- pkgs/by-name/kn/knot-dns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index b1402ea7fe56..fba4e166463d 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.4.7"; + version = "3.4.8"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "sha256-3TRspvOvq83F6boJ3WZ7AQWQu2akL0VBAh+51vBz2sw="; + sha256 = "sha256-ZzCnPb/BLXnYAA/+ItNtBot0Z+dL7h6xIqxJNezqSfk="; }; outputs = [ From cef00dea4e65b97f8342ad2f99d197c49df98fc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 13:48:39 +0000 Subject: [PATCH 126/152] clever-tools: 3.13.1 -> 3.14.0 --- pkgs/by-name/cl/clever-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 22bbb16711b4..29e1811eaf3b 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.13.1"; + version = "3.14.0"; nodejs = nodejs_20; @@ -19,10 +19,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-6QzwZmDCts/ci0J2ok1Met9bNiqDHmdYj/PbvWyd4Wk="; + hash = "sha256-gBmYbnKsnqZ4KqjJhNmLB7lzIh3MztmcFVAPtz0dB2A="; }; - npmDepsHash = "sha256-H53g1hbVpArFNy47M5QS2/diWbEyyoLOf86OxVffvwQ="; + npmDepsHash = "sha256-e3H3nLZZHZ+FX0JTPZXX+YknudnzcAKV6o2bqecZTBA="; nativeBuildInputs = [ installShellFiles From f0bf50c97687c333d48c11ee0b5cdc952d57b8cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 14:33:37 +0000 Subject: [PATCH 127/152] jqfmt: 0-unstable-2024-08-15 -> 0-unstable-2025-07-28 --- pkgs/by-name/jq/jqfmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jq/jqfmt/package.nix b/pkgs/by-name/jq/jqfmt/package.nix index 066b72db67c3..2b061f39d9d1 100644 --- a/pkgs/by-name/jq/jqfmt/package.nix +++ b/pkgs/by-name/jq/jqfmt/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "jqfmt"; - version = "0-unstable-2024-08-15"; + version = "0-unstable-2025-07-28"; src = fetchFromGitHub { owner = "noperator"; repo = "jqfmt"; - rev = "8fc6f864c295e6bd6b08f36f503b3d809270da61"; - hash = "sha256-tvFp1SJeosJdCHs3c+vceBfacypJc/aFYSj55mBfkB8="; + rev = "74b59e03caff3ac5a8c061088d2c228a5c27b171"; + hash = "sha256-3PYIyjZm265atBAfuj5aHmWoAv4H29I7gN4/rjl1d0o="; }; vendorHash = "sha256-avpZSgQKFZxLmYGj+2Gi+wSDHnAgF0/hyp4HtoQ0ZCo="; From 771735756d08c29f665450b29bd70775987c2ca7 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 28 Jul 2025 14:11:21 +0000 Subject: [PATCH 128/152] wofi-power-menu: 0.2.9 -> 0.3.0 Changelog: https://github.com/szaffarano/wofi-power-menu/releases/tag/v0.3.0 Diff: https://github.com/szaffarano/wofi-power-menu/compare/v0.2.9...v0.3.0 --- pkgs/by-name/wo/wofi-power-menu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index b57e0b7aaf98..da3c7ba5791c 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wofi-power-menu"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "szaffarano"; repo = "wofi-power-menu"; tag = "v${finalAttrs.version}"; - hash = "sha256-xio/Gt37PJ/0Di22na4USmfah2GV+xM2eV4NnGBeVfY="; + hash = "sha256-/MoMgOrpM0KHIyxqOJmC5N5NddOVVfTs5fDt1/yiBtQ="; }; - cargoHash = "sha256-diDLKP7JGzrXgdZMwSmg70dbFlMLLWp4Ad/ejjiOSlc="; + cargoHash = "sha256-PWPMBYmB1lyCJFhodNSCicYJy29vEUx6k9ScQTPbZdg="; nativeBuildInputs = [ makeWrapper ]; From 67b8572515cf7de49923fc551d3879d8a616b520 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 28 Jul 2025 14:11:08 +0000 Subject: [PATCH 129/152] olivetin: 2025.7.19 -> 2025.7.28 Changelog: https://github.com/OliveTin/OliveTin/releases/tag/2025.7.28 Diff: https://github.com/OliveTin/OliveTin/compare/2025.7.19...2025.7.28 --- pkgs/by-name/ol/olivetin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix index 1b08eb5882b8..b2a4d4eca800 100644 --- a/pkgs/by-name/ol/olivetin/package.nix +++ b/pkgs/by-name/ol/olivetin/package.nix @@ -81,13 +81,13 @@ buildGoModule ( { pname = "olivetin"; - version = "2025.7.19"; + version = "2025.7.28"; src = fetchFromGitHub { owner = "OliveTin"; repo = "OliveTin"; tag = finalAttrs.version; - hash = "sha256-F1AJ4kbFx+L/t1TSsjbDM761LtA2M9exfjWd9VwRZuE="; + hash = "sha256-gh0Nc7h2Z+Nz7TixmHihFAHI0X0Y2ZeA4OMv3jOYlh4="; }; modRoot = "service"; From d70497532e84c469d0a74a50691e5bcb76209b73 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 28 Jul 2025 14:11:03 +0000 Subject: [PATCH 130/152] tokei: 13.0.0-alpha.8 -> 13.0.0-alpha.9 Changelog: https://github.com/XAMPPRocky/tokei/blob/v13.0.0-alpha.9/CHANGELOG.md Diff: https://github.com/XAMPPRocky/tokei/compare/v13.0.0-alpha.8...v13.0.0-alpha.9 --- pkgs/by-name/to/tokei/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix index 5be24a13671d..dc6d97745131 100644 --- a/pkgs/by-name/to/tokei/package.nix +++ b/pkgs/by-name/to/tokei/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tokei"; - version = "13.0.0-alpha.8"; + version = "13.0.0-alpha.9"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = "tokei"; tag = "v${finalAttrs.version}"; - hash = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE="; + hash = "sha256-OSIJYSUwc8SvszEOMgt+d/ljCW2jtBkPw6buof4JpUc="; }; patches = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }) ]; - cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ="; + cargoHash = "sha256-FIT+c2YzGxJEvLB5uqkdVLWkQ/wlrbCrAkSQEoS4kJw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; From c53516fd566d491d7a32fe5262d046dcaf231334 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Sat, 8 Feb 2025 00:48:03 +0000 Subject: [PATCH 131/152] umami: init at 2.19.0 --- pkgs/by-name/um/umami/package.nix | 197 +++++++++++++++++++++++++++++ pkgs/by-name/um/umami/sources.json | 7 + pkgs/by-name/um/umami/update.sh | 50 ++++++++ 3 files changed, 254 insertions(+) create mode 100644 pkgs/by-name/um/umami/package.nix create mode 100644 pkgs/by-name/um/umami/sources.json create mode 100755 pkgs/by-name/um/umami/update.sh diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix new file mode 100644 index 000000000000..1827473b1a52 --- /dev/null +++ b/pkgs/by-name/um/umami/package.nix @@ -0,0 +1,197 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchurl, + makeWrapper, + nodejs, + pnpm_10, + prisma-engines, + openssl, + rustPlatform, + # build variables + databaseType ? "postgresql", + collectApiEndpoint ? "", + trackerScriptNames ? [ ], + basePath ? "", +}: +let + sources = lib.importJSON ./sources.json; + pnpm = pnpm_10; + + geocities = stdenvNoCC.mkDerivation { + pname = "umami-geocities"; + version = sources.geocities.date; + src = fetchurl { + url = "https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/${sources.geocities.rev}/redist/GeoLite2-City.tar.gz"; + inherit (sources.geocities) hash; + }; + + doBuild = false; + + installPhase = '' + mkdir -p $out + cp ./GeoLite2-City.mmdb $out/GeoLite2-City.mmdb + ''; + + meta.license = lib.licenses.cc-by-40; + }; + + # Pin the specific version of prisma to the one used by upstream + # to guarantee compatibility. + prisma-engines' = prisma-engines.overrideAttrs (old: rec { + version = "6.7.0"; + src = fetchFromGitHub { + owner = "prisma"; + repo = "prisma-engines"; + tag = version; + hash = "sha256-Ty8BqWjZluU6a5xhSAVb2VoTVY91UUj6zoVXMKeLO4o="; + }; + cargoHash = "sha256-HjDoWa/JE6izUd+hmWVI1Yy3cTBlMcvD9ANsvqAoHBI="; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (old) pname; + inherit src version; + hash = cargoHash; + }; + }); +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "umami"; + version = "2.19.0"; + + nativeBuildInputs = [ + makeWrapper + nodejs + pnpm.configHook + ]; + + src = fetchFromGitHub { + owner = "umami-software"; + repo = "umami"; + tag = "v${finalAttrs.version}"; + hash = "sha256-luiwGmCujbFGWANSCOiHIov56gsMQ6M+Bj0stcz9he8="; + }; + + # install dev dependencies as well, for rollup + pnpmInstallFlags = [ "--prod=false" ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) + pname + pnpmInstallFlags + version + src + ; + fetcherVersion = 2; + hash = "sha256-2GiCeCt/mU5Dm5YHQgJF3127WPHq5QLX8JRcUv6B6lE="; + }; + + env.CYPRESS_INSTALL_BINARY = "0"; + env.NODE_ENV = "production"; + env.NEXT_TELEMETRY_DISABLED = "1"; + + # copy-db-files uses this variable to decide which Prisma schema to use + env.DATABASE_TYPE = databaseType; + + env.COLLECT_API_ENDPOINT = collectApiEndpoint; + env.TRACKER_SCRIPT_NAME = lib.concatStringsSep "," trackerScriptNames; + env.BASE_PATH = basePath; + + # Allow prisma-cli to find prisma-engines without having to download them + env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines'}/lib/libquery_engine.node"; + env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines'}/bin/schema-engine"; + + buildPhase = '' + runHook preBuild + + pnpm copy-db-files + pnpm build-db-client # prisma generate + + pnpm build-tracker + pnpm build-app + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + pnpm test + + runHook postCheck + ''; + + doCheck = true; + + installPhase = '' + runHook preInstall + + mv .next/standalone $out + mv .next/static $out/.next/static + + # Include prisma cli in next standalone build. + # This is preferred to using the prisma in nixpkgs because it guarantees + # the version matches. + # See https://nextjs-forum.com/post/1280550687998083198 + # and https://nextjs.org/docs/pages/api-reference/config/next-config-js/output#caveats + # Unfortunately, using outputFileTracingIncludes doesn't work because of pnpm's symlink structure, + # so we just copy the files manually. + mkdir -p $out/node_modules/.bin + cp node_modules/.bin/prisma $out/node_modules/.bin + cp -a node_modules/prisma $out/node_modules + cp -a node_modules/.pnpm/@prisma* $out/node_modules/.pnpm + cp -a node_modules/.pnpm/prisma* $out/node_modules/.pnpm + # remove broken symlinks (some dependencies that are not relevant for running migrations) + find "$out"/node_modules/.pnpm/@prisma* -xtype l -exec rm {} \; + find "$out"/node_modules/.pnpm/prisma* -xtype l -exec rm {} \; + + cp -R public $out/public + cp -R prisma $out/prisma + + ln -s ${geocities} $out/geo + + mkdir -p $out/bin + # Run database migrations before starting umami. + # Add openssl to PATH since it is required for prisma to make SSL connections. + # Force working directory to $out because umami assumes many paths are relative to it (e.g., prisma and geolite). + makeWrapper ${nodejs}/bin/node $out/bin/umami-server \ + --set NODE_ENV production \ + --set NEXT_TELEMETRY_DISABLED 1 \ + --set PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines'}/lib/libquery_engine.node" \ + --set PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines'}/bin/schema-engine" \ + --prefix PATH : ${ + lib.makeBinPath [ + openssl + nodejs + ] + } \ + --chdir $out \ + --run "$out/node_modules/.bin/prisma migrate deploy" \ + --add-flags "$out/server.js" + + runHook postInstall + ''; + + passthru = { + inherit + sources + geocities + ; + prisma-engines = prisma-engines'; + updateScript = ./update.sh; + }; + + meta = with lib; { + changelog = "https://github.com/umami-software/umami/releases/tag/v${finalAttrs.version}"; + description = "Simple, easy to use, self-hosted web analytics solution"; + homepage = "https://umami.is/"; + license = with lib.licenses; [ + mit + cc-by-40 # geocities + ]; + platforms = lib.platforms.linux; + mainProgram = "umami-server"; + maintainers = with maintainers; [ diogotcorreia ]; + }; +}) diff --git a/pkgs/by-name/um/umami/sources.json b/pkgs/by-name/um/umami/sources.json new file mode 100644 index 000000000000..6406373132a5 --- /dev/null +++ b/pkgs/by-name/um/umami/sources.json @@ -0,0 +1,7 @@ +{ + "geocities": { + "rev": "0817bc800279e26e9ff045b7b129385e5b23012e", + "date": "2025-07-29", + "hash": "sha256-Rw9UEvUu7rtXFvHEqKza6kn9LwT6C17zJ/ljoN+t6Ek=" + } +} diff --git a/pkgs/by-name/um/umami/update.sh b/pkgs/by-name/um/umami/update.sh new file mode 100755 index 000000000000..adfec921a26f --- /dev/null +++ b/pkgs/by-name/um/umami/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq prefetch-yarn-deps nix-prefetch-github coreutils nix-update +# shellcheck shell=bash + +# This script exists to update geocities version and pin prisma-engines version + +set -euo pipefail +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" + +old_version=$(nix-instantiate --eval -A 'umami.version' default.nix | tr -d '"' || echo "0.0.1") +version=$(curl -s "https://api.github.com/repos/umami-software/umami/releases/latest" | jq -r ".tag_name") +version="${version#v}" + +echo "Updating to $version" + +if [[ "$old_version" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +nix-update --version "$version" umami + +echo "Fetching geolite" +geocities_rev_date=$(curl https://api.github.com/repos/GitSquared/node-geolite2-redist/branches/master | jq -r ".commit.sha, .commit.commit.author.date") +geocities_rev=$(echo "$geocities_rev_date" | head -1) +geocities_date=$(echo "$geocities_rev_date" | tail -1 | sed 's/T.*//') + +# upstream is kind enough to provide a file with the hash of the tar.gz archive +geocities_hash=$(curl -s "https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/$geocities_rev/redist/GeoLite2-City.tar.gz.sha256") +geocities_hash_sri=$(nix-hash --to-sri --type sha256 "$geocities_hash") + +cat < "$SCRIPT_DIR/sources.json" +{ + "geocities": { + "rev": "$geocities_rev", + "date": "$geocities_date", + "hash": "$geocities_hash_sri" + } +} +EOF + +echo "Pinning Prisma version" +upstream_src="https://raw.githubusercontent.com/umami-software/umami/v$version" + +lock=$(mktemp) +curl -s -o "$lock" "$upstream_src/pnpm-lock.yaml" +prisma_version=$(grep "@prisma/engines@" "$lock" | head -n1 | awk -F"[@']" '{print $4}') +rm "$lock" + +nix-update --version "$prisma_version" umami.prisma-engines From 6d61e7b089e64c81db4abb72a63e5e651bbd285b Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 10 Feb 2025 00:51:15 +0000 Subject: [PATCH 132/152] nixos/umami: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/umami.nix | 316 ++++++++++++++++++++++ 2 files changed, 317 insertions(+) create mode 100644 nixos/modules/services/web-apps/umami.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 45b0b5c1fd7c..572d29b0675c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1683,6 +1683,7 @@ ./services/web-apps/szurubooru.nix ./services/web-apps/trilium.nix ./services/web-apps/tt-rss.nix + ./services/web-apps/umami.nix ./services/web-apps/vikunja.nix ./services/web-apps/wakapi.nix ./services/web-apps/weblate.nix diff --git a/nixos/modules/services/web-apps/umami.nix b/nixos/modules/services/web-apps/umami.nix new file mode 100644 index 000000000000..41593ed69a57 --- /dev/null +++ b/nixos/modules/services/web-apps/umami.nix @@ -0,0 +1,316 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + concatStringsSep + filterAttrs + getExe + hasPrefix + hasSuffix + isString + literalExpression + maintainers + mapAttrs + mkEnableOption + mkIf + mkOption + mkPackageOption + optional + optionalString + types + ; + + cfg = config.services.umami; + + nonFileSettings = filterAttrs (k: _: !hasSuffix "_FILE" k) cfg.settings; +in +{ + options.services.umami = { + enable = mkEnableOption "umami"; + + package = mkPackageOption pkgs "umami" { } // { + apply = + pkg: + pkg.override { + databaseType = cfg.settings.DATABASE_TYPE; + collectApiEndpoint = optionalString ( + cfg.settings.COLLECT_API_ENDPOINT != null + ) cfg.settings.COLLECT_API_ENDPOINT; + trackerScriptNames = cfg.settings.TRACKER_SCRIPT_NAME; + basePath = cfg.settings.BASE_PATH; + }; + }; + + createPostgresqlDatabase = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to automatically create the database for Umami using PostgreSQL. + Both the database name and username will be `umami`, and the connection is + made through unix sockets using peer authentication. + ''; + }; + + settings = mkOption { + description = '' + Additional configuration (environment variables) for Umami, see + for supported values. + ''; + + type = types.submodule { + freeformType = + with types; + attrsOf (oneOf [ + bool + int + str + ]); + + options = { + APP_SECRET_FILE = mkOption { + type = types.nullOr ( + types.str + // { + # We don't want users to be able to pass a path literal here but + # it should look like a path. + check = it: isString it && types.path.check it; + } + ); + default = null; + example = "/run/secrets/umamiAppSecret"; + description = '' + A file containing a secure random string. This is used for signing user sessions. + The contents of the file are read through systemd credentials, therefore the + user running umami does not need permissions to read the file. + If you wish to set this to a string instead (not recommended since it will be + placed world-readable in the Nix store), you can use the APP_SECRET option. + ''; + }; + DATABASE_URL = mkOption { + type = types.nullOr ( + types.str + // { + check = + it: + isString it + && ((hasPrefix "postgresql://" it) || (hasPrefix "postgres://" it) || (hasPrefix "mysql://" it)); + } + ); + # For some reason, Prisma requires the username in the connection string + # and can't derive it from the current user. + default = + if cfg.createPostgresqlDatabase then + "postgresql://umami@localhost/umami?host=/run/postgresql" + else + null; + defaultText = literalExpression ''if config.services.umami.createPostgresqlDatabase then "postgresql://umami@localhost/umami?host=/run/postgresql" else null''; + example = "postgresql://root:root@localhost/umami"; + description = '' + Connection string for the database. Must start with `postgresql://`, `postgres://` + or `mysql://`. + ''; + }; + DATABASE_URL_FILE = mkOption { + type = types.nullOr ( + types.str + // { + # We don't want users to be able to pass a path literal here but + # it should look like a path. + check = it: isString it && types.path.check it; + } + ); + default = null; + example = "/run/secrets/umamiDatabaseUrl"; + description = '' + A file containing a connection string for the database. The connection string + must start with `postgresql://`, `postgres://` or `mysql://`. + If using this, then DATABASE_TYPE must be set to the appropriate value. + The contents of the file are read through systemd credentials, therefore the + user running umami does not need permissions to read the file. + ''; + }; + DATABASE_TYPE = mkOption { + type = types.nullOr ( + types.enum [ + "postgresql" + "mysql" + ] + ); + default = + if cfg.settings.DATABASE_URL != null && hasPrefix "mysql://" cfg.settings.DATABASE_URL then + "mysql" + else + "postgresql"; + defaultText = literalExpression ''if config.services.umami.settings.DATABASE_URL != null && hasPrefix "mysql://" config.services.umami.settings.DATABASE_URL then "mysql" else "postgresql"''; + example = "mysql"; + description = '' + The type of database to use. This is automatically inferred from DATABASE_URL, but + must be set manually if you are using DATABASE_URL_FILE. + ''; + }; + COLLECT_API_ENDPOINT = mkOption { + type = types.nullOr types.str; + default = null; + example = "/api/alternate-send"; + description = '' + Allows you to send metrics to a location different than the default `/api/send`. + ''; + }; + TRACKER_SCRIPT_NAME = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "tracker.js" ]; + description = '' + Allows you to assign a custom name to the tracker script different from the default `script.js`. + ''; + }; + BASE_PATH = mkOption { + type = types.str; + default = ""; + example = "/analytics"; + description = '' + Allows you to host Umami under a subdirectory. + You may need to update your reverse proxy settings to correctly handle the BASE_PATH prefix. + ''; + }; + DISABLE_UPDATES = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Disables the check for new versions of Umami. + ''; + }; + DISABLE_TELEMETRY = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Umami collects completely anonymous telemetry data in order help improve the application. + You can choose to disable this if you don't want to participate. + ''; + }; + HOSTNAME = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = '' + The address to listen on. + ''; + }; + PORT = mkOption { + type = types.port; + default = 3000; + example = 3010; + description = '' + The port to listen on. + ''; + }; + }; + }; + + default = { }; + + example = { + APP_SECRET_FILE = "/run/secrets/umamiAppSecret"; + DISABLE_TELEMETRY = true; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.settings.APP_SECRET_FILE != null) != (cfg.settings ? APP_SECRET); + message = "One (and only one) of services.umami.settings.APP_SECRET_FILE and services.umami.settings.APP_SECRET must be set."; + } + { + assertion = (cfg.settings.DATABASE_URL_FILE != null) != (cfg.settings.DATABASE_URL != null); + message = "One (and only one) of services.umami.settings.DATABASE_URL_FILE and services.umami.settings.DATABASE_URL must be set."; + } + { + assertion = + cfg.createPostgresqlDatabase + -> cfg.settings.DATABASE_URL == "postgresql://umami@localhost/umami?host=/run/postgresql"; + message = "The option config.services.umami.createPostgresqlDatabase is enabled, but config.services.umami.settings.DATABASE_URL has been modified."; + } + ]; + + services.postgresql = mkIf cfg.createPostgresqlDatabase { + enable = true; + ensureDatabases = [ "umami" ]; + ensureUsers = [ + { + name = "umami"; + ensureDBOwnership = true; + ensureClauses.login = true; + } + ]; + }; + + systemd.services.umami = { + environment = mapAttrs (_: toString) nonFileSettings; + + description = "Umami: a simple, fast, privacy-focused alternative to Google Analytics"; + after = [ "network.target" ] ++ (optional (cfg.createPostgresqlDatabase) "postgresql.service"); + wantedBy = [ "multi-user.target" ]; + + script = + let + loadCredentials = + (optional ( + cfg.settings.APP_SECRET_FILE != null + ) ''export APP_SECRET="$(systemd-creds cat appSecret)"'') + ++ (optional ( + cfg.settings.DATABASE_URL_FILE != null + ) ''export DATABASE_URL="$(systemd-creds cat databaseUrl)"''); + in + '' + ${concatStringsSep "\n" loadCredentials} + ${getExe cfg.package} + ''; + + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = 3; + DynamicUser = true; + + LoadCredential = + (optional (cfg.settings.APP_SECRET_FILE != null) "appSecret:${cfg.settings.APP_SECRET_FILE}") + ++ (optional ( + cfg.settings.DATABASE_URL_FILE != null + ) "databaseUrl:${cfg.settings.DATABASE_URL_FILE}"); + + # Hardening + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + PrivateUsers = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = (optional cfg.createPostgresqlDatabase "AF_UNIX") ++ [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + }; + }; + }; + + meta.maintainers = with maintainers; [ diogotcorreia ]; +} From 5d6b6bad55de551f493d211b973822841e8ef69e Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 10 Feb 2025 00:52:55 +0000 Subject: [PATCH 133/152] doc: add services.umami to 25.11 release notes --- nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 588eff3b51b5..e92d82e69214 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -23,6 +23,8 @@ - [Fediwall](https://fediwall.social), a web application for live displaying toots from mastodon, inspired by mastowall. Available as [services.fediwall](#opt-services.fediwall.enable). +- [umami](https://github.com/umami-software/umami), a simple, fast, privacy-focused alternative to Google Analytics. Available with [services.umami](#opt-services.umami.enable). + - [FileBrowser](https://filebrowser.org/), a web application for managing and sharing files. Available as [services.filebrowser](#opt-services.filebrowser.enable). - Options under [networking.getaddrinfo](#opt-networking.getaddrinfo.enable) are now allowed to declaratively configure address selection and sorting behavior of `getaddrinfo` in dual-stack networks. From 35b5939fee8e27e6253afea0e51cd9fdcb02aca0 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 10 Feb 2025 13:39:09 +0000 Subject: [PATCH 134/152] nixos/tests/umami: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/web-apps/umami.nix | 45 +++++++++++++++++++++++++++++++ pkgs/by-name/um/umami/package.nix | 4 +++ 3 files changed, 50 insertions(+) create mode 100644 nixos/tests/web-apps/umami.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fd7caf0bacf6..85088c6b29a9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1489,6 +1489,7 @@ in ucarp = runTest ./ucarp.nix; udisks2 = runTest ./udisks2.nix; ulogd = runTest ./ulogd/ulogd.nix; + umami = runTest ./web-apps/umami.nix; umurmur = runTest ./umurmur.nix; unbound = runTest ./unbound.nix; unifi = runTest ./unifi.nix; diff --git a/nixos/tests/web-apps/umami.nix b/nixos/tests/web-apps/umami.nix new file mode 100644 index 000000000000..6004ae68226b --- /dev/null +++ b/nixos/tests/web-apps/umami.nix @@ -0,0 +1,45 @@ +{ lib, ... }: +{ + name = "umami-nixos"; + + meta.maintainers = with lib.maintainers; [ diogotcorreia ]; + + nodes.machine = + { pkgs, ... }: + { + services.umami = { + enable = true; + settings = { + APP_SECRET = "very_secret"; + }; + }; + }; + + testScript = '' + import json + + machine.wait_for_unit("umami.service") + + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000/") + machine.succeed("curl --fail http://localhost:3000/script.js") + + res = machine.succeed(""" + curl -f --json '{ "username": "admin", "password": "umami" }' http://localhost:3000/api/auth/login + """) + token = json.loads(res)['token'] + + res = machine.succeed(""" + curl -f -H 'Authorization: Bearer %s' --json '{ "domain": "localhost", "name": "Test" }' http://localhost:3000/api/websites + """ % token) + print(res) + websiteId = json.loads(res)['id'] + + res = machine.succeed(""" + curl -f -H 'Authorization: Bearer %s' http://localhost:3000/api/websites/%s + """ % (token, websiteId)) + website = json.loads(res) + assert website["name"] == "Test" + assert website["domain"] == "localhost" + ''; +} diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 1827473b1a52..bcbc6140f01b 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchurl, makeWrapper, + nixosTests, nodejs, pnpm_10, prisma-engines, @@ -174,6 +175,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { + tests = { + inherit (nixosTests) umami; + }; inherit sources geocities From de923637cb6828136ef4d9beea228d95ac07dfd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 15:05:53 +0000 Subject: [PATCH 135/152] artichoke: 0-unstable-2025-06-18 -> 0-unstable-2025-07-28 --- pkgs/by-name/ar/artichoke/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix index 55593a0e617c..7282ca4388be 100644 --- a/pkgs/by-name/ar/artichoke/package.nix +++ b/pkgs/by-name/ar/artichoke/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage { pname = "artichoke"; - version = "0-unstable-2025-06-18"; + version = "0-unstable-2025-07-28"; src = fetchFromGitHub { owner = "artichoke"; repo = "artichoke"; - rev = "94921a493f680381c83465e5c50e5d494a7048f6"; - hash = "sha256-JdCGCvs7GK/I3yyIl4n9OGtN9VwzmwdDdglwbTHfx0Y="; + rev = "148d3bf4bc361fa3214c02219e50e22e4cf2a3cf"; + hash = "sha256-CKCRFSg8ROMhKwiIDU9iAYY/HfGtYlW1zrtn7thxIzY="; }; cargoHash = "sha256-a43awTdhOlu+KO3B6XQ7Vdv4NbZ3iffq4rpmBBgUcZ8="; From 94864a7d9801f7e0b887ab3d6435640e363da961 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 15:11:32 +0000 Subject: [PATCH 136/152] openlist: 4.0.8 -> 4.0.9 --- pkgs/by-name/op/openlist/frontend.nix | 8 ++++---- pkgs/by-name/op/openlist/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index 6f0ac2f559c4..59afc5d372e3 100644 --- a/pkgs/by-name/op/openlist/frontend.nix +++ b/pkgs/by-name/op/openlist/frontend.nix @@ -10,18 +10,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "openlist-frontend"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList-Frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-q/FZ9SMdNDPHmZlNeh8GcyRE6iwvI7X+Ic8InerjOps="; + hash = "sha256-QR5Rh09pO7j9ecmHTbm64Om/rhqX8XaczNqAHMO1XiU="; }; i18n = fetchzip { url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz"; - hash = "sha256-Doomu3ZkHuUI2V4rRKo8XiOgzS4c35ealOb3iMI/RMg="; + hash = "sha256-hBo9fUctSuQG5dP2e3VCNOnT7Koxkdk0olSef0vjR6I="; stripRoot = false; }; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-PTZ+Vhg3hNnORnulkzuVg6TF/jY0PvUWYja9z7S4GdM="; + hash = "sha256-ty9mElTSiDbXHm9vgguzszY/F+YP8hPfbAlQnjdAaJE="; }; buildPhase = '' diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix index 12d2ed62d956..706d65f3344c 100644 --- a/pkgs/by-name/op/openlist/package.nix +++ b/pkgs/by-name/op/openlist/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "openlist"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList"; tag = "v${finalAttrs.version}"; - hash = "sha256-pihGG9vm0wyny9DuN110Nb6cwxvG5oP2RqcoWSOWRes="; + hash = "sha256-RsTcaq5w5EY+zddjTI5BJuDqmbFmZwxq4ng9NUXZvIk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { frontend = callPackage ./frontend.nix { }; proxyVendor = true; - vendorHash = "sha256-WnA5iDXCdBlBhnCxvD0PQYfu3bePAv9tJ3WNUTFNURo="; + vendorHash = "sha256-zDN2sw3oYVDTlP5qqe+RkcZ2Lup/vlB4jnluiA/wLLU="; buildInputs = [ fuse ]; From 4977f9d23a2a3bcb1823ea2ce8a29793f1294668 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 15:16:03 +0000 Subject: [PATCH 137/152] submit50: 3.2.0 -> 3.2.1 --- pkgs/by-name/su/submit50/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/submit50/package.nix b/pkgs/by-name/su/submit50/package.nix index 652ab9e24f7b..6c6ddcb451bf 100644 --- a/pkgs/by-name/su/submit50/package.nix +++ b/pkgs/by-name/su/submit50/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "submit50"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "cs50"; repo = "submit50"; tag = "v${version}"; - hash = "sha256-i1hO9P3FGamo4b733/U7d2fiWLdnTskrHM2BXxxDePc="; + hash = "sha256-D71d8f2XfLrsDRBuEZK7B96UTUkJLkHsCWchDNO8epI="; }; build-system = [ @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { description = "Tool for submitting student CS50 code"; homepage = "https://cs50.readthedocs.io/submit50/"; downloadPage = "https://github.com/cs50/submit50"; - changelog = "https://github.com/cs50/submit50/releases/tag/v${version}"; + changelog = "https://github.com/cs50/submit50/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; From f90e6b81acdbd3e76fc9a10d193373bb0d9496cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 13:12:54 +0000 Subject: [PATCH 138/152] libsForQt5.qtpbfimageplugin: 4.2 -> 4.4 --- pkgs/development/libraries/qtpbfimageplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index c19e971db598..f79ea2200196 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "4.2"; + version = "4.4"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; tag = version; - hash = "sha256-yk/DsLjNLqtmhvPcHDZGsNiAI1zBv1vBtgERvtNjF4I="; + hash = "sha256-WcqhYDfirMfNtUJBvhZ1559NnJun9OuhhVg6o8IcVGQ="; }; nativeBuildInputs = [ From 75575b3366fcd71f70301d4526f2e434d693e3d9 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Tue, 29 Jul 2025 18:51:41 +0200 Subject: [PATCH 139/152] models-dev: 0-unstable-2025-07-23 -> 0-unstable-2025-07-29 --- pkgs/by-name/mo/models-dev/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 20cf8161869d..e648cf1445dd 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -17,12 +17,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "0-unstable-2025-07-23"; + version = "0-unstable-2025-07-29"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "affbfa8012d0dbc0eba81ea51ec32069c71af417"; - hash = "sha256-JPcurldPuaFPfwqiWQR83x1uDcL0Dy79kx2TAOiNnyQ="; + rev = "69e91b1cee1dbd737dc60f5f99ce123a81763cda"; + hash = "sha256-fr4cgQsW03ukgCxNBtlokAXmqjGh1fFJucWx1dJ7xV0="; }; node_modules = stdenvNoCC.mkDerivation { From 12037626440407102bda9c668dae415308dcf561 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 17:22:29 +0000 Subject: [PATCH 140/152] fiddler-everywhere: 7.0.0 -> 7.1.0 --- pkgs/by-name/fi/fiddler-everywhere/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix index baadcc9fa7e6..415d6c9d8c35 100644 --- a/pkgs/by-name/fi/fiddler-everywhere/package.nix +++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix @@ -8,11 +8,11 @@ let pname = "fiddler-everywhere"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage"; - hash = "sha256-pDXvzTuivQUjEr0mi/Bw98il6a1D7gJfQ5x5OuQu2wE="; + hash = "sha256-rgo2WGIk8s+xjh4oJ/YXw/SGc4sKnfIvZoFWAklT70Y="; }; appimageContents = appimageTools.extract { From 30991f3a52a00dd701af5701116e7ec971813146 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 29 Jul 2025 10:16:05 -0700 Subject: [PATCH 141/152] signalbackup-tools: 20250726 -> 20250729 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250726...20250729 --- pkgs/by-name/si/signalbackup-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 0c90f0083589..8b825ed8d039 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250726"; + version = "20250729"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; - rev = version; - hash = "sha256-BDrz2AHscjJdlnHW52TWaMGaz8TKVMRLGXs1rn2TQVI="; + tag = version; + hash = "sha256-IHQrtS75c6fAJeRD4fDc9m1Za95h1kvAZ3B7XFwDxdA="; }; nativeBuildInputs = [ From 7589ef15de162ac3521a10801d11e8dbe804e029 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 17:55:10 +0000 Subject: [PATCH 142/152] ghostfolio: 2.183.0 -> 2.185.0 --- pkgs/by-name/gh/ghostfolio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 6b0c6de1c5da..6ff1e7aef05a 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.183.0"; + version = "2.185.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-ejjuNNCp81UM0B6cvQTL31MO49/zDKPJsXY4dZV1X/E="; + hash = "sha256-jnC2u9ZZcOSux6UUzW9Ot02aFWeGYhrdCC9d4xM0efA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-oApG8QOUteoqhVvAGIDMX0Zef2dV2E49EsekyhV7G4c="; + npmDepsHash = "sha256-FCH0v9jRviH33mfIVX8967X1u494qToHraYVn5pbSPw="; nativeBuildInputs = [ prisma From bcfa1a10fbb4c092160e17ea6fd79987f87cd210 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 29 Jul 2025 10:57:09 -0700 Subject: [PATCH 143/152] python3Packages.langchain-openai: disable text that fails Pydantic validation Langchain is rewriting their pydantic-related code an it's still a WIP. This disables a flaky test. --- .../development/python-modules/langchain-openai/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 1cd8a116515b..fa62fad8522c 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -94,6 +94,12 @@ buildPythonPackage rec { "test_openai_get_num_tokens" ]; + disabledTestPaths = [ + # TODO recheck on next update. Langchain has been working on Pydantic errors. + # ValidationError from pydantic + "tests/unit_tests/chat_models/test_responses_stream.py" + ]; + pythonImportsCheck = [ "langchain_openai" ]; passthru.updateScript = gitUpdater { From 269b5cf9cb7e3de3d581a86c9d9b6bde07913f14 Mon Sep 17 00:00:00 2001 From: Christian Friedow Date: Tue, 22 Jul 2025 22:42:53 +0200 Subject: [PATCH 144/152] vue-language-server: rewrite package to fix the automatic package upgrades - refactor packaging using enhanced pnpm helpers from nixpkgs - remove package-lock.json and custom update.sh as they are no longer needed fix: remove non-deterministic files --- .../vu/vue-language-server/package-lock.json | 1001 ----------------- .../vu/vue-language-server/package.nix | 69 +- pkgs/by-name/vu/vue-language-server/update.sh | 30 - 3 files changed, 53 insertions(+), 1047 deletions(-) delete mode 100644 pkgs/by-name/vu/vue-language-server/package-lock.json delete mode 100755 pkgs/by-name/vu/vue-language-server/update.sh diff --git a/pkgs/by-name/vu/vue-language-server/package-lock.json b/pkgs/by-name/vu/vue-language-server/package-lock.json deleted file mode 100644 index af10033e117a..000000000000 --- a/pkgs/by-name/vu/vue-language-server/package-lock.json +++ /dev/null @@ -1,1001 +0,0 @@ -{ - "name": "@vue/language-server", - "version": "3.0.1", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@vue/language-server", - "version": "3.0.1", - "license": "MIT", - "dependencies": { - "@volar/language-server": "2.4.17", - "@vue/language-core": "3.0.1", - "@vue/language-service": "3.0.1", - "@vue/typescript-plugin": "3.0.1", - "vscode-uri": "^3.0.8" - }, - "bin": { - "vue-language-server": "bin/vue-language-server.js" - }, - "devDependencies": { - "@typescript/server-harness": "latest", - "@volar/test-utils": "2.4.17" - }, - "peerDependencies": { - "typescript": "*" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", - "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.28.0" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/types": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz", - "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==", - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@emmetio/abbreviation": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", - "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", - "license": "MIT", - "dependencies": { - "@emmetio/scanner": "^1.0.4" - } - }, - "node_modules/@emmetio/css-abbreviation": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", - "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", - "license": "MIT", - "dependencies": { - "@emmetio/scanner": "^1.0.4" - } - }, - "node_modules/@emmetio/css-parser": { - "version": "0.4.0", - "resolved": "git+ssh://git@github.com/ramya-rao-a/css-parser.git#370c480ac103bd17c7bcfb34bf5d577dc40d3660", - "license": "MIT", - "dependencies": { - "@emmetio/stream-reader": "^2.2.0", - "@emmetio/stream-reader-utils": "^0.1.0" - } - }, - "node_modules/@emmetio/html-matcher": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-1.3.0.tgz", - "integrity": "sha512-NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ==", - "license": "ISC", - "dependencies": { - "@emmetio/scanner": "^1.0.0" - } - }, - "node_modules/@emmetio/scanner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz", - "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==", - "license": "MIT" - }, - "node_modules/@emmetio/stream-reader": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz", - "integrity": "sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw==", - "license": "MIT" - }, - "node_modules/@emmetio/stream-reader-utils": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz", - "integrity": "sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A==", - "license": "MIT" - }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@johnsoncodehk/pug-beautify": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@johnsoncodehk/pug-beautify/-/pug-beautify-0.2.2.tgz", - "integrity": "sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA==", - "license": "MIT" - }, - "node_modules/@typescript/server-harness": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@typescript/server-harness/-/server-harness-0.3.5.tgz", - "integrity": "sha512-YT9oe27zm7HdGXYad5SZrdJzVe9eavG3F6YplsWvAraowGtuDeY7FHPVuQPtQj6GxG097Us4JDkA8n5I4iQovQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@volar/language-core": { - "version": "2.4.17", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.17.tgz", - "integrity": "sha512-chmRZMbKmcGpKMoO7Reb70uiLrzo0KWC2CkFttKUuKvrE+VYgi+fL9vWMJ07Fv5ulX0V1TAyyacN9q3nc5/ecA==", - "license": "MIT", - "dependencies": { - "@volar/source-map": "2.4.17" - } - }, - "node_modules/@volar/language-server": { - "version": "2.4.17", - "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.17.tgz", - "integrity": "sha512-KUa0v5JjgbQ8hqDTJDoUFDcAfHoE34kd13qAldHst2+zCeOoAthDBg6ZU7d2cGQznCsx7Vm0k5dRrOxj8JG+dg==", - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.17", - "@volar/language-service": "2.4.17", - "@volar/typescript": "2.4.17", - "path-browserify": "^1.0.1", - "request-light": "^0.7.0", - "vscode-languageserver": "^9.0.1", - "vscode-languageserver-protocol": "^3.17.5", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-uri": "^3.0.8" - } - }, - "node_modules/@volar/language-service": { - "version": "2.4.17", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.17.tgz", - "integrity": "sha512-FPmLSJL5znBbfDANuemGeXY3WSLqACs8+NcC4BtATD77nQBx5zubsSXlU1lVJv005pzXqtyhd4dzICUTwo61CQ==", - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.17", - "vscode-languageserver-protocol": "^3.17.5", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-uri": "^3.0.8" - } - }, - "node_modules/@volar/source-map": { - "version": "2.4.17", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.17.tgz", - "integrity": "sha512-QDybtQyO3Ms/NjFqNHTC5tbDN2oK5VH7ZaKrcubtfHBDj63n2pizHC3wlMQ+iT55kQXZUUAbmBX5L1C8CHFeBw==", - "license": "MIT" - }, - "node_modules/@volar/test-utils": { - "version": "2.4.17", - "resolved": "https://registry.npmjs.org/@volar/test-utils/-/test-utils-2.4.17.tgz", - "integrity": "sha512-tyy7yodPZ2+nfjVy/oliO4/jxbTg1znYg+VoEAVxxOQ5908DAkC4uXqmmDQO/tP1neU+pb8Dy9YndEOrOUVXIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.17", - "@volar/language-server": "2.4.17", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-uri": "^3.0.8" - } - }, - "node_modules/@volar/typescript": { - "version": "2.4.17", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.17.tgz", - "integrity": "sha512-3paEFNh4P5DkgNUB2YkTRrfUekN4brAXxd3Ow1syMqdIPtCZHbUy4AW99S5RO/7mzyTWPMdDSo3mqTpB/LPObQ==", - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.17", - "path-browserify": "^1.0.1", - "vscode-uri": "^3.0.8" - } - }, - "node_modules/@vscode/emmet-helper": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.11.0.tgz", - "integrity": "sha512-QLxjQR3imPZPQltfbWRnHU6JecWTF1QSWhx3GAKQpslx7y3Dp6sIIXhKjiUJ/BR9FX8PVthjr9PD6pNwOJfAzw==", - "license": "MIT", - "dependencies": { - "emmet": "^2.4.3", - "jsonc-parser": "^2.3.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.15.1", - "vscode-uri": "^3.0.8" - } - }, - "node_modules/@vscode/l10n": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", - "license": "MIT" - }, - "node_modules/@vue/compiler-core": { - "version": "3.5.17", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz", - "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==", - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.27.5", - "@vue/shared": "3.5.17", - "entities": "^4.5.0", - "estree-walker": "^2.0.2", - "source-map-js": "^1.2.1" - } - }, - "node_modules/@vue/compiler-dom": { - "version": "3.5.17", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz", - "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==", - "license": "MIT", - "dependencies": { - "@vue/compiler-core": "3.5.17", - "@vue/shared": "3.5.17" - } - }, - "node_modules/@vue/compiler-vue2": { - "version": "2.7.16", - "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz", - "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==", - "license": "MIT", - "dependencies": { - "de-indent": "^1.0.2", - "he": "^1.2.0" - } - }, - "node_modules/@vue/language-core": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.0.1.tgz", - "integrity": "sha512-sq+/Mc1IqIexWEQ+Q2XPiDb5SxSvY5JPqHnMOl/PlF5BekslzduX8dglSkpC17VeiAQB6dpS+4aiwNLJRduCNw==", - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.17", - "@vue/compiler-dom": "^3.5.0", - "@vue/compiler-vue2": "^2.7.16", - "@vue/shared": "^3.5.0", - "alien-signals": "^2.0.5", - "minimatch": "^10.0.1", - "muggle-string": "^0.4.1", - "path-browserify": "^1.0.1" - }, - "peerDependencies": { - "typescript": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@vue/language-service": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-3.0.1.tgz", - "integrity": "sha512-1BnOMOFN6SChox7+kY13tW3eeGQGzB3VVHP50xLUqIHFSEss+DYmkmu9tkeR1Oeg0AsYnKUCckAwlEEPl57e3w==", - "license": "MIT", - "dependencies": { - "@volar/language-service": "2.4.17", - "@vue/language-core": "3.0.1", - "@vue/shared": "^3.5.0", - "path-browserify": "^1.0.1", - "volar-service-css": "0.0.64", - "volar-service-emmet": "0.0.64", - "volar-service-html": "0.0.64", - "volar-service-json": "0.0.64", - "volar-service-pug": "0.0.64", - "volar-service-pug-beautify": "0.0.64", - "volar-service-typescript": "0.0.64", - "volar-service-typescript-twoslash-queries": "0.0.64", - "vscode-html-languageservice": "^5.2.0", - "vscode-uri": "^3.0.8" - } - }, - "node_modules/@vue/shared": { - "version": "3.5.17", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz", - "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==", - "license": "MIT" - }, - "node_modules/@vue/typescript-plugin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-3.0.1.tgz", - "integrity": "sha512-uumf1v6TxseOl3n5Zp+aFCFoBEEpu96r2acPO4chFJAKia8be8kTgomP4tWZDOMn/YwFF7L9rk3bNle8cFqSEw==", - "license": "MIT", - "dependencies": { - "@volar/typescript": "2.4.17", - "@vue/language-core": "3.0.1", - "@vue/shared": "^3.5.0", - "path-browserify": "^1.0.1" - } - }, - "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/alien-signals": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-2.0.5.tgz", - "integrity": "sha512-PdJB6+06nUNAClInE3Dweq7/2xVAYM64vvvS1IHVHSJmgeOtEdrAGyp7Z2oJtYm0B342/Exd2NT0uMJaThcjLQ==", - "license": "MIT" - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/character-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", - "integrity": "sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==", - "license": "MIT", - "dependencies": { - "is-regex": "^1.0.3" - } - }, - "node_modules/de-indent": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", - "license": "MIT" - }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/emmet": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.11.tgz", - "integrity": "sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==", - "license": "MIT", - "workspaces": [ - "./packages/scanner", - "./packages/abbreviation", - "./packages/css-abbreviation", - "./" - ], - "dependencies": { - "@emmetio/abbreviation": "^2.3.3", - "@emmetio/css-abbreviation": "^2.1.8" - } - }, - "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "license": "MIT" - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "license": "MIT", - "dependencies": { - "has-symbols": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "license": "MIT", - "bin": { - "he": "bin/he" - } - }, - "node_modules/is-expression": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", - "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==", - "license": "MIT", - "dependencies": { - "acorn": "^7.1.1", - "object-assign": "^4.1.1" - } - }, - "node_modules/is-regex": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", - "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "gopd": "^1.2.0", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/jsonc-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", - "license": "MIT" - }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/minimatch": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", - "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", - "license": "ISC", - "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/muggle-string": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz", - "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==", - "license": "MIT" - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-browserify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", - "license": "MIT" - }, - "node_modules/pug-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz", - "integrity": "sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==", - "license": "MIT" - }, - "node_modules/pug-lexer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz", - "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==", - "license": "MIT", - "dependencies": { - "character-parser": "^2.2.0", - "is-expression": "^4.0.0", - "pug-error": "^2.0.0" - } - }, - "node_modules/pug-parser": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz", - "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==", - "license": "MIT", - "dependencies": { - "pug-error": "^2.0.0", - "token-stream": "1.0.0" - } - }, - "node_modules/request-light": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz", - "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==", - "license": "MIT" - }, - "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/token-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", - "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==", - "license": "MIT" - }, - "node_modules/typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", - "license": "Apache-2.0", - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/typescript-auto-import-cache": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.6.tgz", - "integrity": "sha512-RpuHXrknHdVdK7wv/8ug3Fr0WNsNi5l5aB8MYYuXhq2UH5lnEB1htJ1smhtD5VeCsGr2p8mUDtd83LCQDFVgjQ==", - "license": "MIT", - "dependencies": { - "semver": "^7.3.8" - } - }, - "node_modules/volar-service-css": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.64.tgz", - "integrity": "sha512-BtLq85adIft+Q0PZqllKXMVH7HHk6UmM7Opuj43IhR4AOVkqbNIcsiXhuh12ITVJGTkCGa9xXAPzClorPya6EQ==", - "license": "MIT", - "dependencies": { - "vscode-css-languageservice": "^6.3.0", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-uri": "^3.0.8" - }, - "peerDependencies": { - "@volar/language-service": "~2.4.0" - }, - "peerDependenciesMeta": { - "@volar/language-service": { - "optional": true - } - } - }, - "node_modules/volar-service-emmet": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.64.tgz", - "integrity": "sha512-cIGKpyOXKB9Dsqz3MJD1DF1GYEPfLE4VBoEtqewfx88qpf0dr/WbDnRhuljZ+VFlavkre4MvELzkCt8m9F6GqA==", - "license": "MIT", - "dependencies": { - "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode", - "@emmetio/html-matcher": "^1.3.0", - "@vscode/emmet-helper": "^2.9.3", - "vscode-uri": "^3.0.8" - }, - "peerDependencies": { - "@volar/language-service": "~2.4.0" - }, - "peerDependenciesMeta": { - "@volar/language-service": { - "optional": true - } - } - }, - "node_modules/volar-service-html": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.64.tgz", - "integrity": "sha512-5xknMYKmZBFzp2399RlsnGce25PfNu9ViXa1s63Q8NP6xeXcF3lInFsV+1o2DWBoXZdnXcuRvWOA+K+JIZLEcA==", - "license": "MIT", - "dependencies": { - "vscode-html-languageservice": "^5.3.0", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-uri": "^3.0.8" - }, - "peerDependencies": { - "@volar/language-service": "~2.4.0" - }, - "peerDependenciesMeta": { - "@volar/language-service": { - "optional": true - } - } - }, - "node_modules/volar-service-json": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.64.tgz", - "integrity": "sha512-kZsqmeDR0w/iVkkoxfp4/DcblYmyFXBImVLzgIgyd685XZrb21wVmKcRsD/V+6l0N7/pGwN6m2scxt/mJmFkGQ==", - "license": "MIT", - "dependencies": { - "vscode-json-languageservice": "^5.4.0", - "vscode-uri": "^3.0.8" - }, - "peerDependencies": { - "@volar/language-service": "~2.4.0" - }, - "peerDependenciesMeta": { - "@volar/language-service": { - "optional": true - } - } - }, - "node_modules/volar-service-pug": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.64.tgz", - "integrity": "sha512-rVJ2ySENJFPzzEr4fVlC81ANR4dTh3Axr6Az56KyZ5GV0C9yRk5QqCj5+eOYb2GSoVtnEbzOyYpDTRSuH++lfA==", - "license": "MIT", - "dependencies": { - "@volar/language-service": "~2.4.0", - "muggle-string": "^0.4.1", - "pug-lexer": "^5.0.1", - "pug-parser": "^6.0.0", - "volar-service-html": "0.0.64", - "vscode-html-languageservice": "^5.3.0", - "vscode-languageserver-textdocument": "^1.0.11" - } - }, - "node_modules/volar-service-pug-beautify": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.64.tgz", - "integrity": "sha512-HNVTYGjGKaUkvryCQvhN/kYZ6aP6I1ySECMA7I8SpMqraYN/BDKI185tsRsm5tGmPrEyCgRDKn/GGIAsSj7I7A==", - "license": "MIT", - "dependencies": { - "@johnsoncodehk/pug-beautify": "^0.2.2" - }, - "peerDependencies": { - "@volar/language-service": "~2.4.0" - }, - "peerDependenciesMeta": { - "@volar/language-service": { - "optional": true - } - } - }, - "node_modules/volar-service-typescript": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.64.tgz", - "integrity": "sha512-FN2H97iqjR1id8AM4fH7lTXuTx2on9zD6QlUFllaiHKqgNrEITlQwm/9Ujrd9ST7MUzhgIKyUsa2WlanX9kkMg==", - "license": "MIT", - "dependencies": { - "path-browserify": "^1.0.1", - "semver": "^7.6.2", - "typescript-auto-import-cache": "^0.3.5", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-nls": "^5.2.0", - "vscode-uri": "^3.0.8" - }, - "peerDependencies": { - "@volar/language-service": "~2.4.0" - }, - "peerDependenciesMeta": { - "@volar/language-service": { - "optional": true - } - } - }, - "node_modules/volar-service-typescript-twoslash-queries": { - "version": "0.0.64", - "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.64.tgz", - "integrity": "sha512-DQlArCVUwbH3Ym0Uc/qSrgus/ngQa4LbTNbLsIkWMovxwziPA1c2yCFFY7a6s4Qs8pPXO757ryu99IeX0UK+4w==", - "license": "MIT", - "dependencies": { - "vscode-uri": "^3.0.8" - }, - "peerDependencies": { - "@volar/language-service": "~2.4.0" - }, - "peerDependenciesMeta": { - "@volar/language-service": { - "optional": true - } - } - }, - "node_modules/vscode-css-languageservice": { - "version": "6.3.7", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.7.tgz", - "integrity": "sha512-5TmXHKllPzfkPhW4UE9sODV3E0bIOJPOk+EERKllf2SmAczjfTmYeq5txco+N3jpF8KIZ6loj/JptpHBQuVQRA==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/vscode-html-languageservice": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.5.1.tgz", - "integrity": "sha512-/ZdEtsZ3OiFSyL00kmmu7crFV9KwWR+MgpzjsxO60DQH7sIfHZM892C/E4iDd11EKocr+NYuvOA4Y7uc3QzLEA==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/vscode-json-languageservice": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.6.1.tgz", - "integrity": "sha512-IQIURBF2VMKBdWcMunbHSI3G2WmJ9H7613E1hRxIXX7YsAPSdBxnEiIUrTnsSW/3fk+QW1kfsvSigqgAFYIYtg==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "jsonc-parser": "^3.3.1", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "license": "MIT" - }, - "node_modules/vscode-jsonrpc": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", - "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/vscode-languageserver": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", - "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", - "license": "MIT", - "dependencies": { - "vscode-languageserver-protocol": "3.17.5" - }, - "bin": { - "installServerIntoExtension": "bin/installServerIntoExtension" - } - }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", - "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", - "license": "MIT", - "dependencies": { - "vscode-jsonrpc": "8.2.0", - "vscode-languageserver-types": "3.17.5" - } - }, - "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", - "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", - "license": "MIT" - }, - "node_modules/vscode-languageserver-types": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", - "license": "MIT" - }, - "node_modules/vscode-nls": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==", - "license": "MIT" - }, - "node_modules/vscode-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", - "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", - "license": "MIT" - } - } -} diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index a6b89b17315d..7e50946892f2 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -1,36 +1,73 @@ { lib, - buildNpmPackage, - fetchurl, + stdenv, + fetchFromGitHub, + pnpm, + nodejs, + nix-update-script, + makeBinaryWrapper, }: - -buildNpmPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz"; - hash = "sha256-kSJgE94O1qYdd/YoRex8CJSprS15PpboTzChKnYj2nE="; + src = fetchFromGitHub { + owner = "vuejs"; + repo = "language-tools"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VPN4XWZDT44GwUZNih9sH2AiOKr8800B748DRoZ6hWc="; }; - npmDepsHash = "sha256-S1kmTeReoAn428HaHQbwFzQg75rQNFVKVT1HT9m+7K4="; - forceGitDeps = true; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 1; + hash = "sha256-X34wBcLHhCkpr6oFrUE33X8EjUjdSpV5TZQPYbMzRDs="; + }; - postPatch = '' - ln -s ${./package-lock.json} package-lock.json + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + pnpm run build packages/language-server + runHook postBuild ''; - dontNpmBuild = true; - makeCacheWritable = true; + preInstall = '' + pnpm prune --prod + find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + - passthru.updateScript = ./update.sh; + # https://github.com/pnpm/pnpm/issues/3645 + find node_modules packages/language-server/node_modules -xtype l -delete + + # remove non-deterministic files + rm node_modules/.modules.yaml node_modules/.pnpm-workspace-state-v1.json + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/language-tools} + cp -r {node_modules,packages,extensions} $out/lib/language-tools/ + + makeWrapper ${lib.getExe nodejs} $out/bin/vue-language-server \ + --inherit-argv0 \ + --add-flags $out/lib/language-tools/packages/language-server/bin/vue-language-server.js + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; meta = { description = "Official Vue.js language server"; homepage = "https://github.com/vuejs/language-tools#readme"; - changelog = "https://github.com/vuejs/language-tools/releases/tag/v${version}"; + changelog = "https://github.com/vuejs/language-tools/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ friedow ]; mainProgram = "vue-language-server"; }; -} +}) diff --git a/pkgs/by-name/vu/vue-language-server/update.sh b/pkgs/by-name/vu/vue-language-server/update.sh deleted file mode 100755 index 36321e8a3063..000000000000 --- a/pkgs/by-name/vu/vue-language-server/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget - -set -euo pipefail -pushd "$(dirname "${BASH_SOURCE[0]}")" - -version=$(npm view @vue/language-server version) -tarball="language-server-$version.tgz" -url="https://registry.npmjs.org/@vue/language-server/-/$tarball" - -if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then - echo "Already up to date!" - exit 0 -fi - -sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix - -sha256=$(nix-prefetch-url "$url") -src_hash=$(nix-hash --to-sri --type sha256 "$sha256") -sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix - -rm -f package-lock.json package.json *.tgz -wget "$url" -tar xf "$tarball" --strip-components=1 package/package.json -npm i --package-lock-only --ignore-scripts -npm_hash=$(prefetch-npm-deps package-lock.json) -sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix -rm -f package.json *.tgz - -popd From ca8bfc8496697697df2bbdd8272f7d5b60fab65b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 16:47:49 +0000 Subject: [PATCH 145/152] limine: 9.5.0 -> 9.5.1 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index de2f850afae9..609616167dc1 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -42,14 +42,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "9.5.0"; + version = "9.5.1"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-SWJ5e6/q92UyC0ea8yJAYcFNr5LreJ2qFY7hcunovEM="; + hash = "sha256-UgY8S+XGlSnO1k98JWBfSN0/IY3LANVFgJwI1kdPAcU="; }; enableParallelBuilding = true; From 94d39a488b88b55a8deec2f1747fe781af583956 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 29 Jul 2025 14:57:08 -0400 Subject: [PATCH 146/152] manifold: disable Manifold.Simplify on darwin, enable CrossSection.RoundOffset everywhere (#426188) --- pkgs/by-name/ma/manifold/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 743b71efbe34..179a5f685e48 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -38,9 +38,13 @@ stdenv.mkDerivation (finalAttrs: { "-DMANIFOLD_PAR=TBB" ]; + excludedTestPatterns = lib.optionals stdenv.isDarwin [ + # https://github.com/elalish/manifold/issues/1306 + "Manifold.Simplify" + ]; doCheck = true; checkPhase = '' - test/manifold_test --gtest_filter=-CrossSection.RoundOffset + test/manifold_test --gtest_filter=-${builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns} ''; passthru = { From 9136a4946103d408c18c3fc4b41ad06437b66fcd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 29 Jul 2025 14:11:48 +0200 Subject: [PATCH 147/152] libpthread-stubs: set platforms back to unix I think this was changed from platforms.unix due to a misunderstanding of what the README says. The list in the README is of platforms where the .pc file installed by this package will have one behaviour. On other Unix platforms, it will have a different behaviour, but it's still supported. Restoring platforms.unix fixes building a number of packages for FreeBSD. Fixes: 4cc23fda05f8 ("libpthread-stubs: refactored, moved to pkgs/by-name and renamed from xorg.libpthreadstubs") --- pkgs/by-name/li/libpthread-stubs/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpthread-stubs/package.nix b/pkgs/by-name/li/libpthread-stubs/package.nix index 8ad5577de7b6..c55a3fb36b3b 100644 --- a/pkgs/by-name/li/libpthread-stubs/package.nix +++ b/pkgs/by-name/li/libpthread-stubs/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.x11; maintainers = [ ]; pkgConfigModules = [ "pthread-stubs" ]; - # on these platforms according to the readme - platforms = with lib.platforms; linux ++ cygwin ++ darwin ++ [ "x86_64-solaris" ]; + platforms = lib.platforms.unix; }; }) From 636467f8b54c9c9430109f27480e316b539f124f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 19:39:24 +0000 Subject: [PATCH 148/152] libretro.play: 0-unstable-2025-07-09 -> 0-unstable-2025-07-23 --- pkgs/applications/emulators/libretro/cores/play.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 199fb453b1ca..cfac4250e3f1 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-07-09"; + version = "0-unstable-2025-07-23"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "ae9afb4e45e8de35382fb98c55d13dec9fcf8ed8"; - hash = "sha256-HWKhgGChPGhRmrXXbjEvBt0coGpQ1JAPUTd8Ze4yKww="; + rev = "78c184bca1063d5482cbfad924af72dd23ebbff1"; + hash = "sha256-0n6PQqepc7xKVMf8slN9aOodzBbt7J2c68z7200q07M="; fetchSubmodules = true; }; From a0e1884f3b12a7be239db7010960f3c24fbcacf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 19:49:17 +0000 Subject: [PATCH 149/152] phpdocumentor: 3.8.0 -> 3.8.1 --- pkgs/by-name/ph/phpdocumentor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index f3b567592c81..bc19bf28c7d1 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpdocumentor"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "phpDocumentor"; repo = "phpDocumentor"; tag = "v${finalAttrs.version}"; - hash = "sha256-5wLfTitHr/6vF4c3o+I+l5ZnJGsjfH82kgml8goqUB4="; + hash = "sha256-iQA19FrXvVLzg+LaY1BcNmG8amMfKPVFwYbZ7dr+H9Q="; }; - vendorHash = "sha256-dok1CHFrYVAM5z6k6HvYrHm84khmxDPz1KBUpMQJD/o="; + vendorHash = "sha256-sFRy9Hy9CVNjjYqbPbKH0XhoUdu4HlkiuHDDovTGono="; nativeBuildInputs = [ makeBinaryWrapper ]; From 3c95f0822df324528b503f1952e1398d22e33f61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 04:02:07 +0000 Subject: [PATCH 150/152] python3Packages.snakemake-interface-logger-plugins: 1.2.3 -> 1.2.4 --- .../snakemake-interface-logger-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix index dcda2dab0916..8af8acb5d68a 100644 --- a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-logger-plugins"; - version = "1.2.3"; + version = "1.2.4"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake-interface-logger-plugins"; tag = "v${version}"; - hash = "sha256-VHbta+R2a/K2L03IRu/Ya7dJzshIAvyK9cNIRbx8QqM="; + hash = "sha256-dXC6gV5Av8Ij3lVvgdEKzU2tAPiA5JdV3F2Xil5hjHs="; }; nativeBuildInputs = [ hatchling ]; From a3a0962f23f7e6a1eb9860519b7fcea2ede4168f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 29 Jul 2025 23:24:42 +0200 Subject: [PATCH 151/152] sudo: 1.9.17p1 -> 1.9.17p2 Changes: https://www.sudo.ws/releases/stable/#1.9.17p2 --- nixos/modules/security/sudo.nix | 2 +- pkgs/by-name/su/sudo/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index f68d31c5a577..150dd963d106 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -192,7 +192,7 @@ in "NOINTERCEPT" ]); description = '' - Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/docs/man/1.9.15/sudoers.man/#Tag_Spec). + Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/docs/man/1.9.17/sudoers.man/#Tag_Spec). ''; default = [ ]; }; diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix index 283f1bd17459..2241f417315c 100644 --- a/pkgs/by-name/su/sudo/package.nix +++ b/pkgs/by-name/su/sudo/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sudo"; # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping # e.g. links to man pages, value constraints etc. - version = "1.9.17p1"; + version = "1.9.17p2"; __structuredAttrs = true; src = fetchurl { url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz"; - hash = "sha256-/2B+pxcHIZdzinj3eGks1t+afj5ARWX1HeBjyidFXTI="; + hash = "sha256-SjihqzrbEZklftwqfEor1xRmXrYFsENohDsG2tos/Ps="; }; prePatch = '' From 669d470a1c2d4b9192f75626e2b997f316c10af8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 Jul 2025 08:17:45 +1000 Subject: [PATCH 152/152] python3Packages.uiprotect: 7.14.2 -> 7.20.0 (#429430) https://github.com/uilibs/uiprotect/blob/v7.20.0/CHANGELOG.md --- pkgs/development/python-modules/uiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index ed8f25390b30..16c8ae1c47c5 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.14.2"; + version = "7.20.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-amCE5y/4tAdrvlk6ZSa6QaG9XuLnFfz1ml1r/H80fdE="; + hash = "sha256-mrTRLwqHiYsdVsmtsEv1ZZvhLquednbT0ME4HO1wC4I="; }; build-system = [ poetry-core ];