ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 09:37:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-23 00:02:39 +00:00 committed by GitHub
commit dd5558f8d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
86 changed files with 624 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -388,6 +388,12 @@
fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F";
}];
};
adam248 = {
email = "adamjbutler091@gmail.com";
github = "adam248";
githubId = 85082674;
name = "Adam J. Butler";
};
adamcstephens = {
email = "happy.plan4249@valkor.net";
matrix = "@adam:valkor.net";

35
nixos/modules/programs/mininet.nix
View File

@ -6,39 +6,6 @@ with lib;
let
cfg = config.programs.mininet;
telnet = pkgs.runCommand "inetutils-telnet"
{ }
''
mkdir -p $out/bin
ln -s ${pkgs.inetutils}/bin/telnet $out/bin
'';
generatedPath = with pkgs; makeSearchPath "bin" [
iperf
ethtool
iproute2
socat
# mn errors out without a telnet binary
# pkgs.inetutils brings an undesired ifconfig into PATH see #43105
nettools
telnet
];
pyEnv = pkgs.python3.withPackages (ps: [ ps.mininet-python ]);
mnexecWrapped = pkgs.runCommand "mnexec-wrapper"
{ nativeBuildInputs = [ pkgs.makeWrapper pkgs.python3Packages.wrapPython ]; }
''
makeWrapper ${pkgs.mininet}/bin/mnexec \
$out/bin/mnexec \
--prefix PATH : "${generatedPath}"
makeWrapper ${pyEnv}/bin/mn \
$out/bin/mn \
--prefix PYTHONPATH : "${pyEnv}/${pyEnv.sitePackages}" \
--prefix PATH : "${generatedPath}"
'';
in
{
options.programs.mininet.enable = mkEnableOption (lib.mdDoc "Mininet");
@ -47,6 +14,6 @@ in
virtualisation.vswitch.enable = true;
environment.systemPackages = [ mnexecWrapped ];
environment.systemPackages = [ pkgs.mininet ];
};
}

9
pkgs/applications/misc/parsec/bin.nix
View File

@ -20,6 +20,9 @@
, libpng
, libjpeg8
, curl
, vulkan-loader
, gnome
, zenity ? gnome.zenity
}:
stdenvNoCC.mkDerivation {
@ -64,6 +67,11 @@ stdenvNoCC.mkDerivation {
libXi
libXrandr
libXfixes
vulkan-loader
];
binPath = lib.makeBinPath [
zenity
];
prepareParsec = ''
@ -80,6 +88,7 @@ stdenvNoCC.mkDerivation {
mv usr/* $out
wrapProgram $out/bin/parsecd \
--prefix PATH : "$binPath" \
--prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \
--run "$prepareParsec"

56
pkgs/applications/video/gpac/default.nix
View File

@ -60,5 +60,61 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = with maintainers; [ bluescreen303 mgdelacroix ];
platforms = platforms.linux;
knownVulnerabilities = [
"CVE-2023-48958"
"CVE-2023-48090"
"CVE-2023-48039"
"CVE-2023-48014"
"CVE-2023-48013"
"CVE-2023-48011"
"CVE-2023-47465"
"CVE-2023-47384"
"CVE-2023-46932"
"CVE-2023-46931"
"CVE-2023-46930"
"CVE-2023-46928"
"CVE-2023-46927"
"CVE-2023-46871"
"CVE-2023-46001"
"CVE-2023-42298"
"CVE-2023-41000"
"CVE-2023-39562"
"CVE-2023-37767"
"CVE-2023-37766"
"CVE-2023-37765"
"CVE-2023-37174"
"CVE-2023-23143"
"CVE-2023-5998"
"CVE-2023-5595"
"CVE-2023-5586"
"CVE-2023-5520"
"CVE-2023-5377"
"CVE-2023-4778"
"CVE-2023-4758"
"CVE-2023-4756"
"CVE-2023-4755"
"CVE-2023-4754"
"CVE-2023-4722"
"CVE-2023-4721"
"CVE-2023-4720"
"CVE-2023-4683"
"CVE-2023-4682"
"CVE-2023-4681"
"CVE-2023-4678"
"CVE-2023-3523"
"CVE-2023-3291"
"CVE-2023-3013"
"CVE-2023-3012"
"CVE-2023-1655"
"CVE-2023-1654"
"CVE-2023-1452"
"CVE-2023-1449"
"CVE-2023-1448"
"CVE-2023-0866"
"CVE-2023-0841"
"CVE-2023-0819"
"CVE-2023-0818"
"CVE-2023-0817"
];
};
}

64
pkgs/by-name/de/decent-sampler/package.nix Normal file
View File

@ -0,0 +1,64 @@
{ lib
, stdenv
, fetchzip
, buildFHSEnv
, alsa-lib
, freetype
, nghttp2
, libX11
, }:
let
pname = "decent-sampler";
version = "1.9.4";
decent-sampler = stdenv.mkDerivation {
inherit pname version;
src = fetchzip {
# dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\
url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz";
hash = "sha256-lTp/mukCwLNyeTcBT68eqa7aD0o11Bylbd93A5VCILU=";
};
installPhase = ''
runHook preInstall
install -Dm755 DecentSampler $out/bin/decent-sampler
runHook postInstall
'';
};
in
buildFHSEnv {
inherit pname version;
targetPkgs = pkgs: [
alsa-lib
decent-sampler
freetype
nghttp2
libX11
];
runScript = "decent-sampler";
meta = with lib; {
description = "An audio sample player";
longDescription = ''
Decent Sampler is an audio sample player.
Allowing you to play sample libraries in the DecentSampler format
(files with extensions: dspreset and dslibrary).
'';
mainProgram = "decent-sampler";
homepage = "https://www.decentsamples.com/product/decent-sampler-plugin/";
# It claims to be free but we currently cannot find any license
# that it is released under.
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ adam248 ];
};
}

33
pkgs/by-name/ei/eigenlayer/package.nix Normal file
View File

@ -0,0 +1,33 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
pname = "eigenlayer";
version = "0.5.0";
src = fetchFromGitHub {
owner = "Layr-Labs";
repo = "eigenlayer-cli";
rev = "v${version}";
hash = "sha256-zLTzDVXj2XTjgMuTLXVQStzDkkOGU2kCgIvBmJKohY4";
};
vendorHash = "sha256-gAW+yEj4aRHTuuZLrqQs8lebs9/O0uGxkHRK3B1TG+Q=";
ldflags = ["-s" "-w"];
subPackages = ["cmd/eigenlayer"];
passthru.updateScript = nix-update-script {};
meta = with lib; {
homepage = "https://www.eigenlayer.xyz/";
changelog = "https://github.com/Layr-Labs/eigenlayer-cli/releases/tag/${src.rev}";
description = "Utility that manages core operator functionalities like local keys, operator registration and updates";
mainProgram = "eigenlayer";
license = licenses.bsl11;
maintainers = with maintainers; [selfuryon];
};
}

7
pkgs/by-name/pr/presenterm/package.nix
View File

@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "presenterm";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "mfontanini";
repo = "presenterm";
rev = "refs/tags/v${version}";
hash = "sha256-8oLqZfpkSbGg85vj5V54D052vmmoMRzQmiQzOwCOSxg=";
hash = "sha256-OHp/qbuaZ7uVydKGnSiBR5KQGdf8rWQQWRHrka+PI1M=";
};
buildInputs = [
libsixel
];
cargoHash = "sha256-SJpmQMUm5+0mUmYq2pv4JLV6PxZs2g3TrWqTlHElS3Q=";
cargoHash = "sha256-ymSTloz7sPAtMZN1uDgLs89gMcU+UTsMVc6y5UHt7no=";
buildFeatures = [ "sixel" ];
@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A terminal based slideshow tool";
changelog = "https://github.com/mfontanini/presenterm/releases/tag/v${version}";
homepage = "https://github.com/mfontanini/presenterm";
license = licenses.bsd2;
maintainers = with maintainers; [ mikaelfangel ];

3
pkgs/desktops/lomiri/default.nix
View File

@ -18,6 +18,7 @@ let
gmenuharness = callPackage ./development/gmenuharness { };
libusermetrics = callPackage ./development/libusermetrics { };
lomiri-api = callPackage ./development/lomiri-api { };
lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
trust-store = callPackage ./development/trust-store { };
u1db-qt = callPackage ./development/u1db-qt { };
@ -31,8 +32,8 @@ let
#### Services
biometryd = callPackage ./services/biometryd { };
hfd-service = callPackage ./services/hfd-service { };
lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
mediascanner2 = callPackage ./services/mediascanner2 { };
};
in

169
pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix Normal file
View File

@ -0,0 +1,169 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, gitUpdater
, testers
, cmake
, cmake-extras
, dbus
, dbus-test-runner
, glib
, gtest
, intltool
, json-glib
, libapparmor
, libxkbcommon
, lomiri-app-launch
, lomiri-ui-toolkit
, makeWrapper
, pkg-config
, python3
, qtbase
, qtdeclarative
, qtwayland
, runtimeShell
, sqlite
, systemd
, wrapQtAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-url-dispatcher";
version = "0.1.3";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-url-dispatcher";
rev = finalAttrs.version;
hash = "sha256-kde/HzhBHxTeyc2TCUJwpG7IfC8doDd/jNMF8KLM7KU=";
};
outputs = [
"out"
"dev"
];
patches = [
# Fix case-sensitivity in tests
# Remove when https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/merge_requests/8 merged & in release
(fetchpatch {
url = "https://gitlab.com/sunweaver/lomiri-url-dispatcher/-/commit/ebdd31b9640ca243e90bc7b8aca7951085998bd8.patch";
hash = "sha256-g4EohB3oDcWK4x62/3r/g6CFxqb7/rdK51+E/Fji1Do=";
})
];
postPatch = ''
substituteInPlace data/CMakeLists.txt \
--replace "\''${SYSTEMD_USER_UNIT_DIR}" "\''${CMAKE_INSTALL_LIBDIR}/systemd/user"
substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \
--replace "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}"
# Update URI handler database whenever new url-handler is installed system-wide
substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \
--replace '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share'
'' + lib.optionalString finalAttrs.finalPackage.doCheck ''
patchShebangs tests/test-sql.sh
'';
strictDeps = true;
nativeBuildInputs = [
cmake
glib # for gdbus-codegen
intltool
makeWrapper
pkg-config
(python3.withPackages (ps: with ps; [
setuptools
] ++ lib.optionals finalAttrs.finalPackage.doCheck [
python-dbusmock
]))
wrapQtAppsHook
];
buildInputs = [
cmake-extras
dbus-test-runner
glib
gtest
json-glib
libapparmor
lomiri-app-launch
lomiri-ui-toolkit
qtdeclarative
sqlite
systemd
libxkbcommon
];
nativeCheckInputs = [
dbus
sqlite
];
cmakeFlags = [
"-DLOCAL_INSTALL=ON"
"-Denable_mirclient=OFF"
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
# Tests work with an sqlite db, cannot handle >1 test at the same time
enableParallelChecking = false;
dontWrapQtApps = true;
preFixup = ''
substituteInPlace $out/bin/lomiri-url-dispatcher-dump \
--replace '/bin/sh' '${runtimeShell}'
wrapProgram $out/bin/lomiri-url-dispatcher-dump \
--prefix PATH : ${lib.makeBinPath [ sqlite ]}
# Move from qmlscene call in desktop file to easier-to-wrap script
guiScript=$out/bin/lomiri-url-dispatcher-gui
guiExec=$(grep 'Exec=' $out/share/applications/lomiri-url-dispatcher-gui.desktop | cut -d'=' -f2-)
cat <<EOF >$guiScript
#!${runtimeShell}
$guiExec
EOF
chmod +x $guiScript
mkdir -p $out/share/icons/hicolor/scalable/apps
ln -s $out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg $out/share/icons/hicolor/scalable/apps/
substituteInPlace $out/share/applications/lomiri-url-dispatcher-gui.desktop \
--replace "Exec=$guiExec" "Exec=$(basename $guiScript)" \
--replace "Icon=$out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg" "Icon=lomiri-url-dispatcher-gui"
# Calls qmlscene from PATH, needs Qt plugins & QML components
qtWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ qtdeclarative.dev ]}
)
wrapQtApp $guiScript
'';
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
updateScript = gitUpdater { };
};
meta = with lib; {
description = "Lomiri operating environment service for requesting URLs to be opened";
longDescription = ''
Allows applications to request a URL to be opened and handled by another
process without seeing the list of other applications on the system or
starting them inside its own Application Confinement.
'';
homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher";
license = with licenses; [ lgpl3Only gpl3Only ];
maintainers = teams.lomiri.members;
platforms = platforms.linux;
pkgConfigModules = [
"lomiri-url-dispatcher"
];
};
})

2
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View File

@ -266,7 +266,7 @@ self: super: {
}) super.ConfigFile;
# The curl executable is required for withApplication tests.
warp_3_3_29 = addTestToolDepend pkgs.curl super.warp_3_3_29;
warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30;
# The NCG backend for aarch64 generates invalid jumps in some situations,
# the workaround on 9.6 is to revert to the LLVM backend (which is used

4
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -109,13 +109,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
version = "1.22.7";
version = "1.22.8";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-xxb43/qPrD+2RpQa8cbscv/wWgRRMTEb8tBJ/ch7zi4=";
hash = "sha256-RYeD+CNgaJkePilu3Wccjt24vm+skzwcLhUDRihk6g8=";
};
patches = [

4
pkgs/development/libraries/gstreamer/base/default.nix
View File

@ -45,7 +45,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-base";
version = "1.22.7";
version = "1.22.8";
outputs = [ "out" "dev" ];
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-YlGeDY+Wnr9iqaeZby0j792jMCF6Y19KMsC/HHFXdGg=";
hash = "sha256-62eS5cc8be+5FZw26m5LeKL4r2USZ4tL07AsjS1JKs8=";
};
strictDeps = true;

4
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -24,7 +24,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gstreamer";
version = "1.22.7";
version = "1.22.8";
outputs = [
"bin"
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-AeQsY1Kga9+kRW5ksGq32YxcSHolVXx2FVRjHL2mQhc=";
hash = "sha256-rU49sXcRObHbF7Gvp8BdsIOuAQC9TaJEtx8WLczkG/w=";
};
depsBuildBuild = [

4
pkgs/development/libraries/gstreamer/devtools/default.nix
View File

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
version = "1.22.7";
version = "1.22.8";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-FXz5P7J0HPDD3qcxvjry/65wPJ8s08DJGzgPvGheufk=";
hash = "sha256-zWNAVvyxbQNbPfWVPsha6L1Wxo8pkgtyDvkgynHqdqc=";
};
outputs = [

4
pkgs/development/libraries/gstreamer/ges/default.nix
View File

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
version = "1.22.7";
version = "1.22.8";
outputs = [
"out"
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-/sVqLDeiU80EjSiNTH7abv8ZECKwnbl14HosEF0bUh4=";
hash = "sha256-0dXnXhkOsL4/1JQJ5Bo6qOaM+03qpzU0iFVGdJVs0d8=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -54,13 +54,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32);
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
version = "1.22.7";
version = "1.22.8";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-ttsOGOOYtSZlt83OMBw0qHUEg9X0+6we3p+AsDdDzRU=";
hash = "sha256-4wW58H9SdDykgdoKTgx2w179YK2vGwaU6zuwIeITfjk=";
};
strictDeps = true;

4
pkgs/development/libraries/gstreamer/libav/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "gst-libav";
version = "1.22.7";
version = "1.22.8";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-FSW5FxQbiV/lz2GP6IZ2IrJSgnigKG6fcntfNzF9rKE=";
hash = "sha256-vjk0m8B6tM29ml/W6phIxgHHVguloFd61SALg71CSYE=";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/rtsp-server/default.nix
View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
version = "1.22.7";
version = "1.22.8";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-9/rAAeIK0h420YOXdBxGV8XUNXHrHMO0n5qTrhJ9yI8=";
hash = "sha256-cFF3BRwimXbxca3Nerl2Kua8xLt33DCKC9gKY9psM38=";
};
outputs = [

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
version = "1.22.7";
version = "1.22.8";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-UgtGvKY3GJrYaimP8kWy2JN128rIsF102uqRD4Gp6do=";
hash = "sha256-B2HZa6UI4BwCcYgbJoKMK//X2K/VCHIhnwiPdVslLKc=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/vaapi/default.nix
View File

@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "gstreamer-vaapi";
version = "1.22.7";
version = "1.22.8";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-Dp//douJ3m0xizQUbk54HYK5oPQCXcVBssg0nHvLf2c=";
hash = "sha256-Epi6NHpwxCuIzev5G2Wf6gKxu3Jp6r+OKePAvVgniSg=";
};
outputs = [

4
pkgs/development/python-modules/gst-python/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "gst-python";
version = "1.22.7";
version = "1.22.8";
format = "other";
@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
hash = "sha256-HvjfdggBL6RpMpeZyVDsCHc3ptq60wA8IwZYtYxxAXI=";
hash = "sha256-1cuPFEBUoqEQ5mcr1RLksV1bG42YecGSuXI1Ne+3C48=";
};
# Python 2.x is not supported.

4
pkgs/development/python-modules/pyorthanc/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyorthanc";
version = "1.15.0";
version = "1.16.0";
disabled = pythonOlder "3.8";
format = "pyproject";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gacou54";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-2F5yXWqOwQM1i0AgCCr1j98jpZLA2D919Iex9WjKLuw=";
hash = "sha256-qwH3kJzJRHuuGW7tgcaQjT+JwDsAZksQDZciaJLC55Q=";
};
nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ];

4
pkgs/development/python-modules/pyvista/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pyvista";
version = "0.42.3";
version = "0.43.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-RIeasdsLCBBs9eXUts53zlCkqkME48GBWVAcBoEHuOM=";
hash = "sha256-H7WkRK9lP92L47nFNDT1WusWfU0bLgXBA+KQqTyedL4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/succulent/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "succulent";
version = "0.2.6";
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "firefly-cpp";
repo = "succulent";
rev = "refs/tags/${version}";
hash = "sha256-CGDgt6tv+KysrytJsgDKwf2yv6shXizvD67XsGBg+nI=";
hash = "sha256-2WiKrIQkgFIjmZkEA8veXcKCY4X0aygqoP7R3UCCljQ=";
};
pythonRelaxDeps = [

4
pkgs/development/python-modules/toml-adapt/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "toml-adapt";
version = "0.2.12";
version = "0.3.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "firefly-cpp";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-DtxA63lutgjGMH8GYz5r6IFEuuZ9iFGPGup960c4xgE=";
hash = "sha256-BI0yZlut9PEupa597KN4qdVABOiOLwFpovN8L1lfUmk=";
};
nativeBuildInputs = [

6
pkgs/development/rocm-modules/5/clang-ocl/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "clang-ocl";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0=";
@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "OpenCL compilation with clang compiler";
homepage = "https://github.com/RadeonOpenCompute/clang-ocl";
homepage = "https://github.com/ROCm/clang-ocl";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

10
pkgs/development/rocm-modules/5/clr/default.nix
View File

@ -43,7 +43,7 @@ in stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "clr";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-1gZJhvBbUFdKH9p/7SRfzEV/fM+gIN2Qvlxf2VbmAIw=";
@ -82,7 +82,7 @@ in stdenv.mkDerivation (finalAttrs: {
"-DROCM_PATH=${rocminfo}"
# Temporarily set variables to work around upstream CMakeLists issue
# Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed
# 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"
@ -122,7 +122,7 @@ in stdenv.mkDerivation (finalAttrs: {
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/RadeonOpenCompute/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix
# See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix
gpuTargets = lib.forEach [
"803"
"900"
@ -161,10 +161,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "AMD Common Language Runtime for hipamd, opencl, and rocclr";
homepage = "https://github.com/ROCm-Developer-Tools/clr";
homepage = "https://github.com/ROCm/clr";
license = with licenses; [ mit ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/composable_kernel/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "composable_kernel";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-Z9X+S2SijGJ8bhr9ghkkWicBUzLzs9fxPpqZxX6BBM4=";
@ -79,10 +79,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Performance portable programming model for machine learning tensor operators";
homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
homepage = "https://github.com/ROCm/composable_kernel";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

15
pkgs/development/rocm-modules/5/default.nix
View File

@ -16,7 +16,7 @@
let
rocmUpdateScript = callPackage ./update.nix { };
in rec {
## RadeonOpenCompute ##
## ROCm ##
llvm = recurseIntoAttrs (callPackage ./llvm/default.nix { inherit rocmUpdateScript rocm-device-libs rocm-runtime rocm-thunk clr; });
rocm-core = callPackage ./rocm-core {
@ -80,7 +80,6 @@ in rec {
rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { stdenv = gcc12Stdenv; };
## ROCm-Developer-Tools ##
hip-common = callPackage ./hip-common {
inherit rocmUpdateScript;
stdenv = llvm.rocmClangStdenv;
@ -135,7 +134,6 @@ in rec {
stdenv = llvm.rocmClangStdenv;
};
## ROCmSoftwarePlatform ##
rocprim = callPackage ./rocprim {
inherit rocmUpdateScript rocm-cmake clr;
stdenv = llvm.rocmClangStdenv;
@ -280,7 +278,6 @@ in rec {
rocmlir = rocmlir-rock;
};
## GPUOpen-ProfessionalCompute-Libraries ##
rpp = callPackage ./rpp {
inherit rocmUpdateScript rocm-cmake rocm-docs-core clr half;
inherit (llvm) openmp;
@ -311,7 +308,7 @@ in rec {
stdenv = llvm.rocmClangStdenv;
# Unfortunately, rocAL needs a custom libjpeg-turbo until further notice
# See: https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/issues/1051
# See: https://github.com/ROCm/MIVisionX/issues/1051
libjpeg_turbo = libjpeg_turbo.overrideAttrs {
version = "2.0.6.1";
@ -347,8 +344,8 @@ in rec {
# 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/latest/_images/image.004.png
# See: https://rocm.docs.amd.com/en/latest/deploy/linux/os-native/package_manager_integration.html
# 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";
@ -443,7 +440,7 @@ in rec {
rocm-core
llvm.clang
llvm.mlir
llvm.openmp # openmp-extras-devel (https://github.com/ROCm-Developer-Tools/aomp)
llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp)
rocm-language-runtime
];
};
@ -507,7 +504,7 @@ in rec {
rocm-runtime
rocm-core
rocm-comgr
llvm.openmp # openmp-extras-runtime (https://github.com/ROCm-Developer-Tools/aomp)
llvm.openmp # openmp-extras-runtime (https://github.com/ROCm/aomp)
];
};

6
pkgs/development/rocm-modules/5/half/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "half";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-82It+/wm8+umBdQYn7lz/fS69h+f0mzwPdGxoJNYUq0=";
@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "C++ library for half precision floating point arithmetics";
homepage = "https://github.com/ROCmSoftwarePlatform/half";
homepage = "https://github.com/ROCm/half";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.unix;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hip-common/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "HIP";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-1Abit9qZCwrCVcnaFT4uMygFB9G6ovRasLmTsOsJ/Fw=";
@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "C++ Heterogeneous-Compute Interface for Portability";
homepage = "https://github.com/ROCm-Developer-Tools/HIP";
homepage = "https://github.com/ROCm/HIP";
license = with licenses; [ mit ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipblas/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "hipBLAS";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-abaEZN82dsoEC5gIF3/6epRDVz5ItUo6CkZsybu/G+g=";
@ -90,10 +90,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm BLAS marshalling library";
homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS";
homepage = "https://github.com/ROCm/hipBLAS";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipcc/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "HIPCC";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-lJX6nF1V4YmK5ai7jivXlRnG3doIOf6X9CWLHVdRuVg=";
@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Compiler driver utility that calls clang or nvcc";
homepage = "https://github.com/ROCm-Developer-Tools/HIPCC";
homepage = "https://github.com/ROCm/HIPCC";
license = with licenses; [ mit ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipcub/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "hipCUB";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-ygBEA3NuCQ13QrSzGqyWXkx8Dy9WhR3u4syzapRTkFU=";
@ -81,10 +81,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Thin wrapper library on top of rocPRIM or CUB";
homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB";
homepage = "https://github.com/ROCm/hipCUB";
license = with licenses; [ bsd3 ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipfft/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "hipFFT";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-fuYRKdlTrRMwxr3cgMeT3YniPzs4nuvF8YCzr3LLPFM=";
@ -101,10 +101,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "FFT marshalling library";
homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT";
homepage = "https://github.com/ROCm/hipFFT";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipfort/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "hipfort";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-DRjUWhdinDKP7CZgq2SmU3lGmmodCuXvco9aEeMLSZ4=";
@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Fortran interfaces for ROCm libraries";
homepage = "https://github.com/ROCmSoftwarePlatform/hipfort";
homepage = "https://github.com/ROCm/hipfort";
license = with licenses; [ mit ]; # mitx11
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipify/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "HIPIFY";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-lCQ2VTUGmFC90Xu70/tvoeDhFaInGqLT3vC2A1UojNI=";
@ -41,10 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Convert CUDA to Portable C++ Code";
homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY";
homepage = "https://github.com/ROCm/HIPIFY";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipsolver/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "hipSOLVER";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-5b6kPj9yvXvP7f7AyHDTYRoM/EhQZvwkVCfDflFJugc=";
@ -91,10 +91,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm SOLVER marshalling library";
homepage = "https://github.com/ROCmSoftwarePlatform/hipSOLVER";
homepage = "https://github.com/ROCm/hipSOLVER";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hipsparse/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "hipSPARSE";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-txigaOoZMI/v+EQLgGlj2O0IHfE7EpgjL0cyv49nKzo=";
@ -127,10 +127,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm SPARSE marshalling library";
homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE";
homepage = "https://github.com/ROCm/hipSPARSE";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

2
pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix
View File

@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
license = with licenses; [ unfree ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix
View File

@ -37,6 +37,12 @@ let
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"

6
pkgs/development/rocm-modules/5/llvm/base.nix
View File

@ -75,7 +75,7 @@ in stdenv.mkDerivation (finalAttrs: {
patches = extraPatches;
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "llvm-project";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-0+lJnDiMntxCYbZBCSWvHOcKXexFfEzRfb49QbfOmK8=";
@ -166,10 +166,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm fork of the LLVM compiler infrastructure";
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
homepage = "https://github.com/ROCm/llvm-project";
license = with licenses; [ ncsa ] ++ extraLicenses;
maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = isBroken;
broken = isBroken || versionAtLeast finalAttrs.version "6.0.0";
};
})

2
pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix
View File

@ -6,5 +6,5 @@
callPackage ../base.nix {
inherit stdenv rocmUpdateScript;
requiredSystemFeatures = [ "big-parallel" ];
isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344
isBroken = stdenv.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344
}

2
pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix
View File

@ -18,7 +18,7 @@ callPackage ../base.nix rec {
# 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/RadeonOpenCompute/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch
# https://github.com/ROCm/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch
extraPatches = [ ./0000-mlir-fix-debugtranslation.patch ];
extraNativeBuildInputs = [ clr ];

8
pkgs/development/rocm-modules/5/migraphx/default.nix
View File

@ -59,7 +59,7 @@ in stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "AMDMIGraphX";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-lg3pxHBpwqxBvdOQgE44YKLuumhkVF6b3Xx4+cw7jNQ=";
@ -123,7 +123,7 @@ in stdenv.mkDerivation (finalAttrs: {
--replace "set(MIGRAPHX_TIDY_ERRORS ALL)" ""
# JIT library was removed from composable_kernel...
# https://github.com/ROCmSoftwarePlatform/composable_kernel/issues/782
# https://github.com/ROCm/composable_kernel/issues/782
substituteInPlace src/targets/gpu/CMakeLists.txt \
--replace " COMPONENTS jit_library" "" \
--replace " composable_kernel::jit_library" "" \
@ -162,10 +162,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "AMD's graph optimization engine";
homepage = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX";
homepage = "https://github.com/ROCm/AMDMIGraphX";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

10
pkgs/development/rocm-modules/5/miopen/default.nix
View File

@ -38,7 +38,7 @@ let
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "MIOpen";
rev = "rocm-${version}";
hash = "sha256-xcKmFI8HcRA9bbh6EQGElKykIQ3RJX/q5f4IxXvM1Is=";
@ -110,11 +110,11 @@ in stdenv.mkDerivation (finalAttrs: {
# Find zstd and add to target. Mainly for torch.
patches = [
(fetchpatch {
url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch";
url = "https://github.com/ROCm/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch";
hash = "sha256-oxa3qlIC2bzbwGxrQOZXoY/S7CpLsMrnWRB7Og0tk0M=";
})
(fetchpatch {
url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch";
url = "https://github.com/ROCm/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch";
hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs=";
})
];
@ -230,10 +230,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Machine intelligence library for ROCm";
homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen";
homepage = "https://github.com/ROCm/MIOpen";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

3
pkgs/development/rocm-modules/5/miopengemm/default.nix
View File

@ -43,6 +43,7 @@ in stdenv.mkDerivation (finalAttrs: {
"benchmark"
];
# Deprecated? https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/issues/62
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "MIOpenGEMM";
@ -120,6 +121,6 @@ in stdenv.mkDerivation (finalAttrs: {
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;
broken = versions.major finalAttrs.version != versions.major stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/mivisionx/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "GPUOpen-ProfessionalCompute-Libraries";
owner = "ROCm";
repo = "MIVisionX";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U=";
@ -136,10 +136,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications";
homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX";
homepage = "https://github.com/ROCm/MIVisionX";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rccl/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rccl";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-nFkou/kjGBmImorlPOZNTlCrxbfAYpDhgRveyoAufu8=";
@ -82,10 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm communication collectives library";
homepage = "https://github.com/ROCmSoftwarePlatform/rccl";
homepage = "https://github.com/ROCm/rccl";
license = with licenses; [ bsd2 bsd3 ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rdc/default.nix
View File

@ -51,7 +51,7 @@ in stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "rdc";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-xZD/WI/LfNtKK9j6ZjuU0OTTFZz3G4atyD5mVcSsQ8A=";
@ -115,11 +115,11 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments";
homepage = "https://github.com/RadeonOpenCompute/rdc";
homepage = "https://github.com/ROCm/rdc";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
# broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version;
# 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
};
})

6
pkgs/development/rocm-modules/5/rocalution/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocALUTION";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-+UGpFuZsC4+kmo8LWZWC2YoFJSdTukjN47e1YqW5Zu4=";
@ -106,10 +106,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Iterative sparse solvers for ROCm";
homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION";
homepage = "https://github.com/ROCm/rocALUTION";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocblas/default.nix
View File

@ -84,7 +84,7 @@ in stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocBLAS";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-3wKnwvAra8u9xqlC05wUD+gSoBILTVJFU2cIV6xv3Lk=";
@ -200,10 +200,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "BLAS implementation for ROCm platform";
homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS";
homepage = "https://github.com/ROCm/rocBLAS";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocdbgapi/default.nix
View File

@ -46,7 +46,7 @@ in stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "ROCdbgapi";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-qMXvgcS61lgcylz62ErYq8fhpYIR31skQEeKUryuP1w=";
@ -102,10 +102,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Debugger support for control of execution and inspection state";
homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi";
homepage = "https://github.com/ROCm/ROCdbgapi";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocfft/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocFFT";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-GZSi03geTT+NUztBWhGYyghLqJGsFjUQzVAKQ7d03uA=";
@ -160,10 +160,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "FFT implementation for ROCm";
homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT";
homepage = "https://github.com/ROCm/rocFFT";
license = with licenses; [ mit ];
maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

5
pkgs/development/rocm-modules/5/rocgdb/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "ROCgdb";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-TlT7vvTrVd7P6ilVnWIG5VIrjTleFgDezK/mudBV+xE=";
@ -50,9 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm source-level debugger for Linux, based on GDB";
homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb";
homepage = "https://github.com/ROCm/ROCgdb";
license = with licenses; [ gpl2 gpl3 bsd3 ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocm-cmake/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "rocm-cmake";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-aVjzuJ4BiSfwOdjufFc5CznfnL8di5h992zl+pzD0DU=";
@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "CMake modules for common build tasks for the ROCm stack";
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
homepage = "https://github.com/ROCm/rocm-cmake";
license = licenses.mit;
maintainers = teams.rocm.members;
platforms = platforms.unix;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocm-comgr/default.nix
View File

@ -18,7 +18,7 @@ in stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "ROCm-CompilerSupport";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-QB3G0V92UTW67hD6+zSuExN1+eMT820iYSlMyZeWSFw=";
@ -46,10 +46,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "APIs for compiling and inspecting AMDGPU code objects";
homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr";
homepage = "https://github.com/ROCm/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr";
license = licenses.ncsa;
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocm-core/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "rocm-core";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-jFAHLqf/AR27Nbuq8aypWiKqApNcTgG5LWESVjVCKIg=";
@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Utility for getting the ROCm release version";
homepage = "https://github.com/RadeonOpenCompute/rocm-core";
homepage = "https://github.com/ROCm/rocm-core";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocm-device-libs/default.nix
View File

@ -17,7 +17,7 @@ in stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "ROCm-Device-Libs";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-ARxs/yqyVoIUWliJkINzitumF+64/5u3fbB0tHB5hPU=";
@ -41,10 +41,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Set of AMD-specific device-side language runtime libraries";
homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs";
homepage = "https://github.com/ROCm/ROCm-Device-Libs";
license = licenses.ncsa;
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

1
pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
View File

@ -20,6 +20,7 @@
, fastjsonschema
}:
# FIXME: Move to rocmPackages_common
buildPythonPackage rec {
pname = "rocm-docs-core";
version = "0.26.0";

8
pkgs/development/rocm-modules/5/rocm-runtime/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "ROCR-Runtime";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-D7Ahan5cxDhqPtV5iDDNys0A4FlxQ9oVRa2EeMoY5Qk=";
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
--replace 'hsa/include/hsa' 'include/hsa'
# We compile clang before rocm-device-libs, so patch it in afterwards
# Replace object version: https://github.com/RadeonOpenCompute/ROCR-Runtime/issues/166 (TODO: Remove on LLVM update?)
# 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'
@ -69,10 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Platform runtime for ROCm";
homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
homepage = "https://github.com/ROCm/ROCR-Runtime";
license = with licenses; [ ncsa ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocm-smi/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "rocm_smi_lib";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-NZR4jBgKVfpkRNQFPmav1yCZF872LkcrPBNNcBVTLDU=";
@ -45,10 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "System management interface for AMD GPUs supported by ROCm";
homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib";
homepage = "https://github.com/ROCm/rocm_smi_lib";
license = with licenses; [ mit ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = [ "x86_64-linux" ];
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocm-thunk/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "ROCT-Thunk-Interface";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-jAMBks2/JaXiA45B3qvLHY8fPeFcr1GHT5Jieuduqhw=";
@ -45,10 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Radeon open compute thunk interface";
homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface";
homepage = "https://github.com/ROCm/ROCT-Thunk-Interface";
license = with licenses; [ bsd2 mit ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocminfo/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
pname = "rocminfo";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
owner = "ROCm";
repo = "rocminfo";
rev = "rocm-${finalAttrs.version}";
sha256 = "sha256-UzOo2qDT/uM+vdGdBM4pV5e143mfa+/6sZLBExOO26g=";
@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm Application for Reporting System Info";
homepage = "https://github.com/RadeonOpenCompute/rocminfo";
homepage = "https://github.com/ROCm/rocminfo";
license = licenses.ncsa;
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocmlir/default.nix
View File

@ -41,7 +41,7 @@ in stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocMLIR";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-vPi4UVljohVAfnwDVQqeOVaJPa6v8aV5uBOtqLddTtc=";
@ -121,10 +121,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "MLIR-based convolution and GEMM kernel generator";
homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
homepage = "https://github.com/ROCm/rocMLIR";
license = with licenses; [ asl20 ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocprim/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocPRIM";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-+ukFWsWv3RhS+Z6tmR4TRT8QTYEDuAEk12F9Gv1eXGU=";
@ -77,10 +77,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm parallel primitives";
homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM";
homepage = "https://github.com/ROCm/rocPRIM";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocprofiler/default.nix
View File

@ -49,7 +49,7 @@ in stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "rocprofiler";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y=";
@ -127,10 +127,10 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Profiling with perf-counters and derived metrics";
homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler";
homepage = "https://github.com/ROCm/rocprofiler";
license = with licenses; [ mit ]; # mitx11
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor clr.version;
broken = versions.minor finalAttrs.version != versions.minor clr.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "rocr_debug_agent";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-AUDbNrFtUQ5Hm+uv5KMovh7P9wXQKLyRNx9gEQFnv6Y=";
@ -50,10 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Library that provides some debugging functionality for ROCr";
homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent";
homepage = "https://github.com/ROCm/rocr_debug_agent";
license = with licenses; [ ncsa ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocrand/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocRAND";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-VrpiHlZZQH+IOoaEDuDOfRgnMiqm1bpRIuNyrPz2SGY=";
@ -79,10 +79,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Generate pseudo-random and quasi-random numbers";
homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND";
homepage = "https://github.com/ROCm/rocRAND";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocsolver/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocSOLVER";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-qxmjm4tgpCnfJ2SqUXndk6y0MsPJUKHvjv/3Uc0smr4=";
@ -89,12 +89,12 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm LAPACK implementation";
homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER";
homepage = "https://github.com/ROCm/rocSOLVER";
license = with licenses; [ bsd2 ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
timeout = 14400; # 4 hours
maxSilent = 14400; # 4 hours
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocsparse/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocSPARSE";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-30q9bqgZJUaNrkMXTAG+Z34yjsQ5DpJP+WBcCiEmF58=";
@ -140,10 +140,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm SPARSE implementation";
homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE";
homepage = "https://github.com/ROCm/rocSPARSE";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocthrust/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocThrust";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-+bcHcA87IToTcII7N/hm81C/JiokJKj0M1yAph/x9Qc=";
@ -78,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "ROCm parallel algorithm library";
homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust";
homepage = "https://github.com/ROCm/rocThrust";
license = with licenses; [ asl20 ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/roctracer/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
owner = "ROCm";
repo = "roctracer";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-P6QYyAjMRwFFWKF8AhbrYGe+mYVJXdbBW1or6vcobYU=";
@ -94,10 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Tracer callback/activity library";
homepage = "https://github.com/ROCm-Developer-Tools/roctracer";
homepage = "https://github.com/ROCm/roctracer";
license = with licenses; [ mit ]; # mitx11
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor clr.version;
broken = versions.minor finalAttrs.version != versions.minor clr.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rocwmma/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "rocWMMA";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-0otJxgVYLwvVYIWT/hjrrpuSj5jslP1dbJRt6GUOrDs=";
@ -96,10 +96,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Mixed precision matrix multiplication and accumulation";
homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA";
homepage = "https://github.com/ROCm/rocWMMA";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/rpp/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "5.7.1";
src = fetchFromGitHub {
owner = "GPUOpen-ProfessionalCompute-Libraries";
owner = "ROCm";
repo = "rpp";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-s6ODmxPBLpR5f8VALaW6F0p0rZSxSd2LH2+60SEfLCk=";
@ -79,10 +79,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Comprehensive high-performance computer vision library for AMD processors";
homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp";
homepage = "https://github.com/ROCm/rpp";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version;
broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0";
};
})

6
pkgs/development/rocm-modules/5/tensile/default.nix
View File

@ -19,7 +19,7 @@ buildPythonPackage rec {
format = "pyproject";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
owner = "ROCm";
repo = "Tensile";
rev = "rocm-${version}";
hash = "sha256-CyPGiM/53duJc/oNtOsl6JSsl9uOOYm5R7O6YXaVOm4=";
@ -56,10 +56,10 @@ buildPythonPackage rec {
meta = with lib; {
description = "GEMMs and tensor contractions";
homepage = "https://github.com/ROCmSoftwarePlatform/Tensile";
homepage = "https://github.com/ROCm/Tensile";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
platforms = platforms.linux;
broken = versions.minor version != versions.minor stdenv.cc.version;
broken = versions.minor version != versions.minor stdenv.cc.version || versionAtLeast version "6.0.0";
};
}

5
pkgs/development/rocm-modules/5/update.nix
View File

@ -23,6 +23,11 @@ let
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

2
pkgs/development/tools/hotdoc/default.nix
View File

@ -100,7 +100,7 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace hotdoc/extensions/c/c_extension.py \
--replace "shutil.which('llvm-config')" 'True' \
--replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${llvmPackages.libclang.version}"' \
--replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \
--replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \
--replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"'
'';

2
pkgs/tools/misc/broot/default.nix
View File

@ -8,6 +8,7 @@
, libgit2
, oniguruma
, libiconv
, Foundation
, Security
, xorg
, zlib
@ -35,6 +36,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [
Foundation
libiconv
Security
zlib

6
pkgs/tools/security/cnspec/default.nix
View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "cnspec";
version = "9.12.0";
version = "9.12.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-bNSSU7UJBexnZ95fJM0Oa70jGbbM0ghNA0ePESRMjX0=";
hash = "sha256-U3iEiKIb9lTNM4GK75a8khsjeZzYaMafoBfdpNiiwHQ=";
};
proxyVendor = true;
vendorHash = "sha256-9hjQBoZW6pnuo1YDegp+yxpvR4Ja+6BqOg5/fqwPRig=";
vendorHash = "sha256-RRE0DsBkpI9hvo7k04eIadOKO3YE0g0DDjFj40ya1ZM=";
subPackages = [
"apps/cnspec"

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.47"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.48"

28
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: e9a1adf7e1a5edb3f76bd537fe6fa5c75435aec9
ref: refs/tags/6.3.47
revision: 261eca342915db81d67cdfe7f2ef7b3788fd508f
ref: refs/tags/6.3.48
specs:
metasploit-framework (6.3.47)
metasploit-framework (6.3.48)
actionpack (~> 7.0.0)
activerecord (~> 7.0.0)
activesupport (~> 7.0.0)
@ -134,13 +134,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.3.0)
aws-partitions (1.864.0)
aws-sdk-core (3.190.0)
aws-partitions (1.872.0)
aws-sdk-core (3.190.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.430.0)
aws-sdk-ec2 (1.431.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-ec2instanceconnect (1.36.0)
@ -149,7 +149,7 @@ GEM
aws-sdk-iam (1.92.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.74.0)
aws-sdk-kms (1.75.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.141.0)
@ -191,7 +191,7 @@ GEM
eventmachine (1.2.7)
faker (3.2.2)
i18n (>= 1.8.11, < 2)
faraday (2.7.12)
faraday (2.8.1)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
@ -219,7 +219,7 @@ GEM
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-console (0.6.0)
io-console (0.7.1)
irb (1.7.4)
reline (>= 0.3.6)
jmespath (1.6.2)
@ -274,7 +274,7 @@ GEM
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
nessus_rest (0.1.6)
net-imap (0.4.7)
net-imap (0.4.8)
date
net-protocol
net-ldap (0.18.0)
@ -282,7 +282,7 @@ GEM
timeout
net-smtp (0.4.0)
net-protocol
net-ssh (7.2.0)
net-ssh (7.2.1)
network_interface (0.0.4)
nexpose (7.3.0)
nio4r (2.7.0)
@ -334,7 +334,7 @@ GEM
rasn1 (0.12.1)
strptime (~> 0.2.5)
rb-readline (0.5.5)
recog (3.1.2)
recog (3.1.4)
nokogiri
redcarpet (3.6.0)
reline (0.4.1)
@ -393,7 +393,7 @@ GEM
ruby-mysql (4.1.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
ruby_smb (3.3.0)
ruby_smb (3.3.1)
bindata
openssl-ccm
openssl-cmac
@ -463,4 +463,4 @@ DEPENDENCIES
metasploit-framework!
BUNDLED WITH
2.4.22
2.4.13

4
pkgs/tools/security/metasploit/default.nix
View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.3.47";
version = "6.3.48";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = "refs/tags/${version}";
hash = "sha256-I1BpYCS2wLrvAKwqKn0QDOf0SvdsmT58OtiBDXwJkh8=";
hash = "sha256-AY0k44/gYXP4h3SoRVF9aK2L2skZ03Azd5V9hSRDoHQ=";
};
nativeBuildInputs = [

46
pkgs/tools/security/metasploit/gemset.nix
View File

@ -104,30 +104,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16n1d0bh3zy925y4f8flrnkfir2smsj0j31zslfaz6vf6cvi9qjs";
sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm";
type = "gem";
};
version = "1.864.0";
version = "1.872.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19nglxz49nlzgsvnivb3bdm17vxjn1ng2br8659xv48nzjrmyid3";
sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh";
type = "gem";
};
version = "3.190.0";
version = "3.190.1";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zyazx97nskgl9xzspg2q1rji02p2jv789v8qd1qz6hknz0z6r5f";
sha256 = "04lg4g6aivkf6zvvcc1clw0dqdlpkn3c87kiz5mfc7m2jr0m0ljx";
type = "gem";
};
version = "1.430.0";
version = "1.431.0";
};
aws-sdk-ec2instanceconnect = {
groups = ["default"];
@ -154,10 +154,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1isrj19kzy9sb7a76a1c2n5x0d9lg1h2n7fp7cn13xjis0hpnlxj";
sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1";
type = "gem";
};
version = "1.74.0";
version = "1.75.0";
};
aws-sdk-s3 = {
groups = ["default"];
@ -404,10 +404,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d";
sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8";
type = "gem";
};
version = "2.7.12";
version = "2.8.1";
};
faraday-net_http = {
groups = ["default"];
@ -554,10 +554,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff";
sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5";
type = "gem";
};
version = "0.6.0";
version = "0.7.1";
};
irb = {
groups = ["default"];
@ -664,12 +664,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "e9a1adf7e1a5edb3f76bd537fe6fa5c75435aec9";
sha256 = "07wj15y0v0fq79y3x6bcyx5g9rqc21yjlamc03pvmh5n4ih6jl13";
rev = "261eca342915db81d67cdfe7f2ef7b3788fd508f";
sha256 = "0x508cj8azcmfwrp1lqrr7d8pbb8gm8lba3lhzw76qg0izij9381";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.3.47";
version = "6.3.48";
};
metasploit-model = {
groups = ["default"];
@ -796,10 +796,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs";
sha256 = "1wnmxcrpv7zaf8wli5nvfnz5ybmw7f3r06s05p3d96idc61193mv";
type = "gem";
};
version = "0.4.7";
version = "0.4.8";
};
net-ldap = {
groups = ["default"];
@ -836,10 +836,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a";
sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w";
type = "gem";
};
version = "7.2.0";
version = "7.2.1";
};
network_interface = {
groups = ["default"];
@ -1107,10 +1107,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15633qvzbgsigx55dxb9b07xh0spwr9njd5y2f454kc5zrrapp1a";
sha256 = "1a9m9ngmcgvgzg8m8ahdhjvfm65k6hp8r7dqmrsh3zcphim4x71k";
type = "gem";
};
version = "3.1.2";
version = "3.1.4";
};
redcarpet = {
groups = ["default"];
@ -1377,10 +1377,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xfjl89a46xg1w98ywa2byf23jmhh3xyj4r501hgc7vma1i5gw3v";
sha256 = "04m366ldi33h79k7f35dvyhq0jyh762v8360zf8ss5jbax3bzlkk";
type = "gem";
};
version = "3.3.0";
version = "3.3.1";
};
rubyntlm = {
groups = ["default"];

42
pkgs/tools/virtualization/mininet/default.nix
View File

@ -1,11 +1,38 @@
{ stdenv, lib, fetchFromGitHub
, runCommand
, which
, python3
, help2man
, makeWrapper
, ethtool
, inetutils
, iperf
, iproute2
, nettools
, socat
}:
let
pyEnv = python3.withPackages(ps: [ ps.setuptools ]);
telnet = runCommand "inetutils-telnet"
{ }
''
mkdir -p "$out/bin"
ln -s "${inetutils}"/bin/telnet "$out/bin"
'';
generatedPath = lib.makeSearchPath "bin" [
iperf
ethtool
iproute2
socat
# mn errors out without a telnet binary
# pkgs.inetutils brings an undesired ifconfig into PATH see #43105
nettools
telnet
];
in
stdenv.mkDerivation rec {
pname = "mininet";
@ -24,7 +51,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
pythonPath = [ python3.pkgs.setuptools ];
nativeBuildInputs = [ help2man ];
nativeBuildInputs = [ help2man makeWrapper python3.pkgs.wrapPython ];
propagatedBuildInputs = [ python3 which ];
@ -33,7 +60,18 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p $out $py
# without --root, install fails
${pyEnv.interpreter} setup.py install --root="/" --prefix=$py
"${pyEnv.interpreter}" setup.py install \
--root="/" \
--prefix="$py" \
--install-scripts="$out/bin"
'';
postFixup = ''
wrapPythonProgramsIn "$out/bin" "$py $pythonPath"
wrapProgram "$out/bin/mnexec" \
--prefix PATH : "${generatedPath}"
wrapProgram "$out/bin/mn" \
--prefix PATH : "${generatedPath}"
'';
doCheck = false;

6
pkgs/top-level/all-packages.nix
View File

@ -4522,7 +4522,7 @@ with pkgs;
};
broot = callPackage ../tools/misc/broot {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Foundation Security;
};
bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
@ -27122,11 +27122,9 @@ with pkgs;
OVMF = callPackage ../applications/virtualization/OVMF { };
OVMFFull = callPackage ../applications/virtualization/OVMF {
secureBoot = true;
# CSM support is a BIOS emulation mechanism,
# SeaBIOS is only available on x86.
csmSupport = stdenv.hostPlatform.isx86;
httpSupport = true;
tpmSupport = true;
tlsSupport = true;
};
ops = callPackage ../applications/virtualization/ops { };