From 2445cedc627e4a0a9cd869b2d6d2d17a9ad3935f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Feb 2025 00:35:53 +0000 Subject: [PATCH 001/105] avfs: 1.1.5 -> 1.2.0 --- pkgs/by-name/av/avfs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/av/avfs/package.nix b/pkgs/by-name/av/avfs/package.nix index 0613bcc4b6d3..4effeb22b398 100644 --- a/pkgs/by-name/av/avfs/package.nix +++ b/pkgs/by-name/av/avfs/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-rZ87ZBBNYAmgWMcPZwiPeZMJv4UZsUsVSvrSJqRScs8="; + sha256 = "sha256-olqOxDwe4XJiThpMec5mobkwhBzbVFtyXx7GS8q+iJw="; }; nativeBuildInputs = [ pkg-config ]; From 67a1d022b62797bd3cb1fe8a9a7665ea2dd189b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Mar 2025 15:10:09 +0000 Subject: [PATCH 002/105] lxd-ui: 0.15 -> 0.16 --- pkgs/by-name/lx/lxd-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix index 6e8b2ac01511..d7ef2ec7c328 100644 --- a/pkgs/by-name/lx/lxd-ui/package.nix +++ b/pkgs/by-name/lx/lxd-ui/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; tag = version; - hash = "sha256-HqdaG51W7eUCGUhA+9pYrAWaA6qyK7Fc95CKJvk9GaA="; + hash = "sha256-JVozXgAu0rTjO9aNzKMzzoGYL09lRzNI5qcjDfRaMnE="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-O7oEAjmCEmPpsO/rdkZVhUkxhFzhHpPRbmci3yRBA7g="; + hash = "sha256-Z/C0QgqxBWob6KIWuU8PACkTKuAhTrJzod9WNXTO8Zs="; }; nativeBuildInputs = [ From 392534f2bc4cf9422502c244a8bd4e50b53e9916 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 23:59:24 +0000 Subject: [PATCH 003/105] gradle: 8.12.1 -> 8.13 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index ff23eda5f569..f7f117214dec 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -230,8 +230,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.12.1"; - hash = "sha256-jZepeYT2y9K4X+TGCnQ0QKNHVEvxiBgEjmEfUojUbJQ="; + version = "8.13"; + hash = "sha256-IPGxF2I3JUpvwgTYQ0GW+hGkz7OHVnUZxhVW6HEK7Xg="; defaultJava = jdk21; }; From 885090c958a96c58d86347e17b821e67d66786f6 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 11:40:27 +0200 Subject: [PATCH 004/105] jadx: resolve dependencies with gradle 8.13 --- pkgs/by-name/ja/jadx/deps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ja/jadx/deps.json b/pkgs/by-name/ja/jadx/deps.json index d4c912cc84e7..e9f5b34f86d7 100644 --- a/pkgs/by-name/ja/jadx/deps.json +++ b/pkgs/by-name/ja/jadx/deps.json @@ -255,13 +255,13 @@ "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { - "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", - "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", - "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { - "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", From 2fc4fe567f3e0b6796d3899ad40bbd5d6c17c559 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 11:40:37 +0200 Subject: [PATCH 005/105] keyguard: resolve dependencies with gradle 8.13 --- pkgs/by-name/ke/keyguard/deps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index 14c9cbcb90b6..c183f997c066 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -1170,13 +1170,13 @@ "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { "pom": "sha256-a+z8hpHftExSYVqCqWeS8TQBpXXleMkBkR1/qjMPgoo=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { - "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", - "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", - "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { - "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" }, "org/gradle/toolchains#foojay-resolver/0.9.0": { "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", From f2a96d52e0ae0d40de1d3e295125f536159e5aec Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 11:40:46 +0200 Subject: [PATCH 006/105] velocity: resolve dependencies with gradle 8.13 --- pkgs/by-name/ve/velocity/deps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json index 8259e84806ce..32d59e66322c 100644 --- a/pkgs/by-name/ve/velocity/deps.json +++ b/pkgs/by-name/ve/velocity/deps.json @@ -92,13 +92,13 @@ "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { - "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", - "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", - "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { - "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" }, "org/gradle/toolchains#foojay-resolver/0.9.0": { "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", From 057211b4360a3ff6098fc07a726a29eede45f6e8 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 12:07:19 +0200 Subject: [PATCH 007/105] freeplane: add a patch to support Gradle 8.13 --- pkgs/by-name/fr/freeplane/deps.json | 12 ++++++------ pkgs/by-name/fr/freeplane/package.nix | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json index 8026804546ce..305e2ac2c7e8 100644 --- a/pkgs/by-name/fr/freeplane/deps.json +++ b/pkgs/by-name/fr/freeplane/deps.json @@ -16,8 +16,8 @@ "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.51.0": { "pom": "sha256-oy92kCcy9iIN27EhlfozbDMfT2190MRscHcLOu4dR0E=" }, - "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.10.0": { - "pom": "sha256-2CtlPq9xjbpM5uYMynsMik4IhQb+DLO+jCoU49cBhwc=" + "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.11.1": { + "pom": "sha256-vzFreAr1jNZu6HTiFIpSGFcYGz/pvN36tiQOXikDxPI=" }, "de/jflex#cup-parent/11b": { "pom": "sha256-c4L5m+Pbb+Uh8E1+/XMZ/jlj2nnWXFaOfoofWRLpmHw=" @@ -304,10 +304,10 @@ "jar": "sha256-9UdeY+fonl22IiNImux6Vr0wNUN3IHehfCy1TBnKOiA=", "pom": "sha256-W3YhZzfy2pODlTrMybpY9uc500Rnh5nm1NCCz24da9M=" }, - "com/netflix/nebula#gradle-ospackage-plugin/11.10.0": { - "jar": "sha256-k8JksFhk+NuXmhaameS/qthMqjC4KXQ/ZyEDgt/4lhk=", - "module": "sha256-Ef8gYnVWXB04hmPUmjT73DnQ4OWvGiqO32HOtTtSyzA=", - "pom": "sha256-6hztETK2gdIShusXyuLdJHeGBR9mh/EiufxUWFaSUGQ=" + "com/netflix/nebula#gradle-ospackage-plugin/11.11.1": { + "jar": "sha256-NAJ6yECtuBuA3kMILOM1plGIdSF6OKwCBNWoTcZpt6w=", + "module": "sha256-wb4zriytcHAJd+7KHPhLTNtJXJY7xYjXaAehe+94Lcc=", + "pom": "sha256-2XSxaCnczZP7kLyVaJAFVcxrgJhvSc/yxIZaIANLBPA=" }, "com/samskivert#jmustache/1.15": { "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index 6ba59f984aa4..b0209ec5022d 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchFromGitHub, + fetchpatch, makeBinaryWrapper, makeDesktopItem, jdk17, @@ -35,6 +36,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { copyDesktopItems ]; + patches = [ + # Plugin update to support Gradle 8.13; remove when included in a release. + (fetchpatch { + url = "https://github.com/freeplane/freeplane/commit/e58958783ef6f85ab00bf270c1f897093c4d7006.patch"; + hash = "sha256-oQF/GbItl2ZEVlTKzojqk9xTWl8CVP7V3yig/py71hk="; + }) + ]; + mitmCache = gradle.fetchDeps { inherit pname; data = ./deps.json; From 48c18d04b52ddf6cbca62b8b48b3e07af8655e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Mar 2025 10:17:17 +0000 Subject: [PATCH 008/105] netlify-cli: 18.1.0 -> 19.0.2 --- pkgs/by-name/ne/netlify-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix index bf5e0fa360c9..e913e4bb00a7 100644 --- a/pkgs/by-name/ne/netlify-cli/package.nix +++ b/pkgs/by-name/ne/netlify-cli/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "18.1.0"; + version = "19.0.2"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-qz0OrVdnltNnGOX9mbLYWWMc+wBRtDC1jMHrL2Aa6vk="; + hash = "sha256-+P+hS/g/xRFNvzESZ5LyxyQSSRZ7BzCg9ZX/ndNLeDg="; }; - npmDepsHash = "sha256-mDVz/u6C1cL/67R/rZrEVVwIWEIjsDy4mA3mRLAFbM4="; + npmDepsHash = "sha256-3C+tTqLJCm48pAbQMiIq2SsHmb4bcCaf3IU/cTeR5BA="; inherit nodejs; From 884c800b1bd4eb3dee13dd63354da76e6688fbbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 14:08:24 +0000 Subject: [PATCH 009/105] ipp-usb: 0.9.29 -> 0.9.30 --- pkgs/by-name/ip/ipp-usb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix index f83299571426..76fa581d83d0 100644 --- a/pkgs/by-name/ip/ipp-usb/package.nix +++ b/pkgs/by-name/ip/ipp-usb/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "ipp-usb"; - version = "0.9.29"; + version = "0.9.30"; src = fetchFromGitHub { owner = "openprinting"; repo = "ipp-usb"; rev = version; - sha256 = "sha256-QPknE7Q0UjPRM+ohv3EwZS3D3cR+lZEBgc5MqlvsDso="; + sha256 = "sha256-LcThjiN/MRk4ISWWRT4g/eLvuhzM8pIDAcSlM5us3nQ="; }; postPatch = '' From 0d3cf095c7b5a398dadc4e1e547b2856a091d088 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 18:58:03 +0000 Subject: [PATCH 010/105] python312Packages.conda-libmamba-solver: 25.1.1 -> 25.3.0 --- .../python-modules/conda-libmamba-solver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index 209c7e443544..e072fc30851c 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "25.1.1"; + version = "25.3.0"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; tag = version; - hash = "sha256-d6KLUhc7+KZ5H9vkI84S9TyximSwatu6lg7XIdMqtk0="; + hash = "sha256-7iWrvh82MOkj1tgR0M8mdv8NLGckI4fxIV4rl1DI4w0="; }; From 41d29f20c382dc66bddc877112b05772d99673e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 20:45:06 +0000 Subject: [PATCH 011/105] fittrackee: 0.9.2 -> 0.9.3 --- pkgs/by-name/fi/fittrackee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index f1ca35d1e177..b9406b492a2d 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication rec { pname = "fittrackee"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; tag = "v${version}"; - hash = "sha256-O5dtices32EV/G9cefhewvr+OGnvq598YmwtwWaI3FI="; + hash = "sha256-ofFQJqBKGavXatlpm1bsM2+A1My/9dSzl9X/o9lVDb8="; }; build-system = [ From 95713435eca914c68f9f848661d9b08075f90b93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 02:42:26 +0000 Subject: [PATCH 012/105] qdrant-web-ui: 0.1.37 -> 0.1.38 --- pkgs/by-name/qd/qdrant-web-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix index 8562919703be..b6609ea78825 100644 --- a/pkgs/by-name/qd/qdrant-web-ui/package.nix +++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "qdrant-web-ui"; - version = "0.1.37"; + version = "0.1.38"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant-web-ui"; tag = "v${version}"; - hash = "sha256-Vp50kZwtlQ6IgxkS8cndupTU8WMWp9Juoc5CNbyYyXI="; + hash = "sha256-0oUTKX4dDJ8GYRp8oPgx2a7TEHKofn2ZpIEZRpvbfIs="; }; - npmDepsHash = "sha256-6e6Ubfu5D9FJUc+IQ53KxQ1KmsHQXGqW4FXB1Uj15eE="; + npmDepsHash = "sha256-uH8kjCHQk+4vNkgHSlvO0UrvGRh/LKEM1bvrcEHolp0="; npmBuildScript = "build-qdrant"; From 26b8ea354228fc4ead6507c50c99d7f91b4391a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 05:26:39 +0000 Subject: [PATCH 013/105] kraft: 0.9.4 -> 0.11.5 --- pkgs/by-name/kr/kraft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kr/kraft/package.nix b/pkgs/by-name/kr/kraft/package.nix index 257cae733dad..04718b428d44 100644 --- a/pkgs/by-name/kr/kraft/package.nix +++ b/pkgs/by-name/kr/kraft/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.9.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-4+3yMx/Vf4aZKC5GRhnAeH4oaJ0Rbz8oXptMtPV+5tA="; + hash = "sha256-rwowlwP56IAdogEL6/SBGDtvOW7FhO4+2vTWI755HXI="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildGoModule rec { btrfs-progs ]; - vendorHash = "sha256-uyoIlNhgL684f+3+I4CFc+iuMRdI5WAUr7dWr0Bt6bA="; + vendorHash = "sha256-LdLbAja4AoND5kA+A4rEl5r4tUVDTVxiYzV5GUJP+CA="; ldflags = [ "-s" From 51cb063f6b65e3faff34f28ee0521ed4dcf33b8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 13:43:38 +0000 Subject: [PATCH 014/105] python312Packages.sphinxcontrib-confluencebuilder: 2.11.0 -> 2.12.0 --- .../sphinxcontrib-confluencebuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 903c9ce19a46..1df486bf844a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.11.0"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-THRPXW/Rg/eXIlPfsa4u1kHeXjKBNzVAkX9Vrhg90n0="; + hash = "sha256-+YKH9qTtqWNUlQMRkFSmP+RK8IAN6/rrYctvY3pIf+I="; }; build-system = [ flit-core ]; From 1736a4bd216d9bbac33716b053d84b7e4baeb572 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 01:12:46 +0000 Subject: [PATCH 015/105] gnu-shepherd: 1.0.2 -> 1.0.3 --- pkgs/by-name/gn/gnu-shepherd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 964176154388..1d4125ca77da 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; - hash = "sha256-30usBLSwR2+o+e0TgpKsLMVLQwS17v2FntSJLU+ZJL8="; + hash = "sha256-QOd561/9dvvoXN6VM9N/DamARihT4Bl0gWCT9VEL89g="; }; configureFlags = [ "--localstatedir=/" ]; From 4cf917492b7a2de76ff87ecabe57e56a2807376e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 06:53:43 +0000 Subject: [PATCH 016/105] sentry-native: 0.8.1 -> 0.8.2 --- pkgs/by-name/se/sentry-native/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index 4e700bf2c920..9028a0152e48 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-V8fOFn1qic00TgoXB23ZJPldjdC70JHdx+197hH8iZg="; + hash = "sha256-X5QA27y/7bJoGC1qDNhvbh5Cqm4StiZ9jkdsed+oVL4="; }; nativeBuildInputs = [ From d96fd22f3871e63cc4db9e31dea22d9e26294456 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 14:49:14 +0000 Subject: [PATCH 017/105] python312Packages.graph-tool: 2.91 -> 2.92 --- pkgs/development/python-modules/graph-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index bca3c871423c..1e84e17e9b23 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -32,12 +32,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.91"; + version = "2.92"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-PIUOkrNe/dce8qvSbZ/lwCEuwqB5kPvnMjQI4Sej/QI="; + hash = "sha256-BBtWpWgmZV+R8EAu6eROrVe3jOTINDfi9HN5ZMt5r44="; }; postPatch = '' From d69f7965eebbb71112c24adf705090f7c9ccd75f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 13:31:39 +0000 Subject: [PATCH 018/105] repomix: 0.2.36 -> 0.3.0 --- pkgs/by-name/re/repomix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index 056c48868623..d9f3c163ecf6 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.2.36"; + version = "0.3.0"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-utuCtkDp+3411FTqKxpXdE0XAMsVT0dwpcMAdJ2pAB0="; + hash = "sha256-a0FZaATQ4U9KtRY1m/Bi/1P9hDoNbcracZagm9EMSew="; }; - npmDepsHash = "sha256-jKAHFxxRheMw8pcYfOurL7L5TFaNIQjoxpJsPysuKYI="; + npmDepsHash = "sha256-BD0JBwZ3FSMpJRRTKQinPuaSBjX/RrkwXUqDr1wXEhk="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 546aaa8d4b010d3ef070793724cdd7eec409f049 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 20:54:02 +0000 Subject: [PATCH 019/105] python312Packages.lml: 0.1.0 -> 0.2.0 --- pkgs/development/python-modules/lml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix index 6bb69be09fce..52b704e9cdfa 100644 --- a/pkgs/development/python-modules/lml/default.nix +++ b/pkgs/development/python-modules/lml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "lml"; - version = "0.1.0"; + version = "0.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "57a085a29bb7991d70d41c6c3144c560a8e35b4c1030ffb36d85fa058773bcc5"; + sha256 = "sha256-jdWvtDZ6WT0c2yFEoFh0zZk49SZr67DJ4UEyAEI8DXQ="; }; nativeCheckInputs = [ From 813489269a1db3e7edde866b20424f0b3a9ebac0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Mar 2025 05:41:52 +0000 Subject: [PATCH 020/105] python312Packages.xvfbwrapper: 0.2.9 -> 0.2.10 --- pkgs/development/python-modules/xvfbwrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 148a3de0371b..2b7e7d63cb53 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "xvfbwrapper"; - version = "0.2.9"; + version = "0.2.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w"; + sha256 = "sha256-1mLPjyZu/T0KHAIu67jSwECD1uh/2BOS+1QA2VA27Yw="; }; propagatedBuildInputs = [ xorg.xvfb ]; From e589a04f5e0ca048e93fce24e58bb4446a632447 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 Mar 2025 08:36:57 +0100 Subject: [PATCH 021/105] python312Packages.lml: refactor --- pkgs/development/python-modules/lml/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix index 52b704e9cdfa..1c8d67e9ab8a 100644 --- a/pkgs/development/python-modules/lml/default.nix +++ b/pkgs/development/python-modules/lml/default.nix @@ -4,18 +4,21 @@ fetchPypi, pytestCheckHook, mock, + setuptools, }: buildPythonPackage rec { pname = "lml"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-jdWvtDZ6WT0c2yFEoFh0zZk49SZr67DJ4UEyAEI8DXQ="; + hash = "sha256-jdWvtDZ6WT0c2yFEoFh0zZk49SZr67DJ4UEyAEI8DXQ="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook mock @@ -25,8 +28,9 @@ buildPythonPackage rec { doCheck = false; meta = { - description = "Load me later. A lazy plugin management system for Python"; + description = "Plugin management system for Python"; homepage = "http://lml.readthedocs.io/"; + changelog = "https://github.com/python-lml/lml/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; From 3c132b9207fef27c2a6f5e5e2f99ff29023d8bbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Mar 2025 10:10:41 +0000 Subject: [PATCH 022/105] python312Packages.fake-useragent: 2.0.3 -> 2.1.0 --- pkgs/development/python-modules/fake-useragent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 99f9a27e060e..995dd533f769 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "2.0.3"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fake-useragent"; repo = "fake-useragent"; tag = version; - hash = "sha256-FmGk3Cc1Y2j6+JQsc2JK6D78ktuNCLmfkfY6dNLmpQ4="; + hash = "sha256-pEZfbFw9JWmR4Zf9AH0mw7zBJVbo6v9iUTU0awHSAt4="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}"; + changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${src.tag}"; description = "Up to date simple useragent faker with real world database"; homepage = "https://github.com/hellysmile/fake-useragent"; license = lib.licenses.asl20; From b48920277378cfecf9959cd2128c80c3d8dec466 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Mar 2025 13:23:01 +0000 Subject: [PATCH 023/105] mdk-sdk: 0.31.0 -> 0.32.0 --- pkgs/by-name/md/mdk-sdk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix index 08114970fba8..5a8cd27b12c1 100644 --- a/pkgs/by-name/md/mdk-sdk/package.nix +++ b/pkgs/by-name/md/mdk-sdk/package.nix @@ -33,11 +33,11 @@ let in stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.31.0"; + version = "0.32.0"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux.tar.xz"; - hash = "sha256-RUGDf5802lBEIo1v8VJptCdWv+yDnLatx37GlBrpvWg="; + hash = "sha256-iqoOqGebdAHYwxPH0LYu63apiQdkhFVyssylFcFIYuE="; }; nativeBuildInputs = [ autoPatchelfHook ]; From b0d522069803a9c9eb523bee7bdb95f74844b6a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 00:55:18 +0000 Subject: [PATCH 024/105] davinci-resolve-studio: 19.1.3 -> 19.1.4 --- pkgs/by-name/da/davinci-resolve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index ecbb57067082..9759f6c0a3cf 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -35,7 +35,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "19.1.3"; + version = "19.1.4"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; }) @@ -57,9 +57,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-aAKE+AY/a2XjVzdU0VXT3ekFrTp3rO6zUd7pRTTDc9E=" + "sha256-OTL83suZXt7DxDz+89zIRJD8R25/HZUQMMGlfS+Ow4I=" else - "sha256-CCr4/h0W1fhzUT4o6WyX2hBodzy9iqVLZwzdplzq9SI="; + "sha256-2u1gkaL3vdI+4RnPl5bEXE+zeRhg2BzPWjni015ISWI="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; From f78a2990bf4e6625a5ac1fae0cd152cf09df1364 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 04:07:56 +0000 Subject: [PATCH 025/105] trealla: 2.64.4 -> 2.66.2 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 21b9b88836a2..3440b0792ef7 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.64.4"; + version = "2.66.2"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-BvDR0hLKxJ5XEcIRrH9fdONam5JAjAwWbfrZogiNq5U="; + hash = "sha256-E91w1mQtbnmnGB047UqvdFEg1y9PX7yU2IrXQdN1PYw="; }; postPatch = '' From 0f6f8b23d7a1aed833915a78c8cff4a8bfbd2902 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 13:41:37 +0000 Subject: [PATCH 026/105] hashlink: 1.14 -> 1.15 --- pkgs/by-name/ha/hashlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 42b45b119165..88c5898e827e 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "hashlink"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = "HaxeFoundation"; repo = "hashlink"; rev = version; - sha256 = "sha256-rXw56zoFpLMzz8U3RHWGBF0dUFCUTjXShUEhzp2Qc5g="; + sha256 = "sha256-nVr+fDdna8EEHvIiXsccWFRTYzXfb4GG1zrfL+O6zLA="; }; # incompatible pointer type error: const char ** -> const void ** From dff9eacebb28cc68fad775cb7ea5aedfd38f8747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 14:46:26 +0000 Subject: [PATCH 027/105] python312Packages.setuptools-dso: 2.11 -> 2.12.2 --- pkgs/development/python-modules/setuptools-dso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-dso/default.nix b/pkgs/development/python-modules/setuptools-dso/default.nix index 094c66d1c4a0..6a4823d26677 100644 --- a/pkgs/development/python-modules/setuptools-dso/default.nix +++ b/pkgs/development/python-modules/setuptools-dso/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "setuptools-dso"; - version = "2.11"; + version = "2.12.2"; pyproject = true; src = fetchPypi { pname = "setuptools_dso"; inherit version; - hash = "sha256-lT5mp0TiHbvkrXPiK5/uLke65znya8Y6s3RzpFuXVFY="; + hash = "sha256-evt2+T0Tzp2iRQJnbY8tTbw9o1xiRflfJ9+fp0RQeaQ="; }; build-system = [ setuptools ]; From dc7232857d8ce8948c77ebb935ecfbef4b27a693 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 15:55:55 +0000 Subject: [PATCH 028/105] python312Packages.azure-servicebus: 7.14.0 -> 7.14.1 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 0161a0b95434..13c42576bccb 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.14.0"; + version = "7.14.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_servicebus"; inherit version; - hash = "sha256-SU3bh3GJA1jdJaWB5dtSV5fwHz8yFsxkHIkvC9U7KZo="; + hash = "sha256-qd9vWcZe5BeSN/FrAKlu4W6BzOTiyC4mFoBP57yS+0Y="; }; build-system = [ setuptools ]; From 119f20b3ab64143f44edf866d354650e69bcb287 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 01:19:35 +0000 Subject: [PATCH 029/105] parallel: 20250222 -> 20250322 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 9af0b80e5832..d165f01f2f81 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20250222"; + version = "20250322"; src = fetchurl { url = "mirror://gnu/parallel/parallel-${version}.tar.bz2"; - hash = "sha256-0Fqyfg3RTjvyU9uuGOeJRxfOg0GTM2yajrJggTBdu/c="; + hash = "sha256-yCiW53mxjCoVdSfzLzXemm2YT4uOutK0Hbx4wzrbqr4="; }; outputs = [ From 0817c203ba05ec82adbb4f07275b6defc39ef353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 08:54:26 +0000 Subject: [PATCH 030/105] klayout: 0.29.12 -> 0.30.0 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 8c045da4e3fd..ffc49aa6d4da 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.29.12"; + version = "0.30.0"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-TLLAIlZYKGeQENtzfc9ilWwl4yu2ln7yBy+VW7Zwexc="; + hash = "sha256-i7MQqkVf+NZkmcf589BpLofwqc5KGxRNqdr1Go84M9A="; }; postPatch = '' From 51112d0eb617728ffe5e128301236d2640ba8faa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 09:26:51 +0000 Subject: [PATCH 031/105] stackql: 0.6.95 -> 0.7.131 --- pkgs/by-name/st/stackql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index b3c6669b1454..18176e51d051 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.6.95"; + version = "0.7.131"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-qGfkl1f8rqs6RHxAICHv4ZyPJmNs9YpK/uOluA417AE="; + hash = "sha256-FLr4xGE9x9O0+BcjBiqDoNdw5LAqtqYYkqZ8wWjhgHA="; }; - vendorHash = "sha256-et0KiO9n3DLNIdUTH3D0VLSUiIW31ZbqEhZRwkQrbnU="; + vendorHash = "sha256-OxAdbV7ooqzOWOm6zoyePfsL0480gBztLEzfqbA2Q84="; ldflags = [ "-s" From 9b4711dcae5d35c8cdfe4f081630abcf720b35ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 13:18:28 +0000 Subject: [PATCH 032/105] flyway: 11.3.4 -> 11.4.1 --- pkgs/by-name/fl/flyway/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix index b63021ff639a..2f2e391fac7b 100644 --- a/pkgs/by-name/fl/flyway/package.nix +++ b/pkgs/by-name/fl/flyway/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "11.3.4"; + version = "11.4.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-oJ8/PWMN/9BE0waLWbHoUVMuBcwbUltr0hLzilHRqVc="; + sha256 = "sha256-tOPUBHB8nLdXnJfgd9zn+ph/KTWr7eXu7fRQ8RlpncA="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 5aa0d7d58de66aa5989a70655cdfdf0d20d71ae5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 15:19:34 +0000 Subject: [PATCH 033/105] benthos: 4.45.1 -> 4.46.0 --- pkgs/by-name/be/benthos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index cc1097687bee..675aebae8b8c 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "benthos"; - version = "4.45.1"; + version = "4.46.0"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "benthos"; tag = "v${version}"; - hash = "sha256-pbbeVNpGCjLxhesq88aoeTnaawMgDTCx0wDA6Y2sXsM="; + hash = "sha256-txIzW6qU4XZyvt5ndIjmYwo4D2gWlD4CjEI591k3b8s="; }; proxyVendor = true; From 718e660746e4acedb65d06b0b425f8db4f39349f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 17:41:55 +0000 Subject: [PATCH 034/105] uxn: 1.0-unstable-2025-03-08 -> 1.0-unstable-2025-03-14 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index e92b92c690fa..f721ece73b08 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2025-03-08"; + version = "1.0-unstable-2025-03-14"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "d95abf22b763b5f2f6156592e8ac97b82bd9dd10"; - hash = "sha256-foSrRTPJfKTGqpFBD7p1rwlCZX9YeTWMt2W73ly9QFo="; + rev = "7bdf99afc4748ed5c1f1b356fdff488164111d1e"; + hash = "sha256-OZo7e7M7MVkkT+SW13IOmQp6PyN6/LDqQ8fe+oc71i0="; }; outputs = [ From f1e390736c474c32dd65c6adff4c4877fc1967bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 18:43:06 +0000 Subject: [PATCH 035/105] ultrastardx: 2025.2.1 -> 2025.3.0 --- pkgs/by-name/ul/ultrastardx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index f4b5b49d521b..e6006ebb4df6 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2025.2.1"; + version = "2025.3.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - hash = "sha256-aae01fDMjNETdweTwDsblUFNKuEJRF68JQSTR/FyzGE="; + hash = "sha256-tMYw+nkyEEK7AqG9AvMchCGzzKWlfut4poXc1WK6vkA="; }; nativeBuildInputs = [ From e080a6c97b0776d15d73b7af54ddff42a5b93668 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 18:58:29 +0000 Subject: [PATCH 036/105] schemacrawler: 16.25.2 -> 16.25.3 --- pkgs/by-name/sc/schemacrawler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix index 25fb91fc771f..2877a95a6268 100644 --- a/pkgs/by-name/sc/schemacrawler/package.nix +++ b/pkgs/by-name/sc/schemacrawler/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.25.2"; + version = "16.25.3"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-pFOe+IgkPrIAFpZW6O4Mgt77EFDlz4F/xO+WYjBvHrs="; + hash = "sha256-GAPGu3t4k2hMeBpu/bOiCgRCQVlrEHIGhcp31B/p1vM="; }; nativeBuildInputs = [ makeWrapper ]; From 67117cc6f7def604afa10224f174926299a02257 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Thu, 27 Feb 2025 23:39:29 +0800 Subject: [PATCH 037/105] newt: move to by-name --- .../newt/default.nix => by-name/ne/newt/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{development/libraries/newt/default.nix => by-name/ne/newt/package.nix} (94%) diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/by-name/ne/newt/package.nix similarity index 94% rename from pkgs/development/libraries/newt/default.nix rename to pkgs/by-name/ne/newt/package.nix index 4e6f408acc33..401cb03e075d 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/by-name/ne/newt/package.nix @@ -4,11 +4,11 @@ stdenv, slang, popt, - python, + python3, }: let - pythonIncludePath = "${lib.getDev python}/include/python"; + pythonIncludePath = "${lib.getDev python3}/include/python"; in stdenv.mkDerivation rec { pname = "newt"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; strictDeps = true; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; buildInputs = [ slang popt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e40fe12a25a6..bcb9f2470f64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9740,8 +9740,6 @@ with pkgs; nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; - newt = callPackage ../development/libraries/newt { python = python3; }; - libnghttp2 = nghttp2.lib; nghttp3 = callPackage ../development/libraries/nghttp3 { inherit (darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d42500f8352e..c7ea49b48ca0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16542,7 +16542,7 @@ self: super: with self; { smtpdfix = callPackage ../development/python-modules/smtpdfix { }; - snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); + snack = toPythonModule (pkgs.newt.override { python3 = self.python; }); snakebite = callPackage ../development/python-modules/snakebite { }; From 0d0f72f601768bd0dbaafde55bba22dccc0abb11 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Fri, 28 Feb 2025 11:30:17 +0800 Subject: [PATCH 038/105] newt: clean up & build w/ gettext for darwin See: https://github.com/Homebrew/homebrew-core/blob/e6f19bd09a4e2c339bdfff78163b60e042b33cc2/Formula/n/newt.rb#L28 Also, add myself to maintainers. --- pkgs/by-name/ne/newt/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ne/newt/package.nix b/pkgs/by-name/ne/newt/package.nix index 401cb03e075d..b62cdf502b07 100644 --- a/pkgs/by-name/ne/newt/package.nix +++ b/pkgs/by-name/ne/newt/package.nix @@ -5,6 +5,7 @@ slang, popt, python3, + gettext, }: let @@ -33,10 +34,14 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ python3 ]; - buildInputs = [ - slang - popt - ]; + buildInputs = + [ + slang + popt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gettext # for darwin with clang + ]; NIX_LDFLAGS = "-lncurses"; @@ -46,10 +51,6 @@ stdenv.mkDerivation rec { unset CPP ''; - configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "--disable-nls" - ]; - makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; @@ -59,13 +60,13 @@ stdenv.mkDerivation rec { install_name_tool -change libnewt.so.${version} $out/lib/libnewt.so.${version} $out/bin/whiptail ''; - meta = with lib; { + meta = { description = "Library for color text mode, widget based user interfaces"; mainProgram = "whiptail"; homepage = "https://pagure.io/newt"; changelog = "https://pagure.io/newt/blob/master/f/CHANGES"; - license = licenses.lgpl2; - platforms = platforms.unix; - maintainers = [ ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bryango ]; }; } From 80860b906af62d7b9b12ba29b0e4f337ddf200be Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Fri, 28 Feb 2025 12:01:46 +0800 Subject: [PATCH 039/105] newt, python3Packages.snack: fix darwin linking --- pkgs/by-name/ne/newt/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/newt/package.nix b/pkgs/by-name/ne/newt/package.nix index b62cdf502b07..d70c31e27f8c 100644 --- a/pkgs/by-name/ne/newt/package.nix +++ b/pkgs/by-name/ne/newt/package.nix @@ -43,7 +43,9 @@ stdenv.mkDerivation rec { gettext # for darwin with clang ]; - NIX_LDFLAGS = "-lncurses"; + NIX_LDFLAGS = + "-lncurses" + + lib.optionalString stdenv.hostPlatform.isDarwin " -L${python3}/lib -lpython${python3.pythonVersion}"; preConfigure = '' # If CPP is set explicitly, configure and make will not agree about which From 0e7ffca8e7c27289fef62989b192bf31dc8e43e5 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Fri, 28 Feb 2025 14:23:59 +0800 Subject: [PATCH 040/105] newt, python3Packages.snack: add passthru.tests --- pkgs/by-name/ne/newt/package.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/by-name/ne/newt/package.nix b/pkgs/by-name/ne/newt/package.nix index d70c31e27f8c..4d7fd3fa2a1d 100644 --- a/pkgs/by-name/ne/newt/package.nix +++ b/pkgs/by-name/ne/newt/package.nix @@ -62,6 +62,26 @@ stdenv.mkDerivation rec { install_name_tool -change libnewt.so.${version} $out/lib/libnewt.so.${version} $out/bin/whiptail ''; + passthru.tests.pythonModule = (python3.withPackages (ps: [ ps.snack ])).overrideAttrs ( + { nativeBuildInputs, postBuild, ... }@_prevAttrs: + { + nativeBuildInputs = nativeBuildInputs ++ [ python3.pkgs.pythonImportsCheckHook ]; + pythonImportsCheck = [ "snack" ]; + /** + Call pythonImportsCheckPhase manually. This is necessary because: + - pythonImportsCheckHook adds the check to $preDistPhases + - python3.withPackages is built with a version of `buildEnv`, + ... which is implemented by `runCommand`, + ... which has a custom builder and does not run $preDistPhases + */ + postBuild = + postBuild + + '' + runPhase pythonImportsCheckPhase + ''; + } + ); + meta = { description = "Library for color text mode, widget based user interfaces"; mainProgram = "whiptail"; From cb1a729adc6c36af95d60ccdbf37a5beef5aa6a2 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Fri, 28 Feb 2025 16:06:51 +0800 Subject: [PATCH 041/105] newt, python3Packages.snack: fix dylib name --- pkgs/by-name/ne/newt/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ne/newt/package.nix b/pkgs/by-name/ne/newt/package.nix index 4d7fd3fa2a1d..94459d70d674 100644 --- a/pkgs/by-name/ne/newt/package.nix +++ b/pkgs/by-name/ne/newt/package.nix @@ -58,8 +58,12 @@ stdenv.mkDerivation rec { ]; postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + set -xe install_name_tool -id $out/lib/libnewt.so.${version} $out/lib/libnewt.so.${version} install_name_tool -change libnewt.so.${version} $out/lib/libnewt.so.${version} $out/bin/whiptail + install_name_tool -change libnewt.so.${version} $out/lib/libnewt.so.${version} \ + $out/lib/python*/site-packages/_snack* # glob for version & suffix + set +x ''; passthru.tests.pythonModule = (python3.withPackages (ps: [ ps.snack ])).overrideAttrs ( From a0f5f0af743b12f42380021b80f7a6f4358da8d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Mar 2025 17:24:48 +0000 Subject: [PATCH 042/105] python312Packages.robotframework-seleniumlibrary: 6.7.0 -> 6.7.1 --- .../python-modules/robotframework-seleniumlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index e03cd0350d7c..026bba28397f 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "robotframework-seleniumlibrary"; - version = "6.7.0"; + version = "6.7.1"; pyproject = true; # no tests included in PyPI tarball @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; tag = "v${version}"; - sha256 = "sha256-fiuqJLisCvsVrQfxTDC0koTK7BqkG2x7lnPkvBTZY9E="; + hash = "sha256-pKAOVycckUCe93wMk9kql1lY6WeUTiS4lk/skDAfKCY="; }; build-system = [ setuptools ]; From 509f3d08e20d64eda630e9bc6d723f76af076086 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 26 Mar 2025 22:03:43 +0100 Subject: [PATCH 043/105] python312Packages.robotframework-seleniumlibrary: fix changelog --- .../python-modules/robotframework-seleniumlibrary/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 026bba28397f..9e588405e84d 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.tag}/docs/SeleniumLibrary-${src.tag}.rst"; + changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.tag}/docs/SeleniumLibrary-${version}.rst"; description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; license = lib.licenses.asl20; From 072a5e1ea2ede39e85a01424fee91af35fa3e224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Mar 2025 12:13:32 +0000 Subject: [PATCH 044/105] btrfs-progs: 6.13 -> 6.14 --- pkgs/by-name/bt/btrfs-progs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix index d5f78c750e00..2cb63e250917 100644 --- a/pkgs/by-name/bt/btrfs-progs/package.nix +++ b/pkgs/by-name/bt/btrfs-progs/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.13"; + version = "6.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-ZbPyERellPgAE7QyYg7sxqfisMBeq5cTb/UGx01z7po="; + hash = "sha256-31q4BPyzbikcQq2DYfgBrR4QJBtDvTBP5Qzj355+PaE="; }; nativeBuildInputs = From 59b3addb21de563d35d7dab3d26ccc767d32db1b Mon Sep 17 00:00:00 2001 From: "Braian A. Diez" Date: Fri, 28 Mar 2025 11:54:18 -0300 Subject: [PATCH 045/105] feroxbuster: 2.10.3 -> 2.11.0 --- pkgs/tools/security/feroxbuster/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 525aa942ddec..38cded3af940 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -8,16 +8,15 @@ Security, SystemConfiguration, }: - rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "epi052"; repo = pname; tag = "v${version}"; - hash = "sha256-3cznGVpZISLD2TbsHYyYYUTD55NmgBdNJ44V4XfZ40k="; + hash = "sha256-/NgGlXYMxGxpX93SJ6gWgZW21cSSZsgo/WMvRuLw+Bw="; }; # disable linker overrides on aarch64-linux @@ -26,7 +25,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-DjmMoATagWGK2DHMc6YB0u2X5x5hnqgCwIGe3+Wmdic="; + cargoHash = "sha256-L5s+P9eerv+O2vBUczGmn0rUMbHQtnF8hVa22wOrTGo="; OPENSSL_NO_VENDOR = true; From d1a9a606889350903b942bb5a2022a011b224045 Mon Sep 17 00:00:00 2001 From: "Braian A. Diez" Date: Fri, 28 Mar 2025 11:57:11 -0300 Subject: [PATCH 046/105] feroxbuster: added update-script --- pkgs/tools/security/feroxbuster/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 38cded3af940..3caea82f0ec2 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -7,6 +7,7 @@ rustPlatform, Security, SystemConfiguration, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "feroxbuster"; @@ -45,6 +46,8 @@ rustPlatform.buildRustPackage rec { # Tests require network access doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Fast, simple, recursive content discovery tool"; homepage = "https://github.com/epi052/feroxbuster"; From 037aa5c555a446f012ae12d41df1b3ae54f13674 Mon Sep 17 00:00:00 2001 From: "Braian A. Diez" Date: Fri, 28 Mar 2025 12:03:48 -0300 Subject: [PATCH 047/105] feroxbuster: remove postPatch --- pkgs/tools/security/feroxbuster/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 3caea82f0ec2..12cb7a90eafd 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -20,11 +20,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/NgGlXYMxGxpX93SJ6gWgZW21cSSZsgo/WMvRuLw+Bw="; }; - # disable linker overrides on aarch64-linux - postPatch = '' - rm .cargo/config - ''; - useFetchCargoVendor = true; cargoHash = "sha256-L5s+P9eerv+O2vBUczGmn0rUMbHQtnF8hVa22wOrTGo="; From 7aa7ad4f8f4e67237184bb6b4fe7c05ef350502e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 10:02:01 -0700 Subject: [PATCH 048/105] python313Packages.ical: 9.0.1 -> 9.0.2 Diff: https://github.com/allenporter/ical/compare/refs/tags/9.0.1...9.0.2 Changelog: https://github.com/allenporter/ical/releases/tag/9.0.2 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index e2a150d38092..0603576c59fb 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "9.0.1"; + version = "9.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; tag = version; - hash = "sha256-VaFzN/Yzo0Ad1vsuZJ4P8+WWH+GtPJGOz3PWum8rLww="; + hash = "sha256-+kks/RZ0Wc40WCr2gdZ14Rr8y92NtEluPFJi3wwut64="; }; build-system = [ setuptools ]; From 77c1bce73c2745ca2681eec07713a4cf0d741462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 10:36:52 -0700 Subject: [PATCH 049/105] python313Packages.elevenlabs: 1.54.0 -> 1.55.0 Diff: https://github.com/elevenlabs/elevenlabs-python/compare/refs/tags/v1.54.0...v1.55.0 Changelog: https://github.com/elevenlabs/elevenlabs-python/releases/tag/v1.55.0 --- pkgs/development/python-modules/elevenlabs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index bcdc676ac753..4dfe1dcc5741 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.54.0"; + version = "1.55.0"; tag = "v${version}"; in buildPythonPackage { @@ -24,7 +24,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-IW0iXzkoh4a7NzhG4VqU7z2rtUEUi6JEEDxHNkMjMBA="; + hash = "sha256-gcEffuhnwpxOMcKXZ54H1LJEnmTdFgN2ISzPRzxNh9Q="; }; build-system = [ poetry-core ]; From 74c6e461af5bbadfe65ea8e17e588347b1e61b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 12:29:14 -0700 Subject: [PATCH 050/105] python313Packages.hahomematic: 2025.2.5 -> 2025.3.0 Diff: https://github.com/SukramJ/hahomematic/compare/refs/tags/2025.2.5...2025.3.0 Changelog: https://github.com/SukramJ/hahomematic/blob/2025.3.0/changelog.md --- pkgs/development/python-modules/hahomematic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 91221e73e874..10e8e77059c6 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2025.2.5"; + version = "2025.3.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -26,14 +26,14 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "hahomematic"; tag = version; - hash = "sha256-cBj5dwCGJ5++qAZ0JxlqIQKm/Lw3vWVH1DBVVDvkFco="; + hash = "sha256-EnKK+kGnTr5+aDyDIfXI17KkytYi0nMk1NLV/gukOhE="; }; __darwinAllowLocalNetworking = true; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==75.8.0" "setuptools" \ + --replace-fail "setuptools==75.8.2" "setuptools" \ ''; build-system = [ setuptools ]; From 43faff3abd049dcd1ec774f8178a14615a4dfc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 Mar 2025 12:29:47 -0700 Subject: [PATCH 051/105] home-assistant-custom-components.homematicip_local: 1.81.2 -> 1.82.0 Diff: https://github.com/SukramJ/custom_homematic/compare/refs/tags/1.81.2...1.82.0 Changelog: https://github.com/SukramJ/custom_homematic/blob/1.82.0/changelog.md --- .../custom-components/homematicip_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index 062a26dbfb01..5d3343fdfcf3 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "SukramJ"; domain = "homematicip_local"; - version = "1.81.2"; + version = "1.82.0"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-8B1zaU0fMRN2drJvfdifEXM2bXwHBD6PP7/c8lXQPLA="; + hash = "sha256-4JWFjigTDhU0Fjcw5SCBBFQSV2q6IjiueNGSgpPaiNw="; }; postPatch = '' From 9cfca7b48d0b1490988c277391d04fe6ff58588b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Mar 2025 23:56:56 +0000 Subject: [PATCH 052/105] python312Packages.rollbar: 1.1.1 -> 1.3.0 --- pkgs/development/python-modules/rollbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index 5a0ce83f9c3b..57ab4d80b4de 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "rollbar"; - version = "1.1.1"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A3OD/BqNooglfc2irLJrsoaRck56caZ5c1Z8MdR6kUo="; + hash = "sha256-UZQC6sObzE+khIIYcva7GEl/t7bIEWcEeGfRdxTTs3k="; }; build-system = [ setuptools ]; From e3e0287243a577296ade48577b85691499c48df3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 07:05:29 +0000 Subject: [PATCH 053/105] obsidian-export: 23.12.0 -> 25.3.0 --- pkgs/by-name/ob/obsidian-export/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obsidian-export/package.nix b/pkgs/by-name/ob/obsidian-export/package.nix index 158dc0bf3658..23bd3524bd47 100644 --- a/pkgs/by-name/ob/obsidian-export/package.nix +++ b/pkgs/by-name/ob/obsidian-export/package.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "obsidian-export"; - version = "23.12.0"; + version = "25.3.0"; src = fetchFromGitHub { owner = "zoni"; repo = "obsidian-export"; rev = "v${version}"; - hash = "sha256-r5G2XVV2F/Bt29gxuTZKX+KxH6RFa1hJNH3gSTi7yCU="; + hash = "sha256-FcySNccDVeftX5BKVwYXdufsCmG8YuFBQrbSqibbVV8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d9CL29lc3IMpXZa7hGC17UhEJnZPZuRiy0DqWtgyjV8="; + cargoHash = "sha256-2rP1ks+47fI5Os7ltktPVUzvYss+KkjftrE4G0cl8XI="; meta = { changelog = "https://github.com/zoni/obsidian-export/blob/${src.rev}/CHANGELOG.md"; From 3015bf6e008c2f5644a560bd8dc1ade6f0f349b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Mar 2025 10:55:46 +0100 Subject: [PATCH 054/105] feroxbuster: refactor - move to pkgs/by-name --- .../fe/feroxbuster/package.nix} | 25 ++++++------------- pkgs/top-level/all-packages.nix | 4 --- 2 files changed, 8 insertions(+), 21 deletions(-) rename pkgs/{tools/security/feroxbuster/default.nix => by-name/fe/feroxbuster/package.nix} (69%) diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/by-name/fe/feroxbuster/package.nix similarity index 69% rename from pkgs/tools/security/feroxbuster/default.nix rename to pkgs/by-name/fe/feroxbuster/package.nix index 12cb7a90eafd..84d78838efbf 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/by-name/fe/feroxbuster/package.nix @@ -5,38 +5,29 @@ openssl, pkg-config, rustPlatform, - Security, - SystemConfiguration, nix-update-script, }: + rustPlatform.buildRustPackage rec { pname = "feroxbuster"; version = "2.11.0"; src = fetchFromGitHub { owner = "epi052"; - repo = pname; + repo = "feroxbuster"; tag = "v${version}"; hash = "sha256-/NgGlXYMxGxpX93SJ6gWgZW21cSSZsgo/WMvRuLw+Bw="; }; useFetchCargoVendor = true; + cargoHash = "sha256-L5s+P9eerv+O2vBUczGmn0rUMbHQtnF8hVa22wOrTGo="; OPENSSL_NO_VENDOR = true; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; # Tests require network access doCheck = false; @@ -44,10 +35,10 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - description = "Fast, simple, recursive content discovery tool"; + description = "Recursive content discovery tool"; homepage = "https://github.com/epi052/feroxbuster"; - changelog = "https://github.com/epi052/feroxbuster/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/epi052/feroxbuster/releases/tag/v${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; platforms = platforms.unix; mainProgram = "feroxbuster"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 174a802f54fc..2da64b69d633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3124,10 +3124,6 @@ with pkgs; featherpad = qt5.callPackage ../applications/editors/featherpad { }; - feroxbuster = callPackage ../tools/security/feroxbuster { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - ffsend = callPackage ../tools/misc/ffsend { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; From 0447ce7bd829af18b7ec7acefec3af65ee9b7851 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 10:47:07 +0000 Subject: [PATCH 055/105] flyctl: 0.3.89 -> 0.3.94 --- pkgs/by-name/fl/flyctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 34c198aaef88..35b6127ae73b 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.89"; + version = "0.3.94"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-sAgN45f+RS2uLLP6biym2oT7pW+nyA0lIIpm/pFAPuU="; + hash = "sha256-eCAnOoP5YQL/UCKex/lGiY28JswJTBmg+AIRrrDaAmc="; }; - vendorHash = "sha256-HWSNZQxIR9GnBHpJVkCj+5iIrwqAI3GKYLEmq0GP9lU="; + vendorHash = "sha256-OokZuh6wzu7xWu//T87n0tbFC3L+MpEJWkSaFJJJUVI="; subPackages = [ "." ]; From c2c9bce2934e258d8ff208a2c249e045b70bfba3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Mar 2025 12:10:28 +0100 Subject: [PATCH 056/105] feroxbuster: add versionCheckHook --- pkgs/by-name/fe/feroxbuster/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fe/feroxbuster/package.nix b/pkgs/by-name/fe/feroxbuster/package.nix index 84d78838efbf..383b0e6884e4 100644 --- a/pkgs/by-name/fe/feroxbuster/package.nix +++ b/pkgs/by-name/fe/feroxbuster/package.nix @@ -6,6 +6,7 @@ pkg-config, rustPlatform, nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -25,13 +26,20 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + versionCheckHook + ]; buildInputs = [ openssl ]; # Tests require network access doCheck = false; + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { From 5e21041d0d298ce2c457897d9cd1404a4c574589 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 13:43:33 +0000 Subject: [PATCH 057/105] gtk4-layer-shell: 1.1.0 -> 1.1.1 --- pkgs/by-name/gt/gtk4-layer-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gt/gtk4-layer-shell/package.nix b/pkgs/by-name/gt/gtk4-layer-shell/package.nix index 8a7bca4cf7ae..c47de743da1b 100644 --- a/pkgs/by-name/gt/gtk4-layer-shell/package.nix +++ b/pkgs/by-name/gt/gtk4-layer-shell/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk4-layer-shell"; - version = "1.1.0"; + version = "1.1.1"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk4-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-UGhFeaBBIfC4ToWdyoX+oUzLlqJsjF++9U7mtszE0y0="; + hash = "sha256-5TBQKy58o/BdAwfaY2Ss/xcn5kkVFedgiNKfGj7x5gM="; }; strictDeps = true; From 5b0bc905a940438854c6f4e9d1947d7ce5ad7a88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 14:06:50 +0000 Subject: [PATCH 058/105] deno: 2.2.4 -> 2.2.6 --- pkgs/by-name/de/deno/librusty_v8.nix | 10 +++++----- pkgs/by-name/de/deno/package.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix index 855672bf18cc..68c42657c851 100644 --- a/pkgs/by-name/de/deno/librusty_v8.nix +++ b/pkgs/by-name/de/deno/librusty_v8.nix @@ -2,11 +2,11 @@ { fetchLibrustyV8 }: fetchLibrustyV8 { - version = "134.5.0"; + version = "135.0.0"; shas = { - x86_64-linux = "sha256-Mo7PJoU/GuEIPCIDeLshfwNoYpkpD5NilOljFRgjLgw="; - aarch64-linux = "sha256-h51n1SosveRhKlq47pnOMUMi5Avg23GLdMW24mj//PU="; - x86_64-darwin = "sha256-76AP6aLuPmf6wC3yrfI/dkomOAjqVJjJPkUQxjAgDhI="; - aarch64-darwin = "sha256-IpiLBL51Q06t402bwE8bFQew5dPuHBNvkFC8gsWXvsY="; + x86_64-linux = "sha256-jA/cUjzT3KhpBGFyxZSp61X05PhD6XKAGtZyKdnts7U="; + aarch64-linux = "sha256-+jqLUIv96994e1fFJcYCQNJJ8smF18sU76lq0sirszo="; + x86_64-darwin = "sha256-atemob6PgxMncD4F+b5mfleTHSTMdKvJAwFD9ul/eJ4="; + aarch64-darwin = "sha256-0fDaHgvUTDFKEhQp7WaNe+54e3+GScGO5+8+Qa89nLQ="; }; } diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index f23f5150c4b3..a63f31cb5090 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -20,17 +20,17 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "2.2.4"; + version = "2.2.6"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${version}"; - hash = "sha256-gcUd4N2rTVYprBxx5T2RjG+0uZ090KjXPswYzGU5+14="; + hash = "sha256-Ner3178YukKKqMVQAGpU3bE+fxo9UXrRPp7iqCFSUjs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-V2dKiiTYAsUhq6Pr+z/ga3qtKI43mfzqgBDSAhcBVKo="; + cargoHash = "sha256-dakHDPGv7trd2Kib9Hk5jHZHR3pzk1YIyJW/0uY6WSg="; postPatch = '' # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857 From e9ebc417d71d64295a1acedf47dc3326fe44276c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Mar 2025 12:45:55 +0000 Subject: [PATCH 059/105] gretl: 2024d -> 2025a --- pkgs/by-name/gr/gretl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/gretl/package.nix b/pkgs/by-name/gr/gretl/package.nix index 430b88008ac2..0e09aa73f5aa 100644 --- a/pkgs/by-name/gr/gretl/package.nix +++ b/pkgs/by-name/gr/gretl/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gretl"; - version = "2024d"; + version = "2025a"; src = fetchurl { url = "mirror://sourceforge/gretl/gretl-${finalAttrs.version}.tar.xz"; - hash = "sha256-mQNWjCc9sJtpMbwgd0CNjAiyvaTng6DqWyy8WbW126w="; + hash = "sha256-5B9V1Z12+Hu00x++u2ndUXWq91k/SXy723DoLOefhEQ="; }; buildInputs = [ From 61f4f97d4fc66d5b6c18bc32c487465a5f76d722 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 29 Mar 2025 18:08:10 +0100 Subject: [PATCH 060/105] netboot: fix compilation on GCC 14 --- pkgs/by-name/ne/netboot/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ne/netboot/package.nix b/pkgs/by-name/ne/netboot/package.nix index 2041f5507472..07b020907e06 100644 --- a/pkgs/by-name/ne/netboot/package.nix +++ b/pkgs/by-name/ne/netboot/package.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # mgllex.l:398:53: error: passing argument 1 of 'copy_string' from incompatible pointer type [] + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + # Disable parallel build, errors: # link: `parseopt.lo' is not a valid libtool object enableParallelBuilding = false; From 4e7642cb012aa39bb27ffbf9b27cf834f764139b Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 29 Mar 2025 18:08:24 +0100 Subject: [PATCH 061/105] netboot: modernize --- pkgs/by-name/ne/netboot/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ne/netboot/package.nix b/pkgs/by-name/ne/netboot/package.nix index 07b020907e06..48c427cb4134 100644 --- a/pkgs/by-name/ne/netboot/package.nix +++ b/pkgs/by-name/ne/netboot/package.nix @@ -5,15 +5,16 @@ bison, lzo, db4, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netboot"; version = "0.10.2"; src = fetchurl { - url = "mirror://sourceforge/netboot/netboot-${version}.tar.gz"; - sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; + url = "mirror://sourceforge/netboot/netboot-${finalAttrs.version}.tar.gz"; + hash = "sha256-4HFIsMOW+owsVCOZt5pq2q+oRoS5fAmR/R2sx/dKgCc="; }; buildInputs = [ @@ -31,13 +32,18 @@ stdenv.mkDerivation rec { # link: `parseopt.lo' is not a valid libtool object enableParallelBuilding = false; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/nbdbtool"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + meta = { description = "Mini PXE server"; - maintainers = [ maintainers.raskin ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - license = lib.licenses.free; + license = lib.licenses.gpl2Only; }; -} +}) From 6ba0f0a820c614d80db5e5e474ca4e2ea883d472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 28 Mar 2025 20:58:40 +0100 Subject: [PATCH 062/105] git-quickfix: fix darwin build --- .../version-management/git-quickfix/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index 332e2eb983b4..3649ffb7d400 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -6,8 +6,7 @@ pkg-config, rustPlatform, stdenv, - Security, - SystemConfiguration, + zlib, }: rustPlatform.buildRustPackage rec { @@ -27,9 +26,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration libiconv + zlib ]; useFetchCargoVendor = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a5dc5d9c62c..dd4bc00a41de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1191,9 +1191,7 @@ with pkgs; git-publish = python3Packages.callPackage ../applications/version-management/git-publish { }; - git-quickfix = callPackage ../applications/version-management/git-quickfix { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + git-quickfix = callPackage ../applications/version-management/git-quickfix { }; git-recent = callPackage ../applications/version-management/git-recent { util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux; From 20c1ae6a06d609fd43249e7e76e5fdf7f98b6f63 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 29 Mar 2025 18:21:38 +0000 Subject: [PATCH 063/105] glance: 0.7.8 -> 0.7.9 --- pkgs/by-name/gl/glance/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index f6ed5a01832b..ac440677aabb 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "glance"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; tag = "v${finalAttrs.version}"; - hash = "sha256-j4lW5vY2xts/UYXBlWPuu9fJGbqAYrIH+mqKlsdj+eA="; + hash = "sha256-CUuYwbcKJ985fKcUEV6UNLgOZCjUCOzxNRV+pt5vbnc="; }; vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q="; From 338207043dd1c447309b9817b02c857b7e731070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 29 Mar 2025 18:56:15 +0100 Subject: [PATCH 064/105] cinny-desktop: disable update notification --- pkgs/by-name/ci/cinny-desktop/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 8ead510ba928..06ace97cbaf7 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -14,6 +14,8 @@ glib, glib-networking, webkitgtk_4_0, + jq, + moreutils, }: rustPlatform.buildRustPackage rec { @@ -46,10 +48,9 @@ rustPlatform.buildRustPackage rec { }; in '' - substituteInPlace tauri.conf.json \ - --replace-warn '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' - substituteInPlace tauri.conf.json \ - --replace-warn '"cd cinny && npm run build"' '""' + ${lib.getExe jq} \ + 'del(.tauri.updater) | .build.distDir = "${cinny'}" | del(.build.beforeBuildCommand)' tauri.conf.json \ + | ${lib.getExe' moreutils "sponge"} tauri.conf.json ''; postInstall = From 80a950affbedb25aae90114c2409379c237014e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 19:55:46 +0000 Subject: [PATCH 065/105] kicad: 9.0.0 -> 9.0.1 --- .../science/electronics/kicad/versions.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 900d4ff84377..895e55e2f2e4 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "9.0.0"; + version = "9.0.1"; src = { - rev = "ccafeabf1503a778a283eabe40fa0760aa5bc83c"; - sha256 = "0rr4k5hx4kjbfi4q3jdhamv1gjb0b1nwmmrrdg7ig18335bpw14s"; + rev = "eb0a9f7b5b8f26024310bd02367f8414d6c80734"; + sha256 = "14g4ns2fxigzz1z4chcnaz2b8f4jkdmd56mnlpdq8nld8q84hywk"; }; }; libVersion = { - version = "9.0.0"; + version = "9.0.1"; libSources = { - symbols.rev = "e1c3371228f97b36c6fd61b66d056184930f078e"; - symbols.sha256 = "0l8da2ix917jlsj6v5zclc1cb5pvjaxwmys0gjdv55ic31hhfyyw"; - templates.rev = "3ed4538b0f965d821df63a5fffc4441e723cfe7f"; + symbols.rev = "f8789bb729b5ed7ddc6a45b68563157e3a070944"; + symbols.sha256 = "1q8vq4dwnhryizidx0s3x8p4yjhj3hbjhd40zy1pynkf1p174d7n"; + templates.rev = "793b29a36c6b11a11d3bb417cf508a48b8c6ebb8"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "ef91963f57028aa095f2d0c4239ba994ea822f73"; - footprints.sha256 = "16zslgvjg4swgkkvnd9fmiks3wzg63364d03hixiyzcpjlgk2bbk"; - packages3d.rev = "b40831fd7ea2ca8f9c7282143dbb7d2f5015cd69"; - packages3d.sha256 = "0bg54lg1iw01gw06ajg34y7x4y36wm6ls3jnpjy13i18d4ik77g4"; + footprints.rev = "b5974927427a886128e5ba7a8adc285a751261d1"; + footprints.sha256 = "0xqjnvbf032l191spfdh6g579jfhlpyr7pg53pkqdhzz053j3rlz"; + packages3d.rev = "b1fd04f841f0d88b025be7357482cf7f48de4dae"; + packages3d.sha256 = "1xgwd9srp93pj4pnskk3cnkbx57n6kvmlk7qwi3fl6wim3kxfcj2"; }; }; }; From 77eaf76e6ac5b8783c809559b4f3e8195b5c4b70 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 29 Mar 2025 21:26:58 +0100 Subject: [PATCH 066/105] atop: 2.11.0 -> 2.11.1 Fixes CVE-2025-31160. https://github.com/Atoptool/atop/releases/tag/v2.11.1 --- pkgs/by-name/at/atop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atop/package.nix b/pkgs/by-name/at/atop/package.nix index 390593e7f1d4..4a68003f81e4 100644 --- a/pkgs/by-name/at/atop/package.nix +++ b/pkgs/by-name/at/atop/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "atop"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - hash = "sha256-m5TGZmAu//e/QC7M5wbDR/OMOctjSY+dOWJoYeVkbiA="; + hash = "sha256-d2UPefnjiLb1Zm3BE4SYlFdaKbtN4huM1Ydnv4qQUVQ="; }; nativeBuildInputs = From f1c4d339a5bc99f1b1be68ab42e479e2dd0b3885 Mon Sep 17 00:00:00 2001 From: Daniel Xu Date: Mon, 20 Jan 2025 11:48:04 -0800 Subject: [PATCH 067/105] nixos/wordpress: Use https by default for caddy Previously, `http://` scheme was hard coded into the caddy config if `webserver = "caddy"` was chosen. This is fine for local testing, but is problematic if you want your nixos host to be public facing. In the public facing case, you generally want to be using TLS. But since the wordpress module generates the caddyfile rule, the user's nixos config cannot easily change it to also allow https. An alternative would be to reverse proxy an https rule to the generated http rule, but that's somewhat questionable as there's not an internal http endpoint to proxy to. It might be possible but I couldn't figure it out. So simplify by omitting the scheme. This causes caddy to use https by default and 301 redirect any http requests to the https endpoint. Caddy will just do the right thing if it's being hosted on a local/internal hostname (self sign certificates). This should be backwards compatible with previous default if users are using reasonable browsers/tools. Signed-off-by: Daniel Xu --- nixos/doc/manual/release-notes/rl-2505.section.md | 4 ++++ nixos/modules/services/web-apps/wordpress.nix | 2 +- nixos/tests/wordpress.nix | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 8c0b3bfc63e1..013a1a8ba1da 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -445,6 +445,10 @@ For those unable to upgrade yet, there is a [v0 compatibility mode](https://www.openpolicyagent.org/docs/v1.0.1/v0-compatibility/) available too. +- Wordpress with the Caddy webserver (`services.wordpress.webserver = "caddy"`) now sets up sites with Caddy's automatic HTTPS instead of HTTP-only. + Given a site example.com, http://example.com now 301 redirects to https://example.com. + To keep the old behavior for a site `example.com`, set `services.caddy.virtualHosts."example.com".hostName = "http://example.com"`. + - `vscode-utils.buildVscodeExtension` now requires pname as an argument - The behavior of `services.hostapd.radios..networks..authentication.enableRecommendedPairwiseCiphers` was changed to not include `CCMP-256` anymore. diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 827db987890e..0635b5505701 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -545,7 +545,7 @@ in services.caddy = { enable = true; virtualHosts = mapAttrs' (hostName: cfg: ( - nameValuePair "http://${hostName}" { + nameValuePair hostName { extraConfig = '' root * /${pkg hostName cfg}/share/wordpress file_server diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index c7988c111ac4..0983974908ed 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -75,7 +75,7 @@ rec { }; }; - networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" @@ -106,7 +106,7 @@ rec { machine.wait_for_unit(f"phpfpm-wordpress-{site_name}") with subtest("website returns welcome screen"): - assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}") + assert "Welcome to the famous" in machine.succeed(f"curl -k -L {site_name}") with subtest("wordpress-init went through"): info = machine.get_unit_info(f"wordpress-init-{site_name}") From 728e8e2b587f04d4466dac2e25bb6efe6ecfe57a Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 29 Mar 2025 22:17:53 +0100 Subject: [PATCH 068/105] nixosTests.traefik: migrate to runTestOn Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/traefik.nix | 192 +++++++++++++++++++------------------- 2 files changed, 96 insertions(+), 98 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9b39343628e2..fe47d83902cb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1231,7 +1231,7 @@ in { tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; tpm-ek = handleTest ./tpm-ek {}; - traefik = handleTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix {}; + traefik = runTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix; trafficserver = handleTest ./trafficserver.nix {}; transfer-sh = handleTest ./transfer-sh.nix {}; transmission_3 = handleTest ./transmission.nix { transmission = pkgs.transmission_3; }; diff --git a/nixos/tests/traefik.nix b/nixos/tests/traefik.nix index 5e0c88c8130a..e647528dae50 100644 --- a/nixos/tests/traefik.nix +++ b/nixos/tests/traefik.nix @@ -1,109 +1,107 @@ # Test Traefik as a reverse proxy of a local web service # and a Docker container. -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "traefik"; - meta = with pkgs.lib.maintainers; { - maintainers = [ joko ]; - }; +{ pkgs, ... }: +{ + name = "traefik"; + meta = with pkgs.lib.maintainers; { + maintainers = [ joko ]; + }; - nodes = { - client = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.curl ]; - }; - traefik = - { config, pkgs, ... }: - { - virtualisation.oci-containers = { - backend = "docker"; - containers.nginx = { - extraOptions = [ - "-l" - "traefik.enable=true" - "-l" - "traefik.http.routers.nginx.entrypoints=web" - "-l" - "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)" - ]; - image = "nginx-container"; - imageStream = pkgs.dockerTools.examples.nginxStream; - }; - }; - - networking.firewall.allowedTCPPorts = [ 80 ]; - - services.traefik = { - enable = true; - - dynamicConfigOptions = { - http.routers.simplehttp = { - rule = "Host(`simplehttp.traefik.test`)"; - entryPoints = [ "web" ]; - service = "simplehttp"; - }; - - http.services.simplehttp = { - loadBalancer.servers = [ - { - url = "http://127.0.0.1:8000"; - } - ]; - }; - }; - - staticConfigOptions = { - global = { - checkNewVersion = false; - sendAnonymousUsage = false; - }; - - entryPoints.web.address = ":\${HTTP_PORT}"; - - providers.docker.exposedByDefault = false; - }; - environmentFiles = [ - (pkgs.writeText "traefik.env" '' - HTTP_PORT=80 - '') + nodes = { + client = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.curl ]; + }; + traefik = + { config, pkgs, ... }: + { + virtualisation.oci-containers = { + backend = "docker"; + containers.nginx = { + extraOptions = [ + "-l" + "traefik.enable=true" + "-l" + "traefik.http.routers.nginx.entrypoints=web" + "-l" + "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)" ]; + image = "nginx-container"; + imageStream = pkgs.dockerTools.examples.nginxStream; }; - - systemd.services.simplehttp = { - script = "${pkgs.python3}/bin/python -m http.server 8000"; - serviceConfig.Type = "simple"; - wantedBy = [ "multi-user.target" ]; - }; - - users.users.traefik.extraGroups = [ "docker" ]; }; - }; - testScript = '' - start_all() + networking.firewall.allowedTCPPorts = [ 80 ]; - traefik.wait_for_unit("docker-nginx.service") - traefik.wait_until_succeeds("docker ps | grep nginx-container") - traefik.wait_for_unit("simplehttp.service") - traefik.wait_for_unit("traefik.service") - traefik.wait_for_open_port(80) - traefik.wait_for_unit("multi-user.target") + services.traefik = { + enable = true; - client.wait_for_unit("multi-user.target") + dynamicConfigOptions = { + http.routers.simplehttp = { + rule = "Host(`simplehttp.traefik.test`)"; + entryPoints = [ "web" ]; + service = "simplehttp"; + }; - client.wait_until_succeeds("curl -sSf -H Host:nginx.traefik.test http://traefik/") + http.services.simplehttp = { + loadBalancer.servers = [ + { + url = "http://127.0.0.1:8000"; + } + ]; + }; + }; - with subtest("Check that a container can be reached via Traefik"): - assert "Hello from NGINX" in client.succeed( - "curl -sSf -H Host:nginx.traefik.test http://traefik/" - ) + staticConfigOptions = { + global = { + checkNewVersion = false; + sendAnonymousUsage = false; + }; - with subtest("Check that dynamic configuration works"): - assert "Directory listing for " in client.succeed( - "curl -sSf -H Host:simplehttp.traefik.test http://traefik/" - ) - ''; - } -) + entryPoints.web.address = ":\${HTTP_PORT}"; + + providers.docker.exposedByDefault = false; + }; + environmentFiles = [ + (pkgs.writeText "traefik.env" '' + HTTP_PORT=80 + '') + ]; + }; + + systemd.services.simplehttp = { + script = "${pkgs.python3}/bin/python -m http.server 8000"; + serviceConfig.Type = "simple"; + wantedBy = [ "multi-user.target" ]; + }; + + users.users.traefik.extraGroups = [ "docker" ]; + }; + }; + + testScript = '' + start_all() + + traefik.wait_for_unit("docker-nginx.service") + traefik.wait_until_succeeds("docker ps | grep nginx-container") + traefik.wait_for_unit("simplehttp.service") + traefik.wait_for_unit("traefik.service") + traefik.wait_for_open_port(80) + traefik.wait_for_unit("multi-user.target") + + client.wait_for_unit("multi-user.target") + + client.wait_until_succeeds("curl -sSf -H Host:nginx.traefik.test http://traefik/") + + with subtest("Check that a container can be reached via Traefik"): + assert "Hello from NGINX" in client.succeed( + "curl -sSf -H Host:nginx.traefik.test http://traefik/" + ) + + with subtest("Check that dynamic configuration works"): + assert "Directory listing for " in client.succeed( + "curl -sSf -H Host:simplehttp.traefik.test http://traefik/" + ) + ''; +} From 1f1879a36420b7cae28bb29d6b6ae1f4adb0c849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Mar 2025 14:53:39 -0700 Subject: [PATCH 069/105] libdeltachat: 1.157.3 -> 1.158.0 Diff: https://github.com/chatmail/core/compare/refs/tags/v1.157.3...v1.158.0 Changelog: https://github.com/chatmail/core/blob/v1.158.0/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 1a7dcd948788..e7f6f799247a 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.157.3"; + version = "1.158.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-J9Tm35xuyIbHH2HGcctENYbArIlRWe7xzKyF3hGbwNA="; + hash = "sha256-0po4nPCunq9cBaVFSsS1uo18dv6Y6IHGzL1zC2zwXdI="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-BX0TpyG2OJkD5BUIPCij5/g3aRf6FuF9E8y9GM12o7U="; + hash = "sha256-k8TN6YtCVPR8RnFoiGX9APvKwpQzj7T53DlKMD9r/e0="; }; nativeBuildInputs = [ From fde692647105bdfb1bb5f627c00d9b74b1a9744d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 03:38:19 +0000 Subject: [PATCH 070/105] python312Packages.google-cloud-vision: 3.10.0 -> 3.10.1 --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 632cd4558e65..4319bff07a9d 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_vision"; inherit version; - hash = "sha256-HwseF62mj3slfu88t8kaAsjyHiVPi9uP84sOZ9Jc46U="; + hash = "sha256-Ux4QGyzK2SJDOtRsRqR1KeZKCXM0bzD5GgEt4WOlIxE="; }; build-system = [ setuptools ]; From 9f35f594aa1bcbd9ec395943fb122147a80b0282 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 29 Mar 2025 23:35:21 +0100 Subject: [PATCH 071/105] python312Packages.google-cloud-vision: update changelog --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 4319bff07a9d..eecb0bc116d6 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -56,8 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Vision API API client library"; - homepage = "https://github.com/googleapis/python-vision"; - changelog = "https://github.com/googleapis/python-vision/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vision"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-vision-v${version}/packages/google-cloud-vision/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; }; From 0eecf718c36eeb01d3812e1875038728afb31198 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 00:31:05 +0000 Subject: [PATCH 072/105] python312Packages.clarifai-grpc: 11.2.0 -> 11.2.6 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 6d71bca9da76..d24cf78f2dcb 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "11.2.0"; + version = "11.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-FBeGGEHIhio32v45t0YHja9YebAnhd3hnVIvKgPlQdE="; + hash = "sha256-U3hYAwNklPRKD/mHmuc2pgWEKQgU5SZmfMJwCU6CXmA="; }; build-system = [ setuptools ]; From f999c90e8bcc997ececf1de1c6ce11ab154fc791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Mar 2025 15:42:17 -0700 Subject: [PATCH 073/105] python313Packages.nhc: 0.4.10 -> 0.4.11 Diff: https://github.com/vandeurenglenn/nhc/compare/refs/tags/v0.4.10...v0.4.11 Changelog: https://github.com/vandeurenglenn/nhc/blob/v0.4.11/CHANGELOG.md --- pkgs/development/python-modules/nhc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nhc/default.nix b/pkgs/development/python-modules/nhc/default.nix index b423f09080c2..8a61536b705a 100644 --- a/pkgs/development/python-modules/nhc/default.nix +++ b/pkgs/development/python-modules/nhc/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "nhc"; - version = "0.4.10"; + version = "0.4.11"; pyproject = true; src = fetchFromGitHub { owner = "vandeurenglenn"; repo = "nhc"; tag = "v${version}"; - hash = "sha256-oweR7SX8ltL49JJJK3yRNnXL952kEbcLVnmIYXRcLUA="; + hash = "sha256-HokM3u6yf8mT3Zc46qVcZYAfRG9TTjGu+5eLFmi9EUM="; }; build-system = [ setuptools ]; @@ -25,7 +25,6 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/vandeurenglenn/nhc/blob/${src.tag}/CHANGELOG.md"; description = "SDK for Niko Home Control"; homepage = "https://github.com/vandeurenglenn/nhc"; license = lib.licenses.mit; From 3fb1911c746e856743e6453a2ae5906d495e675c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 29 Mar 2025 23:44:29 +0100 Subject: [PATCH 074/105] python312Packages.clarifai: fix build --- pkgs/development/python-modules/clarifai/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 604f93d87e59..433df5084cb5 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { }; pythonRelaxDeps = [ + "click" "fsspec" "schema" ]; From 756b7e3f8a658c3e39b2a446835ed61d2aeecd01 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 30 Mar 2025 01:59:10 +0300 Subject: [PATCH 075/105] maelstrom: fix build with gcc14 - add patch with `#include ` fixing: `error: implicit declaration of function 'time'` --- .../maelstrom/add-maelstrom-netd-include-time.diff | 12 ++++++++++++ pkgs/by-name/ma/maelstrom/package.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/by-name/ma/maelstrom/add-maelstrom-netd-include-time.diff diff --git a/pkgs/by-name/ma/maelstrom/add-maelstrom-netd-include-time.diff b/pkgs/by-name/ma/maelstrom/add-maelstrom-netd-include-time.diff new file mode 100644 index 000000000000..a4741b40e222 --- /dev/null +++ b/pkgs/by-name/ma/maelstrom/add-maelstrom-netd-include-time.diff @@ -0,0 +1,12 @@ +diff --git a/Maelstrom-netd.c b/Maelstrom-netd.c +index 3e6e942..41ed9a5 100644 +--- a/Maelstrom-netd.c ++++ b/Maelstrom-netd.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + /* We wait in a loop for players to connect and tell us how many people + are playing. Then, once all players have connected, then we broadcast diff --git a/pkgs/by-name/ma/maelstrom/package.nix b/pkgs/by-name/ma/maelstrom/package.nix index 1edeeeb53c0a..696be6070fe9 100644 --- a/pkgs/by-name/ma/maelstrom/package.nix +++ b/pkgs/by-name/ma/maelstrom/package.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { ./fix-compilation.patch # removes register keyword ./c++17-fixes.diff + # fix build with gcc14 + ./add-maelstrom-netd-include-time.diff ]; buildInputs = [ From 0c50eb001260766d2dca6fdabb38d36c80d5d2de Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 29 Mar 2025 16:06:31 -0700 Subject: [PATCH 076/105] nixos/tests/syncthing-many-devices: Fix name --- nixos/tests/syncthing-many-devices.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/syncthing-many-devices.nix b/nixos/tests/syncthing-many-devices.nix index 44bd15e29d91..b60569578071 100644 --- a/nixos/tests/syncthing-many-devices.nix +++ b/nixos/tests/syncthing-many-devices.nix @@ -149,7 +149,7 @@ import ./make-test-python.nix ( ''; in { - name = "syncthing-init"; + name = "syncthing-many-devices"; meta.maintainers = with lib.maintainers; [ doronbehar ]; nodes.machine = { From 45a2b054e654900ae8b81478d4015dba7443022e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 29 Mar 2025 18:43:06 +0100 Subject: [PATCH 077/105] givaro: fix cross build --- pkgs/development/libraries/givaro/default.nix | 3 +++ .../libraries/givaro/skip-gmp-check.patch | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/givaro/skip-gmp-check.patch diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 7bd18824b89d..144378d239c0 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { url = "https://github.com/linbox-team/givaro/commit/a18baf5227d4f3e81a50850fe98e0d954eaa3ddb.patch"; hash = "sha256-IR0IHhCqbxgtsST30vxM9ak1nGtt0apxcLUQ1kS1DHw="; }) + # skip gmp version check for cross-compiling, our version is new enough + ./skip-gmp-check.patch ]; enableParallelBuilding = true; @@ -59,6 +61,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-archnative" + "CCNAM=${stdenv.cc.cc.pname}" ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) diff --git a/pkgs/development/libraries/givaro/skip-gmp-check.patch b/pkgs/development/libraries/givaro/skip-gmp-check.patch new file mode 100644 index 000000000000..fa3f03e74dc7 --- /dev/null +++ b/pkgs/development/libraries/givaro/skip-gmp-check.patch @@ -0,0 +1,26 @@ +diff --git a/macros/gmp-check.m4 b/macros/gmp-check.m4 +index 72eba8c..25af64e 100644 +--- a/macros/gmp-check.m4 ++++ b/macros/gmp-check.m4 +@@ -105,21 +105,6 @@ AC_DEFUN([GIV_CHECK_GMP], [ + exit 1 + ]) + +- AC_MSG_CHECKING([whether gmp version is at least $min_gmp_release]) +- AC_TRY_RUN( +- [ +- #include +- #include +- int main () { +- return (__GNU_MP_RELEASE < $min_gmp_release); +- } +- ], +- [ AC_MSG_RESULT(yes) +- ], +- [ AC_MSG_RESULT(no) +- AC_MSG_ERROR(your GMP is too old. GMP release >= $min_gmp_release needed) +- exit 1] +- ) + AC_LANG_POP([C++]) + + AC_SUBST(GMP_CFLAGS) From 96f28a6face0190b102e7666807696b9e94ca3ba Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 29 Mar 2025 18:43:06 +0100 Subject: [PATCH 078/105] givaro: meta.homepage + modernize --- pkgs/development/libraries/givaro/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 144378d239c0..4271952e11d1 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -12,12 +12,14 @@ stdenv.mkDerivation rec { pname = "givaro"; version = "4.2.0"; + src = fetchFromGitHub { owner = "linbox-team"; - repo = pname; - rev = "v${version}"; + repo = "givaro"; + tag = "v${version}"; sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ="; }; + patches = [ # Pull upstream fix for gcc-13: # https://github.com/linbox-team/givaro/pull/218 @@ -83,6 +85,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ library for arithmetic and algebraic computations"; + homepage = "https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"; mainProgram = "givaro-config"; license = lib.licenses.cecill-b; maintainers = [ lib.maintainers.raskin ]; From 7df78265aa307ec949ae7b5b70224fd6454ce57d Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 30 Mar 2025 01:59:10 +0300 Subject: [PATCH 079/105] maelstrom: modernize - convert `rec` to `finalAttrs` - remove `with lib;` from `meta` --- pkgs/by-name/ma/maelstrom/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ma/maelstrom/package.nix b/pkgs/by-name/ma/maelstrom/package.nix index 696be6070fe9..339242a44c00 100644 --- a/pkgs/by-name/ma/maelstrom/package.nix +++ b/pkgs/by-name/ma/maelstrom/package.nix @@ -7,12 +7,12 @@ SDL2_net, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maelstrom"; version = "3.0.7"; src = fetchurl { - url = "http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${version}.tar.gz"; + url = "http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${finalAttrs.version}.tar.gz"; sha256 = "0dm0m5wd7amrsa8wnrblkv34sq4v4lglc2wfx8klfkdhyhi06s4k"; }; @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "Arcade-style game resembling Asteroids"; mainProgram = "maelstrom"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ tmountain ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ tmountain ]; }; -} +}) From be528426ddcacc10bf785ab577ba8e005ac1f209 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 29 Mar 2025 18:43:06 +0100 Subject: [PATCH 080/105] fpc: disable PIE hardening Fails with the usual error: ld: fpmake.o: relocation R_X86_64_32S against `.bss.n_u_$p$fpmake_$$_p' can not be used when making a PIE object; recompile with -fPIE ld: failed to set dynamic section sizes: bad value The build system is hard to decipher, so just disable PIE for now. --- pkgs/development/compilers/fpc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 6b8fa48511c0..d5167b52a700 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -77,6 +77,9 @@ stdenv.mkDerivation rec { "FPC=${startFPC}/bin/fpc" ]; + # disabled by default in fpcsrc/compiler/llvm/agllvm.pas + hardeningDisable = [ "pie" ]; + installFlags = [ "INSTALL_PREFIX=\${out}" ]; postInstall = '' From 04456442cc59bc259980efdc3cc260b7ac349262 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 30 Mar 2025 00:22:55 +0100 Subject: [PATCH 081/105] nixosTests.node-red: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/node-red.nix | 64 +++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f459cf4611d2..d6623d29ae12 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -846,7 +846,7 @@ in { }; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {}; - node-red = handleTest ./node-red.nix {}; + node-red = runTest ./node-red.nix; nomad = runTest ./nomad.nix; non-default-filesystems = handleTest ./non-default-filesystems.nix {}; non-switchable-system = runTest ./non-switchable-system.nix; diff --git a/nixos/tests/node-red.nix b/nixos/tests/node-red.nix index bb95246367c8..7361c6e884ed 100644 --- a/nixos/tests/node-red.nix +++ b/nixos/tests/node-red.nix @@ -1,38 +1,36 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "nodered"; - meta = with pkgs.lib.maintainers; { - maintainers = [ matthewcroughan ]; - }; +{ pkgs, ... }: +{ + name = "nodered"; + meta = with pkgs.lib.maintainers; { + maintainers = [ matthewcroughan ]; + }; - nodes = { - client = - { config, pkgs, ... }: - { - environment.systemPackages = [ pkgs.curl ]; + nodes = { + client = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.curl ]; + }; + nodered = + { config, pkgs, ... }: + { + services.node-red = { + enable = true; + openFirewall = true; }; - nodered = - { config, pkgs, ... }: - { - services.node-red = { - enable = true; - openFirewall = true; - }; - }; - }; + }; + }; - testScript = '' - start_all() - nodered.wait_for_unit("node-red.service") - nodered.wait_for_open_port(1880) + testScript = '' + start_all() + nodered.wait_for_unit("node-red.service") + nodered.wait_for_open_port(1880) - client.wait_for_unit("multi-user.target") + client.wait_for_unit("multi-user.target") - with subtest("Check that the Node-RED webserver can be reached."): - assert "Node-RED" in client.succeed( - "curl -sSf http:/nodered:1880/ | grep title" - ) - ''; - } -) + with subtest("Check that the Node-RED webserver can be reached."): + assert "Node-RED" in client.succeed( + "curl -sSf http:/nodered:1880/ | grep title" + ) + ''; +} From 9f97c585eb6a98c5134f6a720ba937be39375d7f Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 29 Mar 2025 16:25:01 -0700 Subject: [PATCH 082/105] syncthing: Add missing nixosTests to passthru.tests --- pkgs/applications/networking/syncthing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 481e1d2b6069..5a16b91a9d19 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -59,7 +59,7 @@ let passthru = { tests = { - inherit (nixosTests) syncthing syncthing-init syncthing-relay; + inherit (nixosTests) syncthing syncthing-init syncthing-many-devices syncthing-no-settings syncthing-relay; }; updateScript = nix-update-script { }; }; From 2789e7a7b38727aa5c788d2438d227a8a5232726 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 30 Mar 2025 00:29:17 +0100 Subject: [PATCH 083/105] nixosTests.davis: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/davis.nix | 103 ++++++++++++++++++-------------------- 2 files changed, 51 insertions(+), 54 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f459cf4611d2..588697c12a13 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -314,7 +314,7 @@ in { darling = handleTest ./darling.nix {}; darling-dmg = runTest ./darling-dmg.nix; dae = handleTest ./dae.nix {}; - davis = handleTest ./davis.nix {}; + davis = runTest ./davis.nix; db-rest = handleTest ./db-rest.nix {}; dconf = handleTest ./dconf.nix {}; ddns-updater = handleTest ./ddns-updater.nix {}; diff --git a/nixos/tests/davis.nix b/nixos/tests/davis.nix index 0fb80d0e7e20..480191704e2c 100644 --- a/nixos/tests/davis.nix +++ b/nixos/tests/davis.nix @@ -1,59 +1,56 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: +{ pkgs, ... }: +{ + name = "davis"; - { - name = "davis"; + meta.maintainers = pkgs.davis.meta.maintainers; - meta.maintainers = pkgs.davis.meta.maintainers; - - nodes.machine = - { config, ... }: - { - virtualisation = { - memorySize = 512; - }; - - services.davis = { - enable = true; - hostname = "davis.example.com"; - database = { - driver = "postgresql"; - }; - mail = { - dsnFile = "${pkgs.writeText "davisMailDns" "smtp://username:password@example.com:25"}"; - inviteFromAddress = "dav@example.com"; - }; - adminLogin = "admin"; - appSecretFile = "${pkgs.writeText "davisAppSecret" "52882ef142066e09ab99ce816ba72522e789505caba224"}"; - adminPasswordFile = "${pkgs.writeText "davisAdminPass" "nixos"}"; - nginx = { }; - }; + nodes.machine = + { config, ... }: + { + virtualisation = { + memorySize = 512; }; - testScript = '' - start_all() - machine.wait_for_unit("postgresql.service") - machine.wait_for_unit("davis-env-setup.service") - machine.wait_for_unit("davis-db-migrate.service") - machine.wait_for_unit("nginx.service") - machine.wait_for_unit("phpfpm-davis.service") + services.davis = { + enable = true; + hostname = "davis.example.com"; + database = { + driver = "postgresql"; + }; + mail = { + dsnFile = "${pkgs.writeText "davisMailDns" "smtp://username:password@example.com:25"}"; + inviteFromAddress = "dav@example.com"; + }; + adminLogin = "admin"; + appSecretFile = "${pkgs.writeText "davisAppSecret" "52882ef142066e09ab99ce816ba72522e789505caba224"}"; + adminPasswordFile = "${pkgs.writeText "davisAdminPass" "nixos"}"; + nginx = { }; + }; + }; - with subtest("welcome screen loads"): - machine.succeed( - "curl -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/ | grep 'Davis'" - ) + testScript = '' + start_all() + machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("davis-env-setup.service") + machine.wait_for_unit("davis-db-migrate.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_unit("phpfpm-davis.service") - with subtest("login works"): - csrf_token = machine.succeed( - "curl -c /tmp/cookies -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" - ) - r = machine.succeed( - f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F _username=admin -F _password=nixos -F _csrf_token={csrf_token.strip()} -D headers" - ) - print(r) - machine.succeed( - "[[ $(grep -i 'location: ' headers | cut -d: -f2- | xargs echo) == /dashboard* ]]" - ) - ''; - } -) + with subtest("welcome screen loads"): + machine.succeed( + "curl -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/ | grep 'Davis'" + ) + + with subtest("login works"): + csrf_token = machine.succeed( + "curl -c /tmp/cookies -sSfL --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" + ) + r = machine.succeed( + f"curl -b /tmp/cookies --resolve davis.example.com:80:127.0.0.1 http://davis.example.com/login -X POST -F _username=admin -F _password=nixos -F _csrf_token={csrf_token.strip()} -D headers" + ) + print(r) + machine.succeed( + "[[ $(grep -i 'location: ' headers | cut -d: -f2- | xargs echo) == /dashboard* ]]" + ) + ''; +} From 1004fff7042306a69b2ad6c20e8df6369535f619 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 30 Mar 2025 01:24:16 +0100 Subject: [PATCH 084/105] nixosTests.mailcatcher: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/mailcatcher.nix | 58 ++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f459cf4611d2..69f8f364c089 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -678,7 +678,7 @@ in { maestral = handleTest ./maestral.nix {}; magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; magnetico = handleTest ./magnetico.nix {}; - mailcatcher = handleTest ./mailcatcher.nix {}; + mailcatcher = runTest ./mailcatcher.nix; mailhog = handleTest ./mailhog.nix {}; mailpit = handleTest ./mailpit.nix {}; mailman = handleTest ./mailman.nix {}; diff --git a/nixos/tests/mailcatcher.nix b/nixos/tests/mailcatcher.nix index 312f8ed102bf..376b739abd03 100644 --- a/nixos/tests/mailcatcher.nix +++ b/nixos/tests/mailcatcher.nix @@ -1,37 +1,35 @@ -import ./make-test-python.nix ( - { lib, ... }: +{ lib, ... }: - { - name = "mailcatcher"; - meta.maintainers = [ lib.maintainers.aanderse ]; +{ + name = "mailcatcher"; + meta.maintainers = [ lib.maintainers.aanderse ]; - nodes.machine = - { pkgs, ... }: - { - services.mailcatcher.enable = true; + nodes.machine = + { pkgs, ... }: + { + services.mailcatcher.enable = true; - programs.msmtp = { - enable = true; - accounts.default = { - host = "localhost"; - port = 1025; - }; + programs.msmtp = { + enable = true; + accounts.default = { + host = "localhost"; + port = 1025; }; - - environment.systemPackages = [ pkgs.mailutils ]; }; - testScript = '' - start_all() + environment.systemPackages = [ pkgs.mailutils ]; + }; - machine.wait_for_unit("mailcatcher.service") - machine.wait_for_open_port(1025) - machine.succeed( - 'echo "this is the body of the email" | mail -s "subject" root@example.org' - ) - assert "this is the body of the email" in machine.succeed( - "curl -f http://localhost:1080/messages/1.source" - ) - ''; - } -) + testScript = '' + start_all() + + machine.wait_for_unit("mailcatcher.service") + machine.wait_for_open_port(1025) + machine.succeed( + 'echo "this is the body of the email" | mail -s "subject" root@example.org' + ) + assert "this is the body of the email" in machine.succeed( + "curl -f http://localhost:1080/messages/1.source" + ) + ''; +} From 28cd6cadd23f987f76f176afda651a4e06dfe0f9 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 30 Mar 2025 03:14:28 +0200 Subject: [PATCH 085/105] nixosTests.nifi: migrate to runTestOn Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/web-apps/nifi.nix | 54 +++++++++++++++++------------------ 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 98240a9f15e7..b25df8a49f00 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -815,7 +815,7 @@ in { nginx-tmpdir = handleTest ./nginx-tmpdir.nix {}; nginx-unix-socket = handleTest ./nginx-unix-socket.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; - nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {}; + nifi = runTestOn ["x86_64-linux"] ./web-apps/nifi.nix; nitter = handleTest ./nitter.nix {}; nix-config = handleTest ./nix-config.nix {}; nix-ld = handleTest ./nix-ld.nix {}; diff --git a/nixos/tests/web-apps/nifi.nix b/nixos/tests/web-apps/nifi.nix index 06c50151c717..d88aa2a18b9d 100644 --- a/nixos/tests/web-apps/nifi.nix +++ b/nixos/tests/web-apps/nifi.nix @@ -1,34 +1,32 @@ -import ../make-test-python.nix ( - { pkgs, ... }: - { - name = "nifi"; - meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; +{ pkgs, ... }: +{ + name = "nifi"; + meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; - nodes = { - nifi = - { pkgs, ... }: - { - virtualisation = { - memorySize = 2048; - diskSize = 4096; - }; - services.nifi = { - enable = true; - enableHTTPS = false; - }; + nodes = { + nifi = + { pkgs, ... }: + { + virtualisation = { + memorySize = 2048; + diskSize = 4096; }; - }; + services.nifi = { + enable = true; + enableHTTPS = false; + }; + }; + }; - testScript = '' - nifi.start() + testScript = '' + nifi.start() - nifi.wait_for_unit("nifi.service") - nifi.wait_for_open_port(8080) + nifi.wait_for_unit("nifi.service") + nifi.wait_for_open_port(8080) - # Check if NiFi is running - nifi.succeed("curl --fail http://127.0.0.1:8080/nifi/login 2> /dev/null | grep 'NiFi Login'") + # Check if NiFi is running + nifi.succeed("curl --fail http://127.0.0.1:8080/nifi/login 2> /dev/null | grep 'NiFi Login'") - nifi.shutdown() - ''; - } -) + nifi.shutdown() + ''; +} From f14afb819567f9b68f240e646de6bd6afe60537a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 01:38:11 +0000 Subject: [PATCH 086/105] heptabase: 1.53.7 -> 1.54.0 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 2df1e5aee578..6f6e1bb4d91f 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.53.7"; + version = "1.54.0"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-wy69dT/Iyt1jZKMh8/yCGk7+Z/NQt8R2d8jHXOZSvgQ="; + hash = "sha256-wn/HYtwOdP5n5GVJgNWjeujwhDAYE8PfK84JcuJjOwg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From cacdef40fdfd9fb862b247323fd5029a2bdca563 Mon Sep 17 00:00:00 2001 From: imsuck Date: Sun, 30 Mar 2025 09:28:05 +0700 Subject: [PATCH 087/105] maintainers: add imsuck --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80fac0d41653..10547d89aa8c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10268,6 +10268,12 @@ githubId = 26341736; name = "Vishal Das"; }; + imsuck = { + email = "imsuck12@gmail.com"; + github = "imsuck"; + githubId = 49095435; + name = "imsuck"; + }; imuli = { email = "i@imu.li"; github = "imuli"; From 961233f91f5ee39149d44b0896d1d716e17cdcf7 Mon Sep 17 00:00:00 2001 From: imsuck Date: Sun, 30 Mar 2025 09:28:24 +0700 Subject: [PATCH 088/105] mouseless: init at 0.2.0 mouseless: update metadata mouseless: add changelog to metadata Co-authored-by: awwpotato <153149335+awwpotato@users.noreply.github.com> mouseless: follow convention for description mouseless: add `platforms = linux` (metadata) Co-authored-by: awwpotato <153149335+awwpotato@users.noreply.github.com> mouseless: use `finalAttrs` instead of `let in` --- pkgs/by-name/mo/mouseless/package.nix | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/mo/mouseless/package.nix diff --git a/pkgs/by-name/mo/mouseless/package.nix b/pkgs/by-name/mo/mouseless/package.nix new file mode 100644 index 000000000000..84e50ab78cc6 --- /dev/null +++ b/pkgs/by-name/mo/mouseless/package.nix @@ -0,0 +1,34 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: + +buildGoModule (finalAttrs: { + pname = "mouseless"; + version = "0.2.0"; + + vendorHash = "sha256-2q7L9BVcAaT4h/vUcNjVc5nOAFnb4J3WabcEGxI+hsA="; + + src = fetchFromGitHub { + owner = "jbensmann"; + repo = "mouseless"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iDSTV2ugvHoBuQWmMg2ILXP/Mlt7eq5B2dVaB0jwJOE="; + }; + + meta = { + description = "Replacement for the mouse in Linux"; + longDescription = '' + This program allows you to control the mouse pointer in Linux + with the keyboard. It works in all Linux distributions, even those + running with Wayland. + ''; + homepage = "https://github.com/jbensmann/mouseless"; + changelog = "https://github.com/jbensmann/mouseless/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ imsuck ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "mouseless"; + }; +}) From fd6307f842a37ea81ec98faeaf3aa6c73edad2ff Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sat, 29 Mar 2025 23:30:31 -0300 Subject: [PATCH 089/105] azahar: 2120.1 -> 2120.2 --- pkgs/by-name/az/azahar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index cc5a4b05dbc2..bf6761d3429e 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -56,13 +56,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2120.1"; + version = "2120.2"; src = fetchzip { # TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved # url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250322-6ecee96.tar.xz"; - hash = "sha256-d4JHp/BZEQTKErh476NZoizQjgAldR19Waq9GQg2Ebk="; + url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250329-32bb14f.tar.xz"; + hash = "sha256-OyAc4nePQDuuwb+/ABnNe5ihPqMEoAqNeCYvME7SIio="; }; nativeBuildInputs = [ From 6ccf3319ece744525701d61191f36ce39a940aff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 04:28:09 +0000 Subject: [PATCH 090/105] zed-editor: 0.179.3 -> 0.179.4 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index c8c3b7c70336..e19350031225 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -98,7 +98,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.179.3"; + version = "0.179.4"; outputs = [ "out" ] @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-9NJQ0uPID+YVtxDorh3tbokWmqIXNGqzUzIG5ConbWw="; + hash = "sha256-pUspLaCO9sQX8R4bb3+rhHQ8aAwseWtfc0A7EmU51vk="; }; patches = [ @@ -136,7 +136,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-45yY18I+n5RevPgvgXROAxS4Ub7+TzlAL7qKqEeYMTI="; + cargoHash = "sha256-sVQV5kpc0xoDBlQCd3jMvy9DzjkiRjpKTWMKZjXnQyI="; nativeBuildInputs = [ From 4e2dc2f55d26f2fae7fa494e49737822a27d5595 Mon Sep 17 00:00:00 2001 From: Aos Dabbagh <25783780+aos@users.noreply.github.com> Date: Sat, 29 Mar 2025 23:30:05 -0400 Subject: [PATCH 091/105] hypridle: 0.1.5 -> 0.1.6 --- pkgs/by-name/hy/hypridle/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 19697748d968..81c90c35b0c3 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -4,11 +4,13 @@ fetchFromGitHub, pkg-config, cmake, - hyprutils, wayland, wayland-protocols, wayland-scanner, hyprlang, + hyprutils, + hyprland-protocols, + hyprwayland-scanner, sdbus-cpp_2, systemdLibs, nix-update-script, @@ -16,19 +18,22 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hypridle"; rev = "v${finalAttrs.version}"; - hash = "sha256-esE2L7+9CsmlSjTIHwU9VAhzvsFSMC3kO7EiutCPQpg="; + hash = "sha256-uChAGmceKS9F9jqs1xb58BLTVZLF+sFU00MWDEVfYLg="; }; nativeBuildInputs = [ cmake pkg-config + hyprwayland-scanner wayland-scanner + hyprland-protocols + wayland-protocols ]; buildInputs = [ From 8cf9e99abe27d8e7ba276bef626541eaf9e7bf19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 05:23:31 +0000 Subject: [PATCH 092/105] kdePackages.klevernotes: 1.2.0 -> 1.2.2 --- pkgs/kde/misc/klevernotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index fb4e03ce1986..0ad4056f0d15 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -8,11 +8,11 @@ }: mkKdeDerivation rec { pname = "klevernotes"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; - hash = "sha256-TorqKMx0bvxHfvYlTxRKtgbNOWBPohfXuUmBpKZkugc="; + hash = "sha256-WQoeozREN4GsqUC4OlYTrirt+fYa1yeT90RaJxvTH3I="; }; extraBuildInputs = [ From ec8c29734393b81af92590fec1550df360a652c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 06:06:02 +0000 Subject: [PATCH 093/105] ghostfolio: 2.146.0 -> 2.148.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 ac576ccbc115..92af0fc0432b 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.146.0"; + version = "2.148.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-8YZjstzpun+Vbc1ETBf5AwNAOFGyJFftSdyyGsyh6pY="; + hash = "sha256-cQEqp884yHhVGM6xAXGpB56rxCMHD3R5E1qGXqaHSfQ="; # 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-6aOmDntqp3RPDkgwNwlRgVxoQygIBxMU3VIfYjvG3ho="; + npmDepsHash = "sha256-gMTlZUmcKkD2udlJif8DxTDVhqpgjmWoTh3GmoW+eVo="; nativeBuildInputs = [ prisma From b4519d5481ec6535536f7d603aacb635d396dba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 06:12:22 +0000 Subject: [PATCH 094/105] freerdp: 3.14.0 -> 3.14.1 --- pkgs/by-name/fr/freerdp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix index 5c8de9b45f1c..91b50105ce87 100644 --- a/pkgs/by-name/fr/freerdp/package.nix +++ b/pkgs/by-name/fr/freerdp/package.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-Dd7J0QpKNY0cbTldtKkXjBoAJUSCyDf9Pzoah+Ak9Vw="; + hash = "sha256-3hBssoD6l0d1DC5SRhE7HQlcoxNPjz3G8jbQx2rzp60="; }; postPatch = From 734527b119e61a7d6b1916d18953a785bc37c96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sun, 30 Mar 2025 09:22:38 +0200 Subject: [PATCH 095/105] git-quickfix: move to pkgs/by-name --- .../default.nix => by-name/gi/git-quickfix/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/git-quickfix/default.nix => by-name/gi/git-quickfix/package.nix} (100%) diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/by-name/gi/git-quickfix/package.nix similarity index 100% rename from pkgs/applications/version-management/git-quickfix/default.nix rename to pkgs/by-name/gi/git-quickfix/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd4bc00a41de..8c4582fb4968 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1191,8 +1191,6 @@ with pkgs; git-publish = python3Packages.callPackage ../applications/version-management/git-publish { }; - git-quickfix = callPackage ../applications/version-management/git-quickfix { }; - git-recent = callPackage ../applications/version-management/git-recent { util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux; }; From 60b7349bdc2ff2eb857b80bc89d377c53f3d67ab Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 30 Mar 2025 10:36:46 +0300 Subject: [PATCH 096/105] kdePackages.kio: allow loading admin worker from /nix/store This does technically somewhat extend the trust boundary, but users with permissions to put things in the store can basically do anything they want anyway, so this should be fine(tm). Fixes #394540. --- .../kio/allow-admin-from-store.patch | 20 +++++++++++++++++++ pkgs/kde/frameworks/kio/default.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/kde/frameworks/kio/allow-admin-from-store.patch diff --git a/pkgs/kde/frameworks/kio/allow-admin-from-store.patch b/pkgs/kde/frameworks/kio/allow-admin-from-store.patch new file mode 100644 index 000000000000..c35e1c8756e3 --- /dev/null +++ b/pkgs/kde/frameworks/kio/allow-admin-from-store.patch @@ -0,0 +1,20 @@ +diff --git a/src/core/worker.cpp b/src/core/worker.cpp +index da423731c..443c8db19 100644 +--- a/src/core/worker.cpp ++++ b/src/core/worker.cpp +@@ -343,13 +343,13 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro + return nullptr; + } + +- if (protocol == QLatin1String("admin") && !lib_path.startsWith(QLatin1String{KDE_INSTALL_FULL_KIO_PLUGINDIR})) { ++ if (protocol == QLatin1String("admin") && !lib_path.startsWith(QLatin1String("/nix/store"))) { + error_text = i18nc("@info %2 and %3 are paths", + "The KIO worker for protocol “%1” in %2 was not loaded because all KIO workers which are located outside of %3 and ask for elevated " + "privileges are considered insecure.", + protocol, + lib_path, +- QLatin1String{KDE_INSTALL_FULL_KIO_PLUGINDIR}); ++ QLatin1String("/nix/store")); + error = KIO::ERR_CANNOT_CREATE_WORKER; + return nullptr; + } diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 45f448692baa..0bdcb039adff 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -11,6 +11,8 @@ mkKdeDerivation { patches = [ # Remove hardcoded smbd search path ./0001-Remove-impure-smbd-search-path.patch + # Allow loading kio-admin from the store + ./allow-admin-from-store.patch ]; extraBuildInputs = [ From 12a4a5d1922aede3ecb4c1ba0d21fcdd83f9201e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 08:41:18 +0000 Subject: [PATCH 097/105] jan: 0.5.15 -> 0.5.16 --- pkgs/by-name/ja/jan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index afaa4369b91d..3b1a9294c28a 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.5.15"; + version = "0.5.16"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-9DZl+g458iH4mSsQkNbB64NYKw33qs+bUXFnM5WZBMg="; + hash = "sha256-oKJSX8VuCS/CzIroYYzuEtyfviv3naxYr8jpfUccxBg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From abe6da39650f4626adcda71540d452a7acac7166 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Mar 2025 11:02:22 +0200 Subject: [PATCH 098/105] jan: restrict platforms --- pkgs/by-name/ja/jan/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 3b1a9294c28a..14b92c3cfdf1 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -30,6 +30,6 @@ appimageTools.wrapType2 { license = lib.licenses.agpl3Plus; mainProgram = "jan"; maintainers = [ ]; - platforms = lib.platforms.linux; + platforms = with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64; }; } From 42fd97392fa50e44c8ac98924d6e78c57314922b Mon Sep 17 00:00:00 2001 From: Sora Tonami Date: Sun, 30 Mar 2025 18:26:44 +0900 Subject: [PATCH 099/105] stm32cubemx: fix dependencies --- pkgs/by-name/st/stm32cubemx/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index 6fd08edbb04a..d7966caec68e 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -133,5 +133,8 @@ buildFHSEnv { xorg.libXext xorg.libXfixes xorg.libXrandr + libgcrypt + openssl + udev ]; } From 5e78aa9cae7a6ac30b1e2b1677ae224468ce0034 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Feb 2025 23:09:43 +0000 Subject: [PATCH 100/105] terraform-plugin-docs: 0.20.1 -> 0.21.0 --- pkgs/by-name/te/terraform-plugin-docs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 1884f9aa7119..31a0278bbdda 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "terraform-plugin-docs"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; tag = "v${version}"; - hash = "sha256-i5J0dBXqfm5YvELU8q5jLTtfgo8r1u/x/VW55TPmJLQ="; + hash = "sha256-tvo5ufRBtiecOCHfGO9Sxe+bHXqgnfGhBaQQ47CVllk="; }; - vendorHash = "sha256-UmPbtLHy2PAGxDPo1NziHYpNifuI8lsYDASHyjVzGJo="; + vendorHash = "sha256-y69F/KF7cQvtZ4/ZNpw86l/xZgn4aTzmVBw1bs+AtZI="; nativeBuildInputs = [ makeWrapper ]; From e627c3d7128f154b2cccc92fbc8ee2ab959436ec Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Mar 2025 11:31:05 +0200 Subject: [PATCH 101/105] terraform-plugin-docs: fix version --- pkgs/by-name/te/terraform-plugin-docs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 31a0278bbdda..68ff44313b95 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -35,8 +35,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" + "-X github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs/build.version=${version}" + "-X github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs/build.commit=${src.tag}" ]; postInstall = '' From f845bdffe2284508cfe35d1ef5e864e465276c67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 30 Mar 2025 19:36:12 +1000 Subject: [PATCH 102/105] wine-staging: 10.3 -> 10.4 (#393403) --- pkgs/applications/emulators/wine/sources.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 03976a6bde74..fe5accd4c52f 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.3"; + version = "10.4"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; - hash = "sha256-3j2I/wBWuC/9/KhC8RGVkuSRT0jE6gI3aOBBnDZGfD4="; + hash = "sha256-oJAZzlxCuga6kexCPUnY8qmo6sTBqSMMc+HRGWOdXpI="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.4.0"; + version = "10.0.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-z2FzrpS3np3hPZp0zbJWCohvw9Jx+Uiayxz9vZYcrLI="; + hash = "sha256-26ynPl0J96OnwVetBCia+cpHw87XAS1GVEpgcEaQK4c="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-H52ZM+eA0bZPHFlP+uXew7JtOH29BZcXr8hvsqPDtig="; + hash = "sha256-LteUANxr+w1N9r6LNztjRfr3yXtJnUMi0uayTRtFoSU="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; From f178b6520632ada37223421fa832853ec1c7b2aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 07:44:01 +0000 Subject: [PATCH 103/105] ocamlPackages.dtools: 0.4.5 -> 0.4.6 --- pkgs/development/ocaml-modules/dtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/dtools/default.nix b/pkgs/development/ocaml-modules/dtools/default.nix index 6867f32289b5..2a4f65af58b9 100644 --- a/pkgs/development/ocaml-modules/dtools/default.nix +++ b/pkgs/development/ocaml-modules/dtools/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "dtools"; - version = "0.4.5"; + version = "0.4.6"; minimalOCamlVersion = "4.05"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-dtools"; rev = "v${version}"; - sha256 = "sha256-NLQkQx3ZgxU1zvaQjOi+38nSeX+zKCXW40zOxVNekZA="; + sha256 = "sha256-MIZM/IlPWPa/r/f8EXkhU8gZctOZeAIGZgxoGMF2IkE="; }; meta = with lib; { From 3dcbf6f50bb744c22ef7f7e56aba978a2fd64342 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Mar 2025 12:03:30 +0200 Subject: [PATCH 104/105] ocamlPackages.dtools: fix license --- pkgs/development/ocaml-modules/dtools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/dtools/default.nix b/pkgs/development/ocaml-modules/dtools/default.nix index 2a4f65af58b9..9b94bf1a7ac8 100644 --- a/pkgs/development/ocaml-modules/dtools/default.nix +++ b/pkgs/development/ocaml-modules/dtools/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/savonet/ocaml-dtools"; description = "Library providing various helper functions to make daemons"; - license = licenses.gpl2Plus; + license = licenses.gpl2Only; maintainers = with maintainers; [ dandellion ]; }; } From d68a42bb36d91b424ce6a5e971ede805eafd28a4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Mar 2025 12:10:40 +0200 Subject: [PATCH 105/105] trealla: unbreak on x86_64-darwin --- pkgs/by-name/tr/trealla/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 3440b0792ef7..bd389490f5b1 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -99,6 +99,5 @@ stdenv.mkDerivation (finalAttrs: { ]; mainProgram = "tpl"; platforms = lib.platforms.all; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; })