diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index f33545477c6d..edaea5895a3b 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -99,17 +99,12 @@ failure. To prevent this, guard the completion generation commands. ```nix { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( - let - emulator = stdenv.hostPlatform.emulator buildPackages; - in - '' - # using named fd - installShellCompletion --cmd foobar \ - --bash <(${emulator} $out/bin/foobar --bash-completion) \ - --fish <(${emulator} $out/bin/foobar --fish-completion) \ - --zsh <(${emulator} $out/bin/foobar --zsh-completion) - '' - ); + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # using named fd + installShellCompletion --cmd foobar \ + --bash <($out/bin/foobar --bash-completion) \ + --fish <($out/bin/foobar --fish-completion) \ + --zsh <($out/bin/foobar --zsh-completion) + ''; } ``` diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1a741ed06e0c..675ce7176a0a 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -354,6 +354,10 @@ - `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement. +- `rocmPackages_6` has been updated to ROCm 6.3. + +- `rocmPackages_5` has been removed. + - `rocmPackages.rocm-thunk` has been removed and its functionality has been integrated with the ROCm CLR. Use `rocmPackages.clr` instead. - `rocmPackages.clang-ocl` has been removed. [It was deprecated by AMD in 2023.](https://github.com/ROCm/clang-ocl) diff --git a/nixos/tests/installed-tests/libxmlb.nix b/nixos/tests/installed-tests/libxmlb.nix index af2bbe9c35e2..f45b97e8341f 100644 --- a/nixos/tests/installed-tests/libxmlb.nix +++ b/nixos/tests/installed-tests/libxmlb.nix @@ -2,4 +2,10 @@ makeInstalledTest { tested = pkgs.libxmlb; + + testConfig = { + environment.variables = { + G_TEST_SRCDIR = "${pkgs.libxmlb.installedTests}/libexec/installed-tests/libxmlb"; + }; + }; } diff --git a/nixos/tests/lomiri-calendar-app.nix b/nixos/tests/lomiri-calendar-app.nix index 5530e9e36075..c42e0f96e52c 100644 --- a/nixos/tests/lomiri-calendar-app.nix +++ b/nixos/tests/lomiri-calendar-app.nix @@ -44,23 +44,33 @@ with subtest("lomiri calendar launches"): machine.succeed("lomiri-calendar-app >&2 &") - machine.wait_for_text(r"(January|February|March|April|May|June|July|August|September|October|November|December)") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(2) + # Default page is unbearably slow to OCR on, switch to another + machine.succeed("xdotool mousemove 580 50 click 1") + machine.sleep(2) + machine.wait_for_text(r"(January|February|March|April|May|June|July|August|September|October|November|December|Mon|Tue|Wed|Thu|Fri|Sat|Sun)") machine.screenshot("lomiri-calendar") with subtest("lomiri calendar works"): # Switch to Agenda tab, less busy - machine.succeed("xdotool mousemove 300 50 click 1") + machine.succeed("xdotool mousemove 380 50 click 1") + machine.sleep(2) # Still on main page - machine.succeed("xdotool mousemove 500 650 click 1") + machine.succeed("xdotool mousemove 500 720 click 1") + machine.sleep(2) machine.wait_for_text(r"(Date|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday|All day|Name|Details|More)") machine.screenshot("lomiri-calendar_newevent") # On New Event page machine.succeed("xdotool mousemove 500 230 click 1") + machine.sleep(2) machine.send_chars("foobar") machine.sleep(2) # make sure they're actually in there - machine.succeed("xdotool mousemove 780 40 click 1") + machine.succeed("xdotool mousemove 1000 40 click 1") + machine.sleep(2) machine.wait_for_text("Agenda") machine.screenshot("lomiri-calendar_eventadded") @@ -73,6 +83,9 @@ with subtest("lomiri calendar localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-calendar-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text(r"(Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|Sonntag)") machine.screenshot("lomiri-calendar_localised") ''; diff --git a/nixos/tests/lomiri-camera-app.nix b/nixos/tests/lomiri-camera-app.nix index ccd53a37135b..ec3442966982 100644 --- a/nixos/tests/lomiri-camera-app.nix +++ b/nixos/tests/lomiri-camera-app.nix @@ -47,7 +47,7 @@ testScript = let - qrLabel = "Image"; + qrLabel = "Feed"; qrContent = "Test"; in '' @@ -55,6 +55,10 @@ with subtest("lomiri camera launches"): machine.succeed("lomiri-camera-app >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Cannot access") machine.screenshot("lomiri-camera_open") @@ -64,21 +68,26 @@ machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1") machine.succeed("qrtool encode '${qrContent}' -s 20 -m 10 > qr.png") # Horizontal flip, add text, flip back. Camera displays image mirrored, so need reversed text for OCR - machine.succeed("magick qr.png -flop -pointsize 70 -fill black -annotate +100+100 '${qrLabel}' -flop output.png") + machine.succeed("magick qr.png -flop -pointsize 30 -fill black -annotate +100+100 '${qrLabel}' -flop output.png") machine.succeed("ffmpeg -re -loop 1 -i output.png -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &") with subtest("lomiri camera uses camera"): machine.succeed("lomiri-camera-app >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: For target resolution") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${qrLabel}") machine.screenshot("lomiri-camera_feed") - machine.succeed("xdotool mousemove 320 610 click 1") # take photo - machine.wait_until_succeeds("find /root/Pictures/camera.ubports -name '*.jpg'") + machine.succeed("xdotool mousemove 510 670 click 1") # take photo + machine.wait_until_succeeds("ls /root/Pictures/camera.ubports | grep '\\.jpg$'") # Check that the image is correct machine.send_key("ctrl-alt-right") machine.succeed("magick /root/Pictures/camera.ubports/IMG_00000001.jpg -flop photo_flip.png") machine.succeed("feh photo_flip.png >&2 &") + machine.sleep(10) machine.wait_for_text("${qrLabel}") machine.screenshot("lomiri-camera_photo") @@ -88,18 +97,25 @@ with subtest("lomiri barcode scanner uses camera"): machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: For target resolution") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${qrLabel}") - machine.succeed("xdotool mousemove 320 610 click 1") # open up QR decode result + machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result # OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else machine.sleep(5) machine.screenshot("lomiri-barcode_decode") - machine.succeed("xdotool mousemove 350 530 click 1") + machine.succeed("xdotool mousemove 540 590 click 1") machine.sleep(5) # Need to make a new window without closing camera app, otherwise clipboard content gets lost? machine.send_key("ctrl-alt-right") machine.succeed("gnome-text-editor >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("New") # Font size up to help with OCR @@ -129,6 +145,10 @@ with subtest("lomiri camera localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &") + machine.wait_for_console_text("updateViewfinderResolution: For target resolution") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Kamera") machine.screenshot("lomiri-camera_localised") ''; diff --git a/nixos/tests/lomiri-clock-app.nix b/nixos/tests/lomiri-clock-app.nix index 9db5cee49cf7..d5cb72394abc 100644 --- a/nixos/tests/lomiri-clock-app.nix +++ b/nixos/tests/lomiri-clock-app.nix @@ -34,14 +34,20 @@ machine.wait_for_x() with subtest("lomiri clock launches"): - machine.execute("lomiri-clock-app >&2 &") + machine.succeed("lomiri-clock-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(clock.ubports|City|Alarms)") machine.screenshot("lomiri-clock_open") machine.succeed("pkill -f lomiri-clock-app") with subtest("lomiri clock localisation works"): - machine.execute("env LANG=de_DE.UTF-8 lomiri-clock-app >&2 &") + machine.succeed("env LANG=de_DE.UTF-8 lomiri-clock-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(Stadt|Weckzeiten)") machine.screenshot("lomiri-clock_localised") ''; diff --git a/nixos/tests/lomiri-docviewer-app.nix b/nixos/tests/lomiri-docviewer-app.nix index c21a121f6c02..ad9174e15d30 100644 --- a/nixos/tests/lomiri-docviewer-app.nix +++ b/nixos/tests/lomiri-docviewer-app.nix @@ -46,6 +46,9 @@ in with subtest("lomiri docviewer launches"): machine.succeed("lomiri-docviewer-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("No documents") machine.screenshot("lomiri-docviewer_open") @@ -57,6 +60,9 @@ in with subtest("lomiri docviewer txt works"): machine.succeed("lomiri-docviewer-app /etc/docviewer-sampletext.txt >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${exampleText}") machine.screenshot("lomiri-docviewer_txt") @@ -64,6 +70,9 @@ in with subtest("lomiri docviewer odt works"): machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.odt >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${exampleText}") machine.screenshot("lomiri-docviewer_odt") @@ -71,6 +80,9 @@ in with subtest("lomiri docviewer pdf works"): machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.pdf >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${exampleText}") machine.screenshot("lomiri-docviewer_pdf") @@ -78,6 +90,9 @@ in with subtest("lomiri docviewer localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-docviewer-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Keine Dokumente") machine.screenshot("lomiri-docviewer_localised") ''; diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix index d8cf7466656a..c7cec10d875c 100644 --- a/nixos/tests/lomiri-gallery-app.nix +++ b/nixos/tests/lomiri-gallery-app.nix @@ -59,8 +59,15 @@ machine.succeed("mkdir /root/Pictures /root/Videos") # Setup example data, OCR-friendly: # - White square, black text + # - Small text for display OCR + # - Big text for gallery preview OCR # - uppercase extension - machine.succeed("magick -size 500x500 -background white -fill black canvas:white -pointsize 70 -annotate +100+300 '${imageLabel}' /root/Pictures/output.PNG") + machine.succeed( + "magick -size 500x500 -background white -fill black canvas:white " + + "-pointsize 20 -annotate +100+100 '${imageLabel}' " + + "-pointsize 50 -annotate +100+300 '${imageLabel}' " + + "/root/Pictures/output.PNG" + ) # Different image formats machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.JPG") diff --git a/nixos/tests/lomiri-mediaplayer-app.nix b/nixos/tests/lomiri-mediaplayer-app.nix index b4ac5dd4ad2a..e1f20a4cc203 100644 --- a/nixos/tests/lomiri-mediaplayer-app.nix +++ b/nixos/tests/lomiri-mediaplayer-app.nix @@ -1,6 +1,6 @@ { lib, ... }: let - ocrContent = "Video Test"; + ocrContent = "Feed"; videoFile = "test.webm"; in { @@ -25,8 +25,8 @@ in ]; } '' - magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png - ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 100K -t 120 $out -loglevel fatal + magick -size 600x600 canvas:white -pointsize 20 -fill black -annotate +100+100 '${ocrContent}' output.png + ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 200K -t 120 $out -loglevel fatal ''; systemPackages = with pkgs.lomiri; [ suru-icon-theme @@ -54,6 +54,8 @@ in with subtest("lomiri mediaplayer launches"): machine.succeed("lomiri-mediaplayer-app >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") machine.wait_for_text("Choose from") machine.screenshot("lomiri-mediaplayer_open") @@ -61,6 +63,8 @@ in with subtest("lomiri mediaplayer plays video"): machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") machine.wait_for_text("${ocrContent}") machine.screenshot("lomiri-mediaplayer_playback") @@ -71,6 +75,8 @@ in # Cause an error, and look for the error popup machine.succeed("touch invalid.mp4") machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") machine.wait_for_text("Fehler") machine.screenshot("lomiri-mediaplayer_localised") ''; diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix index 93a3889c9127..354103f90e88 100644 --- a/nixos/tests/lomiri-music-app.nix +++ b/nixos/tests/lomiri-music-app.nix @@ -140,8 +140,10 @@ in with subtest("lomiri music launches"): machine.succeed("lomiri-music-app >&2 &") - machine.wait_for_text("favorite music") + machine.sleep(10) machine.send_key("alt-f10") + machine.sleep(2) + machine.wait_for_text("favorite music") machine.screenshot("lomiri-music") with subtest("lomiri music plays music"): @@ -187,6 +189,9 @@ in with subtest("lomiri music localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text("Titel") machine.screenshot("lomiri-music_localised") ''; diff --git a/nixos/tests/lomiri-system-settings.nix b/nixos/tests/lomiri-system-settings.nix index ab6dfe53630b..8018419f8863 100644 --- a/nixos/tests/lomiri-system-settings.nix +++ b/nixos/tests/lomiri-system-settings.nix @@ -109,7 +109,11 @@ machine.wait_for_x() with subtest("lomiri system settings launches"): - machine.execute("lomiri-system-settings >&2 &") + machine.succeed("lomiri-system-settings >&2 &") + machine.wait_for_console_text("qml: Plugin about does not exist") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("System Settings") machine.screenshot("lss_open") @@ -137,7 +141,11 @@ machine.execute("pkill -f lomiri-system-settings") with subtest("lomiri system settings localisation works"): - machine.execute("env LANG=de_DE.UTF-8 lomiri-system-settings >&2 &") + machine.succeed("env LANG=de_DE.UTF-8 lomiri-system-settings >&2 &") + machine.wait_for_console_text("qml: Plugin about does not exist") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("Systemeinstellungen") machine.screenshot("lss_localised_open") diff --git a/nixos/tests/teleports.nix b/nixos/tests/teleports.nix index a4293f954a45..613ad5a7fc84 100644 --- a/nixos/tests/teleports.nix +++ b/nixos/tests/teleports.nix @@ -34,14 +34,20 @@ machine.wait_for_x() with subtest("teleports launches"): - machine.execute("teleports >&2 &") + machine.succeed("teleports >&2 &") + machine.wait_for_console_text("authorizationStateWaitPhoneNumber") + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text(r"(TELEports|Phone Number)") machine.screenshot("teleports_open") machine.succeed("pkill -f teleports") with subtest("teleports localisation works"): - machine.execute("env LANG=de_DE.UTF-8 teleports >&2 &") + machine.succeed("env LANG=de_DE.UTF-8 teleports >&2 &") + machine.wait_for_console_text("authorizationStateWaitPhoneNumber") + machine.send_key("alt-f10") + machine.sleep(2) machine.wait_for_text("Telefonnummer") machine.screenshot("teleports_localised") ''; diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 767b51f40d15..18934eeb20f2 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-05-02"; + version = "0-unstable-2025-05-09"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "2d2a3682695b0cfa49934f29a34adabbe9470db5"; - hash = "sha256-yPFeVSK3yUhD0e7/7WftMJ3hx3ZAOMhB8zuYJ3uKwZY="; + rev = "96d27505b8332bac1bac7b8f02c049b1cc0ca800"; + hash = "sha256-dX8aH5zGcrCJc/hG/4Yfzv/O2jy8h+HB8pVwI3qPXEY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 39ca9122d13a..bd6d3f856749 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, makeDesktopItem, copyDesktopItems, @@ -14,15 +14,13 @@ laszip, mpfr, pcl, - qtbase, - qtsvg, - qttools, + libsForQt5, tbb, xercesc, wrapGAppsHook3, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "cloudcompare"; version = "2.13.2"; @@ -39,6 +37,7 @@ mkDerivation rec { eigen # header-only wrapGAppsHook3 copyDesktopItems + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -50,9 +49,9 @@ mkDerivation rec { laszip mpfr pcl - qtbase - qtsvg - qttools + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qttools tbb xercesc ]; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 2b78ac0d9ca8..bf8ccce9fe00 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,20 +1,18 @@ { lib, stdenv, - mkDerivation, fetchurl, autoconf, automake, libtool, pkg-config, djvulibre, - qtbase, - qttools, + libsForQt5, xorg, libtiff, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "djview"; version = "4.12"; @@ -33,12 +31,13 @@ mkDerivation rec { automake libtool pkg-config - qttools + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ djvulibre - qtbase + libsForQt5.qtbase xorg.libXt libtiff ]; diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index 6ea762ded515..5c41a460c099 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -4,7 +4,6 @@ lib, jre, qt5, - wrapQtAppsHook, }: python3Packages.buildPythonApplication rec { @@ -20,7 +19,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ qt5.qtbase - wrapQtAppsHook + qt5.wrapQtAppsHook python3Packages.setuptools python3Packages.rfc3987 python3Packages.jpype1 diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 0c7bb0023cbf..caed9af31c21 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -5,8 +5,7 @@ meson, ninja, pkg-config, - wrapQtAppsHook, - qtbase, + libsForQt5, libpng, giflib, libjpeg, @@ -28,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase libpng giflib libjpeg diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 04f0ff9bf358..81e25a88101d 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,13 +1,12 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, - qttools, - qtwebkit, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fontmatrix"; version = "0.9.100"; @@ -19,11 +18,14 @@ mkDerivation rec { }; buildInputs = [ - qttools - qtwebkit + libsForQt5.qttools + libsForQt5.qtwebkit ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index f58b7b7c6365..e5c9dfdd8e48 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -2,15 +2,18 @@ lib, stdenv, fetchFromGitHub, - mkDerivation, cmake, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fstl"; version = "0.11.0"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall diff --git a/pkgs/applications/graphics/glabels-qt/default.nix b/pkgs/applications/graphics/glabels-qt/default.nix index 6865060f2fc2..9ba7740f096d 100644 --- a/pkgs/applications/graphics/glabels-qt/default.nix +++ b/pkgs/applications/graphics/glabels-qt/default.nix @@ -1,12 +1,12 @@ { lib, + stdenv, fetchFromGitHub, cmake, - mkDerivation, - qttools, + libsForQt5, }: -mkDerivation { +stdenv.mkDerivation { pname = "glabels-qt"; version = "unstable-2021-02-06"; @@ -19,7 +19,8 @@ mkDerivation { nativeBuildInputs = [ cmake - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; meta = with lib; { diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index 5199cfe6c06a..c743ba7196b8 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -1,10 +1,9 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, - qtbase, - wrapQtAppsHook, + libsForQt5, libraw, exiv2, zlib, @@ -14,7 +13,7 @@ copyDesktopItems, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hdrmerge"; version = "0.5.0-unstable-2024-08-02"; src = fetchFromGitHub { @@ -27,12 +26,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook copyDesktopItems ]; buildInputs = [ - qtbase + libsForQt5.qtbase libraw exiv2 zlib diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix index 3855d3e16ba5..958963cc8766 100644 --- a/pkgs/applications/graphics/imgp/default.nix +++ b/pkgs/applications/graphics/imgp/default.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitHub, - buildPythonApplication, - pythonOlder, - pillow, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "imgp"; version = "2.9"; - disabled = pythonOlder "3.8"; + disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "jarun"; @@ -18,7 +16,7 @@ buildPythonApplication rec { hash = "sha256-yQ2BzOBn6Bl9ieZkREKsj1zLnoPcf0hZhZ90Za5kiKA="; }; - propagatedBuildInputs = [ pillow ]; + propagatedBuildInputs = [ python3Packages.pillow ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index afb0ab092652..2f71bf8d3506 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -74,11 +74,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-dHlqivThSg1dXBzFjT7B6m1IigQwbdbo0ywR8HSNcjI="; + sha256 = "sha256-IABTDHkX5SYMnoV1pxVP9pJmQ9IAZIfXFOMEqWPwx4I="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index 5df0e6fe2ba1..0eeddade1d58 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -1,13 +1,13 @@ { lib, - mkDerivationWith, python3Packages, fetchPypi, + libsForQt5, p7zip, archiveSupport ? true, }: -mkDerivationWith python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "kcc"; version = "5.5.1"; @@ -17,6 +17,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; }; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ pillow pyqt5 diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index b387a1a8d918..27320c563890 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,24 +1,17 @@ { lib, - mkDerivation, + stdenv, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook3, - kconfig, - kinit, - kdoctools, - kio, - kparts, - kwidgetsaddons, - qtbase, - qtsvg, + libsForQt5, boost, graphviz, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kgraphviewer"; version = "2.4.3"; @@ -28,8 +21,8 @@ mkDerivation rec { }; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg boost graphviz ]; @@ -39,10 +32,11 @@ mkDerivation rec { extra-cmake-modules pkg-config wrapGAppsHook3 - kdoctools + libsForQt5.kdoctools + libsForQt5.wrapQtAppsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with libsForQt5; [ kconfig kinit kio diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index c267b563d974..52d43879186f 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -4,12 +4,9 @@ fetchFromGitHub, fetchpatch, pkg-config, - wrapQtAppsHook, + libsForQt5, poppler, gnuplot, - qmake, - qtbase, - qttools, }: # This package only builds ktikz without KDE integration because KDE4 is @@ -54,15 +51,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qttools - qmake - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; - QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; + QT_PLUGIN_PATH = "${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}"; buildInputs = [ - qtbase - poppler + libsForQt5.qtbase + libsForQt5.poppler ]; qmakeFlags = [ diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 49ee98e95d8f..2e664479513d 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -4,12 +4,10 @@ fetchFromGitHub, fetchurl, povray, - qmake, - qttools, + libsForQt5, replaceVars, zlib, testers, - wrapQtAppsHook, nix-update-script, libGL, }: @@ -38,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index e12bca037461..ad53e38ef7cf 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, cmake, fetchFromGitHub, fetchpatch, @@ -14,14 +14,11 @@ libraw, libtiff, openexr, - qtbase, - qtdeclarative, - qttools, - qtwebengine, + libsForQt5, eigen, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "luminance-hdr"; version = "2.6.1.1"; @@ -43,10 +40,10 @@ mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ - qtbase - qtdeclarative - qttools - qtwebengine + libsForQt5.qtbase + libsForQt5.qtdeclarative + libsForQt5.qttools + libsForQt5.qtwebengine eigen boost exiv2 @@ -60,6 +57,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook cmake pkg-config ]; diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index 912e3b963175..e57017bb6a34 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -1,15 +1,12 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, libpng, gsl, libsndfile, lzo, - qmake, - qttools, - qtbase, - qtmultimedia, + libsForQt5, withOpenCL ? true, opencl-clhpp ? null, ocl-icd ? null, @@ -18,7 +15,7 @@ assert withOpenCL -> opencl-clhpp != null; assert withOpenCL -> ocl-icd != null; -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mandelbulber"; version = "2.32"; @@ -30,13 +27,14 @@ mkDerivation rec { }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia libpng gsl libsndfile diff --git a/pkgs/applications/graphics/meshlab-unstable/default.nix b/pkgs/applications/graphics/meshlab-unstable/default.nix index 714a3c61d67b..23ea4b2c63c9 100644 --- a/pkgs/applications/graphics/meshlab-unstable/default.nix +++ b/pkgs/applications/graphics/meshlab-unstable/default.nix @@ -1,11 +1,9 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, + libsForQt5, libGLU, - qtbase, - qtscript, - qtxmlpatterns, lib3ds, bzip2, muparser, @@ -43,7 +41,7 @@ let hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58="; }; in -mkDerivation { +stdenv.mkDerivation { pname = "meshlab-unstable"; version = "2023.12-unstable-2025-02-21"; @@ -59,9 +57,9 @@ mkDerivation { buildInputs = [ libGLU - qtbase - qtscript - qtxmlpatterns + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qtxmlpatterns lib3ds bzip2 muparser @@ -82,7 +80,10 @@ mkDerivation { structuresynth ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; preConfigure = '' mkdir src/external/downloads diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 710ab40c6dbc..c78afc438302 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,11 +1,9 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, + libsForQt5, libGLU, - qtbase, - qtscript, - qtxmlpatterns, lib3ds, bzip2, muparser, @@ -36,7 +34,7 @@ let hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo="; }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "meshlab"; version = "2023.12"; @@ -49,9 +47,9 @@ mkDerivation rec { buildInputs = [ libGLU - qtbase - qtscript - qtxmlpatterns + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qtxmlpatterns lib3ds bzip2 muparser @@ -73,7 +71,10 @@ mkDerivation rec { structuresynth ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; preConfigure = '' substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 519a0d5d5fdf..31db31a40c4d 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -4,16 +4,11 @@ fetchFromGitHub, cmake, pkg-config, - qmake, - qtbase, - qtxmlpatterns, - qttools, - qtwebengine, + libsForQt5, libGL, fontconfig, openssl, poppler, - wrapQtAppsHook, ffmpeg, libva, alsa-lib, @@ -27,7 +22,6 @@ lame, fdk_aac, libass, - quazip, libXext, libXfixes, }: @@ -44,8 +38,11 @@ let sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; + buildInputs = [ libsForQt5.qtbase ]; dontWrapQtApps = true; installPhase = '' @@ -79,14 +76,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtxmlpatterns - qttools - qtwebengine + libsForQt5.qtbase + libsForQt5.qtxmlpatterns + libsForQt5.qttools + libsForQt5.qtwebengine libGL fontconfig openssl @@ -104,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { lame fdk_aac libass - quazip + libsForQt5.quazip libXext libXfixes ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 6bac0594b028..f4d8d03de2d3 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - qtbase, - qtmultimedia, - qscintilla, + libsForQt5, bison, flex, eigen, @@ -26,21 +24,17 @@ double-conversion, lib3mf, libzip, - mkDerivation, - qtmacextras, - qmake, spacenavSupport ? stdenv.hostPlatform.isLinux, libspnav, wayland, wayland-protocols, wrapGAppsHook3, - qtwayland, cairo, openscad, runCommand, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openscad"; version = "2021.01"; @@ -95,7 +89,8 @@ mkDerivation rec { flex pkg-config gettext - qmake + libsForQt5.qmake + libsForQt5.wrapQtAppsHook wrapGAppsHook3 ]; @@ -115,9 +110,9 @@ mkDerivation rec { double-conversion freetype fontconfig - qtbase - qtmultimedia - qscintilla + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qscintilla cairo ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -125,9 +120,9 @@ mkDerivation rec { libGL wayland wayland-protocols - qtwayland + libsForQt5.qtwayland ] - ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras + ++ lib.optional stdenv.hostPlatform.isDarwin libsForQt5.qtmacextras ++ lib.optional spacenavSupport libspnav; qmakeFlags = diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index c53122f52434..bf02ff0c8914 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -5,6 +5,7 @@ libglut, freetype, glew, + libsForQt5, libjpeg, libmypaint, libpng, @@ -15,14 +16,9 @@ openblas, opencv, pkg-config, - qtbase, - qtmultimedia, - qtscript, - qtserialport, lib, stdenv, superlu, - wrapQtAppsHook, libtiff, zlib, }: @@ -103,7 +99,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -121,10 +117,10 @@ stdenv.mkDerivation { lzo openblas opentoonz-opencv - qtbase - qtmultimedia - qtscript - qtserialport + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtscript + libsForQt5.qtserialport superlu ]; diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 7363b649263b..dd2378ce1b75 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -14,14 +14,8 @@ netcdf, openssl, python3, - qscintilla, - qtbase, - qtsvg, - qttools, - wrapQtAppsHook, + qt6Packages, copyDesktopItems, - # needed to run natively on wayland - qtwayland, }: stdenv.mkDerivation rec { @@ -39,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6Packages.wrapQtAppsHook copyDesktopItems ]; @@ -53,11 +47,12 @@ stdenv.mkDerivation rec { netcdf openssl python3 - qscintilla - qtbase - qtsvg - qttools - qtwayland + qt6Packages.qscintilla + qt6Packages.qtbase + qt6Packages.qtsvg + qt6Packages.qttools + # needed to run natively on wayland + qt6Packages.qtwayland ]; # manually create a desktop file diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index b41e63e2c2df..d62b20303b21 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,12 +6,7 @@ boost, cmake, ffmpeg, - wrapQtAppsHook, - qtbase, - qtx11extras, - qttools, - qtxmlpatterns, - qtsvg, + libsForQt5, gdal, gfortran, libXt, @@ -62,7 +57,7 @@ stdenv.mkDerivation rec { # Find the Qt platform plugin "minimal" preConfigure = '' - export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; cmakeFlags = [ @@ -88,7 +83,7 @@ stdenv.mkDerivation rec { makeWrapper ninja gfortran - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -100,11 +95,11 @@ stdenv.mkDerivation rec { boost ffmpeg gdal - qtbase - qtx11extras - qttools - qtxmlpatterns - qtsvg + libsForQt5.qtbase + libsForQt5.qtx11extras + libsForQt5.qttools + libsForQt5.qtxmlpatterns + libsForQt5.qtsvg ]; postInstall = diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index 75645349377b..694f486733db 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -1,14 +1,12 @@ { - mkDerivation, lib, - graphicsmagick, + stdenv, fetchFromGitHub, - qmake, - qtbase, - qttools, + libsForQt5, + graphicsmagick, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "photoflare"; version = "1.6.13"; @@ -20,11 +18,12 @@ mkDerivation rec { }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ - qtbase + libsForQt5.qtbase graphicsmagick ]; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index fca4490d3448..360f76a387e3 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, exiv2, }: @@ -29,11 +27,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase exiv2 ]; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index b94c0b2d6278..723a5d209833 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -1,16 +1,14 @@ { lib, fetchFromGitHub, - buildPythonPackage, - pygobject3, - pycairo, + python3Packages, glib, gtk3, gobject-introspection, wrapGAppsHook3, }: -buildPythonPackage { +python3Packages.buildPythonPackage { pname = "pick-colour-picker"; version = "unstable-2022-05-08"; @@ -32,7 +30,7 @@ buildPythonPackage { wrapGAppsHook3 ]; - pythonPath = [ + pythonPath = with python3Packages; [ pygobject3 pycairo ]; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index a9aa1c5f587e..b36190b247b7 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -2,11 +2,9 @@ lib, stdenv, fetchFromGitHub, - qtsvg, - qttools, - exiv2, - wrapQtAppsHook, cmake, + qt6Packages, + exiv2, }: stdenv.mkDerivation (finalAttrs: { @@ -22,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - qtsvg + qt6Packages.qtsvg exiv2 ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 3cce7faf76d0..b2edec42104f 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -2,7 +2,6 @@ stdenv, lib, requireFile, - wrapQtAppsHook, autoPatchelfHook, unixtools, fakeroot, @@ -31,20 +30,7 @@ gdk-pixbuf, gtk3, pango, - # Qt 6 subpackages - qtbase, - qtserialport, - qtserialbus, - qtvirtualkeyboard, - qtmultimedia, - qt3d, - mlt, - qtlocation, - qtwebengine, - qtquick3d, - qtwayland, - qtwebview, - qtscxml, + qt6Packages, }: stdenv.mkDerivation (finalAttrs: { @@ -68,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ unixtools.script fakeroot - wrapQtAppsHook + qt6Packages.wrapQtAppsHook autoPatchelfHook mailcap libudev0-shim @@ -102,20 +88,20 @@ stdenv.mkDerivation (finalAttrs: { gtk3 pango # Qt stuff - qt3d - mlt - qtbase + qt6Packages.qt3d + qt6Packages.mlt + qt6Packages.qtbase #qtgamepad - qtserialport - qtserialbus - qtvirtualkeyboard - qtmultimedia - qtlocation - qtwebengine - qtquick3d - qtwayland - qtwebview - qtscxml + qt6Packages.qtserialport + qt6Packages.qtserialbus + qt6Packages.qtvirtualkeyboard + qt6Packages.qtmultimedia + qt6Packages.qtlocation + qt6Packages.qtwebengine + qt6Packages.qtquick3d + qt6Packages.qtwayland + qt6Packages.qtwebview + qt6Packages.qtscxml ] ++ (with xorg; [ libX11 diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 734a49f02622..80be53583a9c 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,16 +1,13 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - pkg-config, cmake, - qtbase, - qttools, - qtx11extras, - poppler, + pkg-config, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qcomicbook"; version = "0.9.1"; @@ -24,13 +21,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qttools - qtx11extras - poppler + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtx11extras + libsForQt5.poppler ]; postInstall = '' diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 338bd5ff3f14..03b78893bf06 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,21 +1,16 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - cmake, pkg-config, - + libsForQt5, exiv2, mpv, opencv4, - qtbase, - qtimageformats, - qtsvg, - qttools, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qimgv"; version = "1.0.3-unstable-2024-10-11"; @@ -29,6 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; cmakeFlags = [ @@ -39,10 +35,10 @@ mkDerivation rec { exiv2 mpv opencv4 - qtbase - qtimageformats - qtsvg - qttools + libsForQt5.qtbase + libsForQt5.qtimageformats + libsForQt5.qtsvg + libsForQt5.qttools ]; postPatch = '' diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix index 3643a9e7af4f..40e6dbc5330b 100644 --- a/pkgs/applications/graphics/qosmic/default.nix +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -2,9 +2,7 @@ stdenv, fetchFromGitHub, fetchpatch, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, pkg-config, lua, flam3, @@ -51,13 +49,13 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook pkg-config ]; buildInputs = [ - qtbase + libsForQt5.qtbase lua flam3 libxml2 diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index fe3b679facf0..9c8beae294a3 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,12 +1,9 @@ { - stdenv, lib, + stdenv, fetchgit, - qtbase, - qttools, - qtx11extras, - wrapQtAppsHook, cmake, + libsForQt5, }: stdenv.mkDerivation { @@ -23,12 +20,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras + libsForQt5.qtbase + libsForQt5.qtx11extras ]; meta = with lib; { description = "Simple creation and editing of screenshots"; diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index 38f74d11f327..28f3f99c4946 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -3,10 +3,7 @@ stdenv, fetchFromGitHub, replaceVars, - wrapQtAppsHook, - qmake, - qtsvg, - qtx11extras, + libsForQt5, graphviz, }: @@ -31,11 +28,12 @@ stdenv.mkDerivation rec { ); nativeBuildInputs = [ - wrapQtAppsHook - qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qmake ]; - buildInputs = if stdenv.hostPlatform.isDarwin then [ qtsvg ] else [ qtx11extras ]; + buildInputs = + if stdenv.hostPlatform.isDarwin then [ libsForQt5.qtsvg ] else [ libsForQt5.qtx11extras ]; meta = with lib; { description = "Qt Visual Graph Editor"; diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index eb2f81c93984..a3b29c425fe7 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -1,17 +1,12 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, - qmake, - qtbase, - qttools, - qtimageformats, - qtsvg, - qtx11extras, + libsForQt5, x11Support ? true, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qview"; version = "6.1"; @@ -24,14 +19,17 @@ mkDerivation rec { qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; buildInputs = [ - qtbase - qttools - qtimageformats - qtsvg - ] ++ lib.optionals x11Support [ qtx11extras ]; + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtimageformats + libsForQt5.qtsvg + ] ++ lib.optionals x11Support [ libsForQt5.qtx11extras ]; meta = with lib; { description = "Practical and minimal image viewer"; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index da1e3487a5c1..8e86020d2354 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,8 +1,8 @@ { lib, - mkDerivationWith, fetchFromGitHub, python3Packages, + libsForQt5, file, intltool, gobject-introspection, @@ -20,7 +20,7 @@ gitUpdater, }: -mkDerivationWith python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; version = "0.9.36"; pyproject = true; @@ -75,6 +75,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ''; nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook file intltool gobject-introspection diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 954ddb4f407c..17402ceac1a4 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,17 +1,16 @@ { lib, + stdenv, fetchFromGitHub, - mkDerivation, cmake, + libsForQt5, libjpeg, libpng, libtiff, boost, - qtbase, - qttools, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "scantailor-advanced"; version = "1.0.19"; @@ -24,14 +23,15 @@ mkDerivation rec { nativeBuildInputs = [ cmake - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ libjpeg libpng libtiff boost - qtbase + libsForQt5.qtbase ]; meta = with lib; { diff --git a/pkgs/applications/graphics/scantailor/universal.nix b/pkgs/applications/graphics/scantailor/universal.nix index b7bdc609f61c..739878f63ccc 100644 --- a/pkgs/applications/graphics/scantailor/universal.nix +++ b/pkgs/applications/graphics/scantailor/universal.nix @@ -1,12 +1,9 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, cmake, - qtbase, - qttools, - wrapQtAppsHook, + libsForQt5, zlib, openjpeg, libjpeg_turbo, @@ -29,7 +26,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qtbase + libsForQt5.qtbase zlib libjpeg_turbo libpng @@ -40,8 +37,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; meta = with lib; { diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix index e72238dfd5b2..6f0b5189fb3a 100644 --- a/pkgs/applications/graphics/seamly2d/default.nix +++ b/pkgs/applications/graphics/seamly2d/default.nix @@ -1,23 +1,17 @@ { - stdenv, lib, - qtbase, - wrapQtAppsHook, + stdenv, fetchFromGitHub, + libsForQt5, addDriverRunpath, poppler-utils, - qtxmlpatterns, - qtsvg, libgbm, xvfb-run, fontconfig, freetype, xorg, - qmake, python3, - qttools, git, - qtmultimedia, }: let qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]); @@ -34,13 +28,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qtmultimedia + libsForQt5.qtmultimedia git qtPython - qtbase + libsForQt5.qtbase poppler-utils - qtxmlpatterns - qtsvg + libsForQt5.qtxmlpatterns + libsForQt5.qtsvg libgbm freetype xorg.libXi @@ -52,9 +46,9 @@ stdenv.mkDerivation rec { addDriverRunpath xvfb-run fontconfig - wrapQtAppsHook - qmake - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools ]; postPatch = '' diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index a1c7dee5f842..e4991aed629b 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -3,9 +3,7 @@ lib, fetchFromGitHub, fftw, - qtbase, - qmake, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -22,11 +20,11 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase fftw ]; diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix index 4622f87d9312..1974466317f8 100644 --- a/pkgs/applications/graphics/veusz/default.nix +++ b/pkgs/applications/graphics/veusz/default.nix @@ -2,8 +2,7 @@ lib, python3Packages, fetchPypi, - wrapQtAppsHook, - qtbase, + libsForQt5, }: python3Packages.buildPythonApplication rec { @@ -16,12 +15,12 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapQtAppsHook + libsForQt5.wrapQtAppsHook python3Packages.sip python3Packages.tomli ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; # veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap # it automatically -> we have to do it explicitly diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 692463174da6..8c6f7f854d42 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -1,20 +1,15 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - qmake, + libsForQt5, poppler, pkg-config, libunarr, libGLU, - qtdeclarative, - qtgraphicaleffects, - qtmultimedia, - qtquickcontrols2, - qtscript, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "yacreader"; version = "9.15.0"; @@ -26,20 +21,21 @@ mkDerivation rec { }; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ poppler libunarr libGLU - qtmultimedia - qtscript + libsForQt5.qtmultimedia + libsForQt5.qtscript ]; propagatedBuildInputs = [ - qtquickcontrols2 - qtgraphicaleffects - qtdeclarative + libsForQt5.qtquickcontrols2 + libsForQt5.qtgraphicaleffects + libsForQt5.qtdeclarative ]; meta = { diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index c6a08a161f98..64a68d26f105 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "136.0.7103.92", + "version": "136.0.7103.113", "chromedriver": { - "version": "136.0.7103.93", - "hash_darwin": "sha256-6u+hJWBZZlqjc81Hs/5dL6csWP3QiWzQvfW3O+bfaaA=", - "hash_darwin_aarch64": "sha256-b4MfxITtIwqV41Jc5Hv42WgOt1+U6dNjIvSDG4VNqw8=" + "version": "136.0.7103.114", + "hash_darwin": "sha256-RAWarx2vOh23XKvhNwAkCgG9swGxX1dw8LaqIQBPJFo=", + "hash_darwin_aarch64": "sha256-TZcO5RiRW0dN0+jBArclBkIvYSSirhmPgJXswfTufgk=" }, "deps": { "depot_tools": { @@ -20,8 +20,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "cb81a4cc5087a8303a6c8827ee2b80b71d26e334", - "hash": "sha256-mySbSMnbM/KBEGnOyJKJMr4WD4PNgIDDeNK0fTPfcnI=", + "rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71", + "hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=", "recompress": true }, "src/third_party/clang-format/script": { @@ -96,8 +96,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "ecc378cc61109732d174d6542c41fd523c331b13", - "hash": "sha256-+Cgf3OocFbD2rL4izA/0Z0qjWQiIUwiTW/z0cW0pGb0=" + "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e", + "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -241,8 +241,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "e793e21a020b53a66ae13ef8673f80b8e8a73746", - "hash": "sha256-BHD/XVQquh9/cr+Kv43lKGFReHy4YbQIAJq5792+4Sw=" + "rev": "4a53cbe7a1270c91ec60903ee792de658453becb", + "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -791,13 +791,13 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "b6178615ecae6d84b347cb7a1812cad9afca51f2", - "hash": "sha256-Gc7huCu+d5XBwI420V1nutKeJpqBfvJ6fhh5zpRtMw4=" + "rev": "5297e56d91816747d539abca52b578e5832135f0", + "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=" } } }, "ungoogled-chromium": { - "version": "136.0.7103.92", + "version": "136.0.7103.113", "deps": { "depot_tools": { "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", @@ -808,16 +808,16 @@ "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=" }, "ungoogled-patches": { - "rev": "136.0.7103.92-1", - "hash": "sha256-mZ/qG7tWKJH1pGE4Onw9P50/WBYva7bvKeAiy4Ckjd0=" + "rev": "136.0.7103.113-1", + "hash": "sha256-+xQvBkwza1QLwWgijoMnih2k2v0I7cBiAjxOeqMf6A0=" }, "npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "cb81a4cc5087a8303a6c8827ee2b80b71d26e334", - "hash": "sha256-mySbSMnbM/KBEGnOyJKJMr4WD4PNgIDDeNK0fTPfcnI=", + "rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71", + "hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=", "recompress": true }, "src/third_party/clang-format/script": { @@ -892,8 +892,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "ecc378cc61109732d174d6542c41fd523c331b13", - "hash": "sha256-+Cgf3OocFbD2rL4izA/0Z0qjWQiIUwiTW/z0cW0pGb0=" + "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e", + "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -1037,8 +1037,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "e793e21a020b53a66ae13ef8673f80b8e8a73746", - "hash": "sha256-BHD/XVQquh9/cr+Kv43lKGFReHy4YbQIAJq5792+4Sw=" + "rev": "4a53cbe7a1270c91ec60903ee792de658453becb", + "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1587,8 +1587,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "b6178615ecae6d84b347cb7a1812cad9afca51f2", - "hash": "sha256-Gc7huCu+d5XBwI420V1nutKeJpqBfvJ6fhh5zpRtMw4=" + "rev": "5297e56d91816747d539abca52b578e5832135f0", + "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=" } } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 35b5bedcf2c9..d48b715ff3c7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -417,11 +417,11 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-ae9mtP5at9b3EB8aaBcjomL3ahr6ta+wm8jv9reQW20=", + "hash": "sha256-erQUWFpGqnxtU88AaD4Lq0OQyhOg0gXoFBMf6wQC1Fs=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v3.7.0", + "rev": "v3.8.0", "spdx": "MIT", "vendorHash": "sha256-sjEgBLwk/dYUmq+kL0PtamEukXgC9rzeyTT87HK0Y8E=" }, @@ -552,13 +552,13 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-ryNGeQ9Ac81iQo+iaqao2dvZ30xYy9TGMOqrPldY5/8=", + "hash": "sha256-KYCyqNKqW/I4q1JHVK4rD9H8/D60IL7H9cCgz6wLg5Q=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.20", + "rev": "v3.10.21", "spdx": "MIT", - "vendorHash": "sha256-6kK9FMT+Ew6RBzNNR9OxYaCz1NjzKRv75Aa9l+p+B5E=" + "vendorHash": "sha256-C1MT4mA7ubh1mN4+HO0bwMpjVHjDIG6UXZI6gvXHFZE=" }, "hcloud": { "hash": "sha256-DSTxn4t6YWxRBimMlqkP1VLqqxk1Kox+h0u9i9rSdhc=", @@ -1219,22 +1219,22 @@ "vendorHash": "sha256-K/44Jio2a1kKYuyI6o/5wwMNRaZvx9zrNEC85v56xdU=" }, "spacelift": { - "hash": "sha256-9TYSIIIqRSOFGbGv6mUgGyvcUb+PoMJ3IAHQFeRsSZ8=", + "hash": "sha256-uRqZ5GRCP+oxm42cVVUdwUUixKLZbqfd6PjohbF7wNQ=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.21.0", + "rev": "v1.22.0", "spdx": "MIT", "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20=" }, "spotinst": { - "hash": "sha256-dQeOucXwHW0GeZ2irKbdx+GvnjuA1PKnW+RFjvjwNc0=", + "hash": "sha256-gRR0Ie27Wsc8Hf4u5gto2tkuZp/VoPbKBfDcJYN4W9A=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.216.2", + "rev": "v1.219.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-STIPYBMj6r630/J71fAeLTkrvop/8u7gToGcijopqCo=" + "vendorHash": "sha256-M6MkqX8iVeP9IpLSLfkl7cMDDtO1VLw1YpODd0zPJvU=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1264,20 +1264,20 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-HdK4YOrOoaivdYOHBTcOjjx4kI7kAITWY39aZ6WFpgU=", + "hash": "sha256-P/icRnqd24To3n/WCS666n3slQwt7eNUpt9aD7c9GGU=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.0.9", + "rev": "v3.0.10", "spdx": "MPL-2.0", "vendorHash": "sha256-S3SBp17+qqA64tWydD5DYc9KahycJ+qDrdXvFwu6Lbc=" }, "sysdig": { - "hash": "sha256-bvYbLU1MgBcgu/koj/cl30rI1WlTVKJybP+vC7H54v0=", + "hash": "sha256-fkMVPPKqUQdp/JSPByV3yuMaY3SKVy75u1ljAL9bEZc=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.54.0", + "rev": "v1.56.1", "spdx": "MPL-2.0", "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s=" }, @@ -1336,13 +1336,13 @@ "vendorHash": null }, "time": { - "hash": "sha256-namFdrrCw5/pAb1yvTmvli+9jewGzlVaa9TjS9Rt48g=", + "hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.13.0", + "rev": "v0.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0o7WKJm4IesxparbbWhzXJNL80qxCUkJvQFypMobR1A=" + "vendorHash": "sha256-4XCCzB5Va1jtTn5vgIVKjQq4g8sKe0SIw3ynZExz/Vg=" }, "tls": { "hash": "sha256-t/nUt0deyckP8opNiPZc5rbC1SleZwkrFXuQFw47sqA=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b5435fb839bb..3f1a045b536f 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -194,9 +194,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.11.4"; - hash = "sha256-VGptJz+MbJ8nJRGUW9LzX6IDLYbjI5tK40ZhkZCGVf0="; - vendorHash = "sha256-pDtWGDKEnYq4wJYG+Rr5C1pWN/X92P+wvHrNm0Ldh+8="; + version = "1.12.0"; + hash = "sha256-+EjsKl13kx3uJ50TrZIJLrvf4RBWDJsp1PD1dwtP6XA="; + vendorHash = "sha256-zWNLIurNP5e/AWr84kQCb2+gZIn6EAsuvr0ZnfSq7Zw="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index 400aed42ca4c..7eb097556736 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "svxlink"; - version = "24.02"; + version = "25.05"; src = fetchFromGitHub { owner = "sm0svx"; repo = "svxlink"; tag = version; - hash = "sha256-QNm3LQ9RY24F/wmRuP+D2G5of1490YpZD9bp6dZErU0="; + hash = "sha256-xFtfHkLnStG730o5tGATLLZvcqYYpR+7ATUdib7B2rw="; }; cmakeFlags = [ diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix index f078176f0529..968206813bb0 100644 --- a/pkgs/by-name/ab/abctl/package.nix +++ b/pkgs/by-name/ab/abctl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "abctl"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "airbytehq"; repo = "abctl"; tag = "v${version}"; - hash = "sha256-O+ABjageccJudXtO5wUYLIT/kI04f68RLW0B7d//jdw="; + hash = "sha256-ZM0ae4Oiz/q4KSkxVxEXPe6oJa5fsNWzw+fX5hobc1c="; }; checkFlags = @@ -33,7 +33,7 @@ buildGoModule rec { in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-4pi5EX7N4zf72rez2aClFezgnT70A7Crd2YTasl5CvU="; + vendorHash = "sha256-9djIgVLPQmqEzDqUBipmXA8DlwYx9D4QlMna26vyJKI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json index a8a33ab6ff92..4e2cb0c59590 100644 --- a/pkgs/by-name/an/animeko/deps.json +++ b/pkgs/by-name/an/animeko/deps.json @@ -654,18 +654,18 @@ "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" }, - "com/strumenta#antlr-kotlin-gradle-plugin/1.0.2": { - "jar": "sha256-neZCtD2Y8AS8TX0wkpVdsuBaL8XKa8Q+tBVqNZVVkos=", - "module": "sha256-t1m4LoiMovlmQAXj1oy58wM2Vdv7KBrG0yqf6XxQ3c4=", - "pom": "sha256-MfifVba08ApogkXzkhvTzCO4Z9PizyAgYSRplmhZPJ0=" + "com/strumenta#antlr-kotlin-gradle-plugin/1.0.3": { + "jar": "sha256-5VI7i8hPUYGRUEHSNsdTuaemtxM22yon7eQcRAYe81U=", + "module": "sha256-4AgFnvxtTXyXhNBV7cL8+I0FalWxjLeP1n+hN52K6Mc=", + "pom": "sha256-6aXHG2HPFEq+C0vhR9kFy9XibQe5xL3ocPk5aqj4tAU=" }, - "com/strumenta#antlr-kotlin-target/1.0.2": { - "jar": "sha256-PNB1k/m4DnGNobdHHpfbjjuxU1hTkQk5qnvq+hlpFHQ=", - "module": "sha256-tzg2oj8tHSx6Zij3FLPcGB+QdvuWCRabJ/QwM6bz5AE=", - "pom": "sha256-CH31pxn7CrLgjHvQjgtP8YccIHqWvuz3Sz5sOgKO2UI=" + "com/strumenta#antlr-kotlin-target/1.0.3": { + "jar": "sha256-lqRnHwdcq2Cs3wfpebaekNprmlbgT9gtCgJwK71A5fU=", + "module": "sha256-bIyr2lyJg151FjpUGn4oXUqjFa1uic7pRFmd9DqHn0A=", + "pom": "sha256-LYVuemGj8sPqq2la0+VIgZmMhZ2VvibtMM3mdIjQA7M=" }, - "com/strumenta/antlr-kotlin#com.strumenta.antlr-kotlin.gradle.plugin/1.0.2": { - "pom": "sha256-k9f3Q5oTfttR/u3P53O0DEMrCq215CigG8erzV8Vn5E=" + "com/strumenta/antlr-kotlin#com.strumenta.antlr-kotlin.gradle.plugin/1.0.3": { + "pom": "sha256-QexbCkIylibd1Tm6buHXXt6NhjhmGswhCt4ks7uH7IU=" }, "com/sun/activation#all/1.2.2": { "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44=" @@ -950,28 +950,28 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/compose/hot-reload#core/1.0.0-alpha03": { - "jar": "sha256-sXY83+E7TDiJLkTqUbKyBEzWdB73v7ppAeWSttDPdss=", - "module": "sha256-6B2a5ZhgmkSrE5l7lgnFu/hU0j/GBP3/Zj071dhUwEw=", - "pom": "sha256-ZDkxOX0cJjb3BJdlmSk5SKNt4II5RquXUz4atBBD7hM=" + "org/jetbrains/compose/hot-reload#core/1.0.0-alpha05": { + "jar": "sha256-sxLfmlRSkDi4835keehBs5dF9iZbSYE2d9BlliJ/O94=", + "module": "sha256-rqsb+JwLN0x2rnXYEd4HQSXZh2oREH8ZnUwreznCZrI=", + "pom": "sha256-C5YOLk1d1uqJ0Jl96xqer/QulPf6QNpOYc9mKTaBiWo=" }, - "org/jetbrains/compose/hot-reload#gradle-core/1.0.0-alpha03": { - "jar": "sha256-ArOlcPFBb10zQws+/DO6X6uHcr2bAySJnFMpJg+iXQg=", - "module": "sha256-TL4UEllYyAE/juhiFS/rRWTltEFDrb3SuKaqScQTDe0=", - "pom": "sha256-yVcTDcpxhlk+k6lBjKJJwHSEmncZ7cWfNKvOVqDNh9M=" + "org/jetbrains/compose/hot-reload#gradle-core/1.0.0-alpha05": { + "jar": "sha256-7kWrwVHX4AywZfkDccecD7DuVRxnlshjIRIpJR7Ri5o=", + "module": "sha256-7/zPQpnAW+lcRthgfOAxMPOVlVDugysS8Ehte+Yi6ZM=", + "pom": "sha256-CAukVwfeQWzNqVJ8E4D2clG7d0KK2J/8RIy2iVtBR40=" }, - "org/jetbrains/compose/hot-reload#gradle-plugin/1.0.0-alpha03": { - "jar": "sha256-kT5z6wT3AoGlRRQW5/1KiZD7lJdsvf61zs5UrcPIADw=", - "module": "sha256-4vhcxiwri2vlC3qx79MSLSFBXi19h4xZ4NrMdIMVVIw=", - "pom": "sha256-H/FOLefyU9o7v15vv4DjGgztd39qvRnovBvonqtRYkA=" + "org/jetbrains/compose/hot-reload#gradle-plugin/1.0.0-alpha05": { + "jar": "sha256-oTw5Byo4IyBOHZ9CXWjZbMUT6+9cYjyKbsc8bhdXgqw=", + "module": "sha256-weJpoNnKRyKDQa8UHzm93CJ06qQcn8q79Cf8j3EBf5k=", + "pom": "sha256-KBm/7ol3Qev1iRsgkoqwiAyXwzGeuyQYhrrnDDQBVDM=" }, - "org/jetbrains/compose/hot-reload#orchestration/1.0.0-alpha03": { - "jar": "sha256-tJSgulpBLpxImvtn5FUj5QBnOczDsnLotmZJi5nxazQ=", - "module": "sha256-VD+3LEWr2cBGKPIxa17H8GUVbxmme9Bqr+RA3lKBMsU=", - "pom": "sha256-fsMmjEdZdtzGHnR3idvcj8Ng+bECO+crxahWdUGGt98=" + "org/jetbrains/compose/hot-reload#orchestration/1.0.0-alpha05": { + "jar": "sha256-g5JIQknG2u2ux4aSIz0tquo3mRuF6zhCbzifKaH3zhg=", + "module": "sha256-HF7Cr+l1CoQ3Utktjmqcz8IWRtBxtfU5N0jGNiNZl5w=", + "pom": "sha256-46cK348/uX/OabYXAUUiGcMGj0MbGJnkr7QWPRjNeQY=" }, - "org/jetbrains/compose/hot-reload#org.jetbrains.compose.hot-reload.gradle.plugin/1.0.0-alpha03": { - "pom": "sha256-ynIJvP9Ake+iyJdFtsYg/Kt63h9qiM3exgkxsqStie4=" + "org/jetbrains/compose/hot-reload#org.jetbrains.compose.hot-reload.gradle.plugin/1.0.0-alpha05": { + "pom": "sha256-0LBsmU0E8W1HkDDuJ4uIBvVYPLn4zEvAGUhSWH/p0dY=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", @@ -1634,14 +1634,14 @@ "module": "sha256-aRc2CEF6IRPm+mr+t7RUCyDfcM/aP6Fsc6qk+nAv+tM=", "pom": "sha256-QOr9s+epasxcFR3pzL7BKFDy37XL53Ph90zrU2JVggM=" }, - "com/strumenta#antlr-kotlin-runtime-jvm/1.0.2": { + "com/strumenta#antlr-kotlin-runtime-jvm/1.0.3": { "jar": "sha256-Hy+1MJxqlAq1K0GMHWN055qy79+mqcYbPd16f5VgROQ=", - "module": "sha256-ZOXc7bM5dAyT31zG6rPoWuT/Aj/B46AqnkzPtM4cD1Y=", - "pom": "sha256-/0wnuIMb7JgQPTarjPSKYzVCP64knOwQKFBEWOeDiBc=" + "module": "sha256-Q3Q+dXyRTUnqniw40PdBVjum8IGTNXuoK5VXi9wS+OU=", + "pom": "sha256-1ASIHsVa6sEEiWDIm8iKxJtk9IaGa5/k2Heo5vMsiGI=" }, - "com/strumenta#antlr-kotlin-runtime/1.0.2": { - "module": "sha256-/O5noEMQ823oFiypQt8rH+rqYf+SWEoJ3KXnYLYkGZA=", - "pom": "sha256-JRjb+jPn3pMMJ1dBpUTwPo86/BRnCMEGvIxRcKVBIPU=" + "com/strumenta#antlr-kotlin-runtime/1.0.3": { + "module": "sha256-Sw9znKgtPCPKsNUbt1FZMMu15geYvGmkda6stdgtdfM=", + "pom": "sha256-z1Sha4i+Muw+HXsuHfqNl60Sif/MdmtzLMW6sOu4q7k=" }, "com/sun/activation#all/1.2.0": { "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" @@ -2557,19 +2557,19 @@ "module": "sha256-9oLYatpLCjX0kvltrnryeLTkVQRoj6CWOi+F9UmmsCo=", "pom": "sha256-YdA6m9aCwFJtOkRsur7DUUKl0W+N9aG9zTpa4d6f6OU=" }, - "org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha03": { - "jar": "sha256-cBMG+ehDNn8KOONndw3kXCGyKsQDOuYzq28EmlrbOCs=", - "module": "sha256-MJrWoqxCI13Bv5SiLm4ydv70iLXDud5MMIkGCnDXnuM=", - "pom": "sha256-rfc6kmMv+o3HXRIBQ87jycO3uTidd7ZiHxpeKxfnI9o=" + "org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha05": { + "jar": "sha256-+2p7PMWZNC8rUApqQ17M8vue1B2pcsfUgCzbSn4DFGI=", + "module": "sha256-XphVM5YuX4vKHnPq7LRw2S0LyC08/H9RydVNB8foCmc=", + "pom": "sha256-6mjs2xBA1jFGN8MN7iTkMqMHcLoDNh9IAIw6AB+ytOs=" }, - "org/jetbrains/compose/hot-reload#runtime-api/1.0.0-alpha03": { - "module": "sha256-v6USCSOJEC7uxPFlokR2i5j7QpCm/yJmYt76w6/8kH4=", - "pom": "sha256-U/KEvIGlcvtWlORFWvxGAc2GdyOzVdbLvuqdZAzahdc=" + "org/jetbrains/compose/hot-reload#runtime-api/1.0.0-alpha05": { + "module": "sha256-VpDI/Ph2E+SAxgPr7QMKRGlUzS3K+9dk9zE1u+eP8DM=", + "pom": "sha256-7dli33dNo1SH/dpP7yi7G1gQj4eeQwpMFQ+oWA4xgqE=" }, - "org/jetbrains/compose/hot-reload#runtime-jvm/1.0.0-alpha03": { - "jar": "sha256-s9L61JESmSI/pmo/WxGFQQasUVsqjM0vYI2C2L7Z0KE=", - "module": "sha256-M1PgB201Bp9n0oy+p/afZH/jJBL3IJ85/pAZmdMQoJI=", - "pom": "sha256-ei0jfOFBdd94w134qn0jfG4X+DCou9jppQyG91GlKGY=" + "org/jetbrains/compose/hot-reload#runtime-jvm/1.0.0-alpha05": { + "jar": "sha256-238TALVeJgQ639D38TzROTpKqD3twn6kw6AJRiGUriw=", + "module": "sha256-LBG1MeaMgYj7+H0QTIumK3trdF5wPNaCvqLcdiG8YXg=", + "pom": "sha256-Qx1LGtWuX0mxy0TAYzZR6WmPpzDjcKR/iziowomZt1Q=" }, "org/jetbrains/compose/material#material-desktop/1.8.0-alpha04": { "jar": "sha256-Jigh7AXNWziN0f9Z2e9q/aE1jUyewBXzjOMf90J7Ngg=", @@ -3357,49 +3357,49 @@ "module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=", "pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk=" }, - "org/openani/mediamp#catalog/0.0.25": { - "module": "sha256-RLBggEOm3icmkUsO/3gynkyUTCglWj9gEsSmtvTcw1A=", - "pom": "sha256-IpCOObVhNrYeZR9JM/SUAlsRU/dQHI1BEOliUP4bLvw=" + "org/openani/mediamp#catalog/0.0.26": { + "module": "sha256-I16xb6VSWCPEXR00K6Pqe+1Ord4hoVegIdFJCjiw70I=", + "pom": "sha256-itzCsDj32fyeFUTVTKskJnG7J9I1ketiWnzmCOCjNfc=" }, - "org/openani/mediamp#mediamp-api-desktop/0.0.25": { + "org/openani/mediamp#mediamp-api-desktop/0.0.26": { "jar": "sha256-wq88zxU6os+DET2GQqnWf7IFQisk8nQfuOMm7yaRhxg=", - "module": "sha256-MXt+vTcFPagmRz20p8Yc3Hfvv6IxnBbEUFbhTRLWAAc=", - "pom": "sha256-xpu0PHOKwpHlQmT55zDFZqkCh3DSNcs+T3O8B7bV4Hc=" + "module": "sha256-Robr2Hjhc9Mucq0MlPX9uDbPTGU37OM+EQMyCuyGCFM=", + "pom": "sha256-rYSUUSwrno45hElP5s65pi+HpfySFdniNZAgLsxFs5Y=" }, - "org/openani/mediamp#mediamp-api/0.0.25": { - "module": "sha256-GGZ5gkP96zF4I9RqwLsTLCVXabkoXY/29o96THCNUnM=", - "pom": "sha256-NvLZVpFI9kzup4+s1Rt8f2iRF5IvLEtRs8I36T1VQq4=" + "org/openani/mediamp#mediamp-api/0.0.26": { + "module": "sha256-67z9qC1RG4iuQ4LkN3hZX8nU/RlqJdB5kgR4WZfdAV4=", + "pom": "sha256-/YHwjj6d4vOu5v9yr9ctEAV7J7aIQPtF+Nc5Zy5Z7MI=" }, - "org/openani/mediamp#mediamp-compose-desktop/0.0.25": { + "org/openani/mediamp#mediamp-compose-desktop/0.0.26": { "jar": "sha256-oC7g3ItyOR0dT7B8L1ncqpQcYYmkC5CbbgKfmXBbCxQ=", - "module": "sha256-wXl1ZiDOfKEwiNMl/6xvFicuwbwIinx8Br7t+wq6b0w=", - "pom": "sha256-xHDUSQ6Q9AYoh5uMBnqClJOLnjQl9/+EAk5Tr83+Glw=" + "module": "sha256-KUPXp03ZHWwJoFW9Yv3G7qZ6KVnzu9kXaHko0sCwa1M=", + "pom": "sha256-gCRVtSffFrskMft9QoPlP00xAkx5fO0RufLK6F+XDPQ=" }, - "org/openani/mediamp#mediamp-compose/0.0.25": { - "module": "sha256-lnwjp0GSCUlcXdOVXXpREfdwXSCIHop+12vL/4scNkY=", - "pom": "sha256-ypU2W27nTUDFHU5l2RQmwA3qBomypDxcjHK6RyCTzRY=" + "org/openani/mediamp#mediamp-compose/0.0.26": { + "module": "sha256-GourAD3L6fbG/2vk6sAcWFbAixi8JMT8VS4hLM5vKGg=", + "pom": "sha256-kDFj3l1wpEcOGnBM5+auo4ir1muIHfb9NW9PaZ8exG8=" }, - "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.25": { + "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.26": { "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=", - "module": "sha256-+L+8bBK8EWYmgLCZruaHln/EBMG5yHUU6O+Hfc1ydC8=", - "pom": "sha256-rOZygEVU3rbOo93jZUviPVG+UW9ugV7q7AlviGknlaQ=" + "module": "sha256-5IKmn1mlfajGIvv66eSr8SBOU+V5dcndh+FlU8gf5nw=", + "pom": "sha256-rWfE+eWilDOkDWU2xLzA+qv2x8/dF+Qwhet7lGVTnd0=" }, - "org/openani/mediamp#mediamp-source-ktxio/0.0.25": { - "module": "sha256-tjK6VgNDEW7ql4BkFaqp38X9VAvBaptZPneZpo7Qz8A=", - "pom": "sha256-N3VH1d/xULwg/i48Inp4GfJ+AR7Btm7S9ozveI/FSok=" + "org/openani/mediamp#mediamp-source-ktxio/0.0.26": { + "module": "sha256-YT7EHwxB69StjLsu3EmPYhb4MWHJLxLfJ7CSy+X7INk=", + "pom": "sha256-Fd7cpjCUJnGnofv2uq3DqePrH00ahYT+f96hVi3Grlc=" }, - "org/openani/mediamp#mediamp-vlc-compose/0.0.25": { - "jar": "sha256-2OhSi5wEWMQNbhNLLZ+FRVibCCccHx/7UV6eWML9h34=", - "module": "sha256-Wr1cLaZulaLEs2xORbkzLEjvka5o2A7gXHoLBwWKJkQ=", - "pom": "sha256-LXuOr48ZOQKU+/PrgMw/SOO9nhB6ghh54fyI9hraiNc=" + "org/openani/mediamp#mediamp-vlc-compose/0.0.26": { + "jar": "sha256-FpRyBToA2qz5SNOQPmTDKr+RO/AZuco60pGvUHueTLQ=", + "module": "sha256-0RYTOM3zHsvu9VY9GIaIUYXyZhIWJGh+qVbt/QuSoLY=", + "pom": "sha256-i1WxsUV+u/uKjTURro7eR08gU55kI2G+v31g48BCTpc=" }, - "org/openani/mediamp#mediamp-vlc/0.0.25": { - "jar": "sha256-6xtrAnFEE8WkO/BF+vfGLKFpog1va7RwUgS3YR9xuaw=", - "module": "sha256-5amJLVbqLGiq0bSZA1MN0L9iQ46/6q7MrKjTN+rnfzs=", - "pom": "sha256-FWH7XzZbM5nOzozdJwsFiBhGFsGAhPc7fs/SSjTL9xA=" + "org/openani/mediamp#mediamp-vlc/0.0.26": { + "jar": "sha256-6kpP5IZcVMPP+YlO5zSgYaMhi0LpbLGSarofI17Qviw=", + "module": "sha256-19aWYPuBD+jGAxH+vYjlUUmqGnl+XGs+jguNlO3724M=", + "pom": "sha256-gO7O6O/LGGPEvgOCoQzgcrqAdSWesJqc223ZVlC2yXg=" }, - "org/openani/mediamp/catalog/0.0.25/catalog-0.0.25": { - "toml": "sha256-lT6UFnmhYD/YDIKLIdbjm7HyEJ0KdyhoTYEvWzcw0Ic=" + "org/openani/mediamp/catalog/0.0.26/catalog-0.0.26": { + "toml": "sha256-OuAXWWvPwKdSS1Xx4zrv4tcOkzYl5BpsbwQb5+gX88g=" }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index aa09ff6e5358..0998722307b0 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -79,20 +79,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "animeko"; - version = "4.9.1"; + version = "4.10.1"; src = fetchFromGitHub { owner = "open-ani"; repo = "animeko"; tag = "v${finalAttrs.version}"; - hash = "sha256-NmvZR0NSo9y3vvdLqtyVKUlhCGq4Qu7Pbz/7Ufvf7rQ="; + hash = "sha256-sFEq6tJfADH5x8+wdQ9T89awT7/Qx2RV5r+cND3J0iw="; fetchSubmodules = true; }; + # copy currentAniBuildConfig from upstream release asset to local.properties postPatch = '' echo "jvm.toolchain.version=21" >> local.properties + echo "ani.dandanplay.app.id=2qkvdr35cy" >> local.properties + echo "ani.dandanplay.app.secret=WspqhGkCD4DQbIUiXTPprrGmpn3YHFeX" >> local.properties + echo "ani.sentry.dsn=https://e548a2f9a8d7dbf1785da0b1a90e1595@o4508788947615744.ingest.us.sentry.io/4508788953448448" >> local.properties + echo "ani.analytics.server=https://us.i.posthog.com" >> local.properties + echo "ani.analytics.key=phc_7uXkMsKVXfFP9ERNbTT5lAHjVLYAskiRiakjxLROrHw" >> local.properties + echo "kotlin.native.ignoreDisabledTargets=true" >> local.properties sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties + substituteInPlace gradle/libs.versions.toml \ + --replace-fail 'antlr-kotlin = "1.0.2"' 'antlr-kotlin = "1.0.3"' ''; gradleBuildTask = "createReleaseDistributable"; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index bbc228e6f17d..b6ec6f336c7e 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -3,18 +3,19 @@ buildGoModule, fetchFromGitHub, installShellFiles, + nix-update-script, stdenv, }: buildGoModule rec { pname = "argocd"; - version = "2.14.10"; + version = "2.14.11"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-Z+xSA0LrvXHHmNg7+i53Y1mSYnLYURZUglXRKvkld14="; + hash = "sha256-KCU/WMytx4kOzlkZDwLfRRfutBtdk6UVBNdXOWC5kWc="; }; proxyVendor = true; # darwin/linux hash mismatch @@ -26,25 +27,27 @@ buildGoModule rec { ldflags = let - package_url = "github.com/argoproj/argo-cd/v2/common"; + packageUrl = "github.com/argoproj/argo-cd/v2/common"; in [ "-s" "-w" - "-X ${package_url}.version=${version}" - "-X ${package_url}.buildDate=unknown" - "-X ${package_url}.gitCommit=${src.rev}" - "-X ${package_url}.gitTag=${src.rev}" - "-X ${package_url}.gitTreeState=clean" - "-X ${package_url}.kubectlVersion=v0.31.2" - # NOTE: Update kubectlVersion when upgrading this package with - # https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22k8s.io%2Fkubectl%22+path%3Ago.mod&type=code - # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code - # Will need a way to automate it :P + "-X ${packageUrl}.version=${version}" + "-X ${packageUrl}.buildDate=unknown" + "-X ${packageUrl}.gitCommit=${src.rev}" + "-X ${packageUrl}.gitTag=${src.rev}" + "-X ${packageUrl}.gitTreeState=clean" ]; nativeBuildInputs = [ installShellFiles ]; + # set ldflag for kubectlVersion since it is needed for argo + # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code + prePatch = '' + export KUBECTL_VERSION=$(grep 'k8s.io/kubectl v' go.mod | cut -f 2 -d " " | cut -f 1 -d "=" ) + echo using $KUBECTL_VERSION + ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v2/common.kubectlVersion=''${KUBECTL_VERSION}" + ''; installPhase = '' runHook preInstall mkdir -p $out/bin @@ -64,6 +67,8 @@ buildGoModule rec { --zsh <($out/bin/argocd completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Declarative continuous deployment for Kubernetes"; mainProgram = "argocd"; @@ -74,6 +79,7 @@ buildGoModule rec { shahrukh330 bryanasdev000 qjoly + FKouhai ]; }; } diff --git a/pkgs/by-name/ba/baudline/package.nix b/pkgs/by-name/ba/baudline/package.nix index 92bedea2b83f..6dec714c2e4f 100644 --- a/pkgs/by-name/ba/baudline/package.nix +++ b/pkgs/by-name/ba/baudline/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz"; - sha256 = "09fn0046i69in1jpizkzbaq5ggij0mpflcsparyskm3wh71mbzvr"; + url = "https://web.archive.org/web/20230130224632/https://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz"; + hash = "sha256-RG8QPSXHo2qfOEn6eWWTh0ilg44tI1KyjXFm+SYnKKM="; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://www.baudline.com/baudline_${version}_linux_i686.tar.gz"; - sha256 = "1waip5pmcf5ffcfvn8lf1rvsaq2ab66imrbfqs777scz7k8fhhjb"; + url = "https://web.archive.org/web/20230130224632/https://www.baudline.com/baudline_${version}_linux_i686.tar.gz"; + hash = "sha256-2A13FyUl4NNWzRConw6gGjBaHxCXYlwtgxbz0ARgI28="; } else throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/bi/bibiman/package.nix b/pkgs/by-name/bi/bibiman/package.nix index 5cf56994b93c..5cecc77e6938 100644 --- a/pkgs/by-name/bi/bibiman/package.nix +++ b/pkgs/by-name/bi/bibiman/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "bibiman"; - version = "0.11.4"; + version = "0.11.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lukeflo"; repo = "bibiman"; tag = "v${version}"; - hash = "sha256-LYoo3j3On4oCANg0acsyL7knFhOjKW0/zBVyK20knDs="; + hash = "sha256-nyONqQmS8MvgMrq6XIuMjc8FkP9wKQu+EVnQUcSAjEo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VYG9KshZ4/MIgtwmfJ+sa8PKj9dgPuNgCUgqF+XRiMA="; + cargoHash = "sha256-fdUCrf6gdZZtrL93GQMnA+4ZJ8qkjsBKJJN5u4VKE1w="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 0d458da4f6b9..0337d6312945 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; - version = "1.46.3"; + version = "1.46.4"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; tag = "v${finalAttrs.version}"; - hash = "sha256-MfBlJ7SokBKkAkmBSj4NsE2hKVqYeGN3z/xiq2VK3vU="; + hash = "sha256-YoTR/rj/edg2KQhPRoihA38V4XM5EM5oJtLIH6zR/38="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QJJxZDRJZkg/A1NjTBj7KpcfO8VUnXXcJT9knguAf/g="; + cargoHash = "sha256-IFDKHsBTJFEmQ6FUG7yJmAEAVrzMvY9qbWQTnvUg274="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/bs/bstone/package.nix b/pkgs/by-name/bs/bstone/package.nix index 667d52a09088..d49537671f82 100644 --- a/pkgs/by-name/bs/bstone/package.nix +++ b/pkgs/by-name/bs/bstone/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bstone"; - version = "1.2.15"; + version = "1.2.16"; src = fetchFromGitHub { owner = "bibendovsky"; repo = "bstone"; tag = "v${finalAttrs.version}"; - hash = "sha256-L07GfqeQPTWGQb+vOOXNgbYLYpxQ2OHFnCLWd4uSlBw="; + hash = "sha256-6BNIMBbLBcQoVx5lnUz14viAvBcFjoZLY8c30EgcvKQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json index ff094b700c3e..01590ff23086 100644 --- a/pkgs/by-name/bu/buck2/hashes.json +++ b/pkgs/by-name/bu/buck2/hashes.json @@ -1,11 +1,11 @@ { "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh" -, "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs=" -, "buck2-x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo=" -, "rust-project-x86_64-linux": "sha256-UbC43xyEIIT76K2OHnp4lBo3saoTeuZxYDRieEry+tE=" -, "buck2-x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E=" -, "rust-project-x86_64-darwin": "sha256-mp8xR4bFb9esN3QABG03H07t09caMNQLKOqxdg8+CEw=" -, "buck2-aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs=" -, "rust-project-aarch64-linux": "sha256-rwT6mO0lyRnyCfdUtYcdelJArHZCHP6K/A//n+yLtgA=" -, "buck2-aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M=" -, "rust-project-aarch64-darwin": "sha256-JYQiCEcplVHTK2iPLDBpGyyoMXU5B0/P/r8VCN1IDko=" +, "_prelude": "sha256-eU4EZ9OqJVUH/YPFctJZM+KZK70IEslr2qLUUvz3ctM=" +, "buck2-x86_64-linux": "sha256-r/5txsY7/i0fQaQsH40YdAhSD/bXtr5aGlAuxaOs8jg=" +, "rust-project-x86_64-linux": "sha256-XJFhaxJvOklMMO3emtdJS4zNu989HLCIU9qBP31XpCo=" +, "buck2-x86_64-darwin": "sha256-9SW0xn7w2dH81oHwze/ysnQyrIAgu8+1WJuXMmxslFo=" +, "rust-project-x86_64-darwin": "sha256-MvYv96OtOU7NEZKXf3gDvCjEcbegLI+1HFN7XBdPAXA=" +, "buck2-aarch64-linux": "sha256-wlmkgWdotvqxmflzoJG266weCsjxtM0mVO0xf7vKVr0=" +, "rust-project-aarch64-linux": "sha256-7zhO+s8LOuDj5ysyADkfqRIZiOG9ewBtfcB43sPfVc4=" +, "buck2-aarch64-darwin": "sha256-0bNtPX8TLTCxf7rEeiUYtJUbzRmgRdgHrv98mmmM/Rg=" +, "rust-project-aarch64-darwin": "sha256-a4OLLLYJjTBskXfB7OWqULPkV5amgDEHudJKRLGwuAU=" } diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix index 38a9ac04771b..9ce373f75736 100644 --- a/pkgs/by-name/bu/buck2/package.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -44,7 +44,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2025-01-02"; + version = "2025-05-06"; # map our platform name to the rust toolchain suffix # NOTE (aseipp): must be synchronized with update.sh! @@ -82,7 +82,7 @@ let # tooling prelude-src = let - prelude-hash = "d11a72de049a37b9b218a3ab8db33d3f97b9413c"; + prelude-hash = "48c249f8c7b99ff501d6e857754760315072b306"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index ef79b31cbb54..b33624ff8661 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.47.1"; + version = "0.48.0"; cli = fetchurl { url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-T+NOp5UEKcP8slDddQ9vyrrpoZVGEChJ379Da5E7pVw="; + hash = "sha256-9481W8AsgxCCvdTkCy2kXH6CG72xP5S3kejjxcXLVkg="; }; desktop = fetchurl { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-J2FvEdLy77uO52KNlugZZ+flsraKatXT2n17npMYo9M="; + hash = "sha256-XIRjuvBxmfdHnizbVOh7kWKHm4OkUDwuSSNYzjJW/dA="; }; appimageContents = appimageTools.extractType2 { inherit pname version; diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 378c3ddfe77a..a5a9320038b8 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.9.1"; + version = "6.9.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-QGvXUYeT01+P843gBX+IJWTyPg0cPI9jZWh3tAcmEqE="; + hash = "sha256-78Y6kJWrF3EtbvLc5Jk+mNZQRfydcIPn4bw7tIUvGoY="; }; - vendorHash = "sha256-5XrwVIaQ2dMizx3Pj0dmLkpYwypUVnfxLNxmNsVhVzY="; + vendorHash = "sha256-RPYjw4G1jfsrge1eXKdQ6RdNL7srjagUY14GzXBJvpI="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix index 89e2eb0b9235..1d47f31fe07d 100644 --- a/pkgs/by-name/du/duperemove/package.nix +++ b/pkgs/by-name/du/duperemove/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - hash = "sha256-T17XkR6AUvOerg9FN4SxTfoMavVXnxujtrA4p4GEnFE="; + hash = "sha256-Y3HIqq61bLfZi4XR2RtSyuCPmcWrTxeWvqpTh+3hUjc="; }; postPatch = '' diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index ec2f05a4743c..1c3f8ade2705 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA="; + hash = "sha256-B6iEssB9+BUXO4p1aSzrOGlBA8TiUOZY7a9U8F9SXaQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vVU10Mj+dRIAOREQiGIO0S+mDBeLtM5v0KjmmoCn3/g="; + cargoHash = "sha256-qfKNxLtvVaXGVP0wzOoZ5jaViO4hcMoZIOqxrpXiWzc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 2d82636a07ce..cb029071463d 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.6.0-unstable-2025-03-25"; + version = "0.6.0-unstable-2025-05-13"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "a9aa0f96892f20e4741e94f4cd46ca31106e492c"; - hash = "sha256-T9OZ8jke2T73Zeqt8VekH82ar23AV7llA7ta8b7HP2o="; + rev = "15315a05ece87aa36fd6b0ff54f6484823e40cda"; + hash = "sha256-0AEYrizfnhhFmxADBEjnXL4VHvzdTvpmZ0Gjk2IQr9g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tjhF4D5WFw6qBUXRWcWjaB57zyXeWBDULsOcr2MJJgA="; + cargoHash = "sha256-GjYeto/As8fM0xqTHfyKQ5YWAciBW9tvXM9ra3V86Eo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 79df2a22a02d..86a9ff62ea9c 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-05-02"; + version = "2025-05-10"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-XBmSiLp92mOudYCytkooHifDHtn+hqTMUOl3eTAUcMs="; + hash = "sha256-YcSkBnzw3iMuD0MtpqtUq1gOBoj2ptigI63cI1wBibY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix index e39d8754bdfc..ee5916854ad6 100644 --- a/pkgs/by-name/ex/expr/package.nix +++ b/pkgs/by-name/ex/expr/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "expr"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "expr-lang"; repo = "expr"; rev = "v${version}"; - hash = "sha256-teP/14czczNiz0kxoLNmZQg/AvcDuB8K4jdQpJf5JLQ="; + hash = "sha256-oi5dMTuirAnUFOC8zBlu7YErp13DZPoSGNpueKXdNtE="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-DamIlXTuuPifGgpbVXn7OPI97ppqlwiCtcZAnQ00YD0="; + vendorHash = "sha256-tSerrcRS7Nl0rZQqGfUKgdHsGBXEAFFF+Cn7HqFyfqA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 23b59aeb52b8..87d2b5bed8d8 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -3,6 +3,7 @@ buildPackages, edid-decode, fetchFromGitHub, + fetchpatch, meson, pkg-config, ninja, @@ -48,14 +49,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.4"; + version = "3.16.7"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-2AxqvZA1eZaJFKMfRljCIcP0M2nMngw0FQiXsfBW7IA="; + hash = "sha256-q0yTOyu47tQXorFfnmRa4wrt0KRnyelLDmfcg4iwPfs="; }; patches = [ @@ -63,6 +64,19 @@ stdenv.mkDerivation (finalAttrs: { ./shaders-path.patch # patch relative gamescopereaper path with absolute ./gamescopereaper.patch + + # Revert change to always use vendored stb/glm libraries + # Upstream discussion: https://github.com/ValveSoftware/gamescope/pull/1751 + (fetchpatch { + url = "https://github.com/ValveSoftware/gamescope/commit/baae74c4b13676fa76a8b200f21ac78f55079734.patch"; + revert = true; + hash = "sha256-XpbyLQ4R9KgBR3hlrgPzmM7Zxr2jm4Q10zGjyhh/Qxw="; + }) + (fetchpatch { + url = "https://github.com/ValveSoftware/gamescope/commit/72bae179ba2ebbbc91ed07c7f66e7e4964a4cd9e.patch"; + revert = true; + hash = "sha256-aglfGvEuycNyPlaFYxqqvPAgFpWns3xZ3B2GiAefxtg="; + }) ]; # We can't substitute the patch itself because substituteAll is itself a derivation, diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py index aeee8239daea..1f0a8081c098 100755 --- a/pkgs/by-name/gc/gclient2nix/gclient2nix.py +++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py @@ -125,7 +125,7 @@ class GitRepo(Repo): self.fetcher = "fetchgit" self.args = { "url": url, - "rev": rev, + "rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev, } @@ -136,13 +136,14 @@ class GitHubRepo(Repo): self.args = { "owner": owner, "repo": repo, - "rev": rev, + "rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev, } def get_file(self, filepath: str) -> str: + rev_or_tag = self.args['rev'] if 'rev' in self.args else f"refs/tags/{self.args['tag']}" return ( urlopen( - f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}" + f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{rev_or_tag}/{filepath}" ) .read() .decode("utf-8") @@ -155,7 +156,7 @@ class GitilesRepo(Repo): self.fetcher = "fetchFromGitiles" self.args = { "url": url, - "rev": rev, + "rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev, } # Quirk: Chromium source code exceeds the Hydra output limit @@ -172,9 +173,10 @@ class GitilesRepo(Repo): self.args["postFetch"] += "rm -r $out/media/test/data; " def get_file(self, filepath: str) -> str: + rev_or_tag = self.args['rev'] if 'rev' in self.args else f"refs/tags/{self.args['tag']}" return base64.b64decode( urlopen( - f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT" + f"{self.args['url']}/+/{rev_or_tag}/{filepath}?format=TEXT" ).read() ).decode("utf-8") diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index b4719fe6a962..e785cfa6ed46 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.07"; + version = "6.19.08"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${version}"; - hash = "sha256-uu+soEYC12LWx0aLbPupoK7g/rnD47dp32w7jpRj/38="; + hash = "sha256-GUO6zozdh5u3dpFVQUYK/2PlurzXSEswgtdcpiPmhV8="; }; build-system = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Program for retrieving mail"; homepage = "https://getmail6.org"; - changelog = "https://github.com/getmail6/getmail6/blob/${src.rev}/docs/CHANGELOG"; + changelog = "https://github.com/getmail6/getmail6/blob/${src.tag}/docs/CHANGELOG"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbe diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index bc93518ddff1..ddadd1a61a3a 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -6,7 +6,7 @@ }: let pname = "git-upstream"; - version = "1.5.0"; + version = "1.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "9999years"; repo = pname; tag = "v${version}"; - hash = "sha256-ooqz2Xp/nljx2+zQsc/RjVbGG/5YTeggU6pB8lGK0o8="; + hash = "sha256-rdxpo1OZD/fpBm76zD7U/YeZOBpliKXJN87LJkw6A28="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oIrUjb+yJgDR5GYrG3hPLpXYJynR9eeX00emcrcjmZY="; + cargoHash = "sha256-7h0aWb7xJjDJedQp9xXc+deW0hM+qBJcG36Sd8fo+Fg="; meta = { homepage = "https://github.com/9999years/git-upstream"; diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index 74409a2dd39a..b04e75d007c1 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.25.1"; + version = "8.26.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-ji13lmGrtJeQuOYi2HsFICs2XUZdmWgsgVrWj/Shh/c="; + hash = "sha256-lBIoEUjAllhUTS9PRSqdWUeBhEGs6wOHOWivj0PC9Is="; }; vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc="; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index 141e85552bf6..965d3dc66c34 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.21"; + version = "1.1.22"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-KQOTCB34zxy34y5gq+xUjBiBO5zKSZHRDtQY/DnRkdo="; + hash = "sha256-+YFQU7qCj2hpRuBpUn0hn5GNq+T0DHQFZwEoLu1FY4c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index d40556da08fb..ed0a3386dfee 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -2,22 +2,23 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, nix-update-script, nixosTests, }: buildGoModule (finalAttrs: { pname = "glance"; - version = "0.7.13"; + version = "0.8.1"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; tag = "v${finalAttrs.version}"; - hash = "sha256-MinskibgOCb8OytC+Uxg31g00Ha/un7MF+uvL9xosUU="; + hash = "sha256-syWalphoKjUYrQjKrQUMDijgILQ+AIOVTMqYCiYVWyU="; }; - vendorHash = "sha256-+7mOCU5GNQV8+s9QPki+7CDi4qtOIpwjC//QracwzHI="; + vendorHash = "sha256-81FAWMe7ksmbklXGGg15v2W4nuT6AcBHLIhXF7bI78c="; ldflags = [ "-s" @@ -25,7 +26,9 @@ buildGoModule (finalAttrs: { "-X github.com/glanceapp/glance/internal/glance.buildVersion=v${finalAttrs.version}" ]; - excludedPackages = [ "scripts/build-and-ship" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 19510f5106e2..2855518d0b35 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -15,17 +15,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.15.10"; + version = "1.15.11"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-QVgi4IDPDGlvg8J3Wwrjtzkd6eYi3aAwU8IJbnIr5fU="; + hash = "sha256-2XGKkimwe9h8RxO3SzUta5Bh2Ooldl2LiHqUpn8FK7I="; }; proxyVendor = true; - vendorHash = "sha256-1FuVdx84jvMBo8VO6q+WaFpK3hWn88J7p8vhIDsQHPM="; + vendorHash = "sha256-R9Qg6estiyjMAwN6tvuN9ZuE7+JqjEy+qYOPAg5lIJY="; doCheck = false; diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix index 1accceb44c3d..26db86ce6dfe 100644 --- a/pkgs/by-name/go/goshs/package.nix +++ b/pkgs/by-name/go/goshs/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "goshs"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "patrickhener"; repo = "goshs"; tag = "v${finalAttrs.version}"; - hash = "sha256-j/GsNkaheYDavxxoibR61knMR3x7o1pkc6NcmGrHSxY="; + hash = "sha256-5/KWAytz0SQYgIerf1xyTfJxzX5ynA2BhKfbYmu/vU8="; }; vendorHash = "sha256-LzuY3l6QQnMtAoVM2i206BuoTkVLVHg1DTWZhjIepY8="; diff --git a/pkgs/by-name/gp/gpg-mdp/package.nix b/pkgs/by-name/gp/gpg-mdp/package.nix index 9e145a5fe2b1..522cbc8852df 100644 --- a/pkgs/by-name/gp/gpg-mdp/package.nix +++ b/pkgs/by-name/gp/gpg-mdp/package.nix @@ -1,53 +1,53 @@ { - fetchurl, - fetchpatch, lib, + fetchFromGitHub, stdenv, + nix-update-script, + ncurses, gnupg, }: -let - version = "0.7.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { # mdp renamed to gpg-mdp because there is a mdp package already. pname = "gpg-mdp"; - inherit version; + version = "0.7.5"; + meta = { homepage = "https://tamentis.com/projects/mdp/"; + changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}"; license = [ lib.licenses.isc ]; description = "Manage your passwords with GnuPG and a text editor"; }; - src = fetchurl { - url = "https://tamentis.com/projects/mdp/files/mdp-${version}.tar.gz"; - sha256 = "04mdnx4ccpxf9m2myy9nvpl9ma4jgzmv9bkrzv2b9affzss3r34g"; + + src = fetchFromGitHub { + owner = "tamentis"; + repo = "mdp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y92y70XkUbB+lhWAzEkCB/cvfUPPKIfu0yrlCS2pKn0="; }; - patches = [ - # Pull fix pending upstream inclusion for -fno-common toolchain support: - # https://github.com/tamentis/mdp/pull/9 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/tamentis/mdp/commit/95c77de3beb96dc7c76ff36d3f3dfb18411d7c54.patch"; - sha256 = "1j6yvjzkx31b758yav4arhlm5ig7phl8mgx4fcwj7lm2pfvzwcsz"; - }) - ]; + buildInputs = [ ncurses ]; + prePatch = '' substituteInPlace ./configure \ - --replace "alias echo=/bin/echo" "" + --replace-fail "alias echo=/bin/echo" "" \ + --replace-fail "main()" "int main()" substituteInPlace ./src/config.c \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \ - --replace "/usr/bin/vi" "vi" + --replace-fail "/usr/bin/gpg" "${lib.getExe gnupg}" \ + --replace-fail "/usr/bin/vi" "vi" substituteInPlace ./mdp.1 \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" + --replace-fail "/usr/bin/gpg" "${lib.getExe gnupg}" ''; + # we add symlinks to the binary and man page with the name 'gpg-mdp', in case # the completely unrelated program also named 'mdp' is already installed. postFixup = '' ln -s $out/bin/mdp $out/bin/gpg-mdp ln -s $out/share/man/man1/mdp.1.gz $out/share/man/man1/gpg-mdp.1.gz ''; -} + + passthru.updateScript = nix-update-script { }; +}) diff --git a/pkgs/by-name/gu/gurobi/package.nix b/pkgs/by-name/gu/gurobi/package.nix index 28bd696f55cc..fd7f9a9eeb24 100644 --- a/pkgs/by-name/gu/gurobi/package.nix +++ b/pkgs/by-name/gu/gurobi/package.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "gurobi"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz"; hash = { - aarch64-linux = "sha256-hQPqdZVU5G1kj/sR8j2QY1eLMn3JVahnWfWnVrk0P7o="; - x86_64-linux = "sha256-kXIJPmXeBPwUxsXSNXaO6j/hXIqctuqS5oBuu4UunYY="; + aarch64-linux = "sha256-vlhF3OIMCVyS9Y31RS4eVhs4wQ4CUDGQZlNkf98Uji0="; + x86_64-linux = "sha256-DMSmk41YzGoonHdX2xLsioU9RTBLn4kQy4v6HgVa08U="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/in/insync-nautilus/package.nix b/pkgs/by-name/in/insync-nautilus/package.nix index d0e3b3d934e4..e6d6b5e7cc87 100644 --- a/pkgs/by-name/in/insync-nautilus/package.nix +++ b/pkgs/by-name/in/insync-nautilus/package.nix @@ -1,47 +1,42 @@ { + lib, stdenv, fetchurl, - lib, dpkg, nautilus-python, - insync-emblem-icons, }: stdenv.mkDerivation (finalAttrs: { pname = "insync-nautilus"; - version = lib.getVersion insync-emblem-icons; + version = "3.9.5.60024"; pyproject = true; # Download latest from: https://www.insynchq.com/downloads/linux#nautilus - src = fetchurl rec { urls = [ - "https://cdn.insynchq.com/builds/linux/insync-nautilus_${finalAttrs.version}_all.deb" - "https://web.archive.org/web/20240409080611/${builtins.elemAt urls 0}" + "https://cdn.insynchq.com/builds/linux/${finalAttrs.version}/insync-nautilus_${finalAttrs.version}_all.deb" + "https://web.archive.org/web/20250502162242/${builtins.elemAt urls 0}" ]; - hash = "sha256-aB1/ZzcQH3T1lviMZO8jXbtdbe4TW20f0TAcv4HDOGI="; + hash = "sha256-yfPZ58xWZknpCqE8cJ7e7fR4+nzsCdprgBFRL0U0LvM="; }; nativeBuildInputs = [ dpkg ]; - buildInputs = [ - nautilus-python - insync-emblem-icons - ]; + buildInputs = [ nautilus-python ]; installPhase = '' runHook preInstall - mkdir -p $out - cp -R usr/share $out/ - cp -rs "${insync-emblem-icons}"/share/icons $out/share/icons + + cp -r usr $out + runHook postInstall ''; - meta = with lib; { + meta = { platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ fromSource ]; - license = licenses.unfree; - maintainers = with maintainers; [ hellwolf ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ hellwolf ]; homepage = "https://www.insynchq.com"; description = "This package contains the Python extension and icons for integrating Insync with Nautilus"; }; diff --git a/pkgs/by-name/ki/kicli/package.nix b/pkgs/by-name/ki/kicli/package.nix index 3c1769bdd2ea..96d4bd9ef5e3 100644 --- a/pkgs/by-name/ki/kicli/package.nix +++ b/pkgs/by-name/ki/kicli/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "kicli"; - version = "0.0.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "anned20"; repo = pname; rev = "v${version}"; - hash = "sha256-Mt1lHOC8gBcLQ6kArUvlPrH+Y/63mIQTCsUY2UTJE2c="; + hash = "sha256-NXKo+zK5HnuMXRsi29lEhoo7RCagwvZdXXPNfp4pHtc="; }; vendorHash = "sha256-+8L/9NJ3dzP4k+LXkPD208uFGeARv7aT39bhH+R08e0="; diff --git a/pkgs/by-name/ko/konstraint/package.nix b/pkgs/by-name/ko/konstraint/package.nix index dc23321f593f..44becc8b0e33 100644 --- a/pkgs/by-name/ko/konstraint/package.nix +++ b/pkgs/by-name/ko/konstraint/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-45zCzjzbKYLsLxmo7yGbbyeYP1WyULD9d+nnNLP9Zzo="; + sha256 = "sha256-DwfBevCGDndMfQiwiuV+J95prhbxT20siMrEY2T7h1w="; }; - vendorHash = "sha256-ZPK3+x0GOMs2RXxIs90BvEg25lb/j11J9zECaMHg4zY="; + vendorHash = "sha256-iCth5WrX0XG218PfbXt4jeA3MZuZ68eNaV+RtzMhXP0="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix index 0a81e31aa843..56ed10dbf688 100644 --- a/pkgs/by-name/li/libspelling/package.nix +++ b/pkgs/by-name/li/libspelling/package.nix @@ -42,14 +42,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - glib - gtk4 - gtksourceview5 enchant icu libsysprof-capture ]; + propagatedBuildInputs = [ + # These were moved from buildInputs because they are + # listed in `Requires` key of `libspelling-1.pc` + glib + gtk4 + gtksourceview5 + ]; + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index 535357f6d2b6..1b9f35d8c1e6 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.45.0"; + version = "1.46.0"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-OJAjTy0vTRb43TTiPeXafWq4kjIpnDXoTprVzbMnaWQ="; + hash = "sha256-UlZ+v202E2daRsV3KBK2WD3NaXcIbhIFL32DZjZ/eus="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index f919b1960eef..6bfaf85c515d 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.672"; + version = "0.673"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-FMFW7AikBnoT6FZhmCOHKqRVCi2qcO8kXxYCaAfCfNY="; + hash = "sha256-0a+4BHDIOeMuJzsDSlYeXCcmnUT5KzKO/q4kDhpfHxQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/lu/lucky-commit/package.nix b/pkgs/by-name/lu/lucky-commit/package.nix index f2295c428aa9..0eddf327835f 100644 --- a/pkgs/by-name/lu/lucky-commit/package.nix +++ b/pkgs/by-name/lu/lucky-commit/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "sha256-57eOhlOkRU1sz0y/sfEyEFXQJx165qehBTP8iWiEGx8="; + sha256 = "sha256-pghc2lTI81/z1bPJ6P2bFPyZkM8pko0V7lqv9rUUxWM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8Z/bfSDjSrvGbPOVpvIYzOz5wxjkMsuwOWASnOA8ziM="; + cargoHash = "sha256-zuWPkaYltxOOLaR6NTVkf1WbKzUQByml45jNL+e5UJ0="; buildInputs = lib.optional (withOpenCL && (!stdenv.hostPlatform.isDarwin)) ocl-icd; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 9274f063f4f9..7f5a78e1cfb0 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { pname = "lux-cli"; - version = "0.4.4"; + version = "0.5.0"; src = luaPackages.lux-lua.src; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 1a095a3520eb..6f4dcac1317c 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "marktext"; - version = "0.17.0-unstable-2024-06-10"; + version = "0.17.1-unstable-2024-06-10"; src = fetchFromGitHub { owner = "marktext"; diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 74778e2bfb48..4d60d995b184 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "mergiraf"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; rev = "refs/tags/v${version}"; - hash = "sha256-6psvTt0r+s5GuPpy1PwdvnUJ8n+lfvC2lWfMYzMvUkg="; + hash = "sha256-CQriH0vZ+ZBSIZcj0MKQEojpugS2g4sCuDICmwLCUBE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-IJ/ywVDHMdd37/jCLzkYyBNVEow9sdK6iSDHlCZXKK0="; + cargoHash = "sha256-nsWRysIupGC3w0L7OMChcgPPTHSwnmcKv58BTn51cY4="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/ne/netdiscover/package.nix b/pkgs/by-name/ne/netdiscover/package.nix index 9886a73fe65c..cd508518ee1d 100644 --- a/pkgs/by-name/ne/netdiscover/package.nix +++ b/pkgs/by-name/ne/netdiscover/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "netdiscover"; - version = "0.11"; + version = "0.20"; src = fetchFromGitHub { owner = "netdiscover-scanner"; repo = pname; tag = version; - hash = "sha256-LUM6vl6pohrTW3X9c1FaDE7j9mvMuAiDkFBKWc4KZso="; + hash = "sha256-I3t9GsgKFo/eJrqYzj8T2Epfi3SURicwRYPBK25uHEw="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index f7e2841d0e13..4b42bcf6d857 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-RI86VdWuPTcjkQstwDBN/rDLv/Imy9kYH/nIJSGuIcI="; + hash = "sha256-7hTlY/WKJaw+ZMSn8A5F0p1vhg67NUY/CCjw7xdOg2M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 2777931a8361..8b300de3879c 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -4,26 +4,26 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "obs-cmd"; - version = "0.18.2"; + version = "0.18.4"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; - rev = "v${version}"; - hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/LgQqxZqxbE8hgip+yl8VVjiRYD+6AblKag2MQo1gDs="; }; useFetchCargoVendor = true; cargoHash = "sha256-ZKHm6N7y5FbDFiK2QfQ+9siexgzrdLpBs5Xikh1SRLo="; - meta = with lib; { + meta = { description = "Minimal CLI to control OBS Studio via obs-websocket"; homepage = "https://github.com/grigio/obs-cmd"; - changelog = "https://github.com/grigio/obs-cmd/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/grigio/obs-cmd/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; mainProgram = "obs-cmd"; }; -} +}) diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index ebc7a6ff1c45..afa12ce2a4d5 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -16,7 +16,6 @@ poppler, nautilus, djvulibre, - libspectre, libarchive, libsecret, wrapGAppsHook4, @@ -26,7 +25,8 @@ gsettings-desktop-schemas, dbus, gi-docgen, - libgxps, + libsysprof-capture, + libspelling, withLibsecret ? true, supportNautilus ? (!stdenv.hostPlatform.isDarwin), libadwaita, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "47.3"; + version = "48.2"; outputs = [ "out" @@ -47,19 +47,16 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz"; - hash = "sha256-PlhTk+gef6D5r55U38hvYSa1w9hS6pDf3DumsHlSxKo="; + hash = "sha256-HpvFlhNCS/ZVIjxr3Khzri8d2ifPAtc0K/9bVZBRYG0="; }; - cargoRoot = "shell-rs"; - cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname version - cargoRoot ; - hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE="; + hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ="; }; nativeBuildInputs = [ @@ -88,9 +85,9 @@ stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas libadwaita libarchive - libgxps librsvg - libspectre + libsysprof-capture + libspelling pango poppler ] @@ -102,10 +99,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = - [ - "-Dps=enabled" - ] - ++ lib.optionals (!withLibsecret) [ + lib.optionals (!withLibsecret) [ "-Dkeyring=disabled" ] ++ lib.optionals (!supportNautilus) [ diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index a2bb45fbe751..7eea0a35f37d 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.1.4"; + version = "12.1.5"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-qFjDbrCqX68ZU+l7ZDADbEyulGk6VY5s92PyfSAum00="; + hash = "sha256-+KYRsYFUs85fOO2mTcB73Cmhc5HOHe5/y7lryGdBYwE="; }; - vendorHash = "sha256-JEi6r5jmXBah+aPr12GxRtLCqJOH/t+zzSDmWqkzHIk="; + vendorHash = "sha256-V7v2XdVawZ/DWjyKugc700EaOCPMWr+wXaXToBWXPQY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pl/please-cli/package.nix b/pkgs/by-name/pl/please-cli/package.nix index 24a1ecc940cb..80f895828b2d 100644 --- a/pkgs/by-name/pl/please-cli/package.nix +++ b/pkgs/by-name/pl/please-cli/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "please-cli"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "TNG"; repo = "please-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-wgH/43CQ8LCOwoidv9ciOiquHKoWAB6qlpeKN/JdcEc="; + hash = "sha256-Kpb36Fm49Cxr3PMlSoUfTNEMNmWFktgEoej1904DmEE="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 812e0270b5ff..42bb23acbf51 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.26.6"; + version = "0.27.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-PDHRMCICzvb7InHSvYRvlYDaB6hkESJyL7iiz+lO6+I="; + hash = "sha256-KvKBx5AKpcvgdf8tq2sJPLF63Fpa9KN3j5WJumR28k4="; }; - vendorHash = "sha256-qkVbtQeyhQ0w0H5BW1Nq4S7UPK7KXkGrueBm9nM/O68="; + vendorHash = "sha256-1Qym5XRyMBfn5csp+YFkKNhJokDrHbfnpKAMq09Da5s="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix index e60e4f3d062f..b5b6a17f96d7 100644 --- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix @@ -5,12 +5,12 @@ }: let - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tynany"; repo = "frr_exporter"; rev = "v${version}"; - hash = "sha256-lGS3/lKtNRmG8zM2V1I9vXhMXoqjMHchHZdag0qECR4="; + hash = "sha256-Dk8YcaUzpM65WlSTJojVZb3IDGIZ7DGWOstRgyA/sYw="; }; in buildGoModule { diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 6487a7fd972a..32c362ea9c2b 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-27"; + version = "GE-Proton10-1"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-70au1dx9co3X+X7xkBCDGf1BxEouuw3zN+7eDyT7i5c="; + hash = "sha256-sGKmfdxZK2quI7QamIGRaW1/ElwS/gJPeE4Tvh6icUo="; }; dontUnpack = true; diff --git a/pkgs/by-name/qr/qrcode/package.nix b/pkgs/by-name/qr/qrcode/package.nix index ccb66cc4c539..e15f7ca636cb 100644 --- a/pkgs/by-name/qr/qrcode/package.nix +++ b/pkgs/by-name/qr/qrcode/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "qrcode"; - version = "0-unstable-2024-07-18"; + version = "0-unstable-2025-04-29"; src = fetchFromGitHub { owner = "qsantos"; repo = "qrcode"; - rev = "6e882a26a30ab9478ba98591ecc547614fb62b69"; - hash = "sha256-wJL+XyYnI8crKVu+xwCioD5YcFjE5a92qkbOB7juw+s="; + rev = "29140c67b69b79e5c8a52911489648853fddf85f"; + hash = "sha256-WQeZB8G9Nm68mYmLr0ksZdFDcQxF54X0yJxigJZWvMo="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/by-name/ro/rootlesskit/package.nix b/pkgs/by-name/ro/rootlesskit/package.nix index 6b2c3e63d8e4..bdf7759140c9 100644 --- a/pkgs/by-name/ro/rootlesskit/package.nix +++ b/pkgs/by-name/ro/rootlesskit/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-9jQNFjxMLjGa9m2gxmoauzLHqhljltEO/ZNsBjWjgtw="; + hash = "sha256-hidQMZMPwnOKpMYV2UL0MkYBdvQUD6SsS7ZXt6bDzI8="; }; - vendorHash = "sha256-8X4lwCPREwSgaRFiXNL/odhsdmGYZs2SjjDKK+Bnln0="; + vendorHash = "sha256-sqmAOEapft5DLHWKwwuuzWY1RCzaKed8M1usyCjmKG8="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index e76bc590435a..899b24f9fabf 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-05-05"; + version = "2025-05-12"; useFetchCargoVendor = true; cargoHash = "sha256-Y6/1xr08KXj+KQVJgLO7LhwsNGE2ooFdTR9GoAgAwKk="; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-d4/WBcspAR38AMsZysrQsenF1NmZ0/9GhjD4hxvPygo="; + hash = "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index f14cac029bb5..cba75e23c2d9 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.195.0"; + version = "0.195.1"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-Y/4j2CC43cf496RugC8Eli6TMGBGFS8/W8UxLx2n+iY="; + hash = "sha256-OZ35DkZyR/xRFAq0BtF97INHj/9rX5QxfSLQyt87fKQ="; }; ldflags = [ diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index b5d708a612cc..1efa4851ec4c 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "seagoat"; - version = "0.54.12"; + version = "0.54.17"; pyproject = true; src = fetchFromGitHub { owner = "kantord"; repo = "SeaGOAT"; tag = "v${version}"; - hash = "sha256-gDnLMdLyltyRElwWJpH2Cn9jnH7ziqOi1LPF8+qPUhQ="; + hash = "sha256-8pLBZXj9p+nO+deozo57H/FlxDKd9KSQHZ8qkGsNzhA="; }; build-system = [ python3Packages.poetry-core ]; diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 71a29e2c6e39..4e94f9df5248 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -4,7 +4,7 @@ "hash": "sha256-yomovlwRmrzsN+dvmUgOM6pzBTH41QuHQXnEJBhQglY=", "owner": "signalapp", "repo": "webrtc", - "rev": "6998b" + "tag": "6998b" }, "fetcher": "fetchFromGitHub" }, diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index a8e433ec2b20..9415aff683da 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "spider"; - version = "2.36.117"; + version = "2.37.18"; src = fetchFromGitHub { owner = "spider-rs"; repo = "spider"; tag = "v${finalAttrs.version}"; - hash = "sha256-D67v79+BOxliMtC9twB7PlsXy2qmNkQO9379YQ4/zeQ="; + hash = "sha256-aJXd8yzDEP1pYe4J8Zi6vmLN1+ki6B0tLFV/mvwkk/k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QNHMyGQl3/hCMcqyKaDfDq5DNCnPLOLjHBiIOwmKYjk="; + cargoHash = "sha256-QVh962yXXStDwLyd8LSnmxkik6wNebOfGyH0HuE13kg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ta/tarts/package.nix b/pkgs/by-name/ta/tarts/package.nix new file mode 100644 index 000000000000..e6c8cbb5051b --- /dev/null +++ b/pkgs/by-name/ta/tarts/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage { + pname = "tarts"; + version = "0.1.16-unstable-2025-05-04"; + + src = fetchFromGitHub { + owner = "oiwn"; + repo = "tarts"; + rev = "8560a63dda8e5ffd5fdd96a1f7687f8f12d36022"; + hash = "sha256-d06FL0khcI2LUMbrUo3tmQn97pNFIVefPWlxWFSUJ+E="; + }; + + cargoHash = "sha256-DLIBVl7CzhEYjAnkJmLHSlUoXCNos8YPHfSz9rs99/8="; + + meta = { + description = "Screen saves and visual effects for your terminal"; + homepage = "https://github.com/oiwn/tarts"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.awwpotato ]; + mainProgram = "tarts"; + }; +} diff --git a/pkgs/by-name/ty/typship/package.nix b/pkgs/by-name/ty/typship/package.nix new file mode 100644 index 000000000000..5b26a4343122 --- /dev/null +++ b/pkgs/by-name/ty/typship/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "typship"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "sjfhsjfh"; + repo = "typship"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LDiKAQmzEgzFJH2NAR3FYsO4SmH5uAEOa6I4A0FnwJk="; + }; + + cargoHash = "sha256-t4Vnww49CnkBSRsAWKxSpJffuUuqFAxqUN0GtoxnKLY="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + env = { + OPENSSL_NO_VENDOR = true; # From the typst package + }; + + meta = { + description = "A Typst package CLI tool"; + homepage = "https://github.com/sjfhsjfh/typship"; + license = lib.licenses.mit; + changelog = "https://github.com/sjfhsjfh/typship/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ heijligen ]; + }; +}) diff --git a/pkgs/by-name/ug/uget-integrator/package.nix b/pkgs/by-name/ug/uget-integrator/package.nix index cda04712302f..507e4c45c886 100644 --- a/pkgs/by-name/ug/uget-integrator/package.nix +++ b/pkgs/by-name/ug/uget-integrator/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, uget, python3Packages, + installShellFiles, }: stdenv.mkDerivation rec { @@ -17,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp"; }; - nativeBuildInputs = [ python3Packages.wrapPython ]; + nativeBuildInputs = [ + installShellFiles + python3Packages.wrapPython + ]; buildInputs = [ uget @@ -29,7 +33,7 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace "/usr" "$out" done - install -D -t $out/bin bin/uget-integrator + installBin bin/uget-integrator install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json diff --git a/pkgs/by-name/ug/uget/package.nix b/pkgs/by-name/ug/uget/package.nix index fd90e58161b1..3c46d5741cef 100644 --- a/pkgs/by-name/ug/uget/package.nix +++ b/pkgs/by-name/ug/uget/package.nix @@ -12,7 +12,9 @@ gtk3, dconf, wrapGAppsHook3, - aria2 ? null, + aria2, + # Boolean guards + aria2Support ? true, }: stdenv.mkDerivation rec { @@ -51,13 +53,11 @@ stdenv.mkDerivation rec { gst-plugins-base gst-plugins-good ]) - ++ (lib.optional (aria2 != null) aria2); + ++ (lib.optional aria2Support aria2); enableParallelBuilding = true; - preFixup = lib.optionalString ( - aria2 != null - ) ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")''; + preFixup = lib.optionalString aria2Support ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")''; meta = with lib; { description = "Download manager using GTK and libcurl"; diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json index 8e56dc7c535f..94d300dd1421 100644 --- a/pkgs/by-name/up/upbound/sources-stable.json +++ b/pkgs/by-name/up/upbound/sources-stable.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-hQpZdqE27jCXIGp+Y7fdVocBPM6PJ50Z9/ly0QvFsok=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-mBL2ytAXOtGwkitBzk1VB4SHS1oZ/9wcyZbCbfxyFko=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-SHjYjf4wC8G6KpF+W86ULI1CwVH93bgKLTof5M9wvZ4=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-7BZ9MuszhhWfK6OaDhij8Q6qPXBm58sWLcPN/XjF/QY=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-XiiyEMVb8bhjmJrofE2T/Vgg+pNBNxUv0yKKm9rIx+4=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-wH3KGhRcdDj3bAwTbRZDiKSNyKgsxzfFRtmZKmFCc8A=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-R3pgYboerb8gVc1sDmZVHY541yO0A3hIYeIiZ1wrTzg=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-VChdnWUJgS2meK0POrF3HoPFVskgHTQgUkJaj/yAIFA=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-6DTIUGeT4LGRVyfUl463y9b2zGJawWzXp/Y0aNWoYPI=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-NL0erDPBa35mQoxGscLEYOZEf4QPWIrtEi20v0kkjD4=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-bgR9OSHRWFQG50TWt7b8r9Gdb/xE0ps5yu33C58k31I=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-kZeD9NyUpXJCjEP+KdCy9JnyEBEMNvUJ0DxkKtL/5HI=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-zMpYwYncghWCr+sNbXvjcwWcimv4ouc8EsKmK50i9zU=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-0bIC7h4Eor9wFCzxiJaSv3OlDONmiDxLM7aApCcG7bY=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-f6ggEUV9CRWVcG/RkYzmwaOUljxnJeoVshwkOZL3Toc=", - "url": "https://cli.upbound.io/stable/v0.38.4/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-ihjjtkhfXsUPnkeEfCaMTjkX4J+hbyrfpjnMY4kGuSQ=", + "url": "https://cli.upbound.io/stable/v0.39.0/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.38.4" + "version": "0.39.0" } diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index d2eb0522a7a5..86fdb752e0a7 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-sGRR3nHPQttiBIIaA2yYFyRezEq+2Ds+mgCpy6TYueU="; + hash = "sha256-Vs6S8N3q5JzXfeogfD0JrVIhMnYIio7+Dfy12gUJrlU="; }; pnpmDeps = pnpm_10.fetchDeps { diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix index f6e57ea1d598..69e81b43b03d 100644 --- a/pkgs/by-name/vi/virglrenderer/package.nix +++ b/pkgs/by-name/vi/virglrenderer/package.nix @@ -5,7 +5,7 @@ meson, ninja, pkg-config, - python3, + buildPackages, libGLU, libepoxy, libX11, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - (python3.withPackages (ps: [ + (buildPackages.python3.withPackages (ps: [ ps.pyyaml ])) ]; diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index d8a2e04ab4a1..28c49736e450 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -9,20 +9,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; - version = "31.0.0"; + version = "32.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-IQeYmqCXhzWsuufrLKeBI2sw86dXbn7c5DbmcoJTWvo="; + hash = "sha256-MGeLnxUmhhuW1FInBCc1xzppgvf3W8J0sy9v9QjgBIA="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; useFetchCargoVendor = true; - cargoHash = "sha256-zMDpbJoOaKJ974Ln43JtY3f3WOq2dEmdgX9TubYdlow="; + cargoHash = "sha256-m9TsTTx/ExqE9/W3xVkYxtgKh8AlGUJTlGPMIDK2xog="; cargoBuildFlags = [ "--package" "wasmtime-cli" diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix index 6489f3d4fdcf..158bddae2e63 100644 --- a/pkgs/by-name/xg/xgboost/package.nix +++ b/pkgs/by-name/xg/xgboost/package.nix @@ -48,14 +48,14 @@ effectiveStdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.1.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-k1k6K11cWpG6PtzTt99q/rrkN3FyxCVEzfPI9fCTAjM="; + hash = "sha256-OwsZ1RzVi6ba+XJqFbIW1Rmqu5OVttBfcpDe84gmQxI="; }; nativeBuildInputs = @@ -88,6 +88,9 @@ effectiveStdenv.mkDerivation rec { ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; + # on Darwin, cmake uses find_library to locate R instead of using the PATH + env.NIX_LDFLAGS = "-L${R}/lib/R/lib"; + preConfigure = lib.optionals rLibrary '' substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library" export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" @@ -124,12 +127,14 @@ effectiveStdenv.mkDerivation rec { "Approx.PartitionerColumnSplit" "BroadcastTest.Basic" "CPUHistogram.BuildHistColSplit" + "CPUHistogram.BuildHistColumnSplit" "CPUPredictor.CategoricalPredictLeafColumnSplit" "CPUPredictor.CategoricalPredictionColumnSplit" "ColumnSplit/ColumnSplitTrainingTest*" "ColumnSplit/TestApproxColumnSplit*" "ColumnSplit/TestHistColumnSplit*" "ColumnSplitObjective/TestColumnSplit*" + "Cpu/ColumnSplitTrainingTest*" "CommGroupTest.Basic" "CommTest.Channel" "CpuPredictor.BasicColumnSplit" @@ -150,6 +155,8 @@ effectiveStdenv.mkDerivation rec { "Quantile.SortedDistributedBasic" "QuantileHist.MultiPartitionerColumnSplit" "QuantileHist.PartitionerColumnSplit" + "Stats.SampleMean" + "Stats.WeightedSampleMean" "SimpleDMatrix.ColumnSplit" "TrackerAPITest.CAPI" "TrackerTest.AfterShutdown" @@ -174,7 +181,6 @@ effectiveStdenv.mkDerivation rec { '' + '' cmake --install . - cp -r ../rabit/include/rabit $out/include runHook postInstall ''; diff --git a/pkgs/by-name/zi/zinnia/package.nix b/pkgs/by-name/zi/zinnia/package.nix index 517902833644..df39b6c9b495 100644 --- a/pkgs/by-name/zi/zinnia/package.nix +++ b/pkgs/by-name/zi/zinnia/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "zinnia"; version = "2016-08-28"; @@ -15,15 +15,19 @@ stdenv.mkDerivation { sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; }; - setSourceRoot = '' - sourceRoot=$(echo */zinnia) - ''; + sourceRoot = "${finalAttrs.src.name}/zinnia"; - meta = with lib; { + patches = [ + # Fixes the following error on darwin: + # svm.cpp:50:10: error: no member named 'random_shuffle' in namespace 'std' + ./remove-random-shuffle-usage.patch + ]; + + meta = { description = "Online hand recognition system with machine learning"; homepage = "http://taku910.github.io/zinnia/"; - license = licenses.bsd2; - platforms = platforms.unix; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/zi/zinnia/remove-random-shuffle-usage.patch b/pkgs/by-name/zi/zinnia/remove-random-shuffle-usage.patch new file mode 100644 index 000000000000..0ef90c7a275b --- /dev/null +++ b/pkgs/by-name/zi/zinnia/remove-random-shuffle-usage.patch @@ -0,0 +1,27 @@ +diff --git a/svm.cpp b/svm.cpp +index 3b7643e..2a34b42 100644 +--- a/svm.cpp ++++ b/svm.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include "feature.h" + + namespace zinnia { +@@ -43,11 +44,13 @@ bool svm_train(size_t l, + } + } + ++ std::random_device rand_device; ++ std::default_random_engine rand_engine(rand_device()); + static const size_t kMaxIteration = 2000; + for (size_t iter = 0; iter < kMaxIteration; ++iter) { + double PGmax_new = -kINF; + double PGmin_new = kINF; +- std::random_shuffle(index.begin(), index.begin() + active_size); ++ std::shuffle(index.begin(), index.begin() + active_size, rand_engine); + + for (size_t s = 0; s < active_size; ++s) { + const size_t i = index[s]; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 67fe45c2a102..56a86a5c74bf 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -117,6 +117,10 @@ self: super: # https://github.com/haskell-foundation/foundation/pull/412 foundation = dontCheck super.foundation; + # Test suite attempts to create illegal paths on HFS+ + # https://github.com/fpco/haskell-filesystem/issues/37 + system-fileio = dontCheck super.system-fileio; + llvm-hs = overrideCabal (oldAttrs: { # One test fails on darwin. doCheck = false; diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index adfbe426cc00..ae76873b96a3 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "25.0.5"; + version = "25.0.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-zYZgvuRnqhPbVmxmdmq4rLng20gMiAvJYD0o4jN5McI="; + hash = "sha256-SuSs8rwcu3GizOFfoUQZkVfwS1gxihgnmIGnD90YS54="; }; meta = { diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 5bc3ad62197a..729e8b6e918b 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-49QnPwGQo4gOxO7EUJnn0JoQl6LgrEOW3cks3IT3fnU="; + hash = "sha256-G1yqToqYVnV/ag//b4C3jUvh2ayIhV3bEavfhpiF0p0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index e68949dd3290..53407ebe7bcb 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -16,7 +16,6 @@ fetchpatch, gfortran, gpuTargets ? [ ], # Non-CUDA targets, that is HIP - rocmPackages_5 ? null, rocmPackages, lapack, lib, @@ -49,7 +48,12 @@ let inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder; effectiveRocmPackages = - if strings.versionOlder version "2.8.0" then rocmPackages_5 else rocmPackages; + if strings.versionOlder version "2.8.0" then + throw '' + the required ROCm 5.7 version for magma ${version} has been removed + '' + else + rocmPackages; # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements # of the first list *from* the second list. That means: @@ -254,6 +258,6 @@ stdenv.mkDerivation { || !(cudaSupport || rocmSupport) # At least one back-end enabled || (cudaSupport && rocmSupport) # Mutually exclusive || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null) - || (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null); + || (rocmSupport && strings.versionOlder version "2.8.0"); }; } diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix index 2ee6fd15c75b..998d8fb4892a 100644 --- a/pkgs/development/lua-modules/lux-lua.nix +++ b/pkgs/development/lua-modules/lux-lua.nix @@ -20,14 +20,14 @@ in rustPlatform.buildRustPackage rec { pname = "lux-lua"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lux"; # NOTE: Lux's tags represent the lux-cli version, which may differ from the lux-lua version - tag = "v0.4.4"; - hash = "sha256-jhkd5JDMXMwGCmaKLXoZepRwO+EIqLK2NL3hXDj627Q="; + tag = "v0.5.0"; + hash = "sha256-maVnRaEuB8q7wUukDGwB4d+go+oerkoWsnb5swPagMY="; }; buildAndTestSubdir = "lux-lua"; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ luaFeature ]; useFetchCargoVendor = true; - cargoHash = "sha256-ymESnATGxczfwM4Vy7qQ/UREpJDYIceFcZ9uAJpyRjU="; + cargoHash = "sha256-CWPHE+j6RDtVrnYzakKecIM5dXuHuWaWK+T9xFEdmz8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix index 3679cebb0d6e..5c9f59c0f536 100644 --- a/pkgs/development/python-modules/adext/default.nix +++ b/pkgs/development/python-modules/adext/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "adext"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ajschmidt8"; repo = "adext"; tag = "v${version}"; - hash = "sha256-K2SXZ/YW+/XM+R8F77nWWV+DyZxCc4GYdrMwUnJ5jPg="; + hash = "sha256-cZMA8/t24xk5b1At2LQWeDWuRfPcXBCXpl2T70YxZeA="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 0f6e4b2b00be..621dd765d57f 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.12.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; tag = "v${version}"; - hash = "sha256-zowXj2Aq2BK/UPJ8xT6eS0/V2vSKp+v6xRLSRMyDPvE="; + hash = "sha256-b2XxANLdJzgXbwD7m5E86LAWBOIL+MefCjj054rzHi4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index eea8f62d2d70..9b049468fe95 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, mock, pyftdi, pyopenssl, @@ -15,24 +14,16 @@ buildPythonPackage rec { pname = "alarmdecoder"; - version = "1.13.13"; + version = "1.13.14"; pyproject = true; src = fetchFromGitHub { owner = "nutechsoftware"; repo = "alarmdecoder"; rev = version; - hash = "sha256-dMOC8znhnCAn4fKSnT9Vw1oGzDRN72d6m8RWD1NQ6Ms="; + hash = "sha256-qjn6OY8N1Miuou2aCHGhAQJtOEH1kE6XM8k1TPAibGU="; }; - patches = [ - (fetchpatch { - name = "use-setuptools_scm.patch"; - url = "https://github.com/nutechsoftware/alarmdecoder/commit/e9fc6aa76d7925bb61a3c53716f2b6e25c9ca342.patch"; - hash = "sha256-vt48QfbkcwQmMgJckpawENVMselVx17jrCNKkZ+s95k="; - }) - ]; - postPatch = '' substituteInPlace test/test_{ad2,devices,messages}.py \ --replace-fail assertEquals assertEqual @@ -61,9 +52,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "alarmdecoder" ]; meta = with lib; { - changelog = "https://github.com/nutechsoftware/alarmdecoder/releases/tag/${src.rev}"; description = "Python interface for the Alarm Decoder (AD2USB, AD2SERIAL and AD2PI) devices"; homepage = "https://github.com/nutechsoftware/alarmdecoder"; + changelog = "https://github.com/nutechsoftware/alarmdecoder/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 52053488a039..0008e827ce0a 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "8.1.3"; + version = "8.1.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; tag = "v${version}"; - hash = "sha256-r3VsqSfJiwlMP2xc49H4gr4H8XeFjUacefIEpnc4e3o="; + hash = "sha256-BBHtD6J1hb0eGnA6PmTgNfH6t3JNP0N8C8lPYJlRPJ0="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index dee9d7bbd047..7232032c283a 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.6.0"; + version = "12.7.0"; pyproject = true; src = fetchPypi { pname = "azure_data_tables"; inherit version; - hash = "sha256-4NVZgROFX5EU/XZxYj01UJ+Ddylwz9xZeQGzX0LcMTQ="; + hash = "sha256-sU/JSjIjooNf9WiOF9jhB7J8fNfEEUE48qyBNzcjcF0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bezier/default.nix b/pkgs/development/python-modules/bezier/default.nix new file mode 100644 index 000000000000..13ef41aa96dc --- /dev/null +++ b/pkgs/development/python-modules/bezier/default.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildPythonPackage, + setuptools, + numpy, + matplotlib, + scipy, + sympy, + + cmake, + gfortran, + + nix-update-script, +}: +buildPythonPackage rec { + name = "bezier"; + version = "2024.6.20"; + src = fetchFromGitHub { + owner = "dhermes"; + repo = "bezier"; + tag = version; + hash = "sha256-TH3x6K5S3uV/K/5e+TXCSiJsyJE0tZ+8ZLc+i/x/fV8="; + }; + + pyproject = true; + + build-system = [ setuptools ]; + + dependencies = [ numpy ]; + optional-dependencies = { + full = [ + matplotlib + scipy + sympy + ]; + }; + + env = { + BEZIER_IGNORE_VERSION_CHECK = 1; + BEZIER_INSTALL_PREFIX = stdenv.mkDerivation { + name = "bezier-fortran-extension"; + inherit version src; + + sourceRoot = "${src.name}/src/fortran"; + + nativeBuildInputs = [ + cmake + gfortran + ]; + }; + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-pointer-types" + ]; + }; + + pythonImportsCheck = [ "bezier" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Helper for Bézier Curves, Triangles, and Higher Order Objects"; + changelog = "https://bezier.readthedocs.io/en/latest/releases/latest.html"; + homepage = "https://github.com/dhermes/bezier"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ WeetHet ]; + }; +} diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 99186c91a851..218ca589ae61 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ciscoconfparse2"; - version = "0.8.7"; + version = "0.8.17"; pyproject = true; src = fetchFromGitHub { owner = "mpenning"; repo = "ciscoconfparse2"; tag = version; - hash = "sha256-8LyGta+b18mSWbdwmnOmgbjyHmQi0dehABTXKs0RloI="; + hash = "sha256-G6FR2v/FJE0ySpNXJ9603O16UjSqOkRB2+7xNoLBJAM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index d580a343dcd3..81565417bae5 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.16.0"; + version = "3.16.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-5njodmW28F1l9CO/FymNBh4wEsNNtJl74yBSucAH1EI="; + hash = "sha256-Y9CTsKj7E2P6ZhN1k1VqiFbMhsB1dgDmfhlmbTxrszM="; }; build-system = [ diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 356b81bcb04e..0692bead753c 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -10,25 +10,23 @@ httpx, netifaces, pytest-asyncio, - pytestCheckHook, pytest-httpx, pytest-timeout, + pytestCheckHook, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "denonavr"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "ol-iver"; repo = "denonavr"; tag = version; - hash = "sha256-9nY1z6CX8uha/m3OOUyadrKmpbUsgL16CB2ySElOTck="; + hash = "sha256-6aEivDQQlLOGURUvaGxHHALgE9aA0r2dPvq8S0XFcAg="; }; pythonRelaxDeps = [ "defusedxml" ]; @@ -56,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/ol-iver/denonavr"; - changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}"; + changelog = "https://github.com/ol-iver/denonavr/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 91465b899078..2328f4ab0918 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; tag = version; - hash = "sha256-slUOh7KBVJ11NqsAR7yC+4Tyqxy3Yq6f9OTlQesJ608="; + hash = "sha256-GoOddw2kxOMqmV6m8E6vWdpFLyGGkooMtgE1WTAWm7U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix new file mode 100644 index 000000000000..6fa7ef63a24a --- /dev/null +++ b/pkgs/development/python-modules/firedrake/default.nix @@ -0,0 +1,195 @@ +{ + lib, + newScope, + stdenv, + buildPythonPackage, + fetchFromGitHub, + fetchpatch2, + python, + pax-utils, + + # build-system + setuptools, + cython, + pybind11, + + # dependencies + decorator, + cachetools, + mpi4py, + fenics-ufl, + firedrake-fiat, + h5py, + libsupermesh, + loopy, + petsc4py, + numpy, + packaging, + pkgconfig, + progress, + pyadjoint-ad, + pycparser, + pytools, + requests, + rtree, + scipy, + sympy, + islpy, + matplotlib, + + # tests + pytest, + mpi-pytest, + mpiCheckPhaseHook, + writableTmpDirAsHomeHook, + + # passthru.tests + firedrake, + mpich, +}: +let + firedrakePackages = lib.makeScope newScope (self: { + inherit (petsc4py.petscPackages) mpi hdf5; + mpi4py = self.callPackage mpi4py.override { }; + h5py = self.callPackage h5py.override { }; + mpi-pytest = self.callPackage mpi-pytest.override { }; + }); +in +buildPythonPackage rec { + pname = "firedrake"; + version = "2025.4.0.post0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "firedrakeproject"; + repo = "firedrake"; + tag = version; + hash = "sha256-wQOS4v/YkIwXdQq6JMvRbmyhnzvx6wj0O6aszNa5ZMw="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/firedrakeproject/firedrake/commit/b358e33ab12b3c4bc3819c9c6e9ed0930082b750.patch?full_index=1"; + hash = "sha256-y00GB8njhmHgtAVvlv8ImsJe+hMCU1QFtbB8llEhv/I="; + }) + ]; + + postPatch = + '' + # relax build-dependency petsc4py + substituteInPlace pyproject.toml --replace-fail \ + "petsc4py==3.23.0" "petsc4py" + + # These scripts are used by official source distribution only, + # and do not make sense in our binary distribution. + sed -i '/firedrake-\(check\|status\|run-split-tests\)/d' pyproject.toml + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace firedrake/petsc.py --replace-fail \ + 'program = ["ldd"]' \ + 'program = ["${lib.getExe' pax-utils "lddtree"}"]' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace firedrake/petsc.py --replace-fail \ + 'program = ["otool"' \ + 'program = ["${lib.getExe' stdenv.cc.bintools.bintools "otool"}"' + ''; + + pythonRelaxDeps = [ + "decorator" + ]; + + build-system = [ + cython + libsupermesh + firedrakePackages.mpi4py + numpy + pkgconfig + pybind11 + setuptools + petsc4py + rtree + ]; + + nativeBuildInputs = [ + firedrakePackages.mpi + ]; + + dependencies = + [ + decorator + cachetools + firedrakePackages.mpi4py + fenics-ufl + firedrake-fiat + firedrakePackages.h5py + libsupermesh + loopy + petsc4py + numpy + packaging + pkgconfig + progress + pyadjoint-ad + pycparser + pytools + requests + rtree + scipy + sympy + # required by script spydump + matplotlib + ] + ++ pytools.optional-dependencies.siphash + ++ lib.optional stdenv.hostPlatform.isDarwin islpy; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -add_rpath ${libsupermesh}/${python.sitePackages}/libsupermesh/lib \ + $out/${python.sitePackages}/firedrake/cython/supermeshimpl.cpython-*-darwin.so + ''; + + doCheck = true; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "firedrake" ]; + + nativeCheckInputs = [ + pytest + firedrakePackages.mpi-pytest + mpiCheckPhaseHook + writableTmpDirAsHomeHook + ]; + + preCheck = '' + rm -rf firedrake pyop2 tinyasm tsfc + ''; + + # run official smoke tests + checkPhase = '' + runHook preCheck + + make check + + runHook postCheck + ''; + + passthru = { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + mpich = firedrake.override { + petsc4py = petsc4py.override { mpi = mpich; }; + }; + }; + }; + + meta = { + homepage = "https://www.firedrakeproject.org"; + downloadPage = "https://github.com/firedrakeproject/firedrake"; + description = "Automated Finite Element System"; + license = with lib.licenses; [ + bsd3 + lgpl3Plus + ]; + maintainers = with lib.maintainers; [ qbisi ]; + }; +} diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix index 57b817440c09..485d26842c77 100644 --- a/pkgs/development/python-modules/gurobipy/default.nix +++ b/pkgs/development/python-modules/gurobipy/default.nix @@ -18,14 +18,14 @@ let }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hashes = rec { - cp312-aarch64-darwin = "sha256-ZCrGAEiKZ/u/gmVmEanbVJPXDmzglk4ZHER6ZBBsMlw="; - cp312-aarch64-linux = "sha256-Rf8dzgH3hbL7XPfqYtqQSkSSC7JulID7/t8dL2fawa4="; + cp312-aarch64-darwin = "sha256-i/0ygF6PxOotAlO1vq7yx2NXAxbyah9PLIbLqg6zqNc="; + cp312-aarch64-linux = "sha256-WvK9RiY4T/xwDCmvDh3WnK/m9tvW78045eMoc6RvPRI="; cp312-x86_64-darwin = cp312-aarch64-darwin; - cp312-x86_64-linux = "sha256-42xX3wMwxCdylNCQVlpWxWoIPYPXDDCvjpxETYCoVKU="; - cp313-aarch64-darwin = "sha256-ykkK56TacwNhszVkNQqUwK1gXL9wvnMwcbHHtSJmU1U="; - cp313-aarch64-linux = "sha256-yXHkDdzhdR4HfhYFk+0412pz0pg2X9P5BzfBVDEEQk0="; + cp312-x86_64-linux = "sha256-ER0yOTo5o+Ld1erRdScx04izxoW3NVDGsMqaRdlUw2Q="; + cp313-aarch64-darwin = "sha256-V5HcmwKfBrMY1U4N+gf1yWiMJ+XHH3pUvNqv20wJBek="; + cp313-aarch64-linux = "sha256-s8rr72p8a6I1WYcqtz3NgEDHFW74DN4LWRGLvf0k53k="; cp313-x86_64-darwin = cp313-aarch64-darwin; - cp313-x86_64-linux = "sha256-bgB87cLGn1oXkY0P406I6V8WcLXCSsgooN8rFxY0NFk="; + cp313-x86_64-linux = "sha256-JAqrYPz7/lhvRW1uy8yOyjtapf/nF+agjEHIKWQCYTc="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" @@ -33,7 +33,7 @@ let in buildPythonPackage rec { pname = "gurobipy"; - version = "12.0.1"; + version = "12.0.2"; inherit format; src = fetchPypi { diff --git a/pkgs/development/python-modules/linode-metadata/default.nix b/pkgs/development/python-modules/linode-metadata/default.nix index a7b47d18efdc..03dca820a8aa 100644 --- a/pkgs/development/python-modules/linode-metadata/default.nix +++ b/pkgs/development/python-modules/linode-metadata/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "linode-metadata"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { pname = "linode_metadata"; inherit version; - hash = "sha256-ZFCv9f4hbiBaJuKvzs/BGFoP+mAFwVa8OFF22b22voI="; + hash = "sha256-EnOW3o3Y/6wzX8z4JIWqy0zSkP2iyQQfDxHBXmKt3mQ="; }; pyproject = true; diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index cdf638c671eb..46fef3318315 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mcpadapt"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-1GgQ2JVCSNCnsxPS82e+6ICG7ChTGFYiejCPtI827Yk="; + hash = "sha256-crxruowqZ5/tLH61w+M/862rbwELEnUktFuiZCOEBfw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 98eac1bf6292..b1e60408f4e7 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.29.0"; + version = "1.30.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-eyEvGR0KEqhT3hztDZoXoRx/0+/n9Eb63JChX0OCX3I="; + hash = "sha256-YKeQkgEOiblG7RJUAf7qI8F9MYU8sFDxrVUbdYj/H0Y="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 17f0146c72b7..6fabf507a2d0 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "pep8-naming"; tag = version; - hash = "sha256-LOHPLS0BtKsocghi3K24VitlRCwyHbYZB6916i7Gj9c="; + hash = "sha256-swSaMOrgd6R4i92LodJVsquls9wp5ZFyzK0LNqwODoc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index fa5fec3fb2ed..c556ee6b0322 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250509"; + version = "1.0.2.20250514"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T6N0QEVucZie4HkUSuJ5Bo3LHMViXRJq/8yLvAEv2l0="; + hash = "sha256-mhQVQQGFJFr3s4f3qHoAzUo0dMe0HEOuHW2II0MrD3o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyporscheconnectapi/default.nix b/pkgs/development/python-modules/pyporscheconnectapi/default.nix index 13ee074de752..73116e365fe6 100644 --- a/pkgs/development/python-modules/pyporscheconnectapi/default.nix +++ b/pkgs/development/python-modules/pyporscheconnectapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyporscheconnectapi"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "CJNE"; repo = "pyporscheconnectapi"; tag = version; - hash = "sha256-MQYhIp+DUYcRKAEwcT8qzrFY043b33BHR8jma3jR0lE="; + hash = "sha256-fU+P2M4TQzhyNk4CfcTBpaIOFC0sPaOLh/iGCjLIG5I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 51c8d4bdd01b..459edd42b611 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -2,46 +2,63 @@ lib, buildPythonPackage, fetchPypi, + ipykernel, + msgpack, + networkx, + nglview, + numpy, psutil, py-cpuinfo, pydantic, pytestCheckHook, - pythonOlder, pyyaml, qcelemental, - msgpack, + scipy, + setuptools, }: buildPythonPackage rec { pname = "qcengine"; - version = "0.31.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.32.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-UXddmCObC1H4GQT1eUZEWXDwWg2dE5xaibVq+TAMHk8="; + hash = "sha256-HvvWak7a2djF6wDJaHsBltaG1dTGbKH7wjsngO+fh2U="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ + msgpack + numpy psutil py-cpuinfo pydantic pyyaml qcelemental - msgpack ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + align = [ + networkx + scipy + ]; + viz = [ + ipykernel + nglview + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "qcengine" ]; meta = with lib; { description = "Quantum chemistry program executor and IO standardizer (QCSchema) for quantum chemistry"; - mainProgram = "qcengine"; - homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/"; + homepage = "https://molssi.github.io/QCElemental/"; license = licenses.bsd3; maintainers = with maintainers; [ sheepforce ]; + mainProgram = "qcengine"; }; } diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 2dc27793c2ba..9fbbe8210278 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.7.10"; + version = "0.7.11"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-4A/pemu8inIoHjF1Q7INtaEQe4zOU48n4DpwQogtzb4="; + hash = "sha256-WL61XQGBkTXHQBMEbw/pr+PrkinUGT8cPGhquduPgRY="; }; # 'rich' is also somehow checked when building the wheel, diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index f6486bbd1cdb..0240ed4b23d0 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -1,21 +1,22 @@ { lib, buildPythonPackage, + ecdsa, fetchFromGitHub, flask, pytestCheckHook, python-http-client, pythonOlder, pyyaml, + setuptools, starkbank-ecdsa, - six, werkzeug, }: buildPythonPackage rec { pname = "sendgrid"; - version = "6.12.0"; - format = "setuptools"; + version = "6.12.2"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -23,13 +24,15 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; tag = version; - hash = "sha256-+1Tkue09C2qqCqN8lbseo2MzVbx+qDE/M/3r3Q6EXYE="; + hash = "sha256-p9U/tno5LhcfhhZE4iPspN2Du0RA7vurqwxlZmTwavk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ + ecdsa python-http-client starkbank-ecdsa - six ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index ea5a1419f7cd..c7a795e44ee1 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -123,6 +123,7 @@ buildPythonPackage rec { "test_vision_web_browser_main" # Tests require network access "test_agent_type_output" + "test_call_different_providers_without_key" "test_can_import_sklearn_if_explicitly_authorized" "test_transformers_message_no_tool" "test_transformers_message_vl_no_tool" @@ -148,7 +149,7 @@ buildPythonPackage rec { meta = { description = "Barebones library for agents"; homepage = "https://github.com/huggingface/smolagents"; - changelog = "https://github.com/huggingface/smolagents/releases/tag/v${src.tag}"; + changelog = "https://github.com/huggingface/smolagents/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 940a50839852..bc547c7101ce 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.9"; + version = "0.30.10"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; tag = "v${version}"; - hash = "sha256-nyzrBvl6VnNA8cMYtKIvB7k95g5AUixz93Ptc8rQ2pM="; + hash = "sha256-BTDKn6JVqXfLiry6jES/OnsO3SGniEMWW2osf9veukU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-markdown-builder/default.nix b/pkgs/development/python-modules/sphinx-markdown-builder/default.nix index f18be6f09f46..9238b0c5c38b 100644 --- a/pkgs/development/python-modules/sphinx-markdown-builder/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-builder/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, nix-update-script, + fetchpatch2, # build system setuptools, @@ -42,6 +43,15 @@ buildPythonPackage rec { hash = "sha256-dPMOOG3myh9i2ez9uhasqLnlV0BEsE9CHEbZ57VWzAo="; }; + patches = [ + # FIX: tests (remove with the next release) + # https://github.com/liran-funaro/sphinx-markdown-builder/issues/32 + (fetchpatch2 { + url = "https://github.com/liran-funaro/sphinx-markdown-builder/commit/967edca036a73f7644251abd52a5da8451a10dd4.patch"; + hash = "sha256-FGMYzd5k3Q0UvOccCvUSW3y6gor+AUncj2qv38xyOp4="; + }) + ]; + build-system = [ setuptools wheel diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 07d61ed76fcb..c3a51442daeb 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.1375"; + version = "3.0.1377"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-FVFN0qnyOuAfs10Lee9S2CkwtBWoBMTjLFw2hnwO9E4="; + hash = "sha256-y4l83suhI+ijDzg1046J/4lryU/o1d31RAhN9lVAdDg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 566c6fc82f11..d4747dd99e40 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.21.1"; + version = "2.22.0"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-rQmXEGNaFqBt+Z2a65V+DEiDWCAd//X3b3P17CmH/Ds="; + hash = "sha256-BMas2YT5o30i2y6/Zw/4TlX28ifTzHHpspdyDUpxtxg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 6bf02f476388..0c0398330567 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; tag = version; - hash = "sha256-5Mlt4tjlk3wcLa3vHjpu3jzb6jUfLlHLADI5HSGyA14="; + hash = "sha256-iuub8ZO5XN5PWTDGlo/8U7A7+1NpSVGFtG+EmJR9VfM="; }; build-system = [ setuptools ]; @@ -43,10 +43,11 @@ buildPythonPackage rec { disabledTests = [ # Test requires network access - "test_start_secure_routing_manual" - "test_start_secure_routing_knx_keys" - "test_scan_timeout" "test_routing_indication_multicast" + "test_scan_timeout" + "test_start_secure_routing_explicit_keyring" + "test_start_secure_routing_knx_keys" + "test_start_secure_routing_manual" # RuntimeError: Event loop is closed "test_has_group_address_localtime" "test_invalid_authentication" diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 3c3e3a07db27..9e27d760c19e 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.4.5"; + version = "4.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; tag = "v${version}"; - hash = "sha256-4PU3q3VU+H+Rho1qELTNJ+YJX5dF0u8N52TiYeFw8po="; + hash = "sha256-J2A1dBLo5LtO1ldRuopfTjaew38B27D4wE+y387bQvs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/rocm-modules/5/clang-ocl/default.nix b/pkgs/development/rocm-modules/5/clang-ocl/default.nix deleted file mode 100644 index c0a9e21b7506..000000000000 --- a/pkgs/development/rocm-modules/5/clang-ocl/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocm-device-libs, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "clang-ocl"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "clang-ocl"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ rocm-device-libs ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "OpenCL compilation with clang compiler"; - mainProgram = "clang-ocl"; - homepage = "https://github.com/ROCm/clang-ocl"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/clr/add-missing-operators.patch b/pkgs/development/rocm-modules/5/clr/add-missing-operators.patch deleted file mode 100644 index 64ac0c081a02..000000000000 --- a/pkgs/development/rocm-modules/5/clr/add-missing-operators.patch +++ /dev/null @@ -1,979 +0,0 @@ -From 86bd518981b364c138f9901b28a529899d8654f3 Mon Sep 17 00:00:00 2001 -From: Jatin Chaudhary -Date: Wed, 11 Oct 2023 23:19:29 +0100 -Subject: [PATCH] SWDEV-367537 - Add missing operators to __hip_bfloat16 - implementation - -Add __host__ and __device__ to bunch of operator/function matching CUDA -Fix some bugs seen in __hisinf - -Change-Id: I9e67e3e3eb2083b463158f3e250e5221c89b2896 ---- - hipamd/include/hip/amd_detail/amd_hip_bf16.h | 533 ++++++++++++++++--- - 1 file changed, 446 insertions(+), 87 deletions(-) - -diff --git a/hipamd/include/hip/amd_detail/amd_hip_bf16.h b/hipamd/include/hip/amd_detail/amd_hip_bf16.h -index 757cb7ada..b15ea3b65 100644 ---- a/hipamd/include/hip/amd_detail/amd_hip_bf16.h -+++ b/hipamd/include/hip/amd_detail/amd_hip_bf16.h -@@ -96,10 +96,20 @@ - #if defined(__HIPCC_RTC__) - #define __HOST_DEVICE__ __device__ - #else -+#include - #include --#define __HOST_DEVICE__ __host__ __device__ -+#include -+#define __HOST_DEVICE__ __host__ __device__ inline - #endif - -+#define HIPRT_ONE_BF16 __float2bfloat16(1.0f) -+#define HIPRT_ZERO_BF16 __float2bfloat16(0.0f) -+#define HIPRT_INF_BF16 __ushort_as_bfloat16((unsigned short)0x7F80U) -+#define HIPRT_MAX_NORMAL_BF16 __ushort_as_bfloat16((unsigned short)0x7F7FU) -+#define HIPRT_MIN_DENORM_BF16 __ushort_as_bfloat16((unsigned short)0x0001U) -+#define HIPRT_NAN_BF16 __ushort_as_bfloat16((unsigned short)0x7FFFU) -+#define HIPRT_NEG_ZERO_BF16 __ushort_as_bfloat16((unsigned short)0x8000U) -+ - // Since we are using unsigned short to represent data in bfloat16, it can be of different sizes on - // different machines. These naive checks should prevent some undefined behavior on systems which - // have different sizes for basic types. -@@ -189,7 +199,7 @@ __HOST_DEVICE__ float2 __bfloat1622float2(const __hip_bfloat162 a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Moves bfloat16 value to bfloat162 - */ --__device__ __hip_bfloat162 __bfloat162bfloat162(const __hip_bfloat16 a) { -+__HOST_DEVICE__ __hip_bfloat162 __bfloat162bfloat162(const __hip_bfloat16 a) { - return __hip_bfloat162{a, a}; - } - -@@ -197,13 +207,13 @@ __device__ __hip_bfloat162 __bfloat162bfloat162(const __hip_bfloat16 a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Reinterprets bits in a __hip_bfloat16 as a signed short integer - */ --__device__ short int __bfloat16_as_short(const __hip_bfloat16 h) { return (short)h.data; } -+__HOST_DEVICE__ short int __bfloat16_as_short(const __hip_bfloat16 h) { return (short)h.data; } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Reinterprets bits in a __hip_bfloat16 as an unsigned signed short integer - */ --__device__ unsigned short int __bfloat16_as_ushort(const __hip_bfloat16 h) { return h.data; } -+__HOST_DEVICE__ unsigned short int __bfloat16_as_ushort(const __hip_bfloat16 h) { return h.data; } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV -@@ -225,7 +235,7 @@ __HOST_DEVICE__ __hip_bfloat162 __float22bfloat162_rn(const float2 a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Combine two __hip_bfloat16 to __hip_bfloat162 - */ --__device__ __hip_bfloat162 __halves2bfloat162(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ __hip_bfloat162 __halves2bfloat162(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __hip_bfloat162{a, b}; - } - -@@ -233,13 +243,13 @@ __device__ __hip_bfloat162 __halves2bfloat162(const __hip_bfloat16 a, const __hi - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Returns high 16 bits of __hip_bfloat162 - */ --__device__ __hip_bfloat16 __high2bfloat16(const __hip_bfloat162 a) { return a.y; } -+__HOST_DEVICE__ __hip_bfloat16 __high2bfloat16(const __hip_bfloat162 a) { return a.y; } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Returns high 16 bits of __hip_bfloat162 - */ --__device__ __hip_bfloat162 __high2bfloat162(const __hip_bfloat162 a) { -+__HOST_DEVICE__ __hip_bfloat162 __high2bfloat162(const __hip_bfloat162 a) { - return __hip_bfloat162{a.y, a.y}; - } - -@@ -253,7 +263,8 @@ __HOST_DEVICE__ float __high2float(const __hip_bfloat162 a) { return __bfloat162 - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Extracts high 16 bits from each and combines them - */ --__device__ __hip_bfloat162 __highs2bfloat162(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ __hip_bfloat162 __highs2bfloat162(const __hip_bfloat162 a, -+ const __hip_bfloat162 b) { - return __hip_bfloat162{a.y, b.y}; - } - -@@ -261,13 +272,13 @@ __device__ __hip_bfloat162 __highs2bfloat162(const __hip_bfloat162 a, const __hi - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Returns low 16 bits of __hip_bfloat162 - */ --__device__ __hip_bfloat16 __low2bfloat16(const __hip_bfloat162 a) { return a.x; } -+__HOST_DEVICE__ __hip_bfloat16 __low2bfloat16(const __hip_bfloat162 a) { return a.x; } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Returns low 16 bits of __hip_bfloat162 - */ --__device__ __hip_bfloat162 __low2bfloat162(const __hip_bfloat162 a) { -+__HOST_DEVICE__ __hip_bfloat162 __low2bfloat162(const __hip_bfloat162 a) { - return __hip_bfloat162{a.x, a.x}; - } - -@@ -281,7 +292,7 @@ __HOST_DEVICE__ float __low2float(const __hip_bfloat162 a) { return __bfloat162f - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Swaps both halves - */ --__device__ __hip_bfloat162 __lowhigh2highlow(const __hip_bfloat162 a) { -+__HOST_DEVICE__ __hip_bfloat162 __lowhigh2highlow(const __hip_bfloat162 a) { - return __hip_bfloat162{a.y, a.x}; - } - -@@ -289,7 +300,7 @@ __device__ __hip_bfloat162 __lowhigh2highlow(const __hip_bfloat162 a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Extracts low 16 bits from each and combines them - */ --__device__ __hip_bfloat162 __lows2bfloat162(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ __hip_bfloat162 __lows2bfloat162(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hip_bfloat162{a.x, b.x}; - } - -@@ -297,7 +308,7 @@ __device__ __hip_bfloat162 __lows2bfloat162(const __hip_bfloat162 a, const __hip - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Reinterprets short int into a bfloat16 - */ --__device__ __hip_bfloat16 __short_as_bfloat16(const short int a) { -+__HOST_DEVICE__ __hip_bfloat16 __short_as_bfloat16(const short int a) { - return __hip_bfloat16{(unsigned short)a}; - } - -@@ -305,7 +316,7 @@ __device__ __hip_bfloat16 __short_as_bfloat16(const short int a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_CONV - * \brief Reinterprets unsigned short int into a bfloat16 - */ --__device__ __hip_bfloat16 __ushort_as_bfloat16(const unsigned short int a) { -+__HOST_DEVICE__ __hip_bfloat16 __ushort_as_bfloat16(const unsigned short int a) { - return __hip_bfloat16{a}; - } - -@@ -314,7 +325,7 @@ __device__ __hip_bfloat16 __ushort_as_bfloat16(const unsigned short int a) { - * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH - * \brief Adds two bfloat16 values - */ --__device__ __hip_bfloat16 __hadd(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ __hip_bfloat16 __hadd(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __float2bfloat16(__bfloat162float(a) + __bfloat162float(b)); - } - -@@ -322,7 +333,7 @@ __device__ __hip_bfloat16 __hadd(const __hip_bfloat16 a, const __hip_bfloat16 b) - * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH - * \brief Subtracts two bfloat16 values - */ --__device__ __hip_bfloat16 __hsub(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ __hip_bfloat16 __hsub(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __float2bfloat16(__bfloat162float(a) - __bfloat162float(b)); - } - -@@ -330,7 +341,7 @@ __device__ __hip_bfloat16 __hsub(const __hip_bfloat16 a, const __hip_bfloat16 b) - * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH - * \brief Divides two bfloat16 values - */ --__device__ __hip_bfloat16 __hdiv(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ __hip_bfloat16 __hdiv(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __float2bfloat16(__bfloat162float(a) / __bfloat162float(b)); - } - -@@ -348,7 +359,7 @@ __device__ __hip_bfloat16 __hfma(const __hip_bfloat16 a, const __hip_bfloat16 b, - * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH - * \brief Multiplies two bfloat16 values - */ --__device__ __hip_bfloat16 __hmul(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ __hip_bfloat16 __hmul(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __float2bfloat16(__bfloat162float(a) * __bfloat162float(b)); - } - -@@ -356,7 +367,7 @@ __device__ __hip_bfloat16 __hmul(const __hip_bfloat16 a, const __hip_bfloat16 b) - * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH - * \brief Negate a bfloat16 value - */ --__device__ __hip_bfloat16 __hneg(const __hip_bfloat16 a) { -+__HOST_DEVICE__ __hip_bfloat16 __hneg(const __hip_bfloat16 a) { - auto ret = a; - ret.data ^= 0x8000; - return ret; -@@ -366,7 +377,7 @@ __device__ __hip_bfloat16 __hneg(const __hip_bfloat16 a) { - * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH - * \brief Returns absolute of a bfloat16 - */ --__device__ __hip_bfloat16 __habs(const __hip_bfloat16 a) { -+__HOST_DEVICE__ __hip_bfloat16 __habs(const __hip_bfloat16 a) { - auto ret = a; - ret.data &= 0x7FFF; - return ret; -@@ -376,7 +387,7 @@ __device__ __hip_bfloat16 __habs(const __hip_bfloat16 a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH - * \brief Divides bfloat162 values - */ --__device__ __hip_bfloat162 __h2div(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ __hip_bfloat162 __h2div(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hip_bfloat162{__float2bfloat16(__bfloat162float(a.x) / __bfloat162float(b.x)), - __float2bfloat16(__bfloat162float(a.y) / __bfloat162float(b.y))}; - } -@@ -385,7 +396,7 @@ __device__ __hip_bfloat162 __h2div(const __hip_bfloat162 a, const __hip_bfloat16 - * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH - * \brief Returns absolute of a bfloat162 - */ --__device__ __hip_bfloat162 __habs2(const __hip_bfloat162 a) { -+__HOST_DEVICE__ __hip_bfloat162 __habs2(const __hip_bfloat162 a) { - return __hip_bfloat162{__habs(a.x), __habs(a.y)}; - } - -@@ -393,7 +404,7 @@ __device__ __hip_bfloat162 __habs2(const __hip_bfloat162 a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH - * \brief Adds two bfloat162 values - */ --__device__ __hip_bfloat162 __hadd2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ __hip_bfloat162 __hadd2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hip_bfloat162{__hadd(a.x, b.x), __hadd(a.y, b.y)}; - } - -@@ -410,7 +421,7 @@ __device__ __hip_bfloat162 __hfma2(const __hip_bfloat162 a, const __hip_bfloat16 - * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH - * \brief Multiplies two bfloat162 values - */ --__device__ __hip_bfloat162 __hmul2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ __hip_bfloat162 __hmul2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hip_bfloat162{__hmul(a.x, b.x), __hmul(a.y, b.y)}; - } - -@@ -418,7 +429,7 @@ __device__ __hip_bfloat162 __hmul2(const __hip_bfloat162 a, const __hip_bfloat16 - * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH - * \brief Converts a bfloat162 into negative - */ --__device__ __hip_bfloat162 __hneg2(const __hip_bfloat162 a) { -+__HOST_DEVICE__ __hip_bfloat162 __hneg2(const __hip_bfloat162 a) { - return __hip_bfloat162{__hneg(a.x), __hneg(a.y)}; - } - -@@ -426,15 +437,251 @@ __device__ __hip_bfloat162 __hneg2(const __hip_bfloat162 a) { - * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH - * \brief Subtracts two bfloat162 values - */ --__device__ __hip_bfloat162 __hsub2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ __hip_bfloat162 __hsub2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hip_bfloat162{__hsub(a.x, b.x), __hsub(a.y, b.y)}; - } - -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to multiply two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator*(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hmul(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to multiply-assign two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator*=(__hip_bfloat16& l, const __hip_bfloat16& r) { -+ l = __hmul(l, r); -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to unary+ on a __hip_bfloat16 number -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator+(const __hip_bfloat16& l) { return l; } -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to add two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator+(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hadd(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to negate a __hip_bfloat16 number -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator-(const __hip_bfloat16& l) { return __hneg(l); } -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to subtract two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator-(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hsub(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to post increment a __hip_bfloat16 number -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator++(__hip_bfloat16& l, const int) { -+ auto ret = l; -+ l = __hadd(l, HIPRT_ONE_BF16); -+ return ret; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to pre increment a __hip_bfloat16 number -+ */ -+__HOST_DEVICE__ __hip_bfloat16& operator++(__hip_bfloat16& l) { -+ l = __hadd(l, HIPRT_ONE_BF16); -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to post decrement a __hip_bfloat16 number -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator--(__hip_bfloat16& l, const int) { -+ auto ret = l; -+ l = __hsub(l, HIPRT_ONE_BF16); -+ return ret; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to pre decrement a __hip_bfloat16 number -+ */ -+__HOST_DEVICE__ __hip_bfloat16& operator--(__hip_bfloat16& l) { -+ l = __hsub(l, HIPRT_ONE_BF16); -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to add-assign two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16& operator+=(__hip_bfloat16& l, const __hip_bfloat16& r) { -+ l = l + r; -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to subtract-assign two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16& operator-=(__hip_bfloat16& l, const __hip_bfloat16& r) { -+ l = l - r; -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to divide two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16 operator/(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hdiv(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH -+ * \brief Operator to divide-assign two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat16& operator/=(__hip_bfloat16& l, const __hip_bfloat16& r) { -+ l = l / r; -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to multiply two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator*(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hmul2(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to multiply-assign two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator*=(__hip_bfloat162& l, const __hip_bfloat162& r) { -+ l = __hmul2(l, r); -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to unary+ on a __hip_bfloat162 number -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator+(const __hip_bfloat162& l) { return l; } -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to add two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator+(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hadd2(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to negate a __hip_bfloat162 number -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator-(const __hip_bfloat162& l) { return __hneg2(l); } -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to subtract two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator-(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hsub2(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to post increment a __hip_bfloat162 number -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator++(__hip_bfloat162& l, const int) { -+ auto ret = l; -+ l = __hadd2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); -+ return ret; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to pre increment a __hip_bfloat162 number -+ */ -+__HOST_DEVICE__ __hip_bfloat162& operator++(__hip_bfloat162& l) { -+ l = __hadd2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to post decrement a __hip_bfloat162 number -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator--(__hip_bfloat162& l, const int) { -+ auto ret = l; -+ l = __hsub2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); -+ return ret; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to pre decrement a __hip_bfloat162 number -+ */ -+__HOST_DEVICE__ __hip_bfloat162& operator--(__hip_bfloat162& l) { -+ l = __hsub2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to add-assign two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162& operator+=(__hip_bfloat162& l, const __hip_bfloat162& r) { -+ l = l + r; -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to subtract-assign two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162& operator-=(__hip_bfloat162& l, const __hip_bfloat162& r) { -+ l = l - r; -+ return l; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to divide two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162 operator/(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __h2div(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH -+ * \brief Operator to divide-assign two __hip_bfloat162 numbers -+ */ -+__HOST_DEVICE__ __hip_bfloat162& operator/=(__hip_bfloat162& l, const __hip_bfloat162& r) { -+ l = l / r; -+ return l; -+} -+ - /** - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - */ --__device__ bool __heq(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __heq(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __bfloat162float(a) == __bfloat162float(b); - } - -@@ -442,7 +689,7 @@ __device__ bool __heq(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - unordered equal - */ --__device__ bool __hequ(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hequ(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return !(__bfloat162float(a) < __bfloat162float(b)) && - !(__bfloat162float(a) > __bfloat162float(b)); - } -@@ -451,7 +698,7 @@ __device__ bool __hequ(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - greater than - */ --__device__ bool __hgt(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hgt(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __bfloat162float(a) > __bfloat162float(b); - } - -@@ -459,7 +706,7 @@ __device__ bool __hgt(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - unordered greater than - */ --__device__ bool __hgtu(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hgtu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return !(__bfloat162float(a) <= __bfloat162float(b)); - } - -@@ -467,7 +714,7 @@ __device__ bool __hgtu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - greater than equal - */ --__device__ bool __hge(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hge(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __bfloat162float(a) >= __bfloat162float(b); - } - -@@ -475,7 +722,7 @@ __device__ bool __hge(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - unordered greater than equal - */ --__device__ bool __hgeu(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hgeu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return !(__bfloat162float(a) < __bfloat162float(b)); - } - -@@ -483,7 +730,7 @@ __device__ bool __hgeu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - not equal - */ --__device__ bool __hne(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hne(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __bfloat162float(a) != __bfloat162float(b); - } - -@@ -491,7 +738,7 @@ __device__ bool __hne(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - unordered not equal - */ --__device__ bool __hneu(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hneu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return !(__bfloat162float(a) == __bfloat162float(b)); - } - -@@ -499,23 +746,31 @@ __device__ bool __hneu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - return max - */ --__device__ __hip_bfloat16 __hmax(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ __hip_bfloat16 __hmax(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+#if __HIP_DEVICE_COMPILE__ - return __float2bfloat16(__ocml_fmax_f32(__bfloat162float(a), __bfloat162float(b))); -+#else -+ return __float2bfloat16(std::max(__bfloat162float(a), __bfloat162float(b))); -+#endif - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - return min - */ --__device__ __hip_bfloat16 __hmin(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ __hip_bfloat16 __hmin(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+#if __HIP_DEVICE_COMPILE__ - return __float2bfloat16(__ocml_fmin_f32(__bfloat162float(a), __bfloat162float(b))); -+#else -+ return __float2bfloat16(std::min(__bfloat162float(a), __bfloat162float(b))); -+#endif - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - less than operator - */ --__device__ bool __hlt(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hlt(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __bfloat162float(a) < __bfloat162float(b); - } - -@@ -523,15 +778,15 @@ __device__ bool __hlt(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - unordered less than - */ --__device__ bool __hltu(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hltu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return !(__bfloat162float(a) >= __bfloat162float(b)); - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -- * \brief Compare two bfloat162 values - less than -+ * \brief Compare two bfloat162 values - less than equal - */ --__device__ bool __hle(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hle(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return __bfloat162float(a) <= __bfloat162float(b); - } - -@@ -539,7 +794,7 @@ __device__ bool __hle(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Compare two bfloat162 values - unordered less than equal - */ --__device__ bool __hleu(const __hip_bfloat16 a, const __hip_bfloat16 b) { -+__HOST_DEVICE__ bool __hleu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - return !(__bfloat162float(a) > __bfloat162float(b)); - } - -@@ -547,19 +802,33 @@ __device__ bool __hleu(const __hip_bfloat16 a, const __hip_bfloat16 b) { - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Checks if number is inf - */ --__device__ int __hisinf(const __hip_bfloat16 a) { return __ocml_isinf_f32(__bfloat162float(a)); } -+__HOST_DEVICE__ int __hisinf(const __hip_bfloat16 a) { -+ unsigned short sign = a.data & 0x8000U; -+#if __HIP_DEVICE_COMPILE__ -+ int res = __ocml_isinf_f32(__bfloat162float(a)); -+#else -+ int res = std::isinf(__bfloat162float(a)) ? 1 : 0; -+#endif -+ return (res == 0) ? res : ((sign != 0U) ? -res : res); -+} - - /** - * \ingroup HIP_INTRINSIC_BFLOAT16_COMP - * \brief Checks if number is nan - */ --__device__ bool __hisnan(const __hip_bfloat16 a) { return __ocml_isnan_f32(__bfloat162float(a)); } -+__HOST_DEVICE__ bool __hisnan(const __hip_bfloat16 a) { -+#if __HIP_DEVICE_COMPILE__ -+ return __ocml_isnan_f32(__bfloat162float(a)); -+#else -+ return std::isnan(__bfloat162float(a)); -+#endif -+} - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Checks if two numbers are equal - */ --__device__ bool __hbeq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbeq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __heq(a.x, b.x) && __heq(a.y, b.y); - } - -@@ -567,7 +836,7 @@ __device__ bool __hbeq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Checks if two numbers are equal - unordered - */ --__device__ bool __hbequ2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbequ2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hequ(a.x, b.x) && __hequ(a.y, b.y); - } - -@@ -575,7 +844,7 @@ __device__ bool __hbequ2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a >= b - */ --__device__ bool __hbge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hge(a.x, b.x) && __hge(a.y, b.y); - } - -@@ -583,7 +852,7 @@ __device__ bool __hbge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a >= b - unordered - */ --__device__ bool __hbgeu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbgeu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hgeu(a.x, b.x) && __hgeu(a.y, b.y); - } - -@@ -591,7 +860,7 @@ __device__ bool __hbgeu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a > b - */ --__device__ bool __hbgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hgt(a.x, b.x) && __hgt(a.y, b.y); - } - -@@ -599,7 +868,7 @@ __device__ bool __hbgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a > b - unordered - */ --__device__ bool __hbgtu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbgtu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hgtu(a.x, b.x) && __hgtu(a.y, b.y); - } - -@@ -607,7 +876,7 @@ __device__ bool __hbgtu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a <= b - */ --__device__ bool __hble2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hble2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hle(a.x, b.x) && __hle(a.y, b.y); - } - -@@ -615,7 +884,7 @@ __device__ bool __hble2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a <= b - unordered - */ --__device__ bool __hbleu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbleu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hleu(a.x, b.x) && __hleu(a.y, b.y); - } - -@@ -623,7 +892,7 @@ __device__ bool __hbleu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a < b - */ --__device__ bool __hblt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hblt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hlt(a.x, b.x) && __hlt(a.y, b.y); - } - -@@ -631,7 +900,7 @@ __device__ bool __hblt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a < b - unordered - */ --__device__ bool __hbltu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbltu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hltu(a.x, b.x) && __hltu(a.y, b.y); - } - -@@ -639,7 +908,7 @@ __device__ bool __hbltu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a != b - */ --__device__ bool __hbne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hne(a.x, b.x) && __hne(a.y, b.y); - } - -@@ -647,7 +916,7 @@ __device__ bool __hbne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a != b - */ --__device__ bool __hbneu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+__HOST_DEVICE__ bool __hbneu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - return __hneu(a.x, b.x) && __hneu(a.y, b.y); - } - -@@ -655,84 +924,175 @@ __device__ bool __hbneu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a != b, returns 1.0 if equal, otherwise 0.0 - */ --__device__ __hip_bfloat162 __heq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{{__heq(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, -- {__heq(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; -+__HOST_DEVICE__ __hip_bfloat162 __heq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{{__heq(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, -+ {__heq(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a >= b, returns 1.0 if greater than equal, otherwise 0.0 - */ --__device__ __hip_bfloat162 __hge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{{__hge(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, -- {__hge(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; -+__HOST_DEVICE__ __hip_bfloat162 __hge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{{__hge(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, -+ {__hge(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a > b, returns 1.0 if greater than equal, otherwise 0.0 - */ --__device__ __hip_bfloat162 __hgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{{__hgt(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, -- {__hgt(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; -+__HOST_DEVICE__ __hip_bfloat162 __hgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{{__hgt(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, -+ {__hgt(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ONE_BF16}}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a is NaN, returns 1.0 if NaN, otherwise 0.0 - */ --__device__ __hip_bfloat162 __hisnan2(const __hip_bfloat162 a) { -- return __hip_bfloat162{ -- {__ocml_isnan_f32(__bfloat162float(a.x)) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, -- {__ocml_isnan_f32(__bfloat162float(a.y)) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; -+__HOST_DEVICE__ __hip_bfloat162 __hisnan2(const __hip_bfloat162 a) { -+ return __hip_bfloat162{{__hisnan(a.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, -+ {__hisnan(a.y) ? HIPRT_ONE_BF16 : HIPRT_ONE_BF16}}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a <= b, returns 1.0 if greater than equal, otherwise 0.0 - */ --__device__ __hip_bfloat162 __hle2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{{__hle(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, -- {__hle(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; -+__HOST_DEVICE__ __hip_bfloat162 __hle2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{{__hle(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, -+ {__hle(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Check for a < b, returns 1.0 if greater than equal, otherwise 0.0 - */ --__device__ __hip_bfloat162 __hlt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{{__hlt(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, -- {__hlt(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; -+__HOST_DEVICE__ __hip_bfloat162 __hlt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{{__hlt(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, -+ {__hlt(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Returns max of two elements - */ --__device__ __hip_bfloat162 __hmax2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{ -- __float2bfloat16(__ocml_fmax_f32(__bfloat162float(a.x), __bfloat162float(b.x))), -- __float2bfloat16(__ocml_fmax_f32(__bfloat162float(a.y), __bfloat162float(b.y)))}; -+__HOST_DEVICE__ __hip_bfloat162 __hmax2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{__hmax(a.x, b.x), __hmax(a.y, b.y)}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Returns min of two elements - */ --__device__ __hip_bfloat162 __hmin2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{ -- __float2bfloat16(__ocml_fmin_f32(__bfloat162float(a.x), __bfloat162float(b.x))), -- __float2bfloat16(__ocml_fmin_f32(__bfloat162float(a.y), __bfloat162float(b.y)))}; -+__HOST_DEVICE__ __hip_bfloat162 __hmin2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{__hmin(a.x, b.x), __hmin(a.y, b.y)}; - } - - /** - * \ingroup HIP_INTRINSIC_BFLOAT162_COMP - * \brief Checks for not equal to - */ --__device__ __hip_bfloat162 __hne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -- return __hip_bfloat162{{__hne(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, -- {__hne(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; -+__HOST_DEVICE__ __hip_bfloat162 __hne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { -+ return __hip_bfloat162{{__hne(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, -+ {__hne(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -+ * \brief Operator to perform an equal compare on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator==(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __heq(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -+ * \brief Operator to perform a not equal on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator!=(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hne(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -+ * \brief Operator to perform a less than on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator<(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hlt(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -+ * \brief Operator to perform a less than equal on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator<=(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hle(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -+ * \brief Operator to perform a greater than on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator>(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hgt(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -+ * \brief Operator to perform a greater than equal on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator>=(const __hip_bfloat16& l, const __hip_bfloat16& r) { -+ return __hge(l, r); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP -+ * \brief Operator to perform an equal compare on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator==(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __heq(l.x, r.x) && __heq(l.y, r.y); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP -+ * \brief Operator to perform a not equal on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator!=(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hne(l.x, r.x) || __hne(l.y, r.y); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP -+ * \brief Operator to perform a less than on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator<(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hlt(l.x, r.x) && __hlt(l.y, r.y); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP -+ * \brief Operator to perform a less than equal on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator<=(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hle(l.x, r.x) && __hle(l.y, r.y); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP -+ * \brief Operator to perform a greater than on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator>(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hgt(l.x, r.x) && __hgt(l.y, r.y); -+} -+ -+/** -+ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP -+ * \brief Operator to perform a greater than equal on two __hip_bfloat16 numbers -+ */ -+__HOST_DEVICE__ bool operator>=(const __hip_bfloat162& l, const __hip_bfloat162& r) { -+ return __hge(l.x, r.x) && __hge(l.y, r.y); - } - - /** -@@ -974,5 +1334,4 @@ __device__ __hip_bfloat162 h2sqrt(const __hip_bfloat162 h) { - __device__ __hip_bfloat162 h2trunc(const __hip_bfloat162 h) { - return __hip_bfloat162{htrunc(h.x), htrunc(h.y)}; - } -- - #endif diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix deleted file mode 100644 index cd5061bff9bc..000000000000 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ /dev/null @@ -1,200 +0,0 @@ -{ - lib, - stdenv, - callPackage, - fetchFromGitHub, - fetchurl, - rocmUpdateScript, - makeWrapper, - cmake, - perl, - clang, - hip-common, - hipcc, - rocm-device-libs, - rocm-comgr, - rocm-runtime, - roctracer, - rocminfo, - rocm-smi, - numactl, - libGL, - libxml2, - libX11, - python3Packages, -}: - -let - wrapperArgs = [ - "--prefix PATH : $out/bin" - "--prefix LD_LIBRARY_PATH : ${rocm-runtime}" - "--set HIP_PLATFORM amd" - "--set HIP_PATH $out" - "--set HIP_CLANG_PATH ${clang}/bin" - "--set DEVICE_LIB_PATH ${rocm-device-libs}/amdgcn/bitcode" - "--set HSA_PATH ${rocm-runtime}" - "--set ROCM_PATH $out" - ]; - - # https://github.com/NixOS/nixpkgs/issues/305641 - # Not needed when 3.29.2 is in unstable - cmake' = cmake.overrideAttrs (old: rec { - version = "3.29.2"; - src = fetchurl { - url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4="; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "clr"; - version = "5.7.1"; - - outputs = [ - "out" - "icd" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "clr"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-1gZJhvBbUFdKH9p/7SRfzEV/fM+gIN2Qvlxf2VbmAIw="; - }; - - nativeBuildInputs = [ - makeWrapper - cmake' - perl - python3Packages.python - python3Packages.cppheaderparser - ]; - - buildInputs = [ - numactl - libGL - libxml2 - libX11 - ]; - - propagatedBuildInputs = [ - rocm-device-libs - rocm-comgr - rocm-runtime - rocminfo - ]; - - cmakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0072=NEW" # Prefer newer OpenGL libraries - "-DCLR_BUILD_HIP=ON" - "-DCLR_BUILD_OCL=ON" - "-DHIP_COMMON_DIR=${hip-common}" - "-DHIPCC_BIN_DIR=${hipcc}/bin" - "-DHIP_PLATFORM=amd" - "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" - "-DROCM_PATH=${rocminfo}" - - # Temporarily set variables to work around upstream CMakeLists issue - # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - patches = [ - ./add-missing-operators.patch - ./static-functions.patch - ]; - - postPatch = '' - patchShebangs hipamd/src - - # We're not on Windows so these are never installed to hipcc... - substituteInPlace hipamd/CMakeLists.txt \ - --replace "install(PROGRAMS \''${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)" "" \ - --replace "install(PROGRAMS \''${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)" "" - - substituteInPlace hipamd/src/hip_embed_pch.sh \ - --replace "\''$LLVM_DIR/bin/clang" "${clang}/bin/clang" - - substituteInPlace opencl/khronos/icd/loader/icd_platform.h \ - --replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \ - '#define ICD_VENDOR_PATH "/run/opengl-driver/etc/OpenCL/vendors/";' - ''; - - postInstall = '' - patchShebangs $out/bin - - # hipcc.bin and hipconfig.bin is mysteriously never installed - cp -a ${hipcc}/bin/{hipcc.bin,hipconfig.bin} $out/bin - - wrapProgram $out/bin/hipcc.bin ${lib.concatStringsSep " " wrapperArgs} - wrapProgram $out/bin/hipconfig.bin ${lib.concatStringsSep " " wrapperArgs} - wrapProgram $out/bin/hipcc.pl ${lib.concatStringsSep " " wrapperArgs} - wrapProgram $out/bin/hipconfig.pl ${lib.concatStringsSep " " wrapperArgs} - - # Just link rocminfo, it's easier - ln -s ${rocminfo}/bin/* $out/bin - - # Replace rocm-opencl-icd functionality - mkdir -p $icd/etc/OpenCL/vendors - echo "$out/lib/libamdocl64.so" > $icd/etc/OpenCL/vendors/amdocl64.icd - - # add version info to output (downstream rocmPackages look for this) - echo "HIP_VERSION_MAJOR=${builtins.elemAt (lib.splitVersion finalAttrs.version) 0}" > $out/bin/.hipVersion - echo "HIP_VERSION_MINOR=${builtins.elemAt (lib.splitVersion finalAttrs.version) 1}" >> $out/bin/.hipVersion - echo "HIP_VERSION_PATCH=${builtins.elemAt (lib.splitVersion finalAttrs.version) 2}" >> $out/bin/.hipVersion - ''; - - passthru = { - # All known and valid general GPU targets - # We cannot use this for each ROCm library, as each defines their own supported targets - # See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix - gpuTargets = lib.forEach [ - "803" - "900" - "906" - "908" - "90a" - "940" - "941" - "942" - "1010" - "1012" - "1030" - "1100" - "1101" - "1102" - ] (target: "gfx${target}"); - - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - page = "tags?per_page=1"; - filter = ".[0].name | split(\"-\") | .[1]"; - }; - - impureTests = { - rocm-smi = callPackage ./test-rocm-smi.nix { - inherit rocm-smi; - clr = finalAttrs.finalPackage; - }; - opencl-example = callPackage ./test-opencl-example.nix { - clr = finalAttrs.finalPackage; - }; - }; - }; - - meta = with lib; { - description = "AMD Common Language Runtime for hipamd, opencl, and rocclr"; - homepage = "https://github.com/ROCm/clr"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/clr/static-functions.patch b/pkgs/development/rocm-modules/5/clr/static-functions.patch deleted file mode 100644 index 87d9528691ce..000000000000 --- a/pkgs/development/rocm-modules/5/clr/static-functions.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 77c581a3ebd47b5e2908973b70adea66891159ee Mon Sep 17 00:00:00 2001 -From: Jatin Chaudhary -Date: Mon, 4 Dec 2023 17:21:39 +0000 -Subject: [PATCH] SWDEV-435702 - the functions in bf16 header need to be static - -If the compiler decides not to inline these functions, we might break ODR (one definition rule) due to this file being included in multiple files and being linked together - -Change-Id: Iacbfdabb53f5b4e5db8c690b23f3730ec9af16c0 ---- - hipamd/include/hip/amd_detail/amd_hip_bf16.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hipamd/include/hip/amd_detail/amd_hip_bf16.h b/hipamd/include/hip/amd_detail/amd_hip_bf16.h -index 836e090eb..204269a84 100644 ---- a/hipamd/include/hip/amd_detail/amd_hip_bf16.h -+++ b/hipamd/include/hip/amd_detail/amd_hip_bf16.h -@@ -94,12 +94,12 @@ - #include "math_fwd.h" // ocml device functions - - #if defined(__HIPCC_RTC__) --#define __HOST_DEVICE__ __device__ -+#define __HOST_DEVICE__ __device__ static - #else - #include - #include - #include --#define __HOST_DEVICE__ __host__ __device__ inline -+#define __HOST_DEVICE__ __host__ __device__ static inline - #endif - - #define HIPRT_ONE_BF16 __float2bfloat16(1.0f) diff --git a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix deleted file mode 100644 index dd63ed97bd0e..000000000000 --- a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - lib, - stdenv, - makeImpureTest, - fetchFromGitHub, - clr, - cmake, - pkg-config, - glew, - libglut, - opencl-headers, - ocl-icd, -}: - -let - - examples = stdenv.mkDerivation { - pname = "amd-app-samples"; - version = "2018-06-10"; - - src = fetchFromGitHub { - owner = "OpenCL"; - repo = "AMD_APP_samples"; - rev = "54da6ca465634e78fc51fc25edf5840467ee2411"; - hash = "sha256-qARQpUiYsamHbko/I1gPZE9pUGJ+3396Vk2n7ERSftA="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - glew - libglut - opencl-headers - ocl-icd - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - # Example path is bin/x86_64/Release/cl/Reduction/Reduction - cp -r bin/*/*/*/*/* $out/bin/ - - runHook postInstall - ''; - - cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; - - meta = with lib; { - description = "Samples from the AMD APP SDK (with OpenCRun support)"; - homepage = "https://github.com/OpenCL/AMD_APP_samples"; - license = licenses.bsd2; - platforms = platforms.linux; - teams = [ lib.teams.rocm ]; - }; - }; - -in -makeImpureTest { - name = "opencl-example"; - testedPackage = "rocmPackages_5.clr"; - - sandboxPaths = [ - "/sys" - "/dev/dri" - "/dev/kfd" - ]; - - nativeBuildInputs = [ examples ]; - - OCL_ICD_VENDORS = "${clr.icd}/etc/OpenCL/vendors"; - - testScript = '' - # Examples load resources from current directory - cd ${examples}/bin - echo OCL_ICD_VENDORS=$OCL_ICD_VENDORS - pwd - - HelloWorld | grep HelloWorld - ''; - - meta = with lib; { - teams = [ teams.rocm ]; - }; -} diff --git a/pkgs/development/rocm-modules/5/clr/test-rocm-smi.nix b/pkgs/development/rocm-modules/5/clr/test-rocm-smi.nix deleted file mode 100644 index 609b8a06f550..000000000000 --- a/pkgs/development/rocm-modules/5/clr/test-rocm-smi.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - makeImpureTest, - clinfo, - clr, - rocm-smi, -}: - -makeImpureTest { - name = "rocm-smi"; - testedPackage = "rocmPackages_5.clr"; - nativeBuildInputs = [ - clinfo - rocm-smi - ]; - OCL_ICD_VENDORS = "${clr.icd}/etc/OpenCL/vendors"; - - testScript = '' - # Test fails if the number of platforms is 0 - clinfo | grep -E 'Number of platforms * [1-9]' - rocm-smi | grep -A1 GPU - ''; - - meta = with lib; { - teams = [ teams.rocm ]; - }; -} diff --git a/pkgs/development/rocm-modules/5/composable_kernel/default.nix b/pkgs/development/rocm-modules/5/composable_kernel/default.nix deleted file mode 100644 index 3df00f9ec23d..000000000000 --- a/pkgs/development/rocm-modules/5/composable_kernel/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - openmp, - clang-tools-extra, - gtest, - buildTests ? false, - buildExamples ? false, - gpuTargets ? [ ], # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "composable_kernel"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildExamples [ - "example" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "composable_kernel"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Z9X+S2SijGJ8bhr9ghkkWicBUzLzs9fxPpqZxX6BBM4="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - clang-tools-extra - ]; - - buildInputs = [ openmp ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names - ]; - - # No flags to build selectively it seems... - postPatch = - lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - '' - + lib.optionalString (!buildExamples) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(example)" "" - ''; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' - + lib.optionalString buildExamples '' - mkdir -p $example/bin - mv $out/bin/example_* $example/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - # Times out otherwise - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "Performance portable programming model for machine learning tensor operators"; - mainProgram = "ckProfiler"; - homepage = "https://github.com/ROCm/composable_kernel"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix deleted file mode 100644 index 3a1b7667093a..000000000000 --- a/pkgs/development/rocm-modules/5/default.nix +++ /dev/null @@ -1,686 +0,0 @@ -{ - gcc12Stdenv, # FIXME: Try removing this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943 - callPackage, - recurseIntoAttrs, - symlinkJoin, - fetchFromGitHub, - cudaPackages, - python3Packages, - elfutils, - boost179, - opencv, - ffmpeg_4, - libjpeg_turbo, -}: - -let - rocmUpdateScript = callPackage ./update.nix { }; -in -rec { - ## ROCm ## - llvm = recurseIntoAttrs ( - callPackage ./llvm/default.nix { - inherit - rocmUpdateScript - rocm-device-libs - rocm-runtime - rocm-thunk - clr - ; - } - ); - - rocm-core = callPackage ./rocm-core { - inherit rocmUpdateScript; - stdenv = llvm.rocmClangStdenv; - }; - - rocm-cmake = callPackage ./rocm-cmake { - inherit rocmUpdateScript; - stdenv = llvm.rocmClangStdenv; - }; - - rocm-thunk = callPackage ./rocm-thunk { - inherit rocmUpdateScript; - stdenv = llvm.rocmClangStdenv; - }; - - rocm-smi = python3Packages.callPackage ./rocm-smi { - inherit rocmUpdateScript; - stdenv = llvm.rocmClangStdenv; - }; - - # Eventually will be in the LLVM repo - rocm-device-libs = callPackage ./rocm-device-libs { - inherit rocmUpdateScript rocm-cmake; - stdenv = llvm.rocmClangStdenv; - }; - - rocm-runtime = callPackage ./rocm-runtime { - inherit rocmUpdateScript rocm-device-libs rocm-thunk; - stdenv = llvm.rocmClangStdenv; - }; - - # Eventually will be in the LLVM repo - rocm-comgr = callPackage ./rocm-comgr { - inherit rocmUpdateScript rocm-cmake rocm-device-libs; - stdenv = llvm.rocmClangStdenv; - }; - - rocminfo = callPackage ./rocminfo { - inherit rocmUpdateScript rocm-cmake rocm-runtime; - stdenv = llvm.rocmClangStdenv; - }; - - clang-ocl = callPackage ./clang-ocl { - inherit rocmUpdateScript rocm-cmake rocm-device-libs; - stdenv = llvm.rocmClangStdenv; - }; - - # Unfree - hsa-amd-aqlprofile-bin = callPackage ./hsa-amd-aqlprofile-bin { - stdenv = llvm.rocmClangStdenv; - }; - - # Broken, too many errors - rdc = callPackage ./rdc { - inherit rocmUpdateScript rocm-smi rocm-runtime; - stdenv = gcc12Stdenv; - # stdenv = llvm.rocmClangStdenv; - }; - - rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { stdenv = gcc12Stdenv; }; - - hip-common = callPackage ./hip-common { - inherit rocmUpdateScript; - stdenv = llvm.rocmClangStdenv; - }; - - # Eventually will be in the LLVM repo - hipcc = callPackage ./hipcc { - inherit rocmUpdateScript; - stdenv = llvm.rocmClangStdenv; - }; - - # Replaces hip, opencl-runtime, and rocclr - clr = callPackage ./clr { - inherit - rocmUpdateScript - hip-common - hipcc - rocm-device-libs - rocm-comgr - rocm-runtime - roctracer - rocminfo - rocm-smi - ; - inherit (llvm) clang; - stdenv = llvm.rocmClangStdenv; - }; - - hipify = callPackage ./hipify { - inherit rocmUpdateScript; - inherit (llvm) clang; - stdenv = llvm.rocmClangStdenv; - }; - - # Needs GCC - rocprofiler = callPackage ./rocprofiler { - inherit - rocmUpdateScript - clr - rocm-core - rocm-thunk - rocm-device-libs - roctracer - rocdbgapi - rocm-smi - hsa-amd-aqlprofile-bin - ; - inherit (llvm) clang; - stdenv = gcc12Stdenv; - }; - - # Needs GCC - roctracer = callPackage ./roctracer { - inherit - rocmUpdateScript - rocm-device-libs - rocm-runtime - clr - ; - stdenv = gcc12Stdenv; - }; - - # Needs GCC - rocgdb = callPackage ./rocgdb { - inherit rocmUpdateScript; - elfutils = elfutils.override { enableDebuginfod = true; }; - stdenv = gcc12Stdenv; - }; - - rocdbgapi = callPackage ./rocdbgapi { - inherit - rocmUpdateScript - rocm-cmake - rocm-comgr - rocm-runtime - ; - stdenv = llvm.rocmClangStdenv; - }; - - rocr-debug-agent = callPackage ./rocr-debug-agent { - inherit rocmUpdateScript clr rocdbgapi; - stdenv = llvm.rocmClangStdenv; - }; - - rocprim = callPackage ./rocprim { - inherit rocmUpdateScript rocm-cmake clr; - stdenv = llvm.rocmClangStdenv; - }; - - rocsparse = callPackage ./rocsparse { - inherit - rocmUpdateScript - rocm-cmake - rocprim - clr - ; - stdenv = llvm.rocmClangStdenv; - }; - - rocthrust = callPackage ./rocthrust { - inherit - rocmUpdateScript - rocm-cmake - rocprim - clr - ; - stdenv = llvm.rocmClangStdenv; - }; - - rocrand = callPackage ./rocrand { - inherit rocmUpdateScript rocm-cmake clr; - stdenv = llvm.rocmClangStdenv; - }; - - hiprand = rocrand; # rocrand includes hiprand - - rocfft = callPackage ./rocfft { - inherit - rocmUpdateScript - rocm-cmake - rocrand - rocfft - clr - ; - inherit (llvm) openmp; - stdenv = llvm.rocmClangStdenv; - }; - - rccl = callPackage ./rccl { - inherit - rocmUpdateScript - rocm-cmake - rocm-smi - clr - hipify - ; - stdenv = llvm.rocmClangStdenv; - }; - - hipcub = callPackage ./hipcub { - inherit - rocmUpdateScript - rocm-cmake - rocprim - clr - ; - stdenv = llvm.rocmClangStdenv; - }; - - hipsparse = callPackage ./hipsparse { - inherit - rocmUpdateScript - rocm-cmake - rocsparse - clr - ; - inherit (llvm) openmp; - stdenv = llvm.rocmClangStdenv; - }; - - hipfort = callPackage ./hipfort { - inherit rocmUpdateScript rocm-cmake; - stdenv = llvm.rocmClangStdenv; - }; - - hipfft = callPackage ./hipfft { - inherit - rocmUpdateScript - rocm-cmake - rocfft - clr - ; - inherit (llvm) openmp; - stdenv = llvm.rocmClangStdenv; - }; - - tensile = python3Packages.callPackage ./tensile { - inherit rocmUpdateScript rocminfo; - stdenv = llvm.rocmClangStdenv; - }; - - rocblas = callPackage ./rocblas { - inherit - rocblas - rocmUpdateScript - rocm-cmake - clr - tensile - ; - inherit (llvm) openmp; - stdenv = llvm.rocmClangStdenv; - }; - - rocsolver = callPackage ./rocsolver { - inherit - rocmUpdateScript - rocm-cmake - rocblas - rocsparse - clr - ; - stdenv = llvm.rocmClangStdenv; - }; - - rocwmma = callPackage ./rocwmma { - inherit - rocmUpdateScript - rocm-cmake - rocm-smi - rocblas - clr - ; - inherit (llvm) openmp; - stdenv = llvm.rocmClangStdenv; - }; - - rocalution = callPackage ./rocalution { - inherit - rocmUpdateScript - rocm-cmake - rocprim - rocsparse - rocrand - rocblas - clr - ; - inherit (llvm) openmp; - stdenv = llvm.rocmClangStdenv; - }; - - rocmlir = callPackage ./rocmlir { - inherit rocmUpdateScript rocm-cmake clr; - stdenv = llvm.rocmClangStdenv; - }; - - rocmlir-rock = rocmlir.override { - buildRockCompiler = true; - }; - - hipsolver = callPackage ./hipsolver { - inherit - rocmUpdateScript - rocm-cmake - rocblas - rocsolver - clr - ; - stdenv = llvm.rocmClangStdenv; - }; - - hipblas = callPackage ./hipblas { - inherit - rocmUpdateScript - rocm-cmake - rocblas - rocsolver - clr - ; - stdenv = llvm.rocmClangStdenv; - }; - - # hipBlasLt - Very broken with Tensile at the moment, only supports GFX9 - # hipTensor - Only supports GFX9 - - miopengemm = callPackage ./miopengemm { - inherit rocmUpdateScript rocm-cmake clr; - stdenv = llvm.rocmClangStdenv; - }; - - composable_kernel = callPackage ./composable_kernel { - inherit rocmUpdateScript rocm-cmake clr; - inherit (llvm) openmp clang-tools-extra; - stdenv = llvm.rocmClangStdenv; - }; - - half = callPackage ./half { - inherit rocmUpdateScript rocm-cmake; - stdenv = llvm.rocmClangStdenv; - }; - - miopen = callPackage ./miopen { - inherit - rocmUpdateScript - rocm-cmake - rocblas - clang-ocl - miopengemm - composable_kernel - rocm-comgr - clr - rocm-docs-core - half - ; - inherit (llvm) clang-tools-extra; - stdenv = llvm.rocmClangStdenv; - rocmlir = rocmlir-rock; - boost = boost179.override { enableStatic = true; }; - }; - - miopen-hip = miopen.override { - useOpenCL = false; - }; - - miopen-opencl = miopen.override { - useOpenCL = true; - }; - - migraphx = callPackage ./migraphx { - inherit - rocmUpdateScript - rocm-cmake - rocblas - composable_kernel - miopengemm - miopen - clr - half - rocm-device-libs - ; - inherit (llvm) openmp clang-tools-extra; - stdenv = llvm.rocmClangStdenv; - rocmlir = rocmlir-rock; - }; - - rpp = callPackage ./rpp { - inherit - rocmUpdateScript - rocm-cmake - rocm-docs-core - clr - half - ; - inherit (llvm) openmp; - stdenv = llvm.rocmClangStdenv; - }; - - rpp-hip = rpp.override { - useOpenCL = false; - useCPU = false; - }; - - rpp-opencl = rpp.override { - useOpenCL = true; - useCPU = false; - }; - - rpp-cpu = rpp.override { - useOpenCL = false; - useCPU = true; - }; - - mivisionx = callPackage ./mivisionx { - inherit - rocmUpdateScript - rocm-cmake - rocm-device-libs - clr - rpp - rocblas - miopengemm - miopen - migraphx - half - rocm-docs-core - ; - inherit (llvm) clang openmp; - opencv = opencv.override { enablePython = true; }; - ffmpeg = ffmpeg_4; - stdenv = llvm.rocmClangStdenv; - - # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice - # See: https://github.com/ROCm/MIVisionX/issues/1051 - libjpeg_turbo = libjpeg_turbo.overrideAttrs { - version = "2.0.6.1"; - - src = fetchFromGitHub { - owner = "rrawther"; - repo = "libjpeg-turbo"; - rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; - sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; - }; - - # overwrite all patches, since patches for newer version do not apply - patches = [ ../6/0001-Compile-transupp.c-as-part-of-the-library.patch ]; - }; - }; - - mivisionx-hip = mivisionx.override { - rpp = rpp-hip; - useOpenCL = false; - useCPU = false; - }; - - mivisionx-opencl = mivisionx.override { - rpp = rpp-opencl; - miopen = miopen-opencl; - useOpenCL = true; - useCPU = false; - }; - - mivisionx-cpu = mivisionx.override { - rpp = rpp-cpu; - useOpenCL = false; - useCPU = true; - }; - - ## Meta ## - # Emulate common ROCm meta layout - # These are mainly for users. I strongly suggest NOT using these in nixpkgs derivations - # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues! - # See: https://rocm.docs.amd.com/en/docs-5.7.1/_images/image.004.png - # See: https://rocm.docs.amd.com/en/docs-5.7.1/deploy/linux/os-native/package_manager_integration.html - meta = rec { - rocm-developer-tools = symlinkJoin { - name = "rocm-developer-tools-meta"; - - paths = [ - hsa-amd-aqlprofile-bin - rocm-core - rocr-debug-agent - roctracer - rocdbgapi - rocprofiler - rocgdb - rocm-language-runtime - ]; - }; - - rocm-ml-sdk = symlinkJoin { - name = "rocm-ml-sdk-meta"; - - paths = [ - rocm-core - miopen-hip - rocm-hip-sdk - rocm-ml-libraries - ]; - }; - - rocm-ml-libraries = symlinkJoin { - name = "rocm-ml-libraries-meta"; - - paths = [ - llvm.clang - llvm.mlir - llvm.openmp - rocm-core - miopen-hip - rocm-hip-libraries - ]; - }; - - rocm-hip-sdk = symlinkJoin { - name = "rocm-hip-sdk-meta"; - - paths = [ - rocprim - rocalution - hipfft - rocm-core - hipcub - hipblas - rocrand - rocfft - rocsparse - rccl - rocthrust - rocblas - hipsparse - hipfort - rocwmma - hipsolver - rocsolver - rocm-hip-libraries - rocm-hip-runtime-devel - ]; - }; - - rocm-hip-libraries = symlinkJoin { - name = "rocm-hip-libraries-meta"; - - paths = [ - rocblas - hipfort - rocm-core - rocsolver - rocalution - rocrand - hipblas - rocfft - hipfft - rccl - rocsparse - hipsparse - hipsolver - rocm-hip-runtime - ]; - }; - - rocm-openmp-sdk = symlinkJoin { - name = "rocm-openmp-sdk-meta"; - - paths = [ - rocm-core - llvm.clang - llvm.mlir - llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp) - rocm-language-runtime - ]; - }; - - rocm-opencl-sdk = symlinkJoin { - name = "rocm-opencl-sdk-meta"; - - paths = [ - rocm-core - rocm-runtime - clr - clr.icd - rocm-thunk - rocm-opencl-runtime - ]; - }; - - rocm-opencl-runtime = symlinkJoin { - name = "rocm-opencl-runtime-meta"; - - paths = [ - rocm-core - clr - clr.icd - rocm-language-runtime - ]; - }; - - rocm-hip-runtime-devel = symlinkJoin { - name = "rocm-hip-runtime-devel-meta"; - - paths = [ - clr - rocm-core - hipify - rocm-cmake - llvm.clang - llvm.mlir - llvm.openmp - rocm-thunk - rocm-runtime - rocm-hip-runtime - ]; - }; - - rocm-hip-runtime = symlinkJoin { - name = "rocm-hip-runtime-meta"; - - paths = [ - rocm-core - rocminfo - clr - rocm-language-runtime - ]; - }; - - rocm-language-runtime = symlinkJoin { - name = "rocm-language-runtime-meta"; - - paths = [ - rocm-runtime - rocm-core - rocm-comgr - llvm.openmp # openmp-extras-runtime (https://github.com/ROCm/aomp) - ]; - }; - - rocm-all = symlinkJoin { - name = "rocm-all-meta"; - - paths = [ - rocm-developer-tools - rocm-ml-sdk - rocm-ml-libraries - rocm-hip-sdk - rocm-hip-libraries - rocm-openmp-sdk - rocm-opencl-sdk - rocm-opencl-runtime - rocm-hip-runtime-devel - rocm-hip-runtime - rocm-language-runtime - ]; - }; - }; -} diff --git a/pkgs/development/rocm-modules/5/half/default.nix b/pkgs/development/rocm-modules/5/half/default.nix deleted file mode 100644 index aca87edeb6a7..000000000000 --- a/pkgs/development/rocm-modules/5/half/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "half"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "half"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-82It+/wm8+umBdQYn7lz/fS69h+f0mzwPdGxoJNYUq0="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "C++ library for half precision floating point arithmetics"; - homepage = "https://github.com/ROCm/half"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.unix; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hip-common/default.nix b/pkgs/development/rocm-modules/5/hip-common/default.nix deleted file mode 100644 index 9d9820819020..000000000000 --- a/pkgs/development/rocm-modules/5/hip-common/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hip-common"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "HIP"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-1Abit9qZCwrCVcnaFT4uMygFB9G6ovRasLmTsOsJ/Fw="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv * $out - - runHook postInstall - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "C++ Heterogeneous-Compute Interface for Portability"; - homepage = "https://github.com/ROCm/HIP"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipblas/default.nix b/pkgs/development/rocm-modules/5/hipblas/default.nix deleted file mode 100644 index 05ab718fd901..000000000000 --- a/pkgs/development/rocm-modules/5/hipblas/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - gfortran, - rocblas, - rocsolver, - gtest, - lapack-reference, - buildTests ? false, - buildBenchmarks ? false, - buildSamples ? false, -}: - -# Can also use cuBLAS -stdenv.mkDerivation (finalAttrs: { - pname = "hipblas"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ] - ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "hipBLAS"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-abaEZN82dsoEC5gIF3/6epRDVz5ItUo6CkZsybu/G+g="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - gfortran - ]; - - buildInputs = - [ - rocblas - rocsolver - ] - ++ lib.optionals buildTests [ - gtest - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - lapack-reference - ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ] - ++ lib.optionals buildSamples [ - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipblas-test $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/hipblas-bench $benchmark/bin - '' - + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv $out/bin/example-* $sample/bin - '' - + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm BLAS marshalling library"; - homepage = "https://github.com/ROCm/hipBLAS"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipcc/default.nix b/pkgs/development/rocm-modules/5/hipcc/default.nix deleted file mode 100644 index da704805db38..000000000000 --- a/pkgs/development/rocm-modules/5/hipcc/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - lsb-release, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hipcc"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "HIPCC"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-lJX6nF1V4YmK5ai7jivXlRnG3doIOf6X9CWLHVdRuVg="; - }; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - substituteInPlace src/hipBin_amd.h \ - --replace "/usr/bin/lsb_release" "${lsb-release}/bin/lsb_release" - ''; - - postInstall = '' - rm -r $out/hip/bin - ln -s $out/bin $out/hip/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Compiler driver utility that calls clang or nvcc"; - homepage = "https://github.com/ROCm/HIPCC"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipcub/default.nix b/pkgs/development/rocm-modules/5/hipcub/default.nix deleted file mode 100644 index 73288bfa8fdc..000000000000 --- a/pkgs/development/rocm-modules/5/hipcub/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocprim, - clr, - gtest, - gbenchmark, - buildTests ? false, - buildBenchmarks ? false, - gpuTargets ? [ ], -}: - -# CUB can also be used as a backend instead of rocPRIM. -stdenv.mkDerivation (finalAttrs: { - pname = "hipcub"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "hipCUB"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ygBEA3NuCQ13QrSzGqyWXkx8Dy9WhR3u4syzapRTkFU="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - ]; - - buildInputs = - [ - rocprim - ] - ++ lib.optionals buildTests [ - gtest - ] - ++ lib.optionals buildBenchmarks [ - gbenchmark - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${clr}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARK=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Thin wrapper library on top of rocPRIM or CUB"; - homepage = "https://github.com/ROCm/hipCUB"; - license = with licenses; [ bsd3 ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipfft/default.nix b/pkgs/development/rocm-modules/5/hipfft/default.nix deleted file mode 100644 index 21dd155891b8..000000000000 --- a/pkgs/development/rocm-modules/5/hipfft/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - git, - rocfft, - gtest, - boost, - fftw, - fftwFloat, - openmp, - buildTests ? false, - buildBenchmarks ? false, - buildSamples ? false, - gpuTargets ? [ ], -}: - -# Can also use cuFFT -stdenv.mkDerivation (finalAttrs: { - pname = "hipfft"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ] - ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "hipFFT"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-fuYRKdlTrRMwxr3cgMeT3YniPzs4nuvF8YCzr3LLPFM="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - clr - git - cmake - rocm-cmake - ]; - - buildInputs = - [ - rocfft - ] - ++ lib.optionals (buildTests || buildBenchmarks || buildSamples) [ - gtest - boost - fftw - fftwFloat - openmp - ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${clr}" - "-DHIP_PATH=${clr}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_RIDER=ON" - ] - ++ lib.optionals buildSamples [ - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipfft-test $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/hipfft-rider $benchmark/bin - '' - + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/hipfft_* $sample/bin - patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "FFT marshalling library"; - homepage = "https://github.com/ROCm/hipFFT"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipfort/default.nix b/pkgs/development/rocm-modules/5/hipfort/default.nix deleted file mode 100644 index c8a14376d2ba..000000000000 --- a/pkgs/development/rocm-modules/5/hipfort/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - gfortran, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hipfort"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "hipfort"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-DRjUWhdinDKP7CZgq2SmU3lGmmodCuXvco9aEeMLSZ4="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - gfortran - ]; - - cmakeFlags = [ - "-DHIPFORT_COMPILER=${gfortran}/bin/gfortran" - "-DHIPFORT_AR=${gfortran.cc}/bin/gcc-ar" - "-DHIPFORT_RANLIB=${gfortran.cc}/bin/gcc-ranlib" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postPatch = '' - patchShebangs bin - - substituteInPlace bin/hipfc bin/mymcpu \ - --replace "/bin/cat" "cat" - - substituteInPlace bin/CMakeLists.txt \ - --replace "/bin/mkdir" "mkdir" \ - --replace "/bin/cp" "cp" \ - --replace "/bin/sed" "sed" \ - --replace "/bin/chmod" "chmod" \ - --replace "/bin/ln" "ln" - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Fortran interfaces for ROCm libraries"; - mainProgram = "hipfc"; - homepage = "https://github.com/ROCm/hipfort"; - license = with licenses; [ mit ]; # mitx11 - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipify/default.nix b/pkgs/development/rocm-modules/5/hipify/default.nix deleted file mode 100644 index f4a998dcd736..000000000000 --- a/pkgs/development/rocm-modules/5/hipify/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - clang, - libxml2, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hipify"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "HIPIFY"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-lCQ2VTUGmFC90Xu70/tvoeDhFaInGqLT3vC2A1UojNI="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${clang}/bin/clang" - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - # Fixup bad symlinks - postInstall = '' - rm -r $out/hip/bin - ln -s $out/bin $out/hip/bin - patchShebangs $out/bin - ''; - - meta = with lib; { - description = "Convert CUDA to Portable C++ Code"; - homepage = "https://github.com/ROCm/HIPIFY"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipsolver/default.nix b/pkgs/development/rocm-modules/5/hipsolver/default.nix deleted file mode 100644 index 98f4e788a995..000000000000 --- a/pkgs/development/rocm-modules/5/hipsolver/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - gfortran, - rocblas, - rocsolver, - gtest, - lapack-reference, - buildTests ? false, - buildBenchmarks ? false, - buildSamples ? false, -}: - -# Can also use cuSOLVER -stdenv.mkDerivation (finalAttrs: { - pname = "hipsolver"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ] - ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "hipSOLVER"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5b6kPj9yvXvP7f7AyHDTYRoM/EhQZvwkVCfDflFJugc="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - gfortran - ]; - - buildInputs = - [ - rocblas - rocsolver - ] - ++ lib.optionals buildTests [ - gtest - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - lapack-reference - ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ] - ++ lib.optionals buildSamples [ - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipsolver-test $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/hipsolver-bench $benchmark/bin - '' - + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/example-* $sample/bin - patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm SOLVER marshalling library"; - homepage = "https://github.com/ROCm/hipSOLVER"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hipsparse/default.nix b/pkgs/development/rocm-modules/5/hipsparse/default.nix deleted file mode 100644 index 29dcecaeaf17..000000000000 --- a/pkgs/development/rocm-modules/5/hipsparse/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocsparse, - clr, - gfortran, - git, - gtest, - openmp, - buildTests ? false, - buildSamples ? false, - gpuTargets ? [ ], -}: - -# This can also use cuSPARSE as a backend instead of rocSPARSE -stdenv.mkDerivation (finalAttrs: { - pname = "hipsparse"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "hipSPARSE"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-txigaOoZMI/v+EQLgGlj2O0IHfE7EpgjL0cyv49nKzo="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - gfortran - ]; - - buildInputs = - [ - rocsparse - git - ] - ++ lib.optionals buildTests [ - gtest - ] - ++ lib.optionals (buildTests || buildSamples) [ - openmp - ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ]; - - # We have to manually generate the matrices - # CMAKE_MATRICES_DIR seems to be reset in clients/tests/CMakeLists.txt - postPatch = lib.optionalString buildTests '' - mkdir -p matrices - - ln -s ${rocsparse.passthru.matrices.matrix-01}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-02}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-03}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-04}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-05}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-06}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-07}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-08}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-09}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-10}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-11}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-12}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-13}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-14}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-15}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-16}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-17}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-18}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-19}/*.mtx matrices - - # Not used by the original cmake, causes an error - rm matrices/*_b.mtx - - echo "deps/convert.cpp -> deps/mtx2csr" - hipcc deps/convert.cpp -O3 -o deps/mtx2csr - - for mat in $(ls -1 matrices | cut -d "." -f 1); do - echo "mtx2csr: $mat.mtx -> $mat.bin" - deps/mtx2csr matrices/$mat.mtx matrices/$mat.bin - unlink matrices/$mat.mtx - done - - substituteInPlace clients/tests/CMakeLists.txt \ - --replace "\''${PROJECT_BINARY_DIR}/matrices" "/build/source/matrices" - ''; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipsparse-test $test/bin - mv /build/source/matrices $test - rmdir $out/bin - '' - + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/example_* $sample/bin - patchelf --set-rpath $out/lib:${ - lib.makeLibraryPath ( - finalAttrs.buildInputs - ++ [ - clr - gfortran.cc - ] - ) - } $sample/bin/example_* - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm SPARSE marshalling library"; - homepage = "https://github.com/ROCm/hipSPARSE"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix deleted file mode 100644 index 501aac4aeb46..000000000000 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - callPackage, - dpkg, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hsa-amd-aqlprofile-bin"; - version = "5.7.1"; - - src = fetchurl { - url = "https://repo.radeon.com/rocm/apt/5.7.1/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.50701.50701-98~22.04_amd64.deb"; - hash = "sha256-LWAtZ0paJW8lhE+QAMwq2l8wM+96bxk5rNWyQXTc9Vo="; - }; - - 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; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix deleted file mode 100644 index 03f60b738b55..000000000000 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - writeScript, -}: - -{ version }: - -let - prefix = "hsa-amd-aqlprofile"; - extVersion = lib.strings.concatStrings ( - lib.strings.intersperse "0" (lib.versions.splitVersion version) - ); - major = lib.versions.major version; - minor = lib.versions.minor version; - patch = lib.versions.patch version; - - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts - apt="https://repo.radeon.com/rocm/apt" - pool="pool/main/h/${prefix}/" - url="$apt/latest/$pool" - res="$(curl -sL "$url")" - deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" - patch="${patch}" - - # Try up to 10 patch versions - for i in {1..10}; do - ((patch++)) - extVersion="$(echo "$deb" | grep -o -P "(?<=\.....).*(?=\..*-)")" - - if (( ''${#extVersion} == 5 )) && (( $extVersion <= ${extVersion} )); then - url="https://repo.radeon.com/rocm/apt/${major}.${minor}.$patch/pool/main/h/${prefix}/" - res="$(curl -sL "$url")" - deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" - else - break - fi - done - - extVersion="$(echo $deb | grep -o -P "(?<=\.....).*(?=\..*-)")" - version="$(echo $extVersion | sed "s/0/./1" | sed "s/0/./1")" - IFS='.' read -a version_arr <<< "$version" - - if (( ''${version_arr[0]} > 5 )); then - echo "'rocmPackages_5.${prefix}-bin' is already at it's maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${prefix}-bin'." 1>&2 - exit 1 - fi - - if (( ''${#extVersion} == 5 )); then - repoVersion="$version" - - if (( ''${version:4:1} == 0 )); then - repoVersion=''${version:0:3} - fi - - update-source-version rocmPackages_5.${prefix}-bin "$version" "" "$apt/$repoVersion/$pool$deb" --ignore-same-hash - fi - ''; -in -[ updateScript ] diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix deleted file mode 100644 index df5ab72a5b1f..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ /dev/null @@ -1,206 +0,0 @@ -{ - lib, - stdenv, - gcc12Stdenv, - fetchFromGitHub, - rocmUpdateScript, - pkg-config, - cmake, - ninja, - git, - doxygen, - sphinx, - lit, - libxml2, - libxcrypt, - libedit, - libffi, - mpfr, - zlib, - ncurses, - python3Packages, - buildDocs ? true, - buildMan ? true, - buildTests ? true, - targetName ? "llvm", - targetDir ? "llvm", - targetProjects ? [ ], - targetRuntimes ? [ ], - llvmTargetsToBuild ? [ "NATIVE" ], # "NATIVE" resolves into x86 or aarch64 depending on stdenv - extraPatches ? [ ], - extraNativeBuildInputs ? [ ], - extraBuildInputs ? [ ], - extraCMakeFlags ? [ ], - extraPostPatch ? "", - checkTargets ? [ - (lib.optionalString buildTests (if targetDir == "runtimes" then "check-runtimes" else "check-all")) - ], - extraPostInstall ? "", - hardeningDisable ? [ ], - requiredSystemFeatures ? [ ], - extraLicenses ? [ ], - isBroken ? false, -}: - -let - stdenv' = stdenv; -in -let - stdenv = - if stdenv'.cc.cc.isGNU or false && lib.versionAtLeast stdenv'.cc.cc.version "13.0" then - gcc12Stdenv - else - stdenv'; -in - -let - llvmNativeTarget = - if stdenv.hostPlatform.isx86_64 then - "X86" - else if stdenv.hostPlatform.isAarch64 then - "AArch64" - else - throw "Unsupported ROCm LLVM platform"; - inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t; - llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-llvm-${targetName}"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildDocs [ - "doc" - ] - ++ lib.optionals buildMan [ - "man" - "info" # Avoid `attribute 'info' missing` when using with wrapCC - ]; - - patches = extraPatches; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "llvm-project"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0+lJnDiMntxCYbZBCSWvHOcKXexFfEzRfb49QbfOmK8="; - }; - - nativeBuildInputs = - [ - pkg-config - cmake - ninja - git - (python3Packages.python.withPackages (p: [ p.setuptools ])) - ] - ++ lib.optionals (buildDocs || buildMan) [ - doxygen - sphinx - python3Packages.recommonmark - ] - ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [ - lit - ] - ++ extraNativeBuildInputs; - - buildInputs = [ - libxml2 - libxcrypt - libedit - libffi - mpfr - ] ++ extraBuildInputs; - - propagatedBuildInputs = lib.optionals finalAttrs.passthru.isLLVM [ - zlib - ncurses - ]; - - sourceRoot = "${finalAttrs.src.name}/${targetDir}"; - - cmakeFlags = - [ - "-DLLVM_TARGETS_TO_BUILD=${builtins.concatStringsSep ";" llvmTargetsToBuild'}" - ] - ++ lib.optionals (finalAttrs.passthru.isLLVM && targetProjects != [ ]) [ - "-DLLVM_ENABLE_PROJECTS=${lib.concatStringsSep ";" targetProjects}" - ] - ++ - lib.optionals ((finalAttrs.passthru.isLLVM || targetDir == "runtimes") && targetRuntimes != [ ]) - [ - "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" targetRuntimes}" - ] - ++ lib.optionals finalAttrs.passthru.isLLVM [ - "-DLLVM_INSTALL_UTILS=ON" - "-DLLVM_INSTALL_GTEST=ON" - ] - ++ lib.optionals (buildDocs || buildMan) [ - "-DLLVM_INCLUDE_DOCS=ON" - "-DLLVM_BUILD_DOCS=ON" - # "-DLLVM_ENABLE_DOXYGEN=ON" Way too slow, only uses one core - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_HTML=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - ++ lib.optionals buildTests [ - "-DLLVM_INCLUDE_TESTS=ON" - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" - ] - ++ extraCMakeFlags; - - postPatch = - lib.optionalString finalAttrs.passthru.isLLVM '' - patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh - '' - + lib.optionalString (buildTests && finalAttrs.passthru.isLLVM) '' - # FileSystem permissions tests fail with various special bits - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - rm unittests/Support/Path.cpp - - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - '' - + extraPostPatch; - - doCheck = buildTests; - checkTarget = lib.concatStringsSep " " checkTargets; - - postInstall = - lib.optionalString buildMan '' - mkdir -p $info - '' - + extraPostInstall; - - passthru = { - isLLVM = targetDir == "llvm"; - isClang = targetDir == "clang" || builtins.elem "clang" targetProjects; - isROCm = true; - - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - }; - - inherit hardeningDisable requiredSystemFeatures; - - meta = with lib; { - description = "ROCm fork of the LLVM compiler infrastructure"; - homepage = "https://github.com/ROCm/llvm-project"; - license = with licenses; [ ncsa ] ++ extraLicenses; - maintainers = with maintainers; [ - acowley - lovesegfault - ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = isBroken || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/llvm/default.nix b/pkgs/development/rocm-modules/5/llvm/default.nix deleted file mode 100644 index f68d29e37a19..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ - # stdenv FIXME: Try changing back to this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943 - gcc12Stdenv, - callPackage, - rocmUpdateScript, - wrapBintoolsWith, - overrideCC, - rocm-device-libs, - rocm-runtime, - rocm-thunk, - clr, -}: - -let - ## Stage 1 ## - # Projects - llvm = callPackage ./stage-1/llvm.nix { - inherit rocmUpdateScript; - stdenv = gcc12Stdenv; - }; - clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { - inherit rocmUpdateScript llvm; - stdenv = gcc12Stdenv; - }; - lld = callPackage ./stage-1/lld.nix { - inherit rocmUpdateScript llvm; - stdenv = gcc12Stdenv; - }; - - # Runtimes - runtimes = callPackage ./stage-1/runtimes.nix { - inherit rocmUpdateScript llvm; - stdenv = gcc12Stdenv; - }; - - ## Stage 2 ## - # Helpers - bintools-unwrapped = callPackage ./stage-2/bintools-unwrapped.nix { inherit llvm lld; }; - bintools = wrapBintoolsWith { bintools = bintools-unwrapped; }; - rStdenv = callPackage ./stage-2/rstdenv.nix { - inherit - llvm - clang-unwrapped - lld - runtimes - bintools - ; - stdenv = gcc12Stdenv; - }; -in -rec { - inherit - llvm - clang-unwrapped - lld - bintools - ; - - # Runtimes - libc = callPackage ./stage-2/libc.nix { - inherit rocmUpdateScript; - stdenv = rStdenv; - }; - libunwind = callPackage ./stage-2/libunwind.nix { - inherit rocmUpdateScript; - stdenv = rStdenv; - }; - libcxxabi = callPackage ./stage-2/libcxxabi.nix { - inherit rocmUpdateScript; - stdenv = rStdenv; - }; - libcxx = callPackage ./stage-2/libcxx.nix { - inherit rocmUpdateScript; - stdenv = rStdenv; - }; - compiler-rt = callPackage ./stage-2/compiler-rt.nix { - inherit rocmUpdateScript llvm; - stdenv = rStdenv; - }; - - ## Stage 3 ## - # Helpers - clang = callPackage ./stage-3/clang.nix { - inherit - llvm - lld - clang-unwrapped - bintools - libc - libunwind - libcxxabi - libcxx - compiler-rt - ; - stdenv = gcc12Stdenv; - }; - rocmClangStdenv = overrideCC gcc12Stdenv clang; - - # Projects - clang-tools-extra = callPackage ./stage-3/clang-tools-extra.nix { - inherit rocmUpdateScript llvm clang-unwrapped; - stdenv = rocmClangStdenv; - }; - libclc = callPackage ./stage-3/libclc.nix { - inherit rocmUpdateScript llvm clang; - stdenv = rocmClangStdenv; - }; - lldb = callPackage ./stage-3/lldb.nix { - inherit rocmUpdateScript clang; - stdenv = rocmClangStdenv; - }; - mlir = callPackage ./stage-3/mlir.nix { - inherit rocmUpdateScript clr; - stdenv = rocmClangStdenv; - }; - polly = callPackage ./stage-3/polly.nix { - inherit rocmUpdateScript; - stdenv = rocmClangStdenv; - }; - flang = callPackage ./stage-3/flang.nix { - inherit rocmUpdateScript clang-unwrapped mlir; - stdenv = rocmClangStdenv; - }; - openmp = callPackage ./stage-3/openmp.nix { - inherit - rocmUpdateScript - llvm - clang-unwrapped - clang - rocm-device-libs - rocm-runtime - rocm-thunk - ; - stdenv = rocmClangStdenv; - }; - - # Runtimes - pstl = callPackage ./stage-3/pstl.nix { - inherit rocmUpdateScript; - stdenv = rocmClangStdenv; - }; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix deleted file mode 100644 index 2045f410ce11..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, - llvm, -}: - -callPackage ../base.nix { - inherit stdenv rocmUpdateScript; - targetName = "clang-unwrapped"; - targetDir = "clang"; - extraBuildInputs = [ llvm ]; - - extraCMakeFlags = [ - "-DCLANG_INCLUDE_DOCS=ON" - "-DCLANG_INCLUDE_TESTS=ON" - ]; - - extraPostPatch = '' - # Looks like they forgot to add finding libedit to the standalone build - ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules - - substituteInPlace CMakeLists.txt \ - --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" - - # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'` - rm test/Analysis/scan-build/*.test - rm test/Analysis/scan-build/rebuild_index/rebuild_index.test - - # `does not depend on a module exporting 'baz.h'` - rm test/Modules/header-attribs.cpp - - # We do not have HIP or the ROCm stack available yet - rm test/Driver/hip-options.hip - - # ???? `ld: cannot find crti.o: No such file or directory` linker issue? - rm test/Interpreter/dynamic-library.cpp - - # `fatal error: 'stdio.h' file not found` - rm test/OpenMP/amdgcn_emit_llvm.c - ''; - - extraPostInstall = '' - mv bin/clang-tblgen $out/bin - ''; - - requiredSystemFeatures = [ "big-parallel" ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix deleted file mode 100644 index 6a6226a221e0..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, - llvm, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildMan = false; # No man pages to build - targetName = "lld"; - targetDir = targetName; - extraBuildInputs = [ llvm ]; - checkTargets = [ "check-${targetName}" ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix deleted file mode 100644 index a9464da16697..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, -}: - -callPackage ../base.nix { - inherit stdenv rocmUpdateScript; - requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.hostPlatform.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix deleted file mode 100644 index 268ad973b913..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - stdenv, - callPackage, - rocmUpdateScript, - llvm, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildDocs = false; - buildMan = false; - buildTests = false; - targetName = "runtimes"; - targetDir = targetName; - - targetRuntimes = [ - "libunwind" - "libcxxabi" - "libcxx" - "compiler-rt" - ]; - - extraBuildInputs = [ llvm ]; - - extraCMakeFlags = [ - "-DLIBCXX_INCLUDE_BENCHMARKS=OFF" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; - - extraLicenses = [ lib.licenses.mit ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list deleted file mode 100644 index a70c98d4e473..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list +++ /dev/null @@ -1,176 +0,0 @@ -../libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp -../libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp -../libcxx/test/libcxx/depr/depr.default.allocator/allocator.members/allocate.cxx2a.pass.cpp -../libcxx/test/libcxx/depr/depr.default.allocator/allocator.members/construct.cxx2a.pass.cpp -../libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp -../libcxx/test/libcxx/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp -../libcxx/test/libcxx/language.support/support.dynamic/libcpp_deallocate.sh.cpp -../libcxx/test/libcxx/localization/locales/locale/locale.types/locale.facet/no_allocation.pass.cpp -../libcxx/test/libcxx/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_underaligned_buffer.pass.cpp -../libcxx/test/libcxx/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp -../libcxx/test/std/containers/associative/map/map.access/index_key.pass.cpp -../libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp -../libcxx/test/std/containers/associative/map/map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp -../libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_allocator_requirements.pass.cpp -../libcxx/test/std/containers/associative/multiset/insert_emplace_allocator_requirements.pass.cpp -../libcxx/test/std/containers/associative/set/insert_and_emplace_allocator_requirements.pass.cpp -../libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp -../libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp -../libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp -../libcxx/test/std/containers/sequences/vector.bool/ctor_exceptions.pass.cpp -../libcxx/test/std/containers/sequences/vector/vector.cons/exceptions.pass.cpp -../libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp -../libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp -../libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_allocator_requirements.pass.cpp -../libcxx/test/std/containers/unord/unord.multiset/insert_emplace_allocator_requirements.pass.cpp -../libcxx/test/std/containers/unord/unord.set/insert_and_emplace_allocator_requirements.pass.cpp -../libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp -../libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp -../libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy_assign.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move_assign.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/path.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/assign.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/replace_filename.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/status.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/ctor.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/increment.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move.pass.cpp -../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.compare.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/path.decompose.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_normal.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_relative_and_proximate.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/named_overloads.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/clear.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/make_preferred.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/remove_filename.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_extension.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_filename.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/swap.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/named_overloads.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.factory.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.pass.cpp -../libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp -../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.canonical/canonical.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file_large.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.current_path/current_path.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.exists/exists.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_other/is_other.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove/remove.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.rename/rename.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.space/space.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp -../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp -../libcxx/test/std/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp -../libcxx/test/std/localization/locale.stdcvt/codecvt_utf16.pass.cpp -../libcxx/test/std/localization/locale.stdcvt/codecvt_utf8.pass.cpp -../libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp -../libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp -../libcxx/test/std/strings/basic.string/string.cons/substr_rvalue.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp -../libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp -../libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp -../libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp -../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp -../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp -../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp -../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp -../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp -../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp -../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp -../libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate_at_least.pass.cpp -../libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp -../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp -../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp -../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp -../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp -../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp -../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.global/new_delete_resource.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.global/null_memory_resource.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_exception_safety.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_initial_buffer.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_zero_sized_buffer.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_overaligned_request.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_with_initial_size.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp -../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp -../libcxx/test/std/language.support/support.dynamic/hardware_inference_size.compile.pass.cpp -../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp -../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp -../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp -../libcxx/test/libcxx/transitive_includes.sh.cpp diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/bintools-unwrapped.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/bintools-unwrapped.nix deleted file mode 100644 index e17a913d4bb7..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/bintools-unwrapped.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - runCommand, - llvm, - lld, -}: - -runCommand "rocm-llvm-binutils-${llvm.version}" { preferLocalBuild = true; } '' - mkdir -p $out/bin - - for prog in ${lld}/bin/*; do - ln -s $prog $out/bin/$(basename $prog) - done - - for prog in ${llvm}/bin/*; do - ln -sf $prog $out/bin/$(basename $prog) - done - - ln -s ${llvm}/bin/llvm-ar $out/bin/ar - ln -s ${llvm}/bin/llvm-as $out/bin/as - ln -s ${llvm}/bin/llvm-dwp $out/bin/dwp - ln -s ${llvm}/bin/llvm-nm $out/bin/nm - ln -s ${llvm}/bin/llvm-objcopy $out/bin/objcopy - ln -s ${llvm}/bin/llvm-objdump $out/bin/objdump - ln -s ${llvm}/bin/llvm-ranlib $out/bin/ranlib - ln -s ${llvm}/bin/llvm-readelf $out/bin/readelf - ln -s ${llvm}/bin/llvm-size $out/bin/size - ln -s ${llvm}/bin/llvm-strip $out/bin/strip - ln -s ${lld}/bin/lld $out/bin/ld -'' diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/compiler-rt.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/compiler-rt.nix deleted file mode 100644 index f3b8648e1104..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/compiler-rt.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - callPackage, - rocmUpdateScript, - llvm, - glibc, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - targetName = "compiler-rt"; - targetDir = "runtimes"; - - targetRuntimes = [ - "libunwind" - "libcxxabi" - "libcxx" - targetName - ]; - - extraCMakeFlags = [ - "-DCOMPILER_RT_INCLUDE_TESTS=ON" - "-DCOMPILER_RT_USE_LLVM_UNWINDER=ON" - "-DCOMPILER_RT_CXX_LIBRARY=libcxx" - "-DCOMPILER_RT_CAN_EXECUTE_TESTS=OFF" # We can't run most of these - - # Workaround having to build combined - "-DLIBUNWIND_INCLUDE_DOCS=OFF" - "-DLIBUNWIND_INCLUDE_TESTS=OFF" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - "-DLIBUNWIND_INSTALL_LIBRARY=OFF" - "-DLIBUNWIND_INSTALL_HEADERS=OFF" - "-DLIBCXXABI_INCLUDE_TESTS=OFF" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - "-DLIBCXXABI_USE_COMPILER_RT=ON" - "-DLIBCXXABI_INSTALL_LIBRARY=OFF" - "-DLIBCXXABI_INSTALL_HEADERS=OFF" - "-DLIBCXX_INCLUDE_DOCS=OFF" - "-DLIBCXX_INCLUDE_TESTS=OFF" - "-DLIBCXX_USE_COMPILER_RT=ON" - "-DLIBCXX_CXX_ABI=libcxxabi" - "-DLIBCXX_INSTALL_LIBRARY=OFF" - "-DLIBCXX_INSTALL_HEADERS=OFF" - ]; - - extraPostPatch = '' - # `No such file or directory: 'ldd'` - substituteInPlace ../compiler-rt/test/lit.common.cfg.py \ - --replace "'ldd'," "'${glibc.bin}/bin/ldd'," - - # We can run these - substituteInPlace ../compiler-rt/test/CMakeLists.txt \ - --replace "endfunction()" "endfunction()''\nadd_subdirectory(builtins)''\nadd_subdirectory(shadowcallstack)" - - # Could not launch llvm-config in /build/source/runtimes/build/bin - mkdir -p build/bin - ln -s ${llvm}/bin/llvm-config build/bin - ''; - - extraLicenses = [ lib.licenses.mit ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/libc.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/libc.nix deleted file mode 100644 index e52e39276f15..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/libc.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildMan = false; # No man pages to build - targetName = "libc"; - targetDir = "runtimes"; - targetRuntimes = [ targetName ]; - - extraPostPatch = '' - # `Failed to match ... against ...` `Match value not within tolerance value of MPFR result:` - # We need a better way, but I don't know enough sed magic and patching `CMakeLists.txt` isn't working... - substituteInPlace ../libc/test/src/math/log10_test.cpp \ - --replace "i < N" "i < 0" \ - --replace "test(mpfr::RoundingMode::Nearest);" "" \ - --replace "test(mpfr::RoundingMode::Downward);" "" \ - --replace "test(mpfr::RoundingMode::Upward);" "" \ - --replace "test(mpfr::RoundingMode::TowardZero);" "" - ''; - - checkTargets = [ "check-${targetName}" ]; - hardeningDisable = [ "fortify" ]; # Prevent `error: "Assumed value of MB_LEN_MAX wrong"` -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/libcxx.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/libcxx.nix deleted file mode 100644 index b9ed102d5408..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/libcxx.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildMan = false; # No man pages to build - targetName = "libcxx"; - targetDir = "runtimes"; - - targetRuntimes = [ - "libunwind" - "libcxxabi" - targetName - ]; - - extraCMakeFlags = [ - "-DLIBCXX_INCLUDE_DOCS=ON" - "-DLIBCXX_INCLUDE_TESTS=ON" - "-DLIBCXX_USE_COMPILER_RT=ON" - "-DLIBCXX_CXX_ABI=libcxxabi" - - # Workaround having to build combined - "-DLIBUNWIND_INCLUDE_DOCS=OFF" - "-DLIBUNWIND_INCLUDE_TESTS=OFF" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - "-DLIBUNWIND_INSTALL_LIBRARY=OFF" - "-DLIBUNWIND_INSTALL_HEADERS=OFF" - "-DLIBCXXABI_INCLUDE_TESTS=OFF" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - "-DLIBCXXABI_USE_COMPILER_RT=ON" - "-DLIBCXXABI_INSTALL_LIBRARY=OFF" - "-DLIBCXXABI_INSTALL_HEADERS=OFF" - ]; - - # Most of these can't find `bash` or `mkdir`, might just be hard-coded paths, or PATH is altered - extraPostPatch = '' - chmod +w -R ../libcxx/test/{libcxx,std} - cat ${./1000-libcxx-failing-tests.list} | xargs -d \\n rm - ''; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/libcxxabi.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/libcxxabi.nix deleted file mode 100644 index bc54e17be45f..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/libcxxabi.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - targetName = "libcxxabi"; - targetDir = "runtimes"; - - targetRuntimes = [ - "libunwind" - targetName - "libcxx" - ]; - - extraCMakeFlags = [ - "-DLIBCXXABI_INCLUDE_TESTS=ON" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - "-DLIBCXXABI_USE_COMPILER_RT=ON" - - # Workaround having to build combined - "-DLIBUNWIND_INCLUDE_DOCS=OFF" - "-DLIBUNWIND_INCLUDE_TESTS=OFF" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - "-DLIBUNWIND_INSTALL_LIBRARY=OFF" - "-DLIBUNWIND_INSTALL_HEADERS=OFF" - "-DLIBCXX_INCLUDE_DOCS=OFF" - "-DLIBCXX_INCLUDE_TESTS=OFF" - "-DLIBCXX_USE_COMPILER_RT=ON" - "-DLIBCXX_CXX_ABI=libcxxabi" - "-DLIBCXX_INSTALL_LIBRARY=OFF" - "-DLIBCXX_INSTALL_HEADERS=OFF" - ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/libunwind.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/libunwind.nix deleted file mode 100644 index fb5e7cb3b68c..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/libunwind.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildMan = false; # No man pages to build - targetName = "libunwind"; - targetDir = "runtimes"; - targetRuntimes = [ targetName ]; - - extraCMakeFlags = [ - "-DLIBUNWIND_INCLUDE_DOCS=ON" - "-DLIBUNWIND_INCLUDE_TESTS=ON" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - ]; - - extraPostPatch = '' - # `command had no output on stdout or stderr` (Says these unsupported tests) - chmod +w -R ../libunwind/test - rm ../libunwind/test/floatregister.pass.cpp - rm ../libunwind/test/unwind_leaffunction.pass.cpp - rm ../libunwind/test/libunwind_02.pass.cpp - ''; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix b/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix deleted file mode 100644 index f83abe36cc2e..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - stdenv, - overrideCC, - wrapCCWith, - llvm, - clang-unwrapped, - lld, - runtimes, - bintools, -}: - -overrideCC stdenv (wrapCCWith rec { - inherit bintools; - libcxx = runtimes; - cc = clang-unwrapped; - gccForLibs = stdenv.cc.cc; - - extraPackages = [ - llvm - lld - ]; - - nixSupport.cc-cflags = [ - "-resource-dir=$out/resource-root" - "-fuse-ld=lld" - "-rtlib=compiler-rt" - "-unwindlib=libunwind" - "-Wno-unused-command-line-argument" - ]; - - extraBuildCommands = '' - clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - mkdir -p $out/resource-root - ln -s ${cc}/lib/clang/$clang_version/include $out/resource-root - ln -s ${runtimes}/lib $out/resource-root - ''; -}) diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/0000-mlir-fix-debugtranslation.patch b/pkgs/development/rocm-modules/5/llvm/stage-3/0000-mlir-fix-debugtranslation.patch deleted file mode 100644 index f4221a088136..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/0000-mlir-fix-debugtranslation.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74 Mon Sep 17 00:00:00 2001 -From: Scott Linder -Date: Mon, 11 Sep 2023 18:37:37 +0000 -Subject: [PATCH] [HeterogeneousDWARF] Update MLIR DI Metadata handling - -Pass a default DW_MSPACE_LLVM_none to satisfy new API - -Change-Id: I50df461f00b5510a715f55f61107122318102d22 ---- - lib/Target/LLVMIR/DebugTranslation.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lib/Target/LLVMIR/DebugTranslation.cpp b/lib/Target/LLVMIR/DebugTranslation.cpp -index 2053f5bcef06aa6..635ee5d7e5fefdc 100644 ---- a/lib/Target/LLVMIR/DebugTranslation.cpp -+++ b/lib/Target/LLVMIR/DebugTranslation.cpp -@@ -148,7 +148,8 @@ llvm::DIDerivedType *DebugTranslation::translateImpl(DIDerivedTypeAttr attr) { - /*File=*/nullptr, /*Line=*/0, - /*Scope=*/nullptr, translate(attr.getBaseType()), attr.getSizeInBits(), - attr.getAlignInBits(), attr.getOffsetInBits(), -- /*DWARFAddressSpace=*/std::nullopt, /*Flags=*/llvm::DINode::FlagZero); -+ /*DWARFAddressSpace=*/std::nullopt, llvm::dwarf::DW_MSPACE_LLVM_none, -+ /*Flags=*/llvm::DINode::FlagZero); - } - - llvm::DIFile *DebugTranslation::translateImpl(DIFileAttr attr) { -@@ -185,7 +186,8 @@ DebugTranslation::translateImpl(DILocalVariableAttr attr) { - llvmCtx, translate(attr.getScope()), getMDStringOrNull(attr.getName()), - translate(attr.getFile()), attr.getLine(), translate(attr.getType()), - attr.getArg(), -- /*Flags=*/llvm::DINode::FlagZero, attr.getAlignInBits(), -+ /*Flags=*/llvm::DINode::FlagZero, llvm::dwarf::DW_MSPACE_LLVM_none, -+ attr.getAlignInBits(), - /*Annotations=*/nullptr); - } - diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/1000-openmp-failing-tests.list b/pkgs/development/rocm-modules/5/llvm/stage-3/1000-openmp-failing-tests.list deleted file mode 100644 index e53b21b3c535..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/1000-openmp-failing-tests.list +++ /dev/null @@ -1,122 +0,0 @@ -runtime/test/tasking/hidden_helper_task/gtid.cpp -runtime/test/ompt/parallel/parallel_if0.c -runtime/test/ompt/parallel/serialized.c -runtime/test/ompt/teams/parallel_team.c -runtime/test/ompt/teams/serial_teams.c -runtime/test/ompt/teams/serialized.c -runtime/test/ompt/teams/team.c -libomptarget/test/api/assert.c -libomptarget/test/api/omp_device_managed_memory.c -libomptarget/test/api/omp_device_memory.c -libomptarget/test/api/omp_get_device_num.c -libomptarget/test/api/omp_host_pinned_memory.c -libomptarget/test/api/omp_host_pinned_memory_alloc.c -libomptarget/test/api/omp_target_memcpy_async1.c -libomptarget/test/api/omp_target_memcpy_async2.c -libomptarget/test/api/omp_target_memcpy_rect_async1.c -libomptarget/test/api/omp_target_memcpy_rect_async2.c -libomptarget/test/mapping/array_section_implicit_capture.c -libomptarget/test/mapping/data_absent_at_exit.c -libomptarget/test/mapping/data_member_ref.cpp -libomptarget/test/mapping/declare_mapper_api.cpp -libomptarget/test/mapping/declare_mapper_target.cpp -libomptarget/test/mapping/declare_mapper_target_data.cpp -libomptarget/test/mapping/declare_mapper_target_data_enter_exit.cpp -libomptarget/test/mapping/firstprivate_aligned.cpp -libomptarget/test/mapping/has_device_addr.cpp -libomptarget/test/mapping/implicit_device_ptr.c -libomptarget/test/mapping/is_device_ptr.cpp -libomptarget/test/mapping/lambda_mapping.cpp -libomptarget/test/mapping/low_alignment.c -libomptarget/test/mapping/map_back_race.cpp -libomptarget/test/mapping/power_of_two_alignment.c -libomptarget/test/mapping/pr38704.c -libomptarget/test/mapping/prelock.cpp -libomptarget/test/mapping/present/target_data_at_exit.c -libomptarget/test/mapping/private_mapping.c -libomptarget/test/mapping/ptr_and_obj_motion.c -libomptarget/test/mapping/reduction_implicit_map.cpp -libomptarget/test/mapping/target_derefence_array_pointrs.cpp -libomptarget/test/mapping/target_map_for_member_data.cpp -libomptarget/test/mapping/target_update_array_extension.c -libomptarget/test/mapping/target_use_device_addr.c -libomptarget/test/offloading/atomic-compare-signedness.c -libomptarget/test/offloading/bug47654.cpp -libomptarget/test/offloading/bug49021.cpp -libomptarget/test/offloading/bug49779.cpp -libomptarget/test/offloading/bug50022.cpp -libomptarget/test/offloading/bug51781.c -libomptarget/test/offloading/bug51982.c -libomptarget/test/offloading/bug53727.cpp -libomptarget/test/offloading/complex_reduction.cpp -libomptarget/test/offloading/cuda_no_devices.c -libomptarget/test/offloading/d2d_memcpy.c -libomptarget/test/offloading/dynamic_module.c -libomptarget/test/offloading/dynamic_module_load.c -libomptarget/test/offloading/global_constructor.cpp -libomptarget/test/offloading/lone_target_exit_data.c -libomptarget/test/offloading/memory_manager.cpp -libomptarget/test/offloading/parallel_offloading_map.cpp -libomptarget/test/offloading/static_linking.c -libomptarget/test/offloading/std_complex_arithmetic.cpp -libomptarget/test/offloading/target-teams-atomic.c -libomptarget/test/offloading/target_constexpr_mapping.cpp -libomptarget/test/offloading/target_critical_region.cpp -libomptarget/test/offloading/target_depend_nowait.cpp -libomptarget/test/offloading/target_nowait_target.cpp -libomptarget/test/offloading/taskloop_offload_nowait.cpp -libomptarget/test/offloading/test_libc.cpp -libomptarget/test/ompt/veccopy.c -libomptarget/test/ompt/veccopy_disallow_both.c -libomptarget/test/ompt/veccopy_emi.c -libomptarget/test/ompt/veccopy_emi_map.c -libomptarget/test/ompt/veccopy_map.c -libomptarget/test/ompt/veccopy_no_device_init.c -libomptarget/test/ompt/veccopy_wrong_return.c -libomptarget/test/api/is_initial_device.c -libomptarget/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp -libomptarget/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp -libomptarget/test/mapping/declare_mapper_nested_default_mappers_var.cpp -libomptarget/test/mapping/target_pointers_members_map.cpp -libomptarget/test/api/omp_dynamic_shared_memory_mixed.c -libomptarget/test/api/omp_env_vars.c -libomptarget/test/api/omp_get_mapped_ptr.c -libomptarget/test/api/omp_get_num_devices.c -libomptarget/test/api/omp_get_num_devices_with_empty_target.c -libomptarget/test/mapping/alloc_fail.c -libomptarget/test/mapping/array_section_use_device_ptr.c -libomptarget/test/mapping/declare_mapper_nested_default_mappers.cpp -libomptarget/test/mapping/declare_mapper_nested_mappers.cpp -libomptarget/test/mapping/declare_mapper_target_update.cpp -libomptarget/test/mapping/delete_inf_refcount.c -libomptarget/test/mapping/lambda_by_value.cpp -libomptarget/test/mapping/ompx_hold/omp_target_disassociate_ptr.c -libomptarget/test/mapping/ompx_hold/struct.c -libomptarget/test/mapping/ompx_hold/target-data.c -libomptarget/test/mapping/ompx_hold/target.c -libomptarget/test/mapping/present/target.c -libomptarget/test/mapping/present/target_array_extension.c -libomptarget/test/mapping/present/target_data.c -libomptarget/test/mapping/present/target_data_array_extension.c -libomptarget/test/mapping/present/target_enter_data.c -libomptarget/test/mapping/present/target_exit_data_delete.c -libomptarget/test/mapping/present/target_exit_data_release.c -libomptarget/test/mapping/present/target_update.c -libomptarget/test/mapping/present/target_update_array_extension.c -libomptarget/test/mapping/present/zero_length_array_section.c -libomptarget/test/mapping/present/zero_length_array_section_exit.c -libomptarget/test/mapping/target_data_array_extension_at_exit.c -libomptarget/test/mapping/target_has_device_addr.c -libomptarget/test/mapping/target_implicit_partial_map.c -libomptarget/test/mapping/target_wrong_use_device_addr.c -libomptarget/test/offloading/host_as_target.c -libomptarget/test/offloading/info.c -libomptarget/test/offloading/offloading_success.c -libomptarget/test/offloading/offloading_success.cpp -libomptarget/test/offloading/wtime.c -libomptarget/test/unified_shared_memory/api.c -libomptarget/test/unified_shared_memory/associate_ptr.c -libomptarget/test/unified_shared_memory/close_enter_exit.c -libomptarget/test/unified_shared_memory/close_manual.c -libomptarget/test/unified_shared_memory/close_member.c -libomptarget/test/unified_shared_memory/close_modifier.c diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/1001-mlir-failing-tests.list b/pkgs/development/rocm-modules/5/llvm/stage-3/1001-mlir-failing-tests.list deleted file mode 100644 index 0b3d2d22592d..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/1001-mlir-failing-tests.list +++ /dev/null @@ -1,11 +0,0 @@ -./test/Target/LLVMIR/openmp-llvm.mlir -./test/mlir-spirv-cpu-runner/double.mlir -./test/mlir-spirv-cpu-runner/simple_add.mlir -./test/mlir-vulkan-runner/addf.mlir -./test/mlir-vulkan-runner/addi.mlir -./test/mlir-vulkan-runner/addi8.mlir -./test/mlir-vulkan-runner/mulf.mlir -./test/mlir-vulkan-runner/smul_extended.mlir -./test/mlir-vulkan-runner/subf.mlir -./test/mlir-vulkan-runner/time.mlir -./test/mlir-vulkan-runner/umul_extended.mlir diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix deleted file mode 100644 index 314ce9806424..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, - llvm, - clang-unwrapped, - gtest, -}: - -callPackage ../base.nix { - inherit stdenv rocmUpdateScript; - buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream' and 'const llvm::StringRef')` - targetName = "clang-tools-extra"; - - targetProjects = [ - "clang" - "clang-tools-extra" - ]; - - extraBuildInputs = [ gtest ]; - - extraCMakeFlags = [ - "-DLLVM_INCLUDE_DOCS=OFF" - "-DLLVM_INCLUDE_TESTS=OFF" - "-DCLANG_INCLUDE_DOCS=OFF" - "-DCLANG_INCLUDE_TESTS=ON" - "-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON" - ]; - - extraPostInstall = '' - # Remove LLVM and Clang - for path in `find ${llvm} ${clang-unwrapped}`; do - if [ $path != ${llvm} ] && [ $path != ${clang-unwrapped} ]; then - rm -f $out''${path#${llvm}} $out''${path#${clang-unwrapped}} || true - fi - done - - # Cleanup empty directories - find $out -type d -empty -delete - ''; - - requiredSystemFeatures = [ "big-parallel" ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix deleted file mode 100644 index c702334140d7..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - stdenv, - wrapCCWith, - llvm, - lld, - clang-unwrapped, - bintools, - libc, - libunwind, - libcxxabi, - libcxx, - compiler-rt, -}: - -wrapCCWith rec { - inherit libcxx bintools; - - # We do this to avoid HIP pathing problems, and mimic a monolithic install - cc = stdenv.mkDerivation (finalAttrs: { - inherit (clang-unwrapped) version; - pname = "rocm-llvm-clang"; - dontUnpack = true; - - installPhase = '' - runHook preInstall - - clang_version=`${clang-unwrapped}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - mkdir -p $out/{bin,include/c++/v1,lib/{cmake,clang/$clang_version/{include,lib}},libexec,share} - - for path in ${llvm} ${clang-unwrapped} ${lld} ${libc} ${libunwind} ${libcxxabi} ${libcxx} ${compiler-rt}; do - cp -as $path/* $out - chmod +w $out/{*,include/c++/v1,lib/{clang/$clang_version/include,cmake}} - rm -f $out/lib/libc++.so - done - - ln -s $out/lib/* $out/lib/clang/$clang_version/lib - ln -sf $out/include/* $out/lib/clang/$clang_version/include - - runHook postInstall - ''; - - passthru.isClang = true; - passthru.isROCm = true; - }); - - gccForLibs = stdenv.cc.cc; - - extraPackages = [ - llvm - lld - libc - libunwind - libcxxabi - compiler-rt - ]; - - nixSupport.cc-cflags = [ - "-resource-dir=$out/resource-root" - "-fuse-ld=lld" - "-rtlib=compiler-rt" - "-unwindlib=libunwind" - "-Wno-unused-command-line-argument" - ]; - - extraBuildCommands = '' - clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - mkdir -p $out/resource-root - ln -s ${cc}/lib/clang/$clang_version/{include,lib} $out/resource-root - - # Not sure why, but hardening seems to make things break - echo "" > $out/nix-support/add-hardening.sh - - # GPU compilation uses builtin `lld` - substituteInPlace $out/bin/{clang,clang++} \ - --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" - ''; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/flang.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/flang.nix deleted file mode 100644 index c6e72d56ce56..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/flang.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, - clang-unwrapped, - mlir, - graphviz, - python3Packages, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - targetName = "flang"; - targetDir = targetName; - - extraNativeBuildInputs = [ - graphviz - python3Packages.sphinx-markdown-tables - ]; - - extraBuildInputs = [ mlir ]; - - extraCMakeFlags = [ - "-DCLANG_DIR=${clang-unwrapped}/lib/cmake/clang" - "-DMLIR_TABLEGEN_EXE=${mlir}/bin/mlir-tblgen" - "-DCLANG_TABLEGEN_EXE=${clang-unwrapped}/bin/clang-tblgen" - "-DFLANG_INCLUDE_TESTS=OFF" # `The dependency target "Bye" of target ...` - ]; - - # `flang/lib/Semantics/check-omp-structure.cpp:1905:1: error: no member named 'v' in 'Fortran::parser::OmpClause::OmpxDynCgroupMem'` - isBroken = true; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/libclc.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/libclc.nix deleted file mode 100644 index a00dbc292717..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/libclc.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, - llvm, - clang, - spirv-llvm-translator, -}: - -let - spirv = (spirv-llvm-translator.override { inherit llvm; }); -in -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - targetName = "libclc"; - targetDir = targetName; - extraBuildInputs = [ spirv ]; - - # `spirv-mesa3d` isn't compiling with LLVM 15.0.0, it does with LLVM 14.0.0 - # Try removing the `spirv-mesa3d` and `clspv` patches next update - # `clspv` tests fail, unresolved calls - extraPostPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ - "find_program( LLVM_CLANG clang PATHS \"${clang}/bin\" NO_DEFAULT_PATH )" \ - --replace "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ - "find_program( LLVM_SPIRV llvm-spirv PATHS \"${spirv}/bin\" NO_DEFAULT_PATH )" \ - --replace " spirv-mesa3d-" "" \ - --replace " spirv64-mesa3d-" "" \ - --replace "NOT \''${t} MATCHES" \ - "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES" - ''; - - checkTargets = [ ]; - isBroken = true; # ROCm 5.7.0 doesn't have IR/AttributeMask.h yet...? -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/lldb.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/lldb.nix deleted file mode 100644 index 31694ce50113..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/lldb.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, - clang, - xz, - swig, - lua5_3, - graphviz, - gtest, - python3Packages, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildTests = false; # FIXME: Bad pathing for clang executable in tests, using relative path most likely - targetName = "lldb"; - targetDir = targetName; - extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ]; - - extraBuildInputs = [ - xz - swig - lua5_3 - graphviz - gtest - ]; - - extraCMakeFlags = [ - "-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR=${clang}/resource-root/lib/clang/$clang_version" - "-DLLDB_INCLUDE_TESTS=ON" - "-DLLDB_INCLUDE_UNITTESTS=ON" - ]; - - extraPostPatch = '' - export clang_version=`clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - ''; - - checkTargets = [ "check-${targetName}" ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix deleted file mode 100644 index e826d2a7a2b3..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, - clr, - vulkan-headers, - vulkan-loader, - glslang, - shaderc, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildDocs = false; # No decent way to hack this to work - buildMan = false; # No man pages to build - targetName = "mlir"; - targetDir = targetName; - - # Fix `DebugTranslation.cpp:139:10: error: no matching function for call to 'get'` - # We patch at a different source root, so we modify the patch and include it locally - # https://github.com/ROCm/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch - extraPatches = [ ./0000-mlir-fix-debugtranslation.patch ]; - extraNativeBuildInputs = [ clr ]; - - extraBuildInputs = [ - vulkan-headers - vulkan-loader - glslang - shaderc - ]; - - extraCMakeFlags = [ - "-DMLIR_INCLUDE_DOCS=ON" - "-DMLIR_INCLUDE_TESTS=ON" - "-DMLIR_ENABLE_ROCM_RUNNER=ON" - "-DMLIR_ENABLE_SPIRV_CPU_RUNNER=ON" - "-DMLIR_ENABLE_VULKAN_RUNNER=ON" - "-DROCM_TEST_CHIPSET=gfx000" # CPU runner - ]; - - extraPostPatch = '' - # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` - substituteInPlace CMakeLists.txt \ - --replace "EXISTS \''${UNITTEST_DIR}/googletest/include/gtest/gtest.h" "FALSE" - - # Mainly `No such file or directory` - cat ${./1001-mlir-failing-tests.list} | xargs -d \\n rm - ''; - - extraPostInstall = '' - mkdir -p $out/bin - mv bin/mlir-tblgen $out/bin - ''; - - checkTargets = [ "check-${targetName}" ]; - requiredSystemFeatures = [ "big-parallel" ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/openmp.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/openmp.nix deleted file mode 100644 index 258166105780..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/openmp.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - callPackage, - rocmUpdateScript, - llvm, - clang, - clang-unwrapped, - rocm-device-libs, - rocm-runtime, - rocm-thunk, - perl, - elfutils, - libdrm, - numactl, - lit, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - targetName = "openmp"; - targetDir = targetName; - extraNativeBuildInputs = [ perl ]; - - extraBuildInputs = [ - rocm-device-libs - rocm-runtime - rocm-thunk - elfutils - libdrm - numactl - ]; - - extraCMakeFlags = [ - "-DCMAKE_MODULE_PATH=/build/source/llvm/cmake/modules" # For docs - "-DCLANG_TOOL=${clang}/bin/clang" - "-DCLANG_OFFLOAD_BUNDLER_TOOL=${clang-unwrapped}/bin/clang-offload-bundler" - "-DPACKAGER_TOOL=${clang-unwrapped}/bin/clang-offload-packager" - "-DOPENMP_LLVM_TOOLS_DIR=${llvm}/bin" - "-DOPENMP_LLVM_LIT_EXECUTABLE=${lit}/bin/.lit-wrapped" - "-DDEVICELIBS_ROOT=${rocm-device-libs.src}" - ]; - - extraPostPatch = '' - # We can't build this target at the moment - substituteInPlace libomptarget/DeviceRTL/CMakeLists.txt \ - --replace "gfx1010" "" - - # No idea what's going on here... - cat ${./1000-openmp-failing-tests.list} | xargs -d \\n rm - ''; - - checkTargets = [ "check-${targetName}" ]; - extraLicenses = [ lib.licenses.mit ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/polly.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/polly.nix deleted file mode 100644 index 6347cfffbe2a..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/polly.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - targetName = "polly"; - targetDir = targetName; - - extraPostPatch = '' - # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` - substituteInPlace CMakeLists.txt \ - --replace "NOT TARGET gtest" "FALSE" - ''; - - checkTargets = [ "check-${targetName}" ]; -} diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/pstl.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/pstl.nix deleted file mode 100644 index 63fba911677c..000000000000 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/pstl.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - stdenv, - callPackage, - rocmUpdateScript, -}: - -callPackage ../base.nix rec { - inherit stdenv rocmUpdateScript; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - buildTests = false; # Too many errors - targetName = "pstl"; - targetDir = "runtimes"; - targetRuntimes = [ targetName ]; - checkTargets = [ "check-${targetName}" ]; -} diff --git a/pkgs/development/rocm-modules/5/migraphx/default.nix b/pkgs/development/rocm-modules/5/migraphx/default.nix deleted file mode 100644 index e2efd0daff61..000000000000 --- a/pkgs/development/rocm-modules/5/migraphx/default.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - pkg-config, - cmake, - rocm-cmake, - clr, - clang-tools-extra, - openmp, - rocblas, - rocmlir, - composable_kernel, - miopengemm, - miopen, - protobuf, - half, - nlohmann_json, - msgpack, - sqlite, - oneDNN_2, - blaze, - cppcheck, - rocm-device-libs, - texliveSmall, - doxygen, - sphinx, - docutils, - ghostscript, - python3Packages, - buildDocs ? false, - buildTests ? false, -}: - -let - latex = lib.optionalAttrs buildDocs ( - texliveSmall.withPackages ( - ps: with ps; [ - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec - epstopdf - ] - ) - ); -in -stdenv.mkDerivation (finalAttrs: { - pname = "migraphx"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildDocs [ - "doc" - ] - ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "AMDMIGraphX"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-lg3pxHBpwqxBvdOQgE44YKLuumhkVF6b3Xx4+cw7jNQ="; - }; - - nativeBuildInputs = - [ - pkg-config - cmake - rocm-cmake - clr - clang-tools-extra - python3Packages.python - ] - ++ lib.optionals buildDocs [ - latex - doxygen - sphinx - docutils - ghostscript - python3Packages.sphinx-rtd-theme - python3Packages.breathe - ]; - - buildInputs = [ - openmp - rocblas - rocmlir - composable_kernel - miopengemm - miopen - protobuf - half - nlohmann_json - msgpack - sqlite - oneDNN_2 - blaze - cppcheck - python3Packages.pybind11 - python3Packages.onnx - ]; - - cmakeFlags = [ - "-DMIGRAPHX_ENABLE_GPU=ON" - "-DMIGRAPHX_ENABLE_CPU=ON" - "-DMIGRAPHX_ENABLE_FPGA=ON" - "-DMIGRAPHX_ENABLE_MLIR=OFF" # LLVM or rocMLIR mismatch? - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postPatch = - '' - # We need to not use hipcc and define the CXXFLAGS manually due to `undefined hidden symbol: tensorflow:: ...` - export CXXFLAGS+="--rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" - patchShebangs tools - - # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]` - substituteInPlace CMakeLists.txt \ - --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" "" - - # JIT library was removed from composable_kernel... - # https://github.com/ROCm/composable_kernel/issues/782 - substituteInPlace src/targets/gpu/CMakeLists.txt \ - --replace " COMPONENTS jit_library" "" \ - --replace " composable_kernel::jit_library" "" \ - --replace "if(WIN32)" "if(TRUE)" - '' - + lib.optionalString (!buildDocs) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(doc)" "" - '' - + lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - ''; - - # Unfortunately, it seems like we have to call make on this manually - preInstall = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make -j$NIX_BUILD_CORES doc - cd ../doc/pdf - make -j$NIX_BUILD_CORES - cd - - ''; - - postInstall = - lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/migraphx - mv ../doc/pdf/MIGraphX.pdf $out/share/doc/migraphx - '' - + lib.optionalString buildTests '' - mkdir -p $test/bin - mv bin/test_* $test/bin - patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "AMD's graph optimization engine"; - homepage = "https://github.com/ROCm/AMDMIGraphX"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/miopen/default.nix b/pkgs/development/rocm-modules/5/miopen/default.nix deleted file mode 100644 index 6d83ef06a697..000000000000 --- a/pkgs/development/rocm-modules/5/miopen/default.nix +++ /dev/null @@ -1,273 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - rocmUpdateScript, - runCommand, - pkg-config, - cmake, - rocm-cmake, - rocblas, - rocmlir, - clr, - clang-tools-extra, - clang-ocl, - miopengemm, - composable_kernel, - frugally-deep, - rocm-docs-core, - half, - boost, - sqlite, - bzip2, - lbzip2, - nlohmann_json, - texliveSmall, - doxygen, - sphinx, - zlib, - gtest, - rocm-comgr, - python3Packages, - buildDocs ? false, # Needs internet because of rocm-docs-core - buildTests ? false, - useOpenCL ? false, -}: - -let - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "MIOpen"; - rev = "rocm-${version}"; - hash = "sha256-xcKmFI8HcRA9bbh6EQGElKykIQ3RJX/q5f4IxXvM1Is="; - fetchLFS = true; - leaveDotGit = true; - - # If you're reading this, it's gonna take a bit of time. - # fetchSubModules doesn't work with postFetch??? - # fetchLFS isn't actually fetching the LFS files... - postFetch = '' - export HOME=$(mktemp -d) - cd $out - - # We need more history to fetch LFS files - git remote add origin $url - git fetch origin - git clean -fdx - git checkout rocm-${version} - - # We need to do this manually since using leaveDotGit and fetchSubmodules errors - git submodule update --init - - # Fetch the LFS files - git lfs install - git lfs fetch --all - git lfs checkout - - # Remove the defunct .git folder - rm -rf .git - ''; - }; - - latex = lib.optionalAttrs buildDocs ( - texliveSmall.withPackages ( - ps: with ps; [ - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec - ] - ) - ); - - gfx900 = runCommand "miopen-gfx900.kdb" { preferLocalBuild = true; } '' - ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx900.kdb.bz2 > $out - ''; - - gfx906 = runCommand "miopen-gfx906.kdb" { preferLocalBuild = true; } '' - ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx906.kdb.bz2 > $out - ''; - - gfx908 = runCommand "miopen-gfx908.kdb" { preferLocalBuild = true; } '' - ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx908.kdb.bz2 > $out - ''; - - gfx90a = runCommand "miopen-gfx90a.kdb" { preferLocalBuild = true; } '' - ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx90a.kdb.bz2 > $out - ''; - - gfx1030 = runCommand "miopen-gfx1030.kdb" { preferLocalBuild = true; } '' - ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx1030.kdb.bz2 > $out - ''; -in -stdenv.mkDerivation (finalAttrs: { - inherit version src; - pname = "miopen"; - - # Find zstd and add to target. Mainly for torch. - patches = [ - (fetchpatch { - url = "https://github.com/ROCm/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch"; - hash = "sha256-oxa3qlIC2bzbwGxrQOZXoY/S7CpLsMrnWRB7Og0tk0M="; - }) - (fetchpatch { - url = "https://github.com/ROCm/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; - hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs="; - }) - ]; - - outputs = - [ - "out" - ] - ++ lib.optionals buildDocs [ - "doc" - ] - ++ lib.optionals buildTests [ - "test" - ]; - - nativeBuildInputs = [ - pkg-config - cmake - rocm-cmake - clr - clang-tools-extra - ]; - - buildInputs = - [ - rocblas - rocmlir - clang-ocl - miopengemm - composable_kernel - half - boost - sqlite - bzip2 - nlohmann_json - frugally-deep - ] - ++ lib.optionals buildDocs [ - latex - doxygen - sphinx - rocm-docs-core - python3Packages.sphinx-rtd-theme - python3Packages.breathe - python3Packages.myst-parser - ] - ++ lib.optionals buildTests [ - gtest - zlib - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_FLAGS=-Wno-#warnings" # -> - "-DMIOPEN_USE_MIOPENGEMM=ON" - "-DUNZIPPER=${bzip2}/bin/bunzip2" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (!useOpenCL) [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DMIOPEN_BACKEND=HIP" - ] - ++ lib.optionals useOpenCL [ - "-DMIOPEN_BACKEND=OpenCL" - ] - ++ lib.optionals buildTests [ - "-DBUILD_TESTS=ON" - "-DMIOPEN_TEST_ALL=ON" - ]; - - postPatch = '' - patchShebangs test src/composable_kernel fin utils install_deps.cmake - - substituteInPlace CMakeLists.txt \ - --replace "unpack_db(\"\''${CMAKE_SOURCE_DIR}/src/kernels/\''${FILE_NAME}.kdb.bz2\")" "" \ - --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \ - --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # error: missing required key 'key' - - substituteInPlace test/gtest/CMakeLists.txt \ - --replace "include(googletest)" "" - - substituteInPlace test/gtest/CMakeLists.txt \ - --replace-fail " gtest_main " " ${gtest}/lib/libgtest.so ${gtest}/lib/libgtest_main.so " - - ln -sf ${gfx900} src/kernels/gfx900.kdb - ln -sf ${gfx906} src/kernels/gfx906.kdb - ln -sf ${gfx908} src/kernels/gfx908.kdb - ln -sf ${gfx90a} src/kernels/gfx90a.kdb - ln -sf ${gfx1030} src/kernels/gfx1030.kdb - ''; - - # Unfortunately, it seems like we have to call make on these manually - postBuild = - lib.optionalString buildDocs '' - python -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html - '' - + lib.optionalString buildTests '' - make -j$NIX_BUILD_CORES check - ''; - - postInstall = - '' - rm $out/bin/install_precompiled_kernels.sh - ln -sf ${gfx900} $out/share/miopen/db/gfx900.kdb - ln -sf ${gfx906} $out/share/miopen/db/gfx906.kdb - ln -sf ${gfx908} $out/share/miopen/db/gfx908.kdb - ln -sf ${gfx90a} $out/share/miopen/db/gfx90a.kdb - ln -sf ${gfx1030} $out/share/miopen/db/gfx1030.kdb - '' - + lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} - '' - + lib.optionalString buildTests '' - mkdir -p $test/bin - mv bin/test_* $test/bin - patchelf --set-rpath $out/lib:${ - lib.makeLibraryPath ( - finalAttrs.buildInputs - ++ [ - clr - rocm-comgr - ] - ) - } $test/bin/* - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Machine intelligence library for ROCm"; - homepage = "https://github.com/ROCm/MIOpen"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix deleted file mode 100644 index a2224c14e3d5..000000000000 --- a/pkgs/development/rocm-modules/5/miopengemm/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - clblast, - texliveSmall, - doxygen, - sphinx, - openblas, - python3Packages, - buildDocs ? true, - buildTests ? false, - buildBenchmarks ? false, -}: - -let - latex = lib.optionalAttrs buildDocs ( - texliveSmall.withPackages ( - ps: with ps; [ - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec - ] - ) - ); -in -stdenv.mkDerivation (finalAttrs: { - pname = "miopengemm"; - version = "5.5.0"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildDocs [ - "doc" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - # Deprecated? https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/issues/62 - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "MIOpenGEMM"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - ]; - - buildInputs = - lib.optionals buildDocs [ - latex - doxygen - sphinx - python3Packages.sphinx-rtd-theme - python3Packages.breathe - ] - ++ lib.optionals buildTests [ - openblas - ] - ++ lib.optionals buildBenchmarks [ - clblast - python3Packages.triton - ]; - - cmakeFlags = - [ - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals buildTests [ - "-DOPENBLAS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DAPI_BENCH_MIOGEMM=ON" - "-DAPI_BENCH_CLBLAST=ON" - "-DAPI_BENCH_ISAAC=ON" - ]; - - # Unfortunately, it seems like we have to call make on these manually - postBuild = - lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make doc - '' - + lib.optionalString buildTests '' - make check - '' - + lib.optionalString buildBenchmarks '' - make examples - ''; - - postInstall = - lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/miopengemm - mv ../doc/pdf/miopengemm.pdf $out/share/doc/miopengemm - '' - + lib.optionalString buildTests '' - mkdir -p $test/bin - find tests -executable -type f -exec mv {} $test/bin \; - patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $test/bin/* - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - find examples -executable -type f -exec mv {} $benchmark/bin \; - patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/* - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "OpenCL general matrix multiplication API for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - # They are not making tags or releases, this may break other derivations in the future - # Use version major instead of minor, 6.0 will HOPEFULLY have a release or tag - broken = - versions.major finalAttrs.version != versions.major stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix deleted file mode 100644 index abc9c7a5581b..000000000000 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ /dev/null @@ -1,164 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocm-device-libs, - clr, - pkg-config, - rpp, - rocblas, - miopengemm, - miopen, - migraphx, - clang, - openmp, - protobuf, - qtcreator, - opencv, - ffmpeg, - boost, - libjpeg_turbo, - half, - lmdb, - rapidjson, - rocm-docs-core, - python3Packages, - useOpenCL ? false, - useCPU ? false, - buildDocs ? false, # Needs internet - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = - "mivisionx-" - + ( - if (!useOpenCL && !useCPU) then - "hip" - else if (!useOpenCL && !useCPU) then - "opencl" - else - "cpu" - ); - - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "MIVisionX"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; - }; - - patches = [ - ../../6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch - ]; - - nativeBuildInputs = - [ - cmake - rocm-cmake - clr - pkg-config - ] - ++ lib.optionals buildDocs [ - rocm-docs-core - python3Packages.python - ]; - - buildInputs = [ - miopengemm - miopen - migraphx - rpp - rocblas - openmp - half - protobuf - qtcreator - opencv - ffmpeg - boost - libjpeg_turbo - lmdb - rapidjson - python3Packages.pybind11 - python3Packages.numpy - python3Packages.torchWithRocm - ]; - - cmakeFlags = - [ - "-DROCM_PATH=${clr}" - "-DAMDRPP_PATH=${rpp}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_PREFIX_PYTHON=lib" - # "-DAMD_FP16_SUPPORT=ON" `error: typedef redefinition with different types ('__half' vs 'half_float::half')` - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals (!useOpenCL && !useCPU) [ - "-DBACKEND=HIP" - ] - ++ lib.optionals (useOpenCL && !useCPU) [ - "-DBACKEND=OCL" - ] - ++ lib.optionals useCPU [ - "-DBACKEND=CPU" - ]; - - postPatch = '' - # We need to not use hipcc and define the CXXFLAGS manually due to `undefined hidden symbol: tensorflow:: ...` - export CXXFLAGS+="--rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" - patchShebangs rocAL/rocAL_pybind/examples - - # Properly find miopengemm and miopen - substituteInPlace amd_openvx_extensions/CMakeLists.txt \ - --replace "miopengemm PATHS \''${ROCM_PATH} QUIET" "miopengemm PATHS ${miopengemm} QUIET" \ - --replace "miopen PATHS \''${ROCM_PATH} QUIET" "miopen PATHS ${miopen} QUIET" \ - --replace "\''${ROCM_PATH}/include/miopen/config.h" "${miopen}/include/miopen/config.h" - - # Properly find turbojpeg - substituteInPlace amd_openvx/cmake/FindTurboJpeg.cmake \ - --replace "\''${TURBO_JPEG_PATH}/include" "${libjpeg_turbo.dev}/include" \ - --replace "\''${TURBO_JPEG_PATH}/lib" "${libjpeg_turbo.out}/lib" - - # Fix bad paths - substituteInPlace rocAL/rocAL/rocAL_hip/CMakeLists.txt amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt amd_openvx/openvx/hipvx/CMakeLists.txt \ - --replace "COMPILER_FOR_HIP \''${ROCM_PATH}/llvm/bin/clang++" "COMPILER_FOR_HIP ${clang}/bin/clang++" - ''; - - postBuild = lib.optionalString buildDocs '' - python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html - ''; - - postInstall = lib.optionalString (!useOpenCL && !useCPU) '' - patchelf $out/lib/rocal_pybind*.so --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" - chmod +x $out/lib/rocal_pybind*.so - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications"; - homepage = "https://github.com/ROCm/MIVisionX"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rccl/default.nix b/pkgs/development/rocm-modules/5/rccl/default.nix deleted file mode 100644 index 7d554e5cc07e..000000000000 --- a/pkgs/development/rocm-modules/5/rccl/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocm-smi, - clr, - perl, - hipify, - gtest, - chrpath, - buildTests ? false, - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rccl"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rccl"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-nFkou/kjGBmImorlPOZNTlCrxbfAYpDhgRveyoAufu8="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - perl - hipify - ]; - - buildInputs = - [ - rocm-smi - gtest - ] - ++ lib.optionals buildTests [ - chrpath - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DBUILD_BFD=OFF" # Can't get it to detect bfd.h - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_TESTS=ON" - ]; - - postPatch = '' - patchShebangs src tools - - # Really strange behavior, `#!/usr/bin/env perl` should work... - substituteInPlace CMakeLists.txt \ - --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" - ''; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/* $test/bin - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm communication collectives library"; - homepage = "https://github.com/ROCm/rccl"; - license = with licenses; [ - bsd2 - bsd3 - ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rdc/default.nix b/pkgs/development/rocm-modules/5/rdc/default.nix deleted file mode 100644 index 304e3e377f51..000000000000 --- a/pkgs/development/rocm-modules/5/rdc/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-smi, - rocm-runtime, - libcap, - grpc, - protobuf, - openssl, - doxygen, - graphviz, - texliveSmall, - gtest, - buildDocs ? true, - buildTests ? false, -}: - -let - latex = lib.optionalAttrs buildDocs ( - texliveSmall.withPackages ( - ps: with ps; [ - changepage - latexmk - varwidth - multirow - hanging - adjustbox - collectbox - stackengine - enumitem - alphalph - wasysym - sectsty - tocloft - newunicodechar - etoc - helvetic - wasy - courier - ] - ) - ); -in -stdenv.mkDerivation (finalAttrs: { - pname = "rdc"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildDocs [ - "doc" - ] - ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rdc"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xZD/WI/LfNtKK9j6ZjuU0OTTFZz3G4atyD5mVcSsQ8A="; - }; - - nativeBuildInputs = - [ - cmake - protobuf - ] - ++ lib.optionals buildDocs [ - doxygen - graphviz - latex - ]; - - buildInputs = - [ - rocm-smi - rocm-runtime - libcap - grpc - openssl - ] - ++ lib.optionals buildTests [ - gtest - ]; - - cmakeFlags = - [ - "-DCMAKE_VERBOSE_MAKEFILE=OFF" - "-DRDC_INSTALL_PREFIX=${placeholder "out"}" - "-DBUILD_ROCRTEST=ON" - "-DRSMI_INC_DIR=${rocm-smi}/include" - "-DRSMI_LIB_DIR=${rocm-smi}/lib" - "-DGRPC_ROOT=${grpc}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBEXECDIR=libexec" - "-DCMAKE_INSTALL_DOCDIR=doc" - ] - ++ lib.optionals buildTests [ - "-DBUILD_TESTS=ON" - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "file(STRINGS /etc/os-release LINUX_DISTRO LIMIT_COUNT 1 REGEX \"NAME=\")" "set(LINUX_DISTRO \"NixOS\")" - ''; - - postInstall = - '' - find $out/bin -executable -type f -exec \ - patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \; - '' - + lib.optionalString buildTests '' - mkdir -p $test - mv $out/bin/rdctst_tests $test/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments"; - homepage = "https://github.com/ROCm/rdc"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - # broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version || versionAtLeast finalAttrs.version "6.0.0"; - broken = true; # Too many errors, unsure how to fix - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocalution/default.nix b/pkgs/development/rocm-modules/5/rocalution/default.nix deleted file mode 100644 index 624cdebafe36..000000000000 --- a/pkgs/development/rocm-modules/5/rocalution/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocblas, - rocsparse, - rocprim, - rocrand, - clr, - git, - openmp, - openmpi, - gtest, - buildTests ? false, - buildBenchmarks ? false, - buildSamples ? false, - gpuTargets ? [ ], # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocalution"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ] - ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocALUTION"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-+UGpFuZsC4+kmo8LWZWC2YoFJSdTukjN47e1YqW5Zu4="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - git - ]; - - buildInputs = - [ - rocblas - rocsparse - rocprim - rocrand - openmp - openmpi - ] - ++ lib.optionals buildTests [ - gtest - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DROCM_PATH=${clr}" - "-DHIP_ROOT_DIR=${clr}" - "-DSUPPORT_HIP=ON" - "-DSUPPORT_OMP=ON" - "-DSUPPORT_MPI=ON" - "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/rocalution-test $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/rocalution-bench $benchmark/bin - '' - + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/* $sample/bin - rm $sample/bin/rocalution-test || true - rm $sample/bin/rocalution-bench || true - - patchelf --set-rpath \ - $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ clr ])} \ - $sample/bin/* - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Iterative sparse solvers for ROCm"; - homepage = "https://github.com/ROCm/rocALUTION"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix deleted file mode 100644 index f583b50e9fe7..000000000000 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ /dev/null @@ -1,248 +0,0 @@ -{ - rocblas, - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - python3, - tensile, - msgpack, - libxml2, - gtest, - gfortran, - openmp, - amd-blis, - python3Packages, - buildTensile ? true, - buildTests ? false, - buildBenchmarks ? false, - tensileLogic ? "asm_full", - tensileCOVersion ? "default", - tensileSepArch ? true, - tensileLazyLib ? true, - tensileLibFormat ? "msgpack", - gpuTargets ? [ "all" ], -}: - -let - # NOTE: Update the default GPU targets on every update - gfx80 = - (rocblas.override { - gpuTargets = [ - "gfx803" - ]; - }).overrideAttrs - { pname = "rocblas-tensile-gfx80"; }; - - gfx90 = - (rocblas.override { - gpuTargets = [ - "gfx900" - "gfx906:xnack-" - "gfx908:xnack-" - "gfx90a:xnack+" - "gfx90a:xnack-" - ]; - }).overrideAttrs - { pname = "rocblas-tensile-gfx90"; }; - - gfx94 = - (rocblas.override { - gpuTargets = [ - "gfx940" - "gfx941" - "gfx942" - ]; - }).overrideAttrs - { pname = "rocblas-tensile-gfx94"; }; - - gfx10 = - (rocblas.override { - gpuTargets = [ - "gfx1010" - "gfx1012" - "gfx1030" - ]; - }).overrideAttrs - { pname = "rocblas-tensile-gfx10"; }; - - gfx11 = - (rocblas.override { - gpuTargets = [ - "gfx1100" - "gfx1101" - "gfx1102" - ]; - }).overrideAttrs - { pname = "rocblas-tensile-gfx11"; }; - - # Unfortunately, we have to do two full builds, otherwise we get overlapping _fallback.dat files - fallbacks = rocblas.overrideAttrs { pname = "rocblas-tensile-fallbacks"; }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocblas"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocBLAS"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-3wKnwvAra8u9xqlC05wUD+gSoBILTVJFU2cIV6xv3Lk="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - ]; - - buildInputs = - [ - python3 - ] - ++ lib.optionals buildTensile [ - msgpack - libxml2 - python3Packages.msgpack - python3Packages.joblib - ] - ++ lib.optionals buildTests [ - gtest - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - gfortran - openmp - amd-blis - ] - ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [ - python3Packages.pyyaml - ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-Dpython=python3" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DBUILD_WITH_TENSILE=${if buildTensile then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals buildTensile [ - "-DVIRTUALENV_HOME_DIR=/build/source/tensile" - "-DTensile_TEST_LOCAL_PATH=/build/source/tensile" - "-DTensile_ROOT=/build/source/tensile/${python3.sitePackages}/Tensile" - "-DTensile_LOGIC=${tensileLogic}" - "-DTensile_CODE_OBJECT_VERSION=${tensileCOVersion}" - "-DTensile_SEPARATE_ARCHITECTURES=${if tensileSepArch then "ON" else "OFF"}" - "-DTensile_LAZY_LIBRARY_LOADING=${if tensileLazyLib then "ON" else "OFF"}" - "-DTensile_LIBRARY_FORMAT=${tensileLibFormat}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" - ]; - - postPatch = - lib.optionalString (finalAttrs.pname != "rocblas") '' - # Return early and install tensile files manually - substituteInPlace library/src/CMakeLists.txt \ - --replace "set_target_properties( TensileHost PROPERTIES OUTPUT_NAME" "return()''\nset_target_properties( TensileHost PROPERTIES OUTPUT_NAME" - '' - + lib.optionalString (buildTensile && finalAttrs.pname == "rocblas") '' - # Link the prebuilt Tensile files - mkdir -p build/Tensile/library - - for path in ${gfx80} ${gfx90} ${gfx94} ${gfx10} ${gfx11} ${fallbacks}; do - ln -s $path/lib/rocblas/library/* build/Tensile/library - done - - unlink build/Tensile/library/TensileManifest.txt - '' - + lib.optionalString buildTensile '' - # Tensile REALLY wants to write to the nix directory if we include it normally - cp -a ${tensile} tensile - chmod +w -R tensile - - # Rewrap Tensile - substituteInPlace tensile/bin/{.t*,.T*,*} \ - --replace "${tensile}" "/build/source/tensile" - - substituteInPlace CMakeLists.txt \ - --replace "include(virtualenv)" "" \ - --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" - ''; - - postInstall = - lib.optionalString (finalAttrs.pname == "rocblas") '' - ln -sf ${fallbacks}/lib/rocblas/library/TensileManifest.txt $out/lib/rocblas/library - '' - + lib.optionalString (finalAttrs.pname != "rocblas") '' - mkdir -p $out/lib/rocblas/library - rm -rf $out/share - '' - + - lib.optionalString - (finalAttrs.pname != "rocblas" && finalAttrs.pname != "rocblas-tensile-fallbacks") - '' - rm Tensile/library/{TensileManifest.txt,*_fallback.dat} - mv Tensile/library/* $out/lib/rocblas/library - '' - + lib.optionalString (finalAttrs.pname == "rocblas-tensile-fallbacks") '' - mv Tensile/library/{TensileManifest.txt,*_fallback.dat} $out/lib/rocblas/library - '' - + lib.optionalString buildTests '' - mkdir -p $test/bin - cp -a $out/bin/* $test/bin - rm $test/bin/*-bench || true - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/*-test || true - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rm -rf $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "BLAS implementation for ROCm platform"; - homepage = "https://github.com/ROCm/rocBLAS"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix deleted file mode 100644 index bf00f881d1fd..000000000000 --- a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - git, - rocm-comgr, - rocm-runtime, - hwdata, - texliveSmall, - doxygen, - graphviz, - buildDocs ? true, -}: - -let - latex = lib.optionalAttrs buildDocs ( - texliveSmall.withPackages ( - ps: with ps; [ - changepage - latexmk - varwidth - multirow - hanging - adjustbox - collectbox - stackengine - enumitem - alphalph - wasysym - sectsty - tocloft - newunicodechar - etoc - helvetic - wasy - courier - ] - ) - ); -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocdbgapi"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildDocs [ - "doc" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "ROCdbgapi"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-qMXvgcS61lgcylz62ErYq8fhpYIR31skQEeKUryuP1w="; - }; - - nativeBuildInputs = - [ - cmake - rocm-cmake - git - ] - ++ lib.optionals buildDocs [ - latex - doxygen - graphviz - ]; - - buildInputs = [ - rocm-comgr - rocm-runtime - hwdata - ]; - - cmakeFlags = [ - "-DPCI_IDS_PATH=${hwdata}/share/hwdata" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - # Unfortunately, it seems like we have to call make on this manually - postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make -j$NIX_BUILD_CORES doc - ''; - - postInstall = - '' - substituteInPlace $out/lib/cmake/amd-dbgapi/amd-dbgapi-config.cmake \ - --replace "/build/source/build/" "" - - substituteInPlace $out/lib/cmake/amd-dbgapi/amd-dbgapi-targets.cmake \ - --replace "/build/source/build" "$out" - '' - + lib.optionalString buildDocs '' - mv $out/share/html/amd-dbgapi $doc/share/doc/amd-dbgapi/html - rmdir $out/share/html - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Debugger support for control of execution and inspection state"; - homepage = "https://github.com/ROCm/ROCdbgapi"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocfft/default.nix b/pkgs/development/rocm-modules/5/rocfft/default.nix deleted file mode 100644 index 438bce9cb66d..000000000000 --- a/pkgs/development/rocm-modules/5/rocfft/default.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ - rocfft, - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - clr, - python3, - rocm-cmake, - sqlite, - boost, - fftw, - fftwFloat, - gtest, - openmp, - rocrand, - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocfft"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocFFT"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-GZSi03geTT+NUztBWhGYyghLqJGsFjUQzVAKQ7d03uA="; - }; - - nativeBuildInputs = [ - cmake - clr - python3 - rocm-cmake - ]; - - buildInputs = [ sqlite ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DSQLITE_USE_SYSTEM_PACKAGE=ON" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ]; - - passthru = { - test = stdenv.mkDerivation { - pname = "${finalAttrs.pname}-test"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/clients/tests"; - - nativeBuildInputs = [ - cmake - clr - rocm-cmake - ]; - - buildInputs = [ - boost - fftw - fftwFloat - finalAttrs.finalPackage - gtest - openmp - rocrand - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - - postInstall = '' - rm -r "$out/lib/fftw" - rmdir "$out/lib" - ''; - }; - - benchmark = stdenv.mkDerivation { - pname = "${finalAttrs.pname}-benchmark"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/clients/rider"; - - nativeBuildInputs = [ - cmake - clr - rocm-cmake - ]; - - buildInputs = [ - boost - finalAttrs.finalPackage - openmp - (python3.withPackages ( - ps: with ps; [ - pandas - scipy - ] - )) - rocrand - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - - postInstall = '' - cp -a ../../../scripts/perf "$out/bin" - ''; - }; - - samples = stdenv.mkDerivation { - pname = "${finalAttrs.pname}-samples"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/clients/samples"; - - nativeBuildInputs = [ - cmake - clr - rocm-cmake - ]; - - buildInputs = [ - boost - finalAttrs.finalPackage - openmp - rocrand - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - - installPhase = '' - runHook preInstall - mkdir "$out" - cp -a bin "$out" - runHook postInstall - ''; - }; - - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "FFT implementation for ROCm"; - homepage = "https://github.com/ROCm/rocFFT"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ kira-bruneau ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocgdb/default.nix b/pkgs/development/rocm-modules/5/rocgdb/default.nix deleted file mode 100644 index 47a774f97395..000000000000 --- a/pkgs/development/rocm-modules/5/rocgdb/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - pkg-config, - texinfo, - bison, - flex, - zlib, - elfutils, - gmp, - ncurses, - expat, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocgdb"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "ROCgdb"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-TlT7vvTrVd7P6ilVnWIG5VIrjTleFgDezK/mudBV+xE="; - }; - - nativeBuildInputs = [ - pkg-config - texinfo # For makeinfo - bison - flex - ]; - - buildInputs = [ - zlib - elfutils - gmp - ncurses - expat - ]; - - # `-Wno-format-nonliteral` doesn't work - env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm source-level debugger for Linux, based on GDB"; - homepage = "https://github.com/ROCm/ROCgdb"; - license = with licenses; [ - gpl2 - gpl3 - bsd3 - ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix deleted file mode 100644 index cfac40da8a33..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-cmake"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocm-cmake"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-aVjzuJ4BiSfwOdjufFc5CznfnL8di5h992zl+pzD0DU="; - }; - - nativeBuildInputs = [ cmake ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "CMake modules for common build tasks for the ROCm stack"; - homepage = "https://github.com/ROCm/rocm-cmake"; - license = licenses.mit; - teams = [ teams.rocm ]; - platforms = platforms.unix; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix deleted file mode 100644 index 2e7f8b9182e8..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocm-device-libs, - libxml2, -}: - -let - llvmNativeTarget = - if stdenv.hostPlatform.isx86_64 then - "X86" - else if stdenv.hostPlatform.isAarch64 then - "AArch64" - else - throw "Unsupported ROCm LLVM platform"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-comgr"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "ROCm-CompilerSupport"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-QB3G0V92UTW67hD6+zSuExN1+eMT820iYSlMyZeWSFw="; - }; - - sourceRoot = "${finalAttrs.src.name}/lib/comgr"; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ - rocm-device-libs - libxml2 - ]; - - cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "APIs for compiling and inspecting AMDGPU code objects"; - homepage = "https://github.com/ROCm/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; - license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocm-core/default.nix b/pkgs/development/rocm-modules/5/rocm-core/default.nix deleted file mode 100644 index 5be1b796e43b..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-core/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-core"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocm-core"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jFAHLqf/AR27Nbuq8aypWiKqApNcTgG5LWESVjVCKIg="; - }; - - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DROCM_VERSION=${finalAttrs.version}" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - page = "tags?per_page=1"; - filter = ".[0].name | split(\"-\") | .[1]"; - }; - - meta = with lib; { - description = "Utility for getting the ROCm release version"; - homepage = "https://github.com/ROCm/rocm-core"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/cmake.patch b/pkgs/development/rocm-modules/5/rocm-device-libs/cmake.patch deleted file mode 100644 index 500ff37a9905..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/cmake.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake -index 07c60eb..c736b3e 100644 ---- a/cmake/Packages.cmake -+++ b/cmake/Packages.cmake -@@ -12,24 +12,29 @@ set_target_properties(${target} PROPERTIES - IMPORTED_LOCATION \"${target_path}\")") - endforeach() - configure_file(AMDDeviceLibsConfig.cmake.in -- ${PACKAGE_PREFIX}/AMDDeviceLibsConfig.cmake -+ lib/cmake/AMDDeviceLibs/AMDDeviceLibsConfig.cmake - @ONLY) - - - set(install_path_suffix "amdgcn/bitcode") - - # Generate the install-tree package. --# We do not know the absolute path to the intall tree until we are installed, --# so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use --# relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. --set(AMD_DEVICE_LIBS_PREFIX_CODE " -+if(IS_ABSOLUTE "${CMAKE_INSTALL_PREFIX}") -+ set(AMD_DEVICE_LIBS_PREFIX_CODE "set(AMD_DEVICE_LIBS_PREFIX \"${CMAKE_INSTALL_PREFIX}\")") -+else() -+ # We do not know the absolute path to the install tree until we are installed, -+ # so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use -+ # relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. -+ set(AMD_DEVICE_LIBS_PREFIX_CODE " - # Derive absolute install prefix from config file path. - get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") --string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") --foreach(p ${count}) -- set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} -+ string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") -+ foreach(p ${count}) -+ set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} - get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${AMD_DEVICE_LIBS_PREFIX}\" PATH)") --endforeach() -+ endforeach() -+endif() -+ - set(AMD_DEVICE_LIBS_TARGET_CODE) - foreach(target ${AMDGCN_LIB_LIST}) - get_target_property(target_name ${target} ARCHIVE_OUTPUT_NAME) diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix deleted file mode 100644 index a629560d1ed6..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - libxml2, -}: - -let - llvmNativeTarget = - if stdenv.hostPlatform.isx86_64 then - "X86" - else if stdenv.hostPlatform.isAarch64 then - "AArch64" - else - throw "Unsupported ROCm LLVM platform"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-device-libs"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "ROCm-Device-Libs"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ARxs/yqyVoIUWliJkINzitumF+64/5u3fbB0tHB5hPU="; - }; - - patches = [ ./cmake.patch ]; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ libxml2 ]; - cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Set of AMD-specific device-side language runtime libraries"; - homepage = "https://github.com/ROCm/ROCm-Device-Libs"; - license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix deleted file mode 100644 index 23cf0d7c2dc2..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - gitUpdater, - buildPythonPackage, - setuptools, - beautifulsoup4, - gitpython, - pydata-sphinx-theme, - pygithub, - sphinx, - breathe, - myst-parser, - sphinx-book-theme, - sphinx-copybutton, - sphinx-design, - sphinx-external-toc, - sphinx-notfound-page, - pyyaml, - fastjsonschema, -}: - -# FIXME: Move to rocmPackages_common -buildPythonPackage rec { - pname = "rocm-docs-core"; - version = "1.12.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "rocm-docs-core"; - rev = "v${version}"; - hash = "sha256-++Vi0jZLtHWsGy5IUohgF3P+Q6Jg/d0xWyDA6urbHUA="; - }; - - buildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - beautifulsoup4 - gitpython - pydata-sphinx-theme - pygithub - sphinx - breathe - myst-parser - sphinx-book-theme - sphinx-copybutton - sphinx-design - sphinx-external-toc - sphinx-notfound-page - pyyaml - fastjsonschema - ]; - - pythonImportsCheck = [ "rocm_docs" ]; - - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - - meta = with lib; { - description = "ROCm Documentation Python package for ReadTheDocs build standardization"; - homepage = "https://github.com/RadeonOpenCompute/rocm-docs-core"; - license = with licenses; [ - mit - cc-by-40 - ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix deleted file mode 100644 index 12f56c92e569..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - pkg-config, - cmake, - xxd, - rocm-device-libs, - rocm-thunk, - elfutils, - libdrm, - numactl, - valgrind, - libxml2, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-runtime"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "ROCR-Runtime"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-D7Ahan5cxDhqPtV5iDDNys0A4FlxQ9oVRa2EeMoY5Qk="; - }; - - sourceRoot = "${finalAttrs.src.name}/src"; - - nativeBuildInputs = [ - pkg-config - cmake - xxd - ]; - - buildInputs = [ - rocm-thunk - elfutils - libdrm - numactl - valgrind - libxml2 - ]; - - postPatch = '' - patchShebangs image/blit_src/create_hsaco_ascii_file.sh - patchShebangs core/runtime/trap_handler/create_trap_handler_header.sh - - substituteInPlace CMakeLists.txt \ - --replace 'hsa/include/hsa' 'include/hsa' - - # We compile clang before rocm-device-libs, so patch it in afterwards - # Replace object version: https://github.com/ROCm/ROCR-Runtime/issues/166 (TODO: Remove on LLVM update?) - substituteInPlace image/blit_src/CMakeLists.txt \ - --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' \ - --replace '-mcode-object-version=4' '-mcode-object-version=5' - ''; - - fixupPhase = '' - rm -rf $out/hsa/* - ln -s $out/{include,lib} $out/hsa - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Platform runtime for ROCm"; - homepage = "https://github.com/ROCm/ROCR-Runtime"; - license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocm-smi/cmake.patch b/pkgs/development/rocm-modules/5/rocm-smi/cmake.patch deleted file mode 100644 index 2634ea46a1f8..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-smi/cmake.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/rocm_smi-backward-compat.cmake b/rocm_smi-backward-compat.cmake -index aa8fd9c..59afce5 100644 ---- a/rocm_smi-backward-compat.cmake -+++ b/rocm_smi-backward-compat.cmake -@@ -72,7 +72,12 @@ function(generate_wrapper_header) - set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") - #set #include statement - get_filename_component(file_name ${header_file} NAME) -- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${ROCM_SMI}/${file_name}\"\n") -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") -+ else() -+ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") -+ endif() -+ set(include_statements "${include_statements}#include \"${include_dir}/${ROCM_SMI}/${file_name}\"\n") - configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${RSMI_WRAPPER_INC_DIR}/${file_name}) - unset(include_guard) - unset(include_statements) -@@ -90,7 +95,12 @@ function(generate_wrapper_header) - set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") - #set #include statement - get_filename_component(file_name ${header_file} NAME) -- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${OAM_TARGET_NAME}/${file_name}\"\n") -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") -+ else() -+ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") -+ endif() -+ set(include_statements "${include_statements}#include \"${include_dir}/${OAM_TARGET_NAME}/${file_name}\"\n") - configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${OAM_WRAPPER_INC_DIR}/${file_name}) - unset(include_guard) - unset(include_statements) -@@ -123,11 +133,16 @@ function(create_library_symlink) - set(library_files "${LIB_RSMI}") - endif() - -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -+ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") -+ endif() - foreach(file_name ${library_files}) - add_custom_target(link_${file_name} ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) -+ ${install_libdir}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) - endforeach() - - file(MAKE_DIRECTORY ${OAM_WRAPPER_LIB_DIR}) -@@ -151,11 +166,16 @@ function(create_library_symlink) - set(library_files "${LIB_OAM}") - endif() - -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -+ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") -+ endif() - foreach(file_name ${library_files}) - add_custom_target(link_${file_name} ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) -+ ${install_libdir}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) - endforeach() - - endfunction() -diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt -index c594eeb..d3ed39d 100755 ---- a/rocm_smi/CMakeLists.txt -+++ b/rocm_smi/CMakeLists.txt -@@ -105,10 +105,15 @@ endif () - #file reorganization changes - #rocm_smi.py moved to libexec/rocm_smi. so creating rocm-smi symlink - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -+if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBEXECDIR}) -+ set(install_libexecdir "${CMAKE_INSTALL_LIBEXECDIR}") -+else() -+ set(install_libexecdir "../${CMAKE_INSTALL_LIBEXECDIR}") -+endif() - add_custom_target(link-rocm-smi ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../${CMAKE_INSTALL_LIBEXECDIR}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) -+ ${install_libexecdir}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) - - ## Add the install directives for the runtime library. - install(TARGETS ${ROCM_SMI_TARGET} diff --git a/pkgs/development/rocm-modules/5/rocm-smi/default.nix b/pkgs/development/rocm-modules/5/rocm-smi/default.nix deleted file mode 100644 index 7940f89d299e..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-smi/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - wrapPython, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-smi"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocm_smi_lib"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-NZR4jBgKVfpkRNQFPmav1yCZF872LkcrPBNNcBVTLDU="; - }; - - patches = [ ./cmake.patch ]; - - nativeBuildInputs = [ - cmake - wrapPython - ]; - - cmakeFlags = [ - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postInstall = '' - wrapPythonProgramsIn $out - mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "System management interface for AMD GPUs supported by ROCm"; - mainProgram = "rocm-smi"; - homepage = "https://github.com/ROCm/rocm_smi_lib"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = [ "x86_64-linux" ]; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix deleted file mode 100644 index 60ddab0a04e0..000000000000 --- a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - pkg-config, - cmake, - libdrm, - numactl, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-thunk"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "ROCT-Thunk-Interface"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jAMBks2/JaXiA45B3qvLHY8fPeFcr1GHT5Jieuduqhw="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - ]; - - buildInputs = [ - libdrm - numactl - ]; - - cmakeFlags = [ - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Radeon open compute thunk interface"; - homepage = "https://github.com/ROCm/ROCT-Thunk-Interface"; - license = with licenses; [ - bsd2 - mit - ]; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix deleted file mode 100644 index 05184f8a1ec9..000000000000 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocm-runtime, - busybox, - python3, - gnugrep, - # rocminfo requires that the calling user have a password and be in - # the video group. If we let rocm_agent_enumerator rely upon - # rocminfo's output, then it, too, has those requirements. Instead, - # we can specify the GPU targets for this system (e.g. "gfx803" for - # Polaris) such that no system call is needed for downstream - # compilers to determine the desired target. - defaultTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - version = "5.7.1"; - pname = "rocminfo"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocminfo"; - rev = "rocm-${finalAttrs.version}"; - sha256 = "sha256-UzOo2qDT/uM+vdGdBM4pV5e143mfa+/6sZLBExOO26g="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ rocm-runtime ]; - propagatedBuildInputs = [ python3 ]; - cmakeFlags = [ "-DROCRTST_BLD_TYPE=Release" ]; - - prePatch = '' - patchShebangs rocm_agent_enumerator - sed 's,lsmod | grep ,${busybox}/bin/lsmod | ${gnugrep}/bin/grep ,' -i rocminfo.cc - ''; - - postInstall = lib.optionalString (defaultTargets != [ ]) '' - echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm Application for Reporting System Info"; - homepage = "https://github.com/ROCm/rocminfo"; - license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - stdenv.hostPlatform.isAarch64 - || versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix deleted file mode 100644 index ad0a262e51ff..000000000000 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ /dev/null @@ -1,149 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - ninja, - clr, - git, - libxml2, - libedit, - zstd, - zlib, - ncurses, - python3Packages, - buildRockCompiler ? false, - buildTests ? false, # `argument of type 'NoneType' is not iterable` -}: - -# Theoretically, we could have our MLIR have an output -# with the source and built objects so that we can just -# use it as the external LLVM repo for this -let - suffix = if buildRockCompiler then "-rock" else ""; - - llvmNativeTarget = - if stdenv.hostPlatform.isx86_64 then - "X86" - else if stdenv.hostPlatform.isAarch64 then - "AArch64" - else - throw "Unsupported ROCm LLVM platform"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocmlir${suffix}"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals (!buildRockCompiler) [ - "external" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocMLIR"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-vPi4UVljohVAfnwDVQqeOVaJPa6v8aV5uBOtqLddTtc="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - ninja - clr - python3Packages.python - python3Packages.tomli - ]; - - buildInputs = [ - git - libxml2 - libedit - ]; - - propagatedBuildInputs = [ - zstd - zlib - ncurses - ]; - - cmakeFlags = - [ - "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" - "-DLLVM_ENABLE_ZSTD=ON" - "-DLLVM_ENABLE_ZLIB=ON" - "-DLLVM_ENABLE_TERMINFO=ON" - "-DROCM_PATH=${clr}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals buildRockCompiler [ - "-DBUILD_FAT_LIBROCKCOMPILER=ON" - ] - ++ lib.optionals (!buildRockCompiler) [ - "-DROCM_TEST_CHIPSET=gfx000" - ]; - - postPatch = '' - patchShebangs mlir - - substituteInPlace mlir/utils/performance/common/CMakeLists.txt \ - --replace "/opt/rocm" "${clr}" - ''; - - dontBuild = true; - doCheck = true; - - # Certain libs aren't being generated, try enabling tests next update - checkTarget = - if buildRockCompiler then - "librockCompiler" - else if buildTests then - "check-rocmlir" - else - "check-rocmlir-build-only"; - - postInstall = - let - libPath = lib.makeLibraryPath [ - zstd - zlib - ncurses - clr - stdenv.cc.cc - ]; - in - lib.optionals (!buildRockCompiler) '' - mkdir -p $external/lib - cp -a external/llvm-project/llvm/lib/{*.a*,*.so*} $external/lib - patchelf --set-rpath $external/lib:$out/lib:${libPath} $external/lib/*.so* - patchelf --set-rpath $out/lib:$external/lib:${libPath} $out/{bin/*,lib/*.so*} - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - page = "tags?per_page=2"; - filter = ".[1].name | split(\"-\") | .[1]"; - }; - - meta = with lib; { - description = "MLIR-based convolution and GEMM kernel generator"; - homepage = "https://github.com/ROCm/rocMLIR"; - license = with licenses; [ asl20 ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocprim/default.nix b/pkgs/development/rocm-modules/5/rocprim/default.nix deleted file mode 100644 index 35e55ee75ac2..000000000000 --- a/pkgs/development/rocm-modules/5/rocprim/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - gtest, - gbenchmark, - buildTests ? false, - buildBenchmarks ? false, - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocprim"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocPRIM"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-+ukFWsWv3RhS+Z6tmR4TRT8QTYEDuAEk12F9Gv1eXGU="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - ]; - - buildInputs = - lib.optionals buildTests [ - gtest - ] - ++ lib.optionals buildBenchmarks [ - gbenchmark - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARK=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - mv $out/bin/rocprim $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm parallel primitives"; - homepage = "https://github.com/ROCm/rocPRIM"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch b/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch deleted file mode 100644 index aaa31c4974d5..000000000000 --- a/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 8473a42..07ea873 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -112,10 +112,6 @@ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE) - DEPENDS ${INPUT_FILE} clang - COMMENT "Building ${OUTPUT_FILE}..." - VERBATIM) -- install( -- FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1 -- COMPONENT tests) - set(HSACO_TARGET_LIST - ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} - PARENT_SCOPE) diff --git a/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch b/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch deleted file mode 100644 index aba7709c4edb..000000000000 --- a/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/bin/rocprofv2 b/bin/rocprofv2 -index 92f7489..8839d4d 100755 ---- a/bin/rocprofv2 -+++ b/bin/rocprofv2 -@@ -2,7 +2,8 @@ - set -eo pipefail - CURRENT_DIR="$(dirname -- "$0")" - ROCPROFV2_DIR=$(dirname -- $(realpath ${BASH_SOURCE[0]})) --ROCM_DIR=$(dirname -- "$ROCPROFV2_DIR") -+ROCPROFILER_DIR=$(dirname -- "$ROCPROFV2_DIR") -+ROCM_DIR=@rocmtoolkit_merged@ - PLUGIN_LIST=("ctf" "perfetto" "file" "att") - RUN_FROM_BUILD=0 - if [[ $ROCPROFV2_DIR == *"/build"* ]]; then -@@ -10,7 +11,7 @@ if [[ $ROCPROFV2_DIR == *"/build"* ]]; then - ROCM_DIR=$ROCPROFV2_DIR - fi - --export ROCPROFILER_METRICS_PATH=$ROCM_DIR/libexec/rocprofiler/counters/derived_counters.xml -+export ROCPROFILER_METRICS_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/counters/derived_counters.xml - export LD_LIBRARY_PATH=$ROCM_DIR/lib:$LD_LIBRARY_PATH - - usage() { -@@ -70,8 +71,8 @@ while [ 1 ]; do - exit 1 - fi - elif [[ "$1" = "--list-counters" ]]; then -- export LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so -- eval $ROCM_DIR/libexec/rocprofiler/ctrl -+ export LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so -+ eval $ROCPROFILER_DIR/libexec/rocprofiler/ctrl - exit 1 - elif [[ "$1" = "-i" || "$1" = "--input" ]]; then - if [ $2 ] && [ -n $2 ] && [ -r $2 ]; then -@@ -171,7 +172,7 @@ while [ 1 ]; do - if [ $RUN_FROM_BUILD == 1 ]; then - ATT_PATH=$ROCM_DIR/plugin/att/att/att.py - else -- ATT_PATH=$ROCM_DIR/libexec/rocprofiler/att/att.py -+ ATT_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/att/att.py - export ROCPROFV2_ATT_LIB_PATH=$ROCM_DIR/lib/hsa-amd-aqlprofile/librocprofv2_att.so - fi - ATT_ARGV=$3 -@@ -236,13 +237,13 @@ if [ -n "$PMC_LINES" ] && [ ! -n "$ATT_ARGV" ]; then - export OUTPUT_PATH=$FINAL_PATH - fi - let COUNTER=COUNTER+1 -- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* -+ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* - if [ -n "$OUTPUT_PATH" ]; then - echo -e "\nThe output path for the following counters: $OUTPUT_PATH" - fi - done - else -- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* -+ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* - fi - - get_pmc_results_txt_path() { -diff --git a/bin/rpl_run.sh b/bin/rpl_run.sh -index c1a3daa..bc868a5 100755 ---- a/bin/rpl_run.sh -+++ b/bin/rpl_run.sh -@@ -24,16 +24,17 @@ - - time_stamp=`date +%y%m%d_%H%M%S` - BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) --ROOT_DIR=$(dirname $BIN_DIR) -+ROCPROFILER_DIR=$(dirname $BIN_DIR) -+ROOT_DIR=@rocmtoolkit_merged@ - RUN_DIR=`pwd` - TMP_DIR="/tmp" - DATA_DIR="rpl_data_${time_stamp}_$$" - --RPL_PATH=$ROOT_DIR/lib -+RPL_PATH=$ROCPROFILER_DIR/lib - TLIB_PATH=$RPL_PATH/rocprofiler - TTLIB_PATH=$ROOT_DIR/lib/roctracer - ROCM_LIB_PATH=$ROOT_DIR/lib --PROF_BIN_DIR=$ROOT_DIR/libexec/rocprofiler -+PROF_BIN_DIR=$ROCPROFILER_DIR/libexec/rocprofiler - - if [ -z "$ROCP_PYTHON_VERSION" ] ; then - ROCP_PYTHON_VERSION=python3 -@@ -73,7 +74,7 @@ export ROCP_METRICS=$TLIB_PATH/metrics.xml - # Disable AQL-profile read API - export AQLPROFILE_READ_API=0 - # ROC Profiler package path --export ROCP_PACKAGE_DIR=$ROOT_DIR -+export ROCP_PACKAGE_DIR=$ROCPROFILER_DIR - # enabled SPM KFD mode - export ROCP_SPM_KFD_MODE=1 - -@@ -350,7 +351,7 @@ convert_time_val() { - - ################################################################################################ - # main --echo "RPL: on '$time_stamp' from '$ROOT_DIR' in '$RUN_DIR'" -+echo "RPL: on '$time_stamp' from '$ROCPROFILER_DIR' in '$RUN_DIR'" - # Parsing arguments - if [ -z "$1" ] ; then - usage -@@ -557,7 +558,7 @@ elif [ "$input_type" = "txt" -o "$input_type" = "none" ] ; then - else - echo "" > $RES_DIR/input.xml - fi -- input_list=`/bin/ls $RES_DIR/input*.xml` -+ input_list=`ls $RES_DIR/input*.xml` - export ROCPROFILER_SESS=$RES_DIR - else - fatal "Bad input file type '$INPUT_FILE'" diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix deleted file mode 100644 index 6c7569d9b144..000000000000 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - symlinkJoin, - replaceVars, - cmake, - clang, - clr, - rocm-core, - rocm-thunk, - rocm-device-libs, - roctracer, - rocdbgapi, - rocm-smi, - hsa-amd-aqlprofile-bin, - numactl, - libpciaccess, - libxml2, - elfutils, - mpi, - systemd, - gtest, - python3Packages, - gpuTargets ? clr.gpuTargets, -}: - -let - rocmtoolkit-merged = symlinkJoin { - name = "rocmtoolkit-merged"; - - paths = [ - rocm-core - rocm-thunk - rocm-device-libs - roctracer - rocdbgapi - rocm-smi - hsa-amd-aqlprofile-bin - clr - ]; - - postBuild = '' - rm -rf $out/nix-support - ''; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocprofiler"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocprofiler"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y="; - }; - - patches = [ - # These just simply won't build - ./0000-dont-install-tests-hsaco.patch - - # Fix bad paths - (replaceVars ./0001-fix-shell-scripts.patch { - rocmtoolkit_merged = rocmtoolkit-merged; - }) - ]; - - nativeBuildInputs = [ - cmake - clang - clr - python3Packages.lxml - python3Packages.cppheaderparser - python3Packages.pyyaml - python3Packages.barectf - ]; - - buildInputs = [ - numactl - libpciaccess - libxml2 - elfutils - mpi - systemd - gtest - ]; - - propagatedBuildInputs = [ rocmtoolkit-merged ]; - - cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${clr}" - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postPatch = '' - patchShebangs . - - substituteInPlace tests-v2/featuretests/profiler/CMakeLists.txt \ - --replace "--build-id=sha1" "--build-id=sha1 --rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" - - substituteInPlace test/CMakeLists.txt \ - --replace "\''${ROCM_ROOT_DIR}/amdgcn/bitcode" "${rocm-device-libs}/amdgcn/bitcode" - ''; - - postInstall = '' - # Why do these not already have the executable bit set? - chmod +x $out/lib/rocprofiler/librocprof-tool.so - chmod +x $out/share/rocprofiler/tests-v1/test/ocl/SimpleConvolution - - # Why do these have the executable bit set? - chmod -x $out/libexec/rocprofiler/counters/basic_counters.xml - chmod -x $out/libexec/rocprofiler/counters/derived_counters.xml - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Profiling with perf-counters and derived metrics"; - homepage = "https://github.com/ROCm/rocprofiler"; - license = with licenses; [ mit ]; # mitx11 - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor clr.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix deleted file mode 100644 index 52c522112287..000000000000 --- a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - clr, - git, - rocdbgapi, - elfutils, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocr-debug-agent"; - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocr_debug_agent"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-AUDbNrFtUQ5Hm+uv5KMovh7P9wXQKLyRNx9gEQFnv6Y="; - }; - - nativeBuildInputs = [ - cmake - clr - git - ]; - - buildInputs = [ - rocdbgapi - elfutils - ]; - - cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${clr}" - "-DHIP_PATH=${clr}" - ]; - - # Weird install target - postInstall = '' - rm -rf $out/src - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Library that provides some debugging functionality for ROCr"; - homepage = "https://github.com/ROCm/rocr_debug_agent"; - license = with licenses; [ ncsa ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocrand/default.nix b/pkgs/development/rocm-modules/5/rocrand/default.nix deleted file mode 100644 index 428968ff9104..000000000000 --- a/pkgs/development/rocm-modules/5/rocrand/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - clr, - gtest, - gbenchmark, - buildTests ? false, - buildBenchmarks ? false, - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocrand"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocRAND"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-VrpiHlZZQH+IOoaEDuDOfRgnMiqm1bpRIuNyrPz2SGY="; - fetchSubmodules = true; # For inline hipRAND - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - ]; - - buildInputs = - lib.optionals buildTests [ - gtest - ] - ++ lib.optionals buildBenchmarks [ - gbenchmark - ]; - - cmakeFlags = - [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${clr}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARK=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Generate pseudo-random and quasi-random numbers"; - homepage = "https://github.com/ROCm/rocRAND"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocsolver/default.nix b/pkgs/development/rocm-modules/5/rocsolver/default.nix deleted file mode 100644 index 628c4c6faa86..000000000000 --- a/pkgs/development/rocm-modules/5/rocsolver/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocblas, - rocsparse, - clr, - fmt, - gtest, - gfortran, - lapack-reference, - buildTests ? false, - buildBenchmarks ? false, - gpuTargets ? [ ], # gpuTargets = [ "gfx803" "gfx900" "gfx906:xnack-" ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocsolver"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocSOLVER"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-qxmjm4tgpCnfJ2SqUXndk6y0MsPJUKHvjv/3Uc0smr4="; - }; - - nativeBuildInputs = - [ - cmake - rocm-cmake - clr - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - gfortran - ]; - - buildInputs = - [ - rocblas - rocsparse - fmt - ] - ++ lib.optionals buildTests [ - gtest - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - lapack-reference - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DCMAKE_CXX_FLAGS=-Wno-switch" # Way too many warnings - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/rocsolver-test $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/rocsolver-bench $benchmark/bin - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "ROCm LAPACK implementation"; - homepage = "https://github.com/ROCm/rocSOLVER"; - license = with licenses; [ bsd2 ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - timeout = 14400; # 4 hours - maxSilent = 14400; # 4 hours - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocsparse/default.nix b/pkgs/development/rocm-modules/5/rocsparse/default.nix deleted file mode 100644 index a9f9dc5b83af..000000000000 --- a/pkgs/development/rocm-modules/5/rocsparse/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchzip, - rocmUpdateScript, - cmake, - rocm-cmake, - rocprim, - clr, - gfortran, - git, - gtest, - boost, - python3Packages, - buildTests ? false, - buildBenchmarks ? false, # Seems to depend on tests - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocsparse"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocSPARSE"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-30q9bqgZJUaNrkMXTAG+Z34yjsQ5DpJP+WBcCiEmF58="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - gfortran - ]; - - buildInputs = - [ - rocprim - git - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - gtest - boost - python3Packages.python - python3Packages.pyyaml - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DBUILD_CLIENTS_TESTS=ON" - "-DCMAKE_MATRICES_DIR=/build/source/matrices" - "-Dpython=python3" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ]; - - # We have to manually generate the matrices - postPatch = lib.optionalString (buildTests || buildBenchmarks) '' - mkdir -p matrices - - ln -s ${finalAttrs.passthru.matrices.matrix-01}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-02}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-03}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-04}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-05}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-06}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-07}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-08}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-09}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-10}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-11}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-12}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-13}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-14}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-15}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-16}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-17}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-18}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-19}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-20}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-21}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-22}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-23}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-24}/*.mtx matrices - - # Not used by the original cmake, causes an error - rm matrices/*_b.mtx - - echo "deps/convert.cpp -> deps/mtx2csr" - hipcc deps/convert.cpp -O3 -o deps/mtx2csr - - for mat in $(ls -1 matrices | cut -d "." -f 1); do - echo "mtx2csr: $mat.mtx -> $mat.csr" - deps/mtx2csr matrices/$mat.mtx matrices/$mat.csr - unlink matrices/$mat.mtx - done - ''; - - postInstall = - lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/rocsparse-test - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - mkdir -p $test/bin - mv $out/bin/* $test/bin - rm $test/bin/rocsparse-bench || true - mv /build/source/matrices $test - rmdir $out/bin - ''; - - passthru = { - matrices = import ./deps.nix { - inherit fetchzip; - mirror1 = "https://sparse.tamu.edu/MM"; - mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; - }; - - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - }; - - meta = with lib; { - description = "ROCm SPARSE implementation"; - homepage = "https://github.com/ROCm/rocSPARSE"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocsparse/deps.nix b/pkgs/development/rocm-modules/5/rocsparse/deps.nix deleted file mode 100644 index e39b6de39673..000000000000 --- a/pkgs/development/rocm-modules/5/rocsparse/deps.nix +++ /dev/null @@ -1,223 +0,0 @@ -{ - fetchzip, - mirror1, - mirror2, -}: - -{ - matrix-01 = fetchzip { - sha256 = "sha256-AHur5ZIDZTFRrO2GV0ieXrffq4KUiGWiZ59pv0fUtEQ="; - - urls = [ - "${mirror1}/SNAP/amazon0312.tar.gz" - "${mirror2}/SNAP/amazon0312.tar.gz" - ]; - }; - - matrix-02 = fetchzip { - sha256 = "sha256-0rSxaN4lQcdaCLsvlgicG70FXUxXeERPiEmQ4MzbRdE="; - - urls = [ - "${mirror1}/Muite/Chebyshev4.tar.gz" - "${mirror2}/Muite/Chebyshev4.tar.gz" - ]; - }; - - matrix-03 = fetchzip { - sha256 = "sha256-hDzDWDUnHEyFedX/tMNq83ZH8uWyM4xtZYUUAD3rizo="; - - urls = [ - "${mirror1}/FEMLAB/sme3Dc.tar.gz" - "${mirror2}/FEMLAB/sme3Dc.tar.gz" - ]; - }; - - matrix-04 = fetchzip { - sha256 = "sha256-GmN2yOt/MoX01rKe05aTyB3ypUP4YbQGOITZ0BqPmC0="; - - urls = [ - "${mirror1}/Williams/webbase-1M.tar.gz" - "${mirror2}/Williams/webbase-1M.tar.gz" - ]; - }; - - matrix-05 = fetchzip { - sha256 = "sha256-gQNjfVyWzNM9RwImJGhkhahRmZz74LzDs1oijL7mI7k="; - - urls = [ - "${mirror1}/Williams/mac_econ_fwd500.tar.gz" - "${mirror2}/Williams/mac_econ_fwd500.tar.gz" - ]; - }; - - matrix-06 = fetchzip { - sha256 = "sha256-87cdZjntNcTuz5BtO59irhcuRbPllWSbhCEX3Td02qc="; - - urls = [ - "${mirror1}/Williams/mc2depi.tar.gz" - "${mirror2}/Williams/mc2depi.tar.gz" - ]; - }; - - matrix-07 = fetchzip { - sha256 = "sha256-WRamuJX3D8Tm+k0q67RjUDG3DeNAxhKiaPkk5afY5eU="; - - urls = [ - "${mirror1}/Bova/rma10.tar.gz" - "${mirror2}/Bova/rma10.tar.gz" - ]; - }; - - matrix-08 = fetchzip { - sha256 = "sha256-5dhkm293Mc3lzakKxHy5W5XIn4Rw+gihVh7gyrjEHXo="; - - urls = [ - "${mirror1}/JGD_BIBD/bibd_22_8.tar.gz" - "${mirror2}/JGD_BIBD/bibd_22_8.tar.gz" - ]; - }; - - matrix-09 = fetchzip { - sha256 = "sha256-czjLWCjXAjZCk5TGYHaEkwSAzQu3TQ3QyB6eNKR4G88="; - - urls = [ - "${mirror1}/Hamm/scircuit.tar.gz" - "${mirror2}/Hamm/scircuit.tar.gz" - ]; - }; - - matrix-10 = fetchzip { - sha256 = "sha256-bYuLnJViAIcIejAkh69/bsNAVIDU4wfTLtD+nmHd6FM="; - - urls = [ - "${mirror1}/Sandia/ASIC_320k.tar.gz" - "${mirror2}/Sandia/ASIC_320k.tar.gz" - ]; - }; - - matrix-11 = fetchzip { - sha256 = "sha256-aDwn8P1khYjo2Agbq5m9ZBInJUxf/knJNvyptt0fak0="; - - urls = [ - "${mirror1}/GHS_psdef/bmwcra_1.tar.gz" - "${mirror2}/GHS_psdef/bmwcra_1.tar.gz" - ]; - }; - - matrix-12 = fetchzip { - sha256 = "sha256-8OJqA/byhlAZd869TPUzZFdsOiwOoRGfKyhM+RMjXoY="; - - urls = [ - "${mirror1}/HB/nos1.tar.gz" - "${mirror2}/HB/nos1.tar.gz" - ]; - }; - - matrix-13 = fetchzip { - sha256 = "sha256-FS0rKqmg+uHwsM/yGfQLBdd7LH/rUrdutkNGBD/Mh1I="; - - urls = [ - "${mirror1}/HB/nos2.tar.gz" - "${mirror2}/HB/nos2.tar.gz" - ]; - }; - - matrix-14 = fetchzip { - sha256 = "sha256-DANnlrNJikrI7Pst9vRedtbuxepyHmCIu2yhltc4Qcs="; - - urls = [ - "${mirror1}/HB/nos3.tar.gz" - "${mirror2}/HB/nos3.tar.gz" - ]; - }; - - matrix-15 = fetchzip { - sha256 = "sha256-21mUgqjWGUfYgiWwSrKh9vH8Vdt3xzcefmqYNYRpxiY="; - - urls = [ - "${mirror1}/HB/nos4.tar.gz" - "${mirror2}/HB/nos4.tar.gz" - ]; - }; - - matrix-16 = fetchzip { - sha256 = "sha256-FOuXvGqBBFNkVS6cexmkluret54hCfCOdK+DOZllE4c="; - - urls = [ - "${mirror1}/HB/nos5.tar.gz" - "${mirror2}/HB/nos5.tar.gz" - ]; - }; - - matrix-17 = fetchzip { - sha256 = "sha256-+7NI1rA/qQxYPpjXKHvAaCZ+LSaAJ4xuJvMRMBEUYxg="; - - urls = [ - "${mirror1}/HB/nos6.tar.gz" - "${mirror2}/HB/nos6.tar.gz" - ]; - }; - - matrix-18 = fetchzip { - sha256 = "sha256-q3NxJjbwGGcFiQ9nhWfUKgZmdVwCfPmgQoqy0AqOsNc="; - - urls = [ - "${mirror1}/HB/nos7.tar.gz" - "${mirror2}/HB/nos7.tar.gz" - ]; - }; - - matrix-19 = fetchzip { - sha256 = "sha256-0GAN6qmVfD+tprIigzuUUUwm5KVhkN9X65wMEvFltDY="; - - urls = [ - "${mirror1}/DNVS/shipsec1.tar.gz" - "${mirror2}/DNVS/shipsec1.tar.gz" - ]; - }; - - matrix-20 = fetchzip { - sha256 = "sha256-f28Du/Urxsiq5NkRmRO10Zz9vvGRjEchquzHzbZpZ7U="; - - urls = [ - "${mirror1}/Cote/mplate.tar.gz" - "${mirror2}/Cote/mplate.tar.gz" - ]; - }; - - matrix-21 = fetchzip { - sha256 = "sha256-O+Wy0NfCU1hVUOfNR1dJpvDHLBwwa301IRJDrQJnhak="; - - urls = [ - "${mirror1}/Bai/qc2534.tar.gz" - "${mirror2}/Bai/qc2534.tar.gz" - ]; - }; - - matrix-22 = fetchzip { - sha256 = "sha256-oxMnt8U5Cf1ILWcBdU6W9jdSMMm+U6bIVl8nm3n3+OA="; - - urls = [ - "${mirror1}/Chevron/Chevron2.tar.gz" - "${mirror2}/Chevron/Chevron2.tar.gz" - ]; - }; - - matrix-23 = fetchzip { - sha256 = "sha256-MFD9BxFI/3IS7yatW121BAI04fbqrXpgYDT5UKjeKcU="; - - urls = [ - "${mirror1}/Chevron/Chevron3.tar.gz" - "${mirror2}/Chevron/Chevron3.tar.gz" - ]; - }; - - matrix-24 = fetchzip { - sha256 = "sha256-ikS8O51pe1nt3BNyhvfvqCbVL0+bg/da9bqGqeBDkTg="; - - urls = [ - "${mirror1}/Chevron/Chevron4.tar.gz" - "${mirror2}/Chevron/Chevron4.tar.gz" - ]; - }; -} diff --git a/pkgs/development/rocm-modules/5/rocthrust/default.nix b/pkgs/development/rocm-modules/5/rocthrust/default.nix deleted file mode 100644 index 4e4f7c8a3a66..000000000000 --- a/pkgs/development/rocm-modules/5/rocthrust/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocprim, - clr, - gtest, - buildTests ? false, - buildBenchmarks ? false, - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocthrust"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildTests [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocThrust"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-+bcHcA87IToTcII7N/hm81C/JiokJKj0M1yAph/x9Qc="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - rocprim - clr - ]; - - buildInputs = lib.optionals buildTests [ - gtest - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${clr}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARKS=ON" - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DCMAKE_CXX_FLAGS=-Wno-deprecated-builtins" # Too much spam - ]; - - postInstall = - lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/{test_*,*.hip} $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' - + lib.optionalString (buildTests || buildBenchmarks) '' - rm -rf $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm parallel algorithm library"; - homepage = "https://github.com/ROCm/rocThrust"; - license = with licenses; [ asl20 ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/roctracer/default.nix b/pkgs/development/rocm-modules/5/roctracer/default.nix deleted file mode 100644 index 0e1c59d4f3a3..000000000000 --- a/pkgs/development/rocm-modules/5/roctracer/default.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - clr, - rocm-device-libs, - libxml2, - doxygen, - graphviz, - gcc-unwrapped, - libbacktrace, - rocm-runtime, - python3Packages, - buildDocs ? false, # Nothing seems to be generated, so not making the output - buildTests ? false, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "roctracer"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals buildDocs [ - "doc" - ] - ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "roctracer"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-P6QYyAjMRwFFWKF8AhbrYGe+mYVJXdbBW1or6vcobYU="; - }; - - nativeBuildInputs = - [ - cmake - clr - ] - ++ lib.optionals buildDocs [ - doxygen - graphviz - ]; - - buildInputs = [ - libxml2 - libbacktrace - python3Packages.python - python3Packages.cppheaderparser - ]; - - cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${clr}/hip/cmake" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - - postPatch = - '' - export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode - '' - + lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - ''; - - # Tests always fail, probably need GPU - # doCheck = buildTests; - - postInstall = - lib.optionalString buildDocs '' - mkdir -p $doc - '' - + lib.optionalString buildTests '' - mkdir -p $test/bin - # Not sure why this is an install target - find $out/test -executable -type f -exec mv {} $test/bin \; - rm $test/bin/{*.sh,*.py} - patchelf --set-rpath $out/lib:${ - lib.makeLibraryPath ( - finalAttrs.buildInputs - ++ [ - clr - gcc-unwrapped.lib - rocm-runtime - ] - ) - } $test/bin/* - rm -rf $out/test - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Tracer callback/activity library"; - homepage = "https://github.com/ROCm/roctracer"; - license = with licenses; [ mit ]; # mitx11 - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor clr.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/rocm-modules/5/rocwmma/0000-dont-fetch-googletest.patch deleted file mode 100644 index fa47a3c42249..000000000000 --- a/pkgs/development/rocm-modules/5/rocwmma/0000-dont-fetch-googletest.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 0d00883..86ce282 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -30,30 +30,6 @@ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" - cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF ) - cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF ) - --# Test/benchmark requires additional dependencies --include( FetchContent ) -- --FetchContent_Declare( -- googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG release-1.12.1 --) --FetchContent_GetProperties(googletest) --if(NOT googletest_POPULATED) -- -- # Fetch the content using default details -- FetchContent_Populate(googletest) -- # Save the shared libs setting, then force to static libs -- set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS}) -- set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build SHARED libraries" FORCE) -- -- # Add gtest targets as static libs -- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) -- -- # Restore shared libs setting -- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE) --endif() -- - set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) - set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rocwmma_gtest_main.cpp) diff --git a/pkgs/development/rocm-modules/5/rocwmma/default.nix b/pkgs/development/rocm-modules/5/rocwmma/default.nix deleted file mode 100644 index 16fca6255993..000000000000 --- a/pkgs/development/rocm-modules/5/rocwmma/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocm-smi, - clr, - openmp, - gtest, - rocblas, - buildTests ? false, # Will likely fail building because wavefront shifts are not supported for certain archs - buildExtendedTests ? false, - buildBenchmarks ? false, - buildSamples ? false, - gpuTargets ? [ ], # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocwmma"; - version = "5.7.1"; - - outputs = - [ - "out" - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - "test" - ] - ++ lib.optionals buildBenchmarks [ - "benchmark" - ] - ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rocWMMA"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0otJxgVYLwvVYIWT/hjrrpuSj5jslP1dbJRt6GUOrDs="; - }; - - patches = lib.optionals (buildTests || buildBenchmarks) [ - ./0000-dont-fetch-googletest.patch - ]; - - nativeBuildInputs = [ - cmake - rocm-cmake - clr - ]; - - buildInputs = - [ - openmp - ] - ++ lib.optionals (buildTests || buildBenchmarks) [ - rocm-smi - gtest - rocblas - ]; - - cmakeFlags = - [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}" - "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals buildExtendedTests [ - "-DROCWMMA_BUILD_EXTENDED_TESTS=ON" - ] - ++ lib.optionals buildBenchmarks [ - "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON" - "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON" - ]; - - postInstall = - lib.optionalString (buildTests || buildBenchmarks) '' - mkdir -p $test/bin - mv $out/bin/{*_test,*-validate} $test/bin - '' - + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/*-bench $benchmark/bin - '' - + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv $out/bin/sgemmv $sample/bin - mv $out/bin/simple_gemm $sample/bin - mv $out/bin/simple_dlrm $sample/bin - '' - + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' - rm -rf $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Mixed precision matrix multiplication and accumulation"; - homepage = "https://github.com/ROCm/rocWMMA"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/rpp/default.nix b/pkgs/development/rocm-modules/5/rpp/default.nix deleted file mode 100644 index 7c0d8cab9368..000000000000 --- a/pkgs/development/rocm-modules/5/rpp/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - cmake, - rocm-cmake, - rocm-docs-core, - half, - clr, - openmp, - boost, - python3Packages, - buildDocs ? false, # Needs internet - useOpenCL ? false, - useCPU ? false, - gpuTargets ? [ ], -}: - -stdenv.mkDerivation (finalAttrs: { - pname = - "rpp-" - + ( - if (!useOpenCL && !useCPU) then - "hip" - else if (!useOpenCL && !useCPU) then - "opencl" - else - "cpu" - ); - - version = "5.7.1"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "rpp"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-s6ODmxPBLpR5f8VALaW6F0p0rZSxSd2LH2+60SEfLCk="; - }; - - nativeBuildInputs = - [ - cmake - rocm-cmake - clr - ] - ++ lib.optionals buildDocs [ - rocm-docs-core - python3Packages.python - ]; - - buildInputs = [ - half - openmp - boost - ]; - - cmakeFlags = - [ - "-DROCM_PATH=${clr}" - ] - ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] - ++ lib.optionals (!useOpenCL && !useCPU) [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DBACKEND=HIP" - ] - ++ lib.optionals (useOpenCL && !useCPU) [ - "-DBACKEND=OCL" - ] - ++ lib.optionals useCPU [ - "-DBACKEND=CPU" - ]; - - postPatch = lib.optionalString (!useOpenCL && !useCPU) '' - # Bad path - substituteInPlace CMakeLists.txt \ - --replace "COMPILER_FOR_HIP \''${ROCM_PATH}/llvm/bin/clang++" "COMPILER_FOR_HIP ${clr}/bin/hipcc" - ''; - - postBuild = lib.optionalString buildDocs '' - python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Comprehensive high-performance computer vision library for AMD processors"; - homepage = "https://github.com/ROCm/rpp"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor finalAttrs.version != versions.minor stdenv.cc.version - || versionAtLeast finalAttrs.version "6.0.0"; - }; -}) diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix deleted file mode 100644 index eb486686bb4a..000000000000 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rocmUpdateScript, - buildPythonPackage, - pytestCheckHook, - setuptools, - pyyaml, - msgpack, - pandas, - joblib, - filelock, - rocminfo, - writeText, -}: - -buildPythonPackage rec { - pname = "tensile"; - version = "5.7.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "ROCm"; - repo = "Tensile"; - rev = "rocm-${version}"; - hash = "sha256-CyPGiM/53duJc/oNtOsl6JSsl9uOOYm5R7O6YXaVOm4="; - }; - - buildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - pyyaml - msgpack - pandas - joblib - ]; - - doCheck = false; # Too many errors, not sure how to set this up properly - - nativeCheckInputs = [ - pytestCheckHook - filelock - rocminfo - ]; - - preCheck = '' - export ROCM_PATH=${rocminfo} - ''; - - # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869 - # does not cause issues anymore, or at least replace it with a better workaround - setupHook = writeText "setup-hook" '' - export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++"; - ''; - - pythonImportsCheck = [ "Tensile" ]; - - passthru.updateScript = rocmUpdateScript { - name = pname; - owner = src.owner; - repo = src.repo; - }; - - meta = with lib; { - description = "GEMMs and tensor contractions"; - homepage = "https://github.com/ROCm/Tensile"; - license = with licenses; [ mit ]; - teams = [ teams.rocm ]; - platforms = platforms.linux; - broken = - versions.minor version != versions.minor stdenv.cc.version || versionAtLeast version "6.0.0"; - }; -} diff --git a/pkgs/development/rocm-modules/5/update.nix b/pkgs/development/rocm-modules/5/update.nix deleted file mode 100644 index e9ff2d93d98f..000000000000 --- a/pkgs/development/rocm-modules/5/update.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - writeScript, -}: - -{ - name ? "", - owner ? "", - repo ? "", - page ? "releases/latest", - filter ? ".tag_name | split(\"-\") | .[1]", -}: - -let - pname = - if lib.hasPrefix "rocm-llvm-" name then "llvm.${lib.removePrefix "rocm-llvm-" name}" else name; - - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -sL "https://api.github.com/repos/${owner}/${repo}/${page}" | jq '${filter}' --raw-output)" - - IFS='.' read -a version_arr <<< "$version" - - if (( ''${version_arr[0]} > 5 )); then - echo "'rocmPackages_5.${pname}' is already at it's maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${pname}'." 1>&2 - exit 1 - fi - - if [ "''${#version_arr[*]}" == 2 ]; then - version="''${version}.0" - fi - - update-source-version rocmPackages_5.${pname} "$version" --ignore-same-hash - ''; -in -[ updateScript ] diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 3f7a86a2f29b..91ea23d7781f 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -456,18 +456,15 @@ let miopengemm = throw '' 'miopengemm' has been deprecated. - It is still available for some time as part of rocmPackages_5. ''; # Added 2024-3-3 miopen-opencl = throw '' 'miopen-opencl' has been deprecated. - It is still available for some time as part of rocmPackages_5. ''; # Added 2024-3-3 mivisionx-opencl = throw '' 'mivisionx-opencl' has been deprecated. Other versions of mivisionx are still available. - It is also still available for some time as part of rocmPackages_5. ''; # Added 2024-3-24 } ); diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 978d195b55ab..ef9111ed5c00 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -113,14 +113,14 @@ in echo 'cros_boards_with_qemu_images = ""' >> build/config/gclient_args.gni echo 'generate_location_tags = true' >> build/config/gclient_args.gni - echo 'LASTCHANGE=${info.deps."src".args.rev}-refs/heads/master@{#0}' > build/util/LASTCHANGE + echo 'LASTCHANGE=${info.deps."src".args.tag}-refs/heads/master@{#0}' > build/util/LASTCHANGE echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime cat << EOF > gpu/config/gpu_lists_version.h /* Generated by lastchange.py, do not edit.*/ #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_ #define GPU_CONFIG_GPU_LISTS_VERSION_H_ - #define GPU_LISTS_VERSION "${info.deps."src".args.rev}" + #define GPU_LISTS_VERSION "${info.deps."src".args.tag}" #endif // GPU_CONFIG_GPU_LISTS_VERSION_H_ EOF diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 6e7510d3e8a5..17f7bf015873 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -18,7 +18,7 @@ "args": { "hash": "sha256-NVaErCSvuTQyt7yv2sc4aIX2J/6mxM648Wbbut2Jjxc=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "132.0.6834.210", + "tag": "132.0.6834.210", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -60,7 +60,7 @@ "hash": "sha256-NdeVWtmGpBqUuRtPBc0xLn7z4YNZ9p765a9nM3XdjCw=", "owner": "electron", "repo": "electron", - "rev": "v34.5.5" + "tag": "v34.5.5" }, "fetcher": "fetchFromGitHub" }, @@ -397,7 +397,7 @@ "hash": "sha256-vc3Ztw8m0P96QoCjtyu2Nb0TpVMu9ifrVlkJY15aVbE=", "owner": "nodejs", "repo": "node", - "rev": "v20.19.1" + "tag": "v20.19.1" }, "fetcher": "fetchFromGitHub" }, @@ -1295,7 +1295,7 @@ "args": { "hash": "sha256-LL0lmb23zTjOwi8Sbz0Vb3Nj3ptqpRL/5V5rI8vXu0U=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "134.0.6998.205", + "tag": "134.0.6998.205", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -1337,7 +1337,7 @@ "hash": "sha256-rRrXXuCfS9X+00u7/18A3m8V+k9MK0QITuheQlHFZdQ=", "owner": "electron", "repo": "electron", - "rev": "v35.3.0" + "tag": "v35.3.0" }, "fetcher": "fetchFromGitHub" }, @@ -1666,7 +1666,7 @@ "hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=", "owner": "nodejs", "repo": "node", - "rev": "v22.14.0" + "tag": "v22.14.0" }, "fetcher": "fetchFromGitHub" }, @@ -2604,7 +2604,7 @@ "args": { "hash": "sha256-7ykQd8jKE9aVfTBPrJnOGHQYhmm+gJoMX7kET7eYFXM=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "136.0.7103.49", + "tag": "136.0.7103.49", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2646,7 +2646,7 @@ "hash": "sha256-mErVGqPBvplWEEOnEFnEdxDU34jc5YECLj18rU7E/XM=", "owner": "electron", "repo": "electron", - "rev": "v36.2.0" + "tag": "v36.2.0" }, "fetcher": "fetchFromGitHub" }, @@ -2975,7 +2975,7 @@ "hash": "sha256-KXhkO1qKbf7/KktyLQcPGEzcIErsIKAUE89oGTP2mbI=", "owner": "nodejs", "repo": "node", - "rev": "v22.15.0" + "tag": "v22.15.0" }, "fetcher": "fetchFromGitHub" }, diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index e7747c73f957..0303cb1c682b 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -60,18 +60,18 @@ def get_gclient_data(rev: str) -> any: return json.loads(output) -def get_chromium_file(chromium_rev: str, filepath: str) -> str: +def get_chromium_file(chromium_tag: str, filepath: str) -> str: return base64.b64decode( urlopen( - f"https://chromium.googlesource.com/chromium/src.git/+/{chromium_rev}/{filepath}?format=TEXT" + f"https://chromium.googlesource.com/chromium/src.git/+/{chromium_tag}/{filepath}?format=TEXT" ).read() ).decode("utf-8") -def get_electron_file(electron_rev: str, filepath: str) -> str: +def get_electron_file(electron_tag: str, filepath: str) -> str: return ( urlopen( - f"https://raw.githubusercontent.com/electron/electron/{electron_rev}/{filepath}" + f"https://raw.githubusercontent.com/electron/electron/{electron_tag}/{filepath}" ) .read() .decode("utf-8") @@ -79,9 +79,9 @@ def get_electron_file(electron_rev: str, filepath: str) -> str: @memory.cache -def get_chromium_gn_source(chromium_rev: str) -> dict: +def get_chromium_gn_source(chromium_tag: str) -> dict: gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'" - gn_commit = re.search(gn_pattern, get_chromium_file(chromium_rev, "DEPS")).group(1) + gn_commit = re.search(gn_pattern, get_chromium_file(chromium_tag, "DEPS")).group(1) gn_prefetch: bytes = subprocess.check_output( [ "nix-prefetch-git", @@ -102,11 +102,11 @@ def get_chromium_gn_source(chromium_rev: str) -> dict: } @memory.cache -def get_electron_yarn_hash(electron_rev: str) -> str: +def get_electron_yarn_hash(electron_tag: str) -> str: print(f"prefetch-yarn-deps", file=sys.stderr) with tempfile.TemporaryDirectory() as tmp_dir: with open(tmp_dir + "/yarn.lock", "w") as f: - f.write(get_electron_file(electron_rev, "yarn.lock")) + f.write(get_electron_file(electron_tag, "yarn.lock")) return ( subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"]) .decode("utf-8") @@ -114,11 +114,11 @@ def get_electron_yarn_hash(electron_rev: str) -> str: ) @memory.cache -def get_chromium_npm_hash(chromium_rev: str) -> str: +def get_chromium_npm_hash(chromium_tag: str) -> str: print(f"prefetch-npm-deps", file=sys.stderr) with tempfile.TemporaryDirectory() as tmp_dir: with open(tmp_dir + "/package-lock.json", "w") as f: - f.write(get_chromium_file(chromium_rev, "third_party/node/package-lock.json")) + f.write(get_chromium_file(chromium_tag, "third_party/node/package-lock.json")) return ( subprocess.check_output( ["prefetch-npm-deps", tmp_dir + "/package-lock.json"] @@ -131,12 +131,12 @@ def get_chromium_npm_hash(chromium_rev: str) -> str: def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict]: tasks = [] - a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["rev"]))) + a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["tag"]))) tasks.append(delayed(a)()) a = lambda: ( ( "chromium_npm_hash", - get_chromium_npm_hash(gclient_data["src"]["args"]["rev"]), + get_chromium_npm_hash(gclient_data["src"]["args"]["tag"]), ) ) tasks.append(delayed(a)()) @@ -155,7 +155,7 @@ def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict **{key: m[key] for key in ["version", "modules", "chrome", "node"]}, "chromium": { "version": m["chrome"], - "deps": get_chromium_gn_source(gclient_data["src"]["args"]["rev"]), + "deps": get_chromium_gn_source(gclient_data["src"]["args"]["tag"]), }, **task_results, }, diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 0a1c392700b9..9982c7766d29 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -8,7 +8,7 @@ }: let - tag = "0.3.12"; + tag = "0.3.13"; in stdenv.mkDerivation { pname = "apfs"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-UuPWiqR1CiPlBmFleV+y3sowj82iUkgmakNM+T+Mlvc="; + hash = "sha256-PXTyPOZhBeFGXu71Jj46hlrgVemgmYrjHqkTFjTDoTc="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 0b275d67b683..962f5bb20c7b 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"; - hash = "sha256-99vtxCPds/Lz6Y6RQPFyC/1tSo9Ic8hdouYvageN4Qo="; + version = "6.8.1"; + hash = "sha256-PGVNB5vELE6C/yCmlIxFYpPhBLZ2L/fJ/JSAcbMxAyg="; }; } diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 3fcdba49e721..8f1af271341d 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -20,14 +20,14 @@ let pname = "pgadmin"; - version = "9.2"; - yarnHash = "sha256-I7Eua6MkZR7l4Ks1Cyz0AAXLuayuzZHuk+xtn8Zu8UI="; + version = "9.3"; + yarnHash = "sha256-75FwwQ67j0aTHGvD4YwAaR8CWV4u4KsuMghidbkgVsw="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-2Hl9YpXXlfkD0KOEV0dD0Ib1QlwyY3tXm56sDyvafKE="; + hash = "sha256-4uupF1dw6OE/briAI5PWiQ7h6RPx1sUqf8PB8cJsNSU="; }; # keep the scope, as it is used throughout the derivation and tests diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 6690c1d9ab99..a8ac0d309e96 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.52.0"; + version = "11.53.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-A/OjY2gR6q8EY21L7jOGde6XRv7Y1c8UsqvUgGn5laA="; + hash = "sha256-SYgtdIyqK3T5N6XcpjazdphwALOcReeNswVgR4K6/Pg="; }; proxyVendor = true; - vendorHash = "sha256-A1/nyLrei/p093ChSctBhBhtf48sqgrXyh4nQFZoKLs="; + vendorHash = "sha256-sxAyJsVcBrwUX1w3Kr8Z451RINUPTwJPlmY/yeXSofk="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d5eda7a29733..304eac20d07d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1629,6 +1629,7 @@ mapAliases { rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02 rl_json = tclPackages.rl_json; # Added 2025-05-03 rockbox_utility = rockbox-utility; # Added 2022-03-17 + rocmPackages_5 = throw "ROCm 5 has been removed in favor of newer versions"; # Added 2025-02-18 rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 849fec08c5f5..a9cbe5af23d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2168,7 +2168,7 @@ with pkgs; easyocr = with python3.pkgs; toPythonApplication easyocr; - eddy = libsForQt5.callPackage ../applications/graphics/eddy { }; + eddy = callPackage ../applications/graphics/eddy { }; element-web = callPackage ../by-name/el/element-web/package.nix { conf = config.element-web.conf or { }; @@ -2863,7 +2863,6 @@ with pkgs; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; rocmPackages = rocmPackages_6; - rocmPackages_5 = recurseIntoAttrs (callPackage ../development/rocm-modules/5 { }); rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { }); sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; @@ -3008,7 +3007,7 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; + fontmatrix = callPackage ../applications/graphics/fontmatrix { }; fox = callPackage ../development/libraries/fox { }; @@ -3030,7 +3029,7 @@ with pkgs; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - fstl = qt5.callPackage ../applications/graphics/fstl { }; + fstl = callPackage ../applications/graphics/fstl { }; fwknop = callPackage ../tools/security/fwknop { texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. @@ -3520,7 +3519,7 @@ with pkgs; ocamlPackages = ocaml_p; }; - leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; + leocad = callPackage ../applications/graphics/leocad { }; libcoap = callPackage ../applications/networking/libcoap { autoconf = buildPackages.autoconf269; @@ -3985,7 +3984,7 @@ with pkgs; jre = pkgs.jre_headless; }; - openboard = libsForQt5.callPackage ../applications/graphics/openboard { }; + openboard = callPackage ../applications/graphics/openboard { }; ophcrack-cli = ophcrack.override { enableGui = false; }; @@ -4092,7 +4091,7 @@ with pkgs; ossec-server = callPackage ../tools/security/ossec/server.nix { }; - ovito = qt6Packages.callPackage ../applications/graphics/ovito { }; + ovito = callPackage ../applications/graphics/ovito { }; p4c = callPackage ../development/compilers/p4c { protobuf = protobuf_21; @@ -4308,9 +4307,9 @@ with pkgs; qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; - qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; + qosmic = callPackage ../applications/graphics/qosmic { }; - qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + qtikz = callPackage ../applications/graphics/ktikz { }; qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { }; @@ -4318,9 +4317,9 @@ with pkgs; quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; - qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; + qvge = callPackage ../applications/graphics/qvge { }; - qview = libsForQt5.callPackage ../applications/graphics/qview { }; + qview = callPackage ../applications/graphics/qview { }; wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { }; @@ -7187,7 +7186,7 @@ with pkgs; chruby = callPackage ../development/tools/misc/chruby { rubies = null; }; - cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; + cloudcompare = callPackage ../applications/graphics/cloudcompare { }; cookiecutter = with python3Packages; toPythonApplication cookiecutter; @@ -7429,7 +7428,7 @@ with pkgs; jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; - kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; + kcc = callPackage ../applications/graphics/kcc { }; kustomize = callPackage ../development/tools/kustomize { }; @@ -10364,7 +10363,7 @@ with pkgs; freshrss = callPackage ../servers/web-apps/freshrss { }; freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { }); - glabels-qt = libsForQt5.callPackage ../applications/graphics/glabels-qt { }; + glabels-qt = callPackage ../applications/graphics/glabels-qt { }; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; @@ -12160,7 +12159,7 @@ with pkgs; djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; }; - djview = libsForQt5.callPackage ../applications/graphics/djview { }; + djview = callPackage ../applications/graphics/djview { }; djview4 = djview; dmenu = callPackage ../applications/misc/dmenu { }; @@ -12198,7 +12197,7 @@ with pkgs; drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { }; drawpile = callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { + drawpile-server-headless = drawpile.override { buildClient = false; buildServerGui = false; }; @@ -12267,7 +12266,7 @@ with pkgs; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + evilpixie = callPackage ../applications/graphics/evilpixie { }; greenfoot = callPackage ../applications/editors/greenfoot { openjdk = openjdk21.override { @@ -12278,7 +12277,7 @@ with pkgs; haruna = kdePackages.callPackage ../applications/video/haruna { }; - hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { }; + hdrmerge = callPackage ../applications/graphics/hdrmerge { }; input-leap = qt6Packages.callPackage ../applications/misc/input-leap { avahi = avahi.override { withLibdnssdCompat = true; }; @@ -12764,7 +12763,7 @@ with pkgs; pixel2svg = python310Packages.callPackage ../tools/graphics/pixel2svg { }; - pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { }; + pixinsight = callPackage ../applications/graphics/pixinsight { }; inherit (callPackage ../applications/virtualization/singularity/packages.nix { }) apptainer @@ -12946,7 +12945,7 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgp = python3Packages.callPackage ../applications/graphics/imgp { }; + imgp = callPackage ../applications/graphics/imgp { }; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; @@ -13021,7 +13020,7 @@ with pkgs; kexi = libsForQt5.callPackage ../applications/office/kexi { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; kid3-cli = kid3.override { withCLI = true; @@ -13227,7 +13226,7 @@ with pkgs; portaudio = null; }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { + luminanceHDR = callPackage ../applications/graphics/luminance-hdr { openexr = openexr_2; }; @@ -13261,7 +13260,7 @@ with pkgs; shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { }; }; - mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; + mandelbulber = callPackage ../applications/graphics/mandelbulber { }; mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; @@ -13289,8 +13288,8 @@ with pkgs; meshcentral = callPackage ../tools/admin/meshcentral { }; - meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; - meshlab-unstable = libsForQt5.callPackage ../applications/graphics/meshlab-unstable { }; + meshlab = callPackage ../applications/graphics/meshlab { }; + meshlab-unstable = callPackage ../applications/graphics/meshlab-unstable { }; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; @@ -13395,7 +13394,7 @@ with pkgs; rquickshare-legacy = rquickshare.override { app-type = "legacy"; }; - seamly2d = libsForQt5.callPackage ../applications/graphics/seamly2d { }; + seamly2d = callPackage ../applications/graphics/seamly2d { }; # a somewhat more maintained fork of ympd memento = qt6Packages.callPackage ../applications/video/memento { }; @@ -13607,9 +13606,9 @@ with pkgs; kreative-square ; - openscad = libsForQt5.callPackage ../applications/graphics/openscad { }; + openscad = callPackage ../applications/graphics/openscad { }; - opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { }; + opentoonz = callPackage ../applications/graphics/opentoonz { }; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; @@ -13666,9 +13665,9 @@ with pkgs; stdenv = gccStdenv; }; - photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; + photoflare = callPackage ../applications/graphics/photoflare { }; - phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; + phototonic = callPackage ../applications/graphics/phototonic { }; pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; @@ -13739,7 +13738,7 @@ with pkgs; qcad = libsForQt5.callPackage ../applications/misc/qcad { }; - qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; + qcomicbook = callPackage ../applications/graphics/qcomicbook { }; qctools = libsForQt5.callPackage ../applications/video/qctools { }; @@ -13773,7 +13772,7 @@ with pkgs; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; - qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; + qimgv = callPackage ../applications/graphics/qimgv { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; @@ -13788,7 +13787,7 @@ with pkgs; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; - qscreenshot = libsForQt5.callPackage ../applications/graphics/qscreenshot { }; + qscreenshot = callPackage ../applications/graphics/qscreenshot { }; qsstv = qt5.callPackage ../applications/radio/qsstv { }; @@ -13873,7 +13872,7 @@ with pkgs; wxGTK = wxGTK32; }; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; + rapid-photo-downloader = callPackage ../applications/graphics/rapid-photo-downloader { }; rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; @@ -13945,9 +13944,9 @@ with pkgs; sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; - scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; + scantailor-advanced = callPackage ../applications/graphics/scantailor/advanced.nix { }; - scantailor-universal = libsForQt5.callPackage ../applications/graphics/scantailor/universal.nix { }; + scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { }; scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { }; scribus = scribus_1_5; @@ -14035,7 +14034,7 @@ with pkgs; skrooge = libsForQt5.callPackage ../applications/office/skrooge { }; - smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { }; + smartdeblur = callPackage ../applications/graphics/smartdeblur { }; soci = callPackage ../development/libraries/soci { }; @@ -14309,7 +14308,7 @@ with pkgs; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; + veusz = callPackage ../applications/graphics/veusz { }; vim = vimUtils.makeCustomizable ( callPackage ../applications/editors/vim { @@ -16608,14 +16607,7 @@ with pkgs; qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; - pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { - inherit - glib - gtk3 - gobject-introspection - wrapGAppsHook3 - ; - }; + pick-colour-picker = callPackage ../applications/graphics/pick-colour-picker { }; romdirfs = callPackage ../tools/filesystems/romdirfs { stdenv = gccStdenv; @@ -16794,7 +16786,7 @@ with pkgs; SDL = SDL_sixel; }; - yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; + yacreader = callPackage ../applications/graphics/yacreader { }; yamale = with python3Packages; toPythonApplication yamale; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f0454a4cdbd..2d7487070cd8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1780,6 +1780,8 @@ self: super: with self; { betterproto = callPackage ../development/python-modules/betterproto { }; + bezier = callPackage ../development/python-modules/bezier { }; + beziers = callPackage ../development/python-modules/beziers { }; bibtexparser = callPackage ../development/python-modules/bibtexparser { }; @@ -4951,6 +4953,8 @@ self: super: with self; { firecrawl-py = callPackage ../development/python-modules/firecrawl-py { }; + firedrake = callPackage ../development/python-modules/firedrake { }; + firedrake-fiat = callPackage ../development/python-modules/firedrake-fiat { }; fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { };