cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-11-25 18:02:16 +00:00 committed by GitHub
commit e5a45ed6d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 545 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
nixos/tests/web-apps/mastodon.nix
View file

@ -1,16 +1,13 @@
import ../make-test-python.nix ({pkgs, ...}:
let
test-certificates = pkgs.runCommandLocal "test-certificates" { } ''
cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=mastodon.local' -days 36500
mkdir -p $out
echo insecure-root-password > $out/root-password-file
echo insecure-intermediate-password > $out/intermediate-password-file
${pkgs.step-cli}/bin/step certificate create "Example Root CA" $out/root_ca.crt $out/root_ca.key --password-file=$out/root-password-file --profile root-ca
${pkgs.step-cli}/bin/step certificate create "Example Intermediate CA 1" $out/intermediate_ca.crt $out/intermediate_ca.key --password-file=$out/intermediate-password-file --ca-password-file=$out/root-password-file --profile intermediate-ca --ca $out/root_ca.crt --ca-key $out/root_ca.key
cp key.pem cert.pem $out
'';
hosts = ''
192.168.2.10 ca.local
192.168.2.11 mastodon.local
192.168.2.101 mastodon.local
'';
in
@ -19,42 +16,6 @@ in
meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin turion ];
nodes = {
ca = { pkgs, ... }: {
networking = {
interfaces.eth1 = {
ipv4.addresses = [
{ address = "192.168.2.10"; prefixLength = 24; }
];
};
extraHosts = hosts;
};
services.step-ca = {
enable = true;
address = "0.0.0.0";
port = 8443;
openFirewall = true;
intermediatePasswordFile = "${test-certificates}/intermediate-password-file";
settings = {
dnsNames = [ "ca.local" ];
root = "${test-certificates}/root_ca.crt";
crt = "${test-certificates}/intermediate_ca.crt";
key = "${test-certificates}/intermediate_ca.key";
db = {
type = "badger";
dataSource = "/var/lib/step-ca/db";
};
authority = {
provisioners = [
{
type = "ACME";
name = "acme";
}
];
};
};
};
};
server = { pkgs, ... }: {
virtualisation.memorySize = 2048;
@ -62,7 +23,7 @@ in
networking = {
interfaces.eth1 = {
ipv4.addresses = [
{ address = "192.168.2.11"; prefixLength = 24; }
{ address = "192.168.2.101"; prefixLength = 24; }
];
};
extraHosts = hosts;
@ -70,12 +31,7 @@ in
};
security = {
acme = {
acceptTerms = true;
defaults.server = "https://ca.local:8443/acme/acme/directory";
defaults.email = "mastodon@mastodon.local";
};
pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];
pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
};
services.redis.servers.mastodon = {
@ -89,16 +45,6 @@ in
configureNginx = true;
localDomain = "mastodon.local";
enableUnixSocket = false;
redis = {
createLocally = true;
host = "127.0.0.1";
port = 31637;
};
database = {
createLocally = true;
host = "/run/postgresql";
port = 5432;
};
smtp = {
createLocally = false;
fromAddress = "mastodon@mastodon.local";
@ -107,6 +53,14 @@ in
EMAIL_DOMAIN_ALLOWLIST = "example.com";
};
};
services.nginx = {
virtualHosts."mastodon.local" = {
enableACME = pkgs.lib.mkForce false;
sslCertificate = "${cert pkgs}/cert.pem";
sslCertificateKey = "${cert pkgs}/key.pem";
};
};
};
client = { pkgs, ... }: {
@ -114,14 +68,14 @@ in
networking = {
interfaces.eth1 = {
ipv4.addresses = [
{ address = "192.168.2.12"; prefixLength = 24; }
{ address = "192.168.2.102"; prefixLength = 24; }
];
};
extraHosts = hosts;
};
security = {
pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];
pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
};
};
};
@ -129,12 +83,6 @@ in
testScript = ''
start_all()
ca.wait_for_unit("step-ca.service")
ca.wait_for_open_port(8443)
# Check that mastodon-media-auto-remove is scheduled
server.succeed("systemctl status mastodon-media-auto-remove.timer")
server.wait_for_unit("nginx.service")
server.wait_for_unit("redis-mastodon.service")
server.wait_for_unit("postgresql.service")
@ -144,10 +92,17 @@ in
server.wait_for_open_port(55000)
server.wait_for_open_port(55001)
# Check that mastodon-media-auto-remove is scheduled
server.succeed("systemctl status mastodon-media-auto-remove.timer")
# Check Mastodon version from remote client
client.succeed("curl --fail https://mastodon.local/api/v1/instance | jq -r '.version' | grep '${pkgs.mastodon.version}'")
# Check using admin CLI
# Check access from remote client
client.succeed("curl --fail https://mastodon.local/about | grep 'Mastodon hosted on mastodon.local'")
client.succeed("curl --fail $(curl https://mastodon.local/api/v1/instance 2> /dev/null | jq -r .thumbnail) --output /dev/null")
# Simple check tootctl commands
# Check Mastodon version
server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl version' | grep '${pkgs.mastodon.version}'")
@ -164,12 +119,11 @@ in
# Manage IP access
server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks add 192.168.0.0/16 --severity=no_access'")
server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks export' | grep '192.168.0.0/16'")
server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl p_blocks export' | grep '172.16.0.0/16'")
server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks export' | grep '172.16.0.0/16'")
client.fail("curl --fail https://mastodon.local/about")
server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks remove 192.168.0.0/16'")
client.succeed("curl --fail https://mastodon.local/about")
ca.shutdown()
server.shutdown()
client.shutdown()
'';

38
pkgs/applications/audio/museeks/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib, fetchurl, appimageTools }:
let
pname = "museeks";
version = "0.13.1";
src = fetchurl {
url = "https://github.com/martpie/museeks/releases/download/${version}/museeks-x86_64.AppImage";
hash = "sha256-LvunhCFmpv00TnXzWjp3kQUAhoKpmp6pqKgcaUqZV+o=";
};
appimageContents = appimageTools.extractType2 {
inherit pname version src;
};
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
mkdir -p $out/share/${pname}
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
cp -a ${appimageContents}/usr/share/icons $out/share/
install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
description = "A simple, clean and cross-platform music player";
homepage = "https://github.com/martpie/museeks";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zendo ];
};
}

8
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -1451,8 +1451,8 @@ let
mktplcRef = {
name = "latex-workshop";
publisher = "James-Yu";
version = "8.29.0";
sha256 = "sha256-khAlxN+y06aneZE97fqNg2esj/wvIUINiMdVc/exd38=";
version = "9.0.0";
sha256 = "sha256-aXDYRLbDZGul2mG+jZs6o5Z5QVhEiOCaLhHpj/zVt6E=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
@ -2957,8 +2957,8 @@ let
mktplcRef = {
name = "markdown-all-in-one";
publisher = "yzhang";
version = "3.4.0";
sha256 = "0ihfrsg2sc8d441a2lkc453zbw1jcpadmmkbkaf42x9b9cipd5qb";
version = "3.4.4";
sha256 = "2lZfWP+yk0Dp8INLjlJY5ROGu0sLaWhb4fT+O9xGg0s=";
};
meta = {
license = lib.licenses.mit;

1
pkgs/applications/kde/default.nix
View file

@ -93,6 +93,7 @@ let
grantleetheme = callPackage ./grantleetheme {};
gwenview = callPackage ./gwenview.nix {};
incidenceeditor = callPackage ./incidenceeditor.nix {};
juk = callPackage ./juk.nix {};
k3b = callPackage ./k3b.nix {};
kaccounts-integration = callPackage ./kaccounts-integration.nix {};
kaccounts-providers = callPackage ./kaccounts-providers.nix {};

37
pkgs/applications/kde/juk.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, mkDerivation
, extra-cmake-modules
, wrapQtAppsHook
, kdoctools
, kcoreaddons
, kxmlgui
, kio
, phonon
, taglib
}:
mkDerivation {
pname = "juk";
nativeBuildInputs = [
extra-cmake-modules
wrapQtAppsHook
kdoctools
];
buildInputs = [
kcoreaddons
kxmlgui
kio
phonon
taglib
];
meta = with lib; {
homepage = "https://invent.kde.org/multimedia/juk";
description = "Audio jukebox app, supporting collections of MP3, Ogg Vorbis and FLAC audio files";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ zendo ];
};
}

35
pkgs/applications/networking/feedreaders/fluent-reader/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib, fetchurl, appimageTools }:
let
pname = "fluent-reader";
version = "1.1.3";
src = fetchurl {
url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage";
hash = "sha256-CzvhOaWfZ4rt2HmL/yv6P7IxEPLoyuBhftOxcjdMInU=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
mkdir -p $out/share/${pname}
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications
cp -a ${appimageContents}/usr/share/icons $out/share/
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
description = "Modern desktop RSS reader built with Electron, React, and Fluent UI";
homepage = "https://hyliu.me/fluent-reader";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zendo ];
};
}

4
pkgs/applications/science/computer-architecture/qtrvsim/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "QtRVSim";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "cvut";
repo = "qtrvsim";
rev = "refs/tags/v${version}";
sha256 = "BV/nHRvimPaBtY1nfK1PZ2yJ9xWZpNlwiTRfI/9KQec=";
sha256 = "U9jqFdksD1D9+mFoyj57eHCPi8raWKpf6iB+mRXMG8o=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ];

2
pkgs/applications/science/math/qalculate-qt/default.nix
View file

@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ _4825764518 ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" ];
platforms = platforms.linux;
};
}

4
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fast-export";
version = "220921";
version = "221024";
src = fetchFromGitHub {
owner = "frej";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8tAh17Cp1L0kyV5+HoFnh9mINCBNCNBv1gqsMd6U3FQ=";
sha256 = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/version-management/git-and-tools/git-codereview/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "git-codereview";
version = "1.0.3";
version = "1.2.0";
src = fetchFromGitHub {
owner = "golang";
repo = "review";
rev = "v${version}";
sha256 = "sha256-Hyo2UWGlxxeSz3E73DeA0VoOnBJ1VedvpshnATJGbFo=";
sha256 = "sha256-vh2XFzvGEMutlaHKNhpuYdlnNl49zoNPkLYNUA1lWwc=";
};
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
vendorSha256 = null;
ldflags = [ "-s" "-w" ];

4
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View file

@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
pname = "git-cola";
version = "4.0.3";
version = "4.0.4";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "refs/tags/v${version}";
hash = "sha256-w3SbuquHuWTYg1N3kcix4S5vrsmclVSrHf6uv8CYU6w=";
hash = "sha256-++cpzspN7REp9dOcsostcaJPnFHUW624hlgngQWjQCs=";
};
buildInputs = [ git gettext ];

20
pkgs/development/compilers/hip/default.nix
View file

@ -28,14 +28,14 @@
}:
let
hip = stdenv.mkDerivation rec {
hip = stdenv.mkDerivation (finalAttrs: {
pname = "hip";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "HIP";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE=";
};
@ -103,19 +103,19 @@ let
description = "C++ Heterogeneous-Compute Interface for Portability";
homepage = "https://github.com/ROCm-Developer-Tools/HIP";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
};
};
});
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "hip";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "hipamd";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4=";
};
@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
description = "C++ Heterogeneous-Compute Interface for Portability";
homepage = "https://github.com/ROCm-Developer-Tools/hipamd";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
};
}
})

2
pkgs/development/compilers/llvm/rocm/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }:
let
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "llvm-project";

6
pkgs/development/compilers/llvm/rocm/llvm.nix
View file

@ -24,7 +24,7 @@ let
if stdenv.isx86_64 then "X86"
else if stdenv.isAarch64 then "AArch64"
else throw "Unsupported ROCm LLVM platform";
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
inherit src version;
pname = "rocm-llvm";
@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
description = "ROCm fork of the LLVM compiler infrastructure";
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
license = with licenses; [ ncsa ];
maintainers = with maintainers; [ acowley lovesegfault Flakebi ];
maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
};
}
})

2
pkgs/development/interpreters/erlang/generic-builder.nix
View file

@ -128,6 +128,8 @@ stdenv.mkDerivation ({
++ optional wxSupport "--enable-wx"
++ optional systemdSupport "--enable-systemd"
++ optional stdenv.isDarwin "--enable-darwin-64bit"
# make[3]: *** [yecc.beam] Segmentation fault: 11
++ optional (stdenv.isDarwin && stdenv.isx86_64) "--disable-jit"
++ configureFlags;
# install-docs will generate and install manpages and html docs

22
pkgs/development/libraries/clang-ocl/default.nix
View file

@ -1,21 +1,22 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-device-libs
, clang
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "clang-ocl";
rocmVersion = "5.3.1";
version = rocmVersion;
rocmVersion = "5.3.3";
version = finalAttrs.rocmVersion;
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "clang-ocl";
rev = "rocm-${rocmVersion}";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0=";
};
@ -34,11 +35,18 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_COMPILER=clang++"
];
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
rocmVersion="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version clang-ocl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "OpenCL compilation with clang compiler";
homepage = "https://github.com/RadeonOpenCompute/clang-ocl";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != clang.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != clang.version;
};
}
})

14
pkgs/development/libraries/composable_kernel/default.nix
View file

@ -18,9 +18,9 @@ assert buildTests -> gtest != null;
# Try removing this next update
assert buildTests == false;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "composable_kernel";
version = "unstable-2022-11-02";
version = "unstable-2022-11-19";
outputs = [
"out"
@ -30,11 +30,13 @@ stdenv.mkDerivation rec {
"example"
];
# There is now a release, but it's cpu-only it seems to be for a very specific purpose
# Thus, we're sticking with the develop branch for now...
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "composable_kernel";
rev = "79aa3fb1793c265c59d392e916baa851a55521c8";
hash = "sha256-vIfMdvRYCTqrjMGSb7gQfodzLw2wf3tGoCAa5jtfbvw=";
rev = "43a889b72e3faabf04c16ff410d387ce28486c3e";
hash = "sha256-DDRrWKec/RcOhW3CrN0gl9NZsp0Bjnja7HAiTcEh7qg=";
};
nativeBuildInputs = [
@ -86,6 +88,6 @@ stdenv.mkDerivation rec {
description = "Performance portable programming model for machine learning tensor operators";
homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
maintainers = teams.rocm.members;
};
}
})

26
pkgs/development/libraries/hipcub/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-runtime
@ -18,10 +19,11 @@ assert buildTests -> gtest != null;
assert buildBenchmarks -> gbenchmark != null;
# CUB can also be used as a backend instead of rocPRIM.
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "hipcub";
rocmVersion = "5.3.1";
version = "2.12.0-${rocmVersion}";
repoVersion = "2.12.0";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
outputs = [
"out"
@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "hipCUB";
rev = "rocm-${rocmVersion}";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g=";
};
@ -79,11 +81,21 @@ stdenv.mkDerivation rec {
rmdir $out/bin
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version hipcub "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version hipcub "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "Thin wrapper library on top of rocPRIM or CUB";
homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

26
pkgs/development/libraries/hipsparse/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-runtime
@ -25,10 +26,11 @@ let
mirror1 = "https://sparse.tamu.edu/MM";
mirror2 = "https://www.cise.ufl.edu/research/sparse/MM";
};
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
pname = "hipsparse";
rocmVersion = "5.3.1";
version = "2.3.1-${rocmVersion}";
repoVersion = "2.3.1";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
outputs = [
"out"
@ -39,7 +41,7 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "hipSPARSE";
rev = "rocm-${rocmVersion}";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c=";
};
@ -122,11 +124,21 @@ in stdenv.mkDerivation rec {
rmdir $out/bin
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipSPARSE/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version hipsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version hipsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "ROCm SPARSE marshalling library";
homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

2
pkgs/development/libraries/libp11/default.nix
View file

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru = { inherit openssl; };
meta = with lib; {
description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
homepage = "https://github.com/OpenSC/libp11";

26
pkgs/development/libraries/miopengemm/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-opencl-runtime
@ -35,10 +36,10 @@ let
varwidth
titlesec;
});
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
pname = "miopengemm";
rocmVersion = "5.3.1";
version = rocmVersion;
rocmVersion = "5.3.3";
version = finalAttrs.rocmVersion;
outputs = [
"out"
@ -53,7 +54,7 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "MIOpenGEMM";
rev = "rocm-${rocmVersion}";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc=";
};
@ -106,11 +107,11 @@ in stdenv.mkDerivation rec {
postInstall = lib.optionalString buildTests ''
mkdir -p $test/bin
find tests -executable -type f -exec mv {} $test/bin \;
patchelf --set-rpath ${lib.makeLibraryPath buildInputs}:$out/lib $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 buildInputs}:$out/lib $benchmark/bin/*
patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/*
'';
postFixup = lib.optionalString buildDocs ''
@ -119,11 +120,18 @@ in stdenv.mkDerivation rec {
mv ../doc/pdf/miopengemm.pdf $docs/share/doc/miopengemm
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpenGEMM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version miopengemm "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "OpenCL general matrix multiplication API for ROCm";
homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != clang.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != clang.version;
};
}
})

26
pkgs/development/libraries/rccl/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-runtime
@ -15,10 +16,11 @@
assert buildTests -> chrpath != null;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rccl";
rocmVersion = "5.3.1";
version = "2.12.10-${rocmVersion}";
repoVersion = "2.12.10";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
outputs = [
"out"
@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rccl";
rev = "rocm-${rocmVersion}";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk=";
};
@ -74,11 +76,21 @@ stdenv.mkDerivation rec {
rmdir $out/bin
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rccl/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rccl "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rccl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "ROCm communication collectives library";
homepage = "https://github.com/ROCmSoftwarePlatform/rccl";
license = with licenses; [ bsd2 bsd3 ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

28
pkgs/development/libraries/rocblas/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, fetchpatch
, cmake
, rocm-cmake
@ -40,16 +41,17 @@ assert buildTests -> gfortran != null;
assert buildTests == false;
assert buildBenchmarks == false;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocblas";
rocmVersion = "5.3.1";
version = "2.45.0-${rocmVersion}";
repoVersion = "2.45.0";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocBLAS";
rev = "rocm-${rocmVersion}";
hash = "sha256-GeeICEI1dNE6D+nUUlBtUncLkPowAa5n+bsy160EtaU=";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo=";
};
# We currently need this patch due to faulty toolchain includes
@ -126,11 +128,21 @@ stdenv.mkDerivation rec {
--replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" ""
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocBLAS/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocblas "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocblas "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "BLAS implementation for ROCm platform";
homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

12
pkgs/development/libraries/rocclr/default.nix
View file

@ -5,14 +5,14 @@
, rocm-comgr
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocclr";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "ROCclr";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-dmL9krI/gHGQdOZ53+bQ7WjKcmJ+fZZP0lzF8ITLT4E=";
};
@ -46,17 +46,17 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocclr "$version"
update-source-version rocclr "$version" --ignore-same-hash
'';
meta = with lib; {
description = "Source package of the Radeon Open Compute common language runtime";
homepage = "https://github.com/ROCm-Developer-Tools/ROCclr";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
# rocclr seems to have some AArch64 ifdefs, but does not seem
# to be supported yet by the build infrastructure. Recheck in
# the future.
platforms = [ "x86_64-linux" ];
};
}
})

26
pkgs/development/libraries/rocfft/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-runtime
@ -24,10 +25,11 @@ assert buildBenchmarks -> fftwFloat != null;
assert (buildTests || buildBenchmarks) -> boost != null;
assert (buildTests || buildBenchmarks) -> llvmPackages != null;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocfft";
rocmVersion = "5.3.1";
version = "1.0.18-${rocmVersion}";
repoVersion = "1.0.18";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
outputs = [
"out"
@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocFFT";
rev = "rocm-${rocmVersion}";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM=";
};
@ -104,12 +106,22 @@ stdenv.mkDerivation rec {
mv $out/rocfft_rtc_helper $out/bin
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocFFT/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocfft "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocfft "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "FFT implementation for ROCm ";
homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
hydraPlatforms = [ ]; # rocFFT produces an extremely large output
};
}
})

12
pkgs/development/libraries/rocm-comgr/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-comgr";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-CompilerSupport";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg=";
};
@ -31,14 +31,14 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-comgr "$version"
update-source-version rocm-comgr "$version" --ignore-same-hash
'';
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";
license = licenses.ncsa;
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
};
}
})

12
pkgs/development/libraries/rocm-device-libs/default.nix
View file

@ -6,14 +6,14 @@
, llvm
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-device-libs";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-Device-Libs";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU=";
};
@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-device-libs "$version"
update-source-version rocm-device-libs "$version" --ignore-same-hash
'';
meta = with lib; {
description = "Set of AMD-specific device-side language runtime libraries";
homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs";
license = licenses.ncsa;
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
};
}
})

14
pkgs/development/libraries/rocm-opencl-runtime/default.nix
View file

@ -20,14 +20,14 @@
, rocm-thunk
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-opencl-runtime";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-OpenCL-Runtime";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8=";
};
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DAMD_OPENCL_PATH=${src}"
"-DAMD_OPENCL_PATH=${finalAttrs.src}"
"-DROCCLR_PATH=${rocclr}"
"-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl"
];
@ -72,14 +72,14 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocm-opencl-runtime "$version"
update-source-version rocm-opencl-runtime "$version" --ignore-same-hash
'';
meta = with lib; {
description = "OpenCL runtime for AMD GPUs, part of the ROCm stack";
homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ acowley lovesegfault Flakebi ];
maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
};
}
})

12
pkgs/development/libraries/rocm-runtime/default.nix
View file

@ -13,14 +13,14 @@
, rocm-device-libs
, rocm-thunk }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-runtime";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCR-Runtime";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI=";
};
@ -52,13 +52,13 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-runtime "$version"
update-source-version rocm-runtime "$version" --ignore-same-hash
'';
meta = with lib; {
description = "Platform runtime for ROCm";
homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
license = with licenses; [ ncsa ];
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
};
}
})

12
pkgs/development/libraries/rocm-thunk/default.nix
View file

@ -7,14 +7,14 @@
, numactl
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-thunk";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCT-Thunk-Interface";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k=";
};
@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocm-thunk "$version"
update-source-version rocm-thunk "$version" --ignore-same-hash
'';
meta = with lib; {
description = "Radeon open compute thunk interface";
homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface";
license = with licenses; [ bsd2 mit ];
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
};
}
})

23
pkgs/development/libraries/rocmlir/default.nix
View file

@ -1,21 +1,21 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, hip
, python3
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocmlir";
rocmVersion = "5.3.1";
# For some reason they didn't add a tag for 5.3.1, should be compatible, change to rocmVersion later
version = "5.3.0";
rocmVersion = "5.3.3";
version = finalAttrs.rocmVersion;
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocMLIR";
rev = "rocm-${version}"; # change to rocmVersion later
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ=";
};
@ -32,11 +32,18 @@ stdenv.mkDerivation rec {
"-DBUILD_FAT_LIBMLIRMIOPEN=ON"
];
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocMLIR/tags?per_page=2" | jq '.[1].name | split("-") | .[1]' --raw-output)"
update-source-version rocmlir "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "MLIR-based convolution and GEMM kernel generator";
homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

28
pkgs/development/libraries/rocprim/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-runtime
@ -16,10 +17,11 @@
assert buildTests -> gtest != null;
assert buildBenchmarks -> gbenchmark != null;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocprim";
rocmVersion = "5.3.1";
version = "2.11.0-${rocmVersion}";
repoVersion = "2.11.1";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
outputs = [
"out"
@ -32,8 +34,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocPRIM";
rev = "rocm-${rocmVersion}";
hash = "sha256-aapvj9bwwlg7VJfnH1PVR8DulMcJh1xR6B4rPPGU6Q4=";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U=";
};
nativeBuildInputs = [
@ -75,11 +77,21 @@ stdenv.mkDerivation rec {
rmdir $out/bin
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocPRIM/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocprim "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocprim "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "ROCm parallel primitives";
homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

26
pkgs/development/libraries/rocsparse/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-runtime
@ -29,10 +30,11 @@ let
mirror1 = "https://sparse.tamu.edu/MM";
mirror2 = "https://www.cise.ufl.edu/research/sparse/MM";
};
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
pname = "rocsparse";
rocmVersion = "5.3.1";
version = "2.3.2-${rocmVersion}";
repoVersion = "2.3.2";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
outputs = [
"out"
@ -45,7 +47,7 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocSPARSE";
rev = "rocm-${rocmVersion}";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0=";
};
@ -138,11 +140,21 @@ in stdenv.mkDerivation rec {
rmdir $out/bin
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "ROCm SPARSE implementation";
homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

28
pkgs/development/libraries/rocthrust/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, cmake
, rocm-cmake
, rocm-runtime
@ -20,10 +21,11 @@ assert buildTests -> gtest != null;
assert buildTests == false;
assert buildBenchmarks == false;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocthrust";
rocmVersion = "5.3.1";
version = "2.16.0-${rocmVersion}";
repoVersion = "2.16.0";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
# Comment out these outputs until tests/benchmarks are fixed (upstream?)
# outputs = [
@ -37,8 +39,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocThrust";
rev = "rocm-${rocmVersion}";
hash = "sha256-cT0VyEVz86xR6qubAY2ncTxtCRTwXrNTWcFyf3mV+y0=";
rev = "rocm-${finalAttrs.rocmVersion}";
hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw=";
};
nativeBuildInputs = [
@ -81,11 +83,21 @@ stdenv.mkDerivation rec {
# rmdir $out/bin
# '';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocThrust/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocthrust "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocthrust "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "ROCm parallel algorithm library";
homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
};
}
})

20
pkgs/development/libraries/tensile/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, writeScript
, buildPythonPackage
, pyyaml
, msgpack
@ -9,14 +10,15 @@
buildPythonPackage rec {
pname = "tensile";
rocmVersion = "5.3.1";
version = "4.34.0-${rocmVersion}";
repoVersion = "4.34.0";
rocmVersion = "5.3.3";
version = "${repoVersion}-${rocmVersion}";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "Tensile";
rev = "rocm-${rocmVersion}";
hash = "sha256-QWt/zzBrZKM8h3MTnbLX4vN3p6cCQvo67U1C2yqAQxw=";
hash = "sha256-6A7REYdIw/ZmjrJh7B+wCXZMleh4bf04TFpRItPtctA=";
};
buildInputs = [
@ -25,10 +27,20 @@ buildPythonPackage rec {
pandas
];
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/Tensile/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version tensile "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version tensile "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
'';
meta = with lib; {
description = "GEMMs and tensor contractions";
homepage = "https://github.com/ROCmSoftwarePlatform/Tensile";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
maintainers = teams.rocm.members;
};
}

2
pkgs/development/tools/build-managers/msbuild/default.nix
View file

@ -2,7 +2,7 @@
let
dotnet-sdk = dotnetCorePackages.sdk_5_0;
dotnet-sdk = dotnetCorePackages.sdk_6_0;
xplat = fetchurl {
url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip";

12
pkgs/development/tools/build-managers/rocm-cmake/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, writeScript, cmake }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-cmake";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm-cmake";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc=";
};
@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocm-cmake "$version"
update-source-version rocm-cmake "$version" --ignore-same-hash
'';
meta = with lib; {
description = "CMake modules for common build tasks for the ROCm stack";
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
license = licenses.mit;
maintainers = with maintainers; [ Flakebi ];
maintainers = teams.rocm.members;
platforms = platforms.unix;
};
}
})

6
pkgs/development/tools/goresym/default.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "goresym";
version = "1.5";
version = "1.8";
src = fetchFromGitHub {
owner = "mandiant";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j548FzbxrtJz2N5y9ItO6F+52vQ+2RVCFPUW1cqeJUA=";
sha256 = "sha256-GFr3ppZJsGwi3dyrlpIjYrdJ2QYp2i01SX+EKEAmDE8=";
};
subPackages = [ "." ];
vendorSha256 = "sha256-dnQ/tP4RS6WkACobfW7jTTJSHbLrdlZDy1fmO65743Q=";
vendorSha256 = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY=";
doCheck = true;

12
pkgs/development/tools/rocminfo/default.nix
View file

@ -6,13 +6,13 @@
# Polaris) such that no system call is needed for downstream
# compilers to determine the desired target.
, defaultTargets ? []}:
stdenv.mkDerivation rec {
version = "5.3.1";
stdenv.mkDerivation (finalAttrs: {
version = "5.3.3";
pname = "rocminfo";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocminfo";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U=";
};
@ -41,15 +41,15 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocminfo "$version"
update-source-version rocminfo "$version" --ignore-same-hash
'';
meta = with lib; {
description = "ROCm Application for Reporting System Info";
homepage = "https://github.com/RadeonOpenCompute/rocminfo";
license = licenses.ncsa;
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = platforms.linux;
broken = stdenv.isAarch64;
};
}
})

51
pkgs/development/tools/rust/cargo-cyclonedx/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, Security
, SystemConfiguration
, CoreFoundation
, curl
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-cyclonedx";
version = "0.3.7";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-rust-cargo";
rev = "${pname}-${version}";
hash = "sha256-xr3YNjQp+XhIWIqJ1rPUyM9mbtWGExlFEj28/SB8vfE=";
};
cargoHash = "sha256-NsBY+wb4IAlKOMh5BMvT734z//Wp/s0zimm04v8pqyc=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
Security
SystemConfiguration
CoreFoundation
curl
];
meta = with lib; {
description = "Creates CycloneDX Software Bill of Materials (SBOM) from Rust (Cargo) projects";
longDescription = ''
The CycloneDX module for Rust (Cargo) creates a valid CycloneDX Software
Bill-of-Material (SBOM) containing an aggregate of all project
dependencies. CycloneDX is a lightweight SBOM specification that is
easily created, human and machine readable, and simple to parse.
'';
homepage = "https://github.com/CycloneDX/cyclonedx-rust-cargo";
license = licenses.asl20;
maintainers = with maintainers; [ nikstur ];
};
}

6
pkgs/development/tools/rust/cargo-depgraph/default.nix
View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-depgraph";
version = "1.3.0";
version = "1.4.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-mlbS9EI/ltxnWfpci9hK9QwYpA/nII+wc2IRSHrmNGI=";
sha256 = "sha256-D8g6xsmYvN1IWUFpkpo4/OKT70WqCCkRqcGFBOE8uXA=";
};
cargoSha256 = "sha256-9CKFZmkFiip6iQVkBmy/XoMEoyMhlKNRyI8oDHaAILc=";
cargoSha256 = "sha256-qpd/uvnQzrPc+dbBloxyYNCEjaRWlTicgNC8Z9Z0t88=";
meta = with lib; {
description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz";

12
pkgs/games/starsector/default.nix
View file

@ -41,20 +41,20 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/bin $out/share/starsector
rm -r jre_linux # remove bundled jre7
rm starfarer.api.zip
cp -r ./* $out
cp -r ./* $out/share/starsector
mkdir -p $out/share/icons/hicolor/64x64/apps
ln -s $out/graphics/ui/s_icon64.png $out/share/icons/hicolor/64x64/apps/starsector.png
wrapProgram $out/starsector.sh \
wrapProgram $out/share/starsector/starsector.sh \
--prefix PATH : ${lib.makeBinPath [ openjdk ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \
--run 'mkdir -p ''${XDG_DATA_HOME:-~/.local/share}/starsector' \
--chdir "$out"
ln -s $out/starsector.sh $out/bin/starsector
--chdir "$out/share/starsector"
ln -s $out/share/starsector/starsector.sh $out/bin/starsector
runHook postInstall
'';
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace starsector.sh \
--replace "./jre_linux/bin/java" "${openjdk}/bin/java" \
--replace "./native/linux" "$out/native/linux" \
--replace "./native/linux" "$out/share/starsector/native/linux" \
--replace "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \
--replace "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC"
'';

6
pkgs/os-specific/linux/libzbc/default.nix
View file

@ -1,6 +1,5 @@
{ lib
, stdenv
, autoconf-archive
, autoreconfHook
, fetchFromGitHub
, gtk3
@ -11,17 +10,16 @@
stdenv.mkDerivation rec {
pname = "libzbc";
version = "5.12.0";
version = "5.13.0";
src = fetchFromGitHub {
owner = "westerndigitalcorporation";
repo = "libzbc";
rev = "v${version}";
sha256 = "qI09dkMCwMym3j1ELrFDNbNB5hW/CzwmFmZhUNDXsfI=";
sha256 = "6xkA96bgQ2Ik1vEwkw7hwjMbjMSlopzv5ziTh60Mjx0=";
};
nativeBuildInputs = [
autoconf-archive # this can be removed with the next release
autoreconfHook
libtool
] ++ lib.optionals guiSupport [ pkg-config ];

4
pkgs/os-specific/linux/pam_p11/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam, libintl }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl }:
stdenv.mkDerivation rec {
pname = "pam_p11";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ pam openssl libp11 ]
buildInputs = [ pam libp11.passthru.openssl libp11 ]
++ lib.optionals stdenv.isDarwin [ libintl ];
meta = with lib; {

8
pkgs/servers/monitoring/prometheus/keylight-exporter.nix
View file

@ -2,18 +2,16 @@
buildGoModule rec {
pname = "keylight-exporter";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "mdlayher";
repo = "keylight_exporter";
rev = "v${version}";
sha256 = "141npawcnxj3sz2xqsnyf06r4x1azk3g55941i8gjr7pwcla34r7";
sha256 = "sha256-yI1mmEb5SP2lbP37CpPxYITJL/nvd/mIwxB0RIQRe4I=";
};
vendorSha256 = "0w065ls8dp687jmps4xdffcarss1wyls14dngr43g58xjw6519gb";
doCheck = false;
vendorSha256 = "sha256-0QSsGgokErRNIHQIjZQn5t1dvc306uZck8uLSgjcrck=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) keylight; };

4
pkgs/tools/misc/esphome/dashboard.nix
View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20221020.0";
version = "20221109.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-K65eeiGchdzxx5MIR+QhUd0PzQTQBwNX4P8dqTOM1MY=";
hash = "sha256-9LL/tO40Mr4PGojj50m4UIPoqImnDRNoVPqr8xXs6KU=";
};
# no tests

4
pkgs/tools/misc/esphome/default.nix
View file

@ -15,14 +15,14 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
version = "2022.10.2";
version = "2022.11.3";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-f6t5Q9jK6ovcIFVw1hYyhtiy/iDaq7cmfn5ywAeEaT8=";
hash = "sha256-Qu8QjItfFzB5uCdvmyYrsq9FRmI0S7/xH2LX1dKM28c=";
};
postPatch = ''

2
pkgs/tools/security/enpass/default.nix
View file

@ -57,7 +57,7 @@ let
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux"];
maintainers = with maintainers; [ ewok ];
maintainers = with maintainers; [ ewok dritter ];
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/tools/security/rng-tools/default.nix
View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ]
++ lib.optionals withJitterEntropy [ jitterentropy ]
++ lib.optionals withNistBeacon [ curl jansson libxml2 ]
++ lib.optionals withPkcs11 [ libp11 openssl ]
++ lib.optionals withPkcs11 [ libp11 libp11.passthru.openssl ]
++ lib.optionals withRtlsdr [ librtlsdr ];
enableParallelBuilding = true;

4
pkgs/tools/system/collectd/plugins.nix
View file

@ -31,7 +31,7 @@
, perl
, postgresql
, protobufc
, python2
, python3
, rabbitmq-c
, rdkafka
, riemann_c_client
@ -102,7 +102,7 @@ let
pinba.buildInputs = [ protobufc ];
ping.buildInputs = [ liboping ];
postgresql.buildInputs = [ postgresql ];
python.buildInputs = [ python2 ];
python.buildInputs = [ python3 ];
redis.buildInputs = [ hiredis ];
rrdcached.buildInputs = [ rrdtool libxml2 ];
rrdtool.buildInputs = [ rrdtool libxml2 ];

12
pkgs/tools/system/rocm-smi/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, writeScript, cmake, wrapPython }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-smi";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm_smi_lib";
rev = "rocm-${version}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ=";
};
@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-smi "$version"
update-source-version rocm-smi "$version" --ignore-same-hash
'';
meta = with lib; {
description = "System management interface for AMD GPUs supported by ROCm";
homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib";
license = with licenses; [ mit ];
maintainers = with maintainers; [ lovesegfault Flakebi ];
maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members;
platforms = [ "x86_64-linux" ];
};
}
})

15
pkgs/top-level/all-packages.nix
View file

@ -6643,6 +6643,8 @@ with pkgs;
fluent-bit = callPackage ../tools/misc/fluent-bit { };
fluent-reader = callPackage ../applications/networking/feedreaders/fluent-reader { };
flux = callPackage ../development/compilers/flux { };
fido2luks = callPackage ../tools/security/fido2luks {};
@ -15058,6 +15060,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { };
cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
};
cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -20799,7 +20804,9 @@ with pkgs;
libow = callPackage ../development/libraries/libow { };
libp11 = callPackage ../development/libraries/libp11 { };
libp11 = callPackage ../development/libraries/libp11 {
openssl = openssl_1_1;
};
libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
@ -25647,9 +25654,7 @@ with pkgs;
pam_mysql = callPackage ../os-specific/linux/pam_mysql { };
pam_p11 = callPackage ../os-specific/linux/pam_p11 {
openssl = openssl_1_1;
};
pam_p11 = callPackage ../os-specific/linux/pam_p11 { };
pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
@ -36785,6 +36790,8 @@ with pkgs;
muse = libsForQt5.callPackage ../applications/audio/muse { };
museeks = callPackage ../applications/audio/museeks { };
musly = callPackage ../applications/audio/musly { };
mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };

12
pkgs/top-level/beam-packages.nix
View file

@ -1,7 +1,7 @@
{ beam
, callPackage
, openssl_1_1
, wxGTK30
, wxGTK32
, buildPackages
, stdenv
, wxSupport ? true
@ -31,7 +31,7 @@ in
# R25
erlangR25 = self.beamLib.callErlang ../development/interpreters/erlang/R25.nix {
wxGTK = wxGTK30;
wxGTK = wxGTK32;
parallelBuild = true;
autoconf = buildPackages.autoconf269;
inherit wxSupport systemdSupport;
@ -45,7 +45,7 @@ in
# R24
erlangR24 = self.beamLib.callErlang ../development/interpreters/erlang/R24.nix {
wxGTK = wxGTK30;
wxGTK = wxGTK32;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true;
autoconf = buildPackages.autoconf269;
@ -61,7 +61,7 @@ in
# R23
erlangR23 = self.beamLib.callErlang ../development/interpreters/erlang/R23.nix {
openssl = openssl_1_1;
wxGTK = wxGTK30;
wxGTK = wxGTK32;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true;
autoconf = buildPackages.autoconf269;
@ -77,7 +77,7 @@ in
# R22
erlangR22 = self.beamLib.callErlang ../development/interpreters/erlang/R22.nix {
openssl = openssl_1_1;
wxGTK = wxGTK30;
wxGTK = wxGTK32;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true;
autoconf = buildPackages.autoconf269;
@ -93,7 +93,7 @@ in
# R21
erlangR21 = self.beamLib.callErlang ../development/interpreters/erlang/R21.nix {
openssl = openssl_1_1;
wxGTK = wxGTK30;
wxGTK = wxGTK32;
autoconf = buildPackages.autoconf269;
inherit wxSupport systemdSupport;
};