From efe8bacb4052c50d37d29c1e38f48b089ce4a8ba Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:30:23 -0700 Subject: [PATCH 001/111] fmit: remove with lib --- pkgs/applications/audio/fmit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 9455874ded687..c2fab0492eeea 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -64,15 +64,15 @@ mkDerivation rec { "CONFIG+=acs_portaudio" ]; - meta = with lib; { + meta = { description = "Free Musical Instrument Tuner"; longDescription = '' FMIT is a graphical utility for tuning musical instruments, with error and volume history, and advanced features. ''; homepage = "http://gillesdegottex.github.io/fmit/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; } From e43bb6058ab4e45cfd17f89df8b7fa111d1521b0 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:33:19 -0700 Subject: [PATCH 002/111] fmit: use finalAttrs --- pkgs/applications/audio/fmit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index c2fab0492eeea..57bcd948c15d9 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -20,14 +20,14 @@ assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -mkDerivation rec { +mkDerivation (finalAttrs: { pname = "fmit"; version = "1.2.14"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx"; }; @@ -47,7 +47,7 @@ mkDerivation rec { ++ lib.optionals portaudioSupport [ portaudio ]; postPatch = '' - substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}' + substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${finalAttrs.version}' ''; qmakeFlags = @@ -75,4 +75,4 @@ mkDerivation rec { maintainers = with lib.maintainers; [ orivej ]; platforms = lib.platforms.linux; }; -} +}) From b85e45c6f9fb30c2db3631a8642854284e618ad3 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:34:18 -0700 Subject: [PATCH 003/111] fmit: use callPackage --- pkgs/applications/audio/fmit/default.nix | 17 +++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 57bcd948c15d9..16fca47c5506c 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,13 +1,10 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, + libsForQt5, fftw, - qtbase, - qtmultimedia, - qmake, itstool, - wrapQtAppsHook, alsaSupport ? true, alsa-lib ? null, jackSupport ? false, @@ -20,7 +17,7 @@ assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "fmit"; version = "1.2.14"; @@ -32,15 +29,15 @@ mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - qmake + libsForQt5.qmake itstool - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ fftw - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals jackSupport [ libjack2 ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a5540fec3f4..0e695389716a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12165,7 +12165,7 @@ with pkgs; hamlib = hamlib_4; }; - fmit = libsForQt5.callPackage ../applications/audio/fmit { }; + fmit = callPackage ../applications/audio/fmit { }; focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { }; From 601b789cd74c604e45768cc7c2da1f46561a5025 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 11:34:56 -0700 Subject: [PATCH 004/111] fmit: move to by-name --- .../audio/fmit/default.nix => by-name/fm/fmit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/fmit/default.nix => by-name/fm/fmit/package.nix} (100%) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/by-name/fm/fmit/package.nix similarity index 100% rename from pkgs/applications/audio/fmit/default.nix rename to pkgs/by-name/fm/fmit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e695389716a9..d5624aeab1855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12165,8 +12165,6 @@ with pkgs; hamlib = hamlib_4; }; - fmit = callPackage ../applications/audio/fmit { }; - focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { }; fossil = callPackage ../applications/version-management/fossil { From 26c5111b7c5c6fc6b9e70daa01c55ba727f05eb9 Mon Sep 17 00:00:00 2001 From: opl <4833621+opl@users.noreply.github.com> Date: Thu, 3 Jul 2025 11:57:14 +0200 Subject: [PATCH 005/111] treewide: Correctly force Java font anti-aliasing to gasp mode Fixes instances of the awt.useSystemAAFontSettings property in _JAVA_OPTIONS being impossible to override due to incorrect separators and due to replacing the value from the shell. Changes the font anti-aliasing mode to gasp; led is not suitable for users with subpixel arrangements other than horizontal RGB, on doesn't respect the hints encoded in fonts. See https://github.com/NixOS/nixpkgs/issues/422043 --- pkgs/applications/editors/greenfoot/default.nix | 2 +- pkgs/applications/graphics/processing/default.nix | 4 ++-- pkgs/applications/misc/ganttproject-bin/default.nix | 4 ++-- pkgs/by-name/bl/bluej/package.nix | 2 +- pkgs/by-name/br/brmodelo/package.nix | 2 +- pkgs/by-name/ci/cie-middleware-linux/package.nix | 2 +- pkgs/by-name/cr/crossfire-gridarta/package.nix | 2 +- pkgs/by-name/cr/crossfire-jxclient/package.nix | 2 +- pkgs/by-name/fr/freeplane/package.nix | 2 +- pkgs/by-name/ir/irpf/package.nix | 2 +- pkgs/by-name/jf/jflap/package.nix | 2 +- pkgs/by-name/jo/josm/package.nix | 2 +- pkgs/by-name/ka/kamilalisp/package.nix | 2 +- pkgs/by-name/ne/netbeans/package.nix | 2 +- pkgs/by-name/st/structorizer/package.nix | 2 +- pkgs/by-name/ti/tigerjython/package.nix | 2 +- pkgs/by-name/up/uppaal/package.nix | 2 +- pkgs/by-name/wo/workcraft/package.nix | 2 +- pkgs/by-name/wp/wpcleaner/package.nix | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index a88ab68cef873..4b1ff0007b45f 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper ${openjdk}/bin/java $out/bin/greenfoot \ "''${gappsWrapperArgs[@]}" \ - --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ + --add-flags "-Dawt.useSystemAAFontSettings=gasp -Xmx512M \ --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ -cp $out/share/greenfoot/boot.jar bluej.Boot \ -greenfoot=true -bluej.compiler.showunchecked=false \ diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 401e9881032b5..65e28fec764a1 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -131,11 +131,11 @@ stdenv.mkDerivation rec { makeWrapper $out/share/${pname}/processing $out/bin/processing \ ''${gappsWrapperArgs[@]} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ - --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \ ''${gappsWrapperArgs[@]} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ - --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" runHook postInstall ''; diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index f50aff51f5797..0065eac9c8d58 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; javaOptions = [ - "-Dawt.useSystemAAFontSettings=on" + "-Dawt.useSystemAAFontSettings=gasp" ]; in @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mkdir -pv "$out/bin" wrapProgram "$out/share/ganttproject/ganttproject" \ --set JAVA_HOME "${jre}" \ - --set _JAVA_OPTIONS "${builtins.toString javaOptions}" + --prefix _JAVA_OPTIONS " " "${builtins.toString javaOptions}" mv -v "$out/share/ganttproject/ganttproject" "$out/bin" diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix index 52e46d1f30fdb..ff2238a5323a3 100644 --- a/pkgs/by-name/bl/bluej/package.nix +++ b/pkgs/by-name/bl/bluej/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { makeWrapper ${openjdk}/bin/java $out/bin/bluej \ "''${gappsWrapperArgs[@]}" \ - --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ + --add-flags "-Dawt.useSystemAAFontSettings=gasp -Xmx512M \ --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ -cp $out/share/bluej/boot.jar bluej.Boot" diff --git a/pkgs/by-name/br/brmodelo/package.nix b/pkgs/by-name/br/brmodelo/package.nix index bcc9e5c2df60b..409b2e82cabb2 100644 --- a/pkgs/by-name/br/brmodelo/package.nix +++ b/pkgs/by-name/br/brmodelo/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { # _JAVA_AWT_WM_NONREPARENTING=1. makeWrapper ${jdk8}/bin/java $out/bin/brmodelo \ --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ --add-flags "-jar $out/share/java/brModelo.jar" for size in 16 24 32 48 64 128 256; do diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix index 77c9528e4451c..e765490f117b1 100644 --- a/pkgs/by-name/ci/cie-middleware-linux/package.nix +++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation { mkdir -p "$out/bin" makeWrapper "${jre}/bin/java" "$out/bin/cieid" \ --add-flags "-Djna.library.path='$out/lib:${libraries}'" \ - --add-flags '-Dawt.useSystemAAFontSettings=on' \ + --add-flags "-Dawt.useSystemAAFontSettings=gasp" \ --add-flags "-cp $out/share/cieid/cieid.jar" \ --add-flags "app.m0rf30.cieid.MainApplication" diff --git a/pkgs/by-name/cr/crossfire-gridarta/package.nix b/pkgs/by-name/cr/crossfire-gridarta/package.nix index 59d274d9774b6..e60dad6e0d91b 100644 --- a/pkgs/by-name/cr/crossfire-gridarta/package.nix +++ b/pkgs/by-name/cr/crossfire-gridarta/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/crossfire-gridarta \ --add-flags "-jar $out/share/java/CrossfireEditor.jar" \ - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ --set _JAVA_AWT_WM_NONREPARENTING 1 runHook postInstall diff --git a/pkgs/by-name/cr/crossfire-jxclient/package.nix b/pkgs/by-name/cr/crossfire-jxclient/package.nix index e5297d6fab504..b214fce6dcd11 100644 --- a/pkgs/by-name/cr/crossfire-jxclient/package.nix +++ b/pkgs/by-name/cr/crossfire-jxclient/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/crossfire-jxclient \ --add-flags "-jar $out/share/java/jxclient.jar" \ - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ --set _JAVA_AWT_WM_NONREPARENTING 1 runHook postInstall diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index adc4de096c11b..51950507ec63a 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -102,7 +102,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ] } \ --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" runHook postInstall ''; diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index b7e593ee2dfe4..c18bff4254e01 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # make xdg-open overrideable at runtime makeWrapper ${jdk11}/bin/java $out/bin/irpf \ - --add-flags "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-Dawt.useSystemAAFontSettings=gasp" \ --add-flags "-Dswing.aatext=true" \ --add-flags "-jar $BASEDIR/irpf.jar" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ diff --git a/pkgs/by-name/jf/jflap/package.nix b/pkgs/by-name/jf/jflap/package.nix index 90f32b821fa52..fbc7a152c8ce1 100644 --- a/pkgs/by-name/jf/jflap/package.nix +++ b/pkgs/by-name/jf/jflap/package.nix @@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/share/java cp -s $src $out/share/java/jflap.jar makeWrapper ${jre8}/bin/java $out/bin/jflap \ - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ --add-flags "-jar $out/share/java/jflap.jar" runHook postInstall ''; diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index dd0598ffbec4e..715250c0a48ce 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \ --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' \ --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" ''; meta = { diff --git a/pkgs/by-name/ka/kamilalisp/package.nix b/pkgs/by-name/ka/kamilalisp/package.nix index ca898af855549..efaed71a73e0d 100644 --- a/pkgs/by-name/ka/kamilalisp/package.nix +++ b/pkgs/by-name/ka/kamilalisp/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp ${src} $out/share/java/kamilalisp-${version}.jar makeWrapper ${jre}/bin/java $out/bin/kamilalisp \ --add-flags "-jar $out/share/java/kamilalisp-${version}.jar" \ - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ --set _JAVA_AWT_WM_NONREPARENTING 1 ''; diff --git a/pkgs/by-name/ne/netbeans/package.nix b/pkgs/by-name/ne/netbeans/package.nix index 2f8be3be2c306..364ee5feebd8c 100644 --- a/pkgs/by-name/ne/netbeans/package.nix +++ b/pkgs/by-name/ne/netbeans/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { } \ --prefix JAVA_HOME : ${jdk21.home} \ --add-flags "--jdkhome ${jdk21.home} \ - -J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true" + -J-Dawt.useSystemAAFontSettings=gasp -J-Dswing.aatext=true" # Extract pngs from the Apple icon image and create # the missing ones from the 1024x1024 image. diff --git a/pkgs/by-name/st/structorizer/package.nix b/pkgs/by-name/st/structorizer/package.nix index 9b8db6ac84a7c..99cca15f159e1 100644 --- a/pkgs/by-name/st/structorizer/package.nix +++ b/pkgs/by-name/st/structorizer/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { install -D ${pname}.jar -t $out/share/java/ makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/java/${pname}.jar" \ - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=lcd' + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" cat << EOF > $out/share/mime/packages/structorizer.xml diff --git a/pkgs/by-name/ti/tigerjython/package.nix b/pkgs/by-name/ti/tigerjython/package.nix index d58af72e1a87e..b64b5b6efaef1 100644 --- a/pkgs/by-name/ti/tigerjython/package.nix +++ b/pkgs/by-name/ti/tigerjython/package.nix @@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { --add-flags "-Duser.dir=$CUSTOM_LIBS/" \ --add-flags "-Xmx512M" \ --add-flags "-jar $JAR" \ - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=lcd' + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" runHook postInstall ''; diff --git a/pkgs/by-name/up/uppaal/package.nix b/pkgs/by-name/up/uppaal/package.nix index f61425fbad559..f3770437f8438 100644 --- a/pkgs/by-name/up/uppaal/package.nix +++ b/pkgs/by-name/up/uppaal/package.nix @@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec { makeWrapper $out/lib/uppaal/uppaal $out/bin/uppaal \ --set JAVA_HOME ${jdk17} \ --set PATH $out/lib/uppaal:$PATH \ - --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" runHook postInstall ''; diff --git a/pkgs/by-name/wo/workcraft/package.nix b/pkgs/by-name/wo/workcraft/package.nix index cb6a6b6c8e82f..219f5d91a1ab1 100644 --- a/pkgs/by-name/wo/workcraft/package.nix +++ b/pkgs/by-name/wo/workcraft/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir $out/bin makeWrapper $out/share/workcraft $out/bin/workcraft \ --set JAVA_HOME "${jre}" \ - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=gasp'; + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"; ''; meta = { diff --git a/pkgs/by-name/wp/wpcleaner/package.nix b/pkgs/by-name/wp/wpcleaner/package.nix index 3797140b0e0b7..f618a5af836db 100644 --- a/pkgs/by-name/wp/wpcleaner/package.nix +++ b/pkgs/by-name/wp/wpcleaner/package.nix @@ -17,7 +17,7 @@ let botScript = "$out/bin/wpcleaner-bot"; runTaskScript = "$out/bin/wpcleaner-run-task"; extraJavaArgs = [ - "-Dawt.useSystemAAFontSettings=lcd" + "-Dawt.useSystemAAFontSettings=gasp" "-Xms1g" "-Xmx8g" ]; From 2ddba3215ad468d27c1afd82737f20dd2cdc2044 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 18:32:22 +0300 Subject: [PATCH 006/111] dwm-status: migrate to `pkgs/by-name` --- .../dwm/dwm-status.nix => by-name/dw/dwm-status/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/window-managers/dwm/dwm-status.nix => by-name/dw/dwm-status/package.nix} (100%) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/by-name/dw/dwm-status/package.nix similarity index 100% rename from pkgs/applications/window-managers/dwm/dwm-status.nix rename to pkgs/by-name/dw/dwm-status/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1cc2650e9c07..04a3cdcf8e634 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12059,8 +12059,6 @@ with pkgs; patches = config.dwm.patches or [ ]; }; - dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or [ ]; }; From 9b2228216a35d42922e5daf14e84fe1dd6845072 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 18:35:27 +0300 Subject: [PATCH 007/111] dwm-status: replace `rec` with `finalAttrs` --- pkgs/by-name/dw/dwm-status/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/dw/dwm-status/package.nix b/pkgs/by-name/dw/dwm-status/package.nix index 0da73c8667728..55bc5836a37e7 100644 --- a/pkgs/by-name/dw/dwm-status/package.nix +++ b/pkgs/by-name/dw/dwm-status/package.nix @@ -7,7 +7,7 @@ libnotify, makeWrapper, pkg-config, - xorg, + libX11, enableAlsaUtils ? true, alsa-utils, coreutils, @@ -31,14 +31,14 @@ let ]; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dwm-status"; version = "1.10.0"; src = fetchFromGitHub { owner = "Gerschtli"; - repo = pname; - tag = version; + repo = "dwm-status"; + tag = finalAttrs.version; hash = "sha256-982JFYZroskKppAOZjBWOFt624FfRjhXpYN57s/cM50="; }; @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { dbus gdk-pixbuf libnotify - xorg.libX11 + libX11 ]; useFetchCargoVendor = true; @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; - changelog = "https://github.com/Gerschtli/dwm-status/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Gerschtli/dwm-status/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gepbird @@ -74,4 +74,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "dwm-status"; platforms = lib.platforms.linux; }; -} +}) From 2f3357375f2a03b87698e8c2fea965dca57e05d7 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 19:31:59 +0300 Subject: [PATCH 008/111] dmenu{,-wayland}: migrate to `pkgs/by-name` --- .../dmenu/wayland.nix => by-name/dm/dmenu-wayland/package.nix} | 0 .../misc/dmenu/default.nix => by-name/dm/dmenu/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 3 deletions(-) rename pkgs/{applications/misc/dmenu/wayland.nix => by-name/dm/dmenu-wayland/package.nix} (100%) rename pkgs/{applications/misc/dmenu/default.nix => by-name/dm/dmenu/package.nix} (100%) diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/by-name/dm/dmenu-wayland/package.nix similarity index 100% rename from pkgs/applications/misc/dmenu/wayland.nix rename to pkgs/by-name/dm/dmenu-wayland/package.nix diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/by-name/dm/dmenu/package.nix similarity index 100% rename from pkgs/applications/misc/dmenu/default.nix rename to pkgs/by-name/dm/dmenu/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a3cdcf8e634..233f7dc24f4d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12008,9 +12008,6 @@ with pkgs; djview4 = djview; - dmenu = callPackage ../applications/misc/dmenu { }; - dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; - dmenu-rs-enable-plugins = dmenu-rs.override { enablePlugins = true; }; dmensamenu = callPackage ../applications/misc/dmensamenu { From 86fe2555d72dbfd6e3c12b43d1af37e9c9774dea Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 19:50:35 +0300 Subject: [PATCH 009/111] dmenu-wayland: modernize --- pkgs/by-name/dm/dmenu-wayland/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/dm/dmenu-wayland/package.nix b/pkgs/by-name/dm/dmenu-wayland/package.nix index eb9a124167140..0c5fbb9a360a5 100644 --- a/pkgs/by-name/dm/dmenu-wayland/package.nix +++ b/pkgs/by-name/dm/dmenu-wayland/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { pname = "dmenu-wayland"; - version = "unstable-2023-05-18"; + version = "0-unstable-2023-05-18"; src = fetchFromGitHub { owner = "nyyManni"; @@ -63,12 +63,12 @@ stdenv.mkDerivation { --prefix PATH : $out/bin ''; - meta = with lib; { - license = licenses.mit; - platforms = platforms.linux; + meta = { + license = lib.licenses.mit; + platforms = lib.platforms.linux; description = "Efficient dynamic menu for wayland (wlroots)"; homepage = "https://github.com/nyyManni/dmenu-wayland"; - maintainers = with maintainers; [ rewine ]; + maintainers = with lib.maintainers; [ rewine ]; mainProgram = "dmenu-wl"; }; } From 3762fddd15ef00c7eb7897a8da1f5f209d914893 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 21:55:44 +0300 Subject: [PATCH 010/111] dmenu: allow setting options in nixpkgs.config Also added `extraLibs`, like st has --- pkgs/by-name/dm/dmenu/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 8479bf15d382b..3a3694646cc52 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -9,8 +9,11 @@ pkg-config, zlib, writeText, - conf ? null, - patches ? null, + # customization + config, + conf ? config.dmenu.conf or null, + extraLibs ? config.dmenu.extraLibs or [ ], + patches ? config.dmenu.patches or [ ], # update script dependencies gitUpdater, }: @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { libXinerama zlib libXft - ]; + ] ++ extraLibs; inherit patches; From 2a48fede3a25f75619ee3363638a3c96bc553771 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:04:46 +0300 Subject: [PATCH 011/111] dmenu: remove pkg-config It's no longer necessary + this allows for compiling with extraLibs, if config.mk was patched --- pkgs/by-name/dm/dmenu/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 3a3694646cc52..41c3012260528 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -6,7 +6,6 @@ libX11, libXinerama, libXft, - pkg-config, zlib, writeText, # customization @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8="; }; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig libX11 @@ -53,9 +51,6 @@ stdenv.mkDerivation rec { makeFlagsArray+=( PREFIX="$out" CC="$CC" - # default config.mk hardcodes dependent libraries and include paths - INCS="`$PKG_CONFIG --cflags fontconfig x11 xft xinerama`" - LIBS="`$PKG_CONFIG --libs fontconfig x11 xft xinerama`" ) ''; From 1a1cc628def37d9ca1ed9d8a4dacafb667749a10 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:06:51 +0300 Subject: [PATCH 012/111] dmenu: remove unused zlib --- pkgs/by-name/dm/dmenu/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 41c3012260528..55121250203a4 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -6,7 +6,6 @@ libX11, libXinerama, libXft, - zlib, writeText, # customization config, @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { fontconfig libX11 libXinerama - zlib libXft ] ++ extraLibs; From 6db88336326c1f440e8cbd691321d4ab30b5d3eb Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:09:58 +0300 Subject: [PATCH 013/111] dmenu: modernize --- pkgs/by-name/dm/dmenu/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix index 55121250203a4..6996b62c0e47d 100644 --- a/pkgs/by-name/dm/dmenu/package.nix +++ b/pkgs/by-name/dm/dmenu/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchzip, fontconfig, libX11, libXinerama, @@ -16,13 +16,13 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmenu"; version = "5.3"; - src = fetchurl { - url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; - sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8="; + src = fetchzip { + url = "https://dl.suckless.org/tools/dmenu-${finalAttrs.version}.tar.gz"; + hash = "sha256-3lRLa3NIg+7bUSDnef/rVL3XwvWWHTIPQ8mcVaq/SVI="; }; buildInputs = [ @@ -54,17 +54,17 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dmenu"; }; - meta = with lib; { + meta = { description = "Generic, highly customizable, and efficient menu for the X Window System"; homepage = "https://tools.suckless.org/dmenu"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pSub globin qusic _0david0mp ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "dmenu"; }; -} +}) From 7e06a7c2d0504ab94b3611922d47bd64bb374672 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:20:17 +0300 Subject: [PATCH 014/111] st: move nixpkgs.config options inside the recipe --- pkgs/applications/terminal-emulators/st/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 7657895061d7a..23de36481dc55 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -9,9 +9,10 @@ libXft, ncurses, writeText, - conf ? null, - patches ? [ ], - extraLibs ? [ ], + config, + conf ? config.st.conf or null, + patches ? config.st.patches or [ ], + extraLibs ? config.st.extraLibs or [ ], nixosTests, # update script dependencies gitUpdater, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 233f7dc24f4d4..8044575c54620 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1567,11 +1567,7 @@ with pkgs; emojiSupport = true; }; - st = callPackage ../applications/terminal-emulators/st { - conf = config.st.conf or null; - patches = config.st.patches or [ ]; - extraLibs = config.st.extraLibs or [ ]; - }; + st = callPackage ../applications/terminal-emulators/st { }; xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; From 593f2739dda83a0788dd4430873e2c056f10ed62 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:25:24 +0300 Subject: [PATCH 015/111] {mcaimi-,x,}st: move to pkgs/by-name --- .../st/mcaimi-st.nix => by-name/mc/mcaimi-st/package.nix} | 0 .../st/default.nix => by-name/st/st/package.nix} | 0 .../st/xst.nix => by-name/xs/xst/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 4 deletions(-) rename pkgs/{applications/terminal-emulators/st/mcaimi-st.nix => by-name/mc/mcaimi-st/package.nix} (100%) rename pkgs/{applications/terminal-emulators/st/default.nix => by-name/st/st/package.nix} (100%) rename pkgs/{applications/terminal-emulators/st/xst.nix => by-name/xs/xst/package.nix} (100%) diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/by-name/mc/mcaimi-st/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/mcaimi-st.nix rename to pkgs/by-name/mc/mcaimi-st/package.nix diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/by-name/st/st/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/default.nix rename to pkgs/by-name/st/st/package.nix diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/by-name/xs/xst/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/xst.nix rename to pkgs/by-name/xs/xst/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8044575c54620..01664628ec11d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1567,10 +1567,6 @@ with pkgs; emojiSupport = true; }; - st = callPackage ../applications/terminal-emulators/st { }; - xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; - mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; From f55945287895f6461ef285769cb7f195cc0daa21 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:33:40 +0300 Subject: [PATCH 016/111] mcaimi-st: update meta.homepage, modernize --- pkgs/by-name/mc/mcaimi-st/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 972b6523df165..30a3093cef8e4 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "mcaimi-st"; - version = "0.pre+unstable=2021-08-30"; + version = "0-unstable-2021-08-30"; src = fetchFromGitHub { owner = "mcaimi"; @@ -40,12 +40,12 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { - homepage = "https://github.com/gnotclub/xst"; + meta = { + homepage = "https://github.com/mcaimi/st"; description = "Suckless Terminal fork"; mainProgram = "st"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } From f89c42fe609a3d30a6cee2f1e0795e8dc9d5fd6f Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:37:28 +0300 Subject: [PATCH 017/111] mcaimi-st: add update script --- pkgs/by-name/mc/mcaimi-st/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 30a3093cef8e4..3d09c7b795a30 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -8,6 +8,7 @@ libXft, ncurses, pkg-config, + nix-update-script, }: stdenv.mkDerivation { @@ -40,6 +41,10 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = { homepage = "https://github.com/mcaimi/st"; description = "Suckless Terminal fork"; From b3cb8b7372aade4f8dcd7dc048279e8b0dcb8450 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 19:38:12 +0000 Subject: [PATCH 018/111] mcaimi-st: 0-unstable-2021-08-30 -> 0-unstable-2025-03-12 --- pkgs/by-name/mc/mcaimi-st/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 3d09c7b795a30..0e82a0f8e3b1e 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "mcaimi-st"; - version = "0-unstable-2021-08-30"; + version = "0-unstable-2025-03-12"; src = fetchFromGitHub { owner = "mcaimi"; repo = "st"; - rev = "1a8cad03692ee6d32c03a136cdc76bdb169e15d8"; - hash = "sha256-xyVEvD8s1J9Wj9NB4Gg+0ldvde7M8IVpzCOTttC1IY0="; + rev = "f1ae5cdafadceaf622e1c0ff56da04803bf658b3"; + hash = "sha256-rGru0LqbuJQ4QOts6xYDztAST0K5HCys2gUPZg2w4SE="; }; nativeBuildInputs = [ From fab0654a5fa42434ccd93cf16ccde68bbe3c83b0 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:47:24 +0300 Subject: [PATCH 019/111] mcaimi-st: set installFlags the Nix way --- pkgs/by-name/mc/mcaimi-st/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix index 0e82a0f8e3b1e..daf38a1f725ec 100644 --- a/pkgs/by-name/mc/mcaimi-st/package.nix +++ b/pkgs/by-name/mc/mcaimi-st/package.nix @@ -33,13 +33,10 @@ stdenv.mkDerivation { ncurses ]; - installPhase = '' - runHook preInstall - - TERMINFO=$out/share/terminfo make install PREFIX=$out - - runHook postInstall - ''; + installFlags = [ + "TERMINFO=$(out)/share/terminfo" + "PREFIX=$(out)" + ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; From 9810b3608d2e4b3654eb147e2136d0aec40c1918 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:48:50 +0300 Subject: [PATCH 020/111] xst: modernize --- pkgs/by-name/xs/xst/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix index 904f939c6b8e6..0605ebcafddd7 100644 --- a/pkgs/by-name/xs/xst/package.nix +++ b/pkgs/by-name/xs/xst/package.nix @@ -10,15 +10,15 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xst"; version = "0.10.0"; src = fetchFromGitHub { owner = "gnotclub"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-2pXR9U2tTBd0lyeQ3BjnXW+Ne9aUQg/+rnpmYPPG06A="; + repo = "xst"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2pXR9U2tTBd0lyeQ3BjnXW+Ne9aUQg/+rnpmYPPG06A="; }; nativeBuildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/gnotclub/xst"; description = "Simple terminal fork that can load config from Xresources"; mainProgram = "xst"; - license = licenses.mit; - maintainers = [ maintainers.vyp ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vyp ]; + platforms = lib.platforms.linux; }; -} +}) From 7f58a908dbf0e56a52a8a1ed75dba69274e30451 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:50:04 +0300 Subject: [PATCH 021/111] xst: set installFlags the Nix way --- pkgs/by-name/xs/xst/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix index 0605ebcafddd7..1699ab5c2d699 100644 --- a/pkgs/by-name/xs/xst/package.nix +++ b/pkgs/by-name/xs/xst/package.nix @@ -32,13 +32,10 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; - installPhase = '' - runHook preInstall - - TERMINFO=$out/share/terminfo make install PREFIX=$out - - runHook postInstall - ''; + installFlags = [ + "TERMINFO=$(out)/share/terminfo" + "PREFIX=$(out)" + ]; meta = { homepage = "https://github.com/gnotclub/xst"; From d01eaee630edbaf5c0cdef20189383d37babdd0c Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 22:55:16 +0300 Subject: [PATCH 022/111] xst: add update script --- pkgs/by-name/xs/xst/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix index 1699ab5c2d699..8a089ac6ee85b 100644 --- a/pkgs/by-name/xs/xst/package.nix +++ b/pkgs/by-name/xs/xst/package.nix @@ -8,6 +8,7 @@ libXft, ncurses, pkg-config, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -37,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/gnotclub/xst"; description = "Simple terminal fork that can load config from Xresources"; From 28ae06f536a1128ce0dc18f292e297011b81d6c2 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 12 Jul 2025 23:04:07 +0300 Subject: [PATCH 023/111] st: modernize --- pkgs/by-name/st/st/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/st/st/package.nix b/pkgs/by-name/st/st/package.nix index 23de36481dc55..c9ce15bbca568 100644 --- a/pkgs/by-name/st/st/package.nix +++ b/pkgs/by-name/st/st/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchzip, pkg-config, fontconfig, freetype, @@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "st"; version = "0.9.2"; - src = fetchurl { + src = fetchzip { url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz"; - hash = "sha256-ayFdT0crIdYjLzDyIRF6d34kvP7miVXd77dCZGf5SUs="; + hash = "sha256-pFyK4XvV5Z4gBja8J996zF6wkdgQCNVccqUJ5+ejB/w="; }; outputs = [ @@ -74,12 +74,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; - license = licenses.mit; - maintainers = with maintainers; [ qusic ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qusic ]; + platforms = lib.platforms.unix; mainProgram = "st"; }; }) From df0a8d38ec8a8e657b86f7e289b2eb591dcab315 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:34:36 +0300 Subject: [PATCH 024/111] dwm: move `nixpkgs.config` logic inside the recipe Also added support for `conf` and `extraLibs` --- pkgs/applications/window-managers/dwm/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index efb5f34363ce2..62fb5a5e10433 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -7,8 +7,11 @@ libXft, writeText, pkg-config, - patches ? [ ], - conf ? null, + # customization + config, + conf ? config.dwm.conf or null, + patches ? config.dwm.patches or [ ], + extraLibs ? config.dwm.extraLibs or [ ], # update script dependencies gitUpdater, }: @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { libX11 libXinerama libXft - ]; + ] ++ extraLibs; prePatch = '' sed -i "s@/usr/local@$out@" config.mk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01664628ec11d..ba9311b383ce6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12042,11 +12042,7 @@ with pkgs; wlroots = wlroots_0_18; }; - dwm = callPackage ../applications/window-managers/dwm { - # dwm is configured entirely through source modification. Allow users to - # specify patches through nixpkgs.config.dwm.patches - patches = config.dwm.patches or [ ]; - }; + dwm = callPackage ../applications/window-managers/dwm { }; evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or [ ]; From 8fb8dc8382d2a38cf5121763725a005468692874 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:40:22 +0300 Subject: [PATCH 025/111] dwm: move to pkgs/by-name --- .../dwm/default.nix => by-name/dw/dwm/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/window-managers/dwm/default.nix => by-name/dw/dwm/package.nix} (100%) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/by-name/dw/dwm/package.nix similarity index 100% rename from pkgs/applications/window-managers/dwm/default.nix rename to pkgs/by-name/dw/dwm/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba9311b383ce6..fa4f58b9d35f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12042,8 +12042,6 @@ with pkgs; wlroots = wlroots_0_18; }; - dwm = callPackage ../applications/window-managers/dwm { }; - evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or [ ]; }; From 051dd774d103bf43f06e248890bb3056ee02118b Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:58:06 +0300 Subject: [PATCH 026/111] dwm: take PREFIX and CC from environment --- pkgs/by-name/dw/dwm/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix index 62fb5a5e10433..43a27b4f86a28 100644 --- a/pkgs/by-name/dw/dwm/package.nix +++ b/pkgs/by-name/dw/dwm/package.nix @@ -33,12 +33,14 @@ stdenv.mkDerivation rec { libXft ] ++ extraLibs; - prePatch = '' - sed -i "s@/usr/local@$out@" config.mk - ''; - - preBuild = lib.optional stdenv.hostPlatform.isStatic '' - makeFlagsArray+=(LDFLAGS="$(${stdenv.cc.targetPrefix}pkg-config --static --libs x11 xinerama xft)") + preBuild = '' + makeFlagsArray+=( + "PREFIX=$out" + "CC=$CC" + ${lib.optionalString stdenv.hostPlatform.isStatic '' + LDFLAGS="$(${stdenv.cc.targetPrefix}pkg-config --static --libs x11 xinerama xft)" + ''} + ) ''; # Allow users set their own list of patches @@ -52,8 +54,6 @@ stdenv.mkDerivation rec { in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dwm"; }; From 8764e26bd16ecac263f2d0dc0a09a185aa4ab3a7 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 13 Jul 2025 08:58:46 +0300 Subject: [PATCH 027/111] dwm: modernize --- pkgs/by-name/dw/dwm/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix index 43a27b4f86a28..39dcd69080b45 100644 --- a/pkgs/by-name/dw/dwm/package.nix +++ b/pkgs/by-name/dw/dwm/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchzip, libX11, libXinerama, libXft, @@ -16,13 +16,13 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dwm"; version = "6.5"; - src = fetchurl { - url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; - sha256 = "sha256-Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk="; + src = fetchzip { + url = "https://dl.suckless.org/dwm/dwm-${finalAttrs.version}.tar.gz"; + hash = "sha256-Cc4B8evvuRxOjbeOhg3oAs3Nxi/msxWg950/eiq536w="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isStatic pkg-config; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { url = "git://git.suckless.org/dwm"; }; - meta = with lib; { + meta = { homepage = "https://dwm.suckless.org/"; description = "Extremely fast, small, and dynamic window manager for X"; longDescription = '' @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { multiple tags. Selecting certain tags displays all windows with these tags. ''; - license = licenses.mit; - maintainers = with maintainers; [ neonfuz ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ neonfuz ]; + platforms = lib.platforms.all; mainProgram = "dwm"; }; -} +}) From ed4163c491ab45db16d92965f0e24602480d0f2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Jul 2025 19:37:04 +0000 Subject: [PATCH 028/111] libstaden-read: 1.15.0 -> 1-15-1 --- pkgs/by-name/li/libstaden-read/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libstaden-read/package.nix b/pkgs/by-name/li/libstaden-read/package.nix index 877c5042ff840..bf431ad89e0bb 100644 --- a/pkgs/by-name/li/libstaden-read/package.nix +++ b/pkgs/by-name/li/libstaden-read/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { # Same name as the Debian library pname = "libstaden-read"; - version = "1.15.0"; + version = "1-15-1"; src = fetchFromGitHub { owner = "jkbonfield"; repo = "io_lib"; rev = "io_lib-" + builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version; fetchSubmodules = true; - hash = "sha256-2Dlx+MXmqar81/Xmf0oE+6lWX461EDYijiZsZf/VD28="; + hash = "sha256-X96gFrefH2NAp4+fvVLXHP9FbF04gQOWLm/tAFJPgR8="; }; patches = [ From e5c7114db14c77ed89078e7471ac7e6fa6b5686f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 08:39:52 -0500 Subject: [PATCH 029/111] gazelle-origin: migrate to by-name --- .../default.nix => by-name/ga/gazelle-origin/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gazelle-origin/default.nix => by-name/ga/gazelle-origin/package.nix} (100%) diff --git a/pkgs/tools/misc/gazelle-origin/default.nix b/pkgs/by-name/ga/gazelle-origin/package.nix similarity index 100% rename from pkgs/tools/misc/gazelle-origin/default.nix rename to pkgs/by-name/ga/gazelle-origin/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17d3cb80f7820..de1e77cc89415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12133,8 +12133,6 @@ with pkgs; gauche = callPackage ../development/interpreters/gauche { }; - gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { }; - geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; From 5f36419fef80bca81941a5923f158f4c47625385 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 08:40:46 -0500 Subject: [PATCH 030/111] gazelle-origin: refactor meta section and dependencies --- pkgs/by-name/ga/gazelle-origin/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ga/gazelle-origin/package.nix b/pkgs/by-name/ga/gazelle-origin/package.nix index 37ef0aedd9ccc..3fa2a2431b861 100644 --- a/pkgs/by-name/ga/gazelle-origin/package.nix +++ b/pkgs/by-name/ga/gazelle-origin/package.nix @@ -1,26 +1,23 @@ { lib, - buildPythonApplication, fetchFromGitHub, - bencoder, - pyyaml, - requests, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gazelle-origin"; version = "3.0.0"; format = "setuptools"; src = fetchFromGitHub { - repo = pname; + repo = "gazelle-origin"; # Use the spinfast319 fork, since it seems that upstream # at is inactive owner = "spinfast319"; - rev = version; + tag = version; hash = "sha256-+yMKnfG2f+A1/MxSBFLaHfpCgI2m968iXqt+2QanM/c="; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ bencoder pyyaml requests @@ -28,12 +25,12 @@ buildPythonApplication rec { pythonImportsCheck = [ "gazelleorigin" ]; - meta = with lib; { + meta = { description = "Tool for generating origin files using the API of Gazelle-based torrent trackers"; homepage = "https://github.com/spinfast319/gazelle-origin"; # TODO license is unspecified in the upstream, as well as the fork - license = licenses.unfree; - maintainers = with maintainers; [ somasis ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ somasis ]; mainProgram = "gazelle-origin"; }; } From 3e1ac8bcddcfb9a0a62a701b7b14b3ccd71cc70c Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Thu, 17 Jul 2025 10:46:40 -0400 Subject: [PATCH 031/111] nixos/tests/owi: init Signed-off-by: Ethan Carter Edwards --- nixos/tests/all-tests.nix | 1 + nixos/tests/owi.nix | 61 +++++++++++++++++++++++++++++++++ pkgs/by-name/ow/owi/package.nix | 6 +++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/owi.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7aa2dbdbdaf5c..2a251331675a0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1073,6 +1073,7 @@ in open-web-calendar = runTest ./web-apps/open-web-calendar.nix; ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { }; orthanc = runTest ./orthanc.nix; + owi = runTest ./owi.nix; owncast = runTest ./owncast.nix; outline = runTest ./outline.nix; i18n = runTest ./i18n.nix; diff --git a/nixos/tests/owi.nix b/nixos/tests/owi.nix new file mode 100644 index 0000000000000..74e9d2d394fd9 --- /dev/null +++ b/nixos/tests/owi.nix @@ -0,0 +1,61 @@ +{ + lib, + pkgs, + ... +}: +{ + name = "owi"; + + meta.maintainers = with lib.maintainers; [ ethancedwards8 ]; + + nodes.machine = { + environment.systemPackages = with pkgs; [ owi ]; + + environment.etc."owipass.rs".source = pkgs.writeText "owi.rs" '' + use owi_sym::Symbolic; + + fn mean_one(x: i32, y: i32) -> i32 { + (x + y)/2 + } + + fn mean_two(x: i32, y: i32) -> i32 { + (y + x)/2 + } + + fn main() { + let x = i32::symbol(); + let y = i32::symbol(); + // proving the commutative property of addition! + owi_sym::assert(mean_one(x, y) == mean_two(x, y)) + } + ''; + + environment.etc."owifail.rs".source = pkgs.writeText "owi.rs" '' + use owi_sym::Symbolic; + + fn mean_wrong(x: i32, y: i32) -> i32 { + (x + y) / 2 + } + + fn mean_correct(x: i32, y: i32) -> i32 { + (x & y) + ((x ^ y) >> 1) + } + + fn main() { + let x = i32::symbol(); + let y = i32::symbol(); + owi_sym::assert(mean_wrong(x, y) == mean_correct(x, y)) + } + ''; + }; + + testScript = + { nodes, ... }: + '' + start_all() + + # testing + machine.succeed("owi rust --fail-on-assertion-only /etc/owipass.rs") + machine.fail("owi rust --fail-on-assertion-only /etc/owifail.rs") + ''; +} diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 18ce88812f6e9..9462b2fbde611 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -7,6 +7,7 @@ zig, makeWrapper, unstableGitUpdater, + nixosTests, }: let @@ -75,7 +76,10 @@ ocamlPackages.buildDunePackage rec { doCheck = false; - passthru.updateScript = unstableGitUpdater { }; + passthru = { + updateScript = unstableGitUpdater { }; + tests = { inherit (nixosTests) owi; }; + }; meta = { description = "Symbolic execution for Wasm, C, C++, Rust and Zig"; From ca88da9ce3d77ad5ae654f884361c01623c0d09e Mon Sep 17 00:00:00 2001 From: Sean Behan Date: Sun, 6 Jul 2025 00:22:23 -0400 Subject: [PATCH 032/111] nixos/searx: use envsubst instead of sed for reading environment variables - use envsubst instead of sed for reading in environment variables - update usage examples - add release notes --- doc/release-notes/rl-2511.section.md | 3 +++ nixos/modules/services/networking/searx.nix | 17 ++++++----------- nixos/tests/searx.nix | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 3871e9ad9a577..12c739783cec1 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -60,6 +60,9 @@ - `meta.mainProgram`: Changing this `meta` entry can lead to a package rebuild due to being used to determine the `NIX_MAIN_PROGRAM` environment variable. +- `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables. + If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`. + - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail. diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index e7a10bfffaba5..3e6872e5cfe1f 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -24,13 +24,8 @@ let # write NixOS settings as JSON ( umask 077 - cp --no-preserve=mode ${settingsFile} settings.yml + ${pkgs.envsubst}/bin/envsubst < ${settingsFile} > settings.yml ) - - # substitute environment variables - env -0 | while IFS='=' read -r -d ''' n v; do - sed "s#@$n@#$v#g" -i settings.yml - done ''; settingType = @@ -95,20 +90,20 @@ in { server.port = 8080; server.bind_address = "0.0.0.0"; - server.secret_key = "@SEARX_SECRET_KEY@"; + server.secret_key = "$SEARX_SECRET_KEY"; - engines = lib.singleton { + engines = [ { name = "wolframalpha"; shortcut = "wa"; - api_key = "@WOLFRAM_API_KEY@"; + api_key = "$WOLFRAM_API_KEY"; engine = "wolframalpha_api"; - }; + } ]; } ''; description = '' Searx settings. These will be merged with (taking precedence over) the default configuration. - It's also possible to refer to environment variables (defined in [](#opt-services.searx.environmentFile)) using the syntax `@VARIABLE_NAME@`. + It's also possible to refer to environment variables (defined in [](#opt-services.searx.environmentFile)) using the syntax `$VARIABLE_NAME`. ::: {.note} For available settings, see the Searx [docs](https://docs.searxng.org/admin/settings/index.html). diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 6cbc878df2c8f..18199e6db3ed0 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -28,7 +28,7 @@ server = { port = "8080"; bind_address = "0.0.0.0"; - secret_key = "@SEARX_SECRET_KEY@"; + secret_key = "$SEARX_SECRET_KEY"; }; }; }; From 8900b9d7245e8f70a85f7d871e5f8fa512bc29f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 14:08:15 +0000 Subject: [PATCH 033/111] wordpress: 6.8.1 -> 6.8.2 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 962f5bb20c7bc..fc3422913324b 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -6,7 +6,7 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec { hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY="; }; wordpress_6_8 = { - version = "6.8.1"; - hash = "sha256-PGVNB5vELE6C/yCmlIxFYpPhBLZ2L/fJ/JSAcbMxAyg="; + version = "6.8.2"; + hash = "sha256-2Fpy45K/6GaBazwuvGpEaZByqlDMOmIPHE7S8TtkXis="; }; } From b9e249951a6268b949510dd9de3d4f87041bc01d Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 30 May 2025 14:09:40 -0400 Subject: [PATCH 034/111] compare50: init at 1.2.6 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/co/compare50/package.nix | 74 +++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/co/compare50/package.nix diff --git a/pkgs/by-name/co/compare50/package.nix b/pkgs/by-name/co/compare50/package.nix new file mode 100644 index 0000000000000..0981bb9454b7b --- /dev/null +++ b/pkgs/by-name/co/compare50/package.nix @@ -0,0 +1,74 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "compare50"; + version = "1.2.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cs50"; + repo = "compare50"; + tag = "v${version}"; + hash = "sha256-T7ts/9Uux2gVhh5EGv8PRh9cbCQDbLBYD06sWqNSvLU="; + }; + + postPatch = '' + substituteInPlace setup.py --replace-fail \ + 'scripts=["bin/compare50"]' 'entry_points={"console_scripts": ["compare50=compare50.__main__:main"]}' + # auto included in current python version, no install needed + substituteInPlace setup.py --replace-fail \ + 'importlib' ' ' + ''; + + build-system = [ + python3Packages.setuptools + ]; + + dependencies = with python3Packages; [ + attrs + intervaltree + jinja2 + lib50 + numpy + packaging + pygments + termcolor + tqdm + ]; + + pythonRelaxDeps = [ + "attrs" + "numpy" + "termcolor" + ]; + + pythonImportsCheck = [ "compare50" ]; + + versionCheckProgramArg = "--version"; + nativeCheckInputs = [ versionCheckHook ]; + + # repo does not use pytest + checkPhase = '' + runHook preCheck + + ${python3Packages.python.interpreter} -m tests + + runHook postCheck + ''; + + meta = { + description = "Tool for detecting similarity in code supporting over 300 languages"; + homepage = "https://cs50.readthedocs.io/projects/compare50/en/latest/"; + downloadPage = "https://github.com/cs50/compare50"; + changelog = "https://github.com/cs50/compare50/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "compare50"; + }; +} From 5859e3341c0138c95ab19a7892d04a01d60071f6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 21 Jul 2025 20:39:46 +0800 Subject: [PATCH 035/111] python3Packages.fenics-dolfinx: remove nativeCheckInputs pytest-xdist python3Packages.fenics-dolfinx uses JIT to run programs compiled from C sources, which may have name collisions during parallel testing. This can lead to failures when using pytest-xdist. --- pkgs/development/python-modules/fenics-dolfinx/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/fenics-dolfinx/default.nix b/pkgs/development/python-modules/fenics-dolfinx/default.nix index 158cf7dec1736..7aa04a253fe52 100644 --- a/pkgs/development/python-modules/fenics-dolfinx/default.nix +++ b/pkgs/development/python-modules/fenics-dolfinx/default.nix @@ -32,7 +32,6 @@ # nativeCheckInputs scipy, matplotlib, - pytest-xdist, pytestCheckHook, writableTmpDirAsHomeHook, mpiCheckPhaseHook, @@ -108,7 +107,6 @@ buildPythonPackage rec { nativeCheckInputs = [ scipy matplotlib - pytest-xdist pytestCheckHook writableTmpDirAsHomeHook mpiCheckPhaseHook From 141d8595e00b201dd12fcac7c8e6efe0add525c9 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 09:28:20 -0500 Subject: [PATCH 036/111] hovercraft: migrate to by-name --- .../hovercraft/default.nix => by-name/ho/hovercraft/package.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/{applications/misc/hovercraft/default.nix => by-name/ho/hovercraft/package.nix} (100%) diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/by-name/ho/hovercraft/package.nix similarity index 100% rename from pkgs/applications/misc/hovercraft/default.nix rename to pkgs/by-name/ho/hovercraft/package.nix From 611b8218e44f04b49a3429bcaa99c7ac2414a7ac Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 09:42:15 -0500 Subject: [PATCH 037/111] hovercraft: refactor package definitions --- pkgs/by-name/ho/hovercraft/package.nix | 31 ++++++++++---------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ho/hovercraft/package.nix b/pkgs/by-name/ho/hovercraft/package.nix index a9c882443d0f6..6d25cddf4c037 100644 --- a/pkgs/by-name/ho/hovercraft/package.nix +++ b/pkgs/by-name/ho/hovercraft/package.nix @@ -1,33 +1,26 @@ { lib, - buildPythonApplication, - isPy3k, fetchFromGitHub, - manuel, - setuptools, - docutils, - lxml, - svg-path, - pygments, - watchdog, + python3Packages, fetchpatch, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "hovercraft"; version = "2.7"; format = "setuptools"; - disabled = !isPy3k; + disabled = !python3Packages.isPy3k; src = fetchFromGitHub { owner = "regebro"; repo = "hovercraft"; - rev = version; - sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az"; + tag = version; + hash = "sha256-X6EaiVahAYAaFB65oqmj695wlJFXNseqz0SQLzGVD0w="; }; - nativeCheckInputs = [ manuel ]; - propagatedBuildInputs = [ + nativeCheckInputs = with python3Packages; [ manuel ]; + + dependencies = with python3Packages; [ setuptools docutils lxml @@ -39,15 +32,15 @@ buildPythonApplication rec { (fetchpatch { name = "fix tests with pygments 2.14"; url = "https://sources.debian.org/data/main/h/hovercraft/2.7-5/debian/patches/0003-Fix-tests-with-pygments-2.14.patch"; - sha256 = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc="; + hash = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc="; }) ]; - meta = with lib; { + meta = { description = "Makes impress.js presentations from reStructuredText"; mainProgram = "hovercraft"; homepage = "https://github.com/regebro/hovercraft"; - license = licenses.mit; - maintainers = with maintainers; [ makefu ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ makefu ]; }; } From b5638f2f2ec5d384cd8789656a74eb74fa63a441 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 21 Jul 2025 15:26:06 -0500 Subject: [PATCH 038/111] hovercraft: remove toplevel --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31a981e57e2d..7c74d183de46b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12501,8 +12501,6 @@ with pkgs; haskellPackages.hledger-web; hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; - hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; - hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; From f7076e906f843f8078eae9822e48799fdbb602fb Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 22 Jul 2025 20:43:45 +0900 Subject: [PATCH 039/111] bun: 1.2.18 -> 1.2.19 https://bun.sh/blog/bun-v1.2.19 Signed-off-by: misilelab --- pkgs/by-name/bu/bun/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 4b69f29021dcb..ceeb62523e3c2 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.2.18"; + version = "1.2.19"; pname = "bun"; src = @@ -86,19 +86,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-zKnrUnYrvYHriU/IJ1u6CgZU6BqtMY0ZhphUow83aaI="; + hash = "sha256-Z0pIN4NC76rcPCkVlrVzAQ88I4iVj3xEZ42H9vt1mZE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-G60WcdBboVaWMVynJI7AQ9KbWV/1+xX6hraZwiVdi8U="; + hash = "sha256-/P1HHNvVp4/Uo5DinMzSu3AEpJ01K6A3rzth1P1dC4M="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-1/XHbGiaZ/D5pRmDy2EJacwUYhdr2P0BSDwKDBoG9P4="; + hash = "sha256-7CE3X3nul26pjI7wn+KnijCkibQxWUd13amCgPexEGQ="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-kOAyqYKuKZxi1kXaxsqqjrALaQkryFAb8TpZDejQmcg="; + hash = "sha256-w9PBTppeyD/2fQrP525DFa0G2p809Z/HsTgTeCyvH2Y="; }; }; updateScript = writeShellScript "update-bun" '' From 4dd3a87018e408d7f79016d23262c5b166959ee1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 17 Jul 2025 20:35:43 +0800 Subject: [PATCH 040/111] nixosTests.omnom: test snapshot workflow --- nixos/tests/omnom.nix | 104 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 4 deletions(-) diff --git a/nixos/tests/omnom.nix b/nixos/tests/omnom.nix index 4bfdbd679b39a..e21432980df14 100644 --- a/nixos/tests/omnom.nix +++ b/nixos/tests/omnom.nix @@ -10,8 +10,12 @@ in nodes = { server = - { config, lib, ... }: + { pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + services.omnom = { enable = true; openFirewall = true; @@ -26,17 +30,109 @@ in server.address = "0.0.0.0:${toString servicePort}"; }; }; + + programs.firefox = { + enable = true; + # librewolf allows installations of unsigned extensions + package = pkgs.wrapFirefox pkgs.librewolf-unwrapped { + nixExtensions = [ + ( + let + # specified in manifest.json of the addon + extid = "{f0bca7ce-0cda-41dc-9ea8-126a50fed280}"; + in + pkgs.runCommand "omnom" { passthru = { inherit extid; }; } '' + mkdir -p $out + cp ${pkgs.omnom}/share/addons/omnom_ext_firefox.zip $out/${extid}.xpi + '' + ) + ]; + }; + }; + + environment.systemPackages = [ pkgs.xdotool ]; }; }; - # TODO: take a snapshot testScript = - { nodes, ... }: # python '' + import re + + def open_omnom(): + # Add-ons Manager + server.succeed("xdotool mousemove --sync 960 90 click 1") + server.sleep(10) + # omnom + server.succeed("xdotool mousemove --sync 700 190 click 1") + server.sleep(10) + + + service_url = "http://127.0.0.1:${toString servicePort}" + server.start() server.wait_for_unit("omnom.service") server.wait_for_open_port(${toString servicePort}) - server.succeed("curl -sf http://localhost:${toString servicePort}") + server.succeed(f"curl -sf '{service_url}'") + + output = server.succeed("omnom create-user user user@example.com") + match = re.search(r"Visit (.+?) to sign in", output) + assert match is not None, "Login URL not found" + login_url = match[1].replace("0.0.0.0", "127.0.0.1") + + output = server.succeed("omnom create-token user addon") + match = re.search(r"Token (.+?) created", output) + assert match is not None, "Addon token not found" + token = match[1] + + server.wait_for_x() + server.succeed(f"librewolf --new-window '{login_url}' >&2 &") + server.wait_for_window("Omnom") + + open_omnom() + + # token + server.succeed("xdotool mousemove --sync 700 350 click 1") + server.succeed(f"xdotool type {token}") + server.sleep(10) + + # url + server.succeed("xdotool mousemove --sync 700 470 click 1") + server.succeed(f"xdotool type '{service_url}'") + server.sleep(10) + + # submit + server.succeed("xdotool mousemove --sync 900 520 click 1") + server.sleep(10) + + open_omnom() + + # save + server.succeed("xdotool mousemove --sync 900 520 click 1") + server.sleep(10) + + # refresh + server.succeed("xdotool mousemove --sync 100 80 click 1") + server.sleep(10) + + server.screenshot("home.png") + + # view bookmarks + server.succeed("xdotool mousemove --sync 300 130 click 1") + server.sleep(10) + + # view snapshot + server.succeed("xdotool mousemove --sync 970 230 click 1") + server.sleep(10) + server.succeed("xdotool mousemove --sync 160 340 click 1") + server.sleep(10) + + server.screenshot("screenshot.png") + + # view details + server.succeed("xdotool mousemove --sync 290 200 click 1") + server.sleep(10) + + server.screenshot("snapshot_details.png") ''; } From 551b9d240740fcc6e0946c741f430fb76bf30898 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 22 Jul 2025 14:12:53 +0800 Subject: [PATCH 041/111] nixosTests.omnom: split config --- nixos/tests/all-tests.nix | 2 +- nixos/tests/omnom/config.nix | 36 ++++++++++++++ nixos/tests/{omnom.nix => omnom/default.nix} | 49 ++++---------------- 3 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 nixos/tests/omnom/config.nix rename nixos/tests/{omnom.nix => omnom/default.nix} (66%) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7aa2dbdbdaf5c..4d7a5defc0fbd 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1052,7 +1052,7 @@ in ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix; ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix; ombi = runTest ./ombi.nix; - omnom = runTest ./omnom.nix; + omnom = runTest ./omnom; openarena = runTest ./openarena.nix; openbao = runTest ./openbao.nix; opencloud = runTest ./opencloud.nix; diff --git a/nixos/tests/omnom/config.nix b/nixos/tests/omnom/config.nix new file mode 100644 index 0000000000000..55c2cca56f2e1 --- /dev/null +++ b/nixos/tests/omnom/config.nix @@ -0,0 +1,36 @@ +{ config, pkgs, ... }: +{ + services.omnom = { + enable = true; + openFirewall = true; + + port = 9090; + + settings = { + app = { + disable_signup = false; # restrict CLI user-creation + results_per_page = 50; + }; + server.address = "0.0.0.0:${toString config.services.omnom.port}"; + }; + }; + + programs.firefox = { + enable = true; + # librewolf allows installations of unsigned extensions + package = pkgs.wrapFirefox pkgs.librewolf-unwrapped { + nixExtensions = [ + ( + let + # specified in manifest.json of the addon + extid = "{f0bca7ce-0cda-41dc-9ea8-126a50fed280}"; + in + pkgs.runCommand "omnom" { passthru = { inherit extid; }; } '' + mkdir -p $out + cp ${pkgs.omnom}/share/addons/omnom_ext_firefox.zip $out/${extid}.xpi + '' + ) + ]; + }; + }; +} diff --git a/nixos/tests/omnom.nix b/nixos/tests/omnom/default.nix similarity index 66% rename from nixos/tests/omnom.nix rename to nixos/tests/omnom/default.nix index e21432980df14..95699f3a73a81 100644 --- a/nixos/tests/omnom.nix +++ b/nixos/tests/omnom/default.nix @@ -1,7 +1,4 @@ -{ lib, ... }: -let - servicePort = 9090; -in +{ config, lib, ... }: { name = "Basic Omnom Test"; meta = { @@ -13,48 +10,18 @@ in { pkgs, ... }: { imports = [ - ./common/x11.nix + ../common/x11.nix + ./config.nix ]; - services.omnom = { - enable = true; - openFirewall = true; - - port = servicePort; - - settings = { - app = { - disable_signup = false; # restrict CLI user-creation - results_per_page = 50; - }; - server.address = "0.0.0.0:${toString servicePort}"; - }; - }; - - programs.firefox = { - enable = true; - # librewolf allows installations of unsigned extensions - package = pkgs.wrapFirefox pkgs.librewolf-unwrapped { - nixExtensions = [ - ( - let - # specified in manifest.json of the addon - extid = "{f0bca7ce-0cda-41dc-9ea8-126a50fed280}"; - in - pkgs.runCommand "omnom" { passthru = { inherit extid; }; } '' - mkdir -p $out - cp ${pkgs.omnom}/share/addons/omnom_ext_firefox.zip $out/${extid}.xpi - '' - ) - ]; - }; - }; - environment.systemPackages = [ pkgs.xdotool ]; }; }; testScript = + let + port = toString config.nodes.server.services.omnom.port; + in # python '' import re @@ -68,11 +35,11 @@ in server.sleep(10) - service_url = "http://127.0.0.1:${toString servicePort}" + service_url = "http://127.0.0.1:${toString port}" server.start() server.wait_for_unit("omnom.service") - server.wait_for_open_port(${toString servicePort}) + server.wait_for_open_port(${toString port}) server.succeed(f"curl -sf '{service_url}'") output = server.succeed("omnom create-user user user@example.com") From 1d47e296a0bf0d3eda303aba207928bc13b24d66 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 22 Jul 2025 21:52:57 +0800 Subject: [PATCH 042/111] nixosTests.omnom: use package maintainers --- nixos/tests/omnom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/omnom/default.nix b/nixos/tests/omnom/default.nix index 95699f3a73a81..6f115037aca5f 100644 --- a/nixos/tests/omnom/default.nix +++ b/nixos/tests/omnom/default.nix @@ -1,8 +1,8 @@ -{ config, lib, ... }: +{ config, pkgs, ... }: { name = "Basic Omnom Test"; meta = { - maintainers = lib.teams.ngi.members; + inherit (pkgs.omnom.meta) maintainers; }; nodes = { From a84b337c0160af752d9ca1b6b45ae2108b0c2dcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 14:00:44 +0000 Subject: [PATCH 043/111] flannel: 0.27.1 -> 0.27.2 --- pkgs/tools/networking/flannel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 2bc4f17978ee2..227dc6d4053e6 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.27.1"; + version = "0.27.2"; rev = "v${version}"; - vendorHash = "sha256-FR9jeHVZS87Tlv1jtO4h5ZDqKIRLfa4xGlpCj1IWoXU="; + vendorHash = "sha256-48/BYhVWS/Tp1UKgpGX31/gdMC1xpWr06+Y+WoXPAs4="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-xmKXemr/qSLsBOwLhJIewF7Iu/ERpZX8kUFgotz4Yyw="; + sha256 = "sha256-d92kv1cWwZr4BzrFaI3t/JBvYERaClqFSRzrAUFkqRc="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; From 6e4019021f7adda789be135b5e00234c41a30911 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 14:41:59 +0000 Subject: [PATCH 044/111] bee: 2.5.0 -> 2.6.0 --- pkgs/by-name/be/bee/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix index 3ad451df6c4f9..4bffa8569d31e 100644 --- a/pkgs/by-name/be/bee/package.nix +++ b/pkgs/by-name/be/bee/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bee"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ethersphere"; repo = "bee"; rev = "v${version}"; - hash = "sha256-44mjSeV8imatPpNkRSA5Uewunvkc5j6Eo+gKya+dqzE="; + hash = "sha256-Yz23iVYGZ4PS1jbV5zFaCEsQOoAbHBpePml0zp5GSkQ="; }; - vendorHash = "sha256-1Hl0tT6ZI3otEdOQw9adipOGcSyZXLbSLC8s7YsFRZA="; + vendorHash = "sha256-0czsloD2EhSWKQbj7NJ4IqGgKM9+Vp8gSIhOKWg/onA="; subPackages = [ "cmd/bee" ]; From 67099ae09b9c9618359ea574d0998d45a5eec355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 22 Jul 2025 16:59:05 +0200 Subject: [PATCH 045/111] golangci-lint: 2.2.2 -> 2.3.0 Diff: https://github.com/golangci/golangci-lint/compare/refs/tags/v2.2.2...refs/tags/v2.3.0 Changelog: https://github.com/golangci/golangci-lint/blob/v2.3.0/CHANGELOG.md --- pkgs/by-name/go/golangci-lint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 5da1c501a11df..0a87d4a4ef2bc 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "golangci-lint"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-XpFbcyuARE4gvSsWoIXM+CMUiDeuIiM5dbGPt5ACLA8="; + hash = "sha256-Kr4nkoqlCGyuaa4X1BLqe/WZA+ofYkWPizPMzcZQDQg="; }; - vendorHash = "sha256-Dh+HTUM3uD/l2g4R0hFEtrzjlrOcZQf2S3ELXKWl01U="; + vendorHash = "sha256-SsKypfsr1woHah9rIyFnUNdp0mTde7k++E2CfE22LK4="; subPackages = [ "cmd/golangci-lint" ]; From 5959e69ef2a806402b50ed774770225664857d13 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 22 Jul 2025 23:26:10 +0800 Subject: [PATCH 046/111] iio-sensor-proxy: Fix on cros-ec devices (e.g. Framework 12) https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/merge_requests/400 has finally been merged and fixed the regression in version 3.7. Since the merging has taken a long time, I don't expect a new release soon and we should include the patches. Also see https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/issues/411 Now monitor-sensor can show the display orientation and GNOME/KDE pick it up. Signed-off-by: Daniel Schaefer --- pkgs/by-name/ii/iio-sensor-proxy/package.nix | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/by-name/ii/iio-sensor-proxy/package.nix b/pkgs/by-name/ii/iio-sensor-proxy/package.nix index dee2b98620a66..e30fb572ea1b7 100644 --- a/pkgs/by-name/ii/iio-sensor-proxy/package.nix +++ b/pkgs/by-name/ii/iio-sensor-proxy/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch2, glib, cmake, libxml2, @@ -26,6 +27,26 @@ stdenv.mkDerivation rec { hash = "sha256-MAfh6bgh39J5J3rlyPjyCkk5KcfWHMZLytZcBRPHaJE="; }; + # Fix devices with cros-ec-accel, like Chromebooks and Framework Laptop 12 + # https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/merge_requests/400 + patches = [ + (fetchpatch2 { + name = "mr400_1.patch"; + url = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/f35d293e65841a3b9c0de778300c7fa58b181fd0.patch"; + hash = "sha256-Gk8Wpy+KFhHAsR3XklcsL3Eo4fHjQuFT6PCN5hz9KHk="; + }) + (fetchpatch2 { + name = "mr400_2.patch"; + url = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/7416edf4da98d8e3b75f9eddb7e5c488ac4a4c54.patch"; + hash = "sha256-5UnYam6P+paBHAI0qKXDAvrFM8JYhRVTUFePRTHCp+U="; + }) + (fetchpatch2 { + name = "mr400_3.patch"; + url = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/d00109194422a4fe3e9a7bc1235ffc492459c61a.patch"; + hash = "sha256-58KrXbdpR1eWbPmsr8b0ke67hX5J0o0gtqzrz3dc+ck="; + }) + ]; + postPatch = '' # upstream meson.build currently doesn't have an option to change the default polkit dir substituteInPlace data/meson.build \ From ed8c4780499fb8e9ce35b6c9531dba326afbe285 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 17:26:42 +0000 Subject: [PATCH 047/111] vscode-extensions.sonarsource.sonarlint-vscode: 4.26.0 -> 4.27.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 79135426c4942..2f9c86d42b955 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4403,8 +4403,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.26.0"; - hash = "sha256-Mru3dz0Dl/oDHd0tB/0Ixd+EselC+e70Cn7sdu1gkwk="; + version = "4.27.0"; + hash = "sha256-0BqIJL9Vyccjsov1JQil3dRUdo9w8ecOUotVKzBlYGQ="; }; meta.license = lib.licenses.lgpl3Only; }; From e014b5e79fb0c2f871d202c88ea06bf9556a0495 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 19:42:04 +0000 Subject: [PATCH 048/111] instaloader: 4.14.1 -> 4.14.2 --- pkgs/tools/misc/instaloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix index 4c62eb14d938e..bad52de30dd2d 100644 --- a/pkgs/tools/misc/instaloader/default.nix +++ b/pkgs/tools/misc/instaloader/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "instaloader"; - version = "4.14.1"; + version = "4.14.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "instaloader"; repo = "instaloader"; tag = "v${version}"; - sha256 = "sha256-ZGCO5xNUwrQFsSaAiP1yffrkSN+Mxdtrw+Kve0s2t2E="; + sha256 = "sha256-q5/lZ+BHnrod0vG/ZJw/5iJRKKaP3Gbns5yaZH0P2rE="; }; nativeBuildInputs = [ From b0fc2fcd39e118ec3a4b7bc531823da12d249c91 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 22 Jul 2025 21:45:59 +0200 Subject: [PATCH 049/111] abiword: unpin autotools --- pkgs/by-name/ab/abiword/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ab/abiword/package.nix b/pkgs/by-name/ab/abiword/package.nix index aaac2f39a4f12..08a8ced247883 100644 --- a/pkgs/by-name/ab/abiword/package.nix +++ b/pkgs/by-name/ab/abiword/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitLab, - autoreconfHook269, + autoreconfHook, autoconf-archive, pkg-config, gtk3, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook269 + autoreconfHook autoconf-archive pkg-config wrapGAppsHook3 From 1fd6b7a87f4567fe6967b015364ff80da43214ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 19:52:37 +0000 Subject: [PATCH 050/111] filebeat8: 8.18.3 -> 8.18.4 --- pkgs/by-name/fi/filebeat8/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index 3cda7cb06e170..8a5e0eadaabc1 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "filebeat"; - version = "8.18.3"; + version = "8.18.4"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${version}"; - hash = "sha256-Lg+3M4zw0m7URBvC2G3aasXG7owc8JslMX4kI95qSCU="; + hash = "sha256-H7UKYp+REz7d9wKrP+AhIJp4ydCVS8NGKfBFvDFZWiA="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-2Rl4OJOMbt74QVb57Or2JklYSjTFRkly5GXrW0LAkoI="; + vendorHash = "sha256-G4+FsmmPDyssD+n1N1BnCElYv/bW7kY2tF60r49ZhN8="; subPackages = [ "filebeat" ]; From 57086d0d3ea595939beabfeb345dcae58e09bbe2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 22 Jul 2025 21:53:03 +0200 Subject: [PATCH 051/111] varnish60Packages.dynamic: unpin autotools --- pkgs/servers/varnish/dynamic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index c98d9f0fb0b2a..3c5d6c17f6883 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - autoreconfHook269, + autoreconfHook, pkg-config, varnish, docutils, @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config docutils - autoreconfHook269 + autoreconfHook varnish.python ]; buildInputs = [ varnish ]; From 80fe20d68b1c469ce4eba3da104f293b0d7bd975 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:00:32 +0200 Subject: [PATCH 052/111] python313Packages.tencentcloud-sdk-python: 3.0.1425 -> 3.0.1427 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1425...refs/tags/3.0.1427 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1427/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a9ec7bfa71ebf..b9040a77c1d72 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1425"; + version = "3.0.1427"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-w4pvIWkMjFgn+v7Si8DwzSFhKobrz8EeRSiEmqyn1Ok="; + hash = "sha256-OuQQr9ptcTL6YjeUWIa2ak3i1NMO1uhql+dR+cIJUQU="; }; build-system = [ setuptools ]; From ee9e7604184c4a11d60169839e18b48a2a591673 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 20:01:07 +0000 Subject: [PATCH 053/111] terraform-providers.aiven: 4.42.0 -> 4.43.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 3902cc7890749..00ec2fb4dbdea 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-TJWa1vGYfC8mSzOdMI0WKU8ZXkm26pZKyoXLfAJVehQ=", + "hash": "sha256-36gEDXAZgeniGe6zCmfLkVj0yxYfSk11tmk61cWly04=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.42.0", + "rev": "v4.43.0", "spdx": "MIT", - "vendorHash": "sha256-pQMQvJ/T6adUydIu6vRvSxaeEry22wYmIzY3ryPncJc=" + "vendorHash": "sha256-jZ950/nPFt3+t3CHsNEkYo7POabRCHVvcfu04Iq3cJc=" }, "akamai": { "hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=", From c0eba01f62cb69cda1d818f028fd0af90ce815c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:24:02 +0200 Subject: [PATCH 054/111] python313Packages.slack-sdk: 3.35.0 -> 3.36.0 Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.36.0 --- .../python-modules/slack-sdk/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 6093778bd7519..143314a61700e 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -6,7 +6,6 @@ boto3, buildPythonPackage, fetchFromGitHub, - fetchpatch, moto, pytest-asyncio, pytestCheckHook, @@ -19,24 +18,16 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.35.0"; + version = "3.36.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; tag = "v${version}"; - hash = "sha256-yjYpALyHSTLQSuwd6xth7nqfi3m1C9tqnWrrVRmI220="; + hash = "sha256-Y6w4osSpirBjxPdZRlODwEAWd4Z+sPHrr7alVl/6mPA="; }; - patches = [ - (fetchpatch { - name = "fix-aiohttp-test_init_with_loop.patch"; - url = "https://github.com/slackapi/python-slack-sdk/pull/1697.patch"; - hash = "sha256-rHaJBH/Yxm3Sz/jmzc4G1pVJJXz0PL2880bz5n7w3ck="; - }) - ]; - build-system = [ setuptools ]; optional-dependencies.optional = [ From af809fa4c3c31f65a8890e83f102525fb981773d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Jul 2025 22:28:41 +0200 Subject: [PATCH 055/111] python313Packages.aioairzone-cloud: 0.6.12 -> 0.6.16 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.6.12...refs/tags/0.6.16 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.16 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 30446b44d9931..03c369b1e88b5 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.12"; + version = "0.6.16"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; tag = version; - hash = "sha256-maSYT1sd1GTe0Av0NvOUinI/GBYFzjUAemRLx7sDPUk="; + hash = "sha256-EPj6tql05ZUImMAeeUTyNms1NdwJgtdCJmJ+O8HXP3I="; }; build-system = [ setuptools ]; From 1620466af2bdfa2c7f1e945e79c183af03ab45dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 20:39:35 +0000 Subject: [PATCH 056/111] babeltrace2: 2.1.1 -> 2.1.2 --- pkgs/by-name/ba/babeltrace2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/babeltrace2/package.nix b/pkgs/by-name/ba/babeltrace2/package.nix index e26811b6a653a..91d6c8e354413 100644 --- a/pkgs/by-name/ba/babeltrace2/package.nix +++ b/pkgs/by-name/ba/babeltrace2/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "babeltrace2"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "efficios"; repo = "babeltrace"; rev = "v${version}"; - hash = "sha256-ppSPly4HR/oemsX069o6VqwSB1AU1mKRwRepwPORf7I="; + hash = "sha256-4vqeIwCWEAzsHTdM2S2grF7F4vPqiWTeTEZpxsqf2g8="; }; outputs = [ From e63ab40ad4efd5864d5567c800d453d52c988f87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 20:57:21 +0000 Subject: [PATCH 057/111] vscode-extensions.gitlab.gitlab-workflow: 6.33.2 -> 6.35.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 79135426c4942..746decfbb404e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2045,8 +2045,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.33.2"; - hash = "sha256-28J1PxqJgULkbO49gjMyJf79pSlN1ZeN9vN5clJ2wYo="; + version = "6.35.0"; + hash = "sha256-stSo+GHhEzIE1HevACEUmum9tNetMIfpz0t8330QlTI="; }; meta = { description = "GitLab extension for Visual Studio Code"; From 1798bf4bcc383dff3aba519a901a3e80a10cdb56 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 23 Jul 2025 00:01:46 +0300 Subject: [PATCH 058/111] alt-tab-macos: 7.24.0 -> 7.25.0 Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v7.25.0 Diff: https://github.com/lwouis/alt-tab-macos/compare/v7.24.0...v7.25.0 --- pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index 430c563295ebc..48da2357d034b 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "7.24.0"; + version = "7.25.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-iURIOxRgGCNXJA+9cDb07iwj0b4H8TdX8bPPmM3RjyI="; + hash = "sha256-e13en0fQHO0i49gP1zU6ms9TDMAwo1qsubsTi/DdIUo="; }; sourceRoot = "."; From 3f9849a2338b692a2cba384d8f26507303631766 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 21:21:16 +0000 Subject: [PATCH 059/111] pocketbase: 0.28.4 -> 0.29.0 --- pkgs/by-name/po/pocketbase/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 959bc9369b353..e61156eb7db50 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.28.4"; + version = "0.29.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-LMkyz8Eu5W9TGZva7bPiAoN21ymKvAO6oSZcvX6rX+s="; + hash = "sha256-yNz/bwjOPcj4N4yXi1pckz/rGNSJeCs8xeZHj+W/+2E="; }; - vendorHash = "sha256-hOB8MOfG+RHDJEP5DSDvSiphb+c86QySNEmRr8633cM="; + vendorHash = "sha256-XfHU2E2VEcQEQtcGmZqEPjdy7wxvOEdcysSYYD5oLNM="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 80cea3298bdd5ba0ae7aab83a540de098b2615a6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 22 Jul 2025 23:41:00 +0200 Subject: [PATCH 060/111] heimdal: unpin autotools --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31a981e57e2d..6085829b06378 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8350,9 +8350,7 @@ with pkgs; hamlib_3 = callPackage ../development/libraries/hamlib { }; hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { - autoreconfHook = buildPackages.autoreconfHook269; - }; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; harfbuzzFull = harfbuzz.override { withGraphite2 = true; From d9972f827d52f5ec4770796cf5e260a8384e18eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 21:41:33 +0000 Subject: [PATCH 061/111] alacritty-theme: 0-unstable-2025-05-15 -> 0-unstable-2025-07-16 --- pkgs/by-name/al/alacritty-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix index df06e6abf25ea..e441805d46c31 100644 --- a/pkgs/by-name/al/alacritty-theme/package.nix +++ b/pkgs/by-name/al/alacritty-theme/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2025-05-15"; + version = "0-unstable-2025-07-16"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "59a96ef4c734f97a1aadaa619b31cc1ca90a0fbc"; - hash = "sha256-7Qu00+odZblXqN9e3uVZWfIWySFT0IiwIyK5wEbtReE="; + rev = "6c91a0e913396daafdb7ca43e84014d4e176623c"; + hash = "sha256-Rq5AB9BktTaCQ1UzUITgu6g5a74C0sHpiiHAjeC1RiA="; sparseCheckout = [ "themes" ]; }; From dd1f09a13fd0350df25acb8529f748029006ec7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 22:50:45 +0000 Subject: [PATCH 062/111] fishPlugins.exercism-cli-fish-wrapper: 0-unstable-2025-06-27 -> 0-unstable-2025-07-14 --- pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix index 6ab563ac960f0..dd900babd1711 100644 --- a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix +++ b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix @@ -6,13 +6,13 @@ }: buildFishPlugin { pname = "exercism-cli-fish-wrapper"; - version = "0-unstable-2025-06-27"; + version = "0-unstable-2025-07-14"; src = fetchFromGitHub { owner = "glennj"; repo = "exercism-cli-fish-wrapper"; - rev = "ab03e0a670d07ccaa4e72be7c1f3da1d1092ce3e"; - hash = "sha256-wtxddxEob8L2tavoaZaM/AaEgDzMVkAo3Z1oEtIHxYU="; + rev = "bb03e058d4e9c5d5918e27ae7e046fff2c91adb0"; + hash = "sha256-taIZSyaObVmnjp6ME/QgGKlWZoeOmgRVRLYC0bb8XWk="; }; passthru.updateScript = unstableGitUpdater { }; From b6b021a328d7d29b9946f7c78db1983ea102aac9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 01:11:45 +0000 Subject: [PATCH 063/111] copybara: 20250714 -> 20250721 --- pkgs/by-name/co/copybara/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 7e3ff087f3551..cbb365047ca9b 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20250714"; + version = "20250721"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-pvJnBMuTJb4juJBJObpA9hP2Fw42IssdAARUGUuEgJo="; + hash = "sha256-//HU8zZspR5Rq2xjo1QLLzigGJLuGJE4czUkzXnJ7EA="; }; nativeBuildInputs = [ From a0333ea521b943beb3dee696bc52ea34b612c736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 02:39:51 +0000 Subject: [PATCH 064/111] capnproto-rust: 0.21.1 -> 0.21.2 --- pkgs/by-name/ca/capnproto-rust/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 0cb462c0d63db..01a7e50751e64 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "capnproto-rust"; - version = "0.21.1"; + version = "0.21.2"; src = fetchCrate { crateName = "capnpc"; inherit version; - hash = "sha256-WqzcUnAx/qD50/ZlWlWS4bguTxW+qFj0uFzwsbxHBaw="; + hash = "sha256-9Vsr6pRfC8Onqw/Yna2cJl1L70uo3K/C80CztNw0XoQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-FtJvm6uUFSHn8lQxEFoWpSZgqomfHYkR3E0kKsV/II4="; + cargoHash = "sha256-V92zF75fd5MVz84YnWJONNjxZsA4zHTee1hAPAkoX6k="; postInstall = '' mkdir -p $out/include/capnp From 62d494e48cfcb949c4d1587f8ccb5bd3e405fc8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 02:44:27 +0000 Subject: [PATCH 065/111] kafkactl: 5.10.1 -> 5.11.0 --- pkgs/by-name/ka/kafkactl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix index 1fa763de19cb2..806ec47d44d8a 100644 --- a/pkgs/by-name/ka/kafkactl/package.nix +++ b/pkgs/by-name/ka/kafkactl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kafkactl"; - version = "5.10.1"; + version = "5.11.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = "kafkactl"; tag = "v${version}"; - hash = "sha256-DFtpzsydA5bPec7LPSJJngS12+ekwJ/Un04yTYOLZts="; + hash = "sha256-9d/TXNRuU5+uDImS5hm87tIP1teH6T+/zglRYX+F6Kc="; }; vendorHash = "sha256-rxQxNf3FBAGudgrE2wxHw4mVHxTEpQpQ+DX/nEVpoJY="; From b6e69bc57fb85643b934d0f530a38af4d0698161 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 03:30:16 +0000 Subject: [PATCH 066/111] wait4x: 3.4.0 -> 3.5.0 --- pkgs/by-name/wa/wait4x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index 8f14b034ef5d2..a87ce1601148b 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -5,7 +5,7 @@ }: let pname = "wait4x"; - version = "3.4.0"; + version = "3.5.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "wait4x"; repo = "wait4x"; rev = "v${version}"; - hash = "sha256-Pb2Klupm6cNYUQ3bWBHwr3NW1HCdit2NFFISn9/c860="; + hash = "sha256-iHhUimAREKN3o36vi1Ggj8PrhXCHRllxv4yiQ2xcNig="; }; - vendorHash = "sha256-6gRiYQYtkADBAMNqma4PfuzIttseyE/bHnlkpOgsVjI="; + vendorHash = "sha256-N3HYbeBoDuLvWYX+7mrCTYi38hTdK8BP9uY56fOmuls="; # Tests make network access doCheck = false; From 260d2c6552f175383db0d72066a00caf3ec19893 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 04:36:15 +0000 Subject: [PATCH 067/111] python3Packages.pyshp: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/pyshp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 361252eaee7c8..05ebc0c376d72 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyshp"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GeospatialPython"; repo = "pyshp"; - rev = version; - hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo="; + tag = version; + hash = "sha256-q1++2pifLZWc562m5cKoL2jLWM4lOnIwEAOqzKArh+w="; }; nativeCheckInputs = [ pytestCheckHook ]; From 59fb421c7c9aaceb8cce443c0e18c400e3b16302 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 04:46:57 +0000 Subject: [PATCH 068/111] terraform-providers.sentry: 0.14.5 -> 0.14.6 --- .../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 3902cc7890749..491d864d875b5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1183,13 +1183,13 @@ "vendorHash": "sha256-uMZIze8sng80sCb6f9CsWHVMmUGMaaOD4Ezx9B2fAJ4=" }, "sentry": { - "hash": "sha256-/rulw49DcAi5tk4j6XpvlG0X6HJgcMI+zotKsFU2MmI=", + "hash": "sha256-b5a0++mu6roN6VuJaBZEczfqA6Stt+a7fTOLGLvqPeQ=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.14.5", + "rev": "v0.14.6", "spdx": "MIT", - "vendorHash": "sha256-OurLZioO4zEBwsOyeUhv2KpQZEPySJn7I65w2rmvUn8=" + "vendorHash": "sha256-67xoILi88FEN005tk8Z3ggc3ggfuS1AHthYglqvOLE4=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", From b701661037370654cbd390bf9df72a2dc8901ad5 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Wed, 23 Jul 2025 05:16:47 +0000 Subject: [PATCH 069/111] _1password-gui: 8.11.0 -> 8.11.2 --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 7296265b84f01..422568cd31e75 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,28 +1,28 @@ { "stable": { "linux": { - "version": "8.11.0", + "version": "8.11.2", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.0.x64.tar.gz", - "hash": "sha256-aE7AQPzgMNZh++HOFduT4c7qipEvjUdQ9sBH8epuXeE=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.2.x64.tar.gz", + "hash": "sha256-2yYzUO/ZdB/BA3wT+2fKM0ZzJzBpVH/N5xaIg50lzzo=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.0.arm64.tar.gz", - "hash": "sha256-5jmMolrISZaoqsGEYhsTxlKgAZk+RdVUOBMQDIn9nFM=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.2.arm64.tar.gz", + "hash": "sha256-slKgf7ahA6pFBR2V9L8mI7ROisARRY7M4IjB1UYhwvU=" } } }, "darwin": { - "version": "8.11.0", + "version": "8.11.2", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.0-x86_64.zip", - "hash": "sha256-bZoX7mxh7JqYKgPQGUjrWEFYKGjl7dzhpL/CIt5IY00=" + "url": "https://downloads.1password.com/mac/1Password-8.11.2-x86_64.zip", + "hash": "sha256-jcfSjcAajkgRQP0JA//f4Ltc62nDeISFZxYuGObFMKA=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.0-aarch64.zip", - "hash": "sha256-I88nfsb1xsErgafmo0qqSHcalhTMkGH9m0bMWAGlad8=" + "url": "https://downloads.1password.com/mac/1Password-8.11.2-aarch64.zip", + "hash": "sha256-pdnEhTJCSod/VnbKVvCEqQzNjGwDPz28Or97+jLSwJk=" } } } From 049594d9c417c28c4b33cfbdf836c24e0c75a720 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Tue, 22 Jul 2025 23:09:10 -0700 Subject: [PATCH 070/111] _1password-gui: update.sh improvements - Handle the macOS Beta channel app-updates feed quirk (This is a known issue to the upstream) - Handle OS specific updates When the upstream releases an update for only one OS, handle it gracefully and also include a notice in parens for the commit message: e.g. _1password-gui: 1.2.2 -> 1.2.3 (darwin only) --- pkgs/by-name/_1/_1password-gui/update.sh | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/update.sh b/pkgs/by-name/_1/_1password-gui/update.sh index 07fc726e2f749..b4a2fb91f1f25 100755 --- a/pkgs/by-name/_1/_1password-gui/update.sh +++ b/pkgs/by-name/_1/_1password-gui/update.sh @@ -37,6 +37,7 @@ read_local_versions() { read_remote_versions() { local channel="$1" + local darwin_beta_maybe if [[ ${channel} == "stable" ]]; then remote_versions["stable/linux"]=$( @@ -56,10 +57,17 @@ read_remote_versions() { | "${JQ[@]}" '.[] | select(.repo == "aur" and .srcname == "1password-beta") | .version | sub("_"; "-")' ) - remote_versions["beta/darwin"]=$( + # Handle macOS Beta app-update feed quirk. + # If there is a newer release in the stable channel, queries for beta + # channel will return the stable channel version; masking the current beta. + darwin_beta_maybe=$( "${CURL[@]}" "${APP_UPDATES_URI_BASE}/Y" \ | "${JQ[@]}" 'select(.available == "1") | .version' ) + # Only consider versions that end with '.BETA' + if [[ ${darwin_beta_maybe} =~ \.BETA$ ]]; then + remote_versions["beta/darwin"]=${darwin_beta_maybe} + fi fi } @@ -98,9 +106,12 @@ for i in "${!remote_versions[@]}"; do fi done -if [[ ${#new_version_available[@]} -eq 0 ]]; then - # up to date - exit +num_updates=${#new_version_available[@]} +if (( num_updates == 0 )); then + exit # up to date +elif (( num_updates == 1 )); then + os=$(cut -d / -f 2 <<<"${new_version_available[@]}") + os_specific_update=" (${os} only)" fi ./update-sources.py "${new_version_available[@]}" @@ -109,7 +120,7 @@ cat < Date: Wed, 23 Jul 2025 09:13:21 +0200 Subject: [PATCH 071/111] vencord: 1.12.6 -> 1.12.7 --- pkgs/by-name/ve/vencord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 3bb9de8cb72f0..aae37eecd7252 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.12.6"; + version = "1.12.7"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-7JT8BMKUhIwYMkIwr2mD8IQLDpldcDtAKh6R1tbAKMw="; + hash = "sha256-MS88KCH8ZdLyKoR0K45CSJutZSKUhz4FAE2VtrSx0ic="; }; pnpmDeps = pnpm_10.fetchDeps { From abdfcc5f3a1d20e9f688f8ce5df1b3ff382a5cbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 07:53:20 +0000 Subject: [PATCH 072/111] orchard: 0.36.0 -> 0.37.0 --- pkgs/by-name/or/orchard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 05924132cef80..2f85633231a34 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "orchard"; rev = version; - hash = "sha256-1i62fKxuLYtLIUSbUZ4nu3I1r9V6PUhaWpspH/H7k+Q="; + hash = "sha256-V5pBiF1IIfyyZIAoHnAccZ6YNddA4MosEJROJVEpwoo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-dWx4Ivw25H07rd0pNC3VecS7QcIc9ikEwjjUS53SefU="; + vendorHash = "sha256-VHEj4y7XSfdbSeBo9+ZwBZXUj/ur0w6gPrxCt2xNQMM="; nativeBuildInputs = [ installShellFiles ]; From b22e2eb100f0ec428896a7983a4ba9d961e6fc19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 09:09:06 +0000 Subject: [PATCH 073/111] particle-cli: 3.38.1 -> 3.38.2 --- pkgs/by-name/pa/particle-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix index 6edda5e002b44..6b3d6f59cb9fe 100644 --- a/pkgs/by-name/pa/particle-cli/package.nix +++ b/pkgs/by-name/pa/particle-cli/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "particle-cli"; - version = "3.38.1"; + version = "3.38.2"; src = fetchFromGitHub { owner = "particle-iot"; repo = "particle-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-B01aoCzcesvz6EjOQf9wTkONhByhf3YqJ18hDVNxEY4="; + hash = "sha256-/MfT7+g3l+5Y3mRGl0yiDMRXL2heWZzVNm+LfTmy9SA="; }; - npmDepsHash = "sha256-rxGo5L37GnJfvDxURlSxWqm+/HfxMLNkEFceaPdvL4c="; + npmDepsHash = "sha256-L/DfZWvJRZzHvf9pP7bHEJt85KT0s46+KErkTNRgH04="; buildInputs = [ udev From b433a73a603ecb9f0d3c7a3bbed2eba9ca70bce5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 23 Jul 2025 11:39:59 +0200 Subject: [PATCH 074/111] fswatch: unpin autotools --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31a981e57e2d..87600184ae7e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7237,9 +7237,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { }; - fswatch = callPackage ../development/tools/misc/fswatch { - autoreconfHook = buildPackages.autoreconfHook269; - }; + fswatch = callPackage ../development/tools/misc/fswatch { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; From 478adb878b253893e7edaec94e6567702c3d9e00 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Jul 2025 12:18:46 +0200 Subject: [PATCH 075/111] python3Packages.symfc: 1.3.3 -> 1.5.4 Diff: https://github.com/symfc/symfc/compare/refs/tags/v1.3.3...refs/tags/v1.5.4 Changelog: https://github.com/symfc/symfc/releases/tag/v1.5.4 --- pkgs/development/python-modules/symfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/symfc/default.nix b/pkgs/development/python-modules/symfc/default.nix index ce8f4cd947bbb..085305c84711f 100644 --- a/pkgs/development/python-modules/symfc/default.nix +++ b/pkgs/development/python-modules/symfc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "symfc"; - version = "1.3.3"; + version = "1.5.4"; pyproject = true; src = fetchFromGitHub { owner = "symfc"; repo = "symfc"; tag = "v${version}"; - hash = "sha256-ec/HFs3txVtu46llTmcfDF8j0+mTkozdu7+RsZXaAGE="; + hash = "sha256-SGFKbOVi5cVw+8trXrSnO0v2obpJBZrj+7yXk7hK+1s="; }; build-system = [ From 8b7d929b0074f2835df48e5dae5dc1bd3f30b830 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 10:49:44 +0000 Subject: [PATCH 076/111] models-dev: 0-unstable-2025-07-16 -> 0-unstable-2025-07-23 --- pkgs/by-name/mo/models-dev/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 0062f142dec56..20cf8161869dd 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -17,12 +17,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "0-unstable-2025-07-16"; + version = "0-unstable-2025-07-23"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "a0eedfb30fb449322deaff0b349b3a194608789e"; - hash = "sha256-+0FZmLxWz75wU5NIxjpX+H0oNa3gGgYCjoK8JdP7sOg="; + rev = "affbfa8012d0dbc0eba81ea51ec32069c71af417"; + hash = "sha256-JPcurldPuaFPfwqiWQR83x1uDcL0Dy79kx2TAOiNnyQ="; }; node_modules = stdenvNoCC.mkDerivation { From 9e46bf10a95ad3b27b23299459503a86b2919599 Mon Sep 17 00:00:00 2001 From: miampf Date: Wed, 23 Jul 2025 13:24:18 +0200 Subject: [PATCH 077/111] azure-cli-extensions.confcom: 1.2.1 -> 1.2.6 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index e3b4fd0cbf2e9..7b68394d4f3c2 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -63,9 +63,9 @@ confcom = mkAzExtension rec { pname = "confcom"; - version = "1.2.1"; + version = "1.2.6"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; - hash = "sha256-D78WwrOKbc8RNAa9Q3wgZRjVOUy/012+KIlTtk5NeTM="; + hash = "sha256-kyJ4AkPcpP/10nf4whJiuraC7hn0E6iBkhRIn43E9J0="; description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ openssl_1_1 ]; From dc0acd45851b385faea31997eda780c30e34bdba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 11:32:30 +0000 Subject: [PATCH 078/111] gocryptfs: 2.5.4 -> 2.6.0 --- pkgs/by-name/go/gocryptfs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index 7c25e508a09ff..eace2edb9f10e 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.5.4"; + version = "2.6.0"; src = fetchFromGitHub { owner = "rfjakob"; repo = "gocryptfs"; rev = "v${version}"; - sha256 = "sha256-lDIKMcZLAE1ehijzhpx6G966xzdhusT40Dy06LXBn74="; + sha256 = "sha256-zvem4Uc+pNCDVMsnl/BwMYLp3DSYnYy6jwWM2kduq7k="; }; - vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U="; + vendorHash = "sha256-dvOROh5TsMl+52RvKmDG4ftNv3WF19trgttu5BGWktU="; nativeBuildInputs = [ makeWrapper From 1e1803c7684ef3182f23400c78cea3c9d16c27a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Jul 2025 14:55:41 +0200 Subject: [PATCH 079/111] go-licence-detector: 0.9.0 -> 0.9.1 Changelog: https://github.com/elastic/go-licence-detector/releases/tag/v0.9.1 Diff: https://github.com/elastic/go-licence-detector/compare/v0.9.0...v0.9.1 --- pkgs/by-name/go/go-licence-detector/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/go/go-licence-detector/package.nix b/pkgs/by-name/go/go-licence-detector/package.nix index f4e1d3f66c8b1..7e6fb1aacfcdb 100644 --- a/pkgs/by-name/go/go-licence-detector/package.nix +++ b/pkgs/by-name/go/go-licence-detector/package.nix @@ -6,20 +6,15 @@ buildGoModule rec { pname = "go-licence-detector"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "elastic"; repo = "go-licence-detector"; rev = "v${version}"; - hash = "sha256-z2fJsDnDhD/0fF1QEQIKB398TqAsug1Ye5LbGpJWyfE="; + hash = "sha256-Mo4eBBP9UueLEMVnxndatizDaxVyZuHACvFoV38dRVI="; }; - postPatch = '' - substituteInPlace go.mod \ - --replace-fail "go 1.24.5" "go 1.24" - ''; - vendorHash = "sha256-quFa2gBPsyRMOBde+KsIF8NCHYSF+X9skvIWnpm2Nss="; meta = with lib; { From 8974d3a9c4b9f246bf4073a1a4ea5026557f9eed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 13:27:52 +0000 Subject: [PATCH 080/111] quantlib: 1.38 -> 1.39 --- pkgs/by-name/qu/quantlib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix index fc8555fc7cb89..978bd6a8ecd11 100644 --- a/pkgs/by-name/qu/quantlib/package.nix +++ b/pkgs/by-name/qu/quantlib/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.38"; + version = "1.39"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "lballabio"; repo = "QuantLib"; rev = "v${finalAttrs.version}"; - hash = "sha256-4a86sGUOz/B5IQHE41r5+OTvR9es4FgXeufy3bKRWAc="; + hash = "sha256-UrFamEIeFTR0finNGESlDYbvrmD8jtv73tDUJ17P7WA="; }; nativeBuildInputs = [ cmake ]; From a69e41e8b75268ccd5a699e4af18d805bd5c9301 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 23 Jul 2025 16:31:15 +0200 Subject: [PATCH 081/111] duff: unpin autotools --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31a981e57e2d..16a3d6c2cc872 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2786,9 +2786,7 @@ with pkgs; dub-to-nix ; - duff = callPackage ../tools/filesystems/duff { - autoreconfHook = buildPackages.autoreconfHook269; - }; + duff = callPackage ../tools/filesystems/duff { }; dvtm = callPackage ../tools/misc/dvtm { # if you prefer a custom config, write the config.h in dvtm.config.h From 3235cf011c7cc07e0c1e81316127c5efbb7ed74a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 23 Jul 2025 16:34:15 +0200 Subject: [PATCH 082/111] eid-mw: unpin autotools --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31a981e57e2d..d4db944581ef6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2798,9 +2798,7 @@ with pkgs; dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { }; - eid-mw = callPackage ../tools/security/eid-mw { - autoreconfHook = buildPackages.autoreconfHook269; - }; + eid-mw = callPackage ../tools/security/eid-mw { }; engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; From 5028ddbc048aa705c212dc9e6cd4e4c2bdc29571 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 23 Jul 2025 16:36:18 +0200 Subject: [PATCH 083/111] gsmlib: unpin autotools --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31a981e57e2d..bef0fd8790a9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3156,9 +3156,7 @@ with pkgs; gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; - gsmlib = callPackage ../development/libraries/gsmlib { - autoreconfHook = buildPackages.autoreconfHook269; - }; + gsmlib = callPackage ../development/libraries/gsmlib { }; gssdp = callPackage ../development/libraries/gssdp { }; From e0ee93f8ce2e9fadaf3e7d67d6ba9a5186fff39a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 15:59:55 +0000 Subject: [PATCH 084/111] python3Packages.aioairzone-cloud: 0.6.12 -> 0.6.16 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 30446b44d9931..03c369b1e88b5 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.12"; + version = "0.6.16"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; tag = version; - hash = "sha256-maSYT1sd1GTe0Av0NvOUinI/GBYFzjUAemRLx7sDPUk="; + hash = "sha256-EPj6tql05ZUImMAeeUTyNms1NdwJgtdCJmJ+O8HXP3I="; }; build-system = [ setuptools ]; From ff6fe0f122c9ca0d211f2bc02f04fb7f15f414e1 Mon Sep 17 00:00:00 2001 From: parth Date: Wed, 23 Jul 2025 12:03:44 -0400 Subject: [PATCH 085/111] lockbook: 0.9.22 --> 0.9.25 --- pkgs/by-name/lo/lockbook/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index d4d5da7949116..6b2fe18cf0513 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -7,22 +7,22 @@ }: rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "0.9.22"; + version = "0.9.25"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-akCtnPLJupoo7n3Vfyl37fjCmK4dHB0bt92rie6k0dQ="; + hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xH3GIwh3zaLbpZqvzM+KM+K14fWj241RTwUM7dWRCKA="; + cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4="; doCheck = false; # there are no cli tests cargoBuildFlags = [ "--package" - "lockbook-cli" + "lockbook" ]; nativeBuildInputs = [ installShellFiles ]; From 0bbe53d295c23378d0df9287c4e69eb762e18a32 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 23 Jul 2025 12:21:24 -0400 Subject: [PATCH 086/111] lanzaboote-tool: Remove The lanzaboote-tool doesn't really see much attention in nixpkgs. See the hydra build failures: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.lanzaboote-tool.x86_64-linux It doesn't make much sense in nixpkgs anyway. It's basically useless without the stub and the nixos module, neither of which is present. Users should migrate to the Nix expressions provided by [the main lanzaboote repo](https://github.com/nix-community/lanzaboote). --- pkgs/by-name/la/lanzaboote-tool/package.nix | 68 --------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/by-name/la/lanzaboote-tool/package.nix diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix deleted file mode 100644 index e6883bb8a15ef..0000000000000 --- a/pkgs/by-name/la/lanzaboote-tool/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - systemd, - stdenv, - makeWrapper, - binutils-unwrapped, - sbsigntool, - rustPlatform, - fetchFromGitHub, - lib, -}: -rustPlatform.buildRustPackage rec { - pname = "lanzaboote-tool"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "lanzaboote"; - rev = "v${version}"; - hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs="; - }; - - sourceRoot = "${src.name}/rust/tool"; - useFetchCargoVendor = true; - cargoHash = "sha256-HnTsu46P3HRYo2d1DeaP6hqn+pVW3J4IM+CneckSFoM="; - - env.TEST_SYSTEMD = systemd; - doCheck = lib.meta.availableOn stdenv.hostPlatform systemd; - - nativeBuildInputs = [ - makeWrapper - ]; - - postInstall = '' - # Clean PATH to only contain what we need to do objcopy. - # This is still an unwrapped lanzaboote tool lacking of the - # UEFI stub location. - mv $out/bin/lzbt $out/bin/lzbt-unwrapped - wrapProgram $out/bin/lzbt-unwrapped \ - --set PATH ${ - lib.makeBinPath [ - binutils-unwrapped - sbsigntool - ] - } - ''; - - nativeCheckInputs = [ - binutils-unwrapped - sbsigntool - ]; - - meta = with lib; { - description = "Lanzaboote UEFI tooling for SecureBoot enablement on NixOS systems (unwrapped; does not contain the required stub)"; - homepage = "https://github.com/nix-community/lanzaboote"; - license = licenses.gpl3Only; - mainProgram = "lzbt-unwrapped"; - maintainers = with maintainers; [ - raitobezarius - nikstur - ]; - # Broken on aarch64-linux and any other architecture for now. - # Wait for 0.4.0. - platforms = [ - "x86_64-linux" - "i686-linux" - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e9c8a8be2d86a..a37a34c942330 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1014,6 +1014,7 @@ mapAliases { larynx = piper-tts; # Added 2023-05-09 LASzip = laszip; # Added 2024-06-12 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; lazarus-qt = lazarus-qt5; # Added 2024-12-25 From 18939487ebf15994e60f8dd3dc99f3a8cfef6c0e Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 23 Jul 2025 12:54:28 -0400 Subject: [PATCH 087/111] brave: 1.80.122 -> 1.80.124 https://community.brave.com/t/release-channel-1-80-124/634907 --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index e60de5ac2d97d..54dc21c112375 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.80.122"; + version = "1.80.124"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-UQmSZ3Xi96Q6/8Y09L5VaPVJHv7gUXcOyv5Ba35Z80s="; + hash = "sha256-K3AlYkAMDz988klsGTqYtvt3tswyLa5PhTdy4f0mU9E="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Q/m81hCZF8om3Tlxlj77GPiBElJVibJFA/ts7mtN6n8="; + hash = "sha256-4WP9uGuFcpW9Z0omqQBDTAjr+XCYa9mXcJGnxcm2inQ="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-BezJ5ZXUBC2itSNUivnqygY8VzzIXM6wb3QSC+LE1uM="; + hash = "sha256-vgqYktoVPDOmhibes9ghPcV2cpnyxliKvmELI8Brh0I="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-NN7Anrjym50DRo0qI5bF/XzhssgPuKOhk1CJgMoOq70="; + hash = "sha256-hVKuO3sSMc+yQiwHpwgYxfh7tyXHUpcWNQO6o9uf5Ro="; }; }; From b24f9ea06e67b2b905c3220c6d419a60944d4778 Mon Sep 17 00:00:00 2001 From: parth Date: Wed, 23 Jul 2025 12:54:53 -0400 Subject: [PATCH 088/111] lockbook-desktop: 0.9.24 -> 0.9.25 --- pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index d68e66f62a938..1364545c2b766 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "0.9.24"; + version = "0.9.25"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-NEKmZlBw1OkikHHeohZH01/+E6bslQ6+EK0lhleI9UA="; + hash = "sha256-8zkEVdvoM0PDqGyqY16ZRgyY8G0LplmhAb0THwqTVig="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UDidgvZlFkUrNpnwJijEQ8ib2kiou0cHKOuBnk0u704="; + cargoHash = "sha256-2NGb4a/Ak8DlaxHVElJg8Vhrt4W4XPZdDE283TH19C4="; nativeBuildInputs = [ pkg-config From 5ed2c148d8ca46a13cac0f59d000d2aec981de42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Jul 2025 20:02:02 +0200 Subject: [PATCH 089/111] python313Packages.model-checker: 0.9.26 -> 0.9.28 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 1690d8e1f37a0..3341cd7559eb4 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.9.26"; + version = "0.9.28"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-UPqTdKhXDb1D8Ig1dMk8QIiLuyZPQxMp/P1pAKqJ+Bs="; + hash = "sha256-mRJpkJkSA8wNTCs3YhNm+W3OQnRVUXhCYz5CJhmqpmA="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From b4ec100acdefda7b01078e44887b1aa9bc849b40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Jul 2025 20:17:29 +0000 Subject: [PATCH 090/111] steampipePackages.steampipe-plugin-aws: 1.17.0 -> 1.19.0 --- .../steampipe-packages/steampipe-plugin-aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix index db5c894189edf..29bceca18dc2d 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-aws"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-aws"; tag = "v${version}"; - hash = "sha256-fjxT3nG28CKdkvJSq/PJTqrttH0M96WlP1lWyh0sZtk="; + hash = "sha256-LbaW6a2eR1U8y82CCm0pXbzl0YyqIAqdrjraFgiNsW8="; }; - vendorHash = "sha256-pKgt1KWVHwdVgHHNwL/FO+hLHFsCbtUepiNFItLyIlo="; + vendorHash = "sha256-qRTcntW+CaDlBjcBWCocey8bAgCrar6ityuaK2AgTbY="; ldflags = [ "-s" From a2635ae25abb7cfa72062f1cc9cf42af49107074 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Jul 2025 20:49:42 +0000 Subject: [PATCH 091/111] python3Packages.python-novaclient: 18.9.0 -> 18.10.0 --- pkgs/development/python-modules/python-novaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 9876da3d82b09..9ebb841c651b3 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.9.0"; + version = "18.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_novaclient"; inherit version; - hash = "sha256-z2pLjwHsVD1adcAcIYR0upsGO9n9N0OCH+3GioRcq04="; + hash = "sha256-LwZqAQYe6t0c6G+/4CZ6HQ0Yi2TBZBNh9yXEJ39nqWs="; }; nativeBuildInputs = [ From 348368c5c3d330d165dda1321ff5d5721a918e84 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Jul 2025 21:12:35 +0200 Subject: [PATCH 092/111] python3Packages.torchmetrics: 1.7.4 -> 1.8.0 Diff: https://github.com/Lightning-AI/torchmetrics/compare/refs/tags/v1.7.4...refs/tags/v1.8.0 Changelog: https://github.com/Lightning-AI/torchmetrics/releases/tag/v1.8.0 --- pkgs/development/python-modules/torchmetrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 4277f559c276d..ddc59e0bc0602 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "torchmetrics"; - version = "1.7.4"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; tag = "v${version}"; - hash = "sha256-MpqpzfsT9cxyKHvcw2ue67gaqQfdsLARov50ivGYO98="; + hash = "sha256-zoKULi12vIKMzPRE6I4Rtq4dVQL/GfNFjHR+BId1ADg="; }; dependencies = [ From d1173a321f45053bf131fe11d42d866094335840 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 11 Jul 2025 20:04:38 +0200 Subject: [PATCH 093/111] tomcat9: 9.0.106 -> 9.0.107 Fixes CVE-2025-52434, CVE-2025-52520 and CVE-2025-53506. https://tomcat.apache.org/security-9.html#Fixed_in_Apache_Tomcat_9.0.107 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 32db7801aa3a4..42efd4d64bd86 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -60,8 +60,8 @@ let in { tomcat9 = common { - version = "9.0.106"; - hash = "sha256-EBMxGWDLyIvm2H75RsaF4WBSoNnRp24109GsQZG44n0="; + version = "9.0.107"; + hash = "sha256-08qgrQpltJMafTrsok5VQc90O6X6nlGr2ls6MdC0hX0="; }; tomcat10 = common { From 82aed1e3a460658dbb2e07b21323a5b28ddbe263 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 11 Jul 2025 20:09:29 +0200 Subject: [PATCH 094/111] tomcat11: 11.0.8 -> 11.0.9 Fixes CVE-2025-52520 and CVE-2025-53506. https://tomcat.apache.org/security-11.html#Fixed_in_Apache_Tomcat_11.0.9 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 42efd4d64bd86..84a7bb32024c9 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -70,7 +70,7 @@ in }; tomcat11 = common { - version = "11.0.8"; - hash = "sha256-BGT3ORiCetG5hdhwpehW1ldfEJ0MrWEKSho9sPqadXI="; + version = "11.0.9"; + hash = "sha256-YsVio60p26PqBPWK4x6/yGXPISAzUWP88PwD1CbtOoc="; }; } From c85b8c43b1f397464c1839faabe4784272ff513a Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Wed, 23 Jul 2025 21:08:04 +0200 Subject: [PATCH 095/111] opencode: 3.51 -> 3.58 --- pkgs/by-name/op/opencode/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 93fa9982f5ed7..210e778c3b368 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -12,10 +12,10 @@ let opencode-node-modules-hash = { - "aarch64-darwin" = "sha256-TAeFDsHGFJnUyp20ec+Rxp4t1FrWKfbtnxsE8PnLS0o="; - "aarch64-linux" = "sha256-F056MWf2dNAO21ezEvWg689WUibtz4Q4mcSuDuSY5EM="; - "x86_64-darwin" = "sha256-AN1Ha/les1ByJGfVkLDibfxjPouC0tAZ//EN3vDi1Hc="; - "x86_64-linux" = "sha256-XIRV1QrgRHnpJyrgK9ITxH61dve7nWfVoCPs3Tc8nuU="; + "aarch64-darwin" = "sha256-so+KiAo8C7olbJaCH1rIVxs/tq/g9l5pKPaU8D+Zm28="; + "aarch64-linux" = "sha256-JNf8g0z6oH2OXJLAmCSP0W4WX+GGyald5DAFOYCBNP0="; + "x86_64-darwin" = "sha256-jwmH4gEcyRNgeMvYz2SyWRagFkYN1O3ULEQIPPgqhwg="; + "x86_64-linux" = "sha256-ZMz7vfndYrpjUvhX8L9qv/lXcWKqXZwvfahGAE5EKYo="; }; bun-target = { "aarch64-darwin" = "bun-darwin-arm64"; @@ -26,12 +26,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.3.51"; + version = "0.3.58"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-lvosTLb9HI5IjE6Z1yEGNQn1M84zq23epgEhXGEuteQ="; + hash = "sha256-Zm3ydijaduPcIw5Np1+5CzNMoaASQwOT2R72/pdyUwM="; }; tui = buildGoModule { @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) version; src = "${finalAttrs.src}/packages/tui"; - vendorHash = "sha256-MZAKEXA34dHiH4XYUlLq6zo8ppG8JD3nj7fhZMrr+TI="; + vendorHash = "sha256-8OIPFa+bl1If55YZtacyOZOqMLslbMyO9Hx0HOzmrA0="; subPackages = [ "cmd/opencode" ]; From 0b1374a38d5902ef9c530381d2ec2e7f76e14ab0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 27 May 2025 16:33:22 +0000 Subject: [PATCH 096/111] r10k: 4.1.0 -> 5.0.0 --- pkgs/by-name/r1/r10k/Gemfile.lock | 46 ++++++++++---------- pkgs/by-name/r1/r10k/gemset.nix | 71 ++++++++++++++++++------------- pkgs/by-name/r1/r10k/package.nix | 6 +-- 3 files changed, 68 insertions(+), 55 deletions(-) diff --git a/pkgs/by-name/r1/r10k/Gemfile.lock b/pkgs/by-name/r1/r10k/Gemfile.lock index e82d217dbf371..e19552009e232 100644 --- a/pkgs/by-name/r1/r10k/Gemfile.lock +++ b/pkgs/by-name/r1/r10k/Gemfile.lock @@ -2,20 +2,21 @@ GEM remote: https://rubygems.org/ specs: base64 (0.2.0) - colored2 (3.1.2) + colored2 (4.0.3) cri (2.15.12) - erubi (1.13.0) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + erubi (1.13.1) + faraday (2.13.1) + faraday-net_http (>= 2.0, < 3.5) + json logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.1.1) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) fast_gettext (2.4.0) prime forwardable (1.3.3) - gettext (3.4.9) + gettext (3.5.1) erubi locale (>= 2.0.5) prime @@ -25,37 +26,38 @@ GEM fast_gettext (~> 2.1) gettext (~> 3.4) locale - jwt (2.8.2) + json (2.12.2) + jwt (2.10.1) base64 locale (2.1.4) log4r (1.1.10) - logger (1.6.0) - minitar (0.12.1) + logger (1.7.0) + minitar (1.0.2) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri - prime (0.1.2) + prime (0.1.3) forwardable singleton - puppet_forge (5.0.4) + puppet_forge (6.0.0) faraday (~> 2.0) faraday-follow_redirects (~> 0.3.0) - minitar (< 1.0.0) + minitar (~> 1.0, >= 1.0.2) semantic_puppet (~> 1.0) - r10k (4.1.0) - colored2 (= 3.1.2) + r10k (5.0.0) + colored2 (~> 4.0) cri (>= 2.15.10) gettext-setup (>= 0.24, < 2.0) jwt (>= 2.2.3, < 3) log4r (= 1.1.10) - minitar (~> 0.9) + minitar (>= 0.9, < 2) multi_json (~> 1.10) - puppet_forge (>= 4.1, < 6) + puppet_forge (>= 4.1.0, < 7) racc (1.8.1) - semantic_puppet (1.1.0) - singleton (0.2.0) + semantic_puppet (1.1.1) + singleton (0.3.0) text (1.3.1) - uri (0.13.0) + uri (1.0.3) PLATFORMS ruby @@ -64,4 +66,4 @@ DEPENDENCIES r10k BUNDLED WITH - 2.5.16 + 2.6.6 diff --git a/pkgs/by-name/r1/r10k/gemset.nix b/pkgs/by-name/r1/r10k/gemset.nix index 47ddb6a768ba6..1de7b337aef99 100644 --- a/pkgs/by-name/r1/r10k/gemset.nix +++ b/pkgs/by-name/r1/r10k/gemset.nix @@ -14,10 +14,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + sha256 = "0drbrv5m3l3qpal7s87gvss81cbzl76gad1hqkpqfqlphf0h7qb3"; type = "gem"; }; - version = "3.1.2"; + version = "4.0.3"; }; cri = { groups = [ "default" ]; @@ -34,24 +34,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; + sha256 = "1naaxsqkv5b3vklab5sbb9sdpszrjzlfsbqpy7ncbnw510xi10m0"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; faraday = { dependencies = [ "faraday-net_http" + "json" "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; + sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc"; type = "gem"; }; - version = "2.10.1"; + version = "2.13.1"; }; faraday-follow_redirects = { dependencies = [ "faraday" ]; @@ -70,10 +71,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f49frpfdr8czwm2mjkfny4pini6fy49b6hamw4jrppl4vsg14ys"; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; type = "gem"; }; - version = "3.1.1"; + version = "3.4.0"; }; fast_gettext = { dependencies = [ "prime" ]; @@ -108,10 +109,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16h0kda5z4s4zqygyk0f52xzs9mlz9r4lnhjwk729hhmdbz68a19"; + sha256 = "0aji3873pxn6gc5qkvnv5y9025mqk0p6h22yrpyz2b3yx9qpzv03"; type = "gem"; }; - version = "3.4.9"; + version = "3.5.1"; }; gettext-setup = { dependencies = [ @@ -128,16 +129,26 @@ }; version = "1.1.0"; }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s"; + type = "gem"; + }; + version = "2.12.2"; + }; jwt = { dependencies = [ "base64" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04mw326i9vsdcqwm4bf0zvnqw237f8l7022nhlbmak92bqqpg62s"; + sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; type = "gem"; }; - version = "2.8.2"; + version = "2.10.1"; }; locale = { groups = [ "default" ]; @@ -164,20 +175,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; minitar = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f307mpj4j0gp7iq77xj4p149f4krcvbll9rismng3jcijpbn79s"; + sha256 = "0wj6cgvzbnc8qvdb5rai4hf9z10a2f422gc5agnhcab7lwmyp4mi"; type = "gem"; }; - version = "0.12.1"; + version = "1.0.2"; }; multi_json = { groups = [ "default" ]; @@ -195,10 +206,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.0"; }; prime = { dependencies = [ @@ -209,10 +220,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1973kz8lbck6ga5v42f55jk8b8pnbgwp9p67dl1xw15gvz55dsfl"; + sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; puppet_forge = { dependencies = [ @@ -225,10 +236,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0d65zri1nmpph8iki5iigdzfqd6rfyc1mlgdfhg69q3566rcff06"; + sha256 = "1pwd5x0vyf04qzzdw6v98m6f6rb110g14sv6h6yj2nwz3kbbww07"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.0"; }; r10k = { dependencies = [ @@ -245,10 +256,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k3fr2f0pwyrabs12wqig31f37sqrqs8qza7jrn01d6blvhvkrb4"; + sha256 = "0m0k0aqf9gaakgkmfcx86324qx6mvs2p0ja1rrs36ifq1l70lgsf"; type = "gem"; }; - version = "4.1.0"; + version = "5.0.0"; }; racc = { groups = [ "default" ]; @@ -265,20 +276,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ndqm3jnpdlwkk1jwqdyyb7yw7gv6r4kmjs30g09ap8siv80ilaj"; + sha256 = "15ksbizvakfx0zfdgjbh34hqnrnkjj47m4kbnsg58mpqsx45pzqm"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; singleton = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qq54imvbksnckzf9hrq9bjzcdb0n8wfv6l5jc0di10n88277jx6"; + sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; text = { groups = [ "default" ]; @@ -295,9 +306,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; type = "gem"; }; - version = "0.13.0"; + version = "1.0.3"; }; } diff --git a/pkgs/by-name/r1/r10k/package.nix b/pkgs/by-name/r1/r10k/package.nix index 864f1ea797334..529c1709861bd 100644 --- a/pkgs/by-name/r1/r10k/package.nix +++ b/pkgs/by-name/r1/r10k/package.nix @@ -10,7 +10,7 @@ testers, }: -bundlerApp { +bundlerApp rec { pname = "r10k"; gemdir = ./.; exes = [ "r10k" ]; @@ -33,7 +33,7 @@ bundlerApp { package = r10k; version = (import ./gemset.nix).r10k.version; }; - updateScript = bundlerUpdateScript "r10k"; + updateScript = bundlerUpdateScript pname; }; meta = { @@ -47,6 +47,6 @@ bundlerApp { anthonyroussel ]; platforms = lib.platforms.unix; - mainProgram = "r10k"; + mainProgram = pname; }; } From 693750aeedf895781616bfd621b5561fc654d515 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Fri, 30 May 2025 08:20:24 +0200 Subject: [PATCH 097/111] python3Packages.pyvips: 2.2.3 -> 3.0.0 Changelog: https://github.com/libvips/pyvips/blob/v3.0.0/CHANGELOG.rst The major change is dropping support for Python 2.7 and requiring Python 3.7, which Nix already does, so no breaking changes. --- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index dbcdadc33f2e7..3db7c77b91031 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.2.3"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "libvips"; repo = "pyvips"; tag = "v${version}"; - hash = "sha256-EGB1cOR1pVCXGjRj1NLj4Mk3kIy8luRqk3gGJqVNs7U="; + hash = "sha256-dyous0EahUR7pkr2siBBJwzcoC4TOsnsbRo+rVE8/QQ="; }; nativeBuildInputs = [ From 37a9e6a50afd8227c64e2be95048b83607330db7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 19:52:29 +0000 Subject: [PATCH 098/111] solanum: 0-unstable-2025-06-11 -> 0-unstable-2025-07-20 --- pkgs/servers/irc/solanum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index 6cadf2dc57eb8..2dbd9ab7f6ce6 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "solanum"; - version = "0-unstable-2025-06-11"; + version = "0-unstable-2025-07-20"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "70d491d8a4ad9fa02ce5394d9007baf5f23ca61c"; - hash = "sha256-+AYEfG0MJE7LnoS1saA1zSSKNxAvxMppobYUK+sP4fw="; + rev = "7feda92636c9d5b5e7decceee1273dd18b6cc31b"; + hash = "sha256-cfDwdE2CA69dSg59Sn1TKk3OWxvoTIm/KCiKfgzokVU="; }; patches = [ From b802a0a6dd06f5b39f0a21ceeb912528f8e7fb30 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Wed, 23 Jul 2025 19:53:44 +0000 Subject: [PATCH 099/111] _1password-gui-beta: 8.11.2-18.BETA -> 8.11.4-21.BETA --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 422568cd31e75..4be39c4832825 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -29,28 +29,28 @@ }, "beta": { "linux": { - "version": "8.11.2-18.BETA", + "version": "8.11.4-21.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.2-18.BETA.x64.tar.gz", - "hash": "sha256-/8sXdF1JmJX3kFOn9SCRz6Cr/ZldzHfhvq1oJlV19v8=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.4-21.BETA.x64.tar.gz", + "hash": "sha256-HWPeTCtjHH8vngDX0+tGbiDMj1FoW8a4RCu34RqJXmI=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.2-18.BETA.arm64.tar.gz", - "hash": "sha256-bDRJAU6LgkoHp1Fi/KQPm/Fe/BkGt7V+dGVnLh9awcs=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.4-21.BETA.arm64.tar.gz", + "hash": "sha256-yPjzweuJPvvOkJcIElaAogzBpWPvYch6DQarRoaZojc=" } } }, "darwin": { - "version": "8.11.2-18.BETA", + "version": "8.11.4-21.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.2-18.BETA-x86_64.zip", - "hash": "sha256-oZqrNB49SR8UWh8qXnKi/xlT/b2YUxPCLpz2tjwzzuw=" + "url": "https://downloads.1password.com/mac/1Password-8.11.4-21.BETA-x86_64.zip", + "hash": "sha256-FozwWYQCrqWbfw9qaPRLbaUVWa5hTwG3NHjtZc4smdk=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.2-18.BETA-aarch64.zip", - "hash": "sha256-+EXrqEe3cDp9Ez8iug53HhSTtz0tDYsUXHAsXtRHGH4=" + "url": "https://downloads.1password.com/mac/1Password-8.11.4-21.BETA-aarch64.zip", + "hash": "sha256-0eXtLqknEPG+G+mxa7QYWkUVPu13/KAdkOb9fklZIqg=" } } } From 0c9398ee4d6c8f641e57e8f6a6dcfa2868054d0a Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Wed, 23 Jul 2025 16:50:06 +0200 Subject: [PATCH 100/111] mastodon: 4.4.1 -> 4.4.2 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.4.2 --- pkgs/servers/mastodon/gemset.nix | 8 ++++---- pkgs/servers/mastodon/source.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 2782bfaa1a8fb..c08b5d054499d 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -2411,10 +2411,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; + sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc"; type = "gem"; }; - version = "1.18.8"; + version = "1.18.9"; }; oj = { dependencies = [ @@ -4484,10 +4484,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; + sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; tilt = { groups = [ diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index fb3b5482abb76..a5a782e1c3723 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -5,17 +5,17 @@ patches ? [ ], }: let - version = "4.4.1"; + version = "4.4.2"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-hu6AmR0CvI3lVixJ2UmWY3KAlWbqYULCQAjRGJcuIhc="; + hash = "sha256-BzSN48IamwDrhBtw2TFVPJpRaWaQg96rWOlolBBJ5Fs="; passthru = { inherit version; - yarnHash = "sha256-Qh2jli99rxrT10KVGKnePxP6RXYIjtehDCJB5PfOngM="; + yarnHash = "sha256-jqiPxkbD0MmnUPK/P0zaYEB6rMRK20ito+o98+FHZdE="; yarnMissingHashes = ./missing-hashes.json; }; }; From 458368fb7ac99f0fba12b55f1bae045da75fb714 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 21:38:19 +0000 Subject: [PATCH 101/111] sdl_gamecontrollerdb: 0-unstable-2025-07-10 -> 0-unstable-2025-07-18 --- pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index e3df4161d9464..dcfa2604ef00f 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2025-07-10"; + version = "0-unstable-2025-07-18"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "0f63b5ea2932d1af560fcd874b9b8562b5c69403"; - hash = "sha256-AZkLkSxdNbybf5AJTPHsBd0BQmZ+/1YWg2mSSlUlZTs="; + rev = "dce2d3593c6a96a57716d13d58aa3b1d4965fe6f"; + hash = "sha256-a1466lU8pCQJcJSIe3cEplUcbVnYoABvnm/QQhwsuDw="; }; dontBuild = true; From e88fc16309084acb3a167f9eacbd758b8004758d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 23 Jul 2025 23:55:20 +0200 Subject: [PATCH 102/111] tor-browser: 14.5.4 -> 14.5.5 https://blog.torproject.org/new-release-tor-browser-1455/ --- pkgs/by-name/to/tor-browser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index d185f91634f70..aed15b05cb183 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.5.4"; + version = "14.5.5"; sources = { x86_64-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-27Wq9VwFB85swQZIRQMKZgeUeb/SgQ04aaWmZtlpY9s="; + hash = "sha256-rJGhgSSktaeH7KSOtf1KjJbrl/m4sdz+9UdjUN9ovz0="; }; i686-linux = fetchurl { @@ -131,7 +131,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-OgexrnQWGYSf9g3Le/LyBcpGo3xFqpCMq1NUHF5fi9M="; + hash = "sha256-mvlx817/vLi4QyA0aSPyAuWSBfMLjfkFG9Zse9rmSzw="; }; }; From ca97a99f888b58404f36ae5b05b10ab399d472b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 23 Jul 2025 23:57:25 +0200 Subject: [PATCH 103/111] mullvad-browser: 14.5.4 -> 14.5.5 https://github.com/mullvad/mullvad-browser/releases/tag/14.5.5 --- pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 028a70fe6c143..92d10debd1cdb 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.5.4"; + version = "14.5.5"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-DJEc+2GJHxG49euVpwH8h/yLoR6DVn0a0ZUFS429XaA="; + hash = "sha256-PwqxYylW602XAKBvEJk4Rl8q6nWBGH3pFvTOuAYtr/w="; }; }; From 76c4605fabea25b888c5e6ea2d49a7b39d3a2d74 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 23 Jul 2025 17:38:09 +0000 Subject: [PATCH 104/111] koto: 0.15.3 -> 0.16.0 Changelog: https://github.com/koto-lang/koto/blob/v0.16.0/CHANGELOG.md Diff: https://github.com/koto-lang/koto/compare/v0.15.3...v0.16.0 --- pkgs/by-name/ko/koto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix index 3d82d8b3682b1..0525e87dbe88f 100644 --- a/pkgs/by-name/ko/koto/package.nix +++ b/pkgs/by-name/ko/koto/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "koto"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "koto-lang"; repo = "koto"; tag = "v${finalAttrs.version}"; - hash = "sha256-sFADZj0mBe8TQ2x6NeXLqvvXK13WhVGD2anGWoWrSZw="; + hash = "sha256-KdwKJ0ZKKHU+Fe/TTIITHOyRH9uoJ3LU3qXqUwpJI6g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ok4rgqiQ7N5knXdb0Mfn3fYPPLXoRtOZVv8RvWR2h3k="; + cargoHash = "sha256-5uWCpTnGbqoogOxSD2GcXMjQpoYIp1GfB9k4bd+Easc="; postPatch = '' tomlq -ti 'del(.bench)' crates/koto/Cargo.toml From efba5cc1c2a5bacbeea56ff40008a0508af0e0a8 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 23 Jul 2025 17:38:08 +0000 Subject: [PATCH 105/111] koto-ls: 0.15.3 -> 0.16.0 Changelog: https://github.com/koto-lang/koto-ls/releases/tag/v0.16.0 Diff: https://github.com/koto-lang/koto-ls/compare/v0.15.3...v0.16.0 --- pkgs/by-name/ko/koto-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/koto-ls/package.nix b/pkgs/by-name/ko/koto-ls/package.nix index 63d1c16bbe2cb..ff5e509a55dce 100644 --- a/pkgs/by-name/ko/koto-ls/package.nix +++ b/pkgs/by-name/ko/koto-ls/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "koto-ls"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "koto-lang"; repo = "koto-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-4s+zWiI6Yxv1TB0drds27txnL0kE6RoqjRI36Clls6Y="; + hash = "sha256-a2YGjAZvLyPRfFdZdd0z7sbijS1RCPa5wY2DkJZwbmk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ewBAixbksI9ora5hBZR12lzxCPzxM2Cp6GvQz6hGCSY="; + cargoHash = "sha256-GFgIW+x+kncf1OTWZZZjD9yoLEwW01pWAUnJQCpPFhQ="; passthru.updateScript = nix-update-script { }; From 31c1369438d1b8ca8d3aff30b8f9694ca6a45328 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 14 Jul 2025 10:36:22 -0500 Subject: [PATCH 106/111] instaloader: migrate to by-name Co-authored-by: Aleksana Apply suggestion from @Aleksanaa Co-authored-by: Aleksana Update pkgs/by-name/in/instaloader/package.nix Co-authored-by: Aleksana Update pkgs/by-name/in/instaloader/package.nix Co-authored-by: Aleksana instaloader: format with treefmt --- .../in/instaloader/package.nix} | 28 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 19 deletions(-) rename pkgs/{tools/misc/instaloader/default.nix => by-name/in/instaloader/package.nix} (54%) diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/by-name/in/instaloader/package.nix similarity index 54% rename from pkgs/tools/misc/instaloader/default.nix rename to pkgs/by-name/in/instaloader/package.nix index bad52de30dd2d..60d9ec1ed1934 100644 --- a/pkgs/tools/misc/instaloader/default.nix +++ b/pkgs/by-name/in/instaloader/package.nix @@ -1,43 +1,37 @@ { lib, - buildPythonPackage, - pythonOlder, + python3Packages, fetchFromGitHub, - setuptools, - sphinx, - requests, }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "instaloader"; version = "4.14.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "instaloader"; repo = "instaloader"; tag = "v${version}"; - sha256 = "sha256-q5/lZ+BHnrod0vG/ZJw/5iJRKKaP3Gbns5yaZH0P2rE="; + hash = "sha256-q5/lZ+BHnrod0vG/ZJw/5iJRKKaP3Gbns5yaZH0P2rE="; }; - nativeBuildInputs = [ - setuptools + build-system = [ + python3Packages.setuptools ]; - propagatedBuildInputs = [ - requests - sphinx + dependencies = [ + python3Packages.requests + python3Packages.sphinx ]; pythonImportsCheck = [ "instaloader" ]; - meta = with lib; { + meta = { homepage = "https://instaloader.github.io/"; description = "Download pictures (or videos) along with their captions and other metadata from Instagram"; - maintainers = with maintainers; [ creator54 ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ creator54 ]; + license = lib.licenses.mit; mainProgram = "instaloader"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 785dbf4743688..af6e7a822fca6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14776,8 +14776,6 @@ with pkgs; ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; }; - instaloader = python3Packages.callPackage ../tools/misc/instaloader { }; - iortcw = callPackage ../games/iortcw { }; # used as base package for iortcw forks iortcw_sp = callPackage ../games/iortcw/sp.nix { }; From 83ab2934b02505bfd6dbe3365111a077f9b3f548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Jul 2025 03:48:45 +0000 Subject: [PATCH 107/111] python3Packages.nitransforms: 24.1.2 -> 25.0.0 --- .../python-modules/nitransforms/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index f7509287253ce..4a43c19b92eb4 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -7,25 +7,25 @@ nibabel, numpy, scipy, + setuptools, setuptools-scm, - toml, }: buildPythonPackage rec { pname = "nitransforms"; - version = "24.1.2"; + version = "25.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-JKlKM9bd3pTTBp/xVj9Ywd/+Ok7lxo05AF01eeOBeoE="; + hash = "sha256-bGyrFyB8pjE3zLymQTWXdPAUxDopFQdJ00aQszlOp5g="; }; build-system = [ + setuptools setuptools-scm - toml ]; dependencies = [ @@ -49,12 +49,12 @@ buildPythonPackage rec { "nitransforms.patched" ]; - meta = with lib; { + meta = { homepage = "https://nitransforms.readthedocs.io"; description = "Geometric transformations for images and surfaces"; mainProgram = "nb-transform"; changelog = "https://github.com/nipy/nitransforms/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From ec52fb35db93a413508c472f23fb1cbb312c21b9 Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 7 Jul 2025 16:05:41 +0800 Subject: [PATCH 108/111] p4est-sc: 0-unstable-2021-06-14 -> 2.8.7 --- pkgs/by-name/p4/p4est-sc/package.nix | 78 +++++++++++++++++++ .../science/math/p4est-sc/default.nix | 78 ------------------- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 79 insertions(+), 83 deletions(-) create mode 100644 pkgs/by-name/p4/p4est-sc/package.nix delete mode 100644 pkgs/development/libraries/science/math/p4est-sc/default.nix diff --git a/pkgs/by-name/p4/p4est-sc/package.nix b/pkgs/by-name/p4/p4est-sc/package.nix new file mode 100644 index 0000000000000..1cf4510c4071d --- /dev/null +++ b/pkgs/by-name/p4/p4est-sc/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + mpi, + zlib, + jansson, + mpiCheckPhaseHook, + debug ? false, + mpiSupport ? true, + + # passthru.tests + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "p4est-sc"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "cburstedde"; + repo = "libsc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oeEYNaYx1IdEWefctgUZVUa6wnb8K3z5Il2Y9MtQwBc="; + }; + + strictDeps = true; + + postPatch = '' + echo $version > .tarball-version + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optional mpiSupport mpi; + + propagatedBuildInputs = [ + zlib + jansson + ]; + + configureFlags = + [ + "LDFLAGS=-lm" + ] + ++ lib.optionals mpiSupport [ + "--enable-mpi" + "CC=mpicc" + ] + ++ lib.optional debug "--enable-debug"; + + __darwinAllowLocalNetworking = mpiSupport; + + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + ]; + + doCheck = true; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + description = "Support for parallel scientific applications"; + longDescription = '' + The SC library provides support for parallel scientific applications. + Its main purpose is to support the p4est software library, hence + this package is called p4est-sc, but it works standalone, too. + ''; + homepage = "https://www.p4est.org/"; + downloadPage = "https://github.com/cburstedde/libsc.git"; + pkgConfigModules = [ "libsc" ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix deleted file mode 100644 index 559742f678e25..0000000000000 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - mpiCheckPhaseHook, - autoreconfHook, - pkg-config, - p4est-sc-debugEnable ? true, - p4est-sc-mpiSupport ? true, - mpi, - zlib, -}: - -let - dbg = lib.optionalString debugEnable "-dbg"; - debugEnable = p4est-sc-debugEnable; - mpiSupport = p4est-sc-mpiSupport; -in -stdenv.mkDerivation { - pname = "p4est-sc${dbg}"; - version = "unstable-2021-06-14"; - - # fetch an untagged snapshot of the prev3-develop branch - src = fetchFromGitHub { - owner = "cburstedde"; - repo = "libsc"; - rev = "1ae814e3fb1cc5456652e0d77550386842cb9bfb"; - sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z"; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - propagatedNativeBuildInputs = lib.optional mpiSupport mpi; - propagatedBuildInputs = [ zlib ]; - inherit debugEnable mpiSupport; - - postPatch = '' - echo "dist_scaclocal_DATA += config/sc_v4l2.m4" >> Makefile.am - ''; - preConfigure = '' - echo "2.8.0" > .tarball-version - ${lib.optionalString mpiSupport "unset CC"} - ''; - - configureFlags = - [ "--enable-pthread=-pthread" ] - ++ lib.optional debugEnable "--enable-debug" - ++ lib.optional mpiSupport "--enable-mpi"; - - dontDisableStatic = true; - enableParallelBuilding = true; - makeFlags = [ "V=0" ]; - - nativeCheckInputs = lib.optionals mpiSupport [ - mpiCheckPhaseHook - ]; - - # disallow Darwin checks due to prototype incompatibility of qsort_r - # to be fixed in a future version of the source code - doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; - - meta = { - branch = "prev3-develop"; - description = "Support for parallel scientific applications"; - longDescription = '' - The SC library provides support for parallel scientific applications. - Its main purpose is to support the p4est software library, hence - this package is called p4est-sc, but it works standalone, too. - ''; - homepage = "https://www.p4est.org/"; - downloadPage = "https://github.com/cburstedde/libsc.git"; - license = lib.licenses.lgpl21Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1106bcc38e36f..1607e8dae266c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15397,11 +15397,7 @@ with pkgs; nodejs = nodejs_20; }; - p4est-sc = callPackage ../development/libraries/science/math/p4est-sc { - p4est-sc-debugEnable = false; - }; - - p4est-sc-dbg = callPackage ../development/libraries/science/math/p4est-sc { }; + p4est-sc-dbg = p4est-sc.override { debug = true; }; p4est = callPackage ../development/libraries/science/math/p4est { }; From 556cd7c66d2bd38c07416996e31734b9e2a79102 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 10 Jun 2025 06:53:26 +0800 Subject: [PATCH 109/111] p4est: 0-unstable-2021-06-22 -> 2.8.7 --- pkgs/by-name/p4/p4est/package.nix | 88 +++++++++++++++++++ .../libraries/science/math/p4est/default.nix | 77 ---------------- .../science/math/p4est/p4est-metis.patch | 26 ------ pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 89 insertions(+), 108 deletions(-) create mode 100644 pkgs/by-name/p4/p4est/package.nix delete mode 100644 pkgs/development/libraries/science/math/p4est/default.nix delete mode 100644 pkgs/development/libraries/science/math/p4est/p4est-metis.patch diff --git a/pkgs/by-name/p4/p4est/package.nix b/pkgs/by-name/p4/p4est/package.nix new file mode 100644 index 0000000000000..996422b56194f --- /dev/null +++ b/pkgs/by-name/p4/p4est/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + metis, + p4est-sc, + mpi, + mpiCheckPhaseHook, + debug ? false, + withMetis ? true, + mpiSupport ? true, + + # passthru.tests + testers, +}: +let + p4est-sc' = p4est-sc.override { inherit mpi mpiSupport debug; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "p4est"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "cburstedde"; + repo = "p4est"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8JvKaYOP4IO1Xmim74KNHvMLOV3y9VRoT76RBCaRyhI="; + }; + + strictDeps = true; + + postPatch = '' + echo $version > .tarball-version + + substituteInPlace Makefile.am \ + --replace-fail "@P4EST_SC_AMFLAGS@" "-I ${p4est-sc}/share/aclocal" + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optional mpiSupport mpi; + + buildInputs = [ + metis + ]; + + propagatedBuildInputs = [ p4est-sc' ]; + + configureFlags = + [ + "--with-sc=${p4est-sc'}" + "--with-metis" + "--enable-p6est" + "LDFLAGS=-lm" + ] + ++ lib.optionals mpiSupport [ + "--enable-mpi" + "CC=mpicc" + ] + ++ lib.optional debug "--enable-debug"; + + doCheck = true; + + __darwinAllowLocalNetworking = mpiSupport; + + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + description = "Parallel AMR on Forests of Octrees"; + longDescription = '' + The p4est software library provides algorithms for parallel AMR. + AMR refers to Adaptive Mesh Refinement, a technique in scientific + computing to cover the domain of a simulation with an adaptive mesh. + ''; + homepage = "https://www.p4est.org/"; + downloadPage = "https://github.com/cburstedde/p4est.git"; + pkgConfigModules = [ "p4est" ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix deleted file mode 100644 index 31613dd642599..0000000000000 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - pkg-config, - p4est-withMetis ? true, - metis, - p4est-sc, - mpiCheckPhaseHook, -}: - -let - inherit (p4est-sc) debugEnable mpiSupport; - dbg = lib.optionalString debugEnable "-dbg"; - withMetis = p4est-withMetis; -in -stdenv.mkDerivation { - pname = "p4est${dbg}"; - version = "unstable-2021-06-22"; - - # fetch an untagged snapshot of the prev3-develop branch - src = fetchFromGitHub { - owner = "cburstedde"; - repo = "p4est"; - rev = "7423ac5f2b2b64490a7a92e5ddcbd251053c4dee"; - sha256 = "0vffnf48rzw6d0as4c3x1f31b4kapmdzr1hfj5rz5ngah72gqrph"; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - propagatedBuildInputs = [ p4est-sc ]; - buildInputs = lib.optional withMetis metis; - inherit debugEnable mpiSupport withMetis; - - patches = [ ./p4est-metis.patch ]; - postPatch = '' - sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am - ''; - preAutoreconf = '' - echo "2.8.0" > .tarball-version - ''; - preConfigure = lib.optionalString mpiSupport '' - unset CC - ''; - - configureFlags = - p4est-sc.configureFlags ++ [ "--with-sc=${p4est-sc}" ] ++ lib.optional withMetis "--with-metis"; - - inherit (p4est-sc) - makeFlags - dontDisableStatic - enableParallelBuilding - doCheck - ; - - nativeCheckInputs = lib.optionals mpiSupport [ - mpiCheckPhaseHook - ]; - - meta = { - branch = "prev3-develop"; - description = "Parallel AMR on Forests of Octrees"; - longDescription = '' - The p4est software library provides algorithms for parallel AMR. - AMR refers to Adaptive Mesh Refinement, a technique in scientific - computing to cover the domain of a simulation with an adaptive mesh. - ''; - homepage = "https://www.p4est.org/"; - downloadPage = "https://github.com/cburstedde/p4est.git"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/science/math/p4est/p4est-metis.patch b/pkgs/development/libraries/science/math/p4est/p4est-metis.patch deleted file mode 100644 index 46b8dc8af08c7..0000000000000 --- a/pkgs/development/libraries/science/math/p4est/p4est-metis.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/p4est_connectivity.c b/src/p4est_connectivity.c -index 95339136..c93528f2 100644 ---- a/src/p4est_connectivity.c -+++ b/src/p4est_connectivity.c -@@ -3715,6 +3715,7 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k, - sc_array_t * newid) - { - const int n = (int) conn->num_trees; -+ int metis_n; - int *xadj; - int *adjncy; - int *part; -@@ -3862,10 +3863,12 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k, - - P4EST_GLOBAL_INFO ("Entering metis\n"); - /* now call metis */ -+ metis_n = n; - P4EST_EXECUTE_ASSERT_INT -- (METIS_PartGraphRecursive (&n, &ncon, xadj, adjncy, NULL, NULL, -+ (METIS_PartGraphRecursive (&metis_n, &ncon, xadj, adjncy, NULL, NULL, - NULL, &k, NULL, NULL, NULL, &volume, part), - METIS_OK); -+ P4EST_ASSERT (metis_n == n); - P4EST_GLOBAL_INFO ("Done metis\n"); - - P4EST_GLOBAL_STATISTICSF ("metis volume %d\n", volume); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1607e8dae266c..0eb7afae7ba43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15399,11 +15399,7 @@ with pkgs; p4est-sc-dbg = p4est-sc.override { debug = true; }; - p4est = callPackage ../development/libraries/science/math/p4est { }; - - p4est-dbg = callPackage ../development/libraries/science/math/p4est { - p4est-sc = p4est-sc-dbg; - }; + p4est-dbg = p4est.override { debug = true; }; sageWithDoc = sage.override { withDoc = true; }; From e48d12554c410e16fc5ece2458023ed31b5a4f53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Jul 2025 02:12:43 +0200 Subject: [PATCH 110/111] nixos/tlsrpt: fix permissions for postfix Same as with other services giving postfix access, this needs to happen for the postfix user. Adding supplementary group permissions to the systemd unit does not propagate to child processes that ultimately call the unix domain socket. --- nixos/modules/services/mail/tlsrpt.nix | 14 +++++++++++--- nixos/tests/tlsrpt.nix | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix index 732679c9b05aa..83b219443fd05 100644 --- a/nixos/modules/services/mail/tlsrpt.nix +++ b/nixos/modules/services/mail/tlsrpt.nix @@ -270,9 +270,17 @@ in }; }; - systemd.services.postfix.serviceConfig.SupplementaryGroups = mkIf ( - config.services.postfix.enable && cfg.collectd.configurePostfix - ) [ "tlsrpt" ]; + users.users.tlsrpt = { + isSystemUser = true; + group = "tlsrpt"; + }; + users.groups.tlsrpt = { }; + + users.users.postfix.extraGroups = + lib.mkIf (config.services.postfix.enable && cfg.collectd.configurePostfix) + [ + "tlsrpt" + ]; systemd.services.tlsrpt-collectd = { description = "TLSRPT datagram collector"; diff --git a/nixos/tests/tlsrpt.nix b/nixos/tests/tlsrpt.nix index d93ac78b52407..92a7d0cda78ec 100644 --- a/nixos/tests/tlsrpt.nix +++ b/nixos/tests/tlsrpt.nix @@ -35,7 +35,7 @@ # Enabling postfix should put sendmail as the sendmail setting machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg") - machine.succeed("systemctl show --property SupplementaryGroups postfix.service | grep tlsrpt") + machine.succeed("getent group tlsrpt | grep -q postfix") machine.log(machine.succeed("systemd-analyze security tlsrpt-collectd.service tlsrpt-reportd.service | grep -v ✓")) ''; From d4b59c4d499e8bfe9e79f896f412617c5c6bc0c5 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Wed, 18 Jun 2025 10:53:52 -0700 Subject: [PATCH 111/111] WIP 6.4.1 bump --- .../rocm-modules/6/amdsmi/default.nix | 4 +- .../rocm-modules/6/aqlprofile/default.nix | 38 +++++++++++++ .../update.nix | 0 .../rocm-modules/6/clr/default.nix | 39 ++++---------- .../rocm-modules/6/composable_kernel/base.nix | 10 ++-- pkgs/development/rocm-modules/6/default.nix | 2 +- .../rocm-modules/6/half/default.nix | 2 +- .../rocm-modules/6/hip-common/default.nix | 4 +- .../rocm-modules/6/hipblas-common/default.nix | 4 +- .../rocm-modules/6/hipblas/default.nix | 4 +- .../rocm-modules/6/hipblaslt/default.nix | 4 +- .../rocm-modules/6/hipcub/default.nix | 4 +- .../rocm-modules/6/hipfft/default.nix | 4 +- .../rocm-modules/6/hipfort/default.nix | 4 +- .../rocm-modules/6/hipify/default.nix | 4 +- .../rocm-modules/6/hiprand/default.nix | 4 +- .../rocm-modules/6/hipsolver/default.nix | 4 +- .../rocm-modules/6/hipsparse/default.nix | 4 +- .../6/hsa-amd-aqlprofile-bin/default.nix | 53 ------------------- .../rocm-modules/6/llvm/default.nix | 47 +++++++++++----- .../rocm-modules/6/migraphx/default.nix | 4 +- .../rocm-modules/6/miopen/default.nix | 4 +- .../rocm-modules/6/mivisionx/default.nix | 4 +- .../rocm-modules/6/rccl/default.nix | 4 +- .../rocm-modules/6/rdc/default.nix | 4 +- .../rocm-modules/6/rocalution/default.nix | 4 +- .../rocm-modules/6/rocblas/default.nix | 4 +- .../rocm-modules/6/rocdbgapi/default.nix | 4 +- .../rocm-modules/6/rocfft/default.nix | 4 +- .../rocm-modules/6/rocgdb/default.nix | 4 +- .../rocm-modules/6/rocm-cmake/default.nix | 4 +- .../rocm-modules/6/rocm-comgr/default.nix | 4 +- .../rocm-modules/6/rocm-core/default.nix | 4 +- .../rocm-modules/6/rocm-docs-core/default.nix | 4 +- .../rocm-modules/6/rocm-runtime/default.nix | 9 +--- .../rocm-modules/6/rocm-smi/default.nix | 11 +++- .../rocm-modules/6/rocminfo/default.nix | 4 +- .../rocm-modules/6/rocmlir/default.nix | 4 +- .../rocm-modules/6/rocprim/default.nix | 4 +- .../6/rocprofiler-register/default.nix | 4 +- .../rocm-modules/6/rocprofiler/default.nix | 4 +- .../6/rocr-debug-agent/default.nix | 4 +- .../rocm-modules/6/rocrand/default.nix | 4 +- .../rocm-modules/6/rocsolver/default.nix | 4 +- .../rocm-modules/6/rocsparse/default.nix | 4 +- .../rocm-modules/6/rocthrust/default.nix | 4 +- .../rocm-modules/6/roctracer/default.nix | 4 +- .../rocm-modules/6/rocwmma/default.nix | 4 +- .../rocm-modules/6/rpp/default.nix | 4 +- .../rocm-modules/6/tensile/default.nix | 9 ++-- .../rocm-modules/6/triton/default.nix | 6 +-- 51 files changed, 190 insertions(+), 192 deletions(-) create mode 100644 pkgs/development/rocm-modules/6/aqlprofile/default.nix rename pkgs/development/rocm-modules/6/{hsa-amd-aqlprofile-bin => aqlprofile}/update.nix (100%) delete mode 100644 pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix diff --git a/pkgs/development/rocm-modules/6/amdsmi/default.nix b/pkgs/development/rocm-modules/6/amdsmi/default.nix index 2b4db7be7aa69..39adf1fefb9de 100644 --- a/pkgs/development/rocm-modules/6/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/6/amdsmi/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "rocm"; repo = "amdsmi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-hrPqd4ZWqzTG7JRfVwc1SZx6TNS0Q/LFg8yDxrM3mPo="; + hash = "sha256-K6FVvieJnOCfbyNNwOWs3t836ihtvELJvcCjXQoHuRY="; }; postPatch = '' diff --git a/pkgs/development/rocm-modules/6/aqlprofile/default.nix b/pkgs/development/rocm-modules/6/aqlprofile/default.nix new file mode 100644 index 0000000000000..c318b18100801 --- /dev/null +++ b/pkgs/development/rocm-modules/6/aqlprofile/default.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + clr, + cmake, + fetchFromGitHub, + fetchurl, + callPackage, + dpkg, + rocm-core, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aqlprofile"; + version = "unstable"; + + src = fetchFromGitHub { + owner = "ROCm"; + repo = "aqlprofile"; + # TODO: AMD haven't tagged anything in this repo, once that's fixed we can point + # this at a tag and set up update script + rev = "b20803e95dc3e9a3ffcef1f1500c4d8dd0fa3ab2"; + hash = "sha256-kaXbojl8T71nTLWJEX+g9EikwJiM1n4kXg3NFQ+Tzro="; + }; + + nativeBuildInputs = [ + cmake + clr + ]; + + meta = with lib; { + description = "AQLPROFILE library for AMD HSA runtime API extension support"; + homepage = "https://github.com/ROCm/aqlprofile/"; + license = with licenses; [ mit ]; + teams = [ teams.rocm ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/update.nix b/pkgs/development/rocm-modules/6/aqlprofile/update.nix similarity index 100% rename from pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/update.nix rename to pkgs/development/rocm-modules/6/aqlprofile/update.nix diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index 1644cd122c954..9fc88c286e7af 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ "out" @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-4qjfnn0kto2sNaSumXxHRHFrf3a3RZILOdhVSxkEs1I="; + hash = "sha256-MA9MS/HF3j5iqpFuatHQJZ+nNkcGgzCvpkiNO6CjoPg="; }; nativeBuildInputs = [ @@ -124,28 +124,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./cmake-find-x11-libgl.patch - - (fetchpatch { - # Fix handling of old fatbin version https://github.com/ROCm/clr/issues/99 - sha256 = "sha256-CK/QwgWJQEruiG4DqetF9YM0VEWpSiUMxAf1gGdJkuA="; - url = "https://src.fedoraproject.org/rpms/rocclr/raw/rawhide/f/0001-handle-v1-of-compressed-fatbins.patch"; - }) - (fetchpatch { - # improve rocclr isa compatibility check - sha256 = "sha256-wUrhpYN68AbEXeFU5f366C6peqHyq25kujJXY/bBJMs="; - url = "https://github.com/GZGavinZhao/clr/commit/22c17a0ac09c6b77866febf366591f669a1ed133.patch"; - }) - (fetchpatch { - # [PATCH] Improve hipamd compat check - sha256 = "sha256-uZQ8rMrWH61CCbxwLqQGggDmXFmYTi6x8OcgYPrZRC8="; - url = "https://github.com/GZGavinZhao/clr/commit/63c6ee630966744d4199fdfb854e98d2da9e1122.patch"; - }) - (fetchpatch { - # [PATCH] SWDEV-504340 - Move cast of cl_mem inside the condition - # Fixes crash due to UB in KernelBlitManager::setArgument - sha256 = "sha256-nL4CZ7EOXqsTVUtYhuu9DLOMpnMeMRUhkhylEQLTg9I="; - url = "https://github.com/ROCm/clr/commit/fa63919a6339ea2a61111981ba2362c97fbdf743.patch"; - }) (fetchpatch { # [PATCH] SWDEV-507104 - Removes alignment requirement for Semaphore class to resolve runtime misaligned memory issues sha256 = "sha256-nStJ22B/CM0fzQTvYjbHDbQt0GlE8DXxVK+UDU9BAx4="; @@ -220,23 +198,26 @@ stdenv.mkDerivation (finalAttrs: { # See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix # Generic targets are not yet available in rocm-6.3.1 llvm gpuTargets = lib.forEach [ - # "9-generic" + "9-generic" "900" # MI25, Vega 56/64 "906" # MI50/60, Radeon VII "908" # MI100 "90a" # MI210 / MI250 - # "9-4-generic" + "9-4-generic" # 940/1 - never released publicly, maybe HPE cray specific MI3xx? "942" # MI300 - # "10-1-generic" + "10-1-generic" "1010" "1012" - # "10-3-generic" + "10-3-generic" "1030" # W6800, various Radeon cards - # "11-generic" + "11-generic" "1100" "1101" "1102" + "1200" + "1201" + "12-generic" "1200" # RX 9070 "1201" # RX 9070 XT ] (target: "gfx${target}"); diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/6/composable_kernel/base.nix index 29fa699e97e4b..26affc290ff3f 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/base.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel_base"; # Picked this version over 6.3 because much easier to get to build # and it matches the version torch 2.6 wants - version = "6.4.0-unstable-20241220"; + version = "6.4.1"; outputs = [ @@ -56,8 +56,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; repo = "composable_kernel"; - rev = "07339c738396ebeae57374771ded4dcf11bddf1e"; - hash = "sha256-EvEBxlOpQ71BF57VW79WBo/cdxAwTKFXFMiYKyGyyEs="; + # FIXME: check rev matches what pytorch wants + rev = "6.4.1"; + hash = "sha256-1vEBxlOpQ71BF57VW79WBo/cdxAwTKFXFMiYKyGyyEs="; }; nativeBuildInputs = [ @@ -102,6 +103,9 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_DEV=OFF" "-DROCM_PATH=${clr}" "-DCMAKE_HIP_COMPILER_ROCM_ROOT=${clr}" + # FIXME: disable HUGE _mha instance build iff possible + # Is being made non-default upstream https://github.com/ROCm/composable_kernel/pull/2225 + # but MIOpen might still need it for 6.4 # FP8 can build for 908/90a but very slow build # and produces unusably slow kernels that are huge diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index c399061c19925..3119766a3ca15 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -67,7 +67,7 @@ let rocminfo = self.callPackage ./rocminfo { }; # Unfree - hsa-amd-aqlprofile-bin = self.callPackage ./hsa-amd-aqlprofile-bin { }; + aqlprofile = self.callPackage ./aqlprofile { }; rdc = self.callPackage ./rdc { }; diff --git a/pkgs/development/rocm-modules/6/half/default.nix b/pkgs/development/rocm-modules/6/half/default.nix index 953152b37e0ff..7c77d2bcda95d 100644 --- a/pkgs/development/rocm-modules/6/half/default.nix +++ b/pkgs/development/rocm-modules/6/half/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/6/hip-common/default.nix b/pkgs/development/rocm-modules/6/hip-common/default.nix index a169c97cae549..fc152b8908ad0 100644 --- a/pkgs/development/rocm-modules/6/hip-common/default.nix +++ b/pkgs/development/rocm-modules/6/hip-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-eKDbuG57KCg/nZpy+RcDsjyw0pP68qO9K/3ZpSPuMNw="; + hash = "sha256-2Iekju0t12c6iiqb104j+Lh53FvZwyqYtST12RkkuKc="; }; dontConfigure = true; diff --git a/pkgs/development/rocm-modules/6/hipblas-common/default.nix b/pkgs/development/rocm-modules/6/hipblas-common/default.nix index 626c36833d636..a5296e87c3b7d 100644 --- a/pkgs/development/rocm-modules/6/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/6/hipblas-common/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipBLAS-common"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-tvNz4ymQ1y3YSUQxAtNu2who79QzSKR+3JEevr+GDWo="; + hash = "sha256-eTwoAXH2HGdSAOLTZHJUFHF+c2wWHixqeMqr60KxJrc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipblas/default.nix b/pkgs/development/rocm-modules/6/hipblas/default.nix index 22706ff562b51..3877ff55ce354 100644 --- a/pkgs/development/rocm-modules/6/hipblas/default.nix +++ b/pkgs/development/rocm-modules/6/hipblas/default.nix @@ -23,7 +23,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Rz1KAhBUbvErHTF2PM1AkVhqo4OHldfSNMSpp5Tx9yk="; + hash = "sha256-lQv8Ik6+0ldqyeJ05CSGB0309nIpzlRL3CRYeQxVfd0="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/6/hipblaslt/default.nix index a5ab8ff2ab211..7b589e2291bfc 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/6/hipblaslt/default.nix @@ -59,13 +59,13 @@ stdenv.mkDerivation ( in { pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipBLASLt"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ozfHwsxcczzYXN9SIkyfRvdtaCqlDN4bh3UHZNS2oVQ="; + hash = "sha256-ojNa3jt5285gsPwo4icATJD9JdxmbJBjfCF4A1ttCQ4="; }; env.CXX = compiler; env.CFLAGS = cFlags; diff --git a/pkgs/development/rocm-modules/6/hipcub/default.nix b/pkgs/development/rocm-modules/6/hipcub/default.nix index d51b5b36bab9c..ca6f388473131 100644 --- a/pkgs/development/rocm-modules/6/hipcub/default.nix +++ b/pkgs/development/rocm-modules/6/hipcub/default.nix @@ -17,7 +17,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-uECOQWG9C64tg5YZdm9/3+fZXaZVGslu8vElK3m23GY="; + hash = "sha256-pwCAsRx5XyuCvppTmZ4VG83iYl9ilAQCZds4oKINhSI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipfft/default.nix b/pkgs/development/rocm-modules/6/hipfft/default.nix index 80c21f158a770..f6bfaf7d372ed 100644 --- a/pkgs/development/rocm-modules/6/hipfft/default.nix +++ b/pkgs/development/rocm-modules/6/hipfft/default.nix @@ -22,7 +22,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Jq/YHEtOo7a0/Ki7gxZATKmSqPU6cyLf5gx3A4MAZNw="; + hash = "sha256-VA9OC/TvvQyFCVVox/9ihuE2W0Ia87O0R3YsLM4Jzuk="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/hipfort/default.nix b/pkgs/development/rocm-modules/6/hipfort/default.nix index d3916bf6d20c7..bad42cc9fd740 100644 --- a/pkgs/development/rocm-modules/6/hipfort/default.nix +++ b/pkgs/development/rocm-modules/6/hipfort/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-V5XDNM0bYHKnpkcnaDyxIS1zwsgaByJj+znFxJ6VxR0="; + hash = "sha256-a2YPGAWP+gF2EykpKmkG/fEIW6blm2ChOybmLAHQQdw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipify/default.nix b/pkgs/development/rocm-modules/6/hipify/default.nix index 8747dba16b96a..4b14f0a9ad3bc 100644 --- a/pkgs/development/rocm-modules/6/hipify/default.nix +++ b/pkgs/development/rocm-modules/6/hipify/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-o/1LNsNtAyQcSug1gf7ujGNRRbvC33kwldrJKZi2LA0="; + hash = "sha256-uj25WmGCpwouS1yzW9Oil5Vyrbyj5yRITvWF9WaGozM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hiprand/default.nix b/pkgs/development/rocm-modules/6/hiprand/default.nix index f32f4e508a186..c65fe3d998586 100644 --- a/pkgs/development/rocm-modules/6/hiprand/default.nix +++ b/pkgs/development/rocm-modules/6/hiprand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprand"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-TVc+qFwRiS5tAo1OKI1Wu5hadlwPZmSVZ9SvVvH1w7Y="; + hash = "sha256-ISl4bVW/JvT81gJ/10JlKliv7ds5WtP2f/Dnc9qvh9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipsolver/default.nix b/pkgs/development/rocm-modules/6/hipsolver/default.nix index dbc0b0c43c3d3..981f59151a7ae 100644 --- a/pkgs/development/rocm-modules/6/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/6/hipsolver/default.nix @@ -21,7 +21,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ZQUKU3L4DgZ5zM7pCYEix0ulRkl78x/5wJnyCndTAwk="; + hash = "sha256-4ig8/P7JQCx3WB+PRHlhSlRhzdbnDo8QrFnWxsxJdwk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipsparse/default.nix b/pkgs/development/rocm-modules/6/hipsparse/default.nix index 5a318c7fe1e20..c89bed1342f93 100644 --- a/pkgs/development/rocm-modules/6/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/6/hipsparse/default.nix @@ -20,7 +20,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-3a7fKpYyiqG3aGOg7YrTHmKoH4rgTVLD16DvrZ3YY1g="; + hash = "sha256-pRR/3t7YXgtPQwGFb5lA6DI2OTF6AnDcfkydRIEod2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix deleted file mode 100644 index 68d7a337f89d6..0000000000000 --- a/pkgs/development/rocm-modules/6/hsa-amd-aqlprofile-bin/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - callPackage, - dpkg, - rocm-core, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hsa-amd-aqlprofile-bin"; - version = "6.3.3"; - - src = - let - inherit (finalAttrs) version; - patch = rocm-core.ROCM_LIBPATCH_VERSION; - majorMinor = lib.versions.majorMinor version; - poolVersion = if majorMinor + ".0" == version then majorMinor else version; - incremental = "74"; - osRelease = "22.04"; - in - fetchurl { - url = "https://repo.radeon.com/rocm/apt/${poolVersion}/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.${patch}-${incremental}~${osRelease}_amd64.deb"; - hash = "sha256-Lo6gU9ywkujtsKvnOAwL3L8qQNPwjjm0Pm4OyzoUYao="; - }; - - nativeBuildInputs = [ dpkg ]; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -a opt/rocm-${finalAttrs.version}*/* $out - chmod +x $out/lib/libhsa-amd-aqlprofile64.so.1.* - chmod +x $out/lib/hsa-amd-aqlprofile/librocprofv2_att.so - - runHook postInstall - ''; - - passthru.updateScript = (callPackage ./update.nix { }) { inherit (finalAttrs) version; }; - - meta = with lib; { - description = "AQLPROFILE library for AMD HSA runtime API extension support"; - homepage = "https://rocm.docs.amd.com/en/latest/"; - license = with licenses; [ unfree ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index 9a1011671a5e8..bba14dad1c96e 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - llvmPackages_18, + llvmPackages_20, overrideCC, rocm-device-libs, rocm-runtime, @@ -28,7 +28,8 @@ }: let - llvmPackagesNoBintools = llvmPackages_18.override { + llvmPackages_base = llvmPackages_20; + llvmPackagesNoBintools = llvmPackages_base.override { bootBintools = null; bootBintoolsNoLibc = null; }; @@ -37,7 +38,7 @@ let llvmStdenv = overrideCC llvmPackagesNoBintools.libcxxStdenv llvmPackagesNoBintools.clangUseLLVM; llvmLibstdcxxStdenv = overrideCC llvmPackagesNoBintools.stdenv ( llvmPackagesNoBintools.libstdcxxClang.override { - inherit (llvmPackages_18) bintools; + inherit (llvmPackages_base) bintools; } ); stdenvToBuildRocmLlvm = if useLibcxx then llvmStdenv else llvmLibstdcxxStdenv; @@ -88,9 +89,9 @@ let ln -s $out $out/x86_64-unknown-linux-gnu ''; }; - version = "6.3.1"; + version = "6.4.1"; # major version of this should be the clang version ROCm forked from - rocmLlvmVersion = "18.0.0-${llvmSrc.rev}"; + rocmLlvmVersion = "19.0.0-${llvmSrc.rev}"; usefulOutputs = drv: builtins.filter (x: x != null) [ @@ -100,18 +101,17 @@ let ]; listUsefulOutputs = builtins.concatMap usefulOutputs; llvmSrc = fetchFromGitHub { - # Performance improvements cherry-picked on top of rocm-6.3.x - # most importantly, amdgpu-early-alwaysinline memory usage fix - owner = "LunNova"; - repo = "llvm-project-rocm"; - rev = "4182046534deb851753f0d962146e5176f648893"; - hash = "sha256-sPmYi1WiiAqnRnHVNba2nPUxGflBC01FWCTNLPlYF9c="; + # FIXME: Add patches currently in LunNova/llvm-project-rocm IF not upstreamed + owner = "ROCm"; + repo = "llvm-project"; + rev = "rocm-6.4.1"; + hash = "sha256-84+ZsKjIhXip2yLU5jpoV53+ejxy2dzgamVU6AcAngU="; }; llvmSrcFixed = llvmSrc; llvmMajorVersion = lib.versions.major rocmLlvmVersion; # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree # optionally using LLVM libcxx - llvmPackagesRocm = llvmPackages_18.override (_old: { + llvmPackagesRocm = llvmPackages_base.override (_old: { stdenv = stdenvToBuildRocmLlvm; # old.stdenv #llvmPackagesNoBintools.libcxxStdenv; # not setting gitRelease = because that causes patch selection logic to use git patches @@ -163,6 +163,7 @@ let ( (lib.strings.hasSuffix "add-nostdlibinc-flag.patch" (builtins.baseNameOf x)) || (lib.strings.hasSuffix "clang-at-least-16-LLVMgold-path.patch" (builtins.baseNameOf x)) + || (lib.strings.hasSuffix "gnu-install-dirs.patch" (builtins.baseNameOf x)) ); llvmTargetsFlag = "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${ { @@ -192,6 +193,17 @@ rec { # llvm-orig = llvmPackagesRocm.llvm; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.llvm-orig # clang-orig = llvmPackagesRocm.clang; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.clang-orig llvm = (llvmPackagesRocm.llvm.override { ninja = emptyDirectory; }).overrideAttrs (old: { + # patches = [ ../../../compilers/llvm/19/clang/gnu-install-dirs.patch ] + # ++ builtins.filter (x: !(lib.strings.hasSuffix "gnu-install-dirs.patch" x)) old.patches; + patches = old.patches ++ [ + (fetchpatch { + name = "gold-plugin-fix.patch"; + url = "https://github.com/llvm/llvm-project/commit/b0baa1d8bd68a2ce2f7c5f2b62333e410e9122a1.patch"; + hash = "sha256-yly93PvGIXOnFeDGZ2W+W6SyhdWFM6iwA+qOeaptrh0="; + relative = "llvm"; + }) + ]; + doCheck = false; dontStrip = profilableStdenv; nativeBuildInputs = old.nativeBuildInputs ++ [ removeReferencesTo ]; buildInputs = old.buildInputs ++ [ @@ -379,12 +391,22 @@ rec { ] ++ lib.optionals (!useLibcxx) [ # FIXME: Config file in rocmcxx instead of GCC_INSTALL_PREFIX? + # Expected to be fully removed eventually + "-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON" "-DGCC_INSTALL_PREFIX=${gcc-prefix}" ]; + preInstall = '' + # HACK: for major version == 19 nixpkgs llbm expects this to exist, but rocm llvm uses $lib correctly + mkdir -p $lib/lib + ''; postFixup = (old.postFixup or "") + '' + mv $out/lib/* $lib/lib/ + rm -rf $out/lib + find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm} {} + find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} + + find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} + find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} + @@ -443,6 +465,7 @@ rec { relative = "compiler-rt"; }) ]; + hardeningDisable = [ "fortify" ]; }); compiler-rt = compiler-rt-libc; bintools = wrapBintoolsWith { diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/6/migraphx/default.nix index 54620d320076c..d52fdba7be7bf 100644 --- a/pkgs/development/rocm-modules/6/migraphx/default.nix +++ b/pkgs/development/rocm-modules/6/migraphx/default.nix @@ -63,7 +63,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-h9cTbrMwHeRGVJS/uHQnCXplNcrBqxbhwz2AcAEso0M="; + hash = "sha256-PytBEnLBHyp0JzkSLbLRHslqGBk4mabKC62JZoXwHxE="; }; nativeBuildInputs = diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index b8e072b9c3fb2..19d1140aaee1d 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -54,13 +54,13 @@ let # FIXME: cmake files need patched to include this properly cFlags = "-O3 -DNDEBUG -Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "MIOpen"; rev = "rocm-${version}"; - hash = "sha256-rX+BE6wBDMnLyc6eai3bDVvmfahomDO0s10n6HhWu7c="; + hash = "sha256-DEcVj2vOwIYYyNKEKFqZ0fb9o+/QRpwiSksxwnmgEMc="; fetchLFS = true; fetchSubmodules = true; # WORKAROUND: .lfsconfig is incorrectly set to exclude everything upstream diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix index 34d1fadc2c36c..ed54a30bb18b9 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-SisCbUDCAiWQ1Ue7qrtoT6vO/1ztzqji+3cJD6MXUNw="; + hash = "sha256-07MivgCYmKLnhGDjOYsFBfwIxEoQLYNoRbOo3MPpVzE="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/6/rccl/default.nix index c74c6287cf213..02f99ddd422c2 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/6/rccl/default.nix @@ -34,7 +34,7 @@ in # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros stdenv.mkDerivation (finalAttrs: { pname = "rccl${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-998tDiC0Qp9hhcXtFpiCWqwdKPVT2vNp0GU/rng03Bw="; + hash = "sha256-6lQBpoJKszgvt+UpNEKdiw74s3ZhC4zpA4HP+F6u7X4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rdc/default.nix b/pkgs/development/rocm-modules/6/rdc/default.nix index a19f2c9aa51f2..5af566ebca550 100644 --- a/pkgs/development/rocm-modules/6/rdc/default.nix +++ b/pkgs/development/rocm-modules/6/rdc/default.nix @@ -48,7 +48,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-s/31b8/Kn5l1QJ941UMSB8SCzpvODsPfOLMmEBUYYmY="; + hash = "sha256-HkGumwag7mDERHiWwZ7cRQz0tzH+vIovY1HgX2g69d4="; }; nativeBuildInputs = diff --git a/pkgs/development/rocm-modules/6/rocalution/default.nix b/pkgs/development/rocm-modules/6/rocalution/default.nix index 785a2f4676a27..19083935bf122 100644 --- a/pkgs/development/rocm-modules/6/rocalution/default.nix +++ b/pkgs/development/rocm-modules/6/rocalution/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xdZ3HUiRGsreHfJH8RgL/s3jGyC5ABmBKcEfgtqWg8Y="; + hash = "sha256-bZx1Cc2jcIfysohKCKzj5mowM3IeCelRhVaBU73KnTo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index 110b96ec118b3..b015df3fdf63d 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -63,7 +63,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ "out" @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-IYcrVcGH4yZDkFZeNOJPfG0qsPS/WiH0fTSUSdo1BH4="; + hash = "sha256-To5V5bydYR5iuUxkwpx79RrNdncvWmR/v/w9VnlKBq4="; }; nativeBuildInputs = diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix index 8226f62bf0f37..0474569942148 100644 --- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix @@ -43,7 +43,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-6itfBrWVspobU47aiJAOQoxT8chwrq9scRn0or3bXto="; + hash = "sha256-Rr8+SNeFps0rjk4Jn2+rFmtRJfL42l0tNOz13oZQy+I="; }; nativeBuildInputs = diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/6/rocfft/default.nix index d8ae87d509c19..86fbc80aea81c 100644 --- a/pkgs/development/rocm-modules/6/rocfft/default.nix +++ b/pkgs/development/rocm-modules/6/rocfft/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-RrxdwZ64uC7lQzyJI1eGHX2dmRnW8TfNThnuvuz5XWo="; + hash = "sha256-z8O//2lihXeVnYZklR8uUIgCS9RyNNRb+hM5keR5aYA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/6/rocgdb/default.nix index 8e009e583b08c..47e7fa49b2cba 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/6/rocgdb/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Z+uk+ViLXgk5hXrIhVHRY0Kly7mktYms7M3o9Tmxv8s="; + hash = "sha256-evDWg2w2FHv6OU5BQOCAXTlDm7JpwdJ3Wh5a2i5r1gQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix b/pkgs/development/rocm-modules/6/rocm-cmake/default.nix index 23a48dcd55b2b..cbdcf253cd384 100644 --- a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-cmake/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-U4vGkH2iUlNJkqiNmVuFianD4WR9yuGvZsYG58smg0k="; + hash = "sha256-wAipNWAB66YNf7exLSNPAzg3NgkGD9LPKfKiulL5yak="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix index 58b35a1a7621a..de0b2434cfacf 100644 --- a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { }) #[Comgr] Extend ISA compatibility for CCOB (fetchpatch { - sha256 = "sha256-6Rwz12Lk4R2JK3olii3cr2Zd0ZLYe7VSpK1YRCOsJWY="; - url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/2d8c459a4d4c0567a7a275b4b54560d88e5c6919.patch"; + sha256 = "sha256-PCi0QHLiEQCTIYRtSSbhOjXANJ3zC3VLdMED1BEfQeg="; + url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/fa80abb77d5ae6f8d89ab956e7ebda9c802a804f.patch"; relative = "amd/comgr"; }) ]; diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/6/rocm-core/default.nix index 55316f4c65d5b..f0cea7a2ac9df 100644 --- a/pkgs/development/rocm-modules/6/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-core/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-core"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UDnPGvgwzwv49CzF+Kt0v95CsxS33BZeqNcKw1K6jRI="; + hash = "sha256-dDTCEAbeA88deLgUbdbulaHpHI9zcTze0mZeS49TsAM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix index c86fa10cdff40..5c902ff51da53 100644 --- a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix @@ -24,14 +24,14 @@ # FIXME: Move to rocmPackages_common buildPythonPackage rec { pname = "rocm-docs-core"; - version = "1.17.0"; + version = "1.20.0"; format = "pyproject"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-docs-core"; rev = "v${version}"; - hash = "sha256-fGRJyQq0Eook1Dc9Qy+dehQ5BVNX+6pkkFN9adb21Eo="; + hash = "sha256-5GGOsNx506DBcibnLjvRGrbKrTU+LyKvsRCEnhO+rTE="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index c40f270699ce0..a8d368c4d527f 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-du20+5VNYgwchGO7W7FIVebBqLPtfSBnmPVbPpgEZjo="; + hash = "sha256-LOILnvjGwlLoB99+TdZib7VJsgp45yGJiEPgrlwXItI="; }; env.CFLAGS = "-I${numactl.dev}/include -I${elfutils.dev}/include -w"; @@ -62,11 +62,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/ROCR-Runtime/commit/39a6a168fa07e289a10f6e20e6ead4e303e99ba0.patch"; hash = "sha256-CshJJDvII1nNyNmt+YjwMwfBHUTlrdsxkhwfgBwO+WE="; }) - (fetchpatch { - # [PATCH] rocr: refactor of runtime.cpp based on Coverity - url = "https://github.com/ROCm/ROCR-Runtime/commit/441bd9fe6c7bdb5c4c31f71524ed642786bc923e.patch"; - hash = "sha256-7bQXxGkipzgT2aXRxCuh3Sfmo/zc/IOmA0x1zB+fMb0="; - }) (fetchpatch { # [PATCH] queues: fix UB due to 1 << 31 url = "https://github.com/ROCm/ROCR-Runtime/commit/9b8a0f5dbee1903fa990a7d8accc1c5fbc549636.patch"; diff --git a/pkgs/development/rocm-modules/6/rocm-smi/default.nix b/pkgs/development/rocm-modules/6/rocm-smi/default.nix index 981c3ca6f892c..d7274bb37ad2a 100644 --- a/pkgs/development/rocm-modules/6/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-smi/default.nix @@ -3,26 +3,33 @@ stdenv, fetchFromGitHub, rocmUpdateScript, + pkg-config, + libdrm, cmake, wrapPython, }: stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-j9pkyUt+p6IkhawIhiTymqDBydxXZunxmdyCyRN0RxE="; + hash = "sha256-qshAMVhHJIA06fGOTJx5/l1t8wKv7KbmvdCSKNuEIKM="; }; patches = [ ./cmake.patch ]; + buildInputs = [ + libdrm + ]; + nativeBuildInputs = [ cmake wrapPython + pkg-config ]; cmakeFlags = [ diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix index 19d1f76dbbc6a..616bf6f1f2529 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix @@ -20,14 +20,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "6.3.3"; + version = "6.4.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; - sha256 = "sha256-fQPtO5TNbCbaZZ7VtGkkqng5QZ+FcScdh1opWr5YkLU="; + sha256 = "sha256-YscZ5sFsLOVBg98w2X6vTzniTvl9NfCkIE+HAH6vv5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix index 13ffe4ada1bd1..8e7e6ccbc499a 100644 --- a/pkgs/development/rocm-modules/6/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix @@ -41,7 +41,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0SQ6uLDRfVfdCX+8a7D6pu6dYlFvX0HFzCDEvlKYfak="; + hash = "sha256-p/gvr1Z6yZtO5N+ecSouXiCrf520jt1HMOy/tohUHfI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/6/rocprim/default.nix index 87505bee0d7ad..d7dd7cfb74496 100644 --- a/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/pkgs/development/rocm-modules/6/rocprim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0aHxpBuYIYhI2UER45YhHHL5YcxA+XeXoihcUs2AmCo="; + hash = "sha256-EP61n4syYMWjTDkjC0dWLj9yau6KL2qu1Bs5IBtw580="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix index 64ef999a506c5..46713b4a1e05a 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler-register"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UZsCiGnudsbL1v5lKBx7Vz3/HRnGn4f86Pd+qu3ryh0="; + hash = "sha256-HaN4XMHuCRDfKOpfuZ2SkOEQfAZKouh6luqbtATUYm0="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix index 06612a65d5912..9cdd5e771a6ad 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-x6DVt1logBE8aNnuwukQhsv/vRqkJALcfAF+6yEQuIk="; + hash = "sha256-CgW8foM4W3K19kUK/l8IsH2Q9DHi/z88viXTxhNqlHQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix index 7fbf0a04da090..54dc2f6272325 100644 --- a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-HYag5/E72hopDhS9EVcdyGgSvzbCMzKqLC+SIS28Y9M="; + hash = "sha256-otoxZ2NHkPDIFhvn4/nvaQ/W4LF38Nx9MZ9IYEf1DyY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocrand/default.nix b/pkgs/development/rocm-modules/6/rocrand/default.nix index d0796c1267b8e..219c5eedda535 100644 --- a/pkgs/development/rocm-modules/6/rocrand/default.nix +++ b/pkgs/development/rocm-modules/6/rocrand/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-rrRLPqEw39M+6dtPW8DcnQiSZNwxWNINJ1wjU098Vkk="; + hash = "sha256-XqGPXx+LqjJs602vtG5u578B1hitGlsopA0izbClHro="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsolver/default.nix b/pkgs/development/rocm-modules/6/rocsolver/default.nix index 317690b40e8b3..2d1fc9abdb8b4 100644 --- a/pkgs/development/rocm-modules/6/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/6/rocsolver/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-+sGU+0CB48iolJSyYo+xH36q5LCUp+nKtOYbguzMuhg="; + hash = "sha256-u5GRWetMnhEBJ9HZcXoEaqpdO8f0cuSPnq+XawljfUs="; }; nativeBuildInputs = diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/6/rocsparse/default.nix index b4a1ead7608a8..5c3e4ff5ae14a 100644 --- a/pkgs/development/rocm-modules/6/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/6/rocsparse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-6Cut5rbyqKFzHaXfJZGApyY9Mj1Zq/+U8MkXgy4X4Pw="; + hash = "sha256-l7rOuVthfrSO5bnhgm49cjPnRbV/2sFhSRT+mShkBek="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocthrust/default.nix b/pkgs/development/rocm-modules/6/rocthrust/default.nix index 06cd7a552aeb8..cbbe5bd2670ea 100644 --- a/pkgs/development/rocm-modules/6/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/6/rocthrust/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-c1+hqP/LipaQ2/lPJo79YBd9H0n0Y7yHkxe0/INE14s="; + hash = "sha256-bHyqG0pSt6bc6cDMnd1uY+0o+V3cxdp0mUEzWYRdd20="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/roctracer/default.nix b/pkgs/development/rocm-modules/6/roctracer/default.nix index c0fe6456df958..d328f495c199d 100644 --- a/pkgs/development/rocm-modules/6/roctracer/default.nix +++ b/pkgs/development/rocm-modules/6/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-GhnF7rqNLQLLB7nzIp0xNqyqBOwj9ZJ+hzzj1EAaXWU="; + hash = "sha256-Dwk5cBZLysmsVA2kwpQM0FQt2KXOGcaZcAw/d8VUaXw="; }; nativeBuildInputs = diff --git a/pkgs/development/rocm-modules/6/rocwmma/default.nix b/pkgs/development/rocm-modules/6/rocwmma/default.nix index 623e6878a2837..2098de974be00 100644 --- a/pkgs/development/rocm-modules/6/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/6/rocwmma/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "6.3.3"; + version = "6.4.1"; outputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-kih3hn6QhcMmyj9n8f8eO+RIgKQgWKIuzg8fb0eoRPE="; + hash = "sha256-fjyxMrzt74rE7Gf4v4WawYltuw1fvahwZUpauMIE3qc="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ diff --git a/pkgs/development/rocm-modules/6/rpp/default.nix b/pkgs/development/rocm-modules/6/rpp/default.nix index 64fd8af1cba6d..2455d9fa66e2a 100644 --- a/pkgs/development/rocm-modules/6/rpp/default.nix +++ b/pkgs/development/rocm-modules/6/rpp/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-METwagek17/DdZGaOTQqvyU6xGt7OBMLHk4YM4KmgtA="; + hash = "sha256-rccVjSrOVIe4ZDtloCoCCI3u9UIcUqdirHIzS7ffAas="; }; nativeBuildInputs = diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index 6d66513bd4024..23dfbf0449b00 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -6,6 +6,7 @@ buildPythonPackage, pytestCheckHook, setuptools, + distro, pyyaml, msgpack, simplejson, @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = if isTensileLite then "tensilelite" else "tensile"; # Using a specific commit which has code object compression support from after the 6.3 release # Without compression packages are too large for hydra - version = "6.3-unstable-2024-12-10"; + version = "6.4.1"; format = "pyproject"; src = fetchFromGitHub { @@ -64,6 +65,7 @@ buildPythonPackage rec { msgpack pandas joblib + distro ] ++ lib.optionals (!isTensileLite) [ rich @@ -83,8 +85,9 @@ buildPythonPackage rec { url = "https://github.com/GZGavinZhao/Tensile/commit/855cb15839849addb0816a6dde45772034a3e41f.patch"; }) ++ lib.optional isTensileLite ./tensilelite-create-library-dont-copy-twice.diff - ++ lib.optional isTensileLite ./tensilelite-gen_assembly-venv-err-handling.diff - ++ lib.optional isTensileLite ./tensilelite-compression.diff; + ++ lib.optional isTensileLite ./tensilelite-gen_assembly-venv-err-handling.diff; + # FIXME: update this? Some compression support was upstreamed - may be unneeded now + # ++ lib.optional isTensileLite ./tensilelite-compression.diff; doCheck = false; # Too many errors, not sure how to set this up properly diff --git a/pkgs/development/rocm-modules/6/triton/default.nix b/pkgs/development/rocm-modules/6/triton/default.nix index 8dc20629a219f..7de0e0fa489f2 100644 --- a/pkgs/development/rocm-modules/6/triton/default.nix +++ b/pkgs/development/rocm-modules/6/triton/default.nix @@ -12,12 +12,12 @@ (old: { doCheck = false; stdenv = rocmPackages.llvm.rocmClangStdenv; - version = "3.2.0"; + version = "v3.3.1"; src = fetchFromGitHub { owner = "triton-lang"; repo = "triton"; - rev = "9641643da6c52000c807b5eeed05edaec4402a67"; # "release/3.2.x"; - hash = "sha256-V1lpARwOLn28ZHfjiWR/JJWGw3MB34c+gz6Tq1GOVfo="; + rev = "v3.3.1"; + hash = "sha256-11lpARwOLn28ZHfjiWR/JJWGw3MB34c+gz6Tq1GOVfo="; }; buildInputs = old.buildInputs ++ [ rocmPackages.clr