From 51121e661c40c0bdb1e93b57743ac7a806c3f954 Mon Sep 17 00:00:00 2001 From: Heitor Pascoal de Bittencourt Date: Thu, 17 Jul 2025 10:10:54 -0300 Subject: [PATCH 001/126] maintainers: add heitorPB --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 04a1e3c0b6d3..abe6df528b09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9994,6 +9994,12 @@ githubId = 44377258; name = "Heitor Augusto"; }; + heitorPB = { + email = "heitorpbittencourt@gmail.com"; + github = "heitorPB"; + githubId = 13461702; + name = "Heitor Pascoal de Bittencourt"; + }; hekazu = { name = "Henri Peurasaari"; email = "henri.peurasaari@helsinki.fi"; From 3d0a214d1e9818a952f518154959aec772207000 Mon Sep 17 00:00:00 2001 From: Heitor Pascoal de Bittencourt Date: Thu, 7 Aug 2025 14:15:56 -0300 Subject: [PATCH 002/126] tcping-rs: init at 1.2.18 Signed-off-by: Heitor Pascoal de Bittencourt --- pkgs/by-name/tc/tcping-rs/package.nix | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/tc/tcping-rs/package.nix diff --git a/pkgs/by-name/tc/tcping-rs/package.nix b/pkgs/by-name/tc/tcping-rs/package.nix new file mode 100644 index 000000000000..ed6387ea07ff --- /dev/null +++ b/pkgs/by-name/tc/tcping-rs/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "tcping-rs"; + version = "1.2.18"; + + src = fetchFromGitHub { + owner = "lvillis"; + repo = "tcping-rs"; + tag = version; + hash = "sha256-G9LZ9XlIl/JYji/GgznQnIbnV83qi9kZqCkaZJ0kENI="; + }; + + cargoHash = "sha256-INbXvNfn3vmXzZgaDUwl1wgbQ2wVQcCP0ZV2dpZedQY="; + + checkFlags = [ + # This test requires external network access + "--skip=resolve_domain" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TCP Ping (tcping) Utility for Port Reachability"; + homepage = "https://github.com/lvillis/tcping-rs"; + license = lib.licenses.mit; + mainProgram = "tcping"; + maintainers = with lib.maintainers; [ heitorPB ]; + }; +} From bc69e094f26db3a3fddeb8105e3733608ee0c37e Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Mon, 11 Aug 2025 16:09:17 +0200 Subject: [PATCH 003/126] alvr: don't build xtask --- pkgs/by-name/al/alvr/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index b8eb338cca50..cb5406758cc8 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -77,6 +77,11 @@ rustPlatform.buildRustPackage rec { "-Wl,--pop-state" ]; + cargoBuildFlags = [ + "--exclude alvr_xtask" + "--workspace" + ]; + nativeBuildInputs = [ rust-cbindgen pkg-config From 94567c3495ea51cf1d591551c3391175215f0cd0 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 16 Aug 2025 12:00:00 +0000 Subject: [PATCH 004/126] dovecot_fts_xapian: remove I think it was mainly used by simple-nixos-mailserver. simple-nixos-mailserver switched to fts-flatcurve, which is more performant and with more vivid development. --- .../by-name/do/dovecot_fts_xapian/package.nix | 56 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/by-name/do/dovecot_fts_xapian/package.nix diff --git a/pkgs/by-name/do/dovecot_fts_xapian/package.nix b/pkgs/by-name/do/dovecot_fts_xapian/package.nix deleted file mode 100644 index 6b0f6e5afbd7..000000000000 --- a/pkgs/by-name/do/dovecot_fts_xapian/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - sqlite, - pkg-config, - dovecot, - xapian, - icu, -}: - -stdenv.mkDerivation rec { - pname = "dovecot-fts-xapian"; - version = "1.9"; - - src = fetchFromGitHub { - owner = "grosjo"; - repo = "fts-xapian"; - rev = version; - hash = "sha256-jHXeCJVdRWGdLMooh5cq5ZeZPM5fDo1lO6U5VMcwf3g="; - }; - - buildInputs = [ - xapian - icu - sqlite - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - preConfigure = '' - export PANDOC=false - ''; - - configureFlags = [ - "--with-dovecot=${dovecot}/lib/dovecot" - "--with-moduledir=${placeholder "out"}/lib/dovecot/modules" - ]; - - meta = with lib; { - homepage = "https://github.com/grosjo/fts-xapian"; - description = "Dovecot FTS plugin based on Xapian"; - changelog = "https://github.com/grosjo/fts-xapian/releases"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ - julm - symphorien - ]; - platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/dovecot_fts_xapian.x86_64-darwin - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6c16ca998d68..c919384179f6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -582,6 +582,7 @@ mapAliases { dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11 + dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16 downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25 dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30 dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21 From 05d1ce858b12b15b7a0f6ec896ffdaa36fa508fb Mon Sep 17 00:00:00 2001 From: detroyejr Date: Fri, 29 Aug 2025 08:56:42 -0400 Subject: [PATCH 005/126] plex-htpc: init at 1.71.1 --- pkgs/by-name/pl/plex-htpc/package.nix | 166 ++++++++++++++++++++++++++ pkgs/by-name/pl/plex-htpc/update.sh | 71 +++++++++++ 2 files changed, 237 insertions(+) create mode 100644 pkgs/by-name/pl/plex-htpc/package.nix create mode 100755 pkgs/by-name/pl/plex-htpc/update.sh diff --git a/pkgs/by-name/pl/plex-htpc/package.nix b/pkgs/by-name/pl/plex-htpc/package.nix new file mode 100644 index 000000000000..9c7332c7c405 --- /dev/null +++ b/pkgs/by-name/pl/plex-htpc/package.nix @@ -0,0 +1,166 @@ +{ + alsa-lib, + autoPatchelfHook, + buildFHSEnv, + elfutils, + extraEnv ? { }, + fetchurl, + ffmpeg_6-headless, + lib, + libdrm, + libgbm, + libpulseaudio, + libva, + libxkbcommon, + libxml2_13, + makeShellWrapper, + minizip, + nss, + squashfsTools, + stdenv, + writeShellScript, + xkeyboard_config, + xorg, +}: +let + pname = "plex-htpc"; + version = "1.71.1"; + rev = "73"; + meta = { + homepage = "https://plex.tv/"; + description = "Plex HTPC client for the big screen"; + longDescription = '' + Plex HTPC for Linux is your client for playing on your Linux computer + connected to the big screen. It features a 10-foot interface with a + powerful playback engine. + ''; + maintainers = with lib.maintainers; [ detroyejr ]; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + mainProgram = "plex-htpc"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + plex-htpc = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://api.snapcraft.io/api/v1/snaps/download/81OP06hEXlwmMrpMAhe5hyLy5bQ9q6Kz_${rev}.snap"; + hash = "sha512-n9pXRx8s6AwhIJm7PmUIOB8pXqzyNFzdmwJMonQ4WzWvA5tPI27x0slQ6WUxRBQJoLScGckyGAFxIGWRylNr3g=="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeShellWrapper + squashfsTools + ]; + + buildInputs = [ + elfutils + ffmpeg_6-headless + libgbm + libpulseaudio + libva + libxkbcommon + libxml2_13 + minizip + nss + stdenv.cc.cc + xorg.libXcomposite + xorg.libXdamage + xorg.libXinerama + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxshmfence + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + xorg.xrandr + ]; + + strictDeps = true; + + unpackPhase = '' + runHook preUnpack + unsquashfs "$src" + cd squashfs-root + runHook postUnpack + ''; + + dontStrip = true; + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + cp -r . $out + rm -r $out/etc + rm -r $out/usr + + # flatpak removes these during installation. + rm -r $out/lib/dri + rm $out/lib/libpciaccess.so* + rm $out/lib/libswresample.so* + rm $out/lib/libva-*.so* + rm $out/lib/libva.so* + rm $out/lib/libEGL.so* + rm $out/lib/libdrm.so* + rm $out/lib/libdrm* + + # Keep some dependencies from the snap. + cp usr/lib/x86_64-linux-gnu/liblcms2.so.2 $out/lib/liblcms2.so.2 + cp usr/lib/x86_64-linux-gnu/libjbig.so.0 $out/lib/libjbig.so.0 + cp usr/lib/x86_64-linux-gnu/libjpeg.so.8 $out/lib/libjpeg.so.8 + cp usr/lib/x86_64-linux-gnu/libpci.so.3 $out/lib/libpci.so.3 + cp usr/lib/x86_64-linux-gnu/libsnappy.so.1 $out/lib/libsnappy.so.1 + cp usr/lib/x86_64-linux-gnu/libtiff.so.5 $out/lib/libtiff.so.5 + cp usr/lib/x86_64-linux-gnu/libwebp.so.6 $out/lib/libwebp.so.6 + cp usr/lib/x86_64-linux-gnu/libxkbfile.so.1 $out/lib/libxkbfile.so.1 + cp usr/lib/x86_64-linux-gnu/libxslt.so.1 $out/lib/libxslt.so.1 + + runHook postInstall + ''; + }; +in +buildFHSEnv { + inherit pname version meta; + targetPkgs = pkgs: [ + alsa-lib + libdrm + xkeyboard_config + ]; + + extraInstallCommands = '' + mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps + install -m 444 -D ${plex-htpc}/meta/gui/plex-htpc.desktop $out/share/applications/plex-htpc.desktop + substituteInPlace $out/share/applications/plex-htpc.desktop \ + --replace-fail \ + 'Icon=''${SNAP}/meta/gui/icon.png' \ + 'Icon=${plex-htpc}/meta/gui/icon.png' + ''; + + runScript = writeShellScript "plex-htpc.sh" '' + # Widevine won't download unless this directory exists. + mkdir -p $HOME/.cache/plex/ + + # Copy the sqlite plugin database on first run. + PLEX_DB="$HOME/.local/share/plex/Plex Media Server/Plug-in Support/Databases" + if [[ ! -d "$PLEX_DB" ]]; then + mkdir -p "$PLEX_DB" + cp "${plex-htpc}/resources/com.plexapp.plugins.library.db" "$PLEX_DB" + fi + + # db files should have write access. + chmod --recursive 750 "$PLEX_DB" + + # These environment variables sometimes silently cause plex to crash. + unset QT_QPA_PLATFORM QT_STYLE_OVERRIDE + + set -o allexport + ${lib.toShellVars extraEnv} + set +o allexport + exec ${plex-htpc}/Plex.sh + ''; + passthru.updateScript = ./update.sh; +} diff --git a/pkgs/by-name/pl/plex-htpc/update.sh b/pkgs/by-name/pl/plex-htpc/update.sh new file mode 100755 index 000000000000..687e7e3fd715 --- /dev/null +++ b/pkgs/by-name/pl/plex-htpc/update.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq git gnused gnugrep + + +# executing this script without arguments will +# - find the newest stable plex-htpc version avaiable on snapcraft (https://snapcraft.io/plex-htpc) +# - read the current plex-htpc version from the current nix expression +# - update the nix expression if the versions differ +# - try to build the updated version, exit if that fails +# - give instructions for upstreaming + +# As an optional argument you can specify the snapcraft channel to update to. +# Default is `stable` and only stable updates should be pushed to nixpkgs. For +# testing you may specify `candidate` or `edge`. + + +channel="${1:-stable}" # stable/candidate/edge +nixpkgs="$(git rev-parse --show-toplevel)" +plex_nix="$nixpkgs/pkgs/by-name/pl/plex-htpc/package.nix" + + +# +# find the newest stable plex-htpc version avaiable on snapcraft +# + +# create bash array from snap info +snap_info=($( + curl -s -H 'X-Ubuntu-Series: 16' \ + "https://api.snapcraft.io/api/v1/snaps/details/plex-htpc?channel=$channel" \ + | jq --raw-output \ + '.revision,.download_sha512,.version,.last_updated' +)) + +# "revision" is the actual version identifier on snapcraft, the "version" is +# just for human consumption. Revision is just an integer that gets increased +# by one every (stable or unstable) release. +revision="${snap_info[0]}" +# We need to escape the slashes +hash="$(nix-hash --to-sri --type sha512 ${snap_info[1]} | sed 's|/|\\/|g')" +upstream_version="${snap_info[2]}" +last_updated="${snap_info[3]}" +echo "Latest $channel release is $upstream_version from $last_updated." +# +# read the current plex-htpc version from the currently *committed* nix expression +# + +current_version=$( + grep 'version\s*=' "$plex_nix" \ + | sed -Ene 's/.*"(.*)".*/\1/p' +) + +echo "Current version: $current_version" + +# +# update the nix expression if the versions differ +# + +if [[ "$current_version" == "$upstream_version" ]]; then + echo "Plex is already up-to-date" + exit 0 +fi + +echo "Updating from ${current_version} to ${upstream_version}, released on ${last_updated}" + +# search-and-replace revision, hash and version +sed --regexp-extended \ + -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ + -e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${hash}"'";/' \ + -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ + -i "$plex_nix" + From e30106c7f831b14315655240dc1bbec03285d843 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Mon, 1 Sep 2025 23:57:23 -0700 Subject: [PATCH 006/126] metee: init at 6.0.1 --- pkgs/by-name/me/metee/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/me/metee/package.nix diff --git a/pkgs/by-name/me/metee/package.nix b/pkgs/by-name/me/metee/package.nix new file mode 100644 index 000000000000..4c4da94e18d3 --- /dev/null +++ b/pkgs/by-name/me/metee/package.nix @@ -0,0 +1,30 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + stdenv, + cmake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "metee"; + version = "6.0.1"; + src = fetchFromGitHub { + owner = "intel"; + repo = "metee"; + tag = finalAttrs.version; + hash = "sha256-PwIadjg1D7WumqVgkpfnXkdUzIOjzA+b3Jjk30epAE8="; + }; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + maintainers = with lib.maintainers; [ xddxdd ]; + description = "C library to access CSE/CSME/GSC firmware via a MEI interface"; + homepage = "https://github.com/intel/metee"; + license = lib.licenses.asl20; + changelog = "https://github.com/intel/metee/releases/tag/${finalAttrs.version}"; + platforms = lib.platforms.linux; + }; +}) From 567702bb43bd4b62b54e498feb709c5e69e83eea Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Mon, 1 Sep 2025 23:57:35 -0700 Subject: [PATCH 007/126] igsc: init at 0.9.6 --- pkgs/by-name/ig/igsc/package.nix | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/ig/igsc/package.nix diff --git a/pkgs/by-name/ig/igsc/package.nix b/pkgs/by-name/ig/igsc/package.nix new file mode 100644 index 000000000000..aa5281d62be5 --- /dev/null +++ b/pkgs/by-name/ig/igsc/package.nix @@ -0,0 +1,42 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + stdenv, + cmake, + metee, + udev, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "igsc"; + version = "0.9.6"; + src = fetchFromGitHub { + owner = "intel"; + repo = "igsc"; + tag = "V${finalAttrs.version}"; + hash = "sha256-ecjcDYirbJC2s48+SOwFuJAJQ6eaabTrmgTjgb+dXrA="; + }; + + buildInputs = [ + metee + udev + ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DMETEE_LIB_PATH=${metee}/lib" + "-DMETEE_HEADER_PATH=${metee}/include" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "igsc"; + maintainers = with lib.maintainers; [ xddxdd ]; + description = "Intel graphics system controller firmware update library"; + homepage = "https://github.com/intel/igsc"; + license = lib.licenses.asl20; + changelog = "https://github.com/intel/igsc/releases/tag/V${finalAttrs.version}"; + platforms = lib.platforms.linux; + }; +}) From 6b9fb3a556c15bf99f2d56e664c997b87aa5309c Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 3 Sep 2025 15:43:22 +0800 Subject: [PATCH 008/126] mumps: 5.8.0 -> 5.8.1 --- pkgs/by-name/mu/mumps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index ade9a4611cc6..748ba7ca4913 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -48,7 +48,7 @@ let in stdenv.mkDerivation (finalAttrs: { name = "mumps"; - version = "5.8.0"; + version = "5.8.1"; # makeFlags contain space and one should use makeFlagsArray+ # Setting this magic var is an optional solution __structuredAttrs = true; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchzip { url = "https://mumps-solver.org/MUMPS_${finalAttrs.version}.tar.gz"; - hash = "sha256-opJW7+Z/YhyUFwYTTTuWZuykz8Z4do6/XTBThHyTVCs="; + hash = "sha256-60hNYhbHONv9E9VY8G0goE83q7AwJh1u/Z+QRK8anHQ="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From ff447bfe52bd983ff423b59b85a02215872375d3 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 2 Sep 2025 07:21:55 +0800 Subject: [PATCH 009/126] netgen: 6.2.2504 -> 6.2.2505 Diff: https://github.com/NGSolve/netgen/compare/v6.2.2504...v6.2.2505 --- pkgs/by-name/ne/netgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index 045090cff4db..4f0eea1fd4b3 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "netgen"; - version = "6.2.2504"; + version = "6.2.2505"; src = fetchFromGitHub { owner = "ngsolve"; repo = "netgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-N4mmh2H2qvc+3Pa9CHm38arViI76Qvwp8fOVGZbMv1M="; + hash = "sha256-MPnibhDzNjqmpW5C76KdeYoZGfKLU0KJ20EnjrK1S+Y="; }; patches = [ From c22962c6ef63014aa9172b13e1af0ea7f64ac5c5 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 2 Sep 2025 07:08:15 +0800 Subject: [PATCH 010/126] netgen: move python3Packages.pybind11 to buildInputs --- pkgs/by-name/ne/netgen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index 4f0eea1fd4b3..b8fab0397f30 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -114,11 +114,11 @@ stdenv.mkDerivation (finalAttrs: { libjpeg ffmpeg mpi + python3Packages.pybind11 ]; propagatedBuildInputs = with python3Packages; [ packaging - pybind11 mpi4py numpy ]; From 1eb27fa2ecf65a5d773b2ad80e43cf23fde658c0 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Thu, 19 Jun 2025 20:07:43 +0300 Subject: [PATCH 011/126] maintainers: add qweered --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 05c8f2ccd16b..b614169bf63a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21052,6 +21052,13 @@ githubId = 2141853; name = "Bang Lee"; }; + qweered = { + email = "grubian2@gmail.com"; + github = "qweered"; + githubId = 41731334; + name = "Aliaksandr Samatyia"; + keys = [ { fingerprint = "4D3C 1993 340D 0ACE F6AF 1903 CACB 28BA 93CE 71A2"; } ]; + }; qxrein = { email = "mnv07@proton.me"; github = "qxrein"; From 507dc27677763d72b70fa793b7347915901c27bf Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Thu, 19 Jun 2025 20:08:03 +0300 Subject: [PATCH 012/126] kmidimon: init at 1.4.1 --- pkgs/by-name/km/kmidimon/package.nix | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/km/kmidimon/package.nix diff --git a/pkgs/by-name/km/kmidimon/package.nix b/pkgs/by-name/km/kmidimon/package.nix new file mode 100644 index 000000000000..d395e51eac94 --- /dev/null +++ b/pkgs/by-name/km/kmidimon/package.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromGitHub, + stdenv, + nix-update-script, + qt6, + qt6Packages, + cmake, + alsa-lib, + pandoc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kmidimon"; + version = "1.4.1"; + src = fetchFromGitHub { + owner = "pedrolcl"; + repo = "kmidimon"; + tag = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-cITRv/k7NJvTPJYNjDXb21ctr69ThIJppmBwrmj7O74="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + pandoc + ]; + + buildInputs = [ + qt6.qtbase + qt6.qttools + qt6.qt5compat + qt6Packages.drumstick + alsa-lib + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Drumstick MIDI Monitor"; + longDescription = '' + Drumstick MIDI Monitor logs MIDI events coming from MIDI external ports or + applications via the ALSA sequencer, and from SMF (Standard MIDI files) or + WRK (Cakewalk/Sonar) files. It is especially useful for debugging MIDI + software or your MIDI setup. + ''; + homepage = "https://github.com/pedrolcl/kmidimon"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qweered ]; + platforms = lib.platforms.linux; + }; +}) From 73b7ed27858817531fc9270acf1f740eac75dce1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Sep 2025 00:46:12 +0000 Subject: [PATCH 013/126] monetdb: 11.53.9 -> 11.53.13 --- pkgs/by-name/mo/monetdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monetdb/package.nix b/pkgs/by-name/mo/monetdb/package.nix index c7345d8c50c3..7f9bc8a0f0ff 100644 --- a/pkgs/by-name/mo/monetdb/package.nix +++ b/pkgs/by-name/mo/monetdb/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.53.9"; + version = "11.53.13"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-qltKYPEWU5w3SIJumxunUTwC//egn7UtvmcFL+bxIUk="; + hash = "sha256-CTTLztClNXLFAFo0xsMqSb+FSbkEx+1E2+j/ljfME2A="; }; nativeBuildInputs = [ From 026eb0d2518ca1d2150e7e99e86ab6dcf4128928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Sep 2025 19:18:39 +0200 Subject: [PATCH 014/126] opencl-clang: adopt, remove darwin from platforms Darwin was broken for a long time and I do not plan to support it in the future. --- pkgs/by-name/op/opencl-clang/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/op/opencl-clang/package.nix b/pkgs/by-name/op/opencl-clang/package.nix index 3b9157221eca..265d1c38d8dc 100644 --- a/pkgs/by-name/op/opencl-clang/package.nix +++ b/pkgs/by-name/op/opencl-clang/package.nix @@ -75,12 +75,6 @@ let # fix not be able to find clang from PATH substituteInPlace cl_headers/CMakeLists.txt \ --replace-fail " NO_DEFAULT_PATH" "" - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Uses linker flags that are not supported on Darwin. - sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt - substituteInPlace CMakeLists.txt \ - --replace-fail '-Wl,--no-undefined' "" ''; }; in @@ -111,13 +105,11 @@ stdenv.mkDerivation { inherit passthru; - meta = with lib; { + meta = { homepage = "https://github.com/intel/opencl-clang/"; description = "Clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; - license = licenses.ncsa; - maintainers = [ ]; - platforms = platforms.all; - # error: invalid value 'CL3.0' in '-cl-std=CL3.0' - broken = stdenv.hostPlatform.isDarwin; + license = lib.licenses.ncsa; + maintainers = [ lib.maintainers.SuperSandro2000 ]; + platforms = lib.platforms.linux; }; } From efb759a13385eae3f26223769a2dde0b56d227c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Sep 2025 20:55:40 +0000 Subject: [PATCH 015/126] c3c: 0.7.4 -> 0.7.5 --- pkgs/by-name/c3/c3c/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 7300e0a4079c..b94a8e079d3b 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -19,13 +19,13 @@ in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c${optionalString debug "-debug"}"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-LIwav9ZvNRn4tGh+MGEhimSIKROU3H+R1pc3oyGDb18="; + hash = "sha256-o95Y5CYPITjn8KjxIZlBtwc6FfvZo2m5atR1Fyh9w+c="; }; cmakeBuildType = if debug then "Debug" else "Release"; From f146a418e659abfe76c0b445cf10c62ac1030e4e Mon Sep 17 00:00:00 2001 From: amesgen Date: Mon, 31 Mar 2025 13:02:05 +0200 Subject: [PATCH 016/126] cddlc: init at 0.4.2 --- pkgs/by-name/cd/cddlc/Gemfile | 2 ++ pkgs/by-name/cd/cddlc/Gemfile.lock | 19 ++++++++++++ pkgs/by-name/cd/cddlc/gemset.nix | 47 ++++++++++++++++++++++++++++++ pkgs/by-name/cd/cddlc/package.nix | 24 +++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 pkgs/by-name/cd/cddlc/Gemfile create mode 100644 pkgs/by-name/cd/cddlc/Gemfile.lock create mode 100644 pkgs/by-name/cd/cddlc/gemset.nix create mode 100644 pkgs/by-name/cd/cddlc/package.nix diff --git a/pkgs/by-name/cd/cddlc/Gemfile b/pkgs/by-name/cd/cddlc/Gemfile new file mode 100644 index 000000000000..3cc0760bb2fc --- /dev/null +++ b/pkgs/by-name/cd/cddlc/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cddlc' diff --git a/pkgs/by-name/cd/cddlc/Gemfile.lock b/pkgs/by-name/cd/cddlc/Gemfile.lock new file mode 100644 index 000000000000..c3555056711f --- /dev/null +++ b/pkgs/by-name/cd/cddlc/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + cddlc (0.4.2) + neatjson (~> 0.10) + treetop (~> 1) + neatjson (0.10.5) + polyglot (0.3.5) + treetop (1.6.14) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + cddlc + +BUNDLED WITH + 2.6.9 diff --git a/pkgs/by-name/cd/cddlc/gemset.nix b/pkgs/by-name/cd/cddlc/gemset.nix new file mode 100644 index 000000000000..997b4c7cabcf --- /dev/null +++ b/pkgs/by-name/cd/cddlc/gemset.nix @@ -0,0 +1,47 @@ +{ + cddlc = { + dependencies = [ + "neatjson" + "treetop" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1s3fbgd5yqgji162zsmlwnva1v1r3zc1qiyv6im7karv5f08r8m3"; + type = "gem"; + }; + version = "0.4.2"; + }; + neatjson = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s"; + type = "gem"; + }; + version = "0.10.5"; + }; + polyglot = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + treetop = { + dependencies = [ "polyglot" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds"; + type = "gem"; + }; + version = "1.6.14"; + }; +} diff --git a/pkgs/by-name/cd/cddlc/package.nix b/pkgs/by-name/cd/cddlc/package.nix new file mode 100644 index 000000000000..e0054ba22ad6 --- /dev/null +++ b/pkgs/by-name/cd/cddlc/package.nix @@ -0,0 +1,24 @@ +{ + lib, + bundlerApp, + bundlerUpdateScript, +}: + +bundlerApp { + pname = "cddlc"; + + gemdir = ./.; + + exes = [ "cddlc" ]; + + passthru.updateScript = bundlerUpdateScript "cddlc"; + + meta = { + description = "CDDL conversion utilities"; + homepage = "https://github.com/cabo/cddlc"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amesgen ]; + platforms = lib.platforms.unix; + mainProgram = "cddlc"; + }; +} From 3090213d52ff4ed63c11ffdd8ae80f2a79c4b459 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Wed, 23 Jul 2025 22:47:58 +1000 Subject: [PATCH 017/126] assetripper: init at 1.3.0 Co-authored-by: diadatp --- pkgs/by-name/as/assetripper/deps.json | 527 ++++++++++++++++++++++++ pkgs/by-name/as/assetripper/package.nix | 87 ++++ 2 files changed, 614 insertions(+) create mode 100644 pkgs/by-name/as/assetripper/deps.json create mode 100644 pkgs/by-name/as/assetripper/package.nix diff --git a/pkgs/by-name/as/assetripper/deps.json b/pkgs/by-name/as/assetripper/deps.json new file mode 100644 index 000000000000..09fcf35dc972 --- /dev/null +++ b/pkgs/by-name/as/assetripper/deps.json @@ -0,0 +1,527 @@ +[ + { + "pname": "AsmResolver", + "version": "6.0.0-beta.3", + "hash": "sha256-hZfhHUMesxRo7Ek0kwKBOQ7+2+WkkFhavEk4stK4Ku0=" + }, + { + "pname": "AsmResolver.DotNet", + "version": "6.0.0-beta.3", + "hash": "sha256-x9BE2dfeACzOUtwrrzFJARMbt6yYREtSQYmdeqJIdJo=" + }, + { + "pname": "AsmResolver.PE", + "version": "6.0.0-beta.3", + "hash": "sha256-//cJkU4+PCAlBcSDeLjwWVkPJBQT1XzHx65uzrEPJR8=" + }, + { + "pname": "AsmResolver.PE.File", + "version": "6.0.0-beta.3", + "hash": "sha256-YzOcIBeILNSn8XATTC9j+0vgFXi6j4t/CQngOK/ZrnA=" + }, + { + "pname": "AssetRipper.Checksum", + "version": "1.0.0", + "hash": "sha256-/RUgkXYya3tpl7NAEbfMoTpw8UJQodSEs0j3l4iO5t4=" + }, + { + "pname": "AssetRipper.CIL", + "version": "1.1.6", + "hash": "sha256-dDiXWd3AtOWlaxFC1+xdw1MkmIGat2/CuH1oTZBF/RA=" + }, + { + "pname": "AssetRipper.Conversions.FastPng", + "version": "1.0.0", + "hash": "sha256-tcMBR4jo61eqEQSiZSFjtsfIku9KOTEgkZnVXD5WX7s=" + }, + { + "pname": "AssetRipper.Gee.External.Capstone", + "version": "2.3.2", + "hash": "sha256-IrcwjWUR0hAO2dmDVIFCd82pJYnpnrRrUMd8Z0dcVjk=" + }, + { + "pname": "AssetRipper.GUI.Web.Dependencies", + "version": "1.0.0", + "hash": "sha256-vRaU7qR5u2TKk1RdP4ZyTbe+/rJ02ffeC8YkqMp+W4E=" + }, + { + "pname": "AssetRipper.HashAlgorithms", + "version": "1.0.0", + "hash": "sha256-z2ryExCXJymw2UsdZxKseYPWQWg5aJe9surz5QABof4=" + }, + { + "pname": "AssetRipper.ICSharpCode.Decompiler", + "version": "9.1.0.8017", + "hash": "sha256-2OC9esZJ2hbeEcWJte0aAYdvykxwzGVF2IB1hV0BcMg=" + }, + { + "pname": "AssetRipper.IO.Endian", + "version": "2.0.2", + "hash": "sha256-/oxfkQpCaERReRha+2fkPQaW9JNAyJdiujp1326Pcmw=" + }, + { + "pname": "AssetRipper.Mining.PredefinedAssets", + "version": "1.5.0", + "hash": "sha256-c1Ru75IKNz/TTYrgMvA0JBW25fNmDsWDxx0bWwrOKco=" + }, + { + "pname": "AssetRipper.NativeDialogs", + "version": "1.0.0", + "hash": "sha256-RwrdAQpmZZII5jugbfCDd/sNqy3ozJ6dqWunuHApkuo=" + }, + { + "pname": "AssetRipper.Primitives", + "version": "3.1.3", + "hash": "sha256-17RT4wzgcZwzWjS92fX9lsZk91BKxEM8/kHc5aG/WU0=" + }, + { + "pname": "AssetRipper.Primitives", + "version": "3.1.6", + "hash": "sha256-0RJAOo3bP8o5pxLvJd7TVTLZqkHg+/PqvN0IF2EyRPY=" + }, + { + "pname": "AssetRipper.Primitives", + "version": "3.2.0", + "hash": "sha256-CoWcgLFJ9hIH09vDfTvrtN6dz9CzBOrXkC2kwj+ebGc=" + }, + { + "pname": "AssetRipper.SharpGLTF.Core", + "version": "1.0.2", + "hash": "sha256-WZgPF8/KMTIML3dYeePGGSap3j2RxWTegteKUrrOmas=" + }, + { + "pname": "AssetRipper.SharpGLTF.Runtime", + "version": "1.0.2", + "hash": "sha256-i3EdcJig488wNOlS2my+iGQMuc2+gm/EYmTZ1Ju7iR4=" + }, + { + "pname": "AssetRipper.SharpGLTF.Toolkit", + "version": "1.0.2", + "hash": "sha256-5cn9qRZNl+lAjG2NTZ0KoMnsuCUhlI8bctqzB3vT4UE=" + }, + { + "pname": "AssetRipper.SourceGenerated", + "version": "1.2.5", + "hash": "sha256-sYOnCL+63F8LVLONtxC9Wcu5erFqkms95FM2QwphEck=" + }, + { + "pname": "AssetRipper.Text.Html", + "version": "2.1.0", + "hash": "sha256-SW5BW3FT8Rt0zR6JNtKLfzjc5kl2fJpBs2PuWP3gBWY=" + }, + { + "pname": "AssetRipper.Text.SourceGeneration", + "version": "1.2.2", + "hash": "sha256-CsJuv8agq57DsjChX5CC9gyhnr0hwNpCdeCxxu62w48=" + }, + { + "pname": "AssetRipper.TextureDecoder", + "version": "2.3.0", + "hash": "sha256-P+McipTHztjmibwO4kOsqGs5u6o+15k52r35tq80oNQ=" + }, + { + "pname": "AssetRipper.Tpk", + "version": "1.1.0", + "hash": "sha256-1FJI8HbeJsXc77+uQngG3LJJQt7LshTKoYwtnQ+gyoc=" + }, + { + "pname": "AtkSharp", + "version": "3.24.24.117-develop", + "hash": "sha256-ubAzPecV3tV9h2OUUqiJw8OqPzg+iHQ1LBMZ7sU/mJo=" + }, + { + "pname": "CairoSharp", + "version": "3.24.24.117-develop", + "hash": "sha256-3dTmn3TpcDxEqTsvPdA8ueMYzK0IR5Z/vUR6xPCEnYE=" + }, + { + "pname": "Disarm", + "version": "2022.1.0-master.57", + "hash": "sha256-KtLpcS+n+HVkHc/CKBoyx+PWKpxkkVvtsqf002KSbPI=", + "url": "https://nuget.samboy.dev/v3/package/disarm/2022.1.0-master.57/disarm.2022.1.0-master.57.nupkg" + }, + { + "pname": "DXDecompiler-ly", + "version": "0.0.1", + "hash": "sha256-R8Nyy60qOPru3SH5mPGNL1/tUKwqbxNq2QqbveoYznc=" + }, + { + "pname": "Fmod5Sharp", + "version": "3.0.1", + "hash": "sha256-Od9D7s20ONwuD1V6ZUCKkCyLR57pX8GRDuDs5oZzc+I=" + }, + { + "pname": "GdkSharp", + "version": "3.24.24.117-develop", + "hash": "sha256-6pW0Pj5jJXiyQfqPKIu0klrViMqKf+pRk++a4chIaxA=" + }, + { + "pname": "GioSharp", + "version": "3.24.24.117-develop", + "hash": "sha256-CLW912aVbiFjcWS8g36fEx+4HfOB7nAlhK1sVaPZSCM=" + }, + { + "pname": "GLibSharp", + "version": "3.24.24.117-develop", + "hash": "sha256-aJC9OOXB6qV/vjCarQn4DC/jxAuyV2cTclFjB3oguMk=" + }, + { + "pname": "GtkSharp", + "version": "3.24.24.117-develop", + "hash": "sha256-CgNVKW81n8MdVy481nYVY6KApDzlhEzxILSKkNLe5pg=" + }, + { + "pname": "Iced", + "version": "1.21.0", + "hash": "sha256-0xYTYX4935Ejm7yUqMWHhJtCNuj4oqK6Weojl6FIfHo=" + }, + { + "pname": "IndexRange", + "version": "1.0.2", + "hash": "sha256-bsoOY0HLG+nsjdeA3XiTOq0NSvXIz/xasFdSMe6svWQ=" + }, + { + "pname": "K4os.Compression.LZ4", + "version": "1.3.8", + "hash": "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA=" + }, + { + "pname": "Kyaru.Texture2DDecoder", + "version": "0.17.0", + "hash": "sha256-8eHFAZ8Y00C9g4ZmUTxYrgqIr4gxMwTM7vtxER8w29g=" + }, + { + "pname": "Kyaru.Texture2DDecoder.Linux", + "version": "0.1.0", + "hash": "sha256-Wrk4NnAGx3E/3zRn03822Zzfcuyx7U4+54NbAe7Mc58=" + }, + { + "pname": "Kyaru.Texture2DDecoder.macOS", + "version": "0.1.0", + "hash": "sha256-BjioRXZSKONx5A1v7HAQtYzhVpMHCzfsi6XvyxLdO0s=" + }, + { + "pname": "Kyaru.Texture2DDecoder.Windows", + "version": "0.1.0", + "hash": "sha256-I4Huq7yZFFVX+9lAebuKf88LVj+oKQB5AetnwalEhlA=" + }, + { + "pname": "Microsoft.AspNetCore.OpenApi", + "version": "9.0.6", + "hash": "sha256-Kk1WNf1BS+9LjjXjBrYb1YCr+23W9PJ+B9Kv2OBv2Oc=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "9.0.6", + "hash": "sha256-+7YVB4UIGrvWzDkW5boLTC+6l2s96Jh1p0NeT95bb9Y=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "4.14.0", + "hash": "sha256-zmTSI77qeBKTmb0m79mbVaW3/94t7AWPO1A2Tchowng=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.14.0", + "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.14.0", + "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY=" + }, + { + "pname": "Microsoft.Extensions.ApiDescription.Server", + "version": "8.0.0", + "hash": "sha256-GceEAtCVtm8xUHjR6obQ6bBJMOf+9d9OQ1iVr48sQbg=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.OpenApi", + "version": "1.6.17", + "hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk=" + }, + { + "pname": "Microsoft.OpenApi", + "version": "1.6.23", + "hash": "sha256-YD2oxM/tlNpK5xUeHF85xdqcpBzHioUSyRjpN2A7KcY=" + }, + { + "pname": "Microsoft.OpenApi", + "version": "1.6.24", + "hash": "sha256-26sypyWk/38Xz6nlFQ1eYQeLM/k4kGyNiLazgyPyuJQ=" + }, + { + "pname": "NAudio.Core", + "version": "2.0.0", + "hash": "sha256-rD5ubdSgpufNjNyCerO0N5Gg2brUMhjEOL5qaNwFhBM=" + }, + { + "pname": "NAudio.Core", + "version": "2.1.0", + "hash": "sha256-cVfdq9B7wwojGiTOOrcnweQyI9q7U9+uDirqjisWrd8=" + }, + { + "pname": "NAudio.Core", + "version": "2.2.1", + "hash": "sha256-eUZF2/0w5IgGY9UtnZIk1VwwH6VCKP9iPJXVcseIc0c=" + }, + { + "pname": "NAudio.Vorbis", + "version": "1.5.0", + "hash": "sha256-FX5EHVRLcWfjY+/NhkUf33fMFrTcPG3Ztm5ptmu1caw=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "NVorbis", + "version": "0.10.4", + "hash": "sha256-6ZouAJWaNge6DFnLHDr35uf4vs6Kf12RPp4ahuEejlA=" + }, + { + "pname": "OggVorbisEncoder", + "version": "1.2.0", + "hash": "sha256-5UhHf3JJUTG968Bst/cLR30qMTe1AntntDIv8w1IkFY=" + }, + { + "pname": "Ookii.CommandLine", + "version": "5.0.0", + "hash": "sha256-9iSS/YaB+rwChSn0PLUZXiBWDqJ4GyjnETwmemNG8b8=" + }, + { + "pname": "Ookii.Common", + "version": "1.0.0", + "hash": "sha256-u8J6JSAOp2gJBsmu9ZjiSgipoXOVpseqtYf38tlnN3g=" + }, + { + "pname": "oqo0.SwaggerThemes", + "version": "1.4.3", + "hash": "sha256-KiOTY0s0J4K9hbQ7pSvgNeb9j6h0lbI9sHQxlNSMIqY=" + }, + { + "pname": "PangoSharp", + "version": "3.24.24.117-develop", + "hash": "sha256-G+UgcJKurjnR3kGfHB6SFZ7ujz1+5/+yN8jUYQ7jpgM=" + }, + { + "pname": "PolySharp", + "version": "1.15.0", + "hash": "sha256-nH/UOZW4X93FUELaDteMvEEWofX4vii4e59jOqx9JTg=" + }, + { + "pname": "Samboy063.Cpp2IL.Core", + "version": "2022.1.0-development.1356", + "hash": "sha256-fGf4BItKAA5wxqnHeipLAc9Tezsb6m0dtGcnXMcnYdM=", + "url": "https://nuget.samboy.dev/v3/package/samboy063.cpp2il.core/2022.1.0-development.1356/samboy063.cpp2il.core.2022.1.0-development.1356.nupkg" + }, + { + "pname": "Samboy063.LibCpp2IL", + "version": "2022.1.0-development.1356", + "hash": "sha256-F8SN2ooYcE+rAya645I166xqZeC5XsqGo8OiYnAkBH8=", + "url": "https://nuget.samboy.dev/v3/package/samboy063.libcpp2il/2022.1.0-development.1356/samboy063.libcpp2il.2022.1.0-development.1356.nupkg" + }, + { + "pname": "Samboy063.WasmDisassembler", + "version": "2022.1.0-development.1356", + "hash": "sha256-w2fMnjPYikPEveS9lPwiTHlOazN2w3IlP5EnLyp+Ln0=", + "url": "https://nuget.samboy.dev/v3/package/samboy063.wasmdisassembler/2022.1.0-development.1356/samboy063.wasmdisassembler.2022.1.0-development.1356.nupkg" + }, + { + "pname": "SharpCompress", + "version": "0.38.0", + "hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM=" + }, + { + "pname": "SharpCompress", + "version": "0.40.0", + "hash": "sha256-pxz5ef//xOUClwuyflO0eLAfUItFcwfq74Cf0Hj5c1E=" + }, + { + "pname": "SharpZipLib", + "version": "1.4.2", + "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" + }, + { + "pname": "SourceGenerator.Foundations", + "version": "2.0.13", + "hash": "sha256-duI1IaumXBKE7xY/YoNqJWXLF96OznZT5IF79ox1s64=" + }, + { + "pname": "StableNameDotNet", + "version": "0.1.0-development.1356", + "hash": "sha256-BsH+CwpStediIOeM+b79PZzZWJQnqKi5ofgTHorcXUU=", + "url": "https://nuget.samboy.dev/v3/package/stablenamedotnet/0.1.0-development.1356/stablenamedotnet.0.1.0-development.1356.nupkg" + }, + { + "pname": "StbImageWriteSharp", + "version": "1.16.7", + "hash": "sha256-E9AQO6tcXneDo4rwcSaW/cNhqFDv881o74wqB2fTG0Y=" + }, + { + "pname": "Swashbuckle.AspNetCore", + "version": "9.0.1", + "hash": "sha256-rJFeYQgpQ6O3nK0I0ovzh5k8NA/Hzp6kIxKRBryBBBw=" + }, + { + "pname": "Swashbuckle.AspNetCore.Swagger", + "version": "9.0.1", + "hash": "sha256-MgjUvPjRdrSVALtJL+kQZsL0siNVPUhVKzsc6VMKsLM=" + }, + { + "pname": "Swashbuckle.AspNetCore.SwaggerGen", + "version": "9.0.1", + "hash": "sha256-yRYM43099u0sH9uozOWAHSj0uLBOSEAp1zzR4RJCYEU=" + }, + { + "pname": "Swashbuckle.AspNetCore.SwaggerUI", + "version": "9.0.1", + "hash": "sha256-R1c/a5mMqstqSwm/PIj6FYa0fimE7ry4KibY6PUAuZQ=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Buffers", + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.0", + "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=" + }, + { + "pname": "System.IO.Hashing", + "version": "8.0.0", + "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.6", + "hash": "sha256-bOZgOtovt6tNf1IVV8ndHVvdqpMDlHN6Zwfl0KnsE0M=" + }, + { + "pname": "System.Memory", + "version": "4.5.3", + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" + }, + { + "pname": "System.Memory", + "version": "4.5.4", + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Numerics.Tensors", + "version": "10.0.0-preview.5.25277.114", + "hash": "sha256-zXbNpujiQO8JcKNvJTMdOtokqvBpD6LeWpeurJDFmts=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "6.0.0", + "hash": "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.0", + "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.1.1", + "hash": "sha256-FeUStJ8EDvosTT651WiWE0X19rE9QqNQpLmhkb/n+rM=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "6.0.0", + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.6", + "hash": "sha256-HHifM7LW0+JhFLHMbPx3954t70IjdTPoBE8mWEiJxcI=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.5", + "hash": "sha256-NKWNrCcKy8S5ldsJzm6+udU53fWzmPGZZG/gpk0Kz4k=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.4", + "hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.6", + "hash": "sha256-WC/QbZhTaoZ3PbDKcFvJwMIA4xLUdnMrAXGlOW87VNY=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "TerraFX.Interop.Windows", + "version": "10.0.26100.2", + "hash": "sha256-dIyetiPHgFg3cXN620ur3O/O3c+7Piw+KKzr88SlpHw=" + }, + { + "pname": "ZstdSharp.Port", + "version": "0.8.1", + "hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg=" + }, + { + "pname": "ZstdSharp.Port", + "version": "0.8.5", + "hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI=" + } +] diff --git a/pkgs/by-name/as/assetripper/package.nix b/pkgs/by-name/as/assetripper/package.nix new file mode 100644 index 000000000000..4a2c3eacabfd --- /dev/null +++ b/pkgs/by-name/as/assetripper/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + autoPatchelfHook, + buildDotnetModule, + fetchFromGitHub, + dbus, + dotnetCorePackages, +}: + +buildDotnetModule (finalAttrs: { + pname = "assetripper"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "AssetRipper"; + repo = "AssetRipper"; + tag = finalAttrs.version; + hash = "sha256-ixXWbygFhvOjld+YRLIhkO3cgDNkQsbivri2pjU4rgM="; + }; + + postPatch = '' + sed 's@Path.Join(ExecutingDirectory, "temp",@Path.Join(Path.GetTempPath(), "AssetRipper",@' \ + -i Source/AssetRipper.IO.Files/Utils/TemporaryFileStorage.cs + ''; + + buildInputs = [ + dbus + (lib.getLib stdenv.cc.cc) + ]; + + nativeBuildInputs = [ autoPatchelfHook ]; + + # Prevent automatic patching of all files. This is necessary as applying + # autoPatchelf indiscriminately causes dangling references to openssl and + # icu4c in AssetRipper.GUI.Free + dontAutoPatchelf = true; + + # Avoid IOException on startup + makeWrapperArgs = [ + "--add-flags" + "--log=false" + ]; + + # Make the main executable available under a more intuitive name. + postInstall = '' + mkdir -p $out/bin + ln -rs $out/bin/AssetRipper.GUI.Free $out/bin/AssetRipper + ''; + + # Patch some prebuilt libraries fetched via NuGet. + fixupPhase = '' + runHook preFixup + + autoPatchelf $out/lib/${finalAttrs.pname}/libnfd.so + autoPatchelf $out/lib/${finalAttrs.pname}/libTexture2DDecoderNative.so + + runHook postFixup + ''; + + projectFile = "Source/AssetRipper.GUI.Free/AssetRipper.GUI.Free.csproj"; + + # Error: "PublishTrimmed is implied by native compilation and cannot be disabled." + # We need to override the project settings and disable native AoT compilation + # as this is incompatible with PublishTrimmed. + dotnetInstallFlags = [ "-p:PublishAot=false" ]; + + nugetDeps = ./deps.json; + + executables = [ "AssetRipper.GUI.Free" ]; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = finalAttrs.dotnet-sdk.aspnetcore; + + meta = { + description = "Tool for extracting assets from Unity serialized files and asset bundles"; + homepage = "https://github.com/AssetRipper/AssetRipper"; + license = lib.licenses.gpl3Only; + mainProgram = "AssetRipper"; + maintainers = with lib.maintainers; [ YoshiRulz ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode # libraries fetched by NuGet + ]; + }; +}) From 3940ae6ac4a18dd25aebe577a4429332f722b9ca Mon Sep 17 00:00:00 2001 From: Cowboylaserkittenjetshark <82691052+Cowboylaserkittenjetshark@users.noreply.github.com> Date: Sun, 7 Sep 2025 05:56:26 -0400 Subject: [PATCH 018/126] epkowa: add plugin for DS-30 --- pkgs/by-name/ep/epkowa/package.nix | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pkgs/by-name/ep/epkowa/package.nix b/pkgs/by-name/ep/epkowa/package.nix index 64fb690f8f86..e0f1c2e5a65c 100644 --- a/pkgs/by-name/ep/epkowa/package.nix +++ b/pkgs/by-name/ep/epkowa/package.nix @@ -436,6 +436,42 @@ let description = "iscan GT-1500 for " + passthru.hw; }; }; + ds30 = stdenv.mkDerivation rec { + name = "iscan-ds-30-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + ${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/lib/iscan $out/lib/esci + mkdir $out/share/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so" + ''; + hw = "DS-30"; + }; + meta = common_meta // { + description = "Plugin to support " + passthru.hw + " scanner in sane"; + }; + }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; # for the version, look for the driver of XP-750 in the search page From 434338b8d4dbc9dda9b9db3e0a8de71721c1cc88 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Sep 2025 13:45:33 +0200 Subject: [PATCH 019/126] ne: unpin texinfo --- pkgs/by-name/ne/ne/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/ne/package.nix b/pkgs/by-name/ne/ne/package.nix index 5d253ac43900..fe98c81a2018 100644 --- a/pkgs/by-name/ne/ne/package.nix +++ b/pkgs/by-name/ne/ne/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, ncurses, - texinfo6, + texinfo, texliveMedium, perl, ghostscript, @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ texliveMedium - texinfo6 + texinfo perl ghostscript ]; From 33367d9e6c3a6a6cd4e6445820499ef27ae70d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= Date: Sun, 7 Sep 2025 13:55:40 +0200 Subject: [PATCH 020/126] rename: 1.11 -> 1.16.3 --- pkgs/by-name/re/rename/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/rename/package.nix b/pkgs/by-name/re/rename/package.nix index a14365c764e7..38aa50b2028d 100644 --- a/pkgs/by-name/re/rename/package.nix +++ b/pkgs/by-name/re/rename/package.nix @@ -6,13 +6,13 @@ perlPackages.buildPerlPackage rec { pname = "rename"; - version = "1.11"; + version = "1.16.3"; outputs = [ "out" ]; src = fetchFromGitHub { owner = "pstray"; repo = "rename"; rev = "v${version}"; - sha256 = "SK6wS3IxjCftuDiiZU27TFnn9GVd137zmzvGH88cNLI="; + sha256 = "KQsBO94fsa4CbTHNyJxOD96AwUfKNLa9p44odlNgQao="; }; meta = with lib; { description = "Rename files according to a Perl rewrite expression"; @@ -20,6 +20,7 @@ perlPackages.buildPerlPackage rec { maintainers = with maintainers; [ mkg cyplo + cfouche ]; license = with licenses; [ gpl1Plus ]; mainProgram = "rename"; From 788d47d8c312d0d622752ae7c0a9a8bad43cbff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= Date: Sat, 23 Aug 2025 10:11:17 +0200 Subject: [PATCH 021/126] vacuum-tube: init at 1.3.15 --- pkgs/by-name/va/vacuum-tube/package.nix | 72 +++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 pkgs/by-name/va/vacuum-tube/package.nix diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix new file mode 100644 index 000000000000..0dfb54ba3bdc --- /dev/null +++ b/pkgs/by-name/va/vacuum-tube/package.nix @@ -0,0 +1,72 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, + electron, + makeWrapper, + writableTmpDirAsHomeHook, +}: + +buildNpmPackage rec { + pname = "vacuum-tube"; + version = "1.3.15"; + + src = fetchFromGitHub { + owner = "shy1132"; + repo = "VacuumTube"; + tag = "v${version}"; + hash = "sha256-dwUmAMogBBzpMFsoF2OP0otMz1tH9Jo3fchjWqMWIV0="; + }; + + npmDepsHash = "sha256-Qi9oMV8nFSfXXbhNYRDRZgLx+kQ8JbdgM8BK3hiEH44="; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = true; + }; + + nativeBuildInputs = [ + makeWrapper + writableTmpDirAsHomeHook + ]; + + buildPhase = '' + runHook preBuild + + npx electron-builder -l --dir \ + -c.electronDist="${electron.dist}" \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt + cp -r ./dist/*-unpacked $out/opt/VacuumTube + + for i in 16 32 48 64 256 512; do + install -Dm644 "assets/icons/$i"x"$i.png" \ + "$out/share/icons/hicolor/$i"x"$i/apps/rocks.shy.VacuumTube.png" + done + + install -Dm644 flatpak/rocks.shy.VacuumTube.desktop $out/share/applications/VacuumTube.desktop + + substituteInPlace $out/share/applications/VacuumTube.desktop \ + --replace-fail 'Exec=startvacuumtube' 'Exec=VacuumTube' + + makeWrapper "${electron}/bin/electron" "$out/bin/VacuumTube" \ + --add-flags "$out/opt/VacuumTube/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + + runHook postInstall + ''; + + meta = { + description = "YouTube Leanback on the desktop, with enhancements"; + homepage = "https://github.com/shy1132/VacuumTube"; + mainProgram = "VacuumTube"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theCapypara ]; + }; +} From 8b942e7829728b2fe65d5f589bb24f5192298a35 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 8 Sep 2025 18:59:17 +0200 Subject: [PATCH 022/126] sane-backends: use `finalAttrs` pattern --- pkgs/applications/graphics/sane/backends/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 5daa76bf0aa3..670cca15d499 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -42,14 +42,14 @@ scanSnapDriversPackage ? sane-drivers.epjitsu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sane-backends"; version = "1.4.0"; src = fetchFromGitLab { owner = "sane-project"; repo = "backends"; - rev = "refs/tags/${version}"; + tag = finalAttrs.version; hash = "sha256-e7Wjda+CobYatblvVCGkMAO2aWrdSCp7q+qIEGnGDCY="; }; @@ -131,8 +131,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-lockdir=/var/lock/sane" ] - ++ lib.optional (avahi != null) "--with-avahi" - ++ lib.optional (libusb1 != null) "--with-usb"; + ++ lib.optionals (avahi != null) [ "--with-avahi" ] + ++ lib.optionals (libusb1 != null) [ "--with-usb" ]; # autoconf check for HAVE_MMAP is never set on cross compilation. # The pieusb backend fails compilation if HAVE_MMAP is not set. @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { postInstall = let - compatFirmware = extraFirmware ++ lib.optional (gt68xxFirmware != null) { @@ -160,7 +159,6 @@ stdenv.mkDerivation rec { mkdir -p $out/share/sane/${f.backend} ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name} ''; - in '' mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d @@ -208,4 +206,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ lib.maintainers.symphorien ]; }; -} +}) From 0a28e12493e218b8a21d1d78ff493cb79430a999 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 8 Sep 2025 19:01:14 +0200 Subject: [PATCH 023/126] sane-backends: remove `substituteInPlace` They are failing when using `--replace-fail` --- pkgs/applications/graphics/sane/backends/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 670cca15d499..0288e4c28650 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -3,7 +3,6 @@ lib, fetchFromGitLab, fetchpatch, - runtimeShell, buildPackages, gettext, pkg-config, @@ -78,10 +77,6 @@ stdenv.mkDerivation (finalAttrs: { # Fixes for cross compilation # https://github.com/NixOS/nixpkgs/issues/308283 - # related to the compile-sane-desc-for-build - substituteInPlace tools/Makefile.in \ - --replace 'cc -I' '$(CC_FOR_BUILD) -I' - # sane-desc will be used in postInstall so compile it for build # https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch patch -p1 -i ${./sane-desc-cross.patch} @@ -164,12 +159,6 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb - # the created 49-libsane references /bin/sh - substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ - --replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}" - - substituteInPlace $out/lib/libsane.la \ - --replace "-ljpeg" "-L${lib.getLib libjpeg}/lib -ljpeg" # net.conf conflicts with the file generated by the nixos module rm $out/etc/sane.d/net.conf From bf1c73d3b17a607ce3ab51db89a4e77fcd86f8f1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 8 Sep 2025 19:02:18 +0200 Subject: [PATCH 024/126] sane-backends: replace `systemd` with `systemdLibs` --- pkgs/applications/graphics/sane/backends/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 0288e4c28650..a473613ad5e7 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -17,8 +17,8 @@ libv4l, net-snmp, curl, - systemd, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + systemdLibs, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, libxml2, poppler, gawk, @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { net-snmp ] ++ lib.optionals withSystemd [ - systemd + systemdLibs ]; enableParallelBuilding = true; From e23235f42a80bb783cd9b65001dcbe49534c6836 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 Sep 2025 11:53:24 -0400 Subject: [PATCH 025/126] blender: 4.5.2 -> 4.5.3 Changelog: https://developer.blender.org/docs/release_notes/4.5/corrective_releases/ --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index c56113252d9d..375bffb32548 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -118,12 +118,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.5.2"; + version = "4.5.3"; src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-6blXwp3DeWNM5Q6M5gWj4O+K/gFxEOj41lzlc5biEYQ="; + hash = "sha256-DNVZUZpysCyB/Xt8yB352gO+UK8Cd4aDFGYuUDKyIrs="; }; postPatch = From f73402c75f2d74b79605651b339f8847a8aa91b9 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 2 Sep 2025 20:45:12 +0200 Subject: [PATCH 026/126] nixos/ifstate: remove manual /var/run creation The directory seems to be created by other processes using recent changes in master now. Therefore the manual mkdir is not needed anymore. As per the removed code comment, this will probably also be fixed later in pyroute2 directly. --- nixos/modules/services/networking/ifstate.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/networking/ifstate.nix b/nixos/modules/services/networking/ifstate.nix index f382f28efbe9..c697aaff9bc5 100644 --- a/nixos/modules/services/networking/ifstate.nix +++ b/nixos/modules/services/networking/ifstate.nix @@ -291,9 +291,6 @@ in # Otherwise systemd starts ifstate again, after the encryption password was entered by the user # and we are able to implement the cleanup using ExecStop rather than a separate unit. RemainAfterExit = true; - # When using network namespaces pyroute2 expects this directory to exists. - # @liske is currently investigating whether this should be considered a bug in pyroute2. - ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} /var/run"; ExecStart = "${lib.getExe initrdCfg.package} --config ${ config.environment.etc."ifstate/ifstate.initrd.yaml".source } apply"; From bc846d64d206486da543074aac859d1c74dffd4b Mon Sep 17 00:00:00 2001 From: Marcel Date: Mon, 8 Sep 2025 23:06:41 +0200 Subject: [PATCH 027/126] nixos/ifstate: add upstream initrd networking targets --- nixos/modules/services/networking/ifstate.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/networking/ifstate.nix b/nixos/modules/services/networking/ifstate.nix index c697aaff9bc5..ef4a132ea2ed 100644 --- a/nixos/modules/services/networking/ifstate.nix +++ b/nixos/modules/services/networking/ifstate.nix @@ -254,6 +254,17 @@ in ) ]; + # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/boot/networkd.nix#L3444 + additionalUpstreamUnits = [ + "network-online.target" + "network-pre.target" + "network.target" + "nss-lookup.target" + "nss-user-lookup.target" + "remote-fs-pre.target" + "remote-fs.target" + ]; + services.ifstate-initrd = { description = "IfState initrd"; From f3f9a71af66bcb79b710821c09c95bc8a73e1dbf Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 9 Sep 2025 00:21:22 +0200 Subject: [PATCH 028/126] nixos/ifstate: remove initrd default dependencies --- nixos/modules/services/networking/ifstate.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/ifstate.nix b/nixos/modules/services/networking/ifstate.nix index ef4a132ea2ed..f7a8222fdaaa 100644 --- a/nixos/modules/services/networking/ifstate.nix +++ b/nixos/modules/services/networking/ifstate.nix @@ -176,6 +176,11 @@ in "network.target" ]; + unitConfig = { + # Avoid default dependencies like "basic.target", which prevents ifstate from starting before luks is unlocked. + DefaultDependencies = "no"; + }; + # mount is always available on nixos, avoid adding additional store paths to the closure path = [ "/run/wrappers" ]; @@ -291,6 +296,11 @@ in "network.target" ]; + unitConfig = { + # Avoid default dependencies like "basic.target", which prevents ifstate from starting before luks is unlocked. + DefaultDependencies = "no"; + }; + # mount is always available on nixos, avoid adding additional store paths to the closure # https://github.com/NixOS/nixpkgs/blob/2b8e2457ebe576ebf41ddfa8452b5b07a8d493ad/nixos/modules/system/boot/systemd/initrd.nix#L550-L551 path = [ From 25863e23a244f845d1459c03c0aa54f31694bddd Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 9 Sep 2025 20:58:58 +0200 Subject: [PATCH 029/126] nixos/ifstate: deuplicate common initrd and non-initrd service config --- nixos/modules/services/networking/ifstate.nix | 79 +++++++------------ 1 file changed, 29 insertions(+), 50 deletions(-) diff --git a/nixos/modules/services/networking/ifstate.nix b/nixos/modules/services/networking/ifstate.nix index f7a8222fdaaa..167155a2de0f 100644 --- a/nixos/modules/services/networking/ifstate.nix +++ b/nixos/modules/services/networking/ifstate.nix @@ -66,6 +66,33 @@ let "wireguard" = [ "wireguard" ]; "xfrm" = [ "xfrm_interface" ]; }; + # https://github.com/systemd/systemd/blob/main/units/systemd-networkd.service.in + commonServiceConfig = { + after = [ + "systemd-udevd.service" + "network-pre.target" + "systemd-sysusers.service" + "systemd-sysctl.service" + ]; + before = [ + "network.target" + "multi-user.target" + "shutdown.target" + "initrd-switch-root.target" + ]; + conflicts = [ + "shutdown.target" + "initrd-switch-root.target" + ]; + wants = [ + "network.target" + ]; + + unitConfig = { + # Avoid default dependencies like "basic.target", which prevents ifstate from starting before luks is unlocked. + DefaultDependencies = "no"; + }; + }; in { meta.maintainers = with lib.maintainers; [ marcel ]; @@ -150,36 +177,12 @@ in etc."ifstate/ifstate.yaml".source = settingsFormat.generate "ifstate.yaml" cfg.settings cfg.package; }; - systemd.services.ifstate = { + systemd.services.ifstate = commonServiceConfig // { description = "IfState"; wantedBy = [ "multi-user.target" ]; - after = [ - "systemd-udevd.service" - "network-pre.target" - "systemd-sysusers.service" - "systemd-sysctl.service" - ]; - before = [ - "network.target" - "multi-user.target" - "shutdown.target" - "initrd-switch-root.target" - ]; - conflicts = [ - "shutdown.target" - "initrd-switch-root.target" - ]; - wants = [ - "network.target" - ]; - - unitConfig = { - # Avoid default dependencies like "basic.target", which prevents ifstate from starting before luks is unlocked. - DefaultDependencies = "no"; - }; # mount is always available on nixos, avoid adding additional store paths to the closure path = [ "/run/wrappers" ]; @@ -270,36 +273,12 @@ in "remote-fs.target" ]; - services.ifstate-initrd = { + services.ifstate-initrd = commonServiceConfig // { description = "IfState initrd"; wantedBy = [ "initrd.target" ]; - after = [ - "systemd-udevd.service" - "network-pre.target" - "systemd-sysusers.service" - "systemd-sysctl.service" - ]; - before = [ - "network.target" - "multi-user.target" - "shutdown.target" - "initrd-switch-root.target" - ]; - conflicts = [ - "shutdown.target" - "initrd-switch-root.target" - ]; - wants = [ - "network.target" - ]; - - unitConfig = { - # Avoid default dependencies like "basic.target", which prevents ifstate from starting before luks is unlocked. - DefaultDependencies = "no"; - }; # mount is always available on nixos, avoid adding additional store paths to the closure # https://github.com/NixOS/nixpkgs/blob/2b8e2457ebe576ebf41ddfa8452b5b07a8d493ad/nixos/modules/system/boot/systemd/initrd.nix#L550-L551 From 68d9614aa6e7be9c32ea2bb5af5c676e06301711 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 10 Sep 2025 09:24:21 +0900 Subject: [PATCH 030/126] podman: 5.6.0 -> 5.6.1 https://github.com/containers/podman/blob/v5.6.1/RELEASE_NOTES.md Signed-off-by: misilelab --- pkgs/by-name/po/podman/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 27705ccd4366..3975102d5255 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -70,13 +70,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-0w22mEbp1RRQlVqAKx0oHG0dVoC6m6Oo2l5RaL05t/A="; + hash = "sha256-i1AXjLg28VV5vHMdywlCHB9kIALXToVx/4ujaNe9Dc0="; }; patches = [ From 08b4d4936d5678dc84fbc9dc839eb0bccd29283a Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 10 Sep 2025 20:40:46 +0800 Subject: [PATCH 031/126] tiv: 1.1.1 -> 1.2.1 Diff: https://github.com/stefanhaustein/TerminalImageViewer/compare/v1.1.1...v1.2.1 --- pkgs/by-name/ti/tiv/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix index b2347948d2e8..4ee9ff92a54f 100644 --- a/pkgs/by-name/ti/tiv/package.nix +++ b/pkgs/by-name/ti/tiv/package.nix @@ -8,23 +8,23 @@ stdenv.mkDerivation rec { pname = "tiv"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "stefanhaustein"; repo = "TerminalImageViewer"; - rev = "v${version}"; - sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0="; + tag = "v${version}"; + hash = "sha256-xuJpl/tGWlyo8aKKy0yYzGladLs3ayKcRCodDNyZI9w="; }; + sourceRoot = "${src.name}/src"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ imagemagick ]; makeFlags = [ "prefix=$(out)" ]; - preConfigure = "cd src/main/cpp"; - postFixup = '' wrapProgram $out/bin/tiv \ --prefix PATH : ${lib.makeBinPath [ imagemagick ]} From 9a76775412c6d01ea2342262606ef4da19bfd45e Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 10 Sep 2025 20:43:54 +0800 Subject: [PATCH 032/126] tiv: use finalAttrs --- pkgs/by-name/ti/tiv/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix index 4ee9ff92a54f..6f1b986d749b 100644 --- a/pkgs/by-name/ti/tiv/package.nix +++ b/pkgs/by-name/ti/tiv/package.nix @@ -2,28 +2,26 @@ lib, stdenv, fetchFromGitHub, - makeWrapper, + makeBinaryWrapper, imagemagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tiv"; version = "1.2.1"; src = fetchFromGitHub { owner = "stefanhaustein"; repo = "TerminalImageViewer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xuJpl/tGWlyo8aKKy0yYzGladLs3ayKcRCodDNyZI9w="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ imagemagick ]; - - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; postFixup = '' wrapProgram $out/bin/tiv \ @@ -38,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ magnetophon ]; platforms = [ "x86_64-linux" ]; }; -} +}) From 8168908b793a0545f95a7b3fb2856fd93b8d8971 Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 10 Sep 2025 20:44:25 +0800 Subject: [PATCH 033/126] tiv: remove with lib --- pkgs/by-name/ti/tiv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix index 6f1b986d749b..5d474c66039d 100644 --- a/pkgs/by-name/ti/tiv/package.nix +++ b/pkgs/by-name/ti/tiv/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : ${lib.makeBinPath [ imagemagick ]} ''; - meta = with lib; { + meta = { homepage = "https://github.com/stefanhaustein/TerminalImageViewer"; description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"; mainProgram = "tiv"; - license = licenses.asl20; - maintainers = with maintainers; [ magnetophon ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ magnetophon ]; platforms = [ "x86_64-linux" ]; }; }) From da852dcb8c929054803f74b2b632706c6130db57 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 10 Sep 2025 12:07:45 -0400 Subject: [PATCH 034/126] nix-plugins: 15.0.0 -> 16.0.0 --- pkgs/by-name/ni/nix-plugins/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix index e9fb5d62d1f5..9a1215c4185f 100644 --- a/pkgs/by-name/ni/nix-plugins/package.nix +++ b/pkgs/by-name/ni/nix-plugins/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, nixVersions, nixComponents ? nixVersions.nixComponents_2_30, cmake, @@ -12,24 +11,15 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "15.0.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-C4VqKHi6nVAHuXVhqvTRRyn0Bb619ez4LzgUWPH1cbM="; + hash = "sha256-yofHs1IyAkyMqrWlLkmnX+CmH+qsvlhKN1YZM4nRf1M="; }; - patches = [ - # https://github.com/shlevy/nix-plugins/pull/22 - (fetchpatch2 { - name = "fix-build-nix-2.28.patch"; - url = "https://github.com/shlevy/nix-plugins/commit/7279e18911fede252b95765d3920dd38b206271a.patch"; - hash = "sha256-Mwjxg7IUVrBefGz1iRJBGqkVCDqG1v8qT4StrINkXH8="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config From ecaf6c6f362c0b69e7174a83dfb26a930e7b5e94 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Sep 2025 08:13:35 +0200 Subject: [PATCH 035/126] amazon-ec2-net-utils: use `finalAttrs` pattern --- pkgs/by-name/am/amazon-ec2-net-utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix index 555240b4d45a..090586b09278 100644 --- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix @@ -16,14 +16,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amazon-ec2-net-utils"; version = "2.6.0"; src = fetchFromGitHub { owner = "amazonlinux"; repo = "amazon-ec2-net-utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PtnRgNmVrIGndLjYjXWWx85z4oxjn637iZqXd6OSiQg="; }; @@ -121,4 +121,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sielicki ]; }; -} +}) From 4498c7ac02790da7ead97c769235175a1f400db2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Sep 2025 08:14:12 +0200 Subject: [PATCH 036/126] amazon-ec2-net-utils: replace `makeWrapper` with `makeBinaryWrapper` --- pkgs/by-name/am/amazon-ec2-net-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix index 090586b09278..097824d5f2d7 100644 --- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix @@ -9,7 +9,7 @@ gnused, installShellFiles, iproute2, - makeWrapper, + makeBinaryWrapper, nix-update-script, systemd, udevCheckHook, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - makeWrapper + makeBinaryWrapper udevCheckHook ]; From ff4383683528d7bf3aa361f24b5f07b80b9b1367 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Sep 2025 08:14:54 +0200 Subject: [PATCH 037/126] amazon-ec2-net-utils: replace `util-linux` with `util-linuxMinimal` --- pkgs/by-name/am/amazon-ec2-net-utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix index 097824d5f2d7..7d2ec3384f2f 100644 --- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix @@ -13,7 +13,7 @@ nix-update-script, systemd, udevCheckHook, - util-linux, + util-linuxMinimal, }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir $out + mkdir -p $out for file in bin/*.sh; do install -D -m 755 "$file" $out/bin/$(basename --suffix ".sh" "$file") @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { gnused iproute2 systemd - util-linux + util-linuxMinimal ] } From 5095bf879b9abf8c78ad772bdd20c68b6883c17a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 01:58:58 +0000 Subject: [PATCH 038/126] libphonenumber: 9.0.13 -> 9.0.14 --- pkgs/by-name/li/libphonenumber/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index 0ab3f835fdd5..e9d30b11b30a 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "9.0.13"; + version = "9.0.14"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-tvpucr+Yp98SYLZhe3/fGHFc0nroAILku7F/kUiNTvE="; + hash = "sha256-qxneoz6TO52MQotRPsHqkq+zF0nz3Ef3JDcbSs2Vci8="; }; patches = [ From f8636ad67f10500e519feccabf3f228ee48c612a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 12:36:11 +0000 Subject: [PATCH 039/126] python3Packages.ocrmypdf: 16.10.4 -> 16.11.0 --- pkgs/development/python-modules/ocrmypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 30b05a04eead..890201e0db44 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.10.4"; + version = "16.11.0"; pyproject = true; src = fetchFromGitHub { @@ -41,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-uHC1mIrWlvpL6SOFZQHWFlha7qSM3jhz2C/CH2cn2K0="; + hash = "sha256-seylNBl29+QxN+3SbgRUdtTo1JwvW1sODpsz7Gwer3E="; }; patches = [ From f9d62eaf59ad73db88dd5c555cd8dd4551bb093c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 13:41:31 +0000 Subject: [PATCH 040/126] python3Packages.botocore-stubs: 1.40.28 -> 1.40.29 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 82b60c474bad..2d10c44f92da 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.28"; + version = "1.40.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-aGbQa+t4oekxPIKX20xor6UXRYalEVgaH899JLgv5Uc="; + hash = "sha256-MkZp1e17X3Jxvzw+pyCBkbHRg/F9fnM5jxH+9KMf32s="; }; nativeBuildInputs = [ setuptools ]; From 62594e6e54280243a44ff150e6844d70aa483007 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 13:45:16 +0000 Subject: [PATCH 041/126] kube-linter: 0.7.5 -> 0.7.6 --- pkgs/by-name/ku/kube-linter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kube-linter/package.nix b/pkgs/by-name/ku/kube-linter/package.nix index 286b802889b4..f57dbc4cc1e1 100644 --- a/pkgs/by-name/ku/kube-linter/package.nix +++ b/pkgs/by-name/ku/kube-linter/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "stackrox"; repo = "kube-linter"; rev = "v${version}"; - sha256 = "sha256-akuyMSgEtIV1+dxFlAgoVdhnKO4SyVP3pIABCjT52Kc="; + sha256 = "sha256-wniDoImqawTdjkd/XnkeiUTMoz5WJNpRs1ZgM1Xy1hw="; }; - vendorHash = "sha256-TETt2USmpKolx3nXk9kXknxoXpa/nRj4XZWeDvWFRZQ="; + vendorHash = "sha256-ui6AECWJhYso3KDbX8EonML4wvbDs3cijG2yWb3KoKA="; excludedPackages = [ "tool-imports" ]; From 95bf4c036d558cbfc957e447fb01c88f9a49d778 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 14:01:50 +0000 Subject: [PATCH 042/126] keycloak: 26.3.3 -> 26.3.4 --- pkgs/by-name/ke/keycloak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 29416d37277a..6bca672d32fd 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.3.3"; + version = "26.3.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-5+KmaLz6pZjgOI3CoXk1wC/LXiYzRiV2s2l0Jkwb45M="; + hash = "sha256-K+7ZUBN3iYGMteP/ycu4M5rJPdIavN144BgOwktdu3g="; }; nativeBuildInputs = [ From e721fa894c9b7f0e2dd04678e49303eff8b05c52 Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 12 Sep 2025 17:01:03 +0200 Subject: [PATCH 043/126] redlib: 0.36.0-unstable-2025-07-21 -> 0.36.0-unstable-2025-09-09 --- pkgs/by-name/re/redlib/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index c37318757147..46ece04cacc8 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage { pname = "redlib"; - version = "0.36.0-unstable-2025-07-21"; + version = "0.36.0-unstable-2025-09-09"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; - rev = "3e67694e2b9a4012b259264af5f2b81807dbadf0"; - hash = "sha256-vFK9DiVANbTKi19DCWdRG8gKKwcyoAcLa1teXCZ9nfE="; + rev = "a989d19ca92713878e9a20dead4252f266dc4936"; + hash = "sha256-YJZVkCi8JQ1U47s52iOSyyf32S3b35pEqw4YTW8FHVY="; }; - cargoHash = "sha256-FDeENHY6bwwCq6leSoIuCqPI6PCHpEod7KN2grS2gFw="; + cargoHash = "sha256-L35VSQdIbKGGsBPU2Sj/MoYohy1ZibgZ+7NVa3yNjH8="; postInstall = '' install -D contrib/redlib.service $out/lib/systemd/system/redlib.service From a998c83c08962281d7a0fe53115180d8e2421b67 Mon Sep 17 00:00:00 2001 From: DoctorDalek1963 Date: Fri, 12 Sep 2025 16:10:53 +0100 Subject: [PATCH 044/126] sunsetr: 0.8.0 -> 0.9.0 --- pkgs/by-name/su/sunsetr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix index 0061c0cf39d6..dd72a816fcf5 100644 --- a/pkgs/by-name/su/sunsetr/package.nix +++ b/pkgs/by-name/su/sunsetr/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sunsetr"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "psi4j"; repo = "sunsetr"; tag = "v${finalAttrs.version}"; - hash = "sha256-TCG6jokt0lMiCGcltFtTTOKDgvOSW/bzNvgAk+opW28="; + hash = "sha256-DbTEHJjYcxzr+ELlN4qgcQpZS/r5P2rcPPnPT8Qkbok="; }; - cargoHash = "sha256-PULjNh7AkwRIoZ8gQp9RB4JeurioKiZ2xjk939l7uOU="; + cargoHash = "sha256-jRDa7wSJLXP+jv0lbCiVzgAhdh9eJfq314Gpw0npRos="; checkFlags = [ "--skip=config::tests::test_geo_toml_exists_before_config_creation" From 8979e15b53262525bcc64828ef270067d917e3f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 17:52:51 +0000 Subject: [PATCH 045/126] kubergrunt: 0.18.3 -> 0.18.4 --- pkgs/by-name/ku/kubergrunt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubergrunt/package.nix b/pkgs/by-name/ku/kubergrunt/package.nix index 28d745dfcf32..b57c1a822ad9 100644 --- a/pkgs/by-name/ku/kubergrunt/package.nix +++ b/pkgs/by-name/ku/kubergrunt/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.18.3"; + version = "0.18.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-qiAmUKOkVsCPIZ8mv8GfG8QU1Ps4Cg4+1NV8qCuJtBo="; + sha256 = "sha256-yrAFm4dvujwxRVjMDlTAOjBpftxdv6kuQIIcbiVnFgU="; }; - vendorHash = "sha256-yTi2JPLUXnORGr/31GEdwkUpqcgoJANfNbZr3dnzVzQ="; + vendorHash = "sha256-zpYc8DurFG6Hqmf8YDSapFbHIvE1HGs5yajrLWtewO4="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure From fc2c2d1aa98c219696b93fb902e37f9157ff472d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 18:46:16 +0000 Subject: [PATCH 046/126] python3Packages.pathlib-abc: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/pathlib-abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix index f711c3cd52f7..d643b0fb1f45 100644 --- a/pkgs/development/python-modules/pathlib-abc/default.nix +++ b/pkgs/development/python-modules/pathlib-abc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pathlib-abc"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pathlib_abc"; inherit version; - hash = "sha256-RpyeVALG0wB9EcQGLrZlEwCkJdZwyRO0vEvXgZnOwsM="; + hash = "sha256-vsmplUco6iEJL4oRaLWc1vOAoMNQPkZuDCrJx8JiNWQ="; }; build-system = [ hatchling ]; From 86fd7cc7edc0dd0c4468fc3349498ebbd5936ce9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 19:05:44 +0000 Subject: [PATCH 047/126] lesspipe: 2.19 -> 2.20 --- pkgs/by-name/le/lesspipe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index b4a572b3e606..cfe53fd5b5be 100644 --- a/pkgs/by-name/le/lesspipe/package.nix +++ b/pkgs/by-name/le/lesspipe/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "lesspipe"; - version = "2.19"; + version = "2.20"; src = fetchFromGitHub { owner = "wofr06"; repo = "lesspipe"; rev = "v${version}"; - hash = "sha256-V+fB5KkbBRhVSDgB/e7oVEyMKQ7HbR82XQYlqxcLZyQ="; + hash = "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU="; }; nativeBuildInputs = [ From c7fabb12a2204e6c90b93a2b3885cb5c6347c100 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 19:58:33 +0000 Subject: [PATCH 048/126] terraform-providers.okta: 5.3.0 -> 6.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4493a44f72cb..525871515af0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -949,13 +949,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-+3IYynRuV+iYI8FMpQmLUstNgEf3oAnPah4LmX6UjZw=", + "hash": "sha256-ANGoCEHLuxTLpP9k2H/zUQjSEu7qob9Dh6c2Uzgj35Q=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v5.3.0", + "rev": "v6.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CdXsClQLswfo/xVr5V65vpmvQg26TZv539zK9uodOco=" + "vendorHash": "sha256-C+EP9ROYOnxkr895ZLZPgdRYm7Da2chDslsQRSq7NkU=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 281b8ab41c94fc57cb8d24e305403bd0ffb45a02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Sep 2025 21:44:01 +0000 Subject: [PATCH 049/126] python3Packages.pydal: 20250629.2 -> 20250908.2 --- pkgs/development/python-modules/pydal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index eb890f9ea391..5125960bd851 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydal"; - version = "20250629.2"; + version = "20250908.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P65iULncYasN7ahwD75czGlwum+N4D1Y0WCd6XpBXSk="; + hash = "sha256-tIwXrzmOfmjcUujVKZ8kK+62iagx9mzo/+iaaUPx3Po="; }; build-system = [ setuptools ]; From 49fe3feeee7d58c32c6a3cd15d231a67c01df88d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 01:16:23 +0000 Subject: [PATCH 050/126] coroot-node-agent: 1.25.9 -> 1.25.10 --- pkgs/by-name/co/coroot-node-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index 94ba458e64af..f2891dd61165 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.25.9"; + version = "1.25.10"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-SiSNYtcqKbbVCArSFhNsu6gckQlKbTsDvECbCn0jXCU="; + hash = "sha256-fzvhnakjFyfQQEcf73rGhOoUv28FzPOoYEcApV34MPc="; }; vendorHash = "sha256-QvdFW/o481F85WuXNdz99Q9MBiGRjVSWvPRytq67vYU="; From f4852da420ec22ce878c2c89d083f7c722cf4146 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 02:02:59 +0000 Subject: [PATCH 051/126] runpodctl: 1.14.4 -> 1.14.11 --- pkgs/by-name/ru/runpodctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix index b6dbfdaf8c57..700f086f7072 100644 --- a/pkgs/by-name/ru/runpodctl/package.nix +++ b/pkgs/by-name/ru/runpodctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "runpodctl"; - version = "1.14.4"; + version = "1.14.11"; src = fetchFromGitHub { owner = "runpod"; repo = "runpodctl"; rev = "v${version}"; - hash = "sha256-QU2gujECzT5mPkZi6siMO7IZRXNZHS0TchYxnG4Snj8="; + hash = "sha256-RXI1NAdEg5QypRDXg0NCpHLDrxcRCCS22KGnZyotXrI="; }; - vendorHash = "sha256-8/OrM8zrisAfZdeo6FGP6+quKMwjxel1BaRIY+yJq5E="; + vendorHash = "sha256-SaaHVaN2r3DhUk7sVizhRggYZRujd+e8qbpq0xOVD88="; postInstall = '' rm $out/bin/docs # remove the docs binary From 7c724ff6fda7fdd0b978fe45c487bb513efdf64d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 02:50:10 +0000 Subject: [PATCH 052/126] go-minimock: 3.4.6 -> 3.4.7 --- pkgs/by-name/go/go-minimock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/go-minimock/package.nix b/pkgs/by-name/go/go-minimock/package.nix index d757aecd1360..cb74d144bc95 100644 --- a/pkgs/by-name/go/go-minimock/package.nix +++ b/pkgs/by-name/go/go-minimock/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.4.6"; + version = "3.4.7"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - hash = "sha256-jbl8ngVagwbDSIZFrMtRRCHvQ0e6mojrk4rXJ/HsJSk="; + hash = "sha256-Dx4m17r7GOdiaV8DzqOXAr32dNCXJyi7gID6GHohKXk="; }; ldflags = [ From 903044160f42b2fa782a11660db7ca560a031914 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 12 Sep 2025 23:13:26 +0100 Subject: [PATCH 053/126] tbb_2022: 2022.1.0 -> 2022.2.0 One patch landed upstream. Diff: https://github.com/oneapi-src/oneTBB/compare/v2022.1.0...v2022.2.0 --- pkgs/by-name/tb/tbb_2022/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index af24d66d1fde..b4601f9154cc 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tbb"; - version = "2022.1.0"; + version = "2022.2.0"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "oneapi-src"; repo = "oneTBB"; tag = "v${finalAttrs.version}"; - hash = "sha256-DqJkNlC94cPJSXnhyFcEqWYGCQPunMfIfb05UcFGynw="; + hash = "sha256-ASQPAGm5e4q7imvTVWlmj5ON4fGEao1L5m2C5wF7EhI="; }; nativeBuildInputs = [ @@ -34,12 +34,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch"; hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU="; }) - # Fix tests on FreeBSD and Windows - (fetchpatch { - name = "fix-tbb-freebsd-and-windows-tests.patch"; - url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch"; - hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4="; - }) # Fix 32-bit PowerPC build (fetchpatch { url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch"; From 70460e8a7fbd10e715fd6db4045b030be185593c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 03:07:24 +0000 Subject: [PATCH 054/126] kubectl-gadget: 0.44.0 -> 0.44.1 --- pkgs/by-name/ku/kubectl-gadget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index c1471fafcadf..0602263f0c12 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-h3J6RQG9CI+2U+iWINUs3JX4uEfbl0VeOXsaWuZx2dg="; + hash = "sha256-S3LF07KY8AwEU8xqgkl4XNNNdygmy0ILfQKVScponlk="; }; vendorHash = "sha256-MSi8nTd9ZAdHq1xONww9qKkgKbXHe7H6oms8/WANuOg="; From 5ae0f9c71d2fe5f5fb0c6655391f94e4238a1380 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 04:11:30 +0000 Subject: [PATCH 055/126] arkade: 0.11.43 -> 0.11.46 --- pkgs/by-name/ar/arkade/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index 63c320add7e8..dfa497d83e32 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.43"; + version = "0.11.46"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-zHKLk9dLZZiH7pH5FR6+uHP9ZteMsAFyrf4V7I+vgSs="; + hash = "sha256-hQLp0LA/VuwYzd+yPeH09WRXBWmxuW4gba85BwmCATU="; }; env.CGO_ENABLED = 0; From afd2dc9f0f4616a8724f0387971c708df9b856e1 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 13 Sep 2025 13:15:41 +0900 Subject: [PATCH 056/126] appflowy: 0.9.8 -> 0.9.9 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.9.9 Signed-off-by: misilelab --- pkgs/by-name/ap/appflowy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index 2689a3aee405..4e96d8e4ccfd 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-ROtQQqTr6v7JnzNOBYVoE4feUZQuqooaA6TKu9iJe8E="; + hash = "sha256-n1ID/fGkRisxJ2rYmNLO9YX1ylezEQldEtnRuIVXHGk="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-y7YxsLr01qqrtftdLnx0bIXd8eL+Y3UryjgdBmaZ4gQ="; + hash = "sha256-+TXllfXtu+7X36XJQMydJzMaWeUkp4/TRD0a35GHuws="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.9.8"; + version = "0.9.9"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From 6bbf8d1d95c08f7bcab3b6d41f45df5e3281db91 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Sep 2025 06:51:10 +0100 Subject: [PATCH 057/126] bind: 9.20.12 -> 9.20.13 Changes: https://bind9.readthedocs.io/en/v9.20.13/changelog.html --- pkgs/by-name/bi/bind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index 4d365f34230f..513df4ba2dcc 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bind"; - version = "9.20.12"; + version = "9.20.13"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz"; - hash = "sha256-3TLW62dQTopDCq9wtO+JTz0CJrRMfgI3DJsNN38ceZk="; + hash = "sha256-FR+TdurTF+ZGpdDJ8BwGA4bYkRGNdDen+Cm7lyfHs0w="; }; outputs = [ From 72b9eb3309e96f32b96bfa4dc440f8a6f75cc573 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 13 Sep 2025 00:37:15 +0800 Subject: [PATCH 058/126] sing-box: 1.12.5 -> 1.12.8 --- pkgs/by-name/si/sing-box/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index c9774778ddf5..dce81cd861f2 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.12.5"; + version = "1.12.8"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-LTORUt3/Q8eyfMkWjk/ixyRHB8NGvthbIJdcgOR3WaA="; + hash = "sha256-4+t90/oJtg93f+cLc2licyqLsQKy3Vh53gEUmTppPdc="; }; - vendorHash = "sha256-XoHIxsJaFkC/Qz0+9AXWL+LBiTFUYKDtMqNseruAqZY="; + vendorHash = "sha256-q06yWv0K/BMplGcIlAufx1HiGb4AEJ4UioeAhPoQce0="; tags = [ "with_quic" From fca834ef4f1ffb618254fa5a795c72a3a8c0ec54 Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Sat, 13 Sep 2025 11:50:40 +0300 Subject: [PATCH 059/126] pulumi-bin: 3.194.0 -> 3.196.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 114 +++++++++++++-------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 063de5ff1f08..8083191a73b2 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.194.0"; + version = "3.196.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-linux-x64.tar.gz"; - sha256 = "1v5mfjwxv6ajqcbvkxrim5nnijwx0jrjd7lz6ayh20plnal9imlm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.196.0-linux-x64.tar.gz"; + sha256 = "1lsw88q2hcd99fsi0f2917iwn00hqdbvf0p62m95pagp3c57bj5c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-linux-amd64.tar.gz"; @@ -41,12 +41,12 @@ sha256 = "0r0s72v99wx2ggb45ifs0hjy76nq8aa6z66zlxjb8wgda3yrsldz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.25.0-linux-amd64.tar.gz"; - sha256 = "1nh5w1ay2bf3prnp4bld5d2gidqd6b9iv9dqhlmw23flx5qjlf2y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-amd64.tar.gz"; + sha256 = "0d0i764g4gcj6k5q94hi8pyd4822di1p2qz1kd1np9clhazghsc6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.8.0-linux-amd64.tar.gz"; - sha256 = "06x508ksj5avyb7a7sjw7pda60rrbwvdwyc7v0g6fzjqb2v2vl7s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.0-linux-amd64.tar.gz"; + sha256 = "1hminrd020xlgb6plxfhfradj3wz1qcgdnx77pcycayk0s3gpwnn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "0y6ir92jqdm981gsmia9ak1c7n4w07jli0719cj6zvclzj5cqz59"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.52.0-linux-amd64.tar.gz"; - sha256 = "0p8l9hq9bpk97a5wjmq0drsbg1mjpqwy271pnmijgjajfrqm25vl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-amd64.tar.gz"; + sha256 = "1vd4wcpkwb01wb3916nna3wwqhbym234jj6ggyayw0mawhrx52rm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-linux-amd64.tar.gz"; @@ -81,8 +81,8 @@ sha256 = "192bz3xl0hiy3k68fgcb9mw6j1hb6ngrahf53h8zb7agikzwiy3m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-linux-amd64.tar.gz"; - sha256 = "08dfz919cmd0k0v5igjand4qgyf6fvv47idf5fjyqab2nafbjsv3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.1-linux-amd64.tar.gz"; + sha256 = "0c6hpaf861ngfzj06lld2c993cdkv02dd7lk47dc6yyy2pn157ln"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -97,8 +97,8 @@ sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.2.0-linux-amd64.tar.gz"; - sha256 = "12ng3ql6grzbqhrqngs7dfn1wn2pj456k034q46pbmd2w7iy0jdk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.3.0-linux-amd64.tar.gz"; + sha256 = "01hqf1sq13s0qgcqsfnkk2ijd6g5cm74b3nxbvc0kf2ybcxvwsmv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-amd64.tar.gz"; @@ -109,8 +109,8 @@ sha256 = "0sawhhcmnhgwdv3wl05z65parmrc74mgk2cpyhgp0hcvbpgagknj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-linux-amd64.tar.gz"; - sha256 = "07vi2qzapg7dgl8hlikadrc0idlf8xx9fqy3d6v64hbmhabrav6y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-amd64.tar.gz"; + sha256 = "1nm79hr1bl2dpxw905d9y5rjdvkzxwfbqbm3vp8314ljjkwmj918"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-darwin-x64.tar.gz"; - sha256 = "0afdq6v88hzr23lpfggb84hbgcfsqg38c4kyx0n8wpk1sjnxq6bk"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.196.0-darwin-x64.tar.gz"; + sha256 = "0kqh6cb2dl0p84lc277x092q61pjgp36yr62ad5yghjva0mgxz7i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-darwin-amd64.tar.gz"; @@ -199,12 +199,12 @@ sha256 = "124fk2mxxzc06dav25kk1wn8gqrys6607gg3nm53fk813wx76zg6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.25.0-darwin-amd64.tar.gz"; - sha256 = "10vggqap983dl2l8xps2qm9d4l32slc014y1g6cqc5qiq3zlwhr4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-amd64.tar.gz"; + sha256 = "1fcy2ygwyd80kfrc45v51101gs79w0cphix4y7bmjrszg3aj695a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.8.0-darwin-amd64.tar.gz"; - sha256 = "1wflkiphhhv14l3472cdpjvyig5lxc35fi2rsfa27hx83d3c8548"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.0-darwin-amd64.tar.gz"; + sha256 = "0c9f90mbshmzcsd42px9y3c3fv3pklxjbvn9sffql4ha69sns3lb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "0zjpwsrg7d6isck6xc55c6nqdclk6a4avlsnbr9wiyrzn9kyqpss"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.52.0-darwin-amd64.tar.gz"; - sha256 = "1bv76h455iflw1jfjikk9gh8lr1zwm6ils3ibf2nskjkjyw8f3g9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-amd64.tar.gz"; + sha256 = "1vpp01zh6g2p3s1x061hrkzl83qcahf5mw6cdhl0m0h425mbzvam"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-darwin-amd64.tar.gz"; @@ -239,8 +239,8 @@ sha256 = "0bsfi36kihw2334gs39z9gwm6gwr0bypbcx7wfckj5zzml94jg6y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-darwin-amd64.tar.gz"; - sha256 = "1kay1ajdjcqcpv12hkicyvfyzkm455x9phxsa7q67mzy49avmjda"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.1-darwin-amd64.tar.gz"; + sha256 = "062f2wyfjw3fxc5fk2b66kmk87ynr1x1k7s1w143xw47xrld06dc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -255,8 +255,8 @@ sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "0bh5jkvzbprwi93gs5ra1hrgf152hxg2yw97148nvpkfripadkhi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "0d3mz66c182hkj61dzga9cd4fdwkw34s6cyv3jvchvfkpyl3d802"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-amd64.tar.gz"; @@ -267,8 +267,8 @@ sha256 = "18hxq1kmaxb6xjajcm84zjc3crpaqh412mkrs0xai97p3pbdfkzn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-darwin-amd64.tar.gz"; - sha256 = "0xzj4hjkqppban49jhszm83aqh8fyay55q54pglcmywfihdwf7rr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-amd64.tar.gz"; + sha256 = "1vdva946j07cmjvjw1kzf12ppwy7x2gin7bmkrqri07ahfibx9i2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-linux-arm64.tar.gz"; - sha256 = "0haghclmldw2dh6wqzjyni9f73inqd3ygfrh15y1bybiig5vcm73"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.196.0-linux-arm64.tar.gz"; + sha256 = "0wn3mphq96jw9f5qraljm6id1lv0yz9m0524lvxbhg18cq3r48p2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-linux-arm64.tar.gz"; @@ -357,12 +357,12 @@ sha256 = "0mmkjim8q5wh0mikwjw3qzg87hm845777jyisz7256p211nrsmyx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.25.0-linux-arm64.tar.gz"; - sha256 = "1715fxw8y7sknyfwwnpbgjfrjkin70iknpqpafimkzg2n9n3xjbc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-linux-arm64.tar.gz"; + sha256 = "07zxxn4clplr90iamngk0xi6gkh88c8jvbipfly50xgv6s0s9b93"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.8.0-linux-arm64.tar.gz"; - sha256 = "1p82d55a423alppisgfi912qiscbawfzqcrlk96l956w4gcnzcb2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.0-linux-arm64.tar.gz"; + sha256 = "1jiral4qji9jarpw73djkvmhnlghgyqcq4angwyphyp3hk1bd7gm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "0cbfxcxc4nnr87b54q3g0prcsf4wm0i6b2h2njj0fmg2z16c5pkg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.52.0-linux-arm64.tar.gz"; - sha256 = "1i0xrhsm6xiwjs173rhs6faz7x64j5vn47lyxq6pmg83qlg902k0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-arm64.tar.gz"; + sha256 = "033lry88mpn9vfqim26hkjg13dc0jl9sqn28zhld1asx7sqbck3y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-linux-arm64.tar.gz"; @@ -397,8 +397,8 @@ sha256 = "1nfsgjfas5md9k67n90hcvcza7gg2iwp9wivmfzf49vz2k25iz44"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-linux-arm64.tar.gz"; - sha256 = "0zfqklx1w242ciiliqk4sidyjgk0w2hl207k1mkjk0nmk6yxxjay"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.1-linux-arm64.tar.gz"; + sha256 = "12zsd977jpnx7fd5bavbs3vg18hcx8fyxc5ajfb76x9kgl634rrq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -413,8 +413,8 @@ sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.2.0-linux-arm64.tar.gz"; - sha256 = "1v6114pywwz9kfxh5469v4hdjm0vysj93ny9wzcy7ivkcnj19hlm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.3.0-linux-arm64.tar.gz"; + sha256 = "0acn838wpwl7kfwd4v50wdw45l9mrv6gfr3rnlh81dp39q6w4fl6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-arm64.tar.gz"; @@ -425,8 +425,8 @@ sha256 = "1gd9l1zdkg5faqlfvc5rl9gqchndxhxp742mx21hizhmp4rsv577"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-linux-arm64.tar.gz"; - sha256 = "1xds90d0lg86c1i320bjhqk0h84xl39hwd91gdq9rllrva413cfl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-arm64.tar.gz"; + sha256 = "0hliswqz55f4mbx62j3g49qm1yfiaaf8hxglm399ngjvky758lzw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-darwin-arm64.tar.gz"; - sha256 = "0f7gcy9qfd918ijb4v9gkc98w52w02g02vafi18dw0yb6ajqq21n"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.196.0-darwin-arm64.tar.gz"; + sha256 = "0ryllf4f3wbr026nracsraggc1pxifw8fwfby9bsw8d636gdib15"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-darwin-arm64.tar.gz"; @@ -515,12 +515,12 @@ sha256 = "00gahf4jlihzywbsd7rmw73jrnjfdsqxhag4qm7ms90gwl5qspa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.25.0-darwin-arm64.tar.gz"; - sha256 = "1ladpq9i6iyafsrm7wfgl35hfxfx0d769hh2894j0a7msfkj4cxj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.26.0-darwin-arm64.tar.gz"; + sha256 = "19k6nz8idbc80x5fqp9vbc6rfd89m3aj52m33sw6x47fc98fim5b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.8.0-darwin-arm64.tar.gz"; - sha256 = "1bdcfwhp1r518mlixl94rmlqrwriljgf55rj9jj424isc29ryx3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.9.0-darwin-arm64.tar.gz"; + sha256 = "1qxxccp9zjv9araan56v606cl4ssh623jcq36ccx9716n1ivmfv9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0c3bj1qb5fhqravw8qqdiwyp51h8ik41i9ibn59cviy1bnr2dkc0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.52.0-darwin-arm64.tar.gz"; - sha256 = "1mw9dnjp62944zijpg25s0zvdm4wjh7mljj1pqxnmjim30jxa17k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-arm64.tar.gz"; + sha256 = "0v50vs1d1cm6dgfjz9adzka34hbws3j6hwr1s3vxk6f6apx9p3x0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.8.2-darwin-arm64.tar.gz"; @@ -555,8 +555,8 @@ sha256 = "13il7mq0g853x1nllvxnhbhflrlqx8i11p4xkg46bvshay15xh9x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-darwin-arm64.tar.gz"; - sha256 = "05razvng8zcvqwj6hqi0b9a648gwkmjrc5f4m3a10pvz8gf1rxvg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.1-darwin-arm64.tar.gz"; + sha256 = "16fxn2j84lcpvmgki2cjl2yfs33xggb4xlfb7lmfy9awh38w1mbv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -571,8 +571,8 @@ sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "1nmk841ax77dm64laja5jdcrk0d4pilj0pfn0jvd5zi13fym43ah"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "0pi9q7iwn670z4dzqqyivdh52dh19g2hsdffc35czj591pfccfvl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-arm64.tar.gz"; @@ -583,8 +583,8 @@ sha256 = "0n1wmplyj2c5qhaq0gplphi8p2i7g4jwrnlwzkv0m1wixrlx3fw5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-darwin-arm64.tar.gz"; - sha256 = "12b397zam5m3d88kbcj1jj84qss8a81haf6bwhw7xhzq278i0rm1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-arm64.tar.gz"; + sha256 = "1bl3qcksqnd90jnmiyagi8sfwjcjkc0i9wrhq05pl4hx4wiv6ql2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.0-darwin-arm64.tar.gz"; From 224a45b9c4986dad3d905bddc4dd1f4d93a139c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 09:37:40 +0000 Subject: [PATCH 060/126] safecloset: 1.4.0 -> 1.4.1 --- pkgs/by-name/sa/safecloset/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 369177f99ca6..c03b53be8f01 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "safecloset"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Canop"; repo = "safecloset"; rev = "v${version}"; - hash = "sha256-1NvBNITb/KmUC2c+vchvyL9yZbK9xj5Es7AXYg0U9mE="; + hash = "sha256-pTfslMZmP8YzLzTru3b64qQ9qefkPzo9V8/S6eSQBgM="; }; - cargoHash = "sha256-VXxDD/2FFg3uQBdKdHsWOeLfOoCTYdaF+OZJVeQC6gE="; + cargoHash = "sha256-b0MD30IJRp06qkYsQsiEI7c4ArY3GCSIh8I16/4eom0="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb From 4fe55b7192addd908389ff9c33fa290efb416233 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 10:07:11 +0000 Subject: [PATCH 061/126] cargo-binstall: 1.15.3 -> 1.15.4 --- pkgs/by-name/ca/cargo-binstall/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index ce8aa989109a..af291d00896c 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-q8zDggvzEyK/kAgDCW98UX1VLR0+jAvHn+hSyQa99dk="; + hash = "sha256-UcDcTWtus2QjUK2HpTQd0dRMM/qxSXhPeWrbnXB40+A="; }; - cargoHash = "sha256-HreVuk49FZm90XxUpkfInoSQvILOHirejf/dbx42iTI="; + cargoHash = "sha256-VxKYilelkxEv1tsBSbINs0fk1fTzf3FWQ085cKwsxrw="; nativeBuildInputs = [ pkg-config From 47110e3dcf54b36bf2f886be091cc51061f5281b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Sep 2025 12:47:48 +0200 Subject: [PATCH 062/126] treewide: drop things the c3d2 is no longer using --- pkgs/applications/audio/codecserver/default.nix | 1 - pkgs/by-name/cs/csdr/package.nix | 1 - pkgs/by-name/di/digiham/package.nix | 1 - pkgs/by-name/dr/drone-runner-ssh/package.nix | 1 - pkgs/by-name/m1/m17-cxx-demod/package.nix | 1 - pkgs/by-name/op/openipmi/package.nix | 1 - pkgs/by-name/wa/wander/package.nix | 1 - pkgs/development/python-modules/napalm/default.nix | 1 - pkgs/development/python-modules/pycsdr/default.nix | 1 - pkgs/development/python-modules/pydigiham/default.nix | 1 - 10 files changed, 10 deletions(-) diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix index 2a632dc47319..231e9619a33a 100644 --- a/pkgs/applications/audio/codecserver/default.nix +++ b/pkgs/applications/audio/codecserver/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { description = "Modular audio codec server"; license = licenses.gpl3Only; platforms = platforms.unix; - teams = [ teams.c3d2 ]; mainProgram = "codecserver"; }; } diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix index 9e581fa2c077..a5c5d6a7ea5d 100644 --- a/pkgs/by-name/cs/csdr/package.nix +++ b/pkgs/by-name/cs/csdr/package.nix @@ -48,6 +48,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; - teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix index 13fe0f3f9001..2e002cfbcd05 100644 --- a/pkgs/by-name/di/digiham/package.nix +++ b/pkgs/by-name/di/digiham/package.nix @@ -46,6 +46,5 @@ stdenv.mkDerivation (finalAttrs: { description = "Tools for decoding digital ham communication"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; - teams = [ lib.teams.c3d2 ]; }; }) diff --git a/pkgs/by-name/dr/drone-runner-ssh/package.nix b/pkgs/by-name/dr/drone-runner-ssh/package.nix index 214b1d4eabcd..14474709f69a 100644 --- a/pkgs/by-name/dr/drone-runner-ssh/package.nix +++ b/pkgs/by-name/dr/drone-runner-ssh/package.nix @@ -21,7 +21,6 @@ buildGoModule { description = "Experimental Drone runner that executes a pipeline on a remote machine"; homepage = "https://github.com/drone-runners/drone-runner-ssh"; license = licenses.unfreeRedistributable; - teams = [ teams.c3d2 ]; mainProgram = "drone-runner-ssh"; }; } diff --git a/pkgs/by-name/m1/m17-cxx-demod/package.nix b/pkgs/by-name/m1/m17-cxx-demod/package.nix index 12d2536526e9..e57f43f375f7 100644 --- a/pkgs/by-name/m1/m17-cxx-demod/package.nix +++ b/pkgs/by-name/m1/m17-cxx-demod/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mobilinkd/m17-cxx-demod"; license = licenses.gpl3Only; platforms = platforms.unix; - teams = [ teams.c3d2 ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/op/openipmi/package.nix b/pkgs/by-name/op/openipmi/package.nix index c8ace62f7daf..0aec715128c1 100644 --- a/pkgs/by-name/op/openipmi/package.nix +++ b/pkgs/by-name/op/openipmi/package.nix @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; maintainers = with maintainers; [ arezvov ]; - teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/by-name/wa/wander/package.nix b/pkgs/by-name/wa/wander/package.nix index a921e5e5d308..2fe965315ce3 100644 --- a/pkgs/by-name/wa/wander/package.nix +++ b/pkgs/by-name/wa/wander/package.nix @@ -36,7 +36,6 @@ buildGoModule rec { description = "Terminal app/TUI for HashiCorp Nomad"; license = licenses.mit; homepage = "https://github.com/robinovitch61/wander"; - teams = [ teams.c3d2 ]; mainProgram = "wander"; }; } diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index 07da3c408cf6..45976cf378d5 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -91,6 +91,5 @@ buildPythonPackage rec { description = "Network Automation and Programmability Abstraction Layer with Multivendor support"; homepage = "https://github.com/napalm-automation/napalm"; license = licenses.asl20; - teams = [ teams.c3d2 ]; }; } diff --git a/pkgs/development/python-modules/pycsdr/default.nix b/pkgs/development/python-modules/pycsdr/default.nix index cdac5ed055c1..22412de57ef2 100644 --- a/pkgs/development/python-modules/pycsdr/default.nix +++ b/pkgs/development/python-modules/pycsdr/default.nix @@ -27,6 +27,5 @@ buildPythonPackage rec { homepage = "https://github.com/jketterl/pycsdr"; description = "Bindings for the csdr library"; license = lib.licenses.gpl3Only; - teams = [ lib.teams.c3d2 ]; }; } diff --git a/pkgs/development/python-modules/pydigiham/default.nix b/pkgs/development/python-modules/pydigiham/default.nix index 7145665b3701..779766c95636 100644 --- a/pkgs/development/python-modules/pydigiham/default.nix +++ b/pkgs/development/python-modules/pydigiham/default.nix @@ -38,6 +38,5 @@ buildPythonPackage rec { homepage = "https://github.com/jketterl/pydigiham"; description = "Bindings for the csdr library"; license = lib.licenses.gpl3Only; - teams = [ lib.teams.c3d2 ]; }; } From b833607a8c82100cea830b142ecbae920bca1a03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 11:07:36 +0000 Subject: [PATCH 063/126] python3Packages.boto3-stubs: 1.40.29 -> 1.40.30 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 84b6fae812e3..1ebd69048f49 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.29"; + version = "1.40.30"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-n8fSTcvMeGCT2vQkh6ntSlimvn8czyj1vgsrrUo+2xE="; + hash = "sha256-uwjryREPAyx9wZmMiPyIbBXRbv5dDWmtx0v9ZHsYx8g="; }; build-system = [ setuptools ]; From d0b9decf1a921d7f51f2d1cc531dfa347c2744a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 15:27:49 +0000 Subject: [PATCH 064/126] auth0-cli: 1.18.0 -> 1.20.0 --- pkgs/by-name/au/auth0-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index e9f835853d9e..05d4208fbb3b 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.18.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-8U5jIzXh0bDKv72nPCsHa20Kzik3Gd/MUjTg6meHLiI="; + hash = "sha256-j8NAm7HodnQBLSCenIzxsr6iYnS3H4c95vzUmpCADxg="; }; - vendorHash = "sha256-Js5yB9a54+98/yPWCvHaxniGwmHXl4hHKxDXGG6IxGQ="; + vendorHash = "sha256-3shr7IaiNKP3TZCETb1oYYINzeN+uENS0JLr3SOYWhs="; ldflags = [ "-s" From a7460995d4ad0068db70af6ebcd9f9569c266c3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 15:59:20 +0000 Subject: [PATCH 065/126] python3Packages.ultralytics-thop: 2.0.16 -> 2.0.17 --- pkgs/development/python-modules/ultralytics-thop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ultralytics-thop/default.nix b/pkgs/development/python-modules/ultralytics-thop/default.nix index 5e7c7cf0702c..adf61bf830bb 100644 --- a/pkgs/development/python-modules/ultralytics-thop/default.nix +++ b/pkgs/development/python-modules/ultralytics-thop/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "ultralytics-thop"; - version = "2.0.16"; + version = "2.0.17"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "thop"; tag = "v${version}"; - hash = "sha256-WKIO5XAf8gVtDTbwN42614E6JtqolUNqVAsCL6iPKrs="; + hash = "sha256-7bNwSbazDlxsaDbyqx2DVhiQ8JgFF3Z+olNLa91jDb4="; }; build-system = [ setuptools ]; From 6236e8b1d158367f0422c3e20b73a295070d2c80 Mon Sep 17 00:00:00 2001 From: S0AndS0 Date: Fri, 12 Sep 2025 12:33:35 -0700 Subject: [PATCH 066/126] prettier: Use `wrapProgram` for plugins These changes _should_ be backwards compatible while allowing users to opt-in to declaring list of Prettier `plugins` via `.override` High-level summary; - Add `plugins` package level argument - Add `exportRelativePathOf` and `nodeEntryPointOf` internal functions - Inject `wrapProgram` into `installPhase` Attributions; - `l0b0` much thanks for code and doc review --- pkgs/by-name/pr/prettier/package.nix | 129 ++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index af2b4a3552ce..6ab2d90cfd06 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -1,3 +1,17 @@ +/** + # Example + + Prettier with plugins and Vim Home Manager configuration + + ```nix + pkgs.prettier.override { + plugins = with pkgs.nodePackages; [ + prettier-plugin-toml + # ... + ]; + } + ``` +*/ { fetchFromGitHub, lib, @@ -6,7 +20,109 @@ stdenv, versionCheckHook, yarn-berry, + plugins ? [ ], }: +let + /** + # Example + + ```nix + exportRelativePathOf (builtins.fromJSON "./package.json") + => + lib/node_modules/prettier-plugin-toml/./lib/index.cjs + ``` + + # Type + + ``` + exportRelativePathOf :: AttrSet => String + ``` + + # Arguments + + packageJsonAttrs + : Attribute set with shape similar to `package.json` file + */ + ## Blame NodeJS + exportRelativePathOf = + let + nodeExportAttrAddresses = [ + [ "main" ] + [ + "exports" + "." + "default" + ] + [ + "exports" + "." + ] + [ + "exports" + "default" + ] + [ "exports" ] + ]; + + recAttrByPath = + addresses: default: attrs: + if builtins.length addresses == 0 then + default + else + let + addressNext = builtins.head addresses; + addressesRemaning = lib.lists.drop 1 addresses; + in + lib.attrByPath addressNext (recAttrByPath addressesRemaning default attrs) attrs; + in + packageJsonAttrs: + recAttrByPath nodeExportAttrAddresses (builtins.head ( + lib.attrByPath [ "prettier" "plugins" ] [ "null" ] packageJsonAttrs + )) packageJsonAttrs; + + /** + # Example + + ```nix + nodeEntryPointOf pkgs.nodePackages.prettier-plugin-toml + => + /nix/store/-prettier-plugin-toml-/lib/node_modules/prettier-plugin-toml/./lib/index.cjs + ``` + + # Type + + ``` + nodeEntryPointOf :: AttrSet => String + ``` + + # Arguments + + plugin + : Attribute set with `.packageName` and `.outPath` defined + */ + nodeEntryPointOf = + plugin: + let + pluginDir = "${plugin.outPath}/lib/node_modules/${plugin.packageName}"; + + packageJsonAttrs = builtins.fromJSON (builtins.readFile "${pluginDir}/package.json"); + + exportPath = exportRelativePathOf packageJsonAttrs; + + pathAbsoluteNaive = "${pluginDir}/${exportPath}"; + pathAbsoluteFallback = "${pluginDir}/${exportPath}.js"; + in + if builtins.pathExists pathAbsoluteNaive then + pathAbsoluteNaive + else if builtins.pathExists pathAbsoluteFallback then + pathAbsoluteFallback + else + lib.warn '' + ${plugin.packageName}: error context, tried finding entry point under; + pathAbsoluteNaive -> ${pathAbsoluteNaive} + pathAbsoluteFallback -> ${pathAbsoluteFallback} + '' throw ''${plugin.packageName}: does not provide parse-able entry point''; +in stdenv.mkDerivation (finalAttrs: { pname = "prettier"; version = "3.6.2"; @@ -41,7 +157,13 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper "${lib.getExe nodejs}" "$out/bin/prettier" \ --add-flags "$out/bin/prettier.cjs" - + '' + + lib.optionalString (builtins.length plugins > 0) '' + wrapProgram $out/bin/prettier --add-flags "${ + builtins.concatStringsSep " " (lib.map (plugin: "--plugin=${nodeEntryPointOf plugin}") plugins) + }"; + '' + + '' runHook postInstall ''; @@ -57,6 +179,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://prettier.io/"; license = lib.licenses.mit; mainProgram = "prettier"; - maintainers = with lib.maintainers; [ l0b0 ]; + maintainers = with lib.maintainers; [ + l0b0 + S0AndS0 + ]; }; }) From 2360033059e65a9effe41aeb66fe29da872b9562 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 17:08:56 +0000 Subject: [PATCH 067/126] python3Packages.py-bip39-bindings: 0.2.0 -> 0.3.0 --- .../python-modules/py-bip39-bindings/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-bip39-bindings/default.nix b/pkgs/development/python-modules/py-bip39-bindings/default.nix index 57094f6a8a6e..8738a1267b10 100644 --- a/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-bip39-bindings"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,12 +20,12 @@ buildPythonPackage rec { owner = "polkascan"; repo = "py-bip39-bindings"; tag = "v${version}"; - hash = "sha256-CglVEvmZ8xYtjFPNhCyzToYrOvGe/Sw3zHAIy1HidzM="; + hash = "sha256-jpBlupIjlH2LJkSm3tzxrH5wT2+eziugNMR4B01gSdE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-DsY4IBxuOTUTMiQs93K8G1hG7jI6PnoQ3Rpbd6iyFpU="; + hash = "sha256-qX4ydIT2+8dJQIVSYzO8Rg8PP61cu7ZjanPkmI34IUY="; }; nativeBuildInputs = with rustPlatform; [ From ebe97e5ad5f16b0d62317bf873d9690b9106b1aa Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 13 Sep 2025 20:24:05 +0200 Subject: [PATCH 068/126] python3Packages.invisible-watermark: disable auto update There is no Git tag for the latest version, so the update script gets confused. To avoid the update script downgrading the version, disable automatic updates. --- pkgs/development/python-modules/invisible-watermark/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index 00ca42d94b22..31ac39da8103 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ShieldMnt"; repo = "invisible-watermark"; + # nixpkgs-update: no auto update rev = "e58e451cff7e092457cd915e445b1a20b64a7c8f"; # No git tag, see https://github.com/ShieldMnt/invisible-watermark/issues/22 hash = "sha256-6SjVpKFtiiLLU7tZ3hBQr0KT/YEQyywJj0e21/dJRzk="; }; From 7c349ca77f038fbeb5a52d7750d39aa4a0f12864 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 18:27:35 +0000 Subject: [PATCH 069/126] python3Packages.s3fs: 2025.7.0 -> 2025.9.0 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 45599a6ef4d8..a0da340231b7 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2025.7.0"; + version = "2025.9.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "s3fs"; tag = version; - hash = "sha256-1e+Y4nY61+BwGNCuBlAlf0Lpxj95di0iDrbmxlyAjVI="; + hash = "sha256-Wb9y2l6/J0EQQwB4AqasqvSVSURylkoh2D2wvw4NjlE="; }; build-system = [ From 9d2f041a291a10abd96c971fc5c2ecd448f2734d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 21:53:52 +0000 Subject: [PATCH 070/126] google-alloydb-auth-proxy: 1.13.5 -> 1.13.6 --- pkgs/by-name/go/google-alloydb-auth-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index ff221c0484ae..51f97ea70509 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-alloydb-auth-proxy"; - version = "1.13.5"; + version = "1.13.6"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${version}"; - hash = "sha256-UbJOVZc9hXMXfBPIJl4C3y9fAp69cRue95EJX155kDQ="; + hash = "sha256-d3YMyvUoNfU32pcStsriBCCiyMPHRZrJzHgrnBRmUL4="; }; subPackages = [ "." ]; - vendorHash = "sha256-9tNj1W4TGepe/CqbNx4Mk26iMOxDwWeKRw36lFmDpts="; + vendorHash = "sha256-DobqGejaRrCy8RJyydepnTVp9IdeM9X6A+3uUgH15iM="; checkFlags = [ "-short" From 5e8e542b33c2ee2b8b84e4db64be261708df385e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 22:26:57 +0000 Subject: [PATCH 071/126] warp-terminal: 0.2025.09.03.08.11.stable_03 -> 0.2025.09.10.08.11.stable_01 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 07726c2c2866..8ade77966e9c 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-P3BKkOaT1k6OUJV65nF5UAVWFcDiAUfdaLpT9zuU8AM=", - "version": "0.2025.09.03.08.11.stable_03" + "hash": "sha256-zLGrKT6L8IU8b7rg9IjHLWsPHmZGKwVMwWjCDFaT+nM=", + "version": "0.2025.09.10.08.11.stable_01" }, "linux_x86_64": { - "hash": "sha256-V1eDS7SQf4oJLiW9OroT9QKPryQWutXhILAlb7124ks=", - "version": "0.2025.09.03.08.11.stable_03" + "hash": "sha256-XbE8vZ7UJDM+37f7GgcTcZNBzuJ/S3lTEdeA63p+m24=", + "version": "0.2025.09.10.08.11.stable_01" }, "linux_aarch64": { - "hash": "sha256-pMYrBdHSgS4wZ9EX4Hj5NFiIz+V7CAWA4x33g5aZfLY=", - "version": "0.2025.09.03.08.11.stable_03" + "hash": "sha256-KfXYendgdDRdr6z98oncC5hAGa6zfIFjgwOB4oLwqrQ=", + "version": "0.2025.09.10.08.11.stable_01" } } From cbcda5ebdf3943d0060a62cd0a703972d95a4a19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 22:32:20 +0000 Subject: [PATCH 072/126] terraform-providers.digitalocean: 2.66.0 -> 2.67.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0f42eb035ab6..6e586cfab551 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -372,11 +372,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-mFwmq/uYQ9i6s7vWfDExl7AC5i/lA4596VH3iCdjC3Q=", + "hash": "sha256-Twj59NRaUwx1YsgzAQm7XYbOZaJlJ/pDLzP/jam4D/8=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.66.0", + "rev": "v2.67.0", "spdx": "MPL-2.0", "vendorHash": null }, From cc43c3b1a3b45b0bd72b15854e570814e24bea21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sun, 14 Sep 2025 00:12:36 +0100 Subject: [PATCH 073/126] codex: 0.31.0 -> 0.34.0 --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index c3294f7f1959..a0925562019f 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -12,18 +12,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.31.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-BGrSArFU/wl47Xad7dzOCL8aNgvISwF5gXUNTpKDBMY="; + hash = "sha256-C1PXK/5vPFV5cz1dYWV+GaYl0grscb6qCR66BSih5/E="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-54eCWW+XJIiMbChvJ06o7SlFq7ZZVgovw2lUXUJem18="; + cargoHash = "sha256-OMGGgg6hYdZ40vcUxVsWyLentFBj62CYEH3NJ909kYM="; nativeBuildInputs = [ installShellFiles From ae46b3ad3eff87891d5d04620ce9cf99c2ea9ed2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 23:21:05 +0000 Subject: [PATCH 074/126] python3Packages.habiticalib: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/habiticalib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix index 46cc9fd4c64b..420c4b7a5f5f 100644 --- a/pkgs/development/python-modules/habiticalib/default.nix +++ b/pkgs/development/python-modules/habiticalib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habiticalib"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "habiticalib"; tag = "v${version}"; - hash = "sha256-hnZS6YIO6mZHS3EXEmeTxwT3LhKkQLYYzls6xMDqOBk="; + hash = "sha256-9IMC4MkL5hRCDjeuSuLBcn986LmO/zz32NV0RGTEf1M="; }; build-system = [ From b6a41a6eb4e5520068653ca2b0c522515e944042 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 23:49:38 +0000 Subject: [PATCH 075/126] nakama: 3.30.0 -> 3.31.0 --- pkgs/by-name/na/nakama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix index 5f26b8548a8e..2caa13cd8534 100644 --- a/pkgs/by-name/na/nakama/package.nix +++ b/pkgs/by-name/na/nakama/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nakama"; - version = "3.30.0"; + version = "3.31.0"; src = fetchFromGitHub { owner = "heroiclabs"; repo = "nakama"; tag = "v${version}"; - hash = "sha256-G+cNR4Ny8aR3ByuKvrCTp3U+GXpdYaHlrZqifoWDce0="; + hash = "sha256-e31Mn4Ma+7vjOtwV13w79AshN9LCg2V0V3h9sSaad1U="; }; vendorHash = null; From 81ce17d78735efdfa9b62362283e6543d650013a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 00:26:38 +0000 Subject: [PATCH 076/126] nwg-displays: 0.3.25 -> 0.3.26 --- pkgs/by-name/nw/nwg-displays/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nw/nwg-displays/package.nix b/pkgs/by-name/nw/nwg-displays/package.nix index 17551b18c230..f829e9b09989 100644 --- a/pkgs/by-name/nw/nwg-displays/package.nix +++ b/pkgs/by-name/nw/nwg-displays/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.25"; + version = "0.3.26"; format = "setuptools"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; tag = "v${version}"; - hash = "sha256-Om5kz3mtrQPd5aHZwf/9BBDnPfSzMhyRp05MqX+7XzQ="; + hash = "sha256-UeALCkmDAXb/gu+Mp3xnHmUPOvYHk3LzegO2CbIh4ak="; }; nativeBuildInputs = [ From bfa5bb6badc3cfdfc1707c15e50169ff41365907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 00:34:46 +0000 Subject: [PATCH 077/126] xapp: 2.8.12 -> 2.8.13 --- pkgs/by-name/xa/xapp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index 251038b73341..b67b16d55923 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.12"; + version = "2.8.13"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = "xapp"; rev = version; - hash = "sha256-LGONOsllf9POLLcRG2JN6VNvvMZorcG+aXVNLUz31Tc="; + hash = "sha256-CbMwkz+4+uADkfdZEqWCJvbJqkVcvQBmcRISjVb090Q="; }; # Recommended by upstream, which enables the build of xapp-debug. From f523fe184ea08522e0a185547f5d5365a95f8cf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 01:08:07 +0000 Subject: [PATCH 078/126] limine: 9.6.6 -> 9.6.7 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 0307263a1e47..cae90856bc45 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -42,14 +42,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "9.6.6"; + version = "9.6.7"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-2NEwmC7+CbR297VsjTSguzYuhxHv8YtCgtB4oTrEaU8="; + hash = "sha256-VGn/Ny9wVKBVFW7SNTTx+u7rr519jQ+CzbcZwTTBKps="; }; enableParallelBuilding = true; From 6ac8af12a21524d1a0ef93cdf8a3e7af4990b8d1 Mon Sep 17 00:00:00 2001 From: Sewer56 Date: Sun, 14 Sep 2025 02:13:56 +0100 Subject: [PATCH 079/126] hypr-dynamic-cursors: 0-unstable-2025-07-19 -> 0-unstable-2025-09-01 --- .../hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index 75f9805ec204..27232ae5de20 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2025-07-19"; + version = "0-unstable-2025-09-01"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "d6eb0b798c9b07f7f866647c8eb1d75a930501be"; - hash = "sha256-Yd5oSg1gS/mwobd5YFrLC3I4bar/cSGNGuIvxF3UeHE="; + rev = "0e11ed12dbd4d0c62b362dda2559c2e374814d56"; + hash = "sha256-2JQ/KxMEVDjauaFU62T0udjKXKSiCyKO5frjVf4b4A8="; }; dontUseCmakeConfigure = true; From 4aa38080ae337584e9f0a5337a0fe49c45d81c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 01:58:02 +0000 Subject: [PATCH 080/126] fzf-git-sh: 0-unstable-2025-08-31 -> 0-unstable-2025-09-04 --- pkgs/by-name/fz/fzf-git-sh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index 7899c70f5a71..9c50309eb482 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "0-unstable-2025-08-31"; + version = "0-unstable-2025-09-04"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "2eef6bf288bf19a6402784a63336f06f87d9a584"; - hash = "sha256-r3b05erlNGw3GQq/nMPqTHRroGEFmhufpiXqaIhQGTA="; + rev = "a6426e615fb9966b99999ae0668847c36e8f53c2"; + hash = "sha256-oMtOCdexNh37Y9kvxzKsjuKM+Dw3r7zbNm9U8O9gpxg="; }; dontBuild = true; From 028621ae98e7dc2d4c62e9a1b3fa99e2c478ad05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 02:13:10 +0000 Subject: [PATCH 081/126] supersonic: 0.18.0 -> 0.18.1 --- pkgs/by-name/su/supersonic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 2cc505839905..88e04130a5f5 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -18,16 +18,16 @@ buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-/8GFrMQvr2dXtK5Cyi5mc+9wxJ95jCzkpZ2Xk6ULrp8="; + hash = "sha256-NzgmkxG58XvaxcIcu9J0VeRjCQ922rJOp3IWX49dgIU="; }; - vendorHash = "sha256-C610AlCpY7hpW4AQbT9HYaRxJdLmpqgQbi5mIsdSTrM="; + vendorHash = "sha256-dG5D7a13TbVurjqFbKwiZ5IOPul39sCmyPCCzRx0NEY="; nativeBuildInputs = [ copyDesktopItems From c240345f2f6e61de03e9bdad4997c367796486e4 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 12 Sep 2025 23:03:47 +0100 Subject: [PATCH 082/126] tbb_2022: enable tests --- pkgs/by-name/tb/tbb_2022/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index b4601f9154cc..31af81c371c8 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -5,6 +5,7 @@ fetchpatch, cmake, ninja, + ctestCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja + ctestCheckHook ]; patches = [ @@ -41,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + doCheck = true; + + dontUseNinjaCheck = true; + # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', NIX_CFLAGS_COMPILE = @@ -61,6 +67,12 @@ stdenv.mkDerivation (finalAttrs: { stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17" ) "--undefined-version"; + # The memory leak test fails on static Linux, despite passing on + # dynamic Musl. + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [ + "test_arena_constraints" + ]; + # Disable failing test on musl # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' From b9acbf9befaf1b85ec42ad137394ebf42c185c37 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 12 Sep 2025 23:03:47 +0100 Subject: [PATCH 083/126] tbb_2022: vendor unmerged patches Unmerged PRs are not stable fetch targets. --- .../tbb_2022/fix-32-bit-powerpc-build.patch | 38 +++++++++++++++++++ pkgs/by-name/tb/tbb_2022/fix-musl-build.patch | 24 ++++++++++++ pkgs/by-name/tb/tbb_2022/package.nix | 22 ++++------- 3 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch create mode 100644 pkgs/by-name/tb/tbb_2022/fix-musl-build.patch diff --git a/pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch b/pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch new file mode 100644 index 000000000000..7cc8216153d0 --- /dev/null +++ b/pkgs/by-name/tb/tbb_2022/fix-32-bit-powerpc-build.patch @@ -0,0 +1,38 @@ +From c828ae47b8f4bea7736d2f9d05460e2b529c9d7d Mon Sep 17 00:00:00 2001 +From: John Paul Adrian Glaubitz +Date: Fri, 9 Dec 2022 12:36:11 +0100 +Subject: [PATCH] Add cmake check for libatomic requirement when building with + gcc (#980) + +Signed-off-by: John Paul Adrian Glaubitz +--- + cmake/compilers/GNU.cmake | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake +index cd76acfe1e..59f4e6934f 100644 +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -44,6 +44,22 @@ if (NOT MINGW) + set(TBB_COMMON_LINK_LIBS dl) + endif() + ++# Check whether code with full atomics can be built without libatomic ++# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles("#include ++int main() { ++ std::atomic w1; ++ std::atomic w2; ++ std::atomic w4; ++ std::atomic w8; ++ return ++w1 + ++w2 + ++w4 + ++w8; ++}" TBB_BUILDS_WITHOUT_LIBATOMIC) ++ ++if(NOT TBB_BUILDS_WITHOUT_LIBATOMIC) ++ set(TBB_COMMON_LINK_LIBS ${TBB_COMMON_LINK_LIBS} atomic) ++endif() ++ + # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled. + if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag) + tbb_remove_compile_flag(-Werror) diff --git a/pkgs/by-name/tb/tbb_2022/fix-musl-build.patch b/pkgs/by-name/tb/tbb_2022/fix-musl-build.patch new file mode 100644 index 000000000000..5a6700a86a24 --- /dev/null +++ b/pkgs/by-name/tb/tbb_2022/fix-musl-build.patch @@ -0,0 +1,24 @@ +From 493774eb57f9c424fc8907d137665e687861ad94 Mon Sep 17 00:00:00 2001 +From: Ismael Luceno +Date: Fri, 9 Sep 2022 16:18:18 +0200 +Subject: [PATCH] Fix build against musl libc + +Probably MALLOC_UNIXLIKE_OVERLOAD_ENABLED only works with glibc, so use +__GLIBC__ in addition to __linux__ to define it. +--- + src/tbbmalloc_proxy/proxy.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tbbmalloc_proxy/proxy.h b/src/tbbmalloc_proxy/proxy.h +index 5f0133f9e0..ba1a07c396 100644 +--- a/src/tbbmalloc_proxy/proxy.h ++++ b/src/tbbmalloc_proxy/proxy.h +@@ -17,7 +17,7 @@ + #ifndef _TBB_malloc_proxy_H_ + #define _TBB_malloc_proxy_H_ + +-#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__ ++#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED (__linux__ && __GLIBC__) + #define MALLOC_ZONE_OVERLOAD_ENABLED __APPLE__ + + // MALLOC_UNIXLIKE_OVERLOAD_ENABLED depends on MALLOC_CHECK_RECURSION stuff diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index 31af81c371c8..00fd6e3d9e8b 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, ninja, ctestCheckHook, @@ -24,25 +23,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ASQPAGm5e4q7imvTVWlmj5ON4fGEao1L5m2C5wF7EhI="; }; + patches = [ + # + ./fix-musl-build.patch + + # + ./fix-32-bit-powerpc-build.patch + ]; + nativeBuildInputs = [ cmake ninja ctestCheckHook ]; - patches = [ - # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch"; - hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU="; - }) - # Fix 32-bit PowerPC build - (fetchpatch { - url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch"; - hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg="; - }) - ]; - doCheck = true; dontUseNinjaCheck = true; From 2c33a3a74895de28784c51b1695cb164321fef42 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 12 Sep 2025 23:03:47 +0100 Subject: [PATCH 084/126] tbb_2022: drop obsolete compiler flags --- pkgs/by-name/tb/tbb_2022/package.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index 00fd6e3d9e8b..710a1ee9a71b 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -43,18 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', - NIX_CFLAGS_COMPILE = - lib.optionals stdenv.cc.isGNU [ - "-Wno-error=array-bounds" - "-Wno-error=stringop-overflow" - ] - ++ - # error: variable 'val' set but not used - lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] - ++ - # Workaround for gcc-12 ICE when using -O3 - # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=stringop-overflow"; # Fix undefined reference errors with version script under LLVM. NIX_LDFLAGS = lib.optionalString ( From 86e75f561f816186907837b5d42534ea5bf49e62 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 12 Sep 2025 23:03:47 +0100 Subject: [PATCH 085/126] tbb_2022: drop redundant `enableParallelBuilding` CMake already enables this by default. --- pkgs/by-name/tb/tbb_2022/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index 710a1ee9a71b..20fa5d067d5f 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -63,8 +63,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' "" ''; - enableParallelBuilding = true; - meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; From 004e1a7b3e690c3f81d94df294efb246964b0eed Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 13 Sep 2025 05:11:22 +0100 Subject: [PATCH 086/126] tbb_2022: use `env` --- pkgs/by-name/tb/tbb_2022/package.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index 20fa5d067d5f..53d7878764d0 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -41,15 +41,6 @@ stdenv.mkDerivation (finalAttrs: { dontUseNinjaCheck = true; - # Fix build with modern gcc - # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=stringop-overflow"; - - # Fix undefined reference errors with version script under LLVM. - NIX_LDFLAGS = lib.optionalString ( - stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17" - ) "--undefined-version"; - # The memory leak test fails on static Linux, despite passing on # dynamic Musl. disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [ @@ -63,6 +54,17 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' "" ''; + env = { + # Fix build with modern gcc + # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=stringop-overflow"; + + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString ( + stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17" + ) "--undefined-version"; + }; + meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; From 09bb3d872b592d30da42548207928b80d3ba9486 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 12 Sep 2025 23:03:47 +0100 Subject: [PATCH 087/126] tbb_2022: add patch to fix macOS crashes Closes: #407674 --- .../tb/tbb_2022/fix-libtbbmalloc-dlopen.patch | 69 +++++++++++++++++++ pkgs/by-name/tb/tbb_2022/package.nix | 7 ++ 2 files changed, 76 insertions(+) create mode 100644 pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch diff --git a/pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch b/pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch new file mode 100644 index 000000000000..e7377b36ef2e --- /dev/null +++ b/pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch @@ -0,0 +1,69 @@ +From 791d42ddacad829d19a4f66b77dc9ca410008db9 Mon Sep 17 00:00:00 2001 +From: Emily +Date: Sat, 13 Sep 2025 03:16:16 +0100 +Subject: [PATCH] Use `dladdr` to keep `libtbbmalloc` loaded on POSIX + +This fixes issues that arise when `libtbbmalloc` cannot be loaded by +relative path, makes the behaviour consistent with the Windows code +path, and eliminates the duplication of `MALLOCLIB_NAME`. +--- + src/tbbmalloc/tbbmalloc.cpp | 34 +++++++++------------------------- + 1 file changed, 9 insertions(+), 25 deletions(-) + +diff --git a/src/tbbmalloc/tbbmalloc.cpp b/src/tbbmalloc/tbbmalloc.cpp +index b72e03a74f..12d62445aa 100644 +--- a/src/tbbmalloc/tbbmalloc.cpp ++++ b/src/tbbmalloc/tbbmalloc.cpp +@@ -1,5 +1,5 @@ + /* +- Copyright (c) 2005-2023 Intel Corporation ++ Copyright (c) 2005-2025 Intel Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. +@@ -32,25 +32,6 @@ + namespace rml { + namespace internal { + +-#if TBB_USE_DEBUG +-#define DEBUG_SUFFIX "_debug" +-#else +-#define DEBUG_SUFFIX +-#endif /* TBB_USE_DEBUG */ +- +-// MALLOCLIB_NAME is the name of the oneTBB memory allocator library. +-#if _WIN32||_WIN64 +-#define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll" +-#elif __APPLE__ +-#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".2.dylib" +-#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__ +-#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so" +-#elif __unix__ +-#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX __TBB_STRING(.so.2) +-#else +-#error Unknown OS +-#endif +- + void init_tbbmalloc() { + #if __TBB_USE_ITT_NOTIFY + MallocInitializeITT(); +@@ -92,11 +73,14 @@ struct RegisterProcessShutdownNotification { + RegisterProcessShutdownNotification() { + // prevents unloading, POSIX case + +- // We need better support for the library pinning +- // when dlopen can't find TBBmalloc library. +- // for example: void *ret = dlopen(MALLOCLIB_NAME, RTLD_NOW); +- // MALLOC_ASSERT(ret, "Allocator can't load itself."); +- dlopen(MALLOCLIB_NAME, RTLD_NOW); ++ Dl_info dlinfo; ++ int ret = dladdr((void*)&init_tbbmalloc, &dlinfo); ++ MALLOC_ASSERT(ret && dlinfo.dli_fname, "Allocator can't find itself."); ++ tbb::detail::suppress_unused_warning(ret); ++ ++ void* lib = dlopen(dlinfo.dli_fname, RTLD_NOW); ++ MALLOC_ASSERT(lib, "Allocator can't load itself."); ++ tbb::detail::suppress_unused_warning(lib); + } + + RegisterProcessShutdownNotification(RegisterProcessShutdownNotification&) = delete; diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index 53d7878764d0..807ca45e9038 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation (finalAttrs: { # ./fix-32-bit-powerpc-build.patch + + # Fix an assumption that `libtbbmalloc` can pass a relative path to + # `dlopen(3)` to find itself. This caused mysterious crashes on + # macOS, where we do not use run paths by default. + # + # + ./fix-libtbbmalloc-dlopen.patch ]; nativeBuildInputs = [ From 052b3cf0e2137e7f18fb9bc671ae7681abd4efc9 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 13 Sep 2025 06:11:10 +0100 Subject: [PATCH 088/126] treewide: tbb_2021 -> tbb_2022 Everything that built with `tbb_2021` builds successfully with `tbb_2022` on `aarch64-linux`, and `tbb_2022` no longer causes crashes on Darwin. --- pkgs/applications/misc/prusa-slicer/default.nix | 8 ++++---- pkgs/by-name/au/autotier/package.nix | 4 ++-- pkgs/by-name/ba/bambu-studio/package.nix | 4 ++-- pkgs/by-name/bl/blender/package.nix | 2 +- pkgs/by-name/ca/cabinpkg/package.nix | 4 ++-- pkgs/by-name/li/libblake3/package.nix | 5 ++--- pkgs/by-name/li/libloot/package.nix | 4 ++-- pkgs/by-name/ma/manifold/package.nix | 6 +++--- pkgs/by-name/na/naja/package.nix | 4 ++-- pkgs/by-name/or/orca-slicer/package.nix | 4 ++-- pkgs/by-name/pd/pdf4qt/package.nix | 4 ++-- pkgs/by-name/sa/salmon/package.nix | 4 ++-- pkgs/by-name/sc/scipopt-papilo/package.nix | 4 ++-- pkgs/by-name/sc/scipopt-scip/package.nix | 4 ++-- pkgs/by-name/su/supercell-wx/package.nix | 4 ++-- pkgs/by-name/to/todds/package.nix | 4 ++-- pkgs/by-name/ue/ueberzugpp/package.nix | 4 ++-- pkgs/development/libraries/embree/2.x.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +++--- 19 files changed, 40 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 929b169a254d..dd149014ae99 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -27,7 +27,7 @@ opencascade-occt_7_6_1, openvdb, qhull, - tbb_2021, + tbb_2022, wxGTK32, xorg, libbgcode, @@ -54,7 +54,7 @@ let hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; }; }); - openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021; }; + openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; }; wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override; opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override; @@ -122,9 +122,9 @@ stdenv.mkDerivation (finalAttrs: { nanosvg-fltk nlopt opencascade-override' - openvdb_tbb_2021_8 + openvdb_tbb_2022 qhull - tbb_2021 + tbb_2022 wxGTK-override' xorg.libX11 libbgcode diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix index bf044574432b..ffd7a0679cd9 100644 --- a/pkgs/by-name/au/autotier/package.nix +++ b/pkgs/by-name/au/autotier/package.nix @@ -8,7 +8,7 @@ boost, fuse3, lib45d, - tbb_2021, + tbb_2022, liburing, installShellFiles, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { boost fuse3 lib45d - tbb_2021 + tbb_2022 liburing ]; diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 6a0b15c2e750..4efb631789db 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -34,7 +34,7 @@ opencv, pcre, systemd, - tbb_2021, + tbb_2022, webkitgtk_4_1, wxGTK31, xorg, @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { opencascade-occt_7_6 openvdb pcre - tbb_2021 + tbb_2022 webkitgtk_4_1 wxGTK' xorg.libX11 diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index e2606a869b68..972b702ce663 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -257,7 +257,7 @@ stdenv'.mkDerivation (finalAttrs: { libsndfile libtiff libwebp - (manifold.override { tbb_2021 = tbb; }) + manifold opencolorio openexr openimageio diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix index 31d35851dcf8..d8144db6aa42 100644 --- a/pkgs/by-name/ca/cabinpkg/package.nix +++ b/pkgs/by-name/ca/cabinpkg/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - tbb_2021, + tbb_2022, libgit2, curl, fmt, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 fmt - tbb_2021 + tbb_2022 nlohmann_json curl ]; diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index ec149e70c696..ada016a4383e 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -4,7 +4,7 @@ cmake, fetchFromGitHub, fetchpatch, - tbb_2021, + tbb_2022, useTBB ? true, }: @@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = lib.optionals useTBB [ - # 2022.0 crashes on macOS at the moment - tbb_2021 + tbb_2022 ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index c73045bca47e..898b59d43b1f 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -18,7 +18,7 @@ gtest, icu, spdlog, - tbb_2021, + tbb_2022, yaml-cpp, }: @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { gtest icu (spdlog.override { fmt = fmt_11; }) - tbb_2021 + tbb_2022 finalAttrs.passthru.yaml-cpp # has merge-key support finalAttrs.passthru.libloadorder diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 50c41e0bbdf9..10a3dd62ae49 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -6,7 +6,7 @@ clipper2, gtest, glm, - tbb_2021, + tbb_2022, python3Packages, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest glm - tbb_2021 + tbb_2022 ]; propagatedBuildInputs = [ clipper2 ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tbb = tbb_2021; + tbb = tbb_2022; tests = { python = python3Packages.manifold3d; }; diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 2995a4089267..9dcf95e28752 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -11,7 +11,7 @@ pkg-config, python3, sphinx, - tbb_2021, + tbb_2022, buildPackages, nix-update-script, }: @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { boost capnproto # cmake modules flex # include dir - tbb_2021 + tbb_2022 python3 ]; diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 763b957d7835..b8c2e79c6b3e 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -34,7 +34,7 @@ opencv, pcre, systemd, - tbb_2021, + tbb_2022, webkitgtk_4_1, wxGTK31, xorg, @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { opencascade-occt_7_6 openvdb pcre - tbb_2021 + tbb_2022 webkitgtk_4_1 wxGTK' xorg.libX11 diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index 174140744327..94b114e535bf 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -8,7 +8,7 @@ qt6, wrapGAppsHook3, openjpeg, - tbb_2021, + tbb_2022, blend2d, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtspeech lcms openjpeg - tbb_2021 + tbb_2022 blend2d ]; diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix index 0d2250c77f07..8cc252a4ba82 100644 --- a/pkgs/by-name/sa/salmon/package.nix +++ b/pkgs/by-name/sa/salmon/package.nix @@ -13,7 +13,7 @@ libiconv, libstaden-read, pkg-config, - tbb_2021, + tbb_2022, xz, zlib, }: @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { jemalloc libgff libstaden-read - tbb_2021 + tbb_2022 xz zlib ] diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index ea38ed196a9a..71c1daf2189a 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -6,7 +6,7 @@ boost, blas, gmp, - tbb_2021, + tbb_2022, gfortran, }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { gmp gfortran boost - tbb_2021 + tbb_2022 ]; cmakeFlags = [ diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index f6a2efe88a67..0665343dd089 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -11,7 +11,7 @@ scipopt-papilo, scipopt-zimpl, ipopt, - tbb_2021, + tbb_2022, boost, gfortran, criterion, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gmp readline zlib - tbb_2021 + tbb_2022 boost gfortran criterion diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index 76e9b05dc7b0..2a6c1aa148f6 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -24,7 +24,7 @@ gtest, glm, qt6, - tbb_2021, + tbb_2022, tracy, replaceVars, python3, @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { aws-sdk-cpp howard-hinnant-date boost - tbb_2021 + tbb_2022 glew geos spdlog diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix index f6d0a9baca64..9712ba56802e 100644 --- a/pkgs/by-name/to/todds/package.nix +++ b/pkgs/by-name/to/todds/package.nix @@ -9,7 +9,7 @@ fmt, hyperscan, opencv, - tbb_2021, + tbb_2022, fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { fmt hyperscan opencv - tbb_2021 + tbb_2022 ]; strictDeps = true; diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 8cf7a044fbf6..419f16eb7c4d 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -7,7 +7,7 @@ openssl, zeromq, cppzmq, - tbb_2021, + tbb_2022, spdlog, libsodium, fmt, @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { openssl zeromq cppzmq - tbb_2021 + tbb_2022 spdlog libsodium fmt diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index 6ec8f1040769..d8adcf7df8a2 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ ispc - # tbb_2021 is not backward compatible + # tbb_2022 is not backward compatible tbb_2020 glfw openimageio diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aadbbeac1b37..2d888141b13c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -283,7 +283,7 @@ with pkgs; cve = with python3Packages; toPythonApplication cvelib; basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix { - tbb = tbb_2021; + tbb = tbb_2022; cereal = cereal_1_3_2; opencv = opencv.override { enableGtk3 = true; }; }; @@ -6878,7 +6878,7 @@ with pkgs; ikos = callPackage ../development/tools/analysis/ikos { inherit (llvmPackages_14) stdenv clang llvm; - tbb = tbb_2021; + tbb = tbb_2022; }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { @@ -7348,7 +7348,7 @@ with pkgs; cctag = callPackage ../development/libraries/cctag { stdenv = clangStdenv; - tbb = tbb_2021; + tbb = tbb_2022; }; ceedling = callPackage ../development/tools/ceedling { }; From 3c792df5556f708524bf1fa876a7fcabe716d24d Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 13 Sep 2025 06:11:10 +0100 Subject: [PATCH 089/126] tbb_2021: drop --- pkgs/by-name/tb/tbb_2021/package.nix | 103 --------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 pkgs/by-name/tb/tbb_2021/package.nix diff --git a/pkgs/by-name/tb/tbb_2021/package.nix b/pkgs/by-name/tb/tbb_2021/package.nix deleted file mode 100644 index 6b6b57cda145..000000000000 --- a/pkgs/by-name/tb/tbb_2021/package.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, - ninja, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tbb"; - version = "2021.12.0"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchFromGitHub { - owner = "oneapi-src"; - repo = "oneTBB"; - tag = "v${finalAttrs.version}"; - hash = "sha256-yG/Fs+3f9hNKzZ8le+W7+JDZk9hMzPsVAzbq0yTcUTc="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - patches = [ - # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch"; - hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU="; - }) - # Fix tests on FreeBSD and Windows - (fetchpatch { - name = "fix-tbb-freebsd-and-windows-tests.patch"; - url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch"; - hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4="; - }) - # Fix 32-bit PowerPC build - (fetchpatch { - url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch"; - hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg="; - }) - ]; - - patchFlags = [ - "-p1" - "--ignore-whitespace" - ]; - - # Fix build with modern gcc - # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', - NIX_CFLAGS_COMPILE = - lib.optionals stdenv.cc.isGNU [ - "-Wno-error=array-bounds" - "-Wno-error=stringop-overflow" - ] - ++ - # error: variable 'val' set but not used - lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] - ++ - # Workaround for gcc-12 ICE when using -O3 - # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; - - # Fix undefined reference errors with version script under LLVM. - NIX_LDFLAGS = lib.optionalString ( - stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17" - ) "--undefined-version"; - - # Disable failing test on musl - # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace test/CMakeLists.txt \ - --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' "" - ''; - - enableParallelBuilding = true; - - meta = { - description = "Intel Thread Building Blocks C++ Library"; - homepage = "http://threadingbuildingblocks.org/"; - license = lib.licenses.asl20; - longDescription = '' - Intel Threading Building Blocks offers a rich and complete approach to - expressing parallelism in a C++ program. It is a library that helps you - take advantage of multi-core processor performance without having to be a - threading expert. Intel TBB is not just a threads-replacement library. It - represents a higher-level, task-based parallelism that abstracts platform - details and threading mechanisms for scalability and performance. - ''; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - silvanshade - thoughtpolice - tmarkus - ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e3f64a8458c0..21ce3e841052 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2323,6 +2323,7 @@ mapAliases { taplo-lsp = taplo; # Added 2022-07-30 targetcli = targetcli-fb; # Added 2025-03-14 taro = taproot-assets; # Added 2023-07-04 + tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use tbb_2022"; # Added 2025-09-13 tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02 tclcurl = tclPackages.tclcurl; # Added 2024-10-02 tcllib = tclPackages.tcllib; # Added 2024-10-02 From 1e05afe682189faa98b70c07b0215939338363fe Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 13 Sep 2025 03:52:44 +0100 Subject: [PATCH 090/126] mold: unmark broken on Darwin `tbb_2022` no longer causes crashes. --- pkgs/by-name/mo/mold/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index 9a74b99d55a4..ebba33550537 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -127,7 +127,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/rui314/mold/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; mainProgram = "mold"; maintainers = with lib.maintainers; [ azahi ]; }; From d5e698ff16a3ceade404d7ae77b76e367731e368 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 03:58:49 +0000 Subject: [PATCH 091/126] dracula-theme: 4.0.0-unstable-2025-08-31 -> 4.0.0-unstable-2025-09-09 --- pkgs/by-name/dr/dracula-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 6e825bf2676e..9fb91e445244 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2025-08-31"; + version = "4.0.0-unstable-2025-09-09"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "1e6067a6b9246c0bddd4655d962f90e110f842f6"; - hash = "sha256-UWon2riHFD1szSQglwUBePuiTsk0znj01MZmJwvPGGM="; + rev = "6e7f9679d5f0509f4d6a847729c5eb36f9b3467e"; + hash = "sha256-leYLtwHTFIqcRaYOA/8J6+xwqnjF7hv85VV/hJc5pe8="; }; propagatedUserEnvPkgs = [ From 8e805cd1c271181298cf8310eedac8283d3fdc8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 04:28:58 +0000 Subject: [PATCH 092/126] files-cli: 2.15.88 -> 2.15.96 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index bf434d48df34..b5a16d4455b7 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.88"; + version = "2.15.96"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-qSQIXDc7x3/qDxEeTEsPA2Dwl29OW+SggkPvbe8rojI="; + hash = "sha256-HGdOlLJBnobstH0oCOMY5qSPjI+xUevTsRLQK4ubSEE="; }; - vendorHash = "sha256-HOnnfWET7p8hdhuoQyx3m7UV+Pp552CrQNxgtq0rA+w="; + vendorHash = "sha256-6J9Iw8Z5iRU+Kx7rfyG1cALEmiynPxVfnxYC9/SFpPI="; ldflags = [ "-s" From 9c3bd38d44bf7241e8053475724bc4e610aba39c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 04:51:03 +0000 Subject: [PATCH 093/126] python3Packages.gflanguages: 0.7.6 -> 0.7.7 --- pkgs/development/python-modules/gflanguages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix index d4b5399b441f..170b92c90cba 100644 --- a/pkgs/development/python-modules/gflanguages/default.nix +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.7.6"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8lhD0L3JwmogPFjL+LAdV8ewvIR4IEtuhEYlaTZXFjk="; + hash = "sha256-JR+lmwGhPR/RoskpouNzGOE9kRgvSGgzx5Xa196k0eA="; }; # Relax the dependency on protobuf 3. Other packages in the Google Fonts From 8142dc35f0838c021ae145b907268949052bc19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Sep 2025 22:05:31 -0700 Subject: [PATCH 094/126] python3Packages.libpcap: fix build It previously failed with OSError: /nix/store/0vzyp6v62bwlr70xr36iwpsxfsc6jvgq-libpcap-1.10.5/lib/libpcap.so: cannot open shared object file: No such file or directory because da89a2d075f2279a09585c1b217b8f7382817339 introduced a lib output. --- pkgs/development/python-modules/libpcap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix index e951a552af28..d23996cb0034 100644 --- a/pkgs/development/python-modules/libpcap/default.nix +++ b/pkgs/development/python-modules/libpcap/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { sed -i "/requires/s/, 'tox>=[^']*'//" pyproject.toml cat <src/libpcap/libpcap.cfg [libpcap] - LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary} + LIBPCAP = ${lib.getLib pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary} EOF ''; From 5fedfee626954701beb4188e98d16fa53bebb311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Sep 2025 22:45:56 -0700 Subject: [PATCH 095/126] python3Packages.libpcap: 1.11.0b8 -> 1.11.0b25 Changelog: https://github.com/karpierz/libpcap/blob/1.11.0b25/CHANGES.rst --- pkgs/development/python-modules/libpcap/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix index d23996cb0034..7ac9f785a71e 100644 --- a/pkgs/development/python-modules/libpcap/default.nix +++ b/pkgs/development/python-modules/libpcap/default.nix @@ -13,18 +13,17 @@ buildPythonPackage rec { pname = "libpcap"; - version = "1.11.0b8"; - format = "pyproject"; + version = "1.11.0b25"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-6XhEVOO2Z2rFZiMz4d32tTR+xUu1KdMdDjChmt2wsQo="; + hash = "sha256-GzrTqpkiKJjWBuZ7ez707BGZez9wXB96psygDQykO6c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # tox is listed in build requirements but not actually used to build # keeping it as a requirement breaks the build unnecessarily @@ -36,7 +35,7 @@ buildPythonPackage rec { EOF ''; - propagatedBuildInputs = [ + buildInputs = [ dbus.lib pkgsLibpcap pkg-about From 7dd7cc4d5fa31b8f09f395cf0463d8c0538c7973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Sep 2025 22:50:04 -0700 Subject: [PATCH 096/126] python3Packages.skytemple-ssb-emulator: fix build by using pkgs.libpcap It used to fail with Run-time dependency pcap found: NO (tried pkgconfig and config-tool) meson.build:15:11: ERROR: Dependency "pcap" not found, tried pkgconfig and config-tool because python3Packages.libpcap was being used instead. --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dac11ca3e051..fa2c0ceea30b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16878,7 +16878,9 @@ self: super: with self; { skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { }; - skytemple-ssb-emulator = callPackage ../development/python-modules/skytemple-ssb-emulator { }; + skytemple-ssb-emulator = callPackage ../development/python-modules/skytemple-ssb-emulator { + inherit (pkgs) libpcap; + }; slack-bolt = callPackage ../development/python-modules/slack-bolt { }; From cc47d509422f1d608a73ac029b3cca36bbdc7cf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 06:12:21 +0000 Subject: [PATCH 097/126] terraform-providers.rootly: 3.6.1 -> 3.6.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c915865d7c70..a243db3e15a0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1138,11 +1138,11 @@ "vendorHash": "sha256-vsnihN98O5RzMZk5YNycCnjpvxklQoLbZolCJXbJRMU=" }, "rootly": { - "hash": "sha256-8ktCllrqpv0woEPfMkaZ0Ns+1JU9KRGANSgTfqsavgU=", + "hash": "sha256-EPEzAftXvnusDQc9JBUHCmtuAsNFarl9yQl/fGekQ3w=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v3.6.1", + "rev": "v3.6.2", "spdx": "MPL-2.0", "vendorHash": "sha256-39OiEYntUmX2fJZh7G/LcCNFXFmHwdLgFGYz6BUEyOA=" }, From 86c077d22b33e82d2d6ee4468b22b88968e4fbd6 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 14 Sep 2025 15:09:52 +0800 Subject: [PATCH 098/126] virtual-ans: update src hash --- pkgs/by-name/vi/virtual-ans/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/virtual-ans/package.nix b/pkgs/by-name/vi/virtual-ans/package.nix index 1cd96f7f8e99..88a6c1bd858e 100644 --- a/pkgs/by-name/vi/virtual-ans/package.nix +++ b/pkgs/by-name/vi/virtual-ans/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; - sha256 = "sha256-tqR7icgURUFOyLJ8+mS17JRf2gK53I2FW/2m8IJPtJE="; + hash = "sha256-QrYWTRYCh1YYJFtBukC2kUNoiRlsAJOD1NdB9rcx7yM="; }; nativeBuildInputs = [ From 5488e373cfcb32263f024cb8832f819a416d46d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 07:22:08 +0000 Subject: [PATCH 099/126] jwx: 3.0.10 -> 3.0.11 --- pkgs/by-name/jw/jwx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix index ddccadebc302..a8e329064aac 100644 --- a/pkgs/by-name/jw/jwx/package.nix +++ b/pkgs/by-name/jw/jwx/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "jwx"; - version = "3.0.10"; + version = "3.0.11"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = "jwx"; tag = "v${finalAttrs.version}"; - hash = "sha256-vOPDypgoTyI1zVxoRReJyZEh7mErAy1jPj/5uXP1hWs="; + hash = "sha256-TGB6dMybvMH/mXlNwnj63kOrj56mbEFTQSVfphnQJfY="; }; vendorHash = "sha256-7lMvSwLi588UBI31YDi/VqyAqwUjWUwjOZbxE3fZQWU="; From baa35fb3cd45d75c9e4e4466a191e6c99c3b2d31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 08:00:12 +0000 Subject: [PATCH 100/126] python3Packages.pyannote-audio: 3.3.2 -> 3.4.0 --- pkgs/development/python-modules/pyannote-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index 9e239ec88fdc..cb84291abbc4 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyannote-audio"; - version = "3.3.2"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "pyannote"; repo = "pyannote-audio"; tag = version; - hash = "sha256-Qx7NDXkT3eQr9PZXlYuoJD01dzsVCvfq6HNPnyLzyAQ="; + hash = "sha256-NnwJJasObePBYWBnuVzOLFz2eqOHoOA6W5CzAEpkDV4="; fetchSubmodules = true; }; From 2e4f1b14d952324b04d8a3a0f9d480c55c95c34d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 08:30:46 +0000 Subject: [PATCH 101/126] dnf5: 5.2.16.0 -> 5.2.17.0 --- pkgs/by-name/dn/dnf5/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index 4666e1106a13..414f8dcf8d5b 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.2.16.0"; + version = "5.2.17.0"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; tag = finalAttrs.version; - hash = "sha256-k71UKcKF5IdK96Q3TnAwFGoTRYmTlSO2kkPD54Bd9s8="; + hash = "sha256-bVXmpoM2ymLgqjv8+3syYhkIKSyW68eKzKhUWRfR1vY="; }; nativeBuildInputs = [ From 2411c9e7c693c0451d9adae45ab62bdab9f94214 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 08:31:37 +0000 Subject: [PATCH 102/126] python3Packages.command-runner: 1.7.4 -> 1.7.5 --- pkgs/development/python-modules/command-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index fa1faf8da38a..041499fe5076 100644 --- a/pkgs/development/python-modules/command-runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "command-runner"; - version = "1.7.4"; + version = "1.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "netinvent"; repo = "command_runner"; tag = "v${version}"; - hash = "sha256-i5VWoXHCdZtf4tJGgYvBqcMaBSSruCOkIl5ntZoSHio="; + hash = "sha256-jGYIz+c6wt137b8kG1QVVAvBAaJQAzNnZyKVeKHIk5c="; }; build-system = [ setuptools ]; From bc9ecd22aae62a87d9c714d16983799edc82cbea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 08:39:45 +0000 Subject: [PATCH 103/126] python3Packages.netbox-napalm-plugin: 0.3.2 -> 0.3.3 --- .../python-modules/netbox-napalm-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix index b80c7e1fd449..59f659f20540 100644 --- a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix +++ b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { pname = "netbox-napalm-plugin"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "netbox-community"; repo = "netbox-napalm-plugin"; tag = "v${version}"; - hash = "sha256-gaoAFToMHszCtn56Y6nczwemIAAeaijRPVW2aSt+8C4="; + hash = "sha256-qo16Bwq2a9AbO80qnQo0WtJ7HbrqqGChMJaqYYD5Aqg="; }; build-system = [ setuptools ]; From b6fb3450ea193aa81fa57105b92f41f57bec8e06 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Sat, 13 Sep 2025 12:13:20 +0200 Subject: [PATCH 104/126] matrix-continuwuity: 0.5.0-rc.6 -> 0.5.0-rc.7 --- .../ma/matrix-continuwuity/cargolock.patch | 32 ++++++++ .../ma/matrix-continuwuity/package.nix | 82 +++++++++++++++---- 2 files changed, 100 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/ma/matrix-continuwuity/cargolock.patch diff --git a/pkgs/by-name/ma/matrix-continuwuity/cargolock.patch b/pkgs/by-name/ma/matrix-continuwuity/cargolock.patch new file mode 100644 index 000000000000..aca29fdf6602 --- /dev/null +++ b/pkgs/by-name/ma/matrix-continuwuity/cargolock.patch @@ -0,0 +1,32 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 5d7192b6..ce9b1302 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3900,8 +3900,9 @@ dependencies = [ + + [[package]] + name = "resolv-conf" +-version = "0.7.4" +-source = "git+https://forgejo.ellis.link/continuwuation/resolv-conf?rev=56251316cc4127bcbf36e68ce5e2093f4d33e227#56251316cc4127bcbf36e68ce5e2093f4d33e227" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" + + [[package]] + name = "rgb" +diff --git a/Cargo.toml b/Cargo.toml +index c656e183..2942ad07 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -592,9 +592,8 @@ rev = "e4ae7628fe4fcdacef9788c4c8415317a4489941" + + # Allows no-aaaa option in resolv.conf + # Use 1-indexed line numbers when displaying parse error messages +-[patch.crates-io.resolv-conf] +-git = "https://forgejo.ellis.link/continuwuation/resolv-conf" +-rev = "56251316cc4127bcbf36e68ce5e2093f4d33e227" ++[workspace.dependencies.resolv-conf] ++version = "0.7.5" + + # + # Our crates diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index a02af10a8a25..5af8647fb9d9 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -13,35 +13,86 @@ enableBlurhashing ? true, # upstream continuwuity enables jemalloc by default, so we follow suit enableJemalloc ? true, - rust-jemalloc-sys, + rust-jemalloc-sys-unprefixed, enableLiburing ? stdenv.hostPlatform.isLinux, liburing, nixosTests, }: let - rust-jemalloc-sys' = rust-jemalloc-sys.override { - unprefixed = !stdenv.hostPlatform.isDarwin; - }; - rocksdb' = rocksdb.override { - inherit enableLiburing; - # rocksdb does not support prefixed jemalloc, which is required on darwin - enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin; - jemalloc = rust-jemalloc-sys'; - }; + rocksdb' = + (rocksdb.override { + inherit enableLiburing; + # rocksdb does not support prefixed jemalloc, which is required on darwin + enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin; + jemalloc = rust-jemalloc-sys-unprefixed; + }).overrideAttrs + ( + final: old: { + version = "10.4.2"; + src = fetchFromGitea { + domain = "forgejo.ellis.link"; + owner = "continuwuation"; + repo = "rocksdb"; + rev = "10.4.fb"; + hash = "sha256-/Hvy1yTH/0D5aa7bc+/uqFugCQq4InTdwlRw88vA5IY="; + }; + + patches = [ ]; + + cmakeFlags = + lib.subtractLists [ + # no real reason to have snappy or zlib, no one uses this + (lib.cmakeBool "WITH_SNAPPY" true) + (lib.cmakeBool "ZLIB" true) + (lib.cmakeBool "WITH_ZLIB" true) + # we dont need to use ldb or sst_dump (core_tools) + (lib.cmakeBool "WITH_CORE_TOOLS" true) + # we dont need to build rocksdb tests + (lib.cmakeBool "WITH_TESTS" true) + # we use rust-rocksdb via C interface and dont need C++ RTTI + (lib.cmakeBool "USE_RTTI" true) + # this doesn't exist in RocksDB + (lib.cmakeBool "FORCE_SSE43" true) + ] old.cmakeFlags + ++ [ + # no real reason to have snappy, no one uses this + (lib.cmakeBool "WITH_SNAPPY" false) + (lib.cmakeBool "ZLIB" false) + (lib.cmakeBool "WITH_ZLIB" false) + # we dont need to use ldb or sst_dump (core_tools) + (lib.cmakeBool "WITH_CORE_TOOLS" false) + # we dont need to build rocksdb tests + (lib.cmakeBool "WITH_TESTS" false) + # we use rust-rocksdb via C interface and dont need C++ RTTI + (lib.cmakeBool "USE_RTTI" false) + (lib.cmakeBool "WITH_TRACE_TOOLS" false) + ]; + outputs = [ "out" ]; + + # We aren't building tools, the original package uses this to make sure rocksdb + # tools work as expected. Hence we override this and make it empty. + preInstall = ""; + } + ); in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "0.5.0-rc.6"; + version = "0.5.0-rc.7"; + # Switch back to fetchFromGitea once archive download errors are fixed src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-xK/jTURQzFJ1FkF1E9cItTxXAgXgTwAiA9/8aE51FvU="; + hash = "sha256-u1k1r95qBoEizeILR5rrM5lDFz2a2NjUwM9TTi0HNjw="; }; - cargoHash = "sha256-+7k1dtrXdonFDXa2Z/qVo4n1hZRmMWEQKKlffki8+/k="; + # Patch to fix linking issue caused by resolv-conf which needs to be incorporated + # into continuwuity upstream. + cargoPatches = [ ./cargolock.patch ]; + + cargoHash = "sha256-1ECD8RZ918TM1IX3jkTDNhCR5Zye0a3ii0zeIPy8jlI="; nativeBuildInputs = [ pkg-config @@ -52,7 +103,9 @@ rustPlatform.buildRustPackage (finalAttrs: { bzip2 zstd ] - ++ lib.optional enableJemalloc rust-jemalloc-sys' + ++ lib.optional enableJemalloc [ + rust-jemalloc-sys-unprefixed + ] ++ lib.optional enableLiburing liburing; env = { @@ -76,6 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "systemd" "url_preview" "zstd_compression" + "bindgen-runtime" ] ++ lib.optional enableBlurhashing "blurhashing" ++ lib.optional enableJemalloc [ From 3c3dedfe5b525f9da5eaf2599f4a833643857add Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 10:12:59 +0000 Subject: [PATCH 105/126] gruvbox-gtk-theme: 0-unstable-2025-08-28 -> 0-unstable-2025-09-09 --- pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 318e8776fa59..512b1623cc88 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2025-08-28"; + version = "0-unstable-2025-09-09"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "2034b4ce9aa30281ff8f3af49b0e53e34a029fd7"; - hash = "sha256-OM5ZkXZxDSYtLS2CbqAjXXJM95plC7VWgvUG0qYbEJI="; + rev = "4a8a67574ef227efa9c129ce57d510c2634d53e5"; + hash = "sha256-cass0sAc6/FzNF/R8HjjGU6mFigD6hjZR/R1Nj+tk38="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 3877097778aed0b302887ae1651b9c667c8c23c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 10:18:49 +0000 Subject: [PATCH 106/126] python3Packages.gftools: 0.9.88 -> 0.9.89 --- pkgs/development/python-modules/gftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix index 5fd907f23aab..a030da9cfaac 100644 --- a/pkgs/development/python-modules/gftools/default.nix +++ b/pkgs/development/python-modules/gftools/default.nix @@ -62,14 +62,14 @@ let in buildPythonPackage rec { pname = "gftools"; - version = "0.9.88"; + version = "0.9.89"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "gftools"; tag = "v${version}"; - hash = "sha256-eCMjxqMxJ2xzPyLHoby0gmrcJVTECzUZmLywpKarDXI="; + hash = "sha256-GbnmKyhcaya0a04Ax7UtnHuB8xMbdENrSzxIVWJHGig="; }; postPatch = '' From fea626bbbf822fe9be61d60b199d45de88f6b99c Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 14 Sep 2025 13:18:23 +0200 Subject: [PATCH 107/126] python3Packages.invisible-watermark: modernize --- .../python-modules/invisible-watermark/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index 31ac39da8103..212bbbc44ae5 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, opencv-python, torch, onnx, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "invisible-watermark"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -29,7 +30,9 @@ buildPythonPackage rec { hash = "sha256-6SjVpKFtiiLLU7tZ3hBQr0KT/YEQyywJj0e21/dJRzk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ opencv-python torch pillow @@ -92,11 +95,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "imwatermark" ]; - meta = with lib; { + meta = { description = "Library for creating and decoding invisible image watermarks"; mainProgram = "invisible-watermark"; homepage = "https://github.com/ShieldMnt/invisible-watermark"; - license = licenses.mit; - maintainers = with maintainers; [ Luflosi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Luflosi ]; }; } From 80d0c19413e6631a989be8b22d761aebb817090f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 11:21:22 +0000 Subject: [PATCH 108/126] postgresqlPackages.pg_csv: 1.0 -> 1.0.1 --- pkgs/servers/sql/postgresql/ext/pg_csv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_csv.nix b/pkgs/servers/sql/postgresql/ext/pg_csv.nix index 89629c97b2f9..294269a79a85 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_csv.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_csv.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_csv"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "PostgREST"; repo = "pg_csv"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sw9eMpzz+suotJQ2KHgT0dQAF8OGFojJIhOC8tZ750o="; + hash = "sha256-hRTNFlNUmc3mjDf0wgn4CGmHoYPQ+2yfZApzooLwgW4="; }; meta = { From 366c7d5372f20f7faf262efa99beefabad93d963 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 11:24:09 +0000 Subject: [PATCH 109/126] kubectl-explore: 0.12.0 -> 0.14.0 --- pkgs/by-name/ku/kubectl-explore/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-explore/package.nix b/pkgs/by-name/ku/kubectl-explore/package.nix index 0b1b70886dc1..9f980706dcd5 100644 --- a/pkgs/by-name/ku/kubectl-explore/package.nix +++ b/pkgs/by-name/ku/kubectl-explore/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-explore"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "keisku"; repo = "kubectl-explore"; rev = "v${version}"; - hash = "sha256-D5K1jGLoEHQEacxNhxdxDs9A9ir7qs7y1pNuBU2r//Y="; + hash = "sha256-URpoIK+5MgBvCtXyZrqwU7cVubCICkAsmfS9w/8Jgks="; }; - vendorHash = "sha256-vCL+gVf0BCqsdRU2xk1Xs3FYcKYB1z2wLpZ3TvYmJdc="; + vendorHash = "sha256-TgC8IgB9E83FBP9qrgcqPesnOyOTA5u3AsXn32kaMnU="; doCheck = false; meta = { From 5f44bfc59b06d60b5d6a6b6cc0006fb0b3d92af5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 13 Sep 2025 15:20:55 +0200 Subject: [PATCH 110/126] nixos/grafana: document how to enable drilldown when using custom plugins IMHO, it's a bit surprising that drilldown doesn't show anything when using `declarativePlugins` (and thus, the four apps are missing). Add instructions on how to get these apps back. --- nixos/modules/services/monitoring/grafana.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 8a849ad4022b..9aad9e21fa6e 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -414,7 +414,14 @@ in declarativePlugins = mkOption { type = with types; nullOr (listOf path); default = null; - description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed."; + description = '' + If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot + be manually installed. + + Keep in mind that this turns off drilldown: for this to work, you need to add + `grafana-metricsdrilldown-app`, `grafana-lokiexplore-app`, `grafana-exploretraces-app` + and `grafana-pyroscope-app` to this option. + ''; example = literalExpression "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]"; # Make sure each plugin is added only once; otherwise building # the link farm fails, since the same path is added multiple From 2821ffd6f5285dbea6bbcd00eea07e659a1df341 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 14 Sep 2025 20:33:41 +0800 Subject: [PATCH 111/126] gedit, libgedit-*: Do not update to unstable releases --- pkgs/by-name/ge/gedit/package.nix | 2 +- pkgs/by-name/li/libgedit-amtk/package.nix | 2 +- pkgs/by-name/li/libgedit-gfls/package.nix | 2 +- pkgs/by-name/li/libgedit-gtksourceview/package.nix | 2 +- pkgs/by-name/li/libgedit-tepl/package.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix index 92b370875960..829a33b64d09 100644 --- a/pkgs/by-name/ge/gedit/package.nix +++ b/pkgs/by-name/ge/gedit/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; }; meta = with lib; { homepage = "https://gitlab.gnome.org/World/gedit/gedit"; diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix index 412affb4d6c4..6210a95764c2 100644 --- a/pkgs/by-name/li/libgedit-amtk/package.nix +++ b/pkgs/by-name/li/libgedit-amtk/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; }; meta = { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk"; diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index ef62e4b8cc00..02000133db28 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { glib ]; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; }; meta = { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls"; diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 124201c92962..0d0b0f6fdaaf 100644 --- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; }; meta = with lib; { description = "Source code editing widget for GTK"; diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index 6d132e7ff89f..65f51d8ce8c0 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { libgedit-gtksourceview ]; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; }; meta = with lib; { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl"; From 70055ec60d6790ba5f593c68718a8b21273247de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 13:15:04 +0000 Subject: [PATCH 112/126] c2patool: 0.20.3 -> 0.22.0 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 5ba0b5d0d84d..b5bd4d618802 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.20.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "contentauth"; repo = "c2pa-rs"; tag = "c2patool-v${finalAttrs.version}"; - hash = "sha256-ubJyplfvQ8OOdPwhnphZl51nbAgFcZz9fMTyQCPu5cw="; + hash = "sha256-6u9L3cEFB2UIsrH8VyGxHzhZqCAjEAIBLZknmYJl/JM="; }; - cargoHash = "sha256-xp9CfHtC4g2o5QJSU/IcNVi8CXifdB9npOYbFujLht4="; + cargoHash = "sha256-wjGixVxuRHeByFiTS/WsBCTyxgLUnxq7P6qASxCU4tY="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; From e43a311b4553c45abc798d3dda37d6a32e2e3849 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 13:16:45 +0000 Subject: [PATCH 113/126] release-plz: 0.3.142 -> 0.3.147 --- pkgs/by-name/re/release-plz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 8ec0f02070a7..6d39ca32d0ac 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.142"; + version = "0.3.147"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-e+EafNBXHUAE4UjJJ7ujfd4QVxQ6AAYTpH6TmNot6jk="; + hash = "sha256-obqPPVUh5m24A3L8WlJxDK2Nbgb57tATNQ5k8JH/dN4="; }; - cargoHash = "sha256-TE2l9Mk41RBaHo/fRdXSLHc8UGiMDIY6LXc33iIDjvA="; + cargoHash = "sha256-t42CsSk6i9ABJOnzqAt5cQS4VS73yjFTzhfK8YVpMZ8="; nativeBuildInputs = [ installShellFiles From 049f81d075169cde7578f86238b06ad9a3a15817 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 14 Sep 2025 21:27:56 +0800 Subject: [PATCH 114/126] bingo: remove aaronjheng from maintainers --- pkgs/by-name/bi/bingo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/bingo/package.nix b/pkgs/by-name/bi/bingo/package.nix index b5c7235b9367..3fae35e7114c 100644 --- a/pkgs/by-name/bi/bingo/package.nix +++ b/pkgs/by-name/bi/bingo/package.nix @@ -33,6 +33,6 @@ buildGoModule (finalAttrs: { mainProgram = "bingo"; homepage = "https://github.com/bwplotka/bingo"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ ]; }; }) From 99210457d100fdf10d8f1644eb0348bbe9843ad9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 14 Sep 2025 21:30:37 +0800 Subject: [PATCH 115/126] protoscope: remove aaronjheng from maintainers --- pkgs/by-name/pr/protoscope/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/protoscope/package.nix b/pkgs/by-name/pr/protoscope/package.nix index 83a763dc6fd1..b44209b93b91 100644 --- a/pkgs/by-name/pr/protoscope/package.nix +++ b/pkgs/by-name/pr/protoscope/package.nix @@ -27,6 +27,6 @@ buildGoModule { mainProgram = "protoscope"; homepage = "https://github.com/protocolbuffers/protoscope"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ ]; }; } From ffbe86fa0f3acfede0c0adac90e0cf5e4c0e96cc Mon Sep 17 00:00:00 2001 From: Viktor Vidovic <2462414+vid14114@users.noreply.github.com> Date: Sun, 14 Sep 2025 15:45:04 +0200 Subject: [PATCH 116/126] freetube: 0.23.8 -> 0.23.9 Changelog: https://github.com/FreeTubeApp/FreeTube/releases/tag/v0.23.9-beta --- pkgs/by-name/fr/freetube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 69c1f4f3008a..9998e5b4fb14 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -20,13 +20,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.23.8"; + version = "0.23.9"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; tag = "v${finalAttrs.version}-beta"; - hash = "sha256-CHp/6/E/v6UdSe3xoB66Ot24WuZDPdmNyUG1w2w3bX0="; + hash = "sha256-KTVGmYlDOqugTbC4YQcoTUW+Ja9y1H6mwULrMkZVI0Y="; }; # Darwin requires writable Electron dist @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-ia5wLRt3Hmo4/dsB1/rhGWGJ7LMnVR9ju9lSlQZDTTg="; + hash = "sha256-CnOxWA36D9x+p/Xx6sE865MSyTgPt054SX+ASr9K7zI="; }; nativeBuildInputs = [ From d3551cd958dda82cd26fbab5db92992233298e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sun, 14 Sep 2025 15:46:44 +0200 Subject: [PATCH 117/126] eza: 0.23.2 -> 0.23.3 changelog: https://github.com/eza-community/eza/releases/tag/v0.23.3 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 6396949cca30..1afadd6cc48b 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-7YQj2QYWn4GHSYBX8MlqPjdFZMpP1ZdzEHInMJaesKc="; + hash = "sha256-z9lG2Ht8Kn/QxmxWqMV27iYGHdUwaz87ayLAZdKJPvQ="; }; - cargoHash = "sha256-QS6iQP5PBHKcQEsr97FawUCkMCswAYg7Ua2ZeIvL7CM="; + cargoHash = "sha256-Izogi+IWOwAuaOBs+99UzuzwIzzfCM8pqo3xZuutYI8="; nativeBuildInputs = [ cmake From bccf4f6b022db544f3c5964082635adcf46323c9 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 13 Sep 2025 13:20:41 +0900 Subject: [PATCH 118/126] opencode: 0.7.1 -> 0.8.0 https://github.com/sst/opencode/releases/tag/v0.7.2 https://github.com/sst/opencode/releases/tag/v0.7.3 https://github.com/sst/opencode/releases/tag/v0.7.4 https://github.com/sst/opencode/releases/tag/v0.7.5 https://github.com/sst/opencode/releases/tag/v0.7.7 https://github.com/sst/opencode/releases/tag/v0.7.8 https://github.com/sst/opencode/releases/tag/v0.7.9 https://github.com/sst/opencode/releases/tag/v0.8.0 Signed-off-by: misilelab --- pkgs/by-name/op/opencode/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 4b652eb0f54f..f99c569ce2bb 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-RU4Qq2xGPOdK/GxHAcAaJYrx31ZhZ/fFuOmvyqqr538="; + hash = "sha256-Bpxb9BLMxF2z42Ok/yVxEvVmmKxh+WWY2kHyCAHrCx4="; }; tui = buildGoModule { @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { modRoot = "packages/tui"; - vendorHash = "sha256-u7jomV6lzr5QMICJ20ED6oAe7euXjsRUjuPl/YiTBfk="; + vendorHash = "sha256-de5FtS7iMrbmoLlIjdfrxs2OEI/f1dfU90GIJbvdO50="; subPackages = [ "cmd/opencode" ]; From 3afc10fb438b3d91825167d2d5eabd953c1012c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 14:32:24 +0000 Subject: [PATCH 119/126] kubectl-ai: 0.0.23 -> 0.0.25 --- pkgs/by-name/ku/kubectl-ai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix index 6e4e65668f91..f567bda5d219 100644 --- a/pkgs/by-name/ku/kubectl-ai/package.nix +++ b/pkgs/by-name/ku/kubectl-ai/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubectl-ai"; - version = "0.0.23"; + version = "0.0.25"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubectl-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-rQJHgBBMTDIa2CrWlxLubZ446PqFz5ejiFyrYRb3jec="; + hash = "sha256-ORCOZ0U8BEpLfKa7s8Z/7spmdKebf+F2IpP252s/vQk="; }; - vendorHash = "sha256-fvkaVdQlDT+95UTaN/zCIX8924MDoKam49U8lbq6yLs="; + vendorHash = "sha256-l+KHc5RJKqoXTbCIM8mAbuSWBMofgqLsYltgr0ZgfWM="; # Build the main command subPackages = [ "cmd" ]; From 72b7736bfcd8084076cec23e8e62e93a700c407c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Sep 2025 23:00:34 -0700 Subject: [PATCH 120/126] supersonic: add meta.changelog --- pkgs/by-name/su/supersonic/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 88e04130a5f5..c89aa1c23c17 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-NzgmkxG58XvaxcIcu9J0VeRjCQ922rJOp3IWX49dgIU="; }; @@ -88,13 +88,14 @@ buildGoModule rec { }) ]; - meta = with lib; { + meta = { mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland"; description = "Lightweight cross-platform desktop client for Subsonic music servers"; homepage = "https://github.com/dweymouth/supersonic"; - platforms = platforms.linux ++ lib.optionals (!waylandSupport) platforms.darwin; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + changelog = "https://github.com/dweymouth/supersonic/releases/tag/${src.tag}"; + platforms = lib.platforms.linux ++ lib.optionals (!waylandSupport) lib.platforms.darwin; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ zane sochotnicky ]; From d026dc08a40a773192cba9fdbd0ce7d473134c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Sep 2025 00:19:56 +0200 Subject: [PATCH 121/126] intel-graphics-compiler: remove buildWithPatches flag and always use patches --- pkgs/by-name/in/intel-graphics-compiler/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 00ff791d94ec..8b368585fa6d 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -14,8 +14,6 @@ spirv-tools, spirv-headers, spirv-llvm-translator, - - buildWithPatches ? true, }: let @@ -27,7 +25,7 @@ let }; inherit (llvmPackages_15) lld llvm; - inherit (if buildWithPatches then opencl-clang else llvmPackages_15) clang libclang; + inherit (opencl-clang) clang libclang; spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; # Handholding the braindead build script From 92c3937bc7ee35bcee06d1533f824b012dcb4fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Sep 2025 19:18:39 +0200 Subject: [PATCH 122/126] intel-graphics-compiler: move opencl-clang into the package Co-authored-by: Emily --- .../in/intel-graphics-compiler/package.nix | 114 ++++++++++------- .../op/opencl-clang/opencl-headers-dir.patch | 25 ---- pkgs/by-name/op/opencl-clang/package.nix | 115 ------------------ pkgs/top-level/aliases.nix | 1 + 4 files changed, 70 insertions(+), 185 deletions(-) delete mode 100644 pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch delete mode 100644 pkgs/by-name/op/opencl-clang/package.nix diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 8b368585fa6d..60ce83a6aefd 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -2,80 +2,105 @@ lib, stdenv, fetchFromGitHub, - bash, cmake, - runCommandLocal, + ninja, + git, bison, flex, + zlib, intel-compute-runtime, - llvmPackages_15, - opencl-clang, python3, spirv-tools, spirv-headers, - spirv-llvm-translator, }: -let - vc_intrinsics_src = fetchFromGitHub { - owner = "intel"; - repo = "vc-intrinsics"; - rev = "v0.23.1"; - hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc="; - }; - - inherit (llvmPackages_15) lld llvm; - inherit (opencl-clang) clang libclang; - spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; - - # Handholding the braindead build script - # cmake requires an absolute path - prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ - ''; -in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; version = "2.16.0"; - src = fetchFromGitHub { - owner = "intel"; - repo = "intel-graphics-compiler"; - tag = "v${version}"; - hash = "sha256-vtVktc77OT7OANVXnLvEQx+NEQBPrTE5FFynXhpsK7o="; - }; + # See the repository for expected versions: + # + srcs = [ + (fetchFromGitHub { + name = "igc"; + owner = "intel"; + repo = "intel-graphics-compiler"; + tag = "v${version}"; + hash = "sha256-vtVktc77OT7OANVXnLvEQx+NEQBPrTE5FFynXhpsK7o="; + }) + (fetchFromGitHub { + name = "llvm-project"; + owner = "llvm"; + repo = "llvm-project"; + tag = "llvmorg-15.0.7"; + hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; + }) + (fetchFromGitHub { + name = "vc-intrinsics"; + owner = "intel"; + repo = "vc-intrinsics"; + tag = "v0.23.1"; + hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc="; + }) + (fetchFromGitHub { + name = "opencl-clang"; + owner = "intel"; + repo = "opencl-clang"; + tag = "v15.0.3"; + hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw=="; + }) + (fetchFromGitHub { + name = "llvm-spirv"; + owner = "KhronosGroup"; + repo = "SPIRV-LLVM-Translator"; + tag = "v15.0.15"; + hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ="; + }) + ]; + + sourceRoot = "."; + + cmakeDir = "../igc"; + + postUnpack = '' + chmod -R +w . + mv opencl-clang llvm-spirv llvm-project/llvm/projects/ + ''; postPatch = '' - substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ + substituteInPlace igc/IGC/AdaptorOCL/igc-opencl.pc.in \ --replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ --replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib" - chmod +x IGC/Scripts/igc_create_linker_script.sh - patchShebangs --build IGC/Scripts/igc_create_linker_script.sh + chmod +x igc/IGC/Scripts/igc_create_linker_script.sh + patchShebangs --build igc/IGC/Scripts/igc_create_linker_script.sh + + # The build system only applies patches when the sources are in a + # Git repository. + git -C llvm-project init + git -C llvm-project -c user.name=nixbld -c user.email= commit --allow-empty -m stub + substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \ + --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ' \ + 'COMMAND patch -p1 --ignore-whitespace -i ' ''; nativeBuildInputs = [ - bash bison cmake flex + git + ninja (python3.withPackages ( ps: with ps; [ mako pyyaml ] )) + zlib ]; buildInputs = [ - lld - llvm spirv-headers - spirv-llvm-translator' spirv-tools ]; @@ -85,11 +110,10 @@ stdenv.mkDerivation rec { doCheck = false; cmakeFlags = [ - "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" - "-DCCLANG_BUILD_PREBUILDS=ON" - "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" - "-DIGC_OPTION__VC_INTRINSICS_MODE=Source" + "-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS=ON" + "-DSPIRV-Headers_INCLUDE_DIR=${spirv-headers}/include" + "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" "-Wno-dev" ]; @@ -100,7 +124,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; homepage = "https://github.com/intel/intel-graphics-compiler"; - changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${src.rev}"; + changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch b/pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch deleted file mode 100644 index 70343b8ee197..000000000000 --- a/pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt -index 3dd2ea4..aeae6e9 100644 ---- a/cl_headers/CMakeLists.txt -+++ b/cl_headers/CMakeLists.txt -@@ -11,12 +11,14 @@ add_custom_command( - ) - endfunction(copy_file) - --if(USE_PREBUILT_LLVM) -- set(OPENCL_HEADERS_DIR -- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/") --else(USE_PREBUILT_LLVM) -- set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers") --endif(USE_PREBUILT_LLVM) -+if(NOT DEFINED OPENCL_HEADERS_DIR) -+ if(USE_PREBUILT_LLVM) -+ set(OPENCL_HEADERS_DIR -+ "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/") -+ else(USE_PREBUILT_LLVM) -+ set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers") -+ endif(USE_PREBUILT_LLVM) -+endif() - copy_file(${OPENCL_HEADERS_DIR}/opencl-c.h opencl-c.h) - - add_custom_target ( diff --git a/pkgs/by-name/op/opencl-clang/package.nix b/pkgs/by-name/op/opencl-clang/package.nix deleted file mode 100644 index 265d1c38d8dc..000000000000 --- a/pkgs/by-name/op/opencl-clang/package.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ - lib, - stdenv, - applyPatches, - fetchFromGitHub, - cmake, - git, - llvmPackages_15, - spirv-llvm-translator, - buildWithPatches ? true, -}: - -let - addPatches = - component: pkg: - pkg.overrideAttrs (oldAttrs: { - postPatch = oldAttrs.postPatch or "" + '' - for p in ${passthru.patchesOut}/${component}/*; do - patch -p1 -i "$p" - done - ''; - }); - - llvmPkgs = llvmPackages_15; - inherit (llvmPkgs) llvm; - spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; - libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang; - - passthru = rec { - spirv-llvm-translator = spirv-llvm-translator'; - llvm = addPatches "llvm" llvmPkgs.llvm; - libclang = addPatches "clang" llvmPkgs.libclang; - - clang-unwrapped = libclang.out; - clang = llvmPkgs.clang.override { - cc = clang-unwrapped; - }; - - patchesOut = stdenv.mkDerivation { - pname = "opencl-clang-patches"; - inherit version src; - # Clang patches assume the root is the llvm root dir - # but clang root in nixpkgs is the clang sub-directory - postPatch = '' - for filename in patches/clang/*.patch; do - substituteInPlace "$filename" \ - --replace-fail "a/clang/" "a/" \ - --replace-fail "b/clang/" "b/" - done - ''; - - installPhase = '' - [ -d patches ] && cp -r patches/ $out || mkdir $out - mkdir -p $out/clang $out/llvm - ''; - }; - }; - - version = "15.0.3"; - src = applyPatches { - src = fetchFromGitHub { - owner = "intel"; - repo = "opencl-clang"; - tag = "v${version}"; - hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw="; - }; - - patches = [ - # Build script tries to find Clang OpenCL headers under ${llvm} - # Work around it by specifying that directory manually. - ./opencl-headers-dir.patch - ]; - - postPatch = '' - # fix not be able to find clang from PATH - substituteInPlace cl_headers/CMakeLists.txt \ - --replace-fail " NO_DEFAULT_PATH" "" - ''; - }; -in - -stdenv.mkDerivation { - pname = "opencl-clang"; - inherit version src; - - nativeBuildInputs = [ - cmake - git - llvm.dev - ]; - - buildInputs = [ - libclang - llvm - spirv-llvm-translator' - ]; - - cmakeFlags = [ - "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${lib.getLib libclang}/lib/clang/${lib.getVersion libclang}/include/" - - "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" - "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}" - ]; - - inherit passthru; - - meta = { - homepage = "https://github.com/intel/opencl-clang/"; - description = "Clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; - license = lib.licenses.ncsa; - maintainers = [ lib.maintainers.SuperSandro2000 ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 217b22bcb254..1445901830d0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1790,6 +1790,7 @@ mapAliases { opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 openafs_1_8 = openafs; # Added 2022-08-22 + opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 openconnect_gnutls = openconnect; # Added 2022-03-29 From 85d5dc66081df1862ea8cc91f045d2382a20afcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Sep 2025 09:29:05 -0700 Subject: [PATCH 123/126] paperless-ngx: unpin ocrmypdf --- pkgs/by-name/pa/paperless-ngx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index d428e0d4aac0..38a4ccf41d43 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -169,6 +169,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "django-allauth" "filelock" + "ocrmypdf" "rapidfuzz" "redis" ]; From 3d256aaf8adcbb30f007bc1859adbe9e7ad0b3be Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 13 Sep 2025 12:56:31 -0400 Subject: [PATCH 124/126] aliases: cleanup correct extra "throw", punctuation, and vtk_9_withQt5, also add missing dates Co-authored-by: Wolfgang Walther --- pkgs/top-level/aliases.nix | 389 +++++++++++++++++-------------------- 1 file changed, 181 insertions(+), 208 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 78a8c4b385be..0e2a8765f49b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -374,7 +374,7 @@ mapAliases { _2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07 _2048-cli-curses = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07 _2048-cli-terminal = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07 - _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; + _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; # Added 2025-05-05 "7z2hashcat" = throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27 @@ -387,7 +387,7 @@ mapAliases { acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04 adminer-pematon = adminneo; # Added 2025-02-20 adminerneo = adminneo; # Added 2025-02-27 - adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; + adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; # Added 2024-02-14 adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31 adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09 adoptopenjdk-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin`"; # Added 2024-05-09 @@ -414,7 +414,7 @@ mapAliases { aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17 - agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" + agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10 ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12 akkoma-emoji = recurseIntoAttrs { blobs_gg = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14 @@ -436,7 +436,7 @@ mapAliases { ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08 ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24 - antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 + antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09 androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09 androidndkPkgs_23b = throw "androidndkPkgs_23b has been removed, as it is EOL"; # Added 2025-08-09 @@ -482,7 +482,7 @@ mapAliases { autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21 autoconf264 = throw "'autoconf264' has been removed in favor of 'autoconf'"; # Added 2025-07-21 automake111x = throw "'automake111x' has been removed in favor of 'automake'"; # Added 2025-07-21 - autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve + autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve, reason: common typo autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 @@ -499,7 +499,7 @@ mapAliases { backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22 badtouch = authoscope; # Project was renamed, added 20210626 badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15 - baget = throw "'baget' has been removed due to being unmaintained"; + baget = throw "'baget' has been removed due to being unmaintained"; # Added 2023-03-19 bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01 banking = saldo; # added 2025-08-29 base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03 @@ -516,9 +516,9 @@ mapAliases { betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27 - bitcoin-abc = throw "bitcoin-abc has been removed due to a lack of maintanance"; # Added 2026-06-17 + bitcoin-abc = throw "bitcoin-abc has been removed due to a lack of maintanance"; # Added 2025-06-17 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 - bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintanance"; # Added 2026-06-17 + bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintanance"; # Added 2025-06-17 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bird = throw "The bird alias was ambiguous and has been removed for the time being. Please explicitly choose bird2 or bird3."; # Added 2025-01-11 bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17 @@ -555,17 +555,15 @@ mapAliases { buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12 bwidget = tclPackages.bwidget; # Added 2024-10-02 - # Shorter names; keep the longer name for back-compat. Added 2023-04-11. Warning added on 2024-12-16. Removed on 2025-05-31 - buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11"; - buildFHSUserEnvChroot = throw "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and was removed in 25.11"; - buildFHSUserEnvBubblewrap = throw "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and was removed in 25.11"; + buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11"; # Converted to throw 2025-06-01 + buildFHSUserEnvChroot = throw "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and was removed in 25.11"; # Converted to throw 2025-06-01 + buildFHSUserEnvBubblewrap = throw "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and was removed in 25.11"; # Converted to throw 2025-06-01 - # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) - bitwarden_rs = vaultwarden; - bitwarden_rs-mysql = vaultwarden-mysql; - bitwarden_rs-postgresql = vaultwarden-postgresql; - bitwarden_rs-sqlite = vaultwarden-sqlite; - bitwarden_rs-vault = vaultwarden-vault; + bitwarden_rs = vaultwarden; # Added 2021-07-01 + bitwarden_rs-mysql = vaultwarden-mysql; # Added 2021-07-01 + bitwarden_rs-postgresql = vaultwarden-postgresql; # Added 2021-07-01 + bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01 + bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01 ### C ### @@ -574,12 +572,12 @@ mapAliases { calculix = calculix-ccx; # Added 2024-12-18 calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; - cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; + cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; # Added 2025-01-29 cask = emacs.pkgs.cask; # Added 2022-11-12 catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 - cargo-espflash = espflash; + cargo-espflash = espflash; # Added 2024-02-09 cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 cargo-information = throw "'cargo-information' has been removed due to being merged upstream into 'cargo'"; # Added 2025-03-09 cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26 @@ -587,7 +585,7 @@ mapAliases { cargonode = throw "'cargonode' has been removed due to lack of upstream maintenance"; # Added 2025-06-18 cassandra_3_0 = throw "'cassandra_3_0' has been removed has it reached end-of-life"; # Added 2025-03-23 cassandra_3_11 = throw "'cassandra_3_11' has been removed has it reached end-of-life"; # Added 2025-03-23 - cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; + cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; # Added 2023-09-05 catalyst-browser = throw "'catalyst-browser' has been removed due to a lack of maintenance and not satisfying our security criteria for browsers."; # Added 2025-06-25 cataract = throw "'cataract' has been removed due to a lack of maintenace"; # Added 2025-08-25 cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenace"; # Added 2025-08-25 @@ -697,16 +695,16 @@ mapAliases { cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 - # these are for convenience, not for backward compat and shouldn't expire + # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated. clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 - clang12Stdenv = lowPrio llvmPackages_12.stdenv; - clang13Stdenv = lowPrio llvmPackages_13.stdenv; - clang14Stdenv = lowPrio llvmPackages_14.stdenv; - clang15Stdenv = lowPrio llvmPackages_15.stdenv; - clang16Stdenv = lowPrio llvmPackages_16.stdenv; - clang17Stdenv = lowPrio llvmPackages_17.stdenv; - clang18Stdenv = lowPrio llvmPackages_18.stdenv; - clang19Stdenv = lowPrio llvmPackages_19.stdenv; + clang12Stdenv = lowPrio llvmPackages_12.stdenv; # preserve, reason: see above + clang13Stdenv = lowPrio llvmPackages_13.stdenv; # preserve, reason: see above + clang14Stdenv = lowPrio llvmPackages_14.stdenv; # preserve, reason: see above + clang15Stdenv = lowPrio llvmPackages_15.stdenv; # preserve, reason: see above + clang16Stdenv = lowPrio llvmPackages_16.stdenv; # preserve, reason: see above + clang17Stdenv = lowPrio llvmPackages_17.stdenv; # preserve, reason: see above + clang18Stdenv = lowPrio llvmPackages_18.stdenv; # preserve, reason: see above + clang19Stdenv = lowPrio llvmPackages_19.stdenv; # preserve, reason: see above clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08 clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08 @@ -729,8 +727,8 @@ mapAliases { daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21 darling = throw "'darling' has been removed due to vendoring Python2"; # Added 2025-05-10 dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17 - dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; - dat = nodePackages.dat; + dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as it is now included in Dart Sass itself."; # Added 2023-10-25 + dat = nodePackages.dat; # Added 2020-02-04 dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03 daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21 dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 @@ -742,13 +740,11 @@ mapAliases { dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25 dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25 deadpixi-sam = deadpixi-sam-unstable; - debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21 degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11 deltachat-cursed = arcanechat-tui; # added 2025-02-25 deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 - demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 devdash = throw "'devdash' has been removed as the upstream project was archived"; # Added 2025-03-27 devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11 @@ -788,14 +784,14 @@ mapAliases { dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30 dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25 dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21 - drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; + drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; # Added 2024-02-20 dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 du-dust = dust; # Added 2024-01-19 duckstation = throw "'duckstation' has been removed due to being unmaintained"; # Added 2025-08-03 duckstation-bin = throw "'duckstation-bin' has been removed due to being unmaintained"; # Added 2025-08-03 dump1090 = dump1090-fa; # Added 2024-02-12 - dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; + dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 ### E ### @@ -815,7 +811,7 @@ mapAliases { edid-decode = v4l-utils; # Added 2025-06-20 eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28 eintopf = lauti; # Project was renamed, added 2025-05-01 - elasticsearch7Plugins = elasticsearchPlugins; + elasticsearch7Plugins = elasticsearchPlugins; # preserve, reason: until v8 electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17 elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25 element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17 @@ -852,7 +848,7 @@ mapAliases { eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 - erlang_24 = throw "erlang_24 has been removed as it is unmaintained upstream"; + erlang_24 = throw "erlang_24 has been removed as it is unmaintained upstream"; # Added 2024-12-26 erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 erlang_nox = throw "erlang_nox has been removed in favor of beam_minimal.packages.erlang or beamMinimalPackages.erlang"; # added 2025-04-01 erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24 @@ -870,11 +866,9 @@ mapAliases { erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24 erlang_language_platform = throw "erlang_language_platform has been renamed erlang-language-platform"; # added 2025-04-04 - est-sfs = throw "'est-sfs' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18 - ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16 - eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; + eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; # Added 2024-02-17 ### F ### @@ -891,23 +885,23 @@ mapAliases { fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19 inherit (luaPackages) fennel; # Added 2022-09-24 ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22 - fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve + fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12 ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12 ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 filet = throw "'filet' has been removed as the upstream repo has been deleted"; # Added 2025-02-07 - finger_bsd = bsd-finger; - fingerd_bsd = bsd-fingerd; + finger_bsd = bsd-finger; # Added 2022-03-14 + fingerd_bsd = bsd-fingerd; # Added 2022-03-14 fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10 firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10 - firefox-beta-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed. Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; - firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed. Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; - firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; - firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead."; - firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; - firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; + firefox-beta-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed. Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06 + firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed. Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06 + firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; # Added 2024-10-13 + firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead."; # Added 2024-10-13 + firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21 + firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; # Added 2025-08-21 firefox-wayland = firefox; # Added 2022-11-15 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 @@ -999,8 +993,8 @@ mapAliases { gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08 gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29 - geocode-glib = throw "throw 'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16 - geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead."; + geocode-glib = throw "'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16 + geos_3_11 = throw "geos_3_11 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2024-11-29 gfbgraph = throw "'gfbgraph' has been removed as it was archived upstream and unused in nixpkgs"; # Added 2025-04-20 gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 @@ -1034,19 +1028,19 @@ mapAliases { Consider migrating to forgejo or gitea. ''; # Added 2024-10-12 - git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; + git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; # Added 2024-07-16 git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20 git-stree = throw "'git-stree' has been deprecated by upstream. Upstream recommends using 'git-subrepo' as a replacement."; # Added 2025-05-05 gitAndTools = self // { - darcsToGit = darcs-to-git; - gitAnnex = git-annex; - gitBrunch = git-brunch; - gitFastExport = git-fast-export; - gitRemoteGcrypt = git-remote-gcrypt; - svn_all_fast_export = svn-all-fast-export; - topGit = top-git; - }; # Added 2021-01-14 + darcsToGit = darcs-to-git; # Added 2021-01-14 + gitAnnex = git-annex; # Added 2021-01-14 + gitBrunch = git-brunch; # Added 2021-01-14 + gitFastExport = git-fast-export; # Added 2021-01-14 + gitRemoteGcrypt = git-remote-gcrypt; # Added 2021-01-14 + svn_all_fast_export = svn-all-fast-export; # Added 2021-01-14 + topGit = top-git; # Added 2021-01-14 + }; github-copilot-cli = throw "'github-copilot-cli' has been removed because GitHub has replaced it with 'gh-copilot'."; # Added 2025-06-01 gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30 givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07 @@ -1066,7 +1060,7 @@ mapAliases { gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gnatboot12 = throw "gnatboot12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gnat12Packages = throw "gnat12Packages has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 - gnatboot = gnat-bootstrap; + gnatboot = gnat-bootstrap; # Added 2023-04-07 gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25 gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25 gnatcoll-iconv = gnatPackages.gnatcoll-iconv; # Added 2024-02-25 @@ -1106,13 +1100,10 @@ mapAliases { gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 grafana-agent = throw "'grafana-agent' has been removed, as it only works with an EOL compiler and will become EOL during the 25.05 release. Consider migrating to 'grafana-alloy' instead"; # Added 2025-04-02 graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 - - #godot - godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; - godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; - godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; - godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; - + godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27 + godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27 + godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27 + godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; # Added 2025-03-27 go-thumbnailer = thud; # Added 2023-09-21 go-upower-notify = upower-notify; # Added 2024-07-21 googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01 @@ -1120,8 +1111,7 @@ mapAliases { gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09 gpxsee-qt6 = gpxsee; # added 2025-09-09 - - gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; + gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; # Added 2024-09-14 gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25 graalvmCEPackages = graalvmPackages; # Added 2024-08-10 graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10 @@ -1172,7 +1162,7 @@ mapAliases { hpp-fcl = coal; # Added 2024-11-15 ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17 hydra_unstable = hydra; # Added 2024-08-22 - hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; + hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; # Added 2024-08-03 hyenae = throw "hyenae has been removed because it fails to build and was unmaintained for 15 years"; # Added 2025-04-04 hyprgui = throw "hyprgui has been removed as the repository is deleted"; # Added 2024-12-27 hyprlauncher = throw "hyprlauncher has been removed as the repository is deleted"; # Added 2024-12-27 @@ -1196,7 +1186,7 @@ mapAliases { inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10 incrtcl = tclPackages.incrtcl; # Added 2024-10-02 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 - inotifyTools = inotify-tools; + inotifyTools = inotify-tools; # Added 2015-09-01 insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14 inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17 ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06 @@ -1227,7 +1217,7 @@ mapAliases { jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 - jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 + jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2024-08-07 jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25 # Julia @@ -1244,7 +1234,7 @@ mapAliases { k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take its place - kube3d = k3d; # Added 2022-0705 + kube3d = k3d; # Added 2022-07-05 kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17 kak-lsp = kakoune-lsp; # Added 2024-04-01 kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01 @@ -1262,17 +1252,17 @@ mapAliases { keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 kgx = gnome-console; # Added 2022-02-19 - kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10 - kibana = kibana7; + kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30 + kibana = kibana7; # Added 2023-10-30 kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18 kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10 kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 - kodiGBM = kodi-gbm; - kodiPlain = kodi; - kodiPlainWayland = kodi-wayland; - kodiPlugins = kodiPackages; # Added 2021-03-09; + kodiGBM = kodi-gbm; # Added 2021-03-09 + kodiPlain = kodi; # Added 2021-03-09 + kodiPlainWayland = kodi-wayland; # Added 2021-03-09 + kodiPlugins = kodiPackages; # Added 2021-03-09 kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17 - krb5Full = krb5; + krb5Full = krb5; # Added 2022-11-17 kreative-square-fonts = throw "'kreative-square-fonts' has been renamed to 'kreative-square'"; # Added 2025-04-16 krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01 @@ -1289,7 +1279,7 @@ mapAliases { LASzip2 = laszip_2; # Added 2024-06-12 lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23 latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 - latinmodern-math = lmmath; + latinmodern-math = lmmath; # Added 2020-03-17 latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 lazarus-qt = lazarus-qt5; # Added 2024-12-25 @@ -1320,7 +1310,7 @@ mapAliases { libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20 libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17 libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 - libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21 + libgda = lib.warnOnInstantiate "'libgda' has been renamed to 'libgda5'" libgda5; # Added 2025-01-21 lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 libgme = game-music-emu; # Added 2022-07-20 @@ -1329,8 +1319,8 @@ mapAliases { libgrss = throw "'libgrss' has been removed as it was archived upstream and had no users in nixpkgs"; # Added 2025-04-17 libheimdal = heimdal; # Added 2022-11-18 libhttpseverywhere = throw "'libhttpseverywhere' has been removed due to lack of upstream maintenance. It was no longer used in nixpkgs."; # Added 2025-04-17 - libiconv-darwin = darwin.libiconv; - libixp_hg = libixp; + libiconv-darwin = darwin.libiconv; # Added 2024-09-22 + libixp_hg = libixp; # Added 2022-04-25 libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 @@ -1360,7 +1350,7 @@ mapAliases { libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 libsForQt515 = libsForQt5; # Added 2022-11-24 libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03 - libsoup = lib.warnOnInstantiate "‘libsoup’ has been renamed to ‘libsoup_2_4’" libsoup_2_4; # Added 2024-12-02 + libsoup = lib.warnOnInstantiate "'libsoup' has been renamed to 'libsoup_2_4'" libsoup_2_4; # Added 2024-12-02 libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10 @@ -1370,14 +1360,14 @@ mapAliases { libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2024-10-17 libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17 libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26 - libwnck3 = libwnck; + libwnck3 = libwnck; # Added 2021-06-23 libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27 libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 libzapojit = throw "'libzapojit' has been removed due to lack of upstream maintenance and archival"; # Added 2025-04-16 licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 - lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; + lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; # Added 2023-10-18 ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03 lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13 lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22 @@ -1444,17 +1434,14 @@ mapAliases { linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - # Added 2021-04-04 - linuxPackages_xen_dom0 = linuxPackages; - linuxPackages_latest_xen_dom0 = linuxPackages_latest; - linuxPackages_xen_dom0_hardened = linuxPackages_hardened; - linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; - - # Added 2021-08-16 - linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; - linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; - linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; - linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; + linuxPackages_xen_dom0 = linuxPackages; # Added 2021-04-04 + linuxPackages_latest_xen_dom0 = linuxPackages_latest; # Added 2021-04-04 + linuxPackages_xen_dom0_hardened = linuxPackages_hardened; # Added 2021-04-04 + linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; # Added 2021-04-04 + linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; # Added 2021-08-16 + linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; # Added 2021-08-16 + linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; # Added 2021-08-16 + linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # Added 2021-08-16 linuxPackages_latest_hardened = throw '' The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches frequently lag behind the upstream kernel. In some cases this meant that this attribute @@ -1465,34 +1452,32 @@ mapAliases { and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'. [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587 - ''; - linux_latest_hardened = linuxPackages_latest_hardened; + ''; # Added 2021-08-16 + linux_latest_hardened = linuxPackages_latest_hardened; # Added 2021-08-16 - # Added 2025-08-10 - linuxPackages_hardened = linuxKernel.packages.linux_hardened; - linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; - linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; - linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; - linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; - linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; - linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; - linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; - linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; - linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; - linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; - linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; - linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; + linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10 + linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10 + linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; # Added 2025-08-10 + linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; # Added 2025-08-10 + linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; # Added 2025-08-10 + linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; # Added 2025-08-10 + linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; # Added 2025-08-10 + linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Added 2025-08-10 + linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; # Added 2025-08-10 + linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; # Added 2025-08-10 + linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; # Added 2025-08-10 + linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; # Added 2025-08-10 + linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; # Added 2025-08-10 + linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; # Added 2025-08-10 - # Added 2023-11-18, modified 2024-01-09 - linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; - linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; + linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09 + linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09 linuxstopmotion = stopmotion; # Added 2024-11-01 lixVersions = lixPackageSets.renamedDeprecatedLixVersions; # Added 2025-03-20, warning in ../tools/package-management/lix/default.nix - llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; + llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02 lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08 lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08 @@ -1512,20 +1497,13 @@ mapAliases { lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxde = { - gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; - + gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31 lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31 - lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level. Use 'lxappearance-gtk2' directly"; # added 2025-08-31 - lxmenu-data = throw "'lxmenu-data' has been moved to top-level. Use 'lxmenu-data' directly"; # added 2025-08-31 - lxpanel = throw "'lxpanel' has been moved to top-level. Use 'lxpanel' directly"; # added 2025-08-31 - lxrandr = throw "'lxrandr' has been moved to top-level. Use 'lxrandr' directly"; # added 2025-08-31 - lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31 - lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31 }; @@ -1547,7 +1525,7 @@ mapAliases { mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26 mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; # added 2019.07.28 - maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 + maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 2024-08-24 manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10 manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25 manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17 @@ -1557,29 +1535,29 @@ mapAliases { maple-mono-NF had been moved to maple-mono.NF. for installing all maple-mono: fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) - ''; + ''; # Added 2025-03-16 maple-mono-otf = throw '' maple-mono-otf had been moved to maple-mono.opentype. for installing all maple-mono: fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) - ''; + ''; # Added 2025-03-16 maple-mono-woff2 = throw '' maple-mono-woff2 had been moved to maple-mono.woff2. for installing all maple-mono: fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) - ''; + ''; # Added 2025-03-16 maple-mono-SC-NF = throw '' mono-SC-NF had been superseded by maple-mono.NF-CN. for installing all maple-mono: fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) - ''; + ''; # Added 2025-03-16 maple-mono-autohint = throw '' maple-mono-autohint had been moved to maple-mono.truetype-autohint. for installing all maple-mono: fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono) - ''; + ''; # Added 2025-03-16 - mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; + mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; # Added 2025-05-17 markets = throw "'markets' has been removed as it was archived upstream in 2023"; # Added 2025-04-17 marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 @@ -1596,8 +1574,8 @@ mapAliases { matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 matrix-synapse-tools = recurseIntoAttrs { - rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; - synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; + rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; # Added 2025-03-04 + synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; # Added 2025-02-20 }; # Added 2025-02-20 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 @@ -1606,7 +1584,7 @@ mapAliases { memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 memstream = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 memstreamHook = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 - mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; + mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; # Added 2024-09-15 microcodeAmd = microcode-amd; # Added 2024-09-08 microcodeIntel = microcode-intel; # Added 2024-09-08 micropad = throw "micropad has been removed, since it was unmaintained and blocked the Electron 27 removal."; # Added 2025-02-24 @@ -1721,7 +1699,7 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28 nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_` instead"; # Added 2025-08-14 - nagiosPluginsOfficial = monitoring-plugins; + nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07 neochat = makePlasma5Throw "neochat"; # added 2022-05-10 nerdfonts = throw '' nerdfonts has been separated into individual font packages under the namespace nerd-fonts. @@ -1743,15 +1721,11 @@ mapAliases { newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25 - nix-direnv-flakes = nix-direnv; + nix-direnv-flakes = nix-direnv; # Added 2021-11-09 nix-ld-rs = nix-ld; # Added 2024-08-17 nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06 nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18 - nix-repl = throw ( - # Added 2018-08-26 - "nix-repl has been removed because it's not maintained anymore, " - + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" - ); + nix-repl = throw "nix-repl has been removed because it's not maintained anymore, use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"; # Added 2018-08-26 nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17 @@ -1791,7 +1765,7 @@ mapAliases { nushellFull = lib.warnOnInstantiate "`nushellFull` has has been replaced by `nushell` as its features no longer exist" nushell; # Added 2024-05-30 nux = throw "nux has been removed because it has been abandoned for 4 years"; # Added 2025-03-22 nvidia-podman = throw "podman should use the Container Device Interface (CDI) instead. See https://web.archive.org/web/20240729183805/https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#configuring-podman"; # Added 2024-08-02 - nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl"; + nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated. Use cudaPackages.cuda_cccl"; # Added 2023-12-04 ### O ### @@ -1868,7 +1842,7 @@ mapAliases { oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 OSCAR = oscar; # Added 2024-06-12 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 - overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub; see for migration instructions"; # Added 2025-08-04 + overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See for migration instructions"; # Added 2025-08-04 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 oxygen-icons5 = throw '' The top-level oxygen-icons5 alias has been removed. @@ -1911,12 +1885,12 @@ mapAliases { percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13 peroxide = throw "'peroxide' has been dropped due to lack of upstream maintenance."; # Added 2025-03-31 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 - perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; - perldevelPackages = perldevel; + perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09 + perldevelPackages = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09 peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30 - pgadmin = pgadmin4; + pgadmin = pgadmin4; # Added 2022-01-14 pharo-spur64 = pharo; # Added 2022-08-03 phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27 picom-next = picom; # Added 2024-02-13 @@ -1924,7 +1898,7 @@ mapAliases { pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25 pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 - pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; + pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; # Added 2023-03-09 platformioPackages = { inherit platformio-core @@ -1935,7 +1909,7 @@ mapAliases { pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28 plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05 - pltScheme = racket; # just to be sure + pltScheme = racket; # Added 2013-02-24 poac = cabinpkg; # Added 2025-01-22 podofo010 = podofo_0_10; # Added 2025-06-01 polkit-kde-agent = throw '' @@ -2033,9 +2007,9 @@ mapAliases { protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14 protobuf_26 = throw "'protobuf_26' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-29 protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14 - protobuf3_24 = protobuf_24; - protobuf3_23 = protobuf_23; - protobuf3_21 = protobuf_21; + protobuf3_24 = protobuf_24; # Added 2023-10-05 + protobuf3_23 = protobuf_23; # Added 2023-10-05 + protobuf3_21 = protobuf_21; # Added 2023-10-05 protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18 protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 @@ -2051,8 +2025,8 @@ mapAliases { pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28 pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28 pynac = throw "'pynac' has been removed as it was broken and unmaintained"; # Added 2025-03-18 - pyo3-pack = maturin; - pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; + pyo3-pack = maturin; # Added 2019-08-30 + pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; # Added 2023-06-02 pypolicyd-spf = spf-engine; # Added 2022-10-09 pypy39Packages = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-07 python = python2; # Added 2022-01-11 @@ -2119,7 +2093,7 @@ mapAliases { restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04 retroarchBare = retroarch-bare; # Added 2024-11-23 retroarchFull = retroarch-full; # Added 2024-11-23 - retroshare06 = retroshare; + retroshare06 = retroshare; # Added 2020-11-07 rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03 responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25 rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 @@ -2144,10 +2118,10 @@ mapAliases { rr-unstable = rr; # Added 2022-09-17 rtx = mise; # Added 2024-01-05 ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24 - runCommandNoCC = runCommand; - runCommandNoCCLocal = runCommandLocal; + runCommandNoCC = runCommand; # Added 2021-08-15 + runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15 run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17 - rust-synapse-state-compress = rust-synapse-compress-state; + rust-synapse-state-compress = rust-synapse-compress-state; # Added 2025-03-08 rustc-wasm32 = rustc; # Added 2023-12-01 rustfilt = throw "'rustfilt' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 rustic-rs = rustic; # Added 2024-08-02 @@ -2183,8 +2157,8 @@ mapAliases { Please participate in upstream discussion on getting out new releases: https://github.com/SchildiChat/schildichat-desktop/issues/212 https://github.com/SchildiChat/schildichat-desktop/issues/215''; # Added 2023-12-05 - schildichat-desktop = schildichat-web; - schildichat-desktop-wayland = schildichat-web; + schildichat-desktop = schildichat-web; # Added 2023-12-07 + schildichat-desktop-wayland = schildichat-web; # Added 2023-12-07 scitoken-cpp = scitokens-cpp; # Added 2024-02-12 scry = throw "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12 scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24 @@ -2195,7 +2169,7 @@ mapAliases { sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 serial-unit-testing = throw "'serial-unit-testing' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 serious-sans = throw "'serious-sans' has been renamed to 'serious-shanns', which is not currently packaged"; # Added 2025-01-26 - session-desktop-appimage = session-desktop; + session-desktop-appimage = session-desktop; # Added 2022-08-31 setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18 sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 @@ -2207,7 +2181,7 @@ mapAliases { sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 - signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; + signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; # Added 2024-11-20 signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16 silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12 silc_client = throw "'silc_client' has been removed because it is unmaintained"; # Added 2025-05-12 @@ -2227,7 +2201,7 @@ mapAliases { slurm-llnl = slurm; # renamed July 2017 sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23 smartgithg = smartgit; # renamed March 2025 - snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; + snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # Added 2024-03-04 snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21 soldat-unstable = opensoldat; # Added 2022-07-02 soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07 @@ -2241,27 +2215,26 @@ mapAliases { spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06 sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27 - # Added 2020-02-10 sourceHanSansPackages = { - japanese = source-han-sans; - korean = source-han-sans; - simplified-chinese = source-han-sans; - traditional-chinese = source-han-sans; + japanese = source-han-sans; # Added 2020-02-10 + korean = source-han-sans; # Added 2020-02-10 + simplified-chinese = source-han-sans; # Added 2020-02-10 + traditional-chinese = source-han-sans; # Added 2020-02-10 }; - source-han-sans-japanese = source-han-sans; - source-han-sans-korean = source-han-sans; - source-han-sans-simplified-chinese = source-han-sans; - source-han-sans-traditional-chinese = source-han-sans; + source-han-sans-japanese = source-han-sans; # Added 2020-02-10 + source-han-sans-korean = source-han-sans; # Added 2020-02-10 + source-han-sans-simplified-chinese = source-han-sans; # Added 2020-02-10 + source-han-sans-traditional-chinese = source-han-sans; # Added 2020-02-10 sourceHanSerifPackages = { - japanese = source-han-serif; - korean = source-han-serif; - simplified-chinese = source-han-serif; - traditional-chinese = source-han-serif; + japanese = source-han-serif; # Added 2020-02-10 + korean = source-han-serif; # Added 2020-02-10 + simplified-chinese = source-han-serif; # Added 2020-02-10 + traditional-chinese = source-han-serif; # Added 2020-02-10 }; - source-han-serif-japanese = source-han-serif; - source-han-serif-korean = source-han-serif; - source-han-serif-simplified-chinese = source-han-serif; - source-han-serif-traditional-chinese = source-han-serif; + source-han-serif-japanese = source-han-serif; # Added 2020-02-10 + source-han-serif-korean = source-han-serif; # Added 2020-02-10 + source-han-serif-simplified-chinese = source-han-serif; # Added 2020-02-10 + source-han-serif-traditional-chinese = source-han-serif; # Added 2020-02-10 sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15 solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20 @@ -2276,17 +2249,17 @@ mapAliases { sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 - starpls-bin = starpls; + starpls-bin = starpls; # Added 2024-10-30 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16 steamPackages = { - steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; - steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; - steam-fhsenv = lib.warnOnInstantiate "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; - steam-fhsenv-small = lib.warnOnInstantiate "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; - steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; - steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; - steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; + steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16 + steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16 + steam-fhsenv = lib.warnOnInstantiate "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; # Added 2024-10-16 + steam-fhsenv-small = lib.warnOnInstantiate "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; # Added 2024-10-16 + steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16 + steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16 + steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; # Added 2024-10-16 }; steam-small = steam; # Added 2024-09-12 steam-run-native = steam-run; # added 2022-02-21 @@ -2322,7 +2295,7 @@ mapAliases { sync = taler-sync; # Added 2024-09-04 syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 - syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; + syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18 syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 ### T ### @@ -2331,7 +2304,7 @@ mapAliases { tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02 tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17 - taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; + taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; # Added 2024-08-14 taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 targetcli = targetcli-fb; # Added 2025-03-14 @@ -2426,7 +2399,7 @@ mapAliases { tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25 tvbrowser-bin = tvbrowser; # Added 2023-03-02 - tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 + tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 typst-fmt = typstfmt; # Added 2023-07-15 typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25 typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 @@ -2441,7 +2414,7 @@ mapAliases { uclibc = uclibc-ng; # Added 2022-06-16 unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17 - uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; + uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; # Added 2023-05-27 unifi-poller = unpoller; # Added 2022-11-24 unifi-video = throw "unifi-video has been removed as it has been unsupported upstream since 2021"; # Added 2024-10-01 unifi5 = throw "'unifi5' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11 @@ -2472,14 +2445,14 @@ mapAliases { v8 = throw "`v8` has been removed as it's unmaintained for several years and has vulnerabilites. Please migrate to `nodejs.libv8`"; # Added 2024-12-21 validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21 vamp = { - vampSDK = vamp-plugin-sdk; - }; # Added 2020-03-26 + vampSDK = vamp-plugin-sdk; # Added 2020-03-26 + }; vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05 vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13 varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31 varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31 - varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 22025-03-29 + varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29 varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29 varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15 varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15 @@ -2513,7 +2486,7 @@ mapAliases { voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30 vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18 vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18 - vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead." vtkWithQt5; # Added 2025-07-18 + vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead."; # Added 2025-07-18 vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22 vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 @@ -2546,7 +2519,7 @@ mapAliases { wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14 - wlroots = wlroots_0_19; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release + wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04 wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04 wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03 @@ -2557,7 +2530,7 @@ mapAliases { wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant; wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 - wmii_hg = wmii; + wmii_hg = wmii; # Added 2022-04-26 wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 write_stylus = styluslabs-write-bin; # Added 2024-10-09 wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 @@ -2579,7 +2552,7 @@ mapAliases { xen_4_17 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.17 would have been the 'n-2' version, it was removed"; # Added 2024-10-05 xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05 xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05 - xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; + xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; # Added 2024-10-05 xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22 xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17 @@ -2597,7 +2570,7 @@ mapAliases { xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xsd = throw "'xsd' has been removed."; # Added 2025-04-02 - xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative"; + xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative"; # Added 2025-01-30 xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22 xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 @@ -2634,8 +2607,8 @@ mapAliases { z3_4_14 = throw "'z3_4_14' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18 z3_4_8_5 = throw "'z3_4_8_5' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18 z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18 - zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; - zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; + zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; # Added 2025-04-22 + zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; # Added 2025-04-22 zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22 zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31 zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31 @@ -2660,7 +2633,7 @@ mapAliases { zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20 zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17 zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10 - zkg = throw "'zkg' has been replaced by 'zeek'"; + zkg = throw "'zkg' has been replaced by 'zeek'"; # Added 2023-10-20 zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28 zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17 zq = zed.overrideAttrs (old: { @@ -2690,7 +2663,7 @@ mapAliases { */ kalendar = merkuro; # Renamed in 23.08 - kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; + kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; # Added 2023-08-24 inherit (pidginPackages) pidgin-indicator From 6c77e93a06047a0fae4abe009e821080dfb6ee4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Sep 2025 15:57:18 +0200 Subject: [PATCH 125/126] pypy: put NIX_CFLAGS_COMPILE under env to fix withCFlags --- .../interpreters/python/pypy/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 7779b3fbba8f..fa97386d68ce 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -120,14 +120,16 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; disallowedReferences = [ python ]; - # fix compiler error in curses cffi module, where char* != const char* - NIX_CFLAGS_COMPILE = - if stdenv.cc.isClang then "-Wno-error=incompatible-function-pointer-types" else null; - C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = lib.makeLibraryPath buildInputs; - LD_LIBRARY_PATH = lib.makeLibraryPath ( - builtins.filter (x: x.outPath != stdenv.cc.libc.outPath or "") buildInputs - ); + env = { + # fix compiler error in curses cffi module, where char* != const char* + NIX_CFLAGS_COMPILE = + if stdenv.cc.isClang then "-Wno-error=incompatible-function-pointer-types" else null; + C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = lib.makeLibraryPath buildInputs; + LD_LIBRARY_PATH = lib.makeLibraryPath ( + builtins.filter (x: x.outPath != stdenv.cc.libc.outPath or "") buildInputs + ); + }; patches = [ ./dont_fetch_vendored_deps.patch From f5347e9dea6bee0e20cabce1a9057dee7a9f54c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Sep 2025 16:00:46 +0200 Subject: [PATCH 126/126] screen: put NIX_CFLAGS_COMPILE under env to fix withCFlags --- pkgs/by-name/sc/screen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/screen/package.nix b/pkgs/by-name/sc/screen/package.nix index 308c4ef1921f..0dc36a39d3b6 100644 --- a/pkgs/by-name/sc/screen/package.nix +++ b/pkgs/by-name/sc/screen/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416 - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; + env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; nativeBuildInputs = [ autoreconfHook