From 3e1f6d207f76f223a69259ab903d564b65c8a759 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Wed, 12 Mar 2025 11:38:06 -0700 Subject: [PATCH 01/91] vesta-viewer: init at 3.5.8 --- pkgs/by-name/ve/vesta-viewer/package.nix | 122 +++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 pkgs/by-name/ve/vesta-viewer/package.nix diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix new file mode 100644 index 000000000000..6ee005925662 --- /dev/null +++ b/pkgs/by-name/ve/vesta-viewer/package.nix @@ -0,0 +1,122 @@ +{ + lib, + fetchzip, + fetchurl, + stdenvNoCC, + makeDesktopItem, + copyDesktopItems, + autoPatchelfHook, + _7zz, + + glib, + libGL, + libGLU, + libgcc, + gtk3, + gtk2, + xorg, + temurin-jre-bin, +}: + +let + pname = "vesta-viewer"; + version = "3.5.8"; + meta = { + description = "3D visualization program for structural models, volumetric data such as electron/nuclear densities, and crystal morphologies"; + homepage = "https://jp-minerals.org/vesta/"; + license = lib.licenses.unfree; + downloadPage = "https://jp-minerals.org/vesta/en/download.html"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + maintainers = with lib.maintainers; [ ulysseszhan ]; + mainProgram = "VESTA"; + }; + + linuxArgs = { + nativeBuildInputs = [ + copyDesktopItems + autoPatchelfHook + ]; + buildInputs = [ + glib + libGL + libGLU + libgcc + gtk3 + gtk2 + temurin-jre-bin + ] + ++ (with xorg; [ + libXxf86vm + libXtst + ]); + + src = fetchzip { + url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2"; + hash = "sha256-Dm4exMUgNZ6Sh8dVhsvLZGS38UXxe9t+9s3ttBQajGg="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/VESTA + cp -r * $out/lib/VESTA + + mkdir -p $out/bin + ln -s $out/lib/VESTA/VESTA{,-core,-gui} -t $out/bin + + mkdir -p $out/share/icons/hicolor/{128x128,256x256}/apps + ln -s $out/lib/VESTA/img/logo.png $out/share/icons/hicolor/128x128/apps/VESTA.png + ln -s $out/lib/VESTA/img/logo@2x.png $out/share/icons/hicolor/256x256/apps/VESTA.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "vesta"; + comment = meta.description; + desktopName = "VESTA"; + genericName = "VESTA"; + exec = "VESTA %u"; + icon = "VESTA"; + categories = [ "Science" ]; + mimeTypes = [ "application/x-vesta" ]; + }) + ]; + }; + + darwinArgs = { + nativeBuildInputs = [ + _7zz # instead of undmg because of APFS + ]; + src = fetchurl { + url = "https://jp-minerals.org/vesta/archives/${version}/VESTA.dmg"; + hash = "sha256-L8vj3MNwHo3m5wP1lByNjHZ4VTVOWSm0Aiw1ItosbSw="; + }; + sourceRoot = "VESTA/VESTA"; + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + }; +in +stdenvNoCC.mkDerivation ( + { + inherit pname version meta; + # I could've written an update script here, + # but I didn't bother because the stable version hasn't been updated for years. + } + // { + "x86_64-linux" = linuxArgs; + "x86_64-darwin" = darwinArgs; + } + .${stdenvNoCC.hostPlatform.system} or { } +) From a4d09cbbb7e0b9f2c1fd284b3630ae1f86dcb7fb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 11 Oct 2025 12:53:51 +0200 Subject: [PATCH 02/91] tower-pixel-dungeon: 0.5.4 -> 1.0.0 --- .../tower-pixel-dungeon/default.nix | 7 ++-- .../tower-pixel-dungeon/deps.json | 39 +++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix index c17d6d1507b9..936bfa00758d 100644 --- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix @@ -6,23 +6,24 @@ callPackage ../generic.nix rec { pname = "tower-pixel-dungeon"; - version = "0.5.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "FixAkaTheFix"; repo = "Tower-Pixel-Dungeon"; tag = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-6b7EC7rye7nSevMJhRwSKJU7zuzta6KUCgzizWPFk8I="; + hash = "sha256-8q1Wt+FXhw58+fK9WMiAcwNrwJfBa5oRBztFmfQz0Uk="; }; sourceRoot = src.name + "/pixel-towers-master"; desktopName = "Tower Pixel Dungeon"; + patches = [ ]; + # Sprite sources (Paint.NET files) and other files interfere with the build process. postPatch = '' rm core/src/main/assets/{levelsplashes,sprites}/*.pdn - rm core/src/main/assets/environment/*.lnk ''; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json index 1448fe4b65f8..c4ba3f9b408d 100644 --- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json +++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json @@ -1,6 +1,45 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, + "https://plugins.gradle.org/m2/org": { + "beryx#badass-runtime-plugin/1.12.7": { + "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=", + "pom": "sha256-9vIy9OpH3sXV5y4jWaQG+pMd8/M2fiVdMmkkCAPBtkk=" + }, + "beryx/runtime#org.beryx.runtime.gradle.plugin/1.12.7": { + "pom": "sha256-95lWpL5pLmiBvaBnA0zUDOOqFX8ti9VWS5wAKWxrK3M=" + }, + "ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "ow2/asm#asm-analysis/9.1": { + "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=", + "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY=" + }, + "ow2/asm#asm-commons/9.1": { + "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=", + "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38=" + }, + "ow2/asm#asm-tree/9.1": { + "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=", + "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw=" + }, + "ow2/asm#asm-util/9.1": { + "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=", + "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88=" + }, + "ow2/asm#asm/9.1": { + "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=", + "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0=" + }, + "slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + } + }, "https://repo.maven.apache.org/maven2": { "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": { "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=", From 6216062a32087c21a66e24a80718ff1eec6c8ba8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 13 Oct 2025 15:43:07 -0700 Subject: [PATCH 03/91] drat: init at 0.1.3-unstable-2024-01-07 > Drat is a tool for analysing and recovering data from [APFS (Apple File System)](https://en.wikipedia.org/wiki/Apple_File_System) partitions. Its creation was inspired by a [personal data loss incident](https://apple.stackexchange.com/questions/373718) and [Jonathan Levin's](https://twitter.com/Morpheus______) closed-source `fsleuth` tool, which he demonstrated in [this lecture](http://docs.macsysadmin.se/2018/video/Day4Session2.mp4). > > The name "Drat" is a loose acronym for "Disaster Recovery APFS Tools", and a bad pun on how one might say "drat!" after discovering that their data is corrupted. --- pkgs/by-name/dr/drat/package.nix | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/dr/drat/package.nix diff --git a/pkgs/by-name/dr/drat/package.nix b/pkgs/by-name/dr/drat/package.nix new file mode 100644 index 000000000000..41911e8ef407 --- /dev/null +++ b/pkgs/by-name/dr/drat/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "drat"; + version = "0.1.3-unstable-2024-01-07"; + + src = fetchFromGitHub { + owner = "jivanpal"; + repo = "drat"; + rev = "af573b9e067e8b6cbcc4825946e7e636b30c748f"; + hash = "sha256-1NmqG73sP25Uqf7DiSPgt7drONOg9ZkrtCS0tYVjSU0="; + }; + + # Don't blow up on warnings; it makes upgrading the compiler difficult. + postPatch = '' + substituteInPlace Makefile --replace-fail "-Werror" "" + ''; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install drat $out/bin + + runHook postInstall + ''; + + meta = { + description = "Utility for performing data recovery and analysis of APFS partitions/containers"; + homepage = "https://github.com/jivanpal/drat"; + changelog = "https://github.com/jivanpal/drat/blob/main/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ philiptaron ]; + mainProgram = "drat"; + platforms = lib.platforms.all; + }; +}) From eb8c425e18863a464425050a2ddc0a4f1f44842c Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Thu, 16 Oct 2025 12:15:04 -0700 Subject: [PATCH 04/91] sentry-cli: partial fix --- .../se/sentry-cli/fix-swift-lib-path.patch | 13 +++++++++++++ pkgs/by-name/se/sentry-cli/package.nix | 18 +++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch diff --git a/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch new file mode 100644 index 000000000000..9d3b0dedd16d --- /dev/null +++ b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch @@ -0,0 +1,13 @@ +diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs +index 2ab4c71b..80301b1a 100644 +--- a/apple-catalog-parsing/build.rs ++++ b/apple-catalog-parsing/build.rs +@@ -30,7 +30,7 @@ fn main() { + // Add necessary libraries to the linker search path. Without this line, compiling fails + // on systems without Xcode installed (xcode-select is still required). + println!( +- "cargo:rustc-link-search=native=/Library/Developer/CommandLineTools/usr/lib/swift/macosx" ++ "cargo:rustc-link-search=native=/usr/lib/swift/macosx" + ); + + let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts"); diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index 4011acc62608..16b0547b0ca1 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -6,6 +6,9 @@ openssl, pkg-config, stdenv, + swift, + swiftpm, + writeShellScriptBin, }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; @@ -22,11 +25,24 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; + patches = [ + ./fix-swift-lib-path.patch + ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ installShellFiles pkg-config - ]; + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ + swift + swiftpm + (writeShellScriptBin "xcode-select" '' + echo $DEVELOPER_DIR + '') + ]); + + # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase` + dontUseSwiftpmBuild = true; cargoHash = "sha256-6AM1oGX4q6kHePiS0fsoXPt0b89O9WItIBukPIwapJQ="; From 8831c62bfdde1f1a91b810bd2b9600e37108a7df Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Thu, 16 Oct 2025 23:17:20 -0500 Subject: [PATCH 05/91] sentry-cli: fix linking issues Co-authored-by: Randy Eckenrode --- .../se/sentry-cli/fix-swift-lib-path.patch | 31 +++++++++++++++++-- pkgs/by-name/se/sentry-cli/package.nix | 9 +++--- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch index 9d3b0dedd16d..04274f374a8f 100644 --- a/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch +++ b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch @@ -1,8 +1,8 @@ diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs -index 2ab4c71b..80301b1a 100644 +index 2ab4c71b59..6bcf003c0a 100644 --- a/apple-catalog-parsing/build.rs +++ b/apple-catalog-parsing/build.rs -@@ -30,7 +30,7 @@ fn main() { +@@ -30,7 +30,7 @@ // Add necessary libraries to the linker search path. Without this line, compiling fails // on systems without Xcode installed (xcode-select is still required). println!( @@ -11,3 +11,30 @@ index 2ab4c71b..80301b1a 100644 ); let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts"); +@@ -87,17 +87,14 @@ + println!("cargo:rustc-link-search=framework=/System/Library/PrivateFrameworks"); + println!("cargo:rustc-link-lib=framework=CoreUI"); + +- // Link to swift macOS support libraries for Swift runtime support on older macOS versions +- let developer_dir = Command::new("xcode-select") +- .args(["-p"]) +- .output() +- .expect("Failed to get developer directory, please ensure Xcode is installed."); +- let developer_dir_path = String::from_utf8(developer_dir.stdout) +- .expect("Failed to convert developer directory to UTF-8") +- .trim() +- .to_owned(); +- +- println!( +- "cargo:rustc-link-search={developer_dir_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx" ++ // Link libobjc to avoid the following error: ld: can't find ordinal for imported symbol '___objc_personality_v0' ++ println!("cargo:rustc-link-lib=objc"); ++ ++ println!( ++ "cargo:rustc-link-search=/usr/lib/swift" ++ ); ++ ++ println!( ++ "cargo:rustc-link-search=@swiftLib@/lib/swift/macosx" + ); + } \ No newline at end of file diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index 16b0547b0ca1..084115cfe1a4 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -8,7 +8,7 @@ stdenv, swift, swiftpm, - writeShellScriptBin, + replaceVars, }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; @@ -26,7 +26,9 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; patches = [ - ./fix-swift-lib-path.patch + (replaceVars ./fix-swift-lib-path.patch { + swiftLib = lib.getLib swift; + }) ]; buildInputs = [ openssl ]; @@ -36,9 +38,6 @@ rustPlatform.buildRustPackage rec { ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ swift swiftpm - (writeShellScriptBin "xcode-select" '' - echo $DEVELOPER_DIR - '') ]); # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase` From 0ff315567c2703895e28b3a8c2a5bb931cc9b2f5 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Thu, 16 Oct 2025 23:36:45 -0500 Subject: [PATCH 06/91] sentry-cli: fix formatting --- pkgs/by-name/se/sentry-cli/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index 084115cfe1a4..e6e44db0eca4 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -35,9 +35,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config - ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - swift - swiftpm + ] + ++ (lib.optionals stdenv.hostPlatform.isDarwin [ + swift + swiftpm ]); # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase` From 35383f5d629d29f667e1b383f20ad806ccaf0581 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 05:00:18 -0300 Subject: [PATCH 07/91] chewing-editor: 0.1.1 -> 0.1.2 --- .../misc/chewing-editor/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index 77a3f7228a1a..1f38613ce6cf 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -1,46 +1,53 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, + gtest, cmake, pkg-config, libchewing, + qt5, qtbase, qttools, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "chewing-editor"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "chewing"; repo = "chewing-editor"; - rev = version; - sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; + tag = version; + hash = "sha256-gF3OotO/xb3Dc0YjVwAKIYnuEPIrgjpGR2tdjOBT4aI="; }; doCheck = true; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config + qt5.wrapQtAppsHook ]; buildInputs = [ + gtest libchewing qtbase qttools ]; - meta = with lib; { + meta = { description = "Cross platform chewing user phrase editor"; mainProgram = "chewing-editor"; longDescription = '' chewing-editor is a cross platform chewing user phrase editor. It provides a easy way to manage user phrase. With it, user can customize their user phrase to increase input performance. ''; homepage = "https://github.com/chewing/chewing-editor"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.ShamrockLee ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ShamrockLee ]; + platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; } From 6e50150544474b9eb82a2207c649e4c84f8345ed Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 09:13:28 -0300 Subject: [PATCH 08/91] ericw-tools: fix build with cmake4 --- pkgs/by-name/er/ericw-tools/package.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/by-name/er/ericw-tools/package.nix b/pkgs/by-name/er/ericw-tools/package.nix index dba4b02f9de7..011c4cb47b2a 100644 --- a/pkgs/by-name/er/ericw-tools/package.nix +++ b/pkgs/by-name/er/ericw-tools/package.nix @@ -61,6 +61,23 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace bspinfo/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace bsputil/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace light/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace qbsp/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace vis/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace man/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { homepage = "https://ericwa.github.io/ericw-tools/"; description = "Map compile tools for Quake and Hexen 2"; From 80f12557f5865badbefab979ca8b15db118773d6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 13 Oct 2025 21:53:42 +0300 Subject: [PATCH 09/91] treewide: replace "yes" else "no" usages to lib.boolToYesNo --- nixos/modules/config/getaddrinfo.nix | 2 +- nixos/modules/misc/locate.nix | 4 +-- nixos/modules/programs/ssh.nix | 2 +- nixos/modules/security/auditd.nix | 2 +- nixos/modules/security/duosec.nix | 13 +++++----- nixos/modules/security/pam_mount.nix | 4 +-- nixos/modules/security/tpm2.nix | 2 +- nixos/modules/services/backup/bacula.nix | 6 ++--- .../modules/services/databases/cassandra.nix | 2 +- nixos/modules/services/mail/cyrus-imap.nix | 3 ++- nixos/modules/services/mail/rspamd.nix | 4 +-- nixos/modules/services/misc/gammu-smsd.nix | 2 +- nixos/modules/services/misc/mediatomb.nix | 7 +++--- .../network-filesystems/orangefs/server.nix | 4 +-- .../services/networking/avahi-daemon.nix | 24 ++++++++---------- .../modules/services/networking/ddclient.nix | 7 +++--- nixos/modules/services/networking/frr.nix | 2 +- .../modules/services/networking/miniupnpd.nix | 4 +-- nixos/modules/services/networking/nsd.nix | 25 +++++++++---------- .../services/networking/pdns-recursor.nix | 3 +-- .../modules/services/networking/smartdns.nix | 2 +- .../modules/services/networking/ssh/sshd.nix | 1 - .../strongswan-swanctl/param-constructors.nix | 2 +- nixos/modules/services/networking/stunnel.nix | 9 +------ nixos/modules/services/networking/tayga.nix | 2 +- nixos/modules/services/networking/unbound.nix | 4 +-- nixos/modules/services/networking/xinetd.nix | 2 +- .../tasks/network-interfaces-systemd.nix | 2 +- pkgs/applications/misc/redshift/default.nix | 12 ++++----- pkgs/build-support/release/debian-build.nix | 2 +- pkgs/by-name/ap/apr/package.nix | 2 +- pkgs/by-name/ba/bacula/package.nix | 2 +- pkgs/by-name/co/colpack/package.nix | 2 +- pkgs/by-name/do/dovecot/package.nix | 6 ++--- pkgs/by-name/i2/i2pd/package.nix | 2 +- pkgs/by-name/li/libcap/package.nix | 2 +- pkgs/by-name/li/libdaemon/package.nix | 2 +- pkgs/by-name/li/libepoxy/package.nix | 4 +-- pkgs/by-name/li/libgpiod/package.nix | 2 +- pkgs/by-name/li/libgpiod_1/package.nix | 2 +- pkgs/by-name/mo/moc/package.nix | 2 +- pkgs/by-name/mo/motif/package.nix | 2 +- pkgs/by-name/mu/mupdf/package.nix | 2 +- .../ne/networkmanager-fortisslvpn/package.nix | 4 +-- .../ne/networkmanager-iodine/package.nix | 2 +- .../ne/networkmanager-l2tp/package.nix | 4 +-- .../ne/networkmanager-openconnect/package.nix | 4 +-- .../ne/networkmanager-openvpn/package.nix | 4 +-- .../ne/networkmanager-sstp/package.nix | 4 +-- .../ne/networkmanager-vpnc/package.nix | 4 +-- pkgs/by-name/op/openmpi/package.nix | 2 +- pkgs/by-name/pc/pciutils/package.nix | 2 +- pkgs/by-name/sh/shadow/package.nix | 2 +- pkgs/by-name/tp/tpm2-pkcs11/package.nix | 2 +- pkgs/by-name/w3/w3m/package.nix | 2 +- .../development/ada-modules/gnatcoll/core.nix | 4 +-- pkgs/development/ada-modules/gpr2/default.nix | 2 +- .../ada-modules/gprbuild/default.nix | 2 +- .../interpreters/python/cpython/default.nix | 4 +-- pkgs/development/libraries/libgda/5.x.nix | 6 ++--- .../tools/protoc-gen-grpc-web/default.nix | 2 +- pkgs/games/quake2/yquake2/default.nix | 4 +-- .../bsd/freebsd/pkgs/sys/package.nix | 2 +- pkgs/shells/bash/5.nix | 2 +- pkgs/tools/nix/info/default.nix | 2 +- 65 files changed, 118 insertions(+), 140 deletions(-) diff --git a/nixos/modules/config/getaddrinfo.nix b/nixos/modules/config/getaddrinfo.nix index f18651a9e031..ddea509bfa78 100644 --- a/nixos/modules/config/getaddrinfo.nix +++ b/nixos/modules/config/getaddrinfo.nix @@ -18,7 +18,7 @@ let [ "# Generated by NixOS module networking.getaddrinfo" "# Do not edit manually!" - "reload ${if cfg.reload then "yes" else "no"}" + "reload ${lib.boolToYesNo cfg.reload}" ] ++ formatTableEntries "label" cfg.label ++ formatTableEntries "precedence" cfg.precedence diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 092852330437..0980e6f385a2 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -241,7 +241,7 @@ in PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}" PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}" PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}" - PRUNE_BIND_MOUNTS="${if cfg.pruneBindMounts then "yes" else "no"}" + PRUNE_BIND_MOUNTS="${lib.boolToYesNo cfg.pruneBindMounts}" ''; systemPackages = [ cfg.package ]; @@ -267,7 +267,7 @@ in '' exec ${cfg.package}/bin/updatedb \ --output ${toString cfg.output} ${lib.concatStringsSep " " args} \ - --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ + --prune-bind-mounts ${lib.boolToYesNo cfg.pruneBindMounts} \ ${lib.concatStringsSep " " cfg.extraFlags} ''; serviceConfig = { diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 443878715bc0..508d1961c770 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -357,7 +357,7 @@ in ] ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet" ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth" - ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}" + ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${lib.boolToYesNo cfg.forwardX11}" ++ lib.optional ( cfg.pubkeyAcceptedKeyTypes != [ ] ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}" diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index bbe22fa6a5bc..f9e7fd6084c1 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -86,7 +86,7 @@ let prepareConfigValue = v: if lib.isBool v then - (if v then "yes" else "no") + lib.boolToYesNo v else if lib.isList v then lib.concatStringsSep " " (map prepareConfigValue v) else diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index b8ff3ae18856..3734bc89e402 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -6,8 +6,7 @@ }: let cfg = config.security.duosec; - - boolToStr = b: if b then "yes" else "no"; + inherit (lib) boolToYesNo; configFilePam = '' [duo] @@ -15,15 +14,15 @@ let host=${cfg.host} ${lib.optionalString (cfg.groups != "") ("groups=" + cfg.groups)} failmode=${cfg.failmode} - pushinfo=${boolToStr cfg.pushinfo} - autopush=${boolToStr cfg.autopush} + pushinfo=${boolToYesNo cfg.pushinfo} + autopush=${boolToYesNo cfg.autopush} prompts=${toString cfg.prompts} - fallback_local_ip=${boolToStr cfg.fallbackLocalIP} + fallback_local_ip=${boolToYesNo cfg.fallbackLocalIP} ''; configFileLogin = configFilePam + '' - motd=${boolToStr cfg.motd} - accept_env_factor=${boolToStr cfg.acceptEnvFactor} + motd=${boolToYesNo cfg.motd} + accept_env_factor=${boolToYesNo cfg.acceptEnvFactor} ''; in { diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index 62deec4ca487..d6459c2598f9 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -170,9 +170,7 @@ in - + ${lib.makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)} diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix index 29eece1ef794..bc05c75669a3 100644 --- a/nixos/modules/security/tpm2.nix +++ b/nixos/modules/security/tpm2.nix @@ -39,7 +39,7 @@ let ima_log_file = cfg.fapi.imaLogFile; } // lib.optionalAttrs (cfg.fapi.ekCertLess != null) { - ek_cert_less = if cfg.fapi.ekCertLess then "yes" else "no"; + ek_cert_less = lib.boolToYesNo cfg.fapi.ekCertLess; } // lib.optionalAttrs (cfg.fapi.ekFingerprint != null) { ek_fingerprint = cfg.fapi.ekFingerprint; } ) diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index cc2e603bf3f9..45d8557e609d 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -10,6 +10,7 @@ let inherit (lib) + boolToYesNo concatStringsSep literalExpression mapAttrsToList @@ -21,16 +22,15 @@ let ; libDir = "/var/lib/bacula"; - yes_no = bool: if bool then "yes" else "no"; tls_conf = tls_cfg: optionalString tls_cfg.enable ( concatStringsSep "\n" ( [ "TLS Enable = yes;" ] - ++ optional (tls_cfg.require != null) "TLS Require = ${yes_no tls_cfg.require};" + ++ optional (tls_cfg.require != null) "TLS Require = ${boolToYesNo tls_cfg.require};" ++ optional (tls_cfg.certificate != null) ''TLS Certificate = "${tls_cfg.certificate}";'' ++ [ ''TLS Key = "${tls_cfg.key}";'' ] - ++ optional (tls_cfg.verifyPeer != null) "TLS Verify Peer = ${yes_no tls_cfg.verifyPeer};" + ++ optional (tls_cfg.verifyPeer != null) "TLS Verify Peer = ${boolToYesNo tls_cfg.verifyPeer};" ++ optional ( tls_cfg.allowedCN != [ ] ) "TLS Allowed CN = ${concatStringsSep " " (tls_cfg.allowedCN)};" diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 27b7a5b94db2..2161fc13ea59 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -504,7 +504,7 @@ in MAX_HEAP_SIZE = toString cfg.maxHeapSize; HEAP_NEWSIZE = toString cfg.heapNewSize; MALLOC_ARENA_MAX = toString cfg.mallocArenaMax; - LOCAL_JMX = if cfg.remoteJmx then "no" else "yes"; + LOCAL_JMX = lib.boolToYesNo (!cfg.remoteJmx); JMX_PORT = toString cfg.jmxPort; }; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix index 3ffd74451b6c..9ee7cf8ee44b 100644 --- a/nixos/modules/services/mail/cyrus-imap.nix +++ b/nixos/modules/services/mail/cyrus-imap.nix @@ -15,6 +15,7 @@ let optionalString generators mapAttrsToList + boolToYesNo ; inherit (lib.strings) concatStringsSep; inherit (lib.types) @@ -63,7 +64,7 @@ let mkValueString = v: if builtins.isBool v then - if v then "yes" else "no" + boolToYesNo v else if builtins.isList v then concatStringsSep " " v else diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 5b09cfb217fb..715376e24f88 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -211,9 +211,7 @@ let '' worker "${value.type}" { type = "${value.type}"; - ${optionalString (value.enable != null) - "enabled = ${if value.enable != false then "yes" else "no"};" - } + ${optionalString (value.enable != null) "enabled = ${lib.boolToYesNo (value.enable != false)};"} ${mkBindSockets value.enable value.bindSockets} ${optionalString (value.count != null) "count = ${toString value.count};"} ${concatStringsSep "\n " (map (each: ".include \"${each}\"") value.includes)} diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 85f3d2fa94a9..518a9c4f0065 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -11,7 +11,7 @@ let [gammu] Device = ${cfg.device.path} Connection = ${cfg.device.connection} - SynchronizeTime = ${if cfg.device.synchronizeTime then "yes" else "no"} + SynchronizeTime = ${lib.boolToYesNo cfg.device.synchronizeTime} LogFormat = ${cfg.log.format} ${lib.optionalString (cfg.device.pin != null) "PIN = ${cfg.device.pin}"} ${cfg.extraConfig.gammu} diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index eac446817ae7..1b92947db696 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -12,7 +12,6 @@ let opt = options.services.mediatomb; name = cfg.package.pname; pkg = cfg.package; - optionYesNo = option: if option then "yes" else "no"; # configuration on media directory mediaDirectory = { options = { @@ -36,7 +35,7 @@ let }; toMediaDirectory = d: - "\n"; + "\n"; transcodingConfig = if cfg.transcoding then @@ -89,13 +88,13 @@ let ${cfg.dataDir} ${cfg.interface} ${pkg}/share/${name}/web - + ${name}.db - + ${lib.optionalString cfg.dsmSupport '' diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix index 99d7b27011c2..d3047af4aa91 100644 --- a/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -50,8 +50,8 @@ let - TroveSyncMeta ${if fs.troveSyncMeta then "yes" else "no"} - TroveSyncData ${if fs.troveSyncData then "yes" else "no"} + TroveSyncMeta ${lib.boolToYesNo fs.troveSyncMeta} + TroveSyncData ${lib.boolToYesNo fs.troveSyncData} ${fs.extraStorageHints} diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index b1ed28980cfe..28efc39f8bce 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -7,8 +7,6 @@ let cfg = config.services.avahi; - yesNo = yes: if yes then "yes" else "no"; - avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" '' @@ -21,8 +19,8 @@ let lib.optionalString (hostName != "") "host-name=${hostName}" } browse-domains=${lib.concatStringsSep ", " browseDomains} - use-ipv4=${yesNo ipv4} - use-ipv6=${yesNo ipv6} + use-ipv4=${lib.boolToYesNo ipv4} + use-ipv6=${lib.boolToYesNo ipv6} ${lib.optionalString ( allowInterfaces != null ) "allow-interfaces=${lib.concatStringsSep "," allowInterfaces}"} @@ -30,22 +28,22 @@ let denyInterfaces != null ) "deny-interfaces=${lib.concatStringsSep "," denyInterfaces}"} ${lib.optionalString (domainName != null) "domain-name=${domainName}"} - allow-point-to-point=${yesNo allowPointToPoint} + allow-point-to-point=${lib.boolToYesNo allowPointToPoint} ${lib.optionalString (cacheEntriesMax != null) "cache-entries-max=${toString cacheEntriesMax}"} [wide-area] - enable-wide-area=${yesNo wideArea} + enable-wide-area=${lib.boolToYesNo wideArea} [publish] - disable-publishing=${yesNo (!publish.enable)} - disable-user-service-publishing=${yesNo (!publish.userServices)} - publish-addresses=${yesNo (publish.userServices || publish.addresses)} - publish-hinfo=${yesNo publish.hinfo} - publish-workstation=${yesNo publish.workstation} - publish-domain=${yesNo publish.domain} + disable-publishing=${lib.boolToYesNo (!publish.enable)} + disable-user-service-publishing=${lib.boolToYesNo (!publish.userServices)} + publish-addresses=${lib.boolToYesNo (publish.userServices || publish.addresses)} + publish-hinfo=${lib.boolToYesNo publish.hinfo} + publish-workstation=${lib.boolToYesNo publish.workstation} + publish-domain=${lib.boolToYesNo publish.domain} [reflector] - enable-reflector=${yesNo reflector} + enable-reflector=${lib.boolToYesNo reflector} ${extraConfig} ''; in diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 54e488db9856..773387939a7c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -6,7 +6,6 @@ }: let cfg = config.services.ddclient; - boolToStr = bool: if bool then "yes" else "no"; dataDir = "/var/lib/ddclient"; StateDirectory = builtins.baseNameOf dataDir; RuntimeDirectory = StateDirectory; @@ -33,10 +32,10 @@ let ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} ${lib.optionalString (cfg.server != "") "server=${cfg.server}"} ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} - ssl=${boolToStr cfg.ssl} + ssl=${lib.boolToYesNo cfg.ssl} wildcard=YES - quiet=${boolToStr cfg.quiet} - verbose=${boolToStr cfg.verbose} + quiet=${lib.boolToYesNo cfg.quiet} + verbose=${lib.boolToYesNo cfg.verbose} ${cfg.extraConfig} ${lib.concatStringsSep "," cfg.domains} ''; diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix index fac18c6a246c..73c194ac060c 100644 --- a/nixos/modules/services/networking/frr.nix +++ b/nixos/modules/services/networking/frr.nix @@ -82,7 +82,7 @@ let isEnabled = service: cfg.${service}.enable; - daemonLine = d: "${d}=${if isEnabled d then "yes" else "no"}"; + daemonLine = d: "${d}=${lib.boolToYesNo (isEnabled d)}"; configFile = if cfg.configFile != null then diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix index ccbddbf3d5a1..c723ff16d3cd 100644 --- a/nixos/modules/services/networking/miniupnpd.nix +++ b/nixos/modules/services/networking/miniupnpd.nix @@ -11,8 +11,8 @@ let cfg = config.services.miniupnpd; configFile = pkgs.writeText "miniupnpd.conf" '' ext_ifname=${cfg.externalInterface} - enable_natpmp=${if cfg.natpmp then "yes" else "no"} - enable_upnp=${if cfg.upnp then "yes" else "no"} + enable_natpmp=${boolToYesNo cfg.natpmp} + enable_upnp=${boolToYesNo cfg.upnp} ${concatMapStrings (range: '' listening_ip=${range} diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index bc6aa5ae3fff..46d9d084d7d7 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -100,19 +100,19 @@ let # interfaces ${forEach " ip-address: " cfg.interfaces} - ip-freebind: ${yesOrNo cfg.ipFreebind} - hide-version: ${yesOrNo cfg.hideVersion} + ip-freebind: ${boolToYesNo cfg.ipFreebind} + hide-version: ${boolToYesNo cfg.hideVersion} identity: "${cfg.identity}" - ip-transparent: ${yesOrNo cfg.ipTransparent} - do-ip4: ${yesOrNo cfg.ipv4} + ip-transparent: ${boolToYesNo cfg.ipTransparent} + do-ip4: ${boolToYesNo cfg.ipv4} ipv4-edns-size: ${toString cfg.ipv4EDNSSize} - do-ip6: ${yesOrNo cfg.ipv6} + do-ip6: ${boolToYesNo cfg.ipv6} ipv6-edns-size: ${toString cfg.ipv6EDNSSize} - log-time-ascii: ${yesOrNo cfg.logTimeAscii} + log-time-ascii: ${boolToYesNo cfg.logTimeAscii} ${maybeString "nsid: " cfg.nsid} port: ${toString cfg.port} - reuseport: ${yesOrNo cfg.reuseport} - round-robin: ${yesOrNo cfg.roundRobin} + reuseport: ${boolToYesNo cfg.reuseport} + round-robin: ${boolToYesNo cfg.roundRobin} server-count: ${toString cfg.serverCount} ${maybeToString "statistics: " cfg.statistics} tcp-count: ${toString cfg.tcpCount} @@ -121,7 +121,7 @@ let verbosity: ${toString cfg.verbosity} ${maybeString "version: " cfg.version} xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout} - zonefiles-check: ${yesOrNo cfg.zonefilesCheck} + zonefiles-check: ${boolToYesNo cfg.zonefilesCheck} zonefiles-write: ${toString cfg.zonefilesWrite} ${maybeString "rrl-ipv4-prefix-length: " cfg.ratelimit.ipv4PrefixLength} @@ -134,7 +134,7 @@ let ${keyConfigFile} remote-control: - control-enable: ${yesOrNo cfg.remoteControl.enable} + control-enable: ${boolToYesNo cfg.remoteControl.enable} control-key-file: "${cfg.remoteControl.controlKeyFile}" control-cert-file: "${cfg.remoteControl.controlCertFile}" ${forEach " control-interface: " cfg.remoteControl.interfaces} @@ -147,7 +147,6 @@ let ${cfg.extraConfig} ''; - yesOrNo = b: if b then "yes" else "no"; maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"''; maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}''; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; @@ -183,8 +182,8 @@ let ${maybeToString "max-retry-time: " zone.maxRetrySecs} ${maybeToString "min-retry-time: " zone.minRetrySecs} - allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback} - multi-master-check: ${yesOrNo zone.multiMasterCheck} + allow-axfr-fallback: ${boolToYesNo zone.allowAXFRFallback} + multi-master-check: ${boolToYesNo zone.multiMasterCheck} ${forEach " allow-notify: " zone.allowNotify} ${forEach " request-xfr: " zone.requestXFR} diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 3185dd1b9696..172f45c61331 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -21,7 +21,6 @@ let ]; configType = with types; attrsOf (nullOr (oneOrMore valueType)); - toBool = val: if val then "yes" else "no"; serialize = val: with types; @@ -32,7 +31,7 @@ let else if path.check val then toString val else if bool.check val then - toBool val + boolToYesNo val else if builtins.isList val then (concatMapStringsSep "," serialize val) else diff --git a/nixos/modules/services/networking/smartdns.nix b/nixos/modules/services/networking/smartdns.nix index d60c5cf19b84..761f3c3e6a14 100644 --- a/nixos/modules/services/networking/smartdns.nix +++ b/nixos/modules/services/networking/smartdns.nix @@ -23,7 +23,7 @@ let with generators; toKeyValue { mkKeyValue = mkKeyValueDefault { - mkValueString = v: if isBool v then if v then "yes" else "no" else mkValueStringDefault { } v; + mkValueString = v: if isBool v then boolToYesNo v else mkValueStringDefault { } v; } " "; listsAsDuplicateKeys = true; # Allowing duplications because we need to deal with multiple entries with the same key. } cfg.settings diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c56193cb4f83..ac7d43f81e77 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -484,7 +484,6 @@ in }; UseDns = lib.mkOption { type = lib.types.nullOr lib.types.bool; - # apply if cfg.useDns then "yes" else "no" default = false; description = '' Specifies whether {manpage}`sshd(8)` should look up the remote host name, and to check that the resolved host name for diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index cb4ef1079016..82b38d18c639 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -97,7 +97,7 @@ rec { default = null; description = documentDefault description strongswanDefault; }; - render = single (b: if b then "yes" else "no"); + render = single boolToYesNo; }; yes = true; no = false; diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix index 9ff040191361..9ce2451b4231 100644 --- a/nixos/modules/services/networking/stunnel.nix +++ b/nixos/modules/services/networking/stunnel.nix @@ -7,7 +7,6 @@ let cfg = config.services.stunnel; - yesNo = val: if val then "yes" else "no"; verifyRequiredField = type: field: n: c: { assertion = lib.hasAttr field c; @@ -23,13 +22,7 @@ let removeNulls = lib.mapAttrs (_: lib.filterAttrs (_: v: v != null)); mkValueString = - v: - if v == true then - "yes" - else if v == false then - "no" - else - lib.generators.mkValueStringDefault { } v; + v: if lib.isBool v then lib.boolToYesNo v else lib.generators.mkValueStringDefault { } v; generateConfig = c: lib.generators.toINI { diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix index 7ed0cf51e561..f7221bdaf8c7 100644 --- a/nixos/modules/services/networking/tayga.nix +++ b/nixos/modules/services/networking/tayga.nix @@ -28,7 +28,7 @@ let log ${concatStringsSep " " cfg.log} ''} - wkpf-strict ${if cfg.wkpfStrict then "yes" else "no"} + wkpf-strict ${boolToYesNo cfg.wkpfStrict} ''; addrOpts = diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 7ad0c53c17e9..219ca9fc13a9 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -9,8 +9,6 @@ with lib; let cfg = config.services.unbound; - yesOrNo = v: if v then "yes" else "no"; - toOption = indent: n: v: "${indent}${toString n}: ${v}"; @@ -22,7 +20,7 @@ let else if isInt v then (toOption indent n (toString v)) else if isBool v then - (toOption indent n (yesOrNo v)) + (toOption indent n (lib.boolToYesNo v)) else if isString v then (toOption indent n v) else if isList v then diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 71a258fbfee1..d33b4d97519b 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -31,7 +31,7 @@ let ${optionalString (srv.flags != "") "flags = ${srv.flags}"} socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"} ${optionalString (srv.port != 0) "port = ${toString srv.port}"} - wait = ${if srv.protocol == "udp" then "yes" else "no"} + wait = ${lib.boolToYesNo (srv.protocol == "udp")} user = ${srv.user} server = ${srv.server} ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"} diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 653fafb9b216..14f9108c160d 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -18,7 +18,7 @@ let interfaceRoutes = i: i.ipv4.routes ++ optionals cfg.enableIPv6 i.ipv6.routes; - dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no"; + dhcpStr = useDHCP: boolToYesNo (useDHCP == true || useDHCP == null); slaves = concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds)) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6ac94dc2906b..aec14488480b 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -70,12 +70,12 @@ let ++ lib.optionals (pname == "gammastep") [ wayland-scanner ]; configureFlags = [ - "--enable-randr=${if withRandr then "yes" else "no"}" - "--enable-geoclue2=${if withGeoclue then "yes" else "no"}" - "--enable-drm=${if withDrm then "yes" else "no"}" - "--enable-vidmode=${if withVidmode then "yes" else "no"}" - "--enable-quartz=${if withQuartz then "yes" else "no"}" - "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" + "--enable-randr=${lib.boolToYesNo withRandr}" + "--enable-geoclue2=${lib.boolToYesNo withGeoclue}" + "--enable-drm=${lib.boolToYesNo withDrm}" + "--enable-vidmode=${lib.boolToYesNo withVidmode}" + "--enable-quartz=${lib.boolToYesNo withQuartz}" + "--enable-corelocation=${lib.boolToYesNo withCoreLocation}" ] ++ lib.optionals (pname == "gammastep") [ "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user/" diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 27afc3a117fa..2359587665b8 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -69,7 +69,7 @@ vmTools.runInLinuxImage ( # the log file export PAGER=cat ${checkinstall}/sbin/checkinstall --nodoc -y -D \ - --fstrans=${if fsTranslation then "yes" else "no"} \ + --fstrans=${lib.boolToYesNo fsTranslation} \ --requires="${lib.concatStringsSep "," debRequires}" \ --provides="${lib.concatStringsSep "," debProvides}" \ ${ diff --git a/pkgs/by-name/ap/apr/package.nix b/pkgs/by-name/ap/apr/package.nix index 8ded7258aca7..f9feea54a782 100644 --- a/pkgs/by-name/ap/apr/package.nix +++ b/pkgs/by-name/ap/apr/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # These answers are valid on x86_64-linux and aarch64-linux. # TODO: provide all valid answers for BSD. "ac_cv_file__dev_zero=yes" - "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}" "apr_cv_tcp_nodelay_with_cork=yes" "ac_cv_define_PTHREAD_PROCESS_SHARED=yes" "apr_cv_process_shared_works=yes" diff --git a/pkgs/by-name/ba/bacula/package.nix b/pkgs/by-name/ba/bacula/package.nix index 74007248fd63..9397eab8c4dd 100644 --- a/pkgs/by-name/ba/bacula/package.nix +++ b/pkgs/by-name/ba/bacula/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) - "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}" ++ lib.optionals stdenv.hostPlatform.isDarwin [ # bacula’s `configure` script fails to detect CoreFoundation correctly, # but these symbols are available in the nixpkgs CoreFoundation framework. diff --git a/pkgs/by-name/co/colpack/package.nix b/pkgs/by-name/co/colpack/package.nix index 897b137cd2c9..56bb94293a0e 100644 --- a/pkgs/by-name/co/colpack/package.nix +++ b/pkgs/by-name/co/colpack/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ - "--enable-openmp=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" + "--enable-openmp=${lib.boolToYesNo stdenv.hostPlatform.isLinux}" "--enable-examples=no" ]; diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix index 1dce4874455d..5dd75ba1b615 100644 --- a/pkgs/by-name/do/dovecot/package.nix +++ b/pkgs/by-name/do/dovecot/package.nix @@ -155,9 +155,9 @@ stdenv.mkDerivation rec { "--with-textcat" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" - "i_cv_posix_fallocate_works=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" - "i_cv_inotify_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" + "i_cv_epoll_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}" + "i_cv_posix_fallocate_works=${lib.boolToYesNo stdenv.hostPlatform.isDarwin}" + "i_cv_inotify_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}" "i_cv_signed_size_t=no" "i_cv_signed_time_t=yes" "i_cv_c99_vsnprintf=yes" diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index 598ffdc52936..83b9fa9aa0cb 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "USE_UPNP=${if upnpSupport then "yes" else "no"}" + "USE_UPNP=${lib.boolToYesNo upnpSupport}" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index 7abcdb8d24b8..76e0ee1d0fe6 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { makeFlags = [ "lib=lib" - "PAM_CAP=${if usePam then "yes" else "no"}" + "PAM_CAP=${lib.boolToYesNo usePam}" "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" diff --git a/pkgs/by-name/li/libdaemon/package.nix b/pkgs/by-name/li/libdaemon/package.nix index 7be36bcece73..5a2013bfe03c 100644 --- a/pkgs/by-name/li/libdaemon/package.nix +++ b/pkgs/by-name/li/libdaemon/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Can't run this test while cross-compiling - "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}" ]; meta = { diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix index c408b12bac40..c73090a25a29 100644 --- a/pkgs/by-name/li/libepoxy/package.nix +++ b/pkgs/by-name/li/libepoxy/package.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Degl=${if (x11Support && !stdenv.hostPlatform.isDarwin) then "yes" else "no"}" - "-Dglx=${if x11Support then "yes" else "no"}" + "-Degl=${lib.boolToYesNo (x11Support && !stdenv.hostPlatform.isDarwin)}" + "-Dglx=${lib.boolToYesNo x11Support}" "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-Dx11=${lib.boolToString x11Support}" ]; diff --git a/pkgs/by-name/li/libgpiod/package.nix b/pkgs/by-name/li/libgpiod/package.nix index b40cb39b86ff..ed6b3ca2fa1c 100644 --- a/pkgs/by-name/li/libgpiod/package.nix +++ b/pkgs/by-name/li/libgpiod/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-tools=${if enable-tools then "yes" else "no"}" + "--enable-tools=${lib.boolToYesNo enable-tools}" "--enable-bindings-cxx" ]; diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index f1c4908a2683..39aa5b933d01 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-tools=${if enable-tools then "yes" else "no"}" + "--enable-tools=${lib.boolToYesNo enable-tools}" "--enable-bindings-cxx" "--prefix=${placeholder "out"}" ] diff --git a/pkgs/by-name/mo/moc/package.nix b/pkgs/by-name/mo/moc/package.nix index ee093e43eb4c..676b435661ba 100644 --- a/pkgs/by-name/mo/moc/package.nix +++ b/pkgs/by-name/mo/moc/package.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation { # Misc (lib.withFeature curlSupport "curl") (lib.withFeature samplerateSupport "samplerate") - ("--enable-debug=" + (if withDebug then "yes" else "no")) + "--enable-debug=${lib.boolToYesNo withDebug}" "--disable-cache" "--without-rcc" ]; diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index c06b6c1e062c..92bd4eafae1b 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { # provide correct configure answers for cross builds configureFlags = [ - "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}" ]; env = lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 1d3b8cea5f99..82447b34a4c5 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -282,7 +282,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env.USE_SONAME = if (stdenv.hostPlatform.isDarwin) then "no" else "yes"; + env.USE_SONAME = lib.boolToYesNo (!stdenv.hostPlatform.isDarwin); passthru = { tests = { diff --git a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix index c03e224044a2..578632ad42b3 100644 --- a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--with-gtk4=${if withGnome then "yes" else "no"}" + "--with-gnome=${lib.boolToYesNo withGnome}" + "--with-gtk4=${lib.boolToYesNo withGnome}" "--localstatedir=/var" "--enable-absolute-paths" ]; diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix index 423a68a9392b..c32c8d3ac34d 100644 --- a/pkgs/by-name/ne/networkmanager-iodine/package.nix +++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { ]; configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gnome=${lib.boolToYesNo withGnome}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager "--enable-absolute-paths" ]; diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index ddb1a9ea489d..3b2a3830d5de 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--with-gtk4=${if withGnome then "yes" else "no"}" + "--with-gnome=${lib.boolToYesNo withGnome}" + "--with-gtk4=${lib.boolToYesNo withGnome}" "--localstatedir=/var" "--enable-absolute-paths" ]; diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix index 2fa483df360e..d9bf1c519342 100644 --- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix +++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--with-gtk4=${if withGnome then "yes" else "no"}" + "--with-gnome=${lib.boolToYesNo withGnome}" + "--with-gtk4=${lib.boolToYesNo withGnome}" "--enable-absolute-paths" ]; diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix index fc777d2e7a77..8ea6dd63f8db 100644 --- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--with-gtk4=${if withGnome then "yes" else "no"}" + "--with-gnome=${lib.boolToYesNo withGnome}" + "--with-gtk4=${lib.boolToYesNo withGnome}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager "--enable-absolute-paths" ]; diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix index fb44c80c5e31..b881ddf0c756 100644 --- a/pkgs/by-name/ne/networkmanager-sstp/package.nix +++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--with-gtk4=${if withGnome then "yes" else "no"}" + "--with-gnome=${lib.boolToYesNo withGnome}" + "--with-gtk4=${lib.boolToYesNo withGnome}" "--with-pppd-plugin-dir=$(out)/lib/pppd/2.5.0" "--enable-absolute-paths" ]; diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index e5eab9609e70..06c49313d36e 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -52,8 +52,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--with-gtk4=${if withGnome then "yes" else "no"}" + "--with-gnome=${lib.boolToYesNo withGnome}" + "--with-gtk4=${lib.boolToYesNo withGnome}" "--enable-absolute-paths" ]; diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix index 2984c4c035d9..4bd744c5f5d3 100644 --- a/pkgs/by-name/op/openmpi/package.nix +++ b/pkgs/by-name/op/openmpi/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace configure \ --replace-fail \ ompi_cv_op_avx_check_${option}=yes \ - ompi_cv_op_avx_check_${option}=${if val then "yes" else "no"} + ompi_cv_op_avx_check_${option}=${lib.boolToYesNo val} '' )) (lib.concatStringsSep "\n") diff --git a/pkgs/by-name/pc/pciutils/package.nix b/pkgs/by-name/pc/pciutils/package.nix index 3aa99cd6634a..b3a0d2b91357 100644 --- a/pkgs/by-name/pc/pciutils/package.nix +++ b/pkgs/by-name/pc/pciutils/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ - "SHARED=${if static then "no" else "yes"}" + "SHARED=${lib.boolToYesNo (!static)}" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 719bfb4fb1ff..72681d81eae0 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { # `AC_FUNC_SETPGRP' is not cross-compilation capable. preConfigure = '' - export ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"} + export ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)} export shadow_cv_logdir=/var/log ''; diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix index 233f578d6596..aa5c17d283aa 100644 --- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix +++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix @@ -87,7 +87,7 @@ chosenStdenv.mkDerivation (finalAttrs: { (lib.enableFeature finalAttrs.doCheck "integration") # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag. - "--with-fapi=${if fapiSupport then "yes" else "no"}" + "--with-fapi=${lib.boolToYesNo fapiSupport}" ] ++ lib.optionals enableFuzzing [ "--enable-fuzzing" diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index 4cb3648a56c5..c9d00588502a 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { "CFLAGS=-std=gnu17" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}" ] ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb" ++ lib.optional (graphicsSupport && !x11Support) "--without-x"; diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix index 6cd55e28c0bb..015c2e54e276 100644 --- a/pkgs/development/ada-modules/gnatcoll/core.nix +++ b/pkgs/development/ada-modules/gnatcoll/core.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { "PROCESSORS=$(NIX_BUILD_CORES)" # confusingly, for gprbuild --target is autoconf --host "TARGET=${stdenv.hostPlatform.config}" - "GNATCOLL_MINIMAL_ONLY=${if !enableGnatcollCore then "yes" else "no"}" - "GNATCOLL_PROJECTS=${if enableGnatcollProjects then "yes" else "no"}" + "GNATCOLL_MINIMAL_ONLY=${lib.boolToYesNo (!enableGnatcollCore)}" + "GNATCOLL_PROJECTS=${lib.boolToYesNo enableGnatcollProjects}" ]; passthru.tests = { diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix index 11c6006884f5..7448d251a692 100644 --- a/pkgs/development/ada-modules/gpr2/default.nix +++ b/pkgs/development/ada-modules/gpr2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "PROCESSORS=$(NIX_BUILD_CORES)" - "ENABLE_SHARED=${if enableShared then "yes" else "no"}" + "ENABLE_SHARED=${lib.boolToYesNo enableShared}" "GPR2_BUILD=release" ] ++ lib.optionals (gpr2kbdir != null) [ diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index b6f4a32fb441..c8d530466ca7 100644 --- a/pkgs/development/ada-modules/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; makeFlags = [ - "ENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "no" else "yes"}" + "ENABLE_SHARED=${lib.boolToYesNo (!stdenv.hostPlatform.isStatic)}" "PROCESSORS=$(NIX_BUILD_CORES)" # confusingly, for gprbuild --target is autoconf --host "TARGET=${stdenv.hostPlatform.config}" diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 58a2a5c4e2e6..51f9a544146c 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -516,8 +516,8 @@ stdenv.mkDerivation (finalAttrs: { "ac_cv_have_size_t_format=yes" "ac_cv_computed_gotos=yes" # Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always. - "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" - "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" + "ac_cv_file__dev_ptmx=${lib.boolToYesNo (!stdenv.hostPlatform.isWindows)}" + "ac_cv_file__dev_ptc=${lib.boolToYesNo (!stdenv.hostPlatform.isWindows)}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [ "--with-build-python=${pythonOnBuildForHostInterpreter}" diff --git a/pkgs/development/libraries/libgda/5.x.nix b/pkgs/development/libraries/libgda/5.x.nix index 0761542379d3..ff40c3ccf86e 100644 --- a/pkgs/development/libraries/libgda/5.x.nix +++ b/pkgs/development/libraries/libgda/5.x.nix @@ -78,15 +78,15 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-mysql=${if mysqlSupport then "yes" else "no"}" - "--with-postgres=${if postgresSupport then "yes" else "no"}" + "--with-mysql=${lib.boolToYesNo mysqlSupport}" + "--with-postgres=${lib.boolToYesNo postgresSupport}" # macOS builds use the sqlite source code that comes with libgda, # as opposed to using the system or brewed sqlite3, which is not supported on macOS, # as mentioned in https://github.com/GNOME/libgda/blob/95eeca4b0470f347c645a27f714c62aa6e59f820/libgda/sqlite/README#L31, # which references the paper https://web.archive.org/web/20100610151539/http://lattice.umiacs.umd.edu/files/functions_tr.pdf # See also https://github.com/Homebrew/homebrew-core/blob/104f9ecd02854a82372b64d63d41356555378a52/Formula/libgda.rb - "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" + "--enable-system-sqlite=${lib.boolToYesNo (!stdenv.hostPlatform.isDarwin)}" ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 61e9c252c12c..357d1d9a7272 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" - "STATIC=${if isStatic then "yes" else "no"}" + "STATIC=${lib.boolToYesNo isStatic}" ]; doCheck = true; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 749147859273..1646cb3163c3 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -14,8 +14,6 @@ }: let - mkFlag = b: if b then "yes" else "no"; - games = import ./games.nix { inherit stdenv lib fetchFromGitHub; }; wrapper = import ./wrapper.nix { @@ -58,7 +56,7 @@ let ++ lib.optional openalSupport openal; makeFlags = [ - "WITH_OPENAL=${mkFlag openalSupport}" + "WITH_OPENAL=${lib.boolToYesNo openalSupport}" "WITH_SYSTEMWIDE=yes" "WITH_SYSTEMDIR=$\{out}/share/games/quake2" ]; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index 9c93d416f6c0..3dbfe3d9c284 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -70,7 +70,7 @@ let // (lib.flip lib.mapAttrs' extraFlags ( name: value: { name = "MK_${lib.toUpper name}"; - value = if value then "yes" else "no"; + value = lib.boolToYesNo value; } )); in diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 08b4e4bff2fc..0ca4ca768b5d 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -103,7 +103,7 @@ lib.warnIf (withDocs != null) # default is fine for static linking on Linux (weak symbols?) but # not with BSDs, when it does clash with the regular `getenv`. "bash_cv_getenv_redef=${ - if !(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD)) then "yes" else "no" + lib.boolToYesNo (!(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD))) }" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index be5b75282101..00e6821ce7bd 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]) ); - is_darwin = if stdenv.hostPlatform.isDarwin then "yes" else "no"; + is_darwin = lib.boolToYesNo stdenv.hostPlatform.isDarwin; sandboxtest = ./sandbox.nix; relaxedsandboxtest = ./relaxedsandbox.nix; From 524585d1b0fc6634ad5a5df9367f2243b3a3c87e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 22 Oct 2025 17:52:51 -0400 Subject: [PATCH 10/91] buildMavenPackage: fix keytool path on darwin zulu jdk build for darwin has different lib/ structure. We should be able to just call /bin/keytool since it's symlinked in both derivations. I think this is a regression since: https://github.com/NixOS/nixpkgs/pull/437528 --- pkgs/by-name/ma/maven/build-maven-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index 2e167b02a9df..b829cb71199b 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -63,7 +63,7 @@ let # handle cacert by populating a trust store on the fly if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then echo "using ''${NIX_SSL_CERT_FILE-} as trust store" - ${jre-generate-cacerts} ${jdk}/lib/openjdk/bin/keytool $NIX_SSL_CERT_FILE + ${jre-generate-cacerts} ${lib.getBin jdk}/bin/keytool $NIX_SSL_CERT_FILE MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit" fi From 0267f98888a66cac451cbaebd20c09fc3aeacb9e Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 19:26:51 -0300 Subject: [PATCH 11/91] msgpuck: fix build with cmake4 --- pkgs/by-name/ms/msgpuck/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ms/msgpuck/package.nix b/pkgs/by-name/ms/msgpuck/package.nix index 41fdca7052de..85cdb0859429 100644 --- a/pkgs/by-name/ms/msgpuck/package.nix +++ b/pkgs/by-name/ms/msgpuck/package.nix @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { pkg-config ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace test/CMakeLists.txt \ + --replace-fail "cmake_policy(SET CMP0037 OLD)" "cmake_policy(SET CMP0037 NEW)" + ''; + meta = with lib; { description = "Simple and efficient MsgPack binary serialization library in a self-contained header file"; homepage = "https://github.com/rtsisyk/msgpuck"; From 8a93389fa7a226659f3673c4008f04002cf75430 Mon Sep 17 00:00:00 2001 From: utopiatopia <98685984+utopiatopia@users.noreply.github.com> Date: Wed, 22 Oct 2025 13:07:21 -0700 Subject: [PATCH 12/91] maintainers: add utopiatopia --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0948524fc6a4..714a865f8b09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27023,6 +27023,11 @@ githubId = 5155100; name = "Utkarsh Gupta"; }; + utopiatopia = { + github = "utopiatopia"; + githubId = 98685984; + name = "utopiatopia"; + }; uvnikita = { email = "uv.nikita@gmail.com"; github = "uvNikita"; From cd4081b41564fcda66779c80af9ab867c42f1454 Mon Sep 17 00:00:00 2001 From: utopiatopia <98685984+utopiatopia@users.noreply.github.com> Date: Wed, 22 Oct 2025 13:48:34 -0700 Subject: [PATCH 13/91] auto-editor: 28.0.2 -> 29.2.0 --- pkgs/by-name/au/auto-editor/lock.json | 28 +++++++ pkgs/by-name/au/auto-editor/package.nix | 101 +++++++++++++++++++----- 2 files changed, 109 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/au/auto-editor/lock.json diff --git a/pkgs/by-name/au/auto-editor/lock.json b/pkgs/by-name/au/auto-editor/lock.json new file mode 100644 index 000000000000..e772f3c9743b --- /dev/null +++ b/pkgs/by-name/au/auto-editor/lock.json @@ -0,0 +1,28 @@ +{ + "depends": [ + { + "method": "fetchzip", + "path": "/nix/store/w556rbsnv2fxb229av2iq180ri9x0d9j-source", + "rev": "77469f58916369bc3863194cabb05238577fb257", + "sha256": "18wjz5yqzr1dz6286p2w02fk2xjr54l477g90bz4pskjcqrqnjbv", + "url": "https://github.com/khchen/tinyre/archive/77469f58916369bc3863194cabb05238577fb257.tar.gz", + "ref": "1.6.0", + "packages": [ + "tinyre" + ], + "srcDir": "" + }, + { + "method": "fetchzip", + "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source", + "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0", + "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615", + "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz", + "ref": "v0.2.1", + "packages": [ + "checksums" + ], + "srcDir": "src" + } + ] +} diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index a1fe3fa99ecb..546eb42a631d 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -1,43 +1,100 @@ { lib, - python3Packages, + buildNimPackage, fetchFromGitHub, + + withHEVC ? true, + withWhisper ? false, + + ffmpeg, yt-dlp, + lame, + libopus, + libvpx, + x264, + x265, + dav1d, + svt-av1, + whisper-cpp, + + python3, + python3Packages, + nimble, + nim, }: -python3Packages.buildPythonApplication rec { +buildNimPackage rec { pname = "auto-editor"; - version = "28.0.2"; - pyproject = true; + version = "29.2.0"; src = fetchFromGitHub { owner = "WyattBlue"; repo = "auto-editor"; tag = version; - hash = "sha256-ozw5ZPvKP7aTBBItQKNx85hZ1T4IxX9NYCcNHC5UuuM="; + hash = "sha256-2EpdrFGkeISiCnwtBMFikfWOzEdHO/ut2NbVbIAutdk="; }; - postPatch = '' - substituteInPlace auto_editor/__main__.py \ - --replace-fail '"yt-dlp"' '"${lib.getExe yt-dlp}"' - ''; + lockFile = ./lock.json; - build-system = with python3Packages; [ setuptools ]; - - dependencies = with python3Packages; [ - basswood-av - numpy + buildInputs = [ + ffmpeg + lame + libopus + libvpx + x264 + dav1d + svt-av1 + ] + ++ lib.optionals withHEVC [ + x265 + ] + ++ lib.optionals withWhisper [ + whisper-cpp ]; - checkPhase = '' - runHook preCheck + nimFlags = [ + "--passc:-Wno-incompatible-pointer-types" + ] + ++ lib.optionals withHEVC [ + "-d:enable_hevc" + ] + ++ lib.optionals withWhisper [ + "-d:enable_whisper" + ]; - $out/bin/auto-editor test all + postPatch = '' + substituteInPlace src/log.nim \ + --replace-fail '"yt-dlp"' '"${lib.getExe yt-dlp}"' - runHook postCheck + # buildNimPackage hack + substituteInPlace ae.nimble \ + --replace-fail '"main=auto-editor"' '"main"' ''; - pythonImportsCheck = [ "auto_editor" ]; + # TODO: Fix checks + /* + nativeCheckInputs = [ + python3Packages.av + python3 + ]; + + checkPhase = '' + runHook preCheck + + nim c \ + ${if withHEVC then "-d:enable_hevc" else ""} \ + ${if withWhisper then "-d:enable_whisper" else ""} \ + -r $src/src/rationals + + python3 $src/tests/test.py + + runHook postCheck + ''; + */ + + postInstall = '' + mv $out/bin/main $out/bin/auto-editor + ''; meta = { changelog = "https://github.com/WyattBlue/auto-editor/releases/tag/${src.tag}"; @@ -45,6 +102,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://auto-editor.com/"; license = lib.licenses.unlicense; mainProgram = "auto-editor"; - maintainers = with lib.maintainers; [ tomasajt ]; + maintainers = with lib.maintainers; [ + tomasajt + utopiatopia + ]; + platforms = lib.platforms.unix; }; } From d894ce6bbd7e26460084b31c204e513d250dc5ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 00:31:30 +0000 Subject: [PATCH 14/91] activemq: 6.1.7 -> 6.1.8 --- pkgs/by-name/ac/activemq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index 56ba6f4e4915..66d78633c3ed 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -5,7 +5,7 @@ }: let - version = "6.1.7"; + version = "6.1.8"; in stdenvNoCC.mkDerivation { pname = "activemq"; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; - hash = "sha256-dcxBEJqJd0XUSsonNYVo88vgzVj8a7/wNag8Td9I0xY="; + hash = "sha256-BCrdMR698xAsl+8nY8DpwdZZH6LH2C5FBNZ2sRUmtBk="; }; installPhase = '' From 84faa36c5030923311b1ecc98cabd850a8f83d76 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Thu, 23 Oct 2025 13:36:01 +0700 Subject: [PATCH 15/91] ufetch: add nix-update-script --- pkgs/by-name/uf/ufetch/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/uf/ufetch/package.nix b/pkgs/by-name/uf/ufetch/package.nix index 3f2543d53263..00f6fca8e348 100644 --- a/pkgs/by-name/uf/ufetch/package.nix +++ b/pkgs/by-name/uf/ufetch/package.nix @@ -1,6 +1,7 @@ { stdenvNoCC, fetchFromGitLab, + nix-update-script, lib, full ? true, # see https://gitlab.com/jschx/ufetch for a list @@ -34,6 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Tiny system info for Unix-like operating systems"; homepage = "https://gitlab.com/jschx/ufetch"; From c65ffed08036e076404b5e7680f7197291677b0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 06:47:11 +0000 Subject: [PATCH 16/91] async-profiler: 4.1 -> 4.2 --- pkgs/by-name/as/async-profiler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix index ce1ac1d6e498..0240dba85cc9 100644 --- a/pkgs/by-name/as/async-profiler/package.nix +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "async-profiler"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - hash = "sha256-82aZK9y1Y5PaYtIG7FqnrbYU+bQ3nNzOCn+3lFzyeCA="; + hash = "sha256-y/MQgXoaJSwc6QjTPGQRFNyVoR1ENQ7rDmtCwR5F/oM="; }; nativeBuildInputs = [ makeWrapper ]; From 7f1ae93e959616517de7aca3429375608c143566 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Thu, 23 Oct 2025 05:29:34 -0300 Subject: [PATCH 17/91] cosmic-ext-applet-caffeine: update license to GPL-2.0-only --- pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix index c5901df0f842..f9f5f1eb28fa 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { meta = { description = "Caffeine Applet for the COSMIC desktop"; homepage = "https://github.com/tropicbliss/cosmic-ext-applet-caffeine"; - license = lib.licenses.mit; + license = lib.licenses.gpl2Only; mainProgram = "cosmic-ext-applet-caffeine"; maintainers = [ lib.maintainers.HeitorAugustoLN ]; platforms = lib.platforms.linux; From adb904feaad57481bb7feecc11d77d3f0dea4df5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 11:34:36 +0000 Subject: [PATCH 18/91] python3Packages.pbxproj: 4.3.0 -> 4.3.2 --- pkgs/development/python-modules/pbxproj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbxproj/default.nix b/pkgs/development/python-modules/pbxproj/default.nix index 74906b1414c7..38e8011b3690 100644 --- a/pkgs/development/python-modules/pbxproj/default.nix +++ b/pkgs/development/python-modules/pbxproj/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pbxproj"; - version = "4.3.0"; + version = "4.3.2"; pyproject = true; src = fetchFromGitHub { owner = "kronenthaler"; repo = "mod-pbxproj"; tag = version; - hash = "sha256-A7kYjlMr0PDZHdZLhs7Mn2Ihx0XKQUbVaRgWcMoWM7E="; + hash = "sha256-Kwt/ellGOZBenYBCCW13pSMsPVdJyiEklIPMtw/UDvI="; }; build-system = [ setuptools ]; From 1c1747cd179721740b171ab66be87af20a3431ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 13:35:44 +0000 Subject: [PATCH 19/91] lynis: 3.1.5 -> 3.1.6 --- pkgs/by-name/ly/lynis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ly/lynis/package.nix b/pkgs/by-name/ly/lynis/package.nix index 47eefd68371e..f19d7cdde6ab 100644 --- a/pkgs/by-name/ly/lynis/package.nix +++ b/pkgs/by-name/ly/lynis/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "CISOfy"; repo = "lynis"; rev = version; - sha256 = "sha256-XMgC6KjkLgjSOBHBx7WM7C2Vm3Z/lto7CFs10kIxwZc="; + sha256 = "sha256-f1iV9OBkycrwP3ydjaGMX45JIBtzZKHEJqnEoVuZPu4="; }; nativeBuildInputs = [ From 668eaba9927a26ccb21eaa547f417da9881418ab Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 23 Oct 2025 15:41:12 +0200 Subject: [PATCH 20/91] integrity-scrub: 0.6.5 -> 0.6.6 --- pkgs/by-name/in/integrity-scrub/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix index 83257185c2ed..51ebd8da0602 100644 --- a/pkgs/by-name/in/integrity-scrub/package.nix +++ b/pkgs/by-name/in/integrity-scrub/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "integrity-scrub"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "illdefined"; repo = "integrity-scrub"; tag = version; - hash = "sha256-oWS6HxdZ8tGeIRGpfHHkNhNdepBjhhdgTjKmxElNPbk="; + hash = "sha256-OLO64R9AYpHSkIwk2arka5EEzCWusZPWsBhy5HEDIQI="; }; - cargoHash = "sha256-3LC3eZNmHG6OFIvQzmvs4BCSX0CVpwaYhZM2H2YoY4M="; + cargoHash = "sha256-sS4z5NImUdk0EnQ+BGPofFZtXZsomfUXXbHNDmVqAos="; nativeInstallCheckInputs = [ versionCheckHook ]; From 337378e8fc5f69e439fc353460ae4ece07978387 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 23 Oct 2025 15:41:42 +0200 Subject: [PATCH 21/91] integrity-scrub: provide meta.mainProgram --- pkgs/by-name/in/integrity-scrub/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix index 51ebd8da0602..b0c3d68fe774 100644 --- a/pkgs/by-name/in/integrity-scrub/package.nix +++ b/pkgs/by-name/in/integrity-scrub/package.nix @@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.cc0; maintainers = with lib.maintainers; [ mvs ]; platforms = lib.platforms.linux; + mainProgram = "integrity-scrub"; }; } From 65a28e21cdb58eedb5e16a94219e29b3eb46f21c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 13:49:02 +0000 Subject: [PATCH 22/91] kotlin-native: 2.2.20 -> 2.2.21 --- pkgs/development/compilers/kotlin/native.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 1c3334a6d392..aeb98f646f58 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "2.2.20"; + version = "2.2.21"; src = let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { { "macos-aarch64" = "sha256-UnDl9wj/7RXrEaApuAaLczIfz0lscQPf+pCeSdJxJeY="; "macos-x86_64" = "sha256-mmsBQrx0yKqvvhnD8CU+oxqhWsOT1RzvzSniN3CeG7g="; - "linux-x86_64" = "sha256-2Ff+4rTj/W0tQBo6lADcQMIN4dAj32UnIXF9PRme0Nw="; + "linux-x86_64" = "sha256-oTW6qe+SklxcKu8gwc8DZzTKj+L65duYYXO+uWp6gfg="; } .${arch}; in From cdfabd6440d380c75b8501d38be357475db4b87d Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 13:37:12 +0200 Subject: [PATCH 23/91] tome4: remove references to pname --- pkgs/by-name/to/tome4/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index c9c23e185156..2cad28ec24a9 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation rec { }; desktop = makeDesktopItem { - desktopName = pname; - name = pname; - exec = "@out@/bin/${pname}"; - icon = pname; + desktopName = "tome4"; + name = "Tales of Maj'Eyal"; + exec = "@out@/bin/tome4"; + icon = "tome4"; comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; type = "Application"; categories = [ "Game" "RolePlaying" ]; - genericName = pname; + genericName = "2D roguelike RPG"; }; prePatch = '' @@ -74,21 +74,21 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - dir=$out/share/${pname} + dir=$out/share/tome4 install -Dm755 t-engine $dir/t-engine cp -r bootstrap game $dir - makeWrapper $dir/t-engine $out/bin/${pname} \ + makeWrapper $dir/t-engine $out/bin/tome4 \ --chdir "$dir" - install -Dm755 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ + install -Dm755 ${desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop + substituteInPlace $out/share/applications/tome4.desktop \ --subst-var out unzip -oj -qq game/engines/te4-${version}.teae data/gfx/te4-icon.png - install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/${pname}.png + install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/tome4.png - install -Dm644 -t $out/share/doc/${pname} CONTRIBUTING COPYING COPYING-MEDIA CREDITS + install -Dm644 -t $out/share/doc/tome4 CONTRIBUTING COPYING COPYING-MEDIA CREDITS runHook postInstall ''; From 1d41c1d76c40bf0549a7ece53dd81e9fce227af6 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 13:37:52 +0200 Subject: [PATCH 24/91] tome4: rec -> finalAttrs --- pkgs/by-name/to/tome4/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 2cad28ec24a9..a9693533dac6 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -15,12 +15,12 @@ SDL2_ttf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tome4"; version = "1.7.6"; src = fetchurl { - url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; + url = "https://te4.org/dl/t-engine/t-engine4-src-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw="; }; @@ -81,11 +81,11 @@ stdenv.mkDerivation rec { makeWrapper $dir/t-engine $out/bin/tome4 \ --chdir "$dir" - install -Dm755 ${desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop + install -Dm755 ${finalAttrs.desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop substituteInPlace $out/share/applications/tome4.desktop \ --subst-var out - unzip -oj -qq game/engines/te4-${version}.teae data/gfx/te4-icon.png + unzip -oj -qq game/engines/te4-${finalAttrs.version}.teae data/gfx/te4-icon.png install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/tome4.png install -Dm644 -t $out/share/doc/tome4 CONTRIBUTING COPYING COPYING-MEDIA CREDITS @@ -104,4 +104,4 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; }; -} +}) From e1d465f7d52140de1ad1228cfce374b3d5a0a679 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 13:38:29 +0200 Subject: [PATCH 25/91] tome4: remove `with lib;` --- pkgs/by-name/to/tome4/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index a9693533dac6..956949657f01 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -93,12 +93,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Tales of Maj'eyal (rogue-like game)"; mainProgram = "tome4"; homepage = "https://te4.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peterhoeg ]; platforms = [ "i686-linux" "x86_64-linux" From 95cd63bebc6566b031813bcf4518a588948b5c02 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 13:39:09 +0200 Subject: [PATCH 26/91] tome4: use copyDesktopItems --- pkgs/by-name/to/tome4/package.nix | 41 ++++++++++++++----------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 956949657f01..770e5974768b 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -2,10 +2,10 @@ lib, stdenv, fetchurl, + copyDesktopItems, makeDesktopItem, makeWrapper, premake4, - unzip, openal, libpng, libvorbis, @@ -24,28 +24,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw="; }; - desktop = makeDesktopItem { - desktopName = "tome4"; - name = "Tales of Maj'Eyal"; - exec = "@out@/bin/tome4"; - icon = "tome4"; - comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; - type = "Application"; - categories = [ - "Game" - "RolePlaying" - ]; - genericName = "2D roguelike RPG"; - }; - prePatch = '' # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354 sed -i 's|#include ||' src/tgl.h ''; nativeBuildInputs = [ + copyDesktopItems makeWrapper - unzip premake4 ]; @@ -68,6 +54,22 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "config=release" ]; + desktopItems = [ + (makeDesktopItem { + desktopName = "Tales of Maj'Eyal"; + name = "tome4"; + exec = "tome4"; + icon = "te4-icon"; + comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; + type = "Application"; + categories = [ + "Game" + "RolePlaying" + ]; + genericName = "2D roguelike RPG"; + }) + ]; + # The wrapper needs to cd into the correct directory as tome4's detection of # the game asset root directory is faulty. @@ -81,12 +83,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $dir/t-engine $out/bin/tome4 \ --chdir "$dir" - install -Dm755 ${finalAttrs.desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop - substituteInPlace $out/share/applications/tome4.desktop \ - --subst-var out - - unzip -oj -qq game/engines/te4-${finalAttrs.version}.teae data/gfx/te4-icon.png - install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/tome4.png + install -Dm644 game/engines/default/data/gfx/te4-icon.png -t $out/share/icons/hicolor/64x64 install -Dm644 -t $out/share/doc/tome4 CONTRIBUTING COPYING COPYING-MEDIA CREDITS From 25454ff52fa4c9984e3b69dbdaca8b17cd7760da Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 13:41:55 +0200 Subject: [PATCH 27/91] tome4: use substituteInPlace instead of sed --- pkgs/by-name/to/tome4/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 770e5974768b..777ee07186e4 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation (finalAttrs: { prePatch = '' # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354 - sed -i 's|#include ||' src/tgl.h + substituteInPlace src/tgl.h \ + --replace-fail "#include " "" ''; nativeBuildInputs = [ From 6ef6514633857d4195db067d9da29fbc4ff7f7f9 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 13:50:28 +0200 Subject: [PATCH 28/91] tome4: sha256 -> hash --- pkgs/by-name/to/tome4/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 777ee07186e4..82691a86a2ad 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw="; + hash = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw="; }; prePatch = '' From 7389da9a751bb6794b3ef1a46298b75e9bc07a95 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 14:13:15 +0200 Subject: [PATCH 29/91] tome4: build from official sources --- pkgs/by-name/to/tome4/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 82691a86a2ad..54111b960562 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, copyDesktopItems, makeDesktopItem, makeWrapper, @@ -19,9 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tome4"; version = "1.7.6"; - src = fetchurl { - url = "https://te4.org/dl/t-engine/t-engine4-src-${finalAttrs.version}.tar.bz2"; - hash = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw="; + # Official source according to https://te4.org/wiki/How_to_compile + src = fetchFromGitLab { + domain = "git.net-core.org"; + owner = "tome"; + repo = "t-engine4"; + tag = "tome-${finalAttrs.version}"; + hash = "sha256-v0YPbmaOqKYgFkOe/X0FCirucrMo2UGAyhZ7MFj+nsU="; }; prePatch = '' From 38f2134339e766a2411a79c05153ea089240c46e Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 14:45:36 +0200 Subject: [PATCH 30/91] tome4: fix build --- .../to/tome4/0001-web-missing-include.patch | 24 +++++++ .../to/tome4/0002-zlib-missing-include.patch | 24 +++++++ .../0003-incompatible-pointer-types.patch | 71 +++++++++++++++++++ pkgs/by-name/to/tome4/package.nix | 40 +++++++++-- 4 files changed, 154 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/to/tome4/0001-web-missing-include.patch create mode 100644 pkgs/by-name/to/tome4/0002-zlib-missing-include.patch create mode 100644 pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch diff --git a/pkgs/by-name/to/tome4/0001-web-missing-include.patch b/pkgs/by-name/to/tome4/0001-web-missing-include.patch new file mode 100644 index 000000000000..e23aa77c1ca2 --- /dev/null +++ b/pkgs/by-name/to/tome4/0001-web-missing-include.patch @@ -0,0 +1,24 @@ +From e0c17a8665250b3e3e7f4938f7b256ff50b78fc8 Mon Sep 17 00:00:00 2001 +From: Tom van Dijk <18gatenmaker6@gmail.com> +Date: Thu, 23 Oct 2025 15:01:01 +0200 +Subject: [PATCH 1/3] web missing include + +--- + src/web.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/web.c b/src/web.c +index f12eebb..940aaf9 100644 +--- a/src/web.c ++++ b/src/web.c +@@ -32,6 +32,7 @@ + #include "te4web.h" + #include "web-external.h" + #include "lua_externs.h" ++#include + + /* + * Grab web browser methods -- availabe only here +-- +2.51.0 + diff --git a/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch b/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch new file mode 100644 index 000000000000..d6fb92441f2b --- /dev/null +++ b/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch @@ -0,0 +1,24 @@ +From a14890a8a7080c73cac10ff31365833b179c0464 Mon Sep 17 00:00:00 2001 +From: Tom van Dijk <18gatenmaker6@gmail.com> +Date: Thu, 23 Oct 2025 15:45:03 +0200 +Subject: [PATCH 2/3] zlib missing include + +--- + src/zlib/gzguts.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/zlib/gzguts.h b/src/zlib/gzguts.h +index 990a4d2..7c89751 100644 +--- a/src/zlib/gzguts.h ++++ b/src/zlib/gzguts.h +@@ -21,6 +21,7 @@ + #include + #include "zlib.h" + #ifdef STDC ++# include + # include + # include + # include +-- +2.51.0 + diff --git a/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch b/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch new file mode 100644 index 000000000000..f2e1b36b34de --- /dev/null +++ b/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch @@ -0,0 +1,71 @@ +From ed9f9819c3a0d6b8e92f66aafa6324eb4b310282 Mon Sep 17 00:00:00 2001 +From: Tom van Dijk <18gatenmaker6@gmail.com> +Date: Thu, 23 Oct 2025 15:53:06 +0200 +Subject: [PATCH 3/3] incompatible pointer types + +--- + src/display_sdl.c | 2 +- + src/physfs/archivers/bind_physfs.c | 2 +- + src/physfs/physfs.c | 3 ++- + src/tgl.h | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/display_sdl.c b/src/display_sdl.c +index 61b2f0e..c533c8b 100644 +--- a/src/display_sdl.c ++++ b/src/display_sdl.c +@@ -78,5 +78,5 @@ GLuint gl_c_shader = 0; + int nb_draws = 0; + int gl_c_vertices_nb = 0, gl_c_texcoords_nb = 0, gl_c_colors_nb = 0; + GLfloat *gl_c_vertices_ptr = NULL; +-GLfloat *gl_c_texcoords_ptr = NULL; ++void *gl_c_texcoords_ptr = NULL; + GLfloat *gl_c_colors_ptr = NULL; +diff --git a/src/physfs/archivers/bind_physfs.c b/src/physfs/archivers/bind_physfs.c +index d02d323..c0d77c1 100644 +--- a/src/physfs/archivers/bind_physfs.c ++++ b/src/physfs/archivers/bind_physfs.c +@@ -222,7 +222,7 @@ static fvoid *doOpen(dvoid *opaque, const char *name, + + static fvoid *BIND_PHYSFS_openRead(dvoid *opaque, const char *fnm, int *exist) + { +- return(doOpen(opaque, fnm, PHYSFS_openRead, exist)); ++ return(doOpen(opaque, fnm, (void * (*)(const char *)) PHYSFS_openRead, exist)); + } /* BIND_PHYSFS_openRead */ + + +diff --git a/src/physfs/physfs.c b/src/physfs/physfs.c +index 03eb86d..32e2c91 100644 +--- a/src/physfs/physfs.c ++++ b/src/physfs/physfs.c +@@ -68,12 +68,13 @@ extern const PHYSFS_Archiver __PHYSFS_Archiver_MVL; + extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_WAD; + extern const PHYSFS_Archiver __PHYSFS_Archiver_WAD; + extern const PHYSFS_Archiver __PHYSFS_Archiver_DIR; ++extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_BIND_PHYSFS; + extern const PHYSFS_Archiver __PHYSFS_Archiver_BIND_PHYSFS; + + + static const PHYSFS_ArchiveInfo *supported_types[] = + { +- &__PHYSFS_Archiver_BIND_PHYSFS, ++ &__PHYSFS_ArchiveInfo_BIND_PHYSFS, + #if (defined PHYSFS_SUPPORTS_ZIP) + &__PHYSFS_ArchiveInfo_SUBZIP, + &__PHYSFS_ArchiveInfo_ZIP, +diff --git a/src/tgl.h b/src/tgl.h +index e2ec026..f905033 100644 +--- a/src/tgl.h ++++ b/src/tgl.h +@@ -71,7 +71,7 @@ extern int nb_draws; + + extern int gl_c_vertices_nb, gl_c_texcoords_nb, gl_c_colors_nb; + extern GLfloat *gl_c_vertices_ptr; +-extern GLfloat *gl_c_texcoords_ptr; ++extern void *gl_c_texcoords_ptr; + extern GLfloat *gl_c_colors_ptr; + #define glVertexPointer(nb, t, v, p) \ + { \ +-- +2.51.0 + diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 54111b960562..0d7b218b44ce 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch2, copyDesktopItems, makeDesktopItem, makeWrapper, @@ -13,8 +14,17 @@ SDL2, SDL2_image, SDL2_ttf, + xorg, }: +let + sdlInputs = [ + SDL2 + SDL2_ttf + SDL2_image + ]; +in + stdenv.mkDerivation (finalAttrs: { pname = "tome4"; version = "1.7.6"; @@ -34,6 +44,19 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "#include " "" ''; + patches = [ + # https://forums.te4.org/viewtopic.php?f=69&t=39859&p=168681&hilit=luaopen_shaders#p168681 + (fetchpatch2 { + url = "https://gist.githubusercontent.com/hasufell/cb3b10f834e891d90f83/raw/cb4adda13868f6b94585575db4f8df70877ae45a/tome4-1.1.3-fix-implicit-declaration.patch"; + hash = "sha256-g47N/bi2/DDKqaEkfTaGp9ItS57QVnObzMDWXqrCjWE="; + }) + # unistd required for execv + ./0001-web-missing-include.patch + # unistd required for read and close + ./0002-zlib-missing-include.patch + ./0003-incompatible-pointer-types.patch + ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper @@ -47,15 +70,22 @@ stdenv.mkDerivation (finalAttrs: { openal libpng libvorbis - SDL2 - SDL2_ttf - SDL2_image - ]; + xorg.libX11 + xorg.xorgproto + ] + ++ sdlInputs; # disable parallel building as it caused sporadic build failures enableParallelBuilding = false; - env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; + env = { + NIX_CFLAGS_COMPILE = + lib.concatMapStringsSep " " (i: "-I${lib.getInclude i}/include/SDL2") sdlInputs + + " " + + lib.concatMapStringsSep " " (i: "-I${lib.getInclude i}") finalAttrs.buildInputs; + + NIX_CFLAGS_LINK = lib.concatMapStringsSep " " (i: "-L${lib.getLib i}/lib") finalAttrs.buildInputs; + }; makeFlags = [ "config=release" ]; From 0ba4d0e96e2358ea1db4737ff8591cba314a574e Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 23 Oct 2025 16:35:15 +0200 Subject: [PATCH 31/91] tome4: add update script --- pkgs/by-name/to/tome4/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 0d7b218b44ce..d74852014c8e 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -15,6 +15,7 @@ SDL2_image, SDL2_ttf, xorg, + nix-update-script, }: let @@ -125,6 +126,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "tome-(.*)" + ]; + }; + meta = { description = "Tales of Maj'eyal (rogue-like game)"; mainProgram = "tome4"; From 706c7e840c3db457b652bd238f7cb6ed1c5a151f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 14:52:57 +0000 Subject: [PATCH 32/91] webex: 45.6.2.32823 -> 45.10.0.33234 --- pkgs/by-name/we/webex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index 1633cb8018d3..6b84aa55a8ad 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "45.6.2.32823"; + version = "45.10.0.33234"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20250725151734/Webex_ubuntu.7z"; - sha256 = "72e9693d7c1c09ebf2c93c5e29e2b52a012eaf3ac108d7759d66be500c528b3b"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20251014140645/Webex_ubuntu.7z"; + sha256 = "126ac38dbf659d26c213a9ccd5930f6a88d1aa90fd9de90cba74b2f2bfbe7793"; }; nativeBuildInputs = [ From fc049b4e2d859aa2d97bb935d346162b66d80977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 15:20:29 +0000 Subject: [PATCH 33/91] converseen: 0.15.0.3 -> 0.15.1.0 --- pkgs/by-name/co/converseen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix index 0f7e90a87f78..036047bc1e61 100644 --- a/pkgs/by-name/co/converseen/package.nix +++ b/pkgs/by-name/co/converseen/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "converseen"; - version = "0.15.0.3"; + version = "0.15.1.0"; src = fetchFromGitHub { owner = "Faster3ck"; repo = "Converseen"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZC7D+0tonAIkbDaoqw+RarIVuNcDQe410JrfC2kG+B8="; + hash = "sha256-loWwwleiBgwV/6t33HgIqEHU9y/pqyocmwBn0Qg01RY="; }; strictDeps = true; From cc176831b79b389dfc8980d2de8e7a601317174c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 15:30:12 +0000 Subject: [PATCH 34/91] papilo: 2.4.3 -> 2.4.4 --- pkgs/by-name/pa/papilo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix index 0aac8f0dade3..b1792c608182 100644 --- a/pkgs/by-name/pa/papilo/package.nix +++ b/pkgs/by-name/pa/papilo/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "papilo"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; tag = "v${finalAttrs.version}"; - hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8="; + hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A="; }; # skip SEGFAULT tests From 3b9257dd0f9b43b0a7a31eb760f9403a97ec8805 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 23 Oct 2025 16:46:01 +0200 Subject: [PATCH 35/91] tart: 2.28.6 -> 2.30.0 --- pkgs/by-name/ta/tart/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix index 357a77a53d82..a207bf40819a 100644 --- a/pkgs/by-name/ta/tart/package.nix +++ b/pkgs/by-name/ta/tart/package.nix @@ -14,11 +14,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.28.6"; + version = "2.30.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - hash = "sha256-F6bYWVHtzXo6TH4CAvdF6qx7OCVvKACsh2KdRYFsxOw="; + hash = "sha256-NUjF5hX+M12WcT+T/QXqHBFz2UOVm0NFtYzKGQmS6kg="; }; sourceRoot = "."; From 75c9e6694415682eea0f73a87a269502bc7a7048 Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Thu, 23 Oct 2025 11:23:15 -0500 Subject: [PATCH 36/91] rpcs3: Add upstream patch for Qt 6.10+ --- pkgs/by-name/rp/rpcs3/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index ed68bcb2ec19..109f71454fe2 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, nix-update-script, cmake, @@ -148,6 +149,14 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ]; + patches = [ + (fetchpatch { + name = "fix-build-qt-6.10.patch"; + url = "https://github.com/RPCS3/rpcs3/commit/038ee090b731bf63917371a3586c2f7d7cf4e585.patch"; + hash = "sha256-jTIxsheG9b9zp0JEeWQ73BunAXmEIg5tj4SrWBfdHy8="; + }) + ]; + doInstallCheck = true; preFixup = '' From 93ea59f66d5e33c0734f2c8f27d7b3c0b4207ab3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 23 Oct 2025 18:31:35 +0200 Subject: [PATCH 37/91] lib/modules: Report error for unsupported // { check } `check` can have a new place since the introduction of merge.v2. This makes the // { check = ... } idiom unreliable. In this PR we add checks to detect and report this. merge.v2 introduced in: https://github.com/NixOS/nixpkgs/pull/391544 Real world case: https://hercules-ci.com/github/hercules-ci/hercules-ci-effects/jobs/875 --- lib/modules.nix | 34 ++++++- lib/tests/modules.sh | 19 ++++ lib/tests/modules/v2-check-coherence.nix | 117 +++++++++++++++++++++++ lib/types.nix | 83 ++++++++++++---- 4 files changed, 232 insertions(+), 21 deletions(-) create mode 100644 lib/tests/modules/v2-check-coherence.nix diff --git a/lib/modules.nix b/lib/modules.nix index 42e88dbbf625..09f0908a69da 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1126,6 +1126,29 @@ let __toString = _: showOption loc; }; + # Check that a type with v2 merge has a coherent check attribute. + # Throws an error if the type uses an ad-hoc `type // { check }` override. + # Returns the last argument like `seq`, allowing usage: checkV2MergeCoherence loc type expr + checkV2MergeCoherence = + loc: type: result: + if type.check.isV2MergeCoherent or false then + result + else + throw '' + The option `${showOption loc}' has a type `${type.description}' that uses + an ad-hoc `type // { check = ...; }' override, which is incompatible with + the v2 merge mechanism. + + Please use `lib.types.addCheck` instead of `type // { check }' to add + custom validation. For example: + + lib.types.addCheck baseType (value: /* your check */) + + instead of: + + baseType // { check = value: /* your check */; } + ''; + # Merge definitions of a value of a given type. mergeDefinitions = loc: type: defs: rec { defsFinal' = @@ -1201,10 +1224,13 @@ let ( if type.merge ? v2 then let - r = type.merge.v2 { - inherit loc; - defs = defsFinal; - }; + # Check for v2 merge coherence + r = checkV2MergeCoherence loc type ( + type.merge.v2 { + inherit loc; + defs = defsFinal; + } + ); in r // { diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 5cd781752317..02f73310dd9b 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -806,6 +806,25 @@ checkConfigError 'A definition for option .* is not of type .signed integer.*' c checkConfigOutput '^true$' config.v2checkedPass ./add-check.nix checkConfigError 'A definition for option .* is not of type .attribute set of signed integer.*' config.v2checkedFail ./add-check.nix +# v2 merge check coherence +# Tests checkV2MergeCoherence call in modules.nix (mergeDefinitions for lazyAttrsOf) +checkConfigError 'ad-hoc.*override.*incompatible' config.adhocFail.foo ./v2-check-coherence.nix +# Tests checkV2MergeCoherence call in modules.nix (mergeDefinitions for lazyAttrsOf) +checkConfigError 'ad-hoc.*override.*incompatible' config.adhocOuterFail.bar ./v2-check-coherence.nix +# Tests checkV2MergeCoherence call in types.nix (either t1) +checkConfigError 'ad-hoc.*override.*incompatible' config.eitherLeftFail ./v2-check-coherence.nix +# Tests checkV2MergeCoherence call in types.nix (either t2) +checkConfigError 'ad-hoc.*override.*incompatible' config.eitherRightFail ./v2-check-coherence.nix +# Tests checkV2MergeCoherence call in types.nix (coercedTo coercedType) +checkConfigError 'ad-hoc.*override.*incompatible' config.coercedFromFail.bar ./v2-check-coherence.nix +# Tests checkV2MergeCoherence call in types.nix (coercedTo finalType) +checkConfigError 'ad-hoc.*override.*incompatible' config.coercedToFail.foo ./v2-check-coherence.nix +# Tests checkV2MergeCoherence call in types.nix (addCheck elemType) +checkConfigError 'ad-hoc.*override.*incompatible' config.addCheckNested.foo ./v2-check-coherence.nix +checkConfigError 'Please use.*lib.types.addCheck.*instead' config.adhocFail.foo ./v2-check-coherence.nix +checkConfigError 'A definition for option .* is not of type .*' config.addCheckFail.bar.baz ./v2-check-coherence.nix +checkConfigOutput '^true$' config.result ./v2-check-coherence.nix + cat < Date: Thu, 23 Oct 2025 16:14:24 +0200 Subject: [PATCH 38/91] lychee: 0.20.1 -> 0.21.0 --- pkgs/by-name/ly/lychee/package.nix | 31 +++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix index d2139a8f023c..44daa281a8ef 100644 --- a/pkgs/by-name/ly/lychee/package.nix +++ b/pkgs/by-name/ly/lychee/package.nix @@ -1,30 +1,48 @@ { callPackage, lib, - rustPlatform, + stdenv, + buildPackages, fetchFromGitHub, + rustPlatform, + installShellFiles, pkg-config, + git, openssl, testers, }: +let + canRun = stdenv.hostPlatform.emulatorAvailable buildPackages; + lychee = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/lychee${stdenv.hostPlatform.extensions.executable}"; +in rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "lycheeverse"; repo = "lychee"; rev = "lychee-v${version}"; - hash = "sha256-yHIj45RfQch4y+V4Ht7cDMcg5MECejxsbjuE345I/to="; + hash = "sha256-zV3EVFFYU9fR5gXPTyYudE8rgAW3eDjOF3sTJMuXzh4="; + leaveDotGit = true; # used by lychee to determine latest commit date at build time }; - cargoHash = "sha256-d3umjtXPBJbPRtNCuktYhJUPgKFmB8UEeewWMekDZRE="; + cargoHash = "sha256-1sqFjNil6KktpqrsXXgt3xtOz7eFQc2skkFHqmTMDg4="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + git + installShellFiles + ]; buildInputs = [ openssl ]; + postFixup = lib.optionalString canRun '' + ${lychee} --generate man > lychee.1 + installManPage lychee.1 + ''; + cargoTestFlags = [ # don't run doctests since they tend to use the network "--lib" @@ -32,6 +50,8 @@ rustPlatform.buildRustPackage rec { "--tests" ]; + checkType = "debug"; # compilation fails otherwise + checkFlags = [ # Network errors for all of these tests # "error reading DNS system conf: No such file or directory (os error 2)" } } @@ -44,6 +64,7 @@ rustPlatform.buildRustPackage rec { "--skip=cli::test_local_file" "--skip=client::tests" "--skip=collector::tests" + "--skip=commands::generate::tests::test_examples_work" "--skip=src/lib.rs" # Color error for those tests as we are not in a tty "--skip=formatters::response::color::tests::test_format_response_with_error_status" From dc12b5912482e81f19ed5854f25437cdaef20f22 Mon Sep 17 00:00:00 2001 From: XBagon Date: Thu, 23 Oct 2025 18:47:24 +0200 Subject: [PATCH 39/91] gate: 0.53.0 -> 0.57.1 Diff: https://github.com/minekube/gate/compare/v0.53.0...v0.57.1 --- pkgs/by-name/ga/gate/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 0bb69f91f75d..91fa29ed0e8c 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -6,7 +6,7 @@ let pname = "gate"; - version = "0.53.0"; + version = "0.57.1"; in buildGoModule { inherit pname version; @@ -15,16 +15,21 @@ buildGoModule { owner = "minekube"; repo = "gate"; tag = "v${version}"; - hash = "sha256-wrvq2opwT4bbplUljasWmT+JF3/lS8AyzBSfyUB3nUw="; + hash = "sha256-G4kmXGiogl/W6SYVWZyQsQE+6YO5Yggk8K4rH+t9znE="; }; - vendorHash = "sha256-0NcfuCZHR4QHbMNqc+ilPouie+9k7FqOG/JdNX8uO8c="; + vendorHash = "sha256-2ZRfvjIGUznHjn7KA20uzEpVbI7EByNUYu6xALJEUfo="; ldflags = [ "-s" "-w" ]; + # this test requires network access, therefore it should not be run + preCheck = '' + rm ./pkg/edition/bedrock/geyser/managed/download_test.go + ''; + excludedPackages = [ ".web" ]; meta = { From 366d65722acf7c1b596d5bd00e0e81a4c3f9a38d Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Thu, 23 Oct 2025 18:59:54 -0400 Subject: [PATCH 40/91] caffe: fix build with cmake 4 --- .../math/caffe/cmake-minimum-required.patch | 10 ++++++++++ pkgs/applications/science/math/caffe/default.nix | 2 ++ .../math/caffe/random-shuffle-includes.patch | 14 ++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/science/math/caffe/cmake-minimum-required.patch create mode 100644 pkgs/applications/science/math/caffe/random-shuffle-includes.patch diff --git a/pkgs/applications/science/math/caffe/cmake-minimum-required.patch b/pkgs/applications/science/math/caffe/cmake-minimum-required.patch new file mode 100644 index 000000000000..218196a65a7b --- /dev/null +++ b/pkgs/applications/science/math/caffe/cmake-minimum-required.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08f56a33..c5291fd7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.7) ++cmake_minimum_required(VERSION 3.10) + if(POLICY CMP0046) + cmake_policy(SET CMP0046 NEW) + endif() diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index a022fcd8e1dd..46f792e67ec5 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -112,9 +112,11 @@ stdenv.mkDerivation rec { propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle patches = [ + ./cmake-minimum-required.patch ./darwin.patch ./glog-cmake.patch ./random-shuffle.patch + ./random-shuffle-includes.patch (fetchpatch { name = "support-opencv4"; url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; diff --git a/pkgs/applications/science/math/caffe/random-shuffle-includes.patch b/pkgs/applications/science/math/caffe/random-shuffle-includes.patch new file mode 100644 index 000000000000..bfc1f4e459e9 --- /dev/null +++ b/pkgs/applications/science/math/caffe/random-shuffle-includes.patch @@ -0,0 +1,14 @@ +diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp +index 01213691..f42e7bea 100644 +--- a/src/caffe/layers/hdf5_data_layer.cpp ++++ b/src/caffe/layers/hdf5_data_layer.cpp +@@ -6,7 +6,9 @@ TODO: + :: don't forget to update hdf5_daa_layer.cu accordingly + - add ability to shuffle filenames if flag is set + */ ++#include + #include // NOLINT(readability/streams) ++#include + #include + #include + From 6c8c69dd58b7e77c3d61b61257bffe79087f887e Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Fri, 24 Oct 2025 01:34:50 +0800 Subject: [PATCH 41/91] gitfetch: init at 1.2.1 --- pkgs/by-name/gi/gitfetch/package.nix | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/gi/gitfetch/package.nix diff --git a/pkgs/by-name/gi/gitfetch/package.nix b/pkgs/by-name/gi/gitfetch/package.nix new file mode 100644 index 000000000000..7f0f5636a118 --- /dev/null +++ b/pkgs/by-name/gi/gitfetch/package.nix @@ -0,0 +1,46 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + gh, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "gitfetch"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Matars"; + repo = "gitfetch"; + tag = "v${version}"; + hash = "sha256-2cOfVv/snhluazyjwDuHEbbMq3cK+bsKYnnRmby0JDo="; + }; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + requests + readchar + ]; + + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath [ + gh + ] + }" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Neofetch-style CLI tool for git provider statistics"; + homepage = "https://github.com/Matars/gitfetch"; + mainProgram = "gitfetch"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ lonerOrz ]; + }; +} From 150dc7aff5852d151459cea57665be816d7570bd Mon Sep 17 00:00:00 2001 From: eyjhb Date: Thu, 23 Oct 2025 15:21:36 +0200 Subject: [PATCH 42/91] wireshark: 4.4.9 -> 4.6.0 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index a030ed2c47fe..1d74c153494f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -25,6 +25,7 @@ libpcap, libsmi, libssh, + libxml2, lua5_4, lz4, makeWrapper, @@ -56,7 +57,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.4.9"; + version = "4.6.0"; outputs = [ "out" @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-0+uPXSNabsYNGn+4753WNoUBe9lJ2EH3i3J36lqI4Ak="; + hash = "sha256-XkHcVN3xCYwnS69nJ4/AT76Iaggt1GXA6JWi+IG15IM="; }; patches = [ @@ -111,6 +112,7 @@ stdenv.mkDerivation rec { libpcap libsmi libssh + libxml2 lua5_4 lz4 minizip From 7a0d05be3efdc8e759fa2e036c598566e7b92f90 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sat, 25 Oct 2025 12:07:10 +0200 Subject: [PATCH 43/91] python3Packages.pyshark: adds fixes for wireshark 4.6.0 --- pkgs/development/python-modules/pyshark/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index 3df8c781aaa2..e2cb49c23797 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -35,6 +35,12 @@ buildPythonPackage rec { url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch"; hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g="; }) + # fixes tests that failed related to elastic-mapping + # remove fix if this is ever merged upstream + (fetchpatch { + url = "https://github.com/KimiNewt/pyshark/commit/0e1d8d0e06108f2887c3147c93049de63b475f8a.patch"; + hash = "sha256-fpgiBHcfS/TGYIB65ioZJrWUuDIrLxxXqGVJ9y18b2w="; + }) (replaceVars ./hardcode-tshark-path.patch { tshark = lib.getExe' wireshark-cli "tshark"; }) From 25b4acf2eacda5546ab89394aa8b877ac52a8538 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:39:53 +0100 Subject: [PATCH 44/91] python3Packages.affinegap: init at 1.12 --- .../python-modules/affinegap/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/affinegap/default.nix diff --git a/pkgs/development/python-modules/affinegap/default.nix b/pkgs/development/python-modules/affinegap/default.nix new file mode 100644 index 000000000000..6d315b347729 --- /dev/null +++ b/pkgs/development/python-modules/affinegap/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "affinegap"; + version = "1.12"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "affinegap"; + tag = "v${version}"; + hash = "sha256-9eX41eoME5Vdtq+c04eQbMYnViy6QKOhKkafrkeMylI="; + }; + + build-system = [ + cython + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Prevent importing from source during test collection (only $out has compiled extensions) + preCheck = '' + rm -rf affinegap + ''; + + pythonImportsCheck = [ + "affinegap" + ]; + + meta = { + description = "Cython implementation of the affine gap string distance"; + homepage = "https://github.com/dedupeio/affinegap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99a8ce5fcd78..23224850d8a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -124,6 +124,8 @@ self: super: with self; { affine-gaps = callPackage ../development/python-modules/affine-gaps { }; + affinegap = callPackage ../development/python-modules/affinegap { }; + afsapi = callPackage ../development/python-modules/afsapi { }; agate = callPackage ../development/python-modules/agate { }; From 0d1deaa35fdf15527790c1fc0b239b2c70933f34 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:40:23 +0100 Subject: [PATCH 45/91] python3Packages.categorical-distance: init at 1.9-unstable-2020-03-31 --- .../categorical-distance/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/categorical-distance/default.nix diff --git a/pkgs/development/python-modules/categorical-distance/default.nix b/pkgs/development/python-modules/categorical-distance/default.nix new file mode 100644 index 000000000000..451474d2f848 --- /dev/null +++ b/pkgs/development/python-modules/categorical-distance/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unstableGitUpdater, + + # build-system + setuptools, + + # dependencies + numpy, + + # tests + pytestCheckHook, +}: + +buildPythonPackage { + pname = "categorical-distance"; + version = "1.9-unstable-2020-03-31"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "categorical-distance"; + rev = "07d079fd412ccf06cdb200b3cd2cfa4b67f78722"; + hash = "sha256-zSjSrlFiRus/T2XZdakLQpF1u/LV0VNWwrc8lhss6kU="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "categorical" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Compare similarity of categorical variables using Jaccard index"; + homepage = "https://github.com/dedupeio/categorical-distance"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23224850d8a5..8f81677a7725 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2397,6 +2397,8 @@ self: super: with self; { }; }; + categorical-distance = callPackage ../development/python-modules/categorical-distance { }; + catkin-pkg = callPackage ../development/python-modules/catkin-pkg { }; catppuccin = callPackage ../development/python-modules/catppuccin { }; From d3edbad75fba40eb8e7dadc375ddcb8343de29c9 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:41:17 +0100 Subject: [PATCH 46/91] python3Packages.dedupe-levenshtein-search: init at 1.4.5 --- .../dedupe-levenshtein-search/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/dedupe-levenshtein-search/default.nix diff --git a/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix b/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix new file mode 100644 index 000000000000..40527a894cd4 --- /dev/null +++ b/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dedupe-levenshtein-search"; + version = "1.4.5"; + pyproject = true; + + # NOTE: This is a fork of mattandahalfew/Levenshtein_search created for MIT licensing. + # TODO: Evaluate if upstream version could be used instead. + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "Levenshtein_search"; + tag = "v${version}"; + hash = "sha256-YhsZA28H4OUkQEBtJ+9OXJld4Z/PJbOPqAQQ9qaXSjk="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "Levenshtein_search" + ]; + + meta = { + description = "Search through documents for approximately matching strings using Levenshtein distance"; + homepage = "https://github.com/dedupeio/Levenshtein_search"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f81677a7725..5c331334d060 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3536,6 +3536,8 @@ self: super: with self; { decorator = callPackage ../development/python-modules/decorator { }; + dedupe-levenshtein-search = callPackage ../development/python-modules/dedupe-levenshtein-search { }; + deebot-client = callPackage ../development/python-modules/deebot-client { }; deemix = callPackage ../development/python-modules/deemix { }; From 2ba14e65cb413e739768b17e30c8687aa39c266b Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:42:16 +0100 Subject: [PATCH 47/91] python3Packages.pyhacrf-datamade: init at 0.2.8-unstable-2025-05-16 --- .../pyhacrf-datamade/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/pyhacrf-datamade/default.nix diff --git a/pkgs/development/python-modules/pyhacrf-datamade/default.nix b/pkgs/development/python-modules/pyhacrf-datamade/default.nix new file mode 100644 index 000000000000..db850e5809ff --- /dev/null +++ b/pkgs/development/python-modules/pyhacrf-datamade/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unstableGitUpdater, + + # build-system + cython, + numpy, + setuptools, + + # dependencies + dedupe-pylbfgs, + + # tests + pytestCheckHook, +}: + +buildPythonPackage { + pname = "pyhacrf-datamade"; + # Tagged release requested upstream in https://github.com/dedupeio/pyhacrf/issues/57 + version = "0.2.8-unstable-2025-05-16"; + pyproject = true; + + # NOTE: This is a fork of dirko/pyhacrf maintained by dedupeio + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "pyhacrf"; + rev = "899aa6c2c48e5afe8fb40727ffd6070e4ba71c31"; + hash = "sha256-MVkOChDblu7A/ve51SYqO7lNoTXwh37bHjnZd+NvzK0="; + }; + + build-system = [ + cython + numpy + setuptools + ]; + + dependencies = [ + dedupe-pylbfgs + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Change to temp directory so pytest imports from installed package in $out, not source + preCheck = '' + export TEST_DIR=$(mktemp -d) + cp -r pyhacrf/tests $TEST_DIR/ + pushd $TEST_DIR + ''; + + postCheck = '' + popd + ''; + + pythonImportsCheck = [ + "pyhacrf" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Hidden alignment conditional random field for classifying string pairs"; + homepage = "https://github.com/dedupeio/pyhacrf"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c331334d060..f568dda5a799 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13187,6 +13187,8 @@ self: super: with self; { pygtrie = callPackage ../development/python-modules/pygtrie { }; + pyhacrf-datamade = callPackage ../development/python-modules/pyhacrf-datamade { }; + pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; pyhanko = callPackage ../development/python-modules/pyhanko { }; From a21f05cdb18db9b048c8bcbefb3b8f784d884c56 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:43:41 +0100 Subject: [PATCH 48/91] python3Packages.dedupe-pylbfgs: init at 0.2.0.16 --- .../python-modules/dedupe-pylbfgs/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/dedupe-pylbfgs/default.nix diff --git a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix new file mode 100644 index 000000000000..83b031473cd9 --- /dev/null +++ b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + numpy, + setuptools, + + # tests + pytest-cov-stub, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dedupe-pylbfgs"; + version = "0.2.0.16"; + pyproject = true; + + # NOTE: This is a fork of larsmans/pylbfgs maintained by dedupeio + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "pylbfgs"; + tag = "${version}"; + hash = "sha256-H416dgZQxyqsnhmlK5keW8cJWY6gea4mebVuP0IEVOU="; + }; + + build-system = [ + cython + numpy + setuptools + ]; + + dependencies = [ + numpy + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + # Prevent importing from source during test collection (only $out has compiled extensions) + preCheck = '' + rm -rf lbfgs + ''; + + pythonImportsCheck = [ + "lbfgs" + ]; + + meta = { + description = "Python wrapper for L-BFGS and OWL-QN optimization algorithms"; + homepage = "https://github.com/dedupeio/pylbfgs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f568dda5a799..b50cb59036bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3538,6 +3538,8 @@ self: super: with self; { dedupe-levenshtein-search = callPackage ../development/python-modules/dedupe-levenshtein-search { }; + dedupe-pylbfgs = callPackage ../development/python-modules/dedupe-pylbfgs { }; + deebot-client = callPackage ../development/python-modules/deebot-client { }; deemix = callPackage ../development/python-modules/deemix { }; From 1e34678aa1b3f8f9e58a8a42fb30b1c4bfdd27e6 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:44:17 +0100 Subject: [PATCH 49/91] python3Packages.doublemetaphone: init at 1.2i --- .../doublemetaphone/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/doublemetaphone/default.nix diff --git a/pkgs/development/python-modules/doublemetaphone/default.nix b/pkgs/development/python-modules/doublemetaphone/default.nix new file mode 100644 index 000000000000..a5fe45fea786 --- /dev/null +++ b/pkgs/development/python-modules/doublemetaphone/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "doublemetaphone"; + version = "1.2i"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "doublemetaphone"; + tag = "v${version}"; + hash = "sha256-VPJqHxQHLiLSko+aJYTIgISluHPARgQN5pYWYxP9QKQ="; + }; + + build-system = [ + cython + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Prevent importing from source during test collection (only $out has compiled extensions) + preCheck = '' + rm -rf doublemetaphone + ''; + + pythonImportsCheck = [ + "doublemetaphone" + ]; + + meta = { + description = "Python wrapper for Double Metaphone phonetic encoding algorithm"; + homepage = "https://github.com/dedupeio/doublemetaphone"; + license = lib.licenses.artistic1; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b50cb59036bd..51b4db69a23e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4377,6 +4377,8 @@ self: super: with self; { dotwiz = callPackage ../development/python-modules/dotwiz { }; + doublemetaphone = callPackage ../development/python-modules/doublemetaphone { }; + doubleratchet = callPackage ../development/python-modules/doubleratchet { }; doubles = callPackage ../development/python-modules/doubles { }; From 2b85955dd123ed564d9e0f0f7f693dcaad305619 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:44:45 +0100 Subject: [PATCH 50/91] python3Packages.highered: init at 0.2.1-unstable-2020-03-31 --- .../python-modules/highered/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/highered/default.nix diff --git a/pkgs/development/python-modules/highered/default.nix b/pkgs/development/python-modules/highered/default.nix new file mode 100644 index 000000000000..b9025a0c4c67 --- /dev/null +++ b/pkgs/development/python-modules/highered/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unstableGitUpdater, + + # build-system + setuptools, + + # dependencies + pyhacrf-datamade, + numpy, + + # tests + pytestCheckHook, +}: + +buildPythonPackage { + pname = "highered"; + version = "0.2.1-unstable-2020-03-31"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "highered"; + rev = "5e6e505e182ff91b1620535a491ad4a3d98ef71e"; + hash = "sha256-sDOAB0QabJ/WJYSIZ31J12kSDQADQUilE2SmGPjXmZo="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pyhacrf-datamade + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # No tests in repository + doCheck = false; + + pythonImportsCheck = [ + "highered" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Learnable edit distance using CRF (Conditional Random Fields)"; + homepage = "https://github.com/dedupeio/highered"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51b4db69a23e..5a14083c93e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6658,6 +6658,8 @@ self: super: with self; { highdicom = callPackage ../development/python-modules/highdicom { }; + highered = callPackage ../development/python-modules/highered { }; + highspy = callPackage ../development/python-modules/highspy { }; hightime = callPackage ../development/python-modules/hightime { }; From 5ad8a6252cc43adb82e9dd6fa5c43f42463924ea Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:45:21 +0100 Subject: [PATCH 51/91] python3Packages.simplecosine: init at 1.2 --- .../python-modules/simplecosine/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/simplecosine/default.nix diff --git a/pkgs/development/python-modules/simplecosine/default.nix b/pkgs/development/python-modules/simplecosine/default.nix new file mode 100644 index 000000000000..0709c1325387 --- /dev/null +++ b/pkgs/development/python-modules/simplecosine/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "simplecosine"; + version = "1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "simplecosine"; + tag = "v${version}"; + hash = "sha256-TNQnSbCh7o5JsxvfljRGSNwptwpLHmVw9gyk0TELDek="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "simplecosine" + ]; + + meta = { + description = "Simple cosine distance calculation for string comparison"; + homepage = "https://github.com/dedupeio/simplecosine"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a14083c93e6..1c5af03f62f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16852,6 +16852,8 @@ self: super: with self; { simplebayes = callPackage ../development/python-modules/simplebayes { }; + simplecosine = callPackage ../development/python-modules/simplecosine { }; + simpleeval = callPackage ../development/python-modules/simpleeval { }; simplefin4py = callPackage ../development/python-modules/simplefin4py { }; From e36a5b759d897e5a210b3663d5f941ec2a90c146 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:45:49 +0100 Subject: [PATCH 52/91] python3Packages.zope-index: init at 8.0 --- .../python-modules/zope-index/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/zope-index/default.nix diff --git a/pkgs/development/python-modules/zope-index/default.nix b/pkgs/development/python-modules/zope-index/default.nix new file mode 100644 index 000000000000..93c2cf8d90ff --- /dev/null +++ b/pkgs/development/python-modules/zope-index/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + btrees, + persistent, + zope-interface, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "zope-index"; + version = "8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.index"; + tag = "${version}"; + hash = "sha256-dHapd/+pJh6qzVx9FGSMmPsGbz8NhAoPqufXm3FOuM8="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + btrees + persistent + zope-interface + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "zope.index" + ]; + + pythonNamespaces = [ + "zope" + ]; + + meta = { + description = "Full-text indexing and searching for Zope"; + homepage = "https://github.com/zopefoundation/zope.index"; + changelog = "https://github.com/zopefoundation/zope.index/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c5af03f62f4..08b687547a6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20660,6 +20660,8 @@ self: super: with self; { zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { }; + zope-index = callPackage ../development/python-modules/zope-index { }; + zope-interface = callPackage ../development/python-modules/zope-interface { }; zope-lifecycleevent = callPackage ../development/python-modules/zope-lifecycleevent { }; From b77e8364f49d42d2469de43ac08a0cf0bee30a9b Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 20 Oct 2025 09:46:20 +0100 Subject: [PATCH 53/91] python3Packages.dedupe: init at 3.0.3 --- .../python-modules/dedupe/default.nix | 106 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 108 insertions(+) create mode 100644 pkgs/development/python-modules/dedupe/default.nix diff --git a/pkgs/development/python-modules/dedupe/default.nix b/pkgs/development/python-modules/dedupe/default.nix new file mode 100644 index 000000000000..fd8f38f70d4b --- /dev/null +++ b/pkgs/development/python-modules/dedupe/default.nix @@ -0,0 +1,106 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + setuptools, + + # dependencies + affinegap, + btrees, + categorical-distance, + dedupe-levenshtein-search, + doublemetaphone, + haversine, + highered, + numpy, + scikit-learn, + simplecosine, + zope-index, + dedupe, + + # tests + pytest-cov-stub, + pytestCheckHook, + python, + runCommand, +}: + +buildPythonPackage rec { + pname = "dedupe"; + version = "3.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dedupeio"; + repo = "dedupe"; + tag = "v${version}"; + hash = "sha256-tfBJeaeZw5w5OwM+AOfy9H6P2zbShjN/kuzEbpxATHI="; + }; + + build-system = [ + cython + setuptools + ]; + + dependencies = [ + affinegap + btrees + categorical-distance + dedupe-levenshtein-search + doublemetaphone + haversine + highered + numpy + scikit-learn + simplecosine + zope-index + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + # Remove source directory so pytest imports compiled extension from $out + preCheck = '' + rm -rf dedupe + ''; + + pythonImportsCheck = [ + "dedupe" + ]; + + passthru.tests.benchmarks = + runCommand "dedupe-benchmarks-test" + { + nativeBuildInputs = [ (python.withPackages (ps: [ dedupe ])) ]; + } + '' + # Copy benchmarks to writable location + cp -r ${src}/benchmarks benchmarks + chmod -R +w benchmarks + cd benchmarks + + # Run all three canonical benchmarks + for benchmark in canonical canonical_gazetteer canonical_matching; do + echo "Running $benchmark benchmark..." + # Redirect stderr to /dev/null (`2>/dev/null`) to suppress Python 3.13 + # multiprocessing resource tracker warnings from scikit-learn/joblib subprocesses + # `|| exit 1` provides fail-fast behavior: exit immediately if any benchmark fails + PYTHONPATH=$PWD python -m benchmarks.$benchmark 2>/dev/null || exit 1 + done + + touch $out + ''; + + meta = { + description = "Library for accurate and scalable fuzzy matching, deduplication and entity resolution"; + homepage = "https://github.com/dedupeio/dedupe"; + changelog = "https://github.com/dedupeio/dedupe/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ daniel-fahey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08b687547a6d..67eba7d8c0ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3536,6 +3536,8 @@ self: super: with self; { decorator = callPackage ../development/python-modules/decorator { }; + dedupe = callPackage ../development/python-modules/dedupe { }; + dedupe-levenshtein-search = callPackage ../development/python-modules/dedupe-levenshtein-search { }; dedupe-pylbfgs = callPackage ../development/python-modules/dedupe-pylbfgs { }; From 95b801922e5da79737defc6a9eeec3c4b4426e13 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Sun, 19 Oct 2025 05:20:20 +0900 Subject: [PATCH 54/91] bicpl: unstable-2024-05-14 -> 0-unstable-2025-10-24 Signed-off-by: Ludovico Piero --- pkgs/by-name/bi/bicpl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bicpl/package.nix b/pkgs/by-name/bi/bicpl/package.nix index 32c0e6e1bf16..c783217ab8cb 100644 --- a/pkgs/by-name/bi/bicpl/package.nix +++ b/pkgs/by-name/bi/bicpl/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation { pname = "bicpl"; - version = "unstable-2024-05-14"; + version = "0-unstable-2025-10-24"; # master is not actively maintained, using develop and develop-apple branches src = fetchFromGitHub { owner = "BIC-MNI"; repo = "bicpl"; - rev = "7e1e791483cf135fe29b8eecd7a360aa892823ae"; - hash = "sha256-SvbtPUfEYp3IGivG+5yFdJF904miyMk+s15zwW7e7b4="; + rev = "dc9828841e38c6b7c523f3ab8a4c23eeb9e4272b"; + hash = "sha256-wU/Qmtk6rbwxYqealV2On7W0schrYH85oKIUCpT4IXQ="; }; nativeBuildInputs = [ cmake ]; From f060465dba3dfe483ff7e55e79de4020858570ad Mon Sep 17 00:00:00 2001 From: Pim Snel Date: Thu, 23 Oct 2025 21:56:51 +0200 Subject: [PATCH 55/91] documenso: 0.9 -> 1.12.6 --- .../do/documenso/package-lock.json.patch | 789 ++++++++++++++++++ pkgs/by-name/do/documenso/package.json.patch | 40 + pkgs/by-name/do/documenso/package.nix | 116 ++- pkgs/by-name/do/documenso/turbo.json.patch | 104 +++ .../do/documenso/update-from-upstream.sh | 55 ++ 5 files changed, 1081 insertions(+), 23 deletions(-) create mode 100644 pkgs/by-name/do/documenso/package-lock.json.patch create mode 100644 pkgs/by-name/do/documenso/package.json.patch create mode 100644 pkgs/by-name/do/documenso/turbo.json.patch create mode 100755 pkgs/by-name/do/documenso/update-from-upstream.sh diff --git a/pkgs/by-name/do/documenso/package-lock.json.patch b/pkgs/by-name/do/documenso/package-lock.json.patch new file mode 100644 index 000000000000..875cba7457ad --- /dev/null +++ b/pkgs/by-name/do/documenso/package-lock.json.patch @@ -0,0 +1,789 @@ +diff --git a/package-lock.json b/package-lock.json +index 1a647e8..d44033c 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -16,7 +16,6 @@ + "@documenso/prisma": "^0.0.0", + "@lingui/conf": "^5.2.0", + "@lingui/core": "^5.2.0", +- "inngest-cli": "^0.29.1", + "luxon": "^3.5.0", + "mupdf": "^1.0.0", + "react": "^18", +@@ -41,7 +40,7 @@ + "prisma-extension-kysely": "^3.0.0", + "prisma-kysely": "^1.8.0", + "rimraf": "^5.0.1", +- "turbo": "^1.9.3", ++ "turbo": "^2.5.8", + "vite": "^6.3.5" + }, + "engines": { +@@ -13223,15 +13222,6 @@ + "node": ">=0.4.0" + } + }, +- "node_modules/adm-zip": { +- "version": "0.5.16", +- "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz", +- "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==", +- "license": "MIT", +- "engines": { +- "node": ">=12.0" +- } +- }, + "node_modules/agent-base": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", +@@ -14705,6 +14695,7 @@ + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "license": "ISC", ++ "optional": true, + "engines": { + "node": ">=10" + } +@@ -19315,6 +19306,7 @@ + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", ++ "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, +@@ -19327,6 +19319,7 @@ + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", ++ "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, +@@ -19338,7 +19331,8 @@ + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +- "license": "ISC" ++ "license": "ISC", ++ "optional": true + }, + "node_modules/fs.realpath": { + "version": "1.0.0", +@@ -21227,23 +21221,6 @@ + } + } + }, +- "node_modules/inngest-cli": { +- "version": "0.29.9", +- "resolved": "https://registry.npmjs.org/inngest-cli/-/inngest-cli-0.29.9.tgz", +- "integrity": "sha512-H02T7DGG53WV38RswpWmz7JsZXajx+uXDi1Zgq/ON5a+fNQi4hVRkxfoiZLngNeROVVXlokMTBwOShdsrnr7WA==", +- "hasInstallScript": true, +- "license": "SEE LICENSE IN LICENSE.md", +- "dependencies": { +- "adm-zip": "^0.5.10", +- "debug": "^4.3.4", +- "node-fetch": "2.6.7", +- "tar": "6.2.1" +- }, +- "bin": { +- "inngest": "bin/inngest", +- "inngest-cli": "bin/inngest" +- } +- }, + "node_modules/inngest/node_modules/@opentelemetry/api": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", +@@ -25470,6 +25447,7 @@ + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "license": "MIT", ++ "optional": true, + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" +@@ -25483,6 +25461,7 @@ + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", ++ "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, +@@ -25494,13 +25473,15 @@ + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +- "license": "ISC" ++ "license": "ISC", ++ "optional": true + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", ++ "optional": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, +@@ -32780,6 +32761,7 @@ + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "license": "ISC", ++ "optional": true, + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", +@@ -32838,6 +32820,7 @@ + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", ++ "optional": true, + "engines": { + "node": ">=8" + } +@@ -32846,7 +32829,8 @@ + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +- "license": "ISC" ++ "license": "ISC", ++ "optional": true + }, + "node_modules/temp-dir": { + "version": "2.0.0", +@@ -34050,102 +34034,102 @@ + } + }, + "node_modules/turbo": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.13.4.tgz", +- "integrity": "sha512-1q7+9UJABuBAHrcC4Sxp5lOqYS5mvxRrwa33wpIyM18hlOCpRD/fTJNxZ0vhbMcJmz15o9kkVm743mPn7p6jpQ==", ++ "version": "2.5.8", ++ "resolved": "https://registry.npmjs.org/turbo/-/turbo-2.5.8.tgz", ++ "integrity": "sha512-5c9Fdsr9qfpT3hA0EyYSFRZj1dVVsb6KIWubA9JBYZ/9ZEAijgUEae0BBR/Xl/wekt4w65/lYLTFaP3JmwSO8w==", + "dev": true, +- "license": "MPL-2.0", ++ "license": "MIT", + "bin": { + "turbo": "bin/turbo" + }, + "optionalDependencies": { +- "turbo-darwin-64": "1.13.4", +- "turbo-darwin-arm64": "1.13.4", +- "turbo-linux-64": "1.13.4", +- "turbo-linux-arm64": "1.13.4", +- "turbo-windows-64": "1.13.4", +- "turbo-windows-arm64": "1.13.4" ++ "turbo-darwin-64": "2.5.8", ++ "turbo-darwin-arm64": "2.5.8", ++ "turbo-linux-64": "2.5.8", ++ "turbo-linux-arm64": "2.5.8", ++ "turbo-windows-64": "2.5.8", ++ "turbo-windows-arm64": "2.5.8" + } + }, + "node_modules/turbo-darwin-64": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.13.4.tgz", +- "integrity": "sha512-A0eKd73R7CGnRinTiS7txkMElg+R5rKFp9HV7baDiEL4xTG1FIg/56Vm7A5RVgg8UNgG2qNnrfatJtb+dRmNdw==", ++ "version": "2.5.8", ++ "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-2.5.8.tgz", ++ "integrity": "sha512-Dh5bCACiHO8rUXZLpKw+m3FiHtAp2CkanSyJre+SInEvEr5kIxjGvCK/8MFX8SFRjQuhjtvpIvYYZJB4AGCxNQ==", + "cpu": [ + "x64" + ], + "dev": true, +- "license": "MPL-2.0", ++ "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/turbo-darwin-arm64": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.13.4.tgz", +- "integrity": "sha512-eG769Q0NF6/Vyjsr3mKCnkG/eW6dKMBZk6dxWOdrHfrg6QgfkBUk0WUUujzdtVPiUIvsh4l46vQrNVd9EOtbyA==", ++ "version": "2.5.8", ++ "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-2.5.8.tgz", ++ "integrity": "sha512-f1H/tQC9px7+hmXn6Kx/w8Jd/FneIUnvLlcI/7RGHunxfOkKJKvsoiNzySkoHQ8uq1pJnhJ0xNGTlYM48ZaJOQ==", + "cpu": [ + "arm64" + ], + "dev": true, +- "license": "MPL-2.0", ++ "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/turbo-linux-64": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.13.4.tgz", +- "integrity": "sha512-Bq0JphDeNw3XEi+Xb/e4xoKhs1DHN7OoLVUbTIQz+gazYjigVZvtwCvgrZI7eW9Xo1eOXM2zw2u1DGLLUfmGkQ==", ++ "version": "2.5.8", ++ "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-2.5.8.tgz", ++ "integrity": "sha512-hMyvc7w7yadBlZBGl/bnR6O+dJTx3XkTeyTTH4zEjERO6ChEs0SrN8jTFj1lueNXKIHh1SnALmy6VctKMGnWfw==", + "cpu": [ + "x64" + ], + "dev": true, +- "license": "MPL-2.0", ++ "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/turbo-linux-arm64": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.13.4.tgz", +- "integrity": "sha512-BJcXw1DDiHO/okYbaNdcWN6szjXyHWx9d460v6fCHY65G8CyqGU3y2uUTPK89o8lq/b2C8NK0yZD+Vp0f9VoIg==", ++ "version": "2.5.8", ++ "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-2.5.8.tgz", ++ "integrity": "sha512-LQELGa7bAqV2f+3rTMRPnj5G/OHAe2U+0N9BwsZvfMvHSUbsQ3bBMWdSQaYNicok7wOZcHjz2TkESn1hYK6xIQ==", + "cpu": [ + "arm64" + ], + "dev": true, +- "license": "MPL-2.0", ++ "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/turbo-windows-64": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.13.4.tgz", +- "integrity": "sha512-OFFhXHOFLN7A78vD/dlVuuSSVEB3s9ZBj18Tm1hk3aW1HTWTuAw0ReN6ZNlVObZUHvGy8d57OAGGxf2bT3etQw==", ++ "version": "2.5.8", ++ "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-2.5.8.tgz", ++ "integrity": "sha512-3YdcaW34TrN1AWwqgYL9gUqmZsMT4T7g8Y5Azz+uwwEJW+4sgcJkIi9pYFyU4ZBSjBvkfuPZkGgfStir5BBDJQ==", + "cpu": [ + "x64" + ], + "dev": true, +- "license": "MPL-2.0", ++ "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/turbo-windows-arm64": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.13.4.tgz", +- "integrity": "sha512-u5A+VOKHswJJmJ8o8rcilBfU5U3Y1TTAfP9wX8bFh8teYF1ghP0EhtMRLjhtp6RPa+XCxHHVA2CiC3gbh5eg5g==", ++ "version": "2.5.8", ++ "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-2.5.8.tgz", ++ "integrity": "sha512-eFC5XzLmgXJfnAK3UMTmVECCwuBcORrWdewoiXBnUm934DY6QN8YowC/srhNnROMpaKaqNeRpoB5FxCww3eteQ==", + "cpu": [ + "arm64" + ], + "dev": true, +- "license": "MPL-2.0", ++ "license": "MIT", + "optional": true, + "os": [ + "win32" +@@ -36114,7 +36098,9 @@ + }, + "engines": { + "node": ">=18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz", ++ "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==" + }, + "packages/app-tests/node_modules/start-server-and-test": { + "version": "2.0.12", +@@ -36136,25 +36122,33 @@ + }, + "engines": { + "node": ">=16" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.12.tgz", ++ "integrity": "sha512-U6QiS5qsz+DN5RfJJrkAXdooxMDnLZ+n5nR8kaX//ZH19SilF6b58Z3zM9zTfrNIkJepzauHo4RceSgvgUSX9w==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/bluebird": { + "version": "3.7.2", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", ++ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/check-more-types": { + "version": "2.24.0", + "license": "MIT", + "engines": { + "node": ">= 0.8.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", ++ "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/lazy-ass": { + "version": "1.6.0", + "license": "MIT", + "engines": { + "node": "> 0.8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", ++ "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree": { + "version": "1.2.0", +@@ -36167,7 +36161,9 @@ + }, + "engines": { + "node": ">= 0.10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz", ++ "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream": { + "version": "3.3.4", +@@ -36180,18 +36176,26 @@ + "split": "0.3", + "stream-combiner": "~0.0.4", + "through": "~2.3.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", ++ "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/duplexer": { + "version": "0.1.2", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", ++ "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/from": { + "version": "0.1.7", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", ++ "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/map-stream": { +- "version": "0.1.0" ++ "version": "0.1.0", ++ "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", ++ "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/pause-stream": { + "version": "0.0.11", +@@ -36201,7 +36205,9 @@ + ], + "dependencies": { + "through": "~2.3" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", ++ "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/split": { + "version": "0.3.3", +@@ -36211,14 +36217,18 @@ + }, + "engines": { + "node": "*" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", ++ "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/stream-combiner": { + "version": "0.0.4", + "license": "MIT", + "dependencies": { + "duplexer": "~0.1.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", ++ "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on": { + "version": "8.0.3", +@@ -36235,7 +36245,9 @@ + }, + "engines": { + "node": ">=12.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.3.tgz", ++ "integrity": "sha512-nQFqAFzZDeRxsu7S3C7LbuxslHhk+gnJZHyethuGKAn2IVleIbTB9I3vJSQiSR+DifUqmdzfPMoMPJfLqMF2vw==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi": { + "version": "17.13.3", +@@ -36246,40 +36258,54 @@ + "@sideway/address": "^4.1.5", + "@sideway/formula": "^3.0.1", + "@sideway/pinpoint": "^2.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz", ++ "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/hoek": { + "version": "9.3.0", +- "license": "BSD-3-Clause" ++ "license": "BSD-3-Clause", ++ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", ++ "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/topo": { + "version": "5.1.0", + "license": "BSD-3-Clause", + "dependencies": { + "@hapi/hoek": "^9.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", ++ "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/address": { + "version": "4.1.5", + "license": "BSD-3-Clause", + "dependencies": { + "@hapi/hoek": "^9.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", ++ "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/formula": { + "version": "3.0.1", +- "license": "BSD-3-Clause" ++ "license": "BSD-3-Clause", ++ "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", ++ "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/pinpoint": { + "version": "2.0.0", +- "license": "BSD-3-Clause" ++ "license": "BSD-3-Clause", ++ "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", ++ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + }, + "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/rxjs": { + "version": "7.8.2", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", ++ "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==" + }, + "packages/assets": { + "name": "@documenso/assets", +@@ -36718,7 +36744,9 @@ + }, + "packages/signing/node_modules/ts-pattern": { + "version": "5.7.1", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.7.1.tgz", ++ "integrity": "sha512-EGs8PguQqAAUIcQfK4E9xdXxB6s2GK4sJfT/vcc9V1ELIvC4LH/zXu2t/5fajtv6oiRCxdv7BgtVK3vWgROxag==" + }, + "packages/signing/node_modules/vitest": { + "version": "3.1.4", +@@ -36787,7 +36815,9 @@ + "jsdom": { + "optional": true + } +- } ++ }, ++ "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz", ++ "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/expect": { + "version": "3.1.4", +@@ -36801,7 +36831,9 @@ + }, + "funding": { + "url": "https://opencollective.com/vitest" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz", ++ "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/mocker": { + "version": "3.1.4", +@@ -36826,7 +36858,9 @@ + "vite": { + "optional": true + } +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz", ++ "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/mocker/node_modules/estree-walker": { + "version": "3.0.3", +@@ -36834,7 +36868,9 @@ + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", ++ "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/pretty-format": { + "version": "3.1.4", +@@ -36845,7 +36881,9 @@ + }, + "funding": { + "url": "https://opencollective.com/vitest" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz", ++ "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/runner": { + "version": "3.1.4", +@@ -36857,7 +36895,9 @@ + }, + "funding": { + "url": "https://opencollective.com/vitest" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz", ++ "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/snapshot": { + "version": "3.1.4", +@@ -36870,7 +36910,9 @@ + }, + "funding": { + "url": "https://opencollective.com/vitest" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz", ++ "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/spy": { + "version": "3.1.4", +@@ -36881,7 +36923,9 @@ + }, + "funding": { + "url": "https://opencollective.com/vitest" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz", ++ "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/spy/node_modules/tinyspy": { + "version": "3.0.2", +@@ -36889,7 +36933,9 @@ + "license": "MIT", + "engines": { + "node": ">=14.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", ++ "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/utils": { + "version": "3.1.4", +@@ -36902,12 +36948,16 @@ + }, + "funding": { + "url": "https://opencollective.com/vitest" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz", ++ "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==" + }, + "packages/signing/node_modules/vitest/node_modules/@vitest/utils/node_modules/loupe": { + "version": "3.1.3", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", ++ "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" + }, + "packages/signing/node_modules/vitest/node_modules/chai": { + "version": "5.2.0", +@@ -36922,7 +36972,9 @@ + }, + "engines": { + "node": ">=12" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", ++ "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==" + }, + "packages/signing/node_modules/vitest/node_modules/chai/node_modules/assertion-error": { + "version": "2.0.1", +@@ -36930,7 +36982,9 @@ + "license": "MIT", + "engines": { + "node": ">=12" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", ++ "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==" + }, + "packages/signing/node_modules/vitest/node_modules/chai/node_modules/check-error": { + "version": "2.1.1", +@@ -36938,7 +36992,9 @@ + "license": "MIT", + "engines": { + "node": ">= 16" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", ++ "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==" + }, + "packages/signing/node_modules/vitest/node_modules/chai/node_modules/deep-eql": { + "version": "5.0.2", +@@ -36946,12 +37002,16 @@ + "license": "MIT", + "engines": { + "node": ">=6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", ++ "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==" + }, + "packages/signing/node_modules/vitest/node_modules/chai/node_modules/loupe": { + "version": "3.1.3", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", ++ "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" + }, + "packages/signing/node_modules/vitest/node_modules/chai/node_modules/pathval": { + "version": "2.0.0", +@@ -36959,7 +37019,9 @@ + "license": "MIT", + "engines": { + "node": ">= 14.16" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", ++ "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==" + }, + "packages/signing/node_modules/vitest/node_modules/expect-type": { + "version": "1.2.1", +@@ -36967,27 +37029,37 @@ + "license": "Apache-2.0", + "engines": { + "node": ">=12.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz", ++ "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==" + }, + "packages/signing/node_modules/vitest/node_modules/pathe": { + "version": "2.0.3", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", ++ "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==" + }, + "packages/signing/node_modules/vitest/node_modules/std-env": { + "version": "3.9.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz", ++ "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==" + }, + "packages/signing/node_modules/vitest/node_modules/tinybench": { + "version": "2.9.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", ++ "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==" + }, + "packages/signing/node_modules/vitest/node_modules/tinyexec": { + "version": "0.3.2", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", ++ "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==" + }, + "packages/signing/node_modules/vitest/node_modules/tinypool": { + "version": "1.0.2", +@@ -36995,7 +37067,9 @@ + "license": "MIT", + "engines": { + "node": "^18.0.0 || >=20.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz", ++ "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==" + }, + "packages/signing/node_modules/vitest/node_modules/tinyrainbow": { + "version": "2.0.0", +@@ -37003,7 +37077,9 @@ + "license": "MIT", + "engines": { + "node": ">=14.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz", ++ "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==" + }, + "packages/signing/node_modules/vitest/node_modules/vite-node": { + "version": "3.1.4", +@@ -37024,7 +37100,9 @@ + }, + "funding": { + "url": "https://opencollective.com/vitest" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz", ++ "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==" + }, + "packages/signing/node_modules/vitest/node_modules/why-is-node-running": { + "version": "2.3.0", +@@ -37039,17 +37117,23 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", ++ "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==" + }, + "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/siginfo": { + "version": "2.0.0", + "dev": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", ++ "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==" + }, + "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/stackback": { + "version": "0.0.2", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", ++ "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==" + }, + "packages/tailwind-config": { + "name": "@documenso/tailwind-config", +@@ -37171,4 +37255,4 @@ + "license": "MIT" + } + } +-} ++} +\ No newline at end of file diff --git a/pkgs/by-name/do/documenso/package.json.patch b/pkgs/by-name/do/documenso/package.json.patch new file mode 100644 index 000000000000..a8a72575e1ad --- /dev/null +++ b/pkgs/by-name/do/documenso/package.json.patch @@ -0,0 +1,40 @@ +diff --git a/package.json b/package.json +index 1ff8701..e337979 100644 +--- a/package.json ++++ b/package.json +@@ -44,22 +44,22 @@ + "@commitlint/cli": "^17.7.1", + "@commitlint/config-conventional": "^17.7.0", + "@lingui/cli": "^5.2.0", ++ "@prisma/client": "^6.8.2", + "dotenv": "^16.5.0", + "dotenv-cli": "^8.0.0", + "eslint": "^8.40.0", + "eslint-config-custom": "*", + "husky": "^9.0.11", + "lint-staged": "^15.2.2", ++ "nodemailer": "^6.10.1", + "playwright": "1.52.0", + "prettier": "^3.3.3", +- "rimraf": "^5.0.1", +- "turbo": "^1.9.3", +- "vite": "^6.3.5", +- "@prisma/client": "^6.8.2", + "prisma": "^6.8.2", + "prisma-extension-kysely": "^3.0.0", + "prisma-kysely": "^1.8.0", +- "nodemailer": "^6.10.1" ++ "rimraf": "^5.0.1", ++ "turbo": "^2.5.8", ++ "vite": "^6.3.5" + }, + "name": "@documenso/root", + "workspaces": [ +@@ -71,7 +71,6 @@ + "@documenso/prisma": "^0.0.0", + "@lingui/conf": "^5.2.0", + "@lingui/core": "^5.2.0", +- "inngest-cli": "^0.29.1", + "luxon": "^3.5.0", + "mupdf": "^1.0.0", + "react": "^18", diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix index 71b15e2b29b8..f00781bc2c94 100644 --- a/pkgs/by-name/do/documenso/package.nix +++ b/pkgs/by-name/do/documenso/package.nix @@ -1,50 +1,119 @@ { lib, + nodejs, + node-gyp, + node-pre-gyp, + pixman, fetchFromGitHub, buildNpmPackage, prisma, - nix-update-script, + prisma-engines, + vips, + pkg-config, + cairo, + pango, + bash, + openssl, }: let - version = "0.9"; + pname = "documenso"; + version = "1.12.6"; in buildNpmPackage { - pname = "documenso"; - inherit version; + + inherit version pname; src = fetchFromGitHub { owner = "documenso"; repo = "documenso"; rev = "v${version}"; - hash = "sha256-uKOJVZ0GRHo/CYvd/Ix/tq1WDhutRji1tSGdcITsNlo="; + hash = "sha256-1TKjsOKJkv3COFgsE4tPAymI0MdeT+T8HiNgnoWHlAY="; }; - nativeBuildInputs = [ prisma ]; + npmDepsHash = "sha256-ZddRSBDasa3mMAS2dqXgXRMOc1nvspdXsuTZ7c+einw="; - preBuild = '' - # somehow for linux, npm is not finding the prisma package with the - # packages installed with the lockfile. - # This generates a prisma version incompatibility warning and is a kludge - # until the upstream package-lock is modified. - prisma generate + env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; + + env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node"; + env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines}/bin/query-engine"; + env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines}/bin/schema-engine"; + env.TURBO_NO_UPDATE_NOTIFIER = "true"; + env.TURBO_FORCE = "true"; + env.TURBO_REMOTE_CACHE_ENABLED = "false"; + + nativeBuildInputs = [ + pkg-config + vips + node-gyp + ]; + + buildInputs = [ + node-pre-gyp + node-gyp + pixman + cairo + pango + vips + ]; + + patches = [ + ./package-lock.json.patch + ./package.json.patch + ./turbo.json.patch + ]; + + buildPhase = '' + runHook preBuild + + patchShebangs apps/remix/.bin/build.sh + npm exec turbo -- telemetry disable + npm exec turbo -- build --filter=@documenso/remix + + runHook postBuild ''; - npmDepsHash = "sha256-+JbvFMi8xoyxkuL9k96K1Vq0neciCGkkyZUPd15ES2E="; - installPhase = '' - runHook preInstall + runHook preInstall - mkdir $out - cp -r node_modules $out/ - cp package-lock.json $out - cp apps/web/package.json $out - cp -r apps/web/public $out/ - cp -r apps/web/.next $out/ + mkdir -p $out/bin + cp -r . $out/ - runHook postInstall + cat > $out/bin/${pname} < turbo-patched.json + cp turbo-patched.json turbo.json + + echo "fix package-lock.json hashes" + nix run nixpkgs#npm-lockfile-fix -- package-lock.json + + git diff package-lock.json > $current_nixpkgs_dir/package-lock.json.patch + git diff package.json > $current_nixpkgs_dir/package.json.patch + git diff turbo.json > $current_nixpkgs_dir/turbo.json.patch +} + +runme From 1b1060cf058871124a380b12c994a4145e8e27cf Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Thu, 23 Oct 2025 12:09:21 -0400 Subject: [PATCH 56/91] luajit_openresty: 2.1-20220915 -> 2.1-20250826 --- pkgs/development/interpreters/luajit/openresty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix index 5a1397ec3da1..c079cdbbd174 100644 --- a/pkgs/development/interpreters/luajit/openresty.nix +++ b/pkgs/development/interpreters/luajit/openresty.nix @@ -6,13 +6,13 @@ }: callPackage ./default.nix rec { - version = "2.1-20220915"; + version = "2.1-20250826"; src = fetchFromGitHub { owner = "openresty"; repo = "luajit2"; rev = "v${version}"; - hash = "sha256-kMHE4iQtm2CujK9TVut1jNhY2QxYP514jfBsxOCyd4s="; + hash = "sha256-fF3xgAy2IjFy4LdXPlk4RuX+IclOXaw3YR24wyMBNgM="; }; inherit self passthruFun; From 68d3e4fa94d70bf6a4768dccd4f6fdf68bd9d2cd Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Sat, 20 Sep 2025 17:59:20 -0400 Subject: [PATCH 57/91] luaPackages.lua-resty-lrucache: 0.13 -> 0.15 --- pkgs/top-level/lua-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c9f0b72cd552..2d445f59a650 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -184,13 +184,13 @@ rec { { fetchFromGitHub }: buildLuaPackage rec { pname = "lua-resty-lrucache"; - version = "0.13"; + version = "0.15"; src = fetchFromGitHub { owner = "openresty"; repo = "lua-resty-lrucache"; rev = "v${version}"; - sha256 = "sha256-J8RNAMourxqUF8wPKd8XBhNwGC/x1KKvrVnZtYDEu4Q="; + sha256 = "sha256-G2l4Zo9Xm/m4zRfxrgzEvRE5LMO+UuX3kd7FwlCnxDA="; }; meta = with lib; { From 986d621826ca27e48c5e53709079e797cca708a1 Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Sat, 20 Sep 2025 17:59:02 -0400 Subject: [PATCH 58/91] luaPackages.lua-resty-core: 0.1.28 -> 0.1.31 --- pkgs/top-level/lua-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 2d445f59a650..6ac705ba1ade 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -160,13 +160,13 @@ rec { { fetchFromGitHub }: buildLuaPackage rec { pname = "lua-resty-core"; - version = "0.1.28"; + version = "0.1.31"; src = fetchFromGitHub { owner = "openresty"; repo = "lua-resty-core"; rev = "v${version}"; - sha256 = "sha256-RJ2wcHTu447wM0h1fa2qCBl4/p9XL6ZqX9pktRW64RI="; + sha256 = "sha256-WUiBFJ8L8NzSGoEwTAw/iHAzPqJqaOUSFyqGeEf+f94=="; }; propagatedBuildInputs = [ lua-resty-lrucache ]; From 6a0f6a042fbdb24d8d1d95966e72074c40a00bde Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Sat, 20 Sep 2025 17:11:01 -0400 Subject: [PATCH 59/91] nginxModules.lua: 0.10.26 -> 0.10.28 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index ded98d770493..b7b8c50e7a21 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -384,14 +384,14 @@ let lua = rec { name = "lua"; - version = "0.10.26"; + version = "0.10.28"; src = fetchFromGitHub { name = "lua"; owner = "openresty"; repo = "lua-nginx-module"; rev = "v${version}"; - hash = "sha256-007up/XncaSBimBumHpbwgB1WnkXgBe8e/q/yT6vthI="; + hash = "sha256-GT1PpJWpEu5EciK4n9ZDz1gIU/ZdC/SAsIdu0niQy8o="; }; inputs = [ luajit_openresty ]; From 089fab12e3e6d83524f73709ef2be687bef54366 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Oct 2025 21:25:59 +0800 Subject: [PATCH 60/91] fetchurl: move curlOpts warnings down to its value --- pkgs/build-support/fetchurl/default.nix | 31 +++++++++++++++---------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index d524c760c1a3..8e26d02fe8b0 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -212,17 +212,6 @@ let "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}"; in -assert - (lib.isList curlOpts) - -> lib.warn '' - fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${ - lib.generators.toPretty { multiline = false; } curlOpts - }), which is not supported anymore. - - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead: - curlOpts = ${lib.strings.escapeNixString (toString curlOpts)}; - - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead: - curlOptsList = [ ${lib.concatMapStringsSep " " lib.strings.escapeNixString curlOpts} ];'' true; - stdenvNoCC.mkDerivation ( ( if (pname != "" && version != "") then @@ -270,8 +259,26 @@ stdenvNoCC.mkDerivation ( outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; - inherit curlOpts; + curlOpts = lib.warnIf (lib.isList curlOpts) ( + let + url = toString (builtins.head urls_); + curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts; + curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts); + curlOptsListElementsRepresentation = + lib.concatMapStringsSep " " lib.strings.escapeNixString + curlOpts; + in + '' + fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore. + - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead: + curlOpts = ${curlOptsAsStringRepresentation}; + - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead: + curlOptsList = [ ${curlOptsListElementsRepresentation} ]; + '' + ) curlOpts; + curlOptsList = lib.escapeShellArgs curlOptsList; + inherit showURLs mirrorsFile From bf3e7097f36b4c184622cfa2eda7b003333b35ab Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Oct 2025 21:57:51 +0800 Subject: [PATCH 61/91] fetchurl: restructure with lib.extendMkDerivation (not formatted) --- pkgs/build-support/fetchurl/default.nix | 30 ++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 8e26d02fe8b0..189b22413d93 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -53,6 +53,28 @@ let in +lib.extendMkDerivation { + constructDrv = stdenvNoCC.mkDerivation; + + excludeDrvArgNames = [ + # Passed via passthru + "url" + + # Name-related attributes + # TODO(@ShamrockLee): Pass them. + "name" + "pname" + "version" + + # Hash attributes will be map to the corresponding outputHash* + "hash" + "sha1" + "sha256" + "sha512" + ]; + + extendDrvArgs = + finalAttrs: { # URL to fetch. url ? "", @@ -212,7 +234,6 @@ let "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}"; in -stdenvNoCC.mkDerivation ( ( if (pname != "" && version != "") then { inherit pname version; } @@ -307,5 +328,8 @@ stdenvNoCC.mkDerivation ( inherit url resolvedUrl; } // passthru; - } -) + }; + + # No ellipsis + inheritFunctionArgs = false; +} From 0a7fa9fe0a90d6709855ae61548a285f69779565 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Oct 2025 23:59:33 +0800 Subject: [PATCH 62/91] fetchzip: move extraPostFetch warning down where it is referenced --- pkgs/build-support/fetchzip/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 7e1452ae54a2..246ab3ea155b 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -33,10 +33,6 @@ ... }@args: -assert - (extraPostFetch != "") - -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." true; - let tmpFilename = if extension != null then @@ -93,7 +89,10 @@ fetchurl ( ) + '' ${postFetch} - ${extraPostFetch} + ${lib.warnIf (extraPostFetch != "") + "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." + extraPostFetch + } chmod 755 "$out" ''; # ^ Remove non-owner write permissions From d4299caae9f5909e6dd338dc736f4d52a7a97589 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Oct 2025 21:57:51 +0800 Subject: [PATCH 63/91] fetchzip: restructure with lib.extendMkDerivation (not formatted) --- pkgs/build-support/fetchzip/default.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 246ab3ea155b..a5da6f22fb65 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -14,6 +14,19 @@ glibcLocalesUtf8, }: +lib.extendMkDerivation { + constructDrv = fetchurl; + + excludeDrvArgNames = [ + "extraPostFetch" + + # TODO(@ShamrockLee): Move these arguments to derivationArgs when available. + "extension" + "stripRoot" + ]; + + extendDrvArgs = + finalAttrs: { url ? "", urls ? [ ], @@ -41,7 +54,6 @@ let baseNameOf (if url != "" then url else builtins.head urls); in -fetchurl ( { inherit name; recursiveHash = true; @@ -97,12 +109,5 @@ fetchurl ( ''; # ^ Remove non-owner write permissions # Fixes https://github.com/NixOS/nixpkgs/issues/38649 - } - // removeAttrs args [ - "stripRoot" - "extraPostFetch" - "postFetch" - "extension" - "nativeBuildInputs" - ] -) + }; +} From ae5b3bdb05e9e9eec76603a19274bc4be59c57de Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Oct 2025 21:57:51 +0800 Subject: [PATCH 64/91] fetchgit: restructure with lib.extendMkDerivation (not formatted) --- pkgs/build-support/fetchgit/default.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index a620f6c09a00..0efeed065589 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -23,6 +23,21 @@ let in lib.makeOverridable ( + lib.extendMkDerivation { + constructDrv = stdenvNoCC.mkDerivation; + + excludeDrvArgNames = [ + # Passed via `passthru` + "tag" + + # Hashes, handled by `lib.fetchers.withNormalizedHash` + # whose outputs contain outputHash* attributes. + "hash" + "sha256" + ]; + + extendDrvArgs = + finalAttrs: lib.fetchers.withNormalizedHash { } ( # NOTE Please document parameter additions or changes in # ../../../doc/build-helpers/fetchers.chapter.md @@ -120,7 +135,7 @@ lib.makeOverridable ( throw "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more." else - stdenvNoCC.mkDerivation { + { inherit name; builder = ./builder.sh; @@ -199,5 +214,9 @@ lib.makeOverridable ( } // passthru; } - ) + ); + + # No ellipsis. + inheritFunctionArgs = false; + } ) From aeddd850c6d3485fc1af2edfb111e58141d18dc1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Oct 2025 21:58:45 +0800 Subject: [PATCH 65/91] fetchurl, fetchzip, fetchgit: format Nix expression after lib.extendMkDerivation --- pkgs/build-support/fetchgit/default.nix | 316 ++++++++--------- pkgs/build-support/fetchurl/default.nix | 440 ++++++++++++------------ pkgs/build-support/fetchzip/default.nix | 150 ++++---- 3 files changed, 453 insertions(+), 453 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 0efeed065589..4ffb998ee205 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -38,183 +38,183 @@ lib.makeOverridable ( extendDrvArgs = finalAttrs: - lib.fetchers.withNormalizedHash { } ( - # NOTE Please document parameter additions or changes in - # ../../../doc/build-helpers/fetchers.chapter.md - { - url, - tag ? null, - rev ? null, - name ? urlToName { - inherit url; - rev = lib.revOrTag rev tag; - # when rootDir is specified, avoid invalidating the result when rev changes - append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else ""; - }, - leaveDotGit ? deepClone || fetchTags, - outputHash ? lib.fakeHash, - outputHashAlgo ? null, - fetchSubmodules ? true, - deepClone ? false, - branchName ? null, - sparseCheckout ? lib.optional (rootDir != "") rootDir, - nonConeMode ? rootDir != "", - nativeBuildInputs ? [ ], - # Shell code executed before the file has been fetched. This, in - # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to - # run operations between the checkout completing and deleting the .git - # directory. - preFetch ? "", - # Shell code executed after the file has been fetched - # successfully. This can do things like check or transform the file. - postFetch ? "", - preferLocalBuild ? true, - fetchLFS ? false, - # Shell code to build a netrc file for BASIC auth - netrcPhase ? null, - # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) - # needed for netrcPhase - netrcImpureEnvVars ? [ ], - passthru ? { }, - meta ? { }, - allowedRequisites ? null, - # fetch all tags after tree (useful for git describe) - fetchTags ? false, - # make this subdirectory the root of the result - rootDir ? "", - # GIT_CONFIG_GLOBAL (as a file) - gitConfigFile ? config.gitConfigFile, - }: + lib.fetchers.withNormalizedHash { } ( + # NOTE Please document parameter additions or changes in + # ../../../doc/build-helpers/fetchers.chapter.md + { + url, + tag ? null, + rev ? null, + name ? urlToName { + inherit url; + rev = lib.revOrTag rev tag; + # when rootDir is specified, avoid invalidating the result when rev changes + append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else ""; + }, + leaveDotGit ? deepClone || fetchTags, + outputHash ? lib.fakeHash, + outputHashAlgo ? null, + fetchSubmodules ? true, + deepClone ? false, + branchName ? null, + sparseCheckout ? lib.optional (rootDir != "") rootDir, + nonConeMode ? rootDir != "", + nativeBuildInputs ? [ ], + # Shell code executed before the file has been fetched. This, in + # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to + # run operations between the checkout completing and deleting the .git + # directory. + preFetch ? "", + # Shell code executed after the file has been fetched + # successfully. This can do things like check or transform the file. + postFetch ? "", + preferLocalBuild ? true, + fetchLFS ? false, + # Shell code to build a netrc file for BASIC auth + netrcPhase ? null, + # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) + # needed for netrcPhase + netrcImpureEnvVars ? [ ], + passthru ? { }, + meta ? { }, + allowedRequisites ? null, + # fetch all tags after tree (useful for git describe) + fetchTags ? false, + # make this subdirectory the root of the result + rootDir ? "", + # GIT_CONFIG_GLOBAL (as a file) + gitConfigFile ? config.gitConfigFile, + }: - /* - NOTE: - fetchgit has one problem: git fetch only works for refs. - This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks - and checking whether a commit belongs to a ref is expensive. This may - change in the future when some caching is added to git (?) - Usually refs are either tags (refs/tags/*) or branches (refs/heads/*) - Cloning branches will make the hash check fail when there is an update. - But not all patches we want can be accessed by tags. + /* + NOTE: + fetchgit has one problem: git fetch only works for refs. + This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks + and checking whether a commit belongs to a ref is expensive. This may + change in the future when some caching is added to git (?) + Usually refs are either tags (refs/tags/*) or branches (refs/heads/*) + Cloning branches will make the hash check fail when there is an update. + But not all patches we want can be accessed by tags. - The workaround is getting the last n commits so that it's likely that they - still contain the hash we want. + The workaround is getting the last n commits so that it's likely that they + still contain the hash we want. - for now : increase depth iteratively (TODO) + for now : increase depth iteratively (TODO) - real fix: ask git folks to add a - git fetch $HASH contained in $BRANCH - facility because checking that $HASH is contained in $BRANCH is less - expensive than fetching --depth $N. - Even if git folks implemented this feature soon it may take years until - server admins start using the new version? - */ + real fix: ask git folks to add a + git fetch $HASH contained in $BRANCH + facility because checking that $HASH is contained in $BRANCH is less + expensive than fetching --depth $N. + Even if git folks implemented this feature soon it may take years until + server admins start using the new version? + */ - assert nonConeMode -> (sparseCheckout != [ ]); - assert fetchTags -> leaveDotGit; - assert rootDir != "" -> !leaveDotGit; + assert nonConeMode -> (sparseCheckout != [ ]); + assert fetchTags -> leaveDotGit; + assert rootDir != "" -> !leaveDotGit; - let - revWithTag = let - warningMsg = "fetchgit requires one of either `rev` or `tag` to be provided (not both)."; - otherIsNull = other: lib.assertMsg (other == null) warningMsg; + revWithTag = + let + warningMsg = "fetchgit requires one of either `rev` or `tag` to be provided (not both)."; + otherIsNull = other: lib.assertMsg (other == null) warningMsg; + in + if tag != null then + assert (otherIsNull rev); + "refs/tags/${tag}" + else if rev != null then + assert (otherIsNull tag); + rev + else + # FIXME fetching HEAD if no rev or tag is provided is problematic at best + "HEAD"; in - if tag != null then - assert (otherIsNull rev); - "refs/tags/${tag}" - else if rev != null then - assert (otherIsNull tag); - rev + + if builtins.isString sparseCheckout then + # Changed to throw on 2023-06-04 + throw + "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more." else - # FIXME fetching HEAD if no rev or tag is provided is problematic at best - "HEAD"; - in + { + inherit name; - if builtins.isString sparseCheckout then - # Changed to throw on 2023-06-04 - throw - "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more." - else - { - inherit name; + builder = ./builder.sh; + fetcher = ./nix-prefetch-git; - builder = ./builder.sh; - fetcher = ./nix-prefetch-git; + nativeBuildInputs = [ + git + cacert + ] + ++ lib.optionals fetchLFS [ git-lfs ] + ++ nativeBuildInputs; - nativeBuildInputs = [ - git - cacert - ] - ++ lib.optionals fetchLFS [ git-lfs ] - ++ nativeBuildInputs; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit outputHash outputHashAlgo; - outputHashMode = "recursive"; + # git-sparse-checkout(1) says: + # > When the --stdin option is provided, the directories or patterns are read + # > from standard in as a newline-delimited list instead of from the arguments. + sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout; - # git-sparse-checkout(1) says: - # > When the --stdin option is provided, the directories or patterns are read - # > from standard in as a newline-delimited list instead of from the arguments. - sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout; + inherit + url + leaveDotGit + fetchLFS + fetchSubmodules + deepClone + branchName + nonConeMode + preFetch + postFetch + fetchTags + rootDir + gitConfigFile + ; + rev = revWithTag; - inherit - url - leaveDotGit - fetchLFS - fetchSubmodules - deepClone - branchName - nonConeMode - preFetch - postFetch - fetchTags - rootDir - gitConfigFile - ; - rev = revWithTag; + postHook = + if netrcPhase == null then + null + else + '' + ${netrcPhase} + # required that git uses the netrc file + mv {,.}netrc + export NETRC=$PWD/.netrc + export HOME=$PWD + ''; - postHook = - if netrcPhase == null then - null - else - '' - ${netrcPhase} - # required that git uses the netrc file - mv {,.}netrc - export NETRC=$PWD/.netrc - export HOME=$PWD - ''; + impureEnvVars = + lib.fetchers.proxyImpureEnvVars + ++ netrcImpureEnvVars + ++ [ + "GIT_PROXY_COMMAND" + "NIX_GIT_SSL_CAINFO" + "SOCKS_SERVER" - impureEnvVars = - lib.fetchers.proxyImpureEnvVars - ++ netrcImpureEnvVars - ++ [ - "GIT_PROXY_COMMAND" - "NIX_GIT_SSL_CAINFO" - "SOCKS_SERVER" + # This is a parameter intended to be set by setup hooks or preFetch + # scripts that want per-URL control over HTTP proxies used by Git + # (if per-URL control isn't needed, `http_proxy` etc. will + # suffice). It must be a whitespace-separated (with backslash as an + # escape character) list of pairs like this: + # + # http://domain1/path1 proxy1 https://domain2/path2 proxy2 + # + # where the URLs are as documented in the `git-config` manual page + # under `http..*`, and the proxies are as documented on the + # same page under `http.proxy`. + "FETCHGIT_HTTP_PROXIES" + ]; - # This is a parameter intended to be set by setup hooks or preFetch - # scripts that want per-URL control over HTTP proxies used by Git - # (if per-URL control isn't needed, `http_proxy` etc. will - # suffice). It must be a whitespace-separated (with backslash as an - # escape character) list of pairs like this: - # - # http://domain1/path1 proxy1 https://domain2/path2 proxy2 - # - # where the URLs are as documented in the `git-config` manual page - # under `http..*`, and the proxies are as documented on the - # same page under `http.proxy`. - "FETCHGIT_HTTP_PROXIES" - ]; + inherit preferLocalBuild meta allowedRequisites; - inherit preferLocalBuild meta allowedRequisites; - - passthru = { - gitRepoUrl = url; - inherit tag; - } - // passthru; - } - ); + passthru = { + gitRepoUrl = url; + inherit tag; + } + // passthru; + } + ); # No ellipsis. inheritFunctionArgs = false; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 189b22413d93..e528b70eb7a7 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -75,260 +75,260 @@ lib.extendMkDerivation { extendDrvArgs = finalAttrs: -{ - # URL to fetch. - url ? "", + { + # URL to fetch. + url ? "", - # Alternatively, a list of URLs specifying alternative download - # locations. They are tried in order. - urls ? [ ], + # Alternatively, a list of URLs specifying alternative download + # locations. They are tried in order. + urls ? [ ], - # Additional curl options needed for the download to succeed. - # Warning: Each space (no matter the escaping) will start a new argument. - # If you wish to pass arguments with spaces, use `curlOptsList` - curlOpts ? "", + # Additional curl options needed for the download to succeed. + # Warning: Each space (no matter the escaping) will start a new argument. + # If you wish to pass arguments with spaces, use `curlOptsList` + curlOpts ? "", - # Additional curl options needed for the download to succeed. - curlOptsList ? [ ], + # Additional curl options needed for the download to succeed. + curlOptsList ? [ ], - # Name of the file. If empty, use the basename of `url' (or of the - # first element of `urls'). - name ? "", + # Name of the file. If empty, use the basename of `url' (or of the + # first element of `urls'). + name ? "", - # for versioned downloads optionally take pname + version. - pname ? "", - version ? "", + # for versioned downloads optionally take pname + version. + pname ? "", + version ? "", - # SRI hash. - hash ? "", + # SRI hash. + hash ? "", - # Legacy ways of specifying the hash. - outputHash ? "", - outputHashAlgo ? "", - sha1 ? "", - sha256 ? "", - sha512 ? "", + # Legacy ways of specifying the hash. + outputHash ? "", + outputHashAlgo ? "", + sha1 ? "", + sha256 ? "", + sha512 ? "", - recursiveHash ? false, + recursiveHash ? false, - # Shell code to build a netrc file for BASIC auth - netrcPhase ? null, + # Shell code to build a netrc file for BASIC auth + netrcPhase ? null, - # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) - # needed for netrcPhase - netrcImpureEnvVars ? [ ], + # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) + # needed for netrcPhase + netrcImpureEnvVars ? [ ], - # Shell code executed after the file has been fetched - # successfully. This can do things like check or transform the file. - postFetch ? "", + # Shell code executed after the file has been fetched + # successfully. This can do things like check or transform the file. + postFetch ? "", - # Whether to download to a temporary path rather than $out. Useful - # in conjunction with postFetch. The location of the temporary file - # is communicated to postFetch via $downloadedFile. - downloadToTemp ? false, + # Whether to download to a temporary path rather than $out. Useful + # in conjunction with postFetch. The location of the temporary file + # is communicated to postFetch via $downloadedFile. + downloadToTemp ? false, - # If true, set executable bit on downloaded file - executable ? false, + # If true, set executable bit on downloaded file + executable ? false, - # If set, don't download the file, but write a list of all possible - # URLs (resulting from resolving mirror:// URLs) to $out. - showURLs ? false, + # If set, don't download the file, but write a list of all possible + # URLs (resulting from resolving mirror:// URLs) to $out. + showURLs ? false, - # Meta information, if any. - meta ? { }, + # Meta information, if any. + meta ? { }, - # Passthru information, if any. - passthru ? { }, - # Doing the download on a remote machine just duplicates network - # traffic, so don't do that by default - preferLocalBuild ? true, + # Passthru information, if any. + passthru ? { }, + # Doing the download on a remote machine just duplicates network + # traffic, so don't do that by default + preferLocalBuild ? true, - # Additional packages needed as part of a fetch - nativeBuildInputs ? [ ], -}@args: + # Additional packages needed as part of a fetch + nativeBuildInputs ? [ ], + }@args: -let - preRewriteUrls = - if urls != [ ] && url == "" then - ( - if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}" - ) - else if urls == [ ] && url != "" then - ( - if lib.isString url then - [ url ] - else - throw "`url` is not a string: ${lib.generators.toPretty { } urls}" - ) - else - throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}"; - - urls_ = let - u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls); - in - if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u; - - hash_ = - if - with lib.lists; - length ( - filter (s: s != "") [ - hash - outputHash - sha1 - sha256 - sha512 - ] - ) > 1 - then - throw "multiple hashes passed to fetchurl: ${lib.generators.toPretty { } urls_}" - else - - if hash != "" then - { - outputHashAlgo = null; - outputHash = hash; - } - else if outputHash != "" then - if outputHashAlgo != "" then - { inherit outputHashAlgo outputHash; } - else - throw "fetchurl was passed outputHash without outputHashAlgo: ${lib.generators.toPretty { } urls_}" - else if sha512 != "" then - { - outputHashAlgo = "sha512"; - outputHash = sha512; - } - else if sha256 != "" then - { - outputHashAlgo = "sha256"; - outputHash = sha256; - } - else if sha1 != "" then - { - outputHashAlgo = "sha1"; - outputHash = sha1; - } - else if cacert != null then - { - outputHashAlgo = "sha256"; - outputHash = ""; - } - else - throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}"; - - resolvedUrl = - let - mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url; - mirrorName = lib.head mirrorSplit; - mirrorList = - if lib.hasAttr mirrorName mirrors then - mirrors."${mirrorName}" + preRewriteUrls = + if urls != [ ] && url == "" then + ( + if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}" + ) + else if urls == [ ] && url != "" then + ( + if lib.isString url then + [ url ] + else + throw "`url` is not a string: ${lib.generators.toPretty { } urls}" + ) else - throw "unknown mirror:// site ${mirrorName}"; - in - if mirrorSplit == null || mirrorName == null then - url - else - "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}"; -in + throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}"; - ( - if (pname != "" && version != "") then - { inherit pname version; } - else - { - name = - if showURLs then - "urls" - else if name != "" then - name + urls_ = + let + u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls); + in + if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u; + + hash_ = + if + with lib.lists; + length ( + filter (s: s != "") [ + hash + outputHash + sha1 + sha256 + sha512 + ] + ) > 1 + then + throw "multiple hashes passed to fetchurl: ${lib.generators.toPretty { } urls_}" + else + + if hash != "" then + { + outputHashAlgo = null; + outputHash = hash; + } + else if outputHash != "" then + if outputHashAlgo != "" then + { inherit outputHashAlgo outputHash; } else - baseNameOf (toString (builtins.head urls_)); - } - ) - // { - builder = ./builder.sh; + throw "fetchurl was passed outputHash without outputHashAlgo: ${lib.generators.toPretty { } urls_}" + else if sha512 != "" then + { + outputHashAlgo = "sha512"; + outputHash = sha512; + } + else if sha256 != "" then + { + outputHashAlgo = "sha256"; + outputHash = sha256; + } + else if sha1 != "" then + { + outputHashAlgo = "sha1"; + outputHash = sha1; + } + else if cacert != null then + { + outputHashAlgo = "sha256"; + outputHash = ""; + } + else + throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}"; - nativeBuildInputs = [ curl ] ++ nativeBuildInputs; + resolvedUrl = + let + mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url; + mirrorName = lib.head mirrorSplit; + mirrorList = + if lib.hasAttr mirrorName mirrors then + mirrors."${mirrorName}" + else + throw "unknown mirror:// site ${mirrorName}"; + in + if mirrorSplit == null || mirrorName == null then + url + else + "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}"; + in - urls = urls_; - - # If set, prefer the content-addressable mirrors - # (http://tarballs.nixos.org) over the original URLs. - preferHashedMirrors = false; - - # New-style output content requirements. - inherit (hash_) outputHashAlgo outputHash; - - # Disable TLS verification only when we know the hash and no credentials are - # needed to access the resource - SSL_CERT_FILE = - if - ( - hash_.outputHash == "" - || hash_.outputHash == lib.fakeSha256 - || hash_.outputHash == lib.fakeSha512 - || hash_.outputHash == lib.fakeHash - || netrcPhase != null - ) - then - "${cacert}/etc/ssl/certs/ca-bundle.crt" + ( + if (pname != "" && version != "") then + { inherit pname version; } else - "/no-cert-file.crt"; + { + name = + if showURLs then + "urls" + else if name != "" then + name + else + baseNameOf (toString (builtins.head urls_)); + } + ) + // { + builder = ./builder.sh; - outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; + nativeBuildInputs = [ curl ] ++ nativeBuildInputs; - curlOpts = lib.warnIf (lib.isList curlOpts) ( - let - url = toString (builtins.head urls_); - curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts; - curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts); - curlOptsListElementsRepresentation = - lib.concatMapStringsSep " " lib.strings.escapeNixString - curlOpts; - in - '' - fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore. - - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead: - curlOpts = ${curlOptsAsStringRepresentation}; - - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead: - curlOptsList = [ ${curlOptsListElementsRepresentation} ]; - '' - ) curlOpts; + urls = urls_; - curlOptsList = lib.escapeShellArgs curlOptsList; + # If set, prefer the content-addressable mirrors + # (http://tarballs.nixos.org) over the original URLs. + preferHashedMirrors = false; - inherit - showURLs - mirrorsFile - postFetch - downloadToTemp - executable - ; + # New-style output content requirements. + inherit (hash_) outputHashAlgo outputHash; - impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; + # Disable TLS verification only when we know the hash and no credentials are + # needed to access the resource + SSL_CERT_FILE = + if + ( + hash_.outputHash == "" + || hash_.outputHash == lib.fakeSha256 + || hash_.outputHash == lib.fakeSha512 + || hash_.outputHash == lib.fakeHash + || netrcPhase != null + ) + then + "${cacert}/etc/ssl/certs/ca-bundle.crt" + else + "/no-cert-file.crt"; - nixpkgsVersion = lib.trivial.release; + outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; - inherit preferLocalBuild; - - postHook = - if netrcPhase == null then - null - else + curlOpts = lib.warnIf (lib.isList curlOpts) ( + let + url = toString (builtins.head urls_); + curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts; + curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts); + curlOptsListElementsRepresentation = + lib.concatMapStringsSep " " lib.strings.escapeNixString + curlOpts; + in '' - ${netrcPhase} - curlOpts="$curlOpts --netrc-file $PWD/netrc" - ''; + fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore. + - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead: + curlOpts = ${curlOptsAsStringRepresentation}; + - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead: + curlOptsList = [ ${curlOptsListElementsRepresentation} ]; + '' + ) curlOpts; - inherit meta; - passthru = { - inherit url resolvedUrl; - } - // passthru; - }; + curlOptsList = lib.escapeShellArgs curlOptsList; + + inherit + showURLs + mirrorsFile + postFetch + downloadToTemp + executable + ; + + impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; + + nixpkgsVersion = lib.trivial.release; + + inherit preferLocalBuild; + + postHook = + if netrcPhase == null then + null + else + '' + ${netrcPhase} + curlOpts="$curlOpts --netrc-file $PWD/netrc" + ''; + + inherit meta; + passthru = { + inherit url resolvedUrl; + } + // passthru; + }; # No ellipsis inheritFunctionArgs = false; diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index a5da6f22fb65..830f68085f76 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -27,87 +27,87 @@ lib.extendMkDerivation { extendDrvArgs = finalAttrs: -{ - url ? "", - urls ? [ ], - name ? repoRevToNameMaybe (if url != "" then url else builtins.head urls) null "unpacked", - nativeBuildInputs ? [ ], - postFetch ? "", - extraPostFetch ? "", + { + url ? "", + urls ? [ ], + name ? repoRevToNameMaybe (if url != "" then url else builtins.head urls) null "unpacked", + nativeBuildInputs ? [ ], + postFetch ? "", + extraPostFetch ? "", - # Optionally move the contents of the unpacked tree up one level. - stripRoot ? true, - # Allows to set the extension for the intermediate downloaded - # file. This can be used as a hint for the unpackCmdHooks to select - # an appropriate unpacking tool. - extension ? null, + # Optionally move the contents of the unpacked tree up one level. + stripRoot ? true, + # Allows to set the extension for the intermediate downloaded + # file. This can be used as a hint for the unpackCmdHooks to select + # an appropriate unpacking tool. + extension ? null, - # the rest are given to fetchurl as is - ... -}@args: + # the rest are given to fetchurl as is + ... + }@args: -let - tmpFilename = - if extension != null then - "download.${extension}" - else - baseNameOf (if url != "" then url else builtins.head urls); -in + let + tmpFilename = + if extension != null then + "download.${extension}" + else + baseNameOf (if url != "" then url else builtins.head urls); + in - { - inherit name; - recursiveHash = true; + { + inherit name; + recursiveHash = true; - downloadToTemp = true; + downloadToTemp = true; - # Have to pull in glibcLocalesUtf8 for unzip in setup-hook.sh to handle - # UTF-8 aware locale: - # https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263 - nativeBuildInputs = - lib.optionals withUnzip [ - unzip - glibcLocalesUtf8 - ] - ++ nativeBuildInputs; + # Have to pull in glibcLocalesUtf8 for unzip in setup-hook.sh to handle + # UTF-8 aware locale: + # https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263 + nativeBuildInputs = + lib.optionals withUnzip [ + unzip + glibcLocalesUtf8 + ] + ++ nativeBuildInputs; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" - renamed="$TMPDIR/${tmpFilename}" - mv "$downloadedFile" "$renamed" - unpackFile "$renamed" - chmod -R +w "$unpackDir" - '' - + ( - if stripRoot then - '' - if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then - echo "error: zip file must contain a single file or directory." - echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files." - exit 1 - fi - fn=$(cd "$unpackDir" && ls -A) - if [ -f "$unpackDir/$fn" ]; then - mkdir $out - fi - mv "$unpackDir/$fn" "$out" - '' - else - '' - mv "$unpackDir" "$out" - '' - ) - + '' - ${postFetch} - ${lib.warnIf (extraPostFetch != "") - "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." - extraPostFetch - } - chmod 755 "$out" - ''; - # ^ Remove non-owner write permissions - # Fixes https://github.com/NixOS/nixpkgs/issues/38649 - }; + renamed="$TMPDIR/${tmpFilename}" + mv "$downloadedFile" "$renamed" + unpackFile "$renamed" + chmod -R +w "$unpackDir" + '' + + ( + if stripRoot then + '' + if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then + echo "error: zip file must contain a single file or directory." + echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files." + exit 1 + fi + fn=$(cd "$unpackDir" && ls -A) + if [ -f "$unpackDir/$fn" ]; then + mkdir $out + fi + mv "$unpackDir/$fn" "$out" + '' + else + '' + mv "$unpackDir" "$out" + '' + ) + + '' + ${postFetch} + ${lib.warnIf (extraPostFetch != "") + "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." + extraPostFetch + } + chmod 755 "$out" + ''; + # ^ Remove non-owner write permissions + # Fixes https://github.com/NixOS/nixpkgs/issues/38649 + }; } From f5b2fcd10062ee9bde2a0924d4c17c74c3a3cd6f Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 27 Oct 2025 04:07:47 +0800 Subject: [PATCH 66/91] .git-blame-ignore-revs: ignore fetchurl, fetchzip, fetchgit extendMkDerivation reformatting --- .git-blame-ignore-revs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index e4a336ee6d0f..9685de407b97 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -193,6 +193,10 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 # nixos/kanidm: inherit lib, nixfmt 8f18393d380079904d072007fb19dc64baef0a3a +# fetchgit, fetchurl, fetchzip: +# format after refactoring with lib.extendMkDerivation (#455994) +aeddd850c6d3485fc1af2edfb111e58141d18dc1 + # fetchhg: format after refactoring with lib.extendMkDerivation and make overridable (#423539) 34a5b1eb23129f8fb62c677e3760903f6d43228f From 1ec0227cc062251c36140ef1e7c37b1cd1b370f1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 28 Oct 2025 00:48:30 +0800 Subject: [PATCH 67/91] fetchurl: don't treat empty-string name special --- pkgs/build-support/fetchurl/default.nix | 42 ++++++++++--------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index e528b70eb7a7..88e7bfaa7809 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -60,12 +60,6 @@ lib.extendMkDerivation { # Passed via passthru "url" - # Name-related attributes - # TODO(@ShamrockLee): Pass them. - "name" - "pname" - "version" - # Hash attributes will be map to the corresponding outputHash* "hash" "sha1" @@ -91,13 +85,13 @@ lib.extendMkDerivation { # Additional curl options needed for the download to succeed. curlOptsList ? [ ], - # Name of the file. If empty, use the basename of `url' (or of the - # first element of `urls'). - name ? "", + # Name of the file when pname + version is unspecified. + # Default to the basename of `url' (or of the first element of `urls'). + name ? null, # for versioned downloads optionally take pname + version. - pname ? "", - version ? "", + pname ? null, + version ? null, # SRI hash. hash ? "", @@ -234,21 +228,17 @@ lib.extendMkDerivation { "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}"; in - ( - if (pname != "" && version != "") then - { inherit pname version; } - else - { - name = - if showURLs then - "urls" - else if name != "" then - name - else - baseNameOf (toString (builtins.head urls_)); - } - ) - // { + { + name = + if pname != null && version != null then + "${finalAttrs.pname}-${finalAttrs.version}" + else if showURLs then + "urls" + else if name != null then + name + else + baseNameOf (toString (lib.head urls_)); + builder = ./builder.sh; nativeBuildInputs = [ curl ] ++ nativeBuildInputs; From 159e5acf079b6999ba31f922fb6541118129cb49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 22:52:22 +0000 Subject: [PATCH 68/91] slade-unstable: 3.2.8-unstable-2025-10-21 -> 3.2.8-unstable-2025-10-25 --- pkgs/by-name/sl/slade-unstable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index 3d4027fd860b..ed86e1b0feeb 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "slade"; - version = "3.2.8-unstable-2025-10-21"; + version = "3.2.8-unstable-2025-10-25"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "fb7cc161a6886c12c5120e30190a7813c6c16b62"; - hash = "sha256-skJpcxLSInAzBHGtxdTWAqocXQKKQY7vJfUx8ZAlMqc="; + rev = "d473699512b6d41bc9e58c8e6df3b8f24156f3b4"; + hash = "sha256-y5MB5BytWfcRe8orPwqZrObRKilCWz9eITxhQmgVmHc="; }; nativeBuildInputs = [ From 8107431e9b0c7ffeee2f96cc4316318a1a434629 Mon Sep 17 00:00:00 2001 From: Pui Yong Qing Date: Tue, 28 Oct 2025 08:36:48 +0800 Subject: [PATCH 69/91] vesktop: 1.5.8 -> 1.6.0 --- .../by-name/ve/vesktop/disable_update_checking.patch | 12 ------------ pkgs/by-name/ve/vesktop/package.nix | 7 +++---- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 pkgs/by-name/ve/vesktop/disable_update_checking.patch diff --git a/pkgs/by-name/ve/vesktop/disable_update_checking.patch b/pkgs/by-name/ve/vesktop/disable_update_checking.patch deleted file mode 100644 index 2fcc1fc24be7..000000000000 --- a/pkgs/by-name/ve/vesktop/disable_update_checking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/main/index.ts b/src/main/index.ts -index 37fd471..d0a9e56 100644 ---- a/src/main/index.ts -+++ b/src/main/index.ts -@@ -18,7 +18,6 @@ import { Settings, State } from "./settings"; - import { isDeckGameMode } from "./utils/steamOS"; - - if (!IS_DEV) { -- autoUpdater.checkForUpdatesAndNotify(); - } - - console.log("Vesktop v" + app.getVersion()); diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 2555add4a42f..d230d55e1cb2 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.8"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-9wYIg1TGcntUMMp6SqYrgDRl3P41eeOqt76OMjSAi5M="; + hash = "sha256-kzJsSjaTH6HtBfhEtX4NLJS96zgYr0/Us6H0tDJvb9A="; }; pnpmDeps = pnpm_10.fetchDeps { @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { patches ; fetcherVersion = 2; - hash = "sha256-rJzXbIQUxCImTqeH8EsGiyGNGoHYUqoekoa+VXpob5Y="; + hash = "sha256-Vn+Imarp1OTPfe/PoMgFHU5eWnye5Oa+qoGZaTxOUmU="; }; nativeBuildInputs = [ @@ -69,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - ./disable_update_checking.patch ./fix_read_only_settings.patch ] ++ lib.optional withSystemVencord ( From b623af1b2f95b06d1082a055a189ab896bf89c11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 02:43:05 +0000 Subject: [PATCH 70/91] zoekt: 3.7.2-2-unstable-2025-10-16 -> 3.7.2-2-unstable-2025-10-24 --- pkgs/by-name/zo/zoekt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index e5412d1ce914..cc06292c12f4 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2025-10-16"; + version = "3.7.2-2-unstable-2025-10-24"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "90faf6de70e39db5fb48839eabfba6c8add008f0"; - hash = "sha256-nULqnTms5Jw8gE8VcUzRGJaJqyavXyABU8SyTg8fCtE="; + rev = "eab7bf421ca319e3096b3b5192c7b0c32647c335"; + hash = "sha256-vG/btpXRI/8G98iakevtHOG4yEOx7EsrWHCLApAIQMQ="; }; vendorHash = "sha256-urXYBv8+C2jwnr5PjXz7nUyX/Gz4wmtS76UTXFqfQFk="; From b223003b904e09d24059282cfacfe1009f567038 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 02:56:01 +0000 Subject: [PATCH 71/91] trufflehog: 3.90.11 -> 3.90.12 --- pkgs/by-name/tr/trufflehog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index fd83c2e7ef11..08fa92c2bb99 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.90.11"; + version = "3.90.12"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-X2mqmUjdKHIp/w393hLvD6k7LTBIY9FEb1fI+SckIe4="; + hash = "sha256-r+j9YnRKQ5m7XLavM5rARRZwDiNTcGmxpL6Sv8eTZLE="; }; - vendorHash = "sha256-XTjKaRNqSnyLVag5/nBMmKZ6XeTDmd03ujeeMCJCB9Y="; + vendorHash = "sha256-zQ67yLN/HCshOndP/FAUOOyiQpOjyOJChkZZmFb06WM="; nativeBuildInputs = [ makeWrapper ]; From 08a5969b1ef10523e0755dfa154473147c9ac95f Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 28 Oct 2025 13:26:28 +0530 Subject: [PATCH 72/91] openbangla-keyboard: unstable-2023-07-21 > 2.0.0-unstable-2025-08-19 add johnrtitor as maintainer --- .../misc/openbangla-keyboard/Cargo.lock | 247 ++++++++++-------- .../misc/openbangla-keyboard/default.nix | 33 +-- 2 files changed, 155 insertions(+), 125 deletions(-) diff --git a/pkgs/applications/misc/openbangla-keyboard/Cargo.lock b/pkgs/applications/misc/openbangla-keyboard/Cargo.lock index d0bfd1e1783e..1bde0909ddfd 100644 --- a/pkgs/applications/misc/openbangla-keyboard/Cargo.lock +++ b/pkgs/applications/misc/openbangla-keyboard/Cargo.lock @@ -4,105 +4,108 @@ version = 3 [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ + "cfg-if", "getrandom", "once_cell", + "serde", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "edit-distance" -version = "2.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b" +checksum = "e3f497e87b038c09a155dfd169faa5ec940d0644635555ef6bd464ac20e97397" [[package]] name = "emojicon" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349cbfb1ca5301d8492ff741487f98fed75957c5e8fee41485e3413359099ef9" +checksum = "328e1bb7f1b2b87859d560af9ca245e7a0ca664adad1879cb6bd2d49b7501fd4" + +[[package]] +name = "fst" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" [[package]] name = "getrandom" -version = "0.2.10" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", + "r-efi", "wasi", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "okkhor" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ef452078c9fb34be8842a52484bf9271e01ac2795e3d15ee90357fb45c102f" +checksum = "0bc911c392067af1e3c7cde21774ea70dd285b4125b5e3d5febc283b76b9d6a4" [[package]] name = "once_cell" -version = "1.18.0" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "phf" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ "phf_macros", "phf_shared", - "proc-macro-hack", ] [[package]] name = "phf_generator" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared", "rand", @@ -110,85 +113,65 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ "phf_generator", "phf_shared", - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ "siphasher", ] [[package]] name = "poriborton" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c081c9ef49e856f39ccd59e4943582b1e47225eb01b0debc1d388c4daa55b0dd" +checksum = "964aa77aab32f321000ec0b121ab2a27565e051fb7ff979c22d6e21a90376f14" dependencies = [ - "matches", "phf", ] -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", "rand_core", ] @@ -197,9 +180,6 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] [[package]] name = "regex" @@ -240,52 +220,72 @@ dependencies = [ "okkhor", "poriborton", "regex", + "rustversion", "serde_json", "stringplus", + "upodesh", ] [[package]] -name = "ryu" -version = "1.0.15" +name = "rustversion" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.226" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.226" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.226" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "stringplus" @@ -295,20 +295,9 @@ checksum = "9057d3b491a3eee749e52560657c4d93b0badc04fb3fa8dae3c942c5c066f222" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -317,18 +306,68 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" + +[[package]] +name = "upodesh" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af0dcd57dc7aa39411df5c9c8046ee7439a619e7881a43aba328bd533ae54a91" +dependencies = [ + "fst", + "once_cell", + "serde", + "serde_json", +] [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.14.7+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index b2239c5d38a8..510402f40417 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -12,34 +12,22 @@ ibus, qtbase, zstd, - fetchpatch, withFcitx5Support ? false, withIbusSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openbangla-keyboard"; - version = "unstable-2023-07-21"; + version = "2.0.0-unstable-2025-08-19"; src = fetchFromGitHub { owner = "openbangla"; repo = "openbangla-keyboard"; - # no upstream release in 3 years - # fcitx5 support was added over a year after the last release - rev = "780bd40eed16116222faff044bfeb61a07af158f"; - hash = "sha256-4CR4lgHB51UvS/RLc0AEfIKJ7dyTCOfDrQdGLf9de8E="; + rev = "723e348ad2cb0607684d907ce8a9457e12993f4f"; + hash = "sha256-XAcL4gBcu84DMR6o9JSJ/PmI1PsDdTETknD6C48E8ek="; fetchSubmodules = true; }; - patches = [ - # prevents runtime crash when fcitx5-based IM attempts to look in /usr - (fetchpatch { - name = "use-CMAKE_INSTALL_PREFIX-for-loading-data.patch"; - url = "https://github.com/OpenBangla/OpenBangla-Keyboard/commit/f402472780c29eaa6b4cc841a70289adf171462b.diff"; - hash = "sha256-YahvtyOxe8F40Wfe+31C6fdmm197QN26/Q67oinOplk="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -62,8 +50,8 @@ stdenv.mkDerivation rec { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src cargoRoot postPatch; - hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY="; + inherit (finalAttrs) src cargoRoot postPatch; + hash = "sha256-UrS12fcXIIT3xhl/nyegwROBMCIepi6n07CS5CEA2BY="; }; cmakeFlags = @@ -76,7 +64,7 @@ stdenv.mkDerivation rec { cargoRoot = "src/engine/riti"; postPatch = '' - cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock + cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock ''; meta = { @@ -85,9 +73,12 @@ stdenv.mkDerivation rec { mainProgram = "openbangla-gui"; homepage = "https://openbangla.github.io/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ hqurve ]; + maintainers = with lib.maintainers; [ + hqurve + johnrtitor + ]; platforms = lib.platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; -} +}) From 875ef2e2ff8c5d1df51556399776c3fffe78ece3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 09:05:33 +0000 Subject: [PATCH 73/91] python3Packages.elevenlabs: 2.20.0 -> 2.20.1 --- 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 9c4ef79a85dd..2734adc85037 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.20.0"; + version = "2.20.1"; tag = "v${version}"; in buildPythonPackage { @@ -25,7 +25,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-oxhXvPUOplftB3b7oXmfLSRdPVVjzuOeVPp19OEHVCk="; + hash = "sha256-uJ6uy2/DUtwP5k694Ev672JfDnc5j6Qx0HuineAI7bI="; }; build-system = [ poetry-core ]; From 0ace36a3da1013402226f52d59cac23dff81c67a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 28 Oct 2025 12:13:54 +0100 Subject: [PATCH 74/91] .github/labeler-no-sync: backport changes to github-teams Changes to this auto-generated file need to be backported automatically, to keep maintainer pings for teams functional on stable branches. --- .github/labeler-no-sync.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml index 65d54e81a0b2..69249f6ac27d 100644 --- a/.github/labeler-no-sync.yml +++ b/.github/labeler-no-sync.yml @@ -29,5 +29,6 @@ - .github/actions/* - .github/workflows/* - ci/**/*.* + - maintainers/github-teams.json # keep-sorted end From d08e05cb74593a25355bea953dc0b13dd1080545 Mon Sep 17 00:00:00 2001 From: Hennie Marais Date: Tue, 28 Oct 2025 14:14:21 +0200 Subject: [PATCH 75/91] vimPlugins.vim-buftabline: init at 2020-12-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e7e0f02c161d..512c8bd9a2c0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17004,6 +17004,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-buftabline = buildVimPlugin { + pname = "vim-buftabline"; + version = "2020-12-13"; + src = fetchFromGitHub { + owner = "ap"; + repo = "vim-buftabline"; + rev = "73b9ef5dcb6cdf6488bc88adb382f20bc3e3262a"; + sha256 = "1vs4km7fb3di02p0771x42y2bsn1hi4q6iwlbrj0imacd9affv5y"; + }; + meta.homepage = "https://github.com/ap/vim-buftabline/"; + meta.hydraPlatforms = [ ]; + }; + vim-caddyfile = buildVimPlugin { pname = "vim-caddyfile"; version = "2025-07-22"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 573cf666c92a..65fbf1331f98 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1305,6 +1305,7 @@ https://github.com/mtikekar/vim-bsv/,, https://github.com/jeetsukumaran/vim-buffergator/,, https://github.com/bling/vim-bufferline/,, https://github.com/qpkorr/vim-bufkill/,, +https://github.com/ap/vim-buftabline/,HEAD, https://github.com/isobit/vim-caddyfile/,HEAD, https://github.com/tpope/vim-capslock/,, https://github.com/kristijanhusak/vim-carbon-now-sh/,, From c2fc311cf1dc2827697b62a158758122a767d1ac Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sat, 25 Oct 2025 13:12:45 +0200 Subject: [PATCH 76/91] compactor: adds patch for failing test Adds the patch https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb , which fixes the test failure when updating to Wireshark 4.6.0. --- pkgs/applications/networking/compactor/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index e783aef616c7..b2ab9dd0c9d8 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, asciidoctor, autoreconfHook, pkg-config, @@ -42,6 +43,12 @@ stdenv.mkDerivation rec { # https://github.com/dns-stats/compactor/pull/91 ./patches/update-golden-cbor2diag-output.patch + + # https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb + (fetchpatch { + url = "https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb.patch"; + hash = "sha256-eEaVS5rfrLkRGc668PwVfb/xw3n1SoCm30xEf1NjbeY="; + }) ]; nativeBuildInputs = [ From 092b55b2a0ff2ceecc14b6f4bc67cb5999b1f120 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 28 Oct 2025 09:11:09 -0400 Subject: [PATCH 77/91] erlang_27: 27.3.4.3 -> 27.3.4.4 https://github.com/erlang/otp/releases/tag/OTP-27.3.4.4 --- pkgs/development/interpreters/erlang/27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index d51bc6a76572..fd4acce3596b 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ genericBuilder: genericBuilder { - version = "27.3.4.3"; - hash = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o="; + version = "27.3.4.4"; + hash = "sha256-iHpEYXzaso1ZK9XLrT04t+BoX2Y6nSbT9rNjY1JoHPM="; } From f6e5f353191a1b874e0d855dedfe346a69a637db Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 26 Oct 2025 22:30:56 +0100 Subject: [PATCH 78/91] uhhyou-plugins-juce: init at 0.1.0 --- .../uh/uhhyou-plugins-juce/package.nix | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/uh/uhhyou-plugins-juce/package.nix diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix new file mode 100644 index 000000000000..71cb46c212b2 --- /dev/null +++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix @@ -0,0 +1,63 @@ +{ + alsa-lib, + cmake, + curl, + fetchFromGitHub, + freetype, + lib, + libGL, + libXcursor, + libXext, + libXinerama, + libXrandr, + libjack2, + pkg-config, + stdenv, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "uhhyou-plugins-juce"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "ryukau"; + repo = "UhhyouPluginsJuce"; + tag = "UhhyouPluginsJuce${finalAttrs.version}"; + hash = "sha256-oHxyOTiqEwdNUKGQNjjfdRkzMa+4TYX6Vf6ZS9BTcC0="; + fetchSubmodules = true; + }; + nativeBuildInputs = [ + pkg-config + cmake + ]; + buildInputs = [ + alsa-lib + curl + freetype + libGL + libXcursor + libXext + libXinerama + libXrandr + libjack2 + ]; + + # Disable LTO to avoid optimization mismatch issues + NIX_CFLAGS_COMPILE = [ + "-fno-lto" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 + cp -r *_artefacts/Release/VST3/*.vst3 $out/lib/vst3/ + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/ryukau/UhhyouPluginsJuce"; + description = "A collection of VST3 effect plugins"; + license = [ lib.licenses.agpl3Only ]; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; + }; +}) From 29a2273eee1fd21703aff60114f58688f28f1a73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 14:12:59 +0000 Subject: [PATCH 79/91] distrobox: 1.8.1.2 -> 1.8.2.0 --- pkgs/by-name/di/distrobox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix index c7970e436c50..8946a7355b9c 100644 --- a/pkgs/by-name/di/distrobox/package.nix +++ b/pkgs/by-name/di/distrobox/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.8.1.2"; + version = "1.8.2.0"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-wTu+8SQZaf8TKkjyvKqTvIWnCZTiPnozybTu5uKXEJk="; + hash = "sha256-uwJD7HsWoQ/LxYL0mSSxMni676qqEnMHndpL01M5ySE="; }; dontConfigure = true; From 72d9fc32fe1b4b7613b5505d647b82a5b8ba6014 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 28 Oct 2025 01:20:12 +0100 Subject: [PATCH 80/91] workflows/team: Prefix PR branch with create-pull-request Allows better scoping of branch creation restrictions --- .github/workflows/teams.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index 67ffdf053a80..1cd54cd527e0 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -75,7 +75,7 @@ jobs: author: ${{ steps.user.outputs.git-string }} committer: ${{ steps.user.outputs.git-string }} commit-message: "maintainers/github-teams.json: Automated sync" - branch: github-team-sync + branch: pr/github-team-sync title: "maintainers/github-teams.json: Automated sync" body: | This is an automated PR to sync the GitHub teams with access to this repository to the `lib.teams` list. From ecaa134b310603a5ce1c98b2afa5650e62772600 Mon Sep 17 00:00:00 2001 From: myypo Date: Sat, 25 Oct 2025 09:22:39 +0300 Subject: [PATCH 81/91] postgres-lsp: 0.15.0 -> 0.16.1 --- pkgs/by-name/po/postgres-lsp/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix index 93ea5e8604b5..c505ec0a5f6f 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-lsp/package.nix @@ -3,22 +3,29 @@ rustPlatform, fetchgit, rust-jemalloc-sys, + tree-sitter, + nodejs, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "postgres-lsp"; - version = "0.15.0"; + version = "0.16.1"; src = fetchgit { url = "https://github.com/supabase-community/postgres-language-server"; tag = finalAttrs.version; - hash = "sha256-ZintjrSeNsYR6A8tlEfSetse7d79jgLdCpdu+sMe3Zk="; + hash = "sha256-zdFgfZ9GtZObn839kkAIT71bBt7YHs28qkAWlp3k7kw="; fetchSubmodules = true; }; - cargoHash = "sha256-x/Wbx3noH6YOQIis1sN8ylQApjhSy4/mrxX6jvZFs6A="; + cargoHash = "sha256-psgo5/tDHaQd0dkiD/3uhrKuxlOBLi/xG4x3gVPLZbw="; nativeBuildInputs = [ rustPlatform.bindgenHook + + # Required to build the custom tree-sitter grammar + # https://github.com/supabase-community/postgres-language-server/blob/main/crates/pgt_treesitter_grammar/grammar.js + tree-sitter + nodejs ]; buildInputs = [ @@ -44,12 +51,12 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Tools and language server for Postgres"; - homepage = "https://pgtools.dev"; + homepage = "https://pg-language-server.com"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda myypo ]; - mainProgram = "postgrestools"; + mainProgram = "postgres-language-server"; }; }) From f7716b24d0fead530002e719bde68a87e057a665 Mon Sep 17 00:00:00 2001 From: myypo Date: Tue, 28 Oct 2025 16:43:20 +0200 Subject: [PATCH 82/91] postgres-lsp: rename to postgres-language-server --- .../po/{postgres-lsp => postgres-language-server}/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/po/{postgres-lsp => postgres-language-server}/package.nix (97%) diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-language-server/package.nix similarity index 97% rename from pkgs/by-name/po/postgres-lsp/package.nix rename to pkgs/by-name/po/postgres-language-server/package.nix index c505ec0a5f6f..290bc26f02f7 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-language-server/package.nix @@ -7,7 +7,7 @@ nodejs, }: rustPlatform.buildRustPackage (finalAttrs: { - pname = "postgres-lsp"; + pname = "postgres-language-server"; version = "0.16.1"; src = fetchgit { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f40183e4d867..a2fe24a88240 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1214,6 +1214,7 @@ mapAliases { posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03 postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19 + postgres-lsp = lib.warnOnInstantiate "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28 postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27 postgresql14JitPackages = throw "'postgresql14JitPackages' has been renamed to/replaced by 'postgresql14Packages'"; # Converted to throw 2025-10-27 postgresql15JitPackages = throw "'postgresql15JitPackages' has been renamed to/replaced by 'postgresql15Packages'"; # Converted to throw 2025-10-27 From e1690a4f37a785427e043f387eb31006443ad905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 15:35:36 +0000 Subject: [PATCH 83/91] versatiles: 1.1.0 -> 2.0.1 --- pkgs/by-name/ve/versatiles/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index ae1a9420df2c..6d2449b0c5e5 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "versatiles"; - version = "1.1.0"; # When updating: Replace with current version + version = "2.0.1"; # When updating: Replace with current version src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${version}"; # When updating: Replace with long commit hash of new version - hash = "sha256-yGvU/2DUL9PboDhcjxxxXHeBlrUe7vvcxKKWv03bqeA="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. + hash = "sha256-qFVqikq1T6LQnOWgM66uKzFhWQbVjEuUK3N5vNvaDq4="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. }; - cargoHash = "sha256-QD76WR3xnZBcfnQA0G9AOQa9aIdzWazDr3Ya+kL8iCE="; # When updating: Same as above + cargoHash = "sha256-kkYdQEBydxPwxxSjTiwk4huCDK3xJ9FoyrcHL88ytfk="; # When updating: Same as above __darwinAllowLocalNetworking = true; From 1bf1e79f7dca5d9877f28aaa282ae9d3e0915910 Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 15:39:25 +0000 Subject: [PATCH 84/91] maintainers/github-teams.json: Automated sync --- maintainers/github-teams.json | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index b08521a210c7..e764f0cb80fe 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -211,7 +211,6 @@ "domenkozar": 126339, "donn": 12652988, "dwt": 57199, - "eliandoran": 21236836, "emilazy": 18535642, "ethancedwards8": 60861925, "fiddlerwoaroof": 808745, @@ -502,7 +501,7 @@ "name": "kodi" }, "kubernetes": { - "description": "", + "description": "Maintain the Kubernetes package and module", "id": 5536808, "maintainers": { "johanot": 998763, @@ -514,7 +513,7 @@ "name": "kubernetes" }, "linux-kernel": { - "description": "", + "description": "Maintain the Linux kernel", "id": 13371617, "maintainers": { "alyssais": 2768870 @@ -912,17 +911,6 @@ }, "name": "SDL" }, - "security": { - "description": "Private reports: security@nixos.org", - "id": 2197543, - "maintainers": { - "LeSuisse": 737767, - "mweinelt": 131599, - "risicle": 807447 - }, - "members": {}, - "name": "Security" - }, "static": { "description": "People interested in static builds (creation of `.a` files, fully static executables, etc.) and keeping them working", "id": 5906550, From a6018d1f56f3423d526c8230eaa337ec33d36ebc Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 28 Oct 2025 16:09:45 +0100 Subject: [PATCH 85/91] julec: 0.1.6 -> 0.1.7 --- .editorconfig | 3 +++ pkgs/by-name/ju/julec/hook.nix | 1 - pkgs/by-name/ju/julec/hook.sh | 2 +- pkgs/by-name/ju/julec/package.nix | 14 +++++++++----- pkgs/by-name/ju/julec/test/hello-jule/jule.mod | 1 + 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6972df7013d6..6844b559c7b5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -93,6 +93,9 @@ insert_final_newline = unset [*.jule] indent_style = tab +[jule.mod] +insert_final_newline = unset + # Keep this hint at the bottom: # Please don't add entries for subfolders here. # Create /.editorconfig instead. diff --git a/pkgs/by-name/ju/julec/hook.nix b/pkgs/by-name/ju/julec/hook.nix index d6cccb165979..427812bfb87f 100644 --- a/pkgs/by-name/ju/julec/hook.nix +++ b/pkgs/by-name/ju/julec/hook.nix @@ -1,6 +1,5 @@ { julec, - clang, makeSetupHook, }: diff --git a/pkgs/by-name/ju/julec/hook.sh b/pkgs/by-name/ju/julec/hook.sh index 112dc48d0c81..35d314a54922 100644 --- a/pkgs/by-name/ju/julec/hook.sh +++ b/pkgs/by-name/ju/julec/hook.sh @@ -28,7 +28,7 @@ julecBuildHook() { julecSetEnv mkdir -p "$JULE_OUT_DIR" - julec --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR" + julec build --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR" runHook postBuild diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index e22298483855..c1f76526eed5 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -22,23 +22,23 @@ let in clangStdenv.mkDerivation (finalAttrs: { pname = "julec"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "julelang"; repo = "jule"; tag = "jule${finalAttrs.version}"; name = "jule-${finalAttrs.version}"; - hash = "sha256-y4v8FdQkB5Si3SYkchFG9fAU4ZhabAMcPkDcLEWW+6k="; + hash = "sha256-7py8QrNMX8LwpI7LCp5XgRFUzgltFP1rTbuzqw/1D8o="; }; irSrc = fetchFromGitHub { owner = "julelang"; repo = "julec-ir"; # revision determined by the upstream commit hash in julec-ir/README.md - rev = "aebbd12c0f89f6a04f856f3e23d5ea39741c3e0f"; + rev = "81ddbed06a715428a90d3645f7242fa4e522ea16"; name = "jule-ir-${finalAttrs.version}"; - hash = "sha256-7eDOYMmCEfW+0zZpESY1+ql3hWZZ/Q75lKT0nBQPktE="; + hash = "sha256-Az9RDrwRY2kuMgL/Lf/x6YctfySr96/imWZeOa+J/rM="; }; dontConfigure = true; @@ -76,7 +76,11 @@ clangStdenv.mkDerivation (finalAttrs: { -o "bin/${finalAttrs.meta.mainProgram}-bootstrap" echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..." - bin/${finalAttrs.meta.mainProgram}-bootstrap --opt L2 -p -o "bin/${finalAttrs.meta.mainProgram}" "src/${finalAttrs.meta.mainProgram}" + bin/${finalAttrs.meta.mainProgram}-bootstrap build \ + -p \ + --opt L2 \ + -o "bin/${finalAttrs.meta.mainProgram}" \ + "src/${finalAttrs.meta.mainProgram}" runHook postBuild ''; diff --git a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod index e69de29bb2d1..08babbd90c37 100644 --- a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod +++ b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod @@ -0,0 +1 @@ +module helloJule \ No newline at end of file From 79a09ac85bbd0beca2250118c2b5b7deb8011634 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 16:13:00 +0000 Subject: [PATCH 86/91] python3Packages.bpython: 0.25 -> 0.26 --- pkgs/development/python-modules/bpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index fc685f744b68..68798c64e1ed 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.25"; + version = "0.26"; pyproject = true; src = fetchFromGitHub { owner = "bpython"; repo = "bpython"; tag = "${version}-release"; - hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w="; + hash = "sha256-NmWM0fdzS9n5FSnNJOCdS1JE5ZHrmJXqCuHa54rT8GU="; }; postPatch = '' From 25a7f5b821f0bd287b9e5f9551ed118f2c461304 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 28 Oct 2025 19:41:24 +0300 Subject: [PATCH 87/91] xwayland: 24.1.8 -> 24.1.9 --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 5b24b53185fa..78c624811784 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "24.1.8"; + version = "24.1.9"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-yJCNV8jtnOuCk8Frp61a9SLvrxun5R+eTPPAd00ZmQc="; + hash = "sha256-8pevJ6hFCNubgNHLvMacOAHaOOtkxy87W1D1gkWa/dA="; }; postPatch = '' From c663e7f914cf9d2259cf2aa0df25520dac23947a Mon Sep 17 00:00:00 2001 From: Sergey Gulin Date: Tue, 28 Oct 2025 19:47:19 +0300 Subject: [PATCH 88/91] teams/nix-formatting: add Sereja313 Adding myself to the maintainers list and the nix-formatting team. --- maintainers/maintainer-list.nix | 8 ++++++++ maintainers/team-list.nix | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee193d84d31f..4100b6d95be0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23530,6 +23530,14 @@ githubId = 5791019; name = "Jiuyang Liu"; }; + Sereja313 = { + name = "Sergey Gulin"; + github = "Sereja313"; + githubId = 112060595; + email = "sergeygulin96@gmail.com"; + matrix = "@sereja:sereja.xyz"; + keys = [ { fingerprint = "AEF0 79C6 7618 8929 4124 22DB 3AB4 2DF3 F50E 3420"; } ]; + }; serge = { email = "sb@canva.com"; github = "serge-belov"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1ad64b5bc2df..de7d9e27a22b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -358,8 +358,7 @@ with lib.maintainers; _0x4A6F MattSturgeon jfly - # Not in the maintainer list - # Sereja313 + Sereja313 ]; scope = "Nix formatting team: https://nixos.org/community/teams/formatting/"; shortName = "Nix formatting team"; From 6691c568b0624e2fdd4c3c5320960d96900d544b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 28 Oct 2025 18:06:37 +0100 Subject: [PATCH 89/91] nixosTests.gitlab: fix eval This was recently turned into a throw. --- nixos/modules/services/misc/docker-registry.nix | 2 +- nixos/modules/services/misc/gitlab.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 2c2a59052d1b..f4abe2c8bf86 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -48,7 +48,7 @@ in options.services.dockerRegistry = { enable = lib.mkEnableOption "Docker Registry"; - package = lib.mkPackageOption pkgs "docker-distribution" { + package = lib.mkPackageOption pkgs "distribution" { example = "gitlab-container-registry"; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 127a7e73e83e..f0c21379ee3c 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -588,12 +588,12 @@ in if versionAtLeast config.system.stateVersion "23.11" then pkgs.gitlab-container-registry else - pkgs.docker-distribution; - defaultText = literalExpression "pkgs.docker-distribution"; + pkgs.distribution; + defaultText = literalExpression "pkgs.distribution"; description = '' Container registry package to use. - External container registries such as `pkgs.docker-distribution` are not supported + External container registries such as `pkgs.distribution` are not supported anymore since GitLab 16.0.0. ''; }; @@ -1179,7 +1179,7 @@ in ( cfg.registry.enable && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0" - && cfg.registry.package == pkgs.docker-distribution + && cfg.registry.package == pkgs.distribution ) '' Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release. From f929fa921dd252cb1e23d128378f57c8203dcb62 Mon Sep 17 00:00:00 2001 From: Jonas Franke Date: Thu, 23 Oct 2025 10:43:50 +0200 Subject: [PATCH 90/91] bluej: fix desktop executable name --- pkgs/by-name/bl/bluej/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix index b5fa9f683711..925c1508555e 100644 --- a/pkgs/by-name/bl/bluej/package.nix +++ b/pkgs/by-name/bl/bluej/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { (makeDesktopItem { name = "BlueJ"; desktopName = "BlueJ"; - exec = "BlueJ"; + exec = "bluej"; icon = "bluej"; comment = "A simple powerful Java IDE"; categories = [ From c319ac6571de2eac9f0a8527a9776eec9b308948 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 28 Oct 2025 18:10:55 +0100 Subject: [PATCH 91/91] various: fix eval runCommandNoCC has been renamed to runCommand and the former has recently been turned into a throw. --- doc/languages-frameworks/texlive.section.md | 2 +- nixos/tests/acme/http01-builtin.nix | 2 +- nixos/tests/kanidm-provisioning.nix | 2 +- nixos/tests/kanidm.nix | 2 +- .../tests/nix-required-mounts/ensure-path-not-present.nix | 2 +- nixos/tests/nix-required-mounts/test-require-feature.nix | 2 +- .../nix-required-mounts/test-structured-attrs-empty.nix | 7 +++---- nixos/tests/nix-required-mounts/test-structured-attrs.nix | 2 +- .../do/doctoc/test-generates-valid-markdown/default.nix | 4 ++-- pkgs/by-name/ha/hare/cross-compilation-tests.nix | 4 ++-- pkgs/by-name/ha/hare/mime-module-test.nix | 4 ++-- 11 files changed, 16 insertions(+), 17 deletions(-) diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index b4fb5d067f0d..b3305e259044 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -235,7 +235,7 @@ runCommand "test.pdf" { nativeBuildInputs = [ latex_with_foiltex ]; } '' The font cache for LuaLaTeX is written to `$HOME`. Therefore, it is necessary to set `$HOME` to a writable path, e.g. [before using LuaLaTeX in nix derivations](https://github.com/NixOS/nixpkgs/issues/180639): ```nix -runCommandNoCC "lualatex-hello-world" { buildInputs = [ texliveFull ]; } '' +runCommand "lualatex-hello-world" { buildInputs = [ texliveFull ]; } '' mkdir $out echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex env HOME=$(mktemp -d) lualatex -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex diff --git a/nixos/tests/acme/http01-builtin.nix b/nixos/tests/acme/http01-builtin.nix index d92737ed6fb1..a82ef6f5652a 100644 --- a/nixos/tests/acme/http01-builtin.nix +++ b/nixos/tests/acme/http01-builtin.nix @@ -126,7 +126,7 @@ in DNS.1 = ${config.networking.fqdn} ''; csrData = - pkgs.runCommandNoCC "csr-and-key" + pkgs.runCommand "csr-and-key" { buildInputs = [ pkgs.openssl ]; } diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index 547de0d1ac8f..1e6b39be7eba 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -4,7 +4,7 @@ let serverDomain = certs.domain; # copy certs to store to work around mount namespacing - certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } '' + certsPath = pkgs.runCommand "snakeoil-certs" { } '' mkdir $out cp ${certs."${serverDomain}".cert} $out/snakeoil.crt cp ${certs."${serverDomain}".key} $out/snakeoil.key diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 9d918f156b2c..78f71fce90c6 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -8,7 +8,7 @@ let }; # copy certs to store to work around mount namespacing - certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } '' + certsPath = pkgs.runCommand "snakeoil-certs" { } '' mkdir $out cp ${certs."${serverDomain}".cert} $out/snakeoil.crt cp ${certs."${serverDomain}".key} $out/snakeoil.key diff --git a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix index 270c268fcbd9..eddc68aa0a54 100644 --- a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix +++ b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix @@ -3,7 +3,7 @@ feature, }: -pkgs.runCommandNoCC "${feature}-not-present" { } '' +pkgs.runCommand "${feature}-not-present" { } '' if [[ -e /${feature}-files ]]; then echo "No ${feature} in requiredSystemFeatures, but /${feature}-files was mounted anyway" exit 1 diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix index 447fd49a300a..c5a13f2a749f 100644 --- a/nixos/tests/nix-required-mounts/test-require-feature.nix +++ b/nixos/tests/nix-required-mounts/test-require-feature.nix @@ -3,7 +3,7 @@ feature, }: -pkgs.runCommandNoCC "${feature}-present" { requiredSystemFeatures = [ feature ]; } '' +pkgs.runCommand "${feature}-present" { requiredSystemFeatures = [ feature ]; } '' if [[ ! -e /${feature}-files ]]; then echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 exit 1 diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix index 86f275330936..9bf29de7fd24 100644 --- a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix +++ b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix @@ -2,7 +2,6 @@ pkgs ? import { }, }: -pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; } - '' - touch $out - '' +pkgs.runCommand "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; } '' + touch $out +'' diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs.nix b/nixos/tests/nix-required-mounts/test-structured-attrs.nix index 874910eee7bb..c0477258d230 100644 --- a/nixos/tests/nix-required-mounts/test-structured-attrs.nix +++ b/nixos/tests/nix-required-mounts/test-structured-attrs.nix @@ -3,7 +3,7 @@ feature, }: -pkgs.runCommandNoCC "${feature}-present-structured" +pkgs.runCommand "${feature}-present-structured" { __structuredAttrs = true; requiredSystemFeatures = [ feature ]; diff --git a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix index d986566bde4f..00dcc3c02424 100644 --- a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix +++ b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix @@ -1,5 +1,5 @@ -{ runCommandNoCC, doctoc }: -runCommandNoCC "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } '' +{ runCommand, doctoc }: +runCommand "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } '' cp ${./input.md} ./target.md && chmod +w ./target.md doctoc ./target.md diff --git a/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/pkgs/by-name/ha/hare/cross-compilation-tests.nix index 45245d730e5b..3e313da6a219 100644 --- a/pkgs/by-name/ha/hare/cross-compilation-tests.nix +++ b/pkgs/by-name/ha/hare/cross-compilation-tests.nix @@ -2,7 +2,7 @@ lib, file, hare, - runCommandNoCC, + runCommand, writeText, }: let @@ -13,7 +13,7 @@ let export fn main() void = void; ''; in -runCommandNoCC "${hare.pname}-cross-compilation-test" +runCommand "${hare.pname}-cross-compilation-test" { nativeBuildInputs = [ hare diff --git a/pkgs/by-name/ha/hare/mime-module-test.nix b/pkgs/by-name/ha/hare/mime-module-test.nix index 073ae09e3557..ef53bee8c3bc 100644 --- a/pkgs/by-name/ha/hare/mime-module-test.nix +++ b/pkgs/by-name/ha/hare/mime-module-test.nix @@ -1,6 +1,6 @@ { hare, - runCommandNoCC, + runCommand, writeText, }: let @@ -18,7 +18,7 @@ let }; ''; in -runCommandNoCC "mime-module-test" { nativeBuildInputs = [ hare ]; } '' +runCommand "mime-module-test" { nativeBuildInputs = [ hare ]; } '' HARECACHE="$(mktemp -d)" export HARECACHE readonly binout="test-bin"