Merge branch 'staging-next' into staging
This commit is contained in:
Dmitry Kalinkin
commit
9173beb67d
58 changed files with 871 additions and 108 deletions
|
|
@ -5099,6 +5099,12 @@
|
|||
githubId = 2971615;
|
||||
name = "Marius Bergmann";
|
||||
};
|
||||
mcbeth = {
|
||||
email = "mcbeth@broggs.org";
|
||||
github = "mcbeth";
|
||||
githubId = 683809;
|
||||
name = "Jeffrey Brent McBeth";
|
||||
};
|
||||
mcmtroffaes = {
|
||||
email = "matthias.troffaes@gmail.com";
|
||||
github = "mcmtroffaes";
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ let
|
|||
patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
|
||||
'';
|
||||
|
||||
buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
|
||||
buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
|
||||
|
||||
buildPhase = ''
|
||||
ant furniture textures help
|
||||
|
|
@ -53,7 +53,7 @@ let
|
|||
|
||||
makeWrapper ${jre}/bin/java $out/bin/$exec \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"
|
||||
--add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ let
|
|||
# "ffmpeg" # https://crbug.com/731766
|
||||
# "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
|
||||
# so we can't build with one from system and other from source
|
||||
] ++ optional (versionRange "0" "84") "yasm";
|
||||
];
|
||||
|
||||
opusWithCustomModes = libopus.override {
|
||||
withCustomModes = true;
|
||||
|
|
@ -94,9 +94,10 @@ let
|
|||
xdg_utils minizip libwebp
|
||||
libusb1 re2 zlib
|
||||
ffmpeg_3 libxslt libxml2
|
||||
nasm
|
||||
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
|
||||
# so we can't build with one from system and other from source
|
||||
] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]);
|
||||
];
|
||||
|
||||
# build paths and release info
|
||||
packageName = extraAttrs.packageName or extraAttrs.name;
|
||||
|
|
@ -123,9 +124,9 @@ let
|
|||
nativeBuildInputs = [
|
||||
ninja which python2Packages.python perl pkgconfig
|
||||
python2Packages.ply python2Packages.jinja2 nodejs
|
||||
gnutar
|
||||
] ++ optional (versionAtLeast version "83") python2Packages.setuptools
|
||||
++ optional (versionAtLeast version "84") (xorg.xcbproto.override { python = python2Packages.python; });
|
||||
gnutar python2Packages.setuptools
|
||||
(xorg.xcbproto.override { python = python2Packages.python; })
|
||||
];
|
||||
|
||||
buildInputs = defaultDependencies ++ [
|
||||
nspr nss systemd
|
||||
|
|
@ -181,6 +182,11 @@ let
|
|||
'/usr/share/locale/' \
|
||||
'${glibc}/share/locale/'
|
||||
|
||||
substituteInPlace ui/gfx/x/BUILD.gn \
|
||||
--replace \
|
||||
'/usr/share/xcb' \
|
||||
'${xorg.xcbproto}/share/xcb/'
|
||||
|
||||
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
|
||||
chrome/browser/shell_integration_linux.cc
|
||||
|
||||
|
|
@ -226,16 +232,9 @@ let
|
|||
ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang
|
||||
ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++
|
||||
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
|
||||
'' + optionalString (versionAtLeast version "84") ''
|
||||
substituteInPlace ui/gfx/x/BUILD.gn \
|
||||
--replace \
|
||||
'/usr/share/xcb' \
|
||||
'${xorg.xcbproto}/share/xcb/'
|
||||
'';
|
||||
|
||||
gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") {
|
||||
linux_use_bundled_binutils = false;
|
||||
} // {
|
||||
gnFlags = mkGnFlags ({
|
||||
use_lld = false;
|
||||
use_gold = true;
|
||||
gold_path = "${stdenv.cc}/bin";
|
||||
|
|
|
|||
|
|
@ -31,15 +31,6 @@
|
|||
// TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
|
||||
// |output_mode_| as well.
|
||||
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
|
||||
@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
|
||||
// depends on the bitstream and sometimes it's not enough to cover the amount
|
||||
// of frames needed by the client pipeline (see b/133733739).
|
||||
// TODO(crbug.com/911754): Enable for VP9 Profile 2.
|
||||
- if (IsGeminiLakeOrLater() &&
|
||||
+ if (false && IsGeminiLakeOrLater() &&
|
||||
(profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) {
|
||||
// Add one to the reference frames for the one being currently egressed, and
|
||||
// an extra allocation for both |client_| and |decoder_|, see
|
||||
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
|
||||
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
|
||||
@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "1s49qxg0gfmhm1lf5big6hprral21dbzjx0f1cp3xfvag9y61i7h";
|
||||
sha256bin64 = "1sjvi3qmpwpr51442324a853k6s0k59k4809k8j5sjv7h6arw0sm";
|
||||
version = "84.0.4147.56";
|
||||
sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp";
|
||||
sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0";
|
||||
version = "84.0.4147.89";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "1gxa0jg7xff87z7wvllp84a3ii1ypgy4vfzgxs4k7kzg5x0412vi";
|
||||
sha256bin64 = "0swmn37rmvjvvdcrd002qg1wcvna06y14s3kx34bfr4zxhqk3lby";
|
||||
version = "85.0.4173.0";
|
||||
sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a";
|
||||
sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q";
|
||||
version = "85.0.4183.15";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "1hravbi1lazmab2mih465alfzji1kzy38zya1visbwz9zs6pw35v";
|
||||
sha256bin64 = "1ggyv2b50sclnqph0r40lb8p9h3pq9aq4fj1wdszhwc4rb0cj746";
|
||||
version = "83.0.4103.116";
|
||||
sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp";
|
||||
sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz";
|
||||
version = "84.0.4147.89";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,6 +105,12 @@ in stdenv.mkDerivation {
|
|||
cp -a opt/* $out/share
|
||||
cp -a usr/share/* $out/share
|
||||
|
||||
# To fix --use-gl=egl:
|
||||
test -e $out/share/google/$appname/libEGL.so
|
||||
ln -s libEGL.so $out/share/google/$appname/libEGL.so.1
|
||||
test -e $out/share/google/$appname/libGLESv2.so
|
||||
ln -s libGLESv2.so $out/share/google/$appname/libGLESv2.so.2
|
||||
|
||||
substituteInPlace $out/share/applications/google-$appname.desktop \
|
||||
--replace /usr/bin/google-chrome-$dist $exe
|
||||
substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ bitlbee glib ];
|
||||
buildInputs = [ bitlbee ];
|
||||
|
||||
preConfigure = ''
|
||||
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
|
||||
|
||||
buildInputs = [ bitlbee glib json-glib ];
|
||||
buildInputs = [ bitlbee json-glib ];
|
||||
|
||||
preConfigure = ''
|
||||
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
|
||||
|
|
|
|||
|
|
@ -3,21 +3,20 @@
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitlbee-mastodon";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://alexschroeder.ch/cgit/bitlbee-mastodon";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k9j4403w6x93f4ls3xj8nrabz8ynjby6sigqdmhb7cqv26l987p";
|
||||
sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ bitlbee glib ];
|
||||
buildInputs = [ bitlbee ];
|
||||
|
||||
preConfigure = ''
|
||||
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
|
||||
export BITLBEE_DATADIR=$out/share/bitlbee
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ bitlbee autoconf automake libtool glib libgcrypt ];
|
||||
buildInputs = [ bitlbee autoconf automake libtool libgcrypt ];
|
||||
|
||||
preConfigure = ''
|
||||
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
|
||||
|
|
|
|||
|
|
@ -14,10 +14,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
|
||||
|
||||
buildInputs = [ gnutls glib libotr python ]
|
||||
buildInputs = [ gnutls libotr python ]
|
||||
++ optional enableLibPurple pidgin
|
||||
++ optional enablePam pam;
|
||||
|
||||
propagatedBuildInputs = [ glib ];
|
||||
|
||||
configureFlags = [
|
||||
"--otr=1"
|
||||
"--ssl=gnutls"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "1.34.3"; # Please backport all updates to the stable channel.
|
||||
version = "1.34.4"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1723h8fwclv07n5lcsqw3snmfhpigkrj609fayg0aycxgi3321h6";
|
||||
sha256 = "0250ys1lvfl417n8z9w3z6vqflzdlg0sff8l7wbzhv87nnc9kzg9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alpine";
|
||||
version = "2.21";
|
||||
version = "2.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30";
|
||||
sha256 = "0yqzm56lqgg8v66m09vqxjvpclli4pql5xj8zg7mynq0bhhn2fkr";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--with-ssl-include-dir=${openssl.dev}/include/openssl"
|
||||
"--with-passfile=.pine-passfile"
|
||||
"--with-c-client-target=slx"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ let
|
|||
maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
|
||||
};
|
||||
|
||||
version = "0.43.1";
|
||||
version = "0.43.2";
|
||||
|
||||
desktopSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
sha256 = "137gxd0jyvxawjlgwfmkn78z7xkngpfvcnkfhjwfdk8k6asc51w2";
|
||||
sha256 = "0q04brfiwllyxh99k8rhx6q3kysj9vl67dj2yvl5bkm8lf5x2l2g";
|
||||
};
|
||||
|
||||
serverSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
sha256 = "0cmkw0kqwvrf0i2zgvlpri0cg7rbfzmrhmxp92bz1hwly0bid8z7";
|
||||
sha256 = "1993765gi8c890vf5ljrvfhc1bqmsdy58ksblzz08dwdj44frry5";
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-vm-tools";
|
||||
version = "11.0.5";
|
||||
version = "11.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "open-vm-tools";
|
||||
rev = "stable-${version}";
|
||||
sha256 = "0idh8dqwb1df2di689090k9x1iap35jk3wg8yb1g70byichmscqb";
|
||||
sha256 = "1wyiz8j5b22ajrr1fh9cn55lsgd5g13q0i8wvk2a0yw0vaw1883s";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/open-vm-tools";
|
||||
|
|
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
|
||||
++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
|
||||
|
||||
patches = [
|
||||
./recognize_nixos.patch
|
||||
patches = [
|
||||
./recognize_nixos.patch
|
||||
./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438
|
||||
];
|
||||
|
||||
|
|
@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am
|
||||
sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
|
||||
sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am
|
||||
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
|
||||
sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am
|
||||
sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "agave";
|
||||
version = "15";
|
||||
version = "16";
|
||||
in fetchurl {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
|
||||
|
|
@ -13,7 +13,7 @@ in fetchurl {
|
|||
install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
|
||||
'';
|
||||
|
||||
sha256 = "0xphr465qnwf1yhin3hml1nn9ypjk3n0i4bs38glx5b5swrhlmhk";
|
||||
sha256 = "108jvcijnx06v1jzhnb28ql9nvmwqd83309834wcd4aii6bgf9ka";
|
||||
|
||||
meta = with lib; {
|
||||
description = "truetype monospaced typeface designed for X environments";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
# To select only certain fonts, put a list of strings to `fonts`: every key in
|
||||
# ./shas.nix is an optional font
|
||||
, fonts ? []
|
||||
# Whether to enable Windows font variants, their internal font name is limited
|
||||
# to 31 characters
|
||||
, enableWindowsFonts ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -50,6 +53,10 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
find -name \*.otf -exec mkdir -p $out/share/fonts/opentype/NerdFonts \; -exec mv {} $out/share/fonts/opentype/NerdFonts \;
|
||||
find -name \*.ttf -exec mkdir -p $out/share/fonts/truetype/NerdFonts \; -exec mv {} $out/share/fonts/truetype/NerdFonts \;
|
||||
${lib.optionalString (! enableWindowsFonts) ''
|
||||
rm -rfv $out/share/fonts/opentype/NerdFonts/*Windows\ Compatible.*
|
||||
rm -rfv $out/share/fonts/truetype/NerdFonts/*Windows\ Compatible.*
|
||||
''}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
67
pkgs/development/compilers/llvm/rocm/clang.nix
Normal file
67
pkgs/development/compilers/llvm/rocm/clang.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python
|
||||
, llvm
|
||||
, clang-tools-extra_src ? null
|
||||
, rocm-runtime
|
||||
, lld
|
||||
|
||||
, version
|
||||
, src
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version src;
|
||||
|
||||
pname = "clang";
|
||||
|
||||
nativeBuildInputs = [ cmake python ];
|
||||
|
||||
buildInputs = [ llvm rocm-runtime ];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLLVM_CMAKE_PATH=${llvm}/lib/cmake/llvm"
|
||||
"-DLLVM_MAIN_SRC_DIR=${llvm.src}"
|
||||
"-DCLANG_SOURCE_DIR=${src}"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
];
|
||||
|
||||
VCSVersion = ''
|
||||
#undef LLVM_REVISION
|
||||
#undef LLVM_REPOSITORY
|
||||
#undef CLANG_REVISION
|
||||
#undef CLANG_REPOSITORY
|
||||
'';
|
||||
|
||||
postUnpack = stdenv.lib.optionalString (!(isNull clang-tools-extra_src)) ''
|
||||
ln -s ${clang-tools-extra_src} $sourceRoot/tools/extra
|
||||
'';
|
||||
|
||||
# Rather than let cmake extract version information from LLVM or
|
||||
# clang source control repositories, we generate the wanted
|
||||
# `VCSVersion.inc` file ourselves and remove it from the
|
||||
# depencencies of the `clangBasic` target.
|
||||
preConfigure = ''
|
||||
sed 's/ ''${version_inc}//' -i lib/Basic/CMakeLists.txt
|
||||
sed 's|sys::path::parent_path(BundlerExecutable)|StringRef("${llvm}/bin")|' -i tools/clang-offload-bundler/ClangOffloadBundler.cpp
|
||||
sed 's|\([[:space:]]*std::string Linker = \)getToolChain().GetProgramPath(getShortName())|\1"${lld}/bin/ld.lld"|' -i lib/Driver/ToolChains/AMDGPU.cpp
|
||||
substituteInPlace lib/Driver/ToolChains/AMDGPU.h --replace ld.lld ${lld}/bin/ld.lld
|
||||
sed 's|configure_file(AST/gen_ast_dump_json_test.py ''${LLVM_TOOLS_BINARY_DIR}/gen_ast_dump_json_test.py COPYONLY)||' -i test/CMakeLists.txt
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
mkdir -p lib/Basic
|
||||
echo "$VCSVersion" > lib/Basic/VCSVersion.inc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend";
|
||||
homepage = "https://llvm.org/";
|
||||
license = with licenses; [ ncsa ];
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
41
pkgs/development/compilers/llvm/rocm/default.nix
Normal file
41
pkgs/development/compilers/llvm/rocm/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
|
||||
|
||||
let
|
||||
version = "3.5.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "llvm-project";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "03k2xp8wf4awf1zcjc2hb3kf9bqp567c3s569gp1q3q1zjg6r2ib";
|
||||
};
|
||||
in rec {
|
||||
clang = wrapCCWith rec {
|
||||
cc = clang-unwrapped;
|
||||
extraBuildCommands = ''
|
||||
clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"`
|
||||
rsrc="$out/resource-root"
|
||||
mkdir "$rsrc"
|
||||
ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags
|
||||
echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
|
||||
rm $out/nix-support/add-hardening.sh
|
||||
touch $out/nix-support/add-hardening.sh
|
||||
'';
|
||||
};
|
||||
|
||||
clang-unwrapped = callPackage ./clang.nix {
|
||||
inherit lld llvm version;
|
||||
src = "${src}/clang";
|
||||
};
|
||||
|
||||
lld = callPackage ./lld.nix {
|
||||
inherit llvm version;
|
||||
src = "${src}/lld";
|
||||
};
|
||||
|
||||
llvm = callPackage ./llvm.nix {
|
||||
inherit version;
|
||||
src = "${src}/llvm";
|
||||
};
|
||||
}
|
||||
33
pkgs/development/compilers/llvm/rocm/lld.nix
Normal file
33
pkgs/development/compilers/llvm/rocm/lld.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv
|
||||
, cmake
|
||||
, libxml2
|
||||
, llvm
|
||||
|
||||
, version
|
||||
, src
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version src;
|
||||
|
||||
pname = "lld";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ libxml2 llvm ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput include "$dev"
|
||||
moveToOutput lib "$dev"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "ROCm fork of the LLVM Linker";
|
||||
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
|
||||
license = licenses.ncsa;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
26
pkgs/development/compilers/llvm/rocm/llvm-outputs.patch
Normal file
26
pkgs/development/compilers/llvm/rocm/llvm-outputs.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|
||||
index 94d426b..37f7794 100644
|
||||
--- a/tools/llvm-config/llvm-config.cpp
|
||||
+++ b/tools/llvm-config/llvm-config.cpp
|
||||
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
|
||||
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
||||
}
|
||||
|
||||
+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
|
||||
+ if (!IsInDevelopmentTree) {
|
||||
+ bool WantShared = true;
|
||||
+ for (int i = 1; i < argc; ++i) {
|
||||
+ StringRef Arg = argv[i];
|
||||
+ if (Arg == "--link-shared")
|
||||
+ WantShared = true;
|
||||
+ else if (Arg == "--link-static")
|
||||
+ WantShared = false; // the last one wins
|
||||
+ }
|
||||
+
|
||||
+ if (WantShared)
|
||||
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
|
||||
+ }
|
||||
+
|
||||
/// We only use `shared library` mode in cases where the static library form
|
||||
/// of the components provided are not available; note however that this is
|
||||
/// skipped if we're run from within the build dir. However, once installed,
|
||||
97
pkgs/development/compilers/llvm/rocm/llvm.nix
Normal file
97
pkgs/development/compilers/llvm/rocm/llvm.nix
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python3
|
||||
, libxml2
|
||||
, libffi
|
||||
, libbfd
|
||||
, ncurses
|
||||
, zlib
|
||||
, debugVersion ? false
|
||||
, enableManpages ? false
|
||||
, enableSharedLibraries ? true
|
||||
|
||||
, version
|
||||
, src
|
||||
}:
|
||||
|
||||
let
|
||||
llvmNativeTarget =
|
||||
if stdenv.isx86_64 then "X86"
|
||||
else if stdenv.isAarch64 then "AArch64"
|
||||
else throw "Unsupported ROCm LLVM platform";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit src version;
|
||||
|
||||
pname = "rocm-llvm";
|
||||
|
||||
outputs = [ "out" "python" ]
|
||||
++ stdenv.lib.optional enableSharedLibraries "lib";
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
||||
buildInputs = [ libxml2 libffi ];
|
||||
|
||||
propagatedBuildInputs = [ ncurses zlib ];
|
||||
|
||||
cmakeFlags = with stdenv; [
|
||||
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
|
||||
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
|
||||
"-DLLVM_BUILD_TESTS=OFF"
|
||||
"-DLLVM_ENABLE_FFI=ON"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DLLVM_ENABLE_DUMP=ON"
|
||||
"-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
|
||||
]
|
||||
++
|
||||
stdenv.lib.optional
|
||||
enableSharedLibraries
|
||||
"-DLLVM_LINK_LLVM_DYLIB=ON"
|
||||
++ stdenv.lib.optionals enableManpages [
|
||||
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
|
||||
"-DLLVM_BUILD_DOCS=ON"
|
||||
"-DLLVM_ENABLE_SPHINX=ON"
|
||||
"-DSPHINX_OUTPUT_MAN=ON"
|
||||
"-DSPHINX_OUTPUT_HTML=OFF"
|
||||
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
|
||||
patch -p1 < ./llvm-outputs.patch
|
||||
'';
|
||||
|
||||
# hacky fix: created binaries need to be run before installation
|
||||
preBuild = ''
|
||||
mkdir -p $out/
|
||||
ln -sv $PWD/lib $out
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
rm -fR $out
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput share/opt-viewer "$python"
|
||||
''
|
||||
+ stdenv.lib.optionalString enableSharedLibraries ''
|
||||
moveToOutput "lib/libLLVM-*" "$lib"
|
||||
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
|
||||
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
|
||||
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
|
||||
'';
|
||||
|
||||
passthru.src = src;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "ROCm fork of the LLVM compiler infrastructure";
|
||||
homepage = "https://github.com/RadeonOpenCompute/llvm-project";
|
||||
license = with licenses; [ ncsa ];
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,10 +3,10 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picoLisp";
|
||||
version = "19.12";
|
||||
version = "20.6";
|
||||
src = fetchurl {
|
||||
url = "https://www.software-lab.de/${pname}-${version}.tgz";
|
||||
sha256 = "10np0mhihr47r3201617zccrvzpkhdl1jwvz7zimk8kxpriydq2j";
|
||||
sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2";
|
||||
};
|
||||
buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -42,6 +42,13 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y";
|
||||
stripLen = 1;
|
||||
})
|
||||
|
||||
# fix build for "ZSTD_SOURCE=SYSTEM"
|
||||
(fetchpatch {
|
||||
url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff";
|
||||
sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb";
|
||||
stripLen = 1;
|
||||
})
|
||||
] ++ lib.optionals (!enableShared) [
|
||||
# The shared jemalloc lib is unused and breaks in static mode due to missing -fpic.
|
||||
./jemalloc-disable-shared.patch
|
||||
|
|
@ -89,6 +96,7 @@ in stdenv.mkDerivation rec {
|
|||
"-DARROW_WITH_SNAPPY=ON"
|
||||
"-DARROW_WITH_ZLIB=ON"
|
||||
"-DARROW_WITH_ZSTD=ON"
|
||||
"-DARROW_ZSTD_USE_SHARED=OFF" # TODO use shared zstd once #91984 hits the master
|
||||
# Parquet options:
|
||||
"-DARROW_PARQUET=ON"
|
||||
"-DPARQUET_BUILD_EXECUTABLES=ON"
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmatroska";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matroska-Org";
|
||||
repo = "libmatroska";
|
||||
rev = "release-${version}";
|
||||
sha256 = "057iib6p62x31g1ikdjsjzmqzjlajqx6p74h7y4r524pzgb27fzy";
|
||||
sha256 = "118xxdgd3gkwamf59ac2c90s52pz5r0g2jmlrsj1kppybxka5f07";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-Donnxruntime_USE_OPENMP=ON"
|
||||
"-Donnxruntime_BUILD_SHARED_LIB=ON"
|
||||
# flip back to ON next release
|
||||
"-Donnxruntime_ENABLE_LTO=OFF" # https://github.com/microsoft/onnxruntime/issues/2828
|
||||
"-Donnxruntime_ENABLE_LTO=ON"
|
||||
];
|
||||
|
||||
# ContribOpTest.StringNormalizerTest sets locale to en_US.UTF-8"
|
||||
|
|
|
|||
63
pkgs/development/libraries/rocclr/default.nix
Normal file
63
pkgs/development/libraries/rocclr/default.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, rocm-cmake
|
||||
, clang
|
||||
, rocm-comgr
|
||||
, rocm-opencl-runtime
|
||||
, rocm-runtime
|
||||
, rocm-thunk
|
||||
, libelf
|
||||
, libglvnd
|
||||
, libX11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocclr";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ROCm-Developer-Tools";
|
||||
repo = "ROCclr";
|
||||
rev = "roc-${version}";
|
||||
sha256 = "0j70lxpwrdrb1v4lbcyzk7kilw62ip4py9fj149d8k3x5x6wkji1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake rocm-cmake ];
|
||||
|
||||
buildInputs = [ clang rocm-comgr rocm-runtime rocm-thunk clang ];
|
||||
|
||||
propagatedBuildInputs = [ libelf libglvnd libX11 ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")' \
|
||||
'set(ROCCLR_EXPORTS_FILE "''${CMAKE_INSTALL_LIBDIR}/cmake/amdrocclr_staticTargets.cmake")' \
|
||||
--replace 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_CURRENT_BINARY_DIR}/lib)' \
|
||||
'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})'
|
||||
substituteInPlace device/comgrctx.cpp \
|
||||
--replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOPENCL_DIR=${rocm-opencl-runtime.src}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
mv $out/include/include/* $out/include
|
||||
ln -s $out/include/compiler/lib/include/* $out/include/include
|
||||
ln -s $out/include/compiler/lib/include/* $out/include
|
||||
sed "s|^\([[:space:]]*IMPORTED_LOCATION_RELEASE \).*|\1 \"$out/lib/libamdrocclr_static.a\"|" -i $out/lib/cmake/amdrocclr_staticTargets.cmake
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Radeon Open Compute common language runtime";
|
||||
homepage = "https://github.com/ROCm-Developer-Tools/ROCclr";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
# 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" ];
|
||||
};
|
||||
}
|
||||
46
pkgs/development/libraries/rocm-comgr/default.nix
Normal file
46
pkgs/development/libraries/rocm-comgr/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-comgr";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-CompilerSupport";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "0h9bxz98sskgzc3xpnp469iq1wi59nbijbqprlylha91y10hqb88";
|
||||
};
|
||||
|
||||
sourceRoot = "source/lib/comgr";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ clang device-libs lld llvm ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCLANG=${clang}/bin/clang"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DCMAKE_C_COMPILER=${clang}/bin/clang"
|
||||
"-DCMAKE_CXX_COMPILER=${clang}/bin/clang++"
|
||||
"-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm"
|
||||
"-DLLD_INCLUDE_DIRS=${lld.src}/include"
|
||||
"-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\""
|
||||
];
|
||||
|
||||
# The comgr build tends to link against the static LLVM libraries
|
||||
# *and* the dynamic library. Linking against both causes errors
|
||||
# about command line options being registered twice. This patch
|
||||
# removes the static library linking.
|
||||
patchPhase = ''
|
||||
sed -e '/^llvm_map_components_to_libnames/,/[[:space:]]*Symbolize)/d' \
|
||||
-i CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with stdenv.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; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
41
pkgs/development/libraries/rocm-device-libs/default.nix
Normal file
41
pkgs/development/libraries/rocm-device-libs/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, clang
|
||||
, clang-unwrapped
|
||||
, lld
|
||||
, llvm
|
||||
, rocm-runtime
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-device-libs";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-Device-Libs";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "0n160jwbh7jnqckz5bn979ll8afh2a97lf962xh9xv3cx025vnrn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ clang lld llvm rocm-runtime ];
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${clang-unwrapped}/lib/cmake/clang"
|
||||
"-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'"
|
||||
"-DCLANG=${clang}/bin/clang"
|
||||
];
|
||||
|
||||
meta = with stdenv.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; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
20
pkgs/development/libraries/rocm-opencl-icd/default.nix
Normal file
20
pkgs/development/libraries/rocm-opencl-icd/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ stdenv, rocm-opencl-runtime }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-opencl-icd";
|
||||
version = "3.5.0";
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/etc/OpenCL/vendors
|
||||
echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "OpenCL ICD definition for AMD GPUs using the ROCm stack";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
84
pkgs/development/libraries/rocm-opencl-runtime/default.nix
Normal file
84
pkgs/development/libraries/rocm-opencl-runtime/default.nix
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, addOpenGLRunpath
|
||||
, cmake
|
||||
, rocm-cmake
|
||||
, clang
|
||||
, clang-unwrapped
|
||||
, libGLU
|
||||
, libX11
|
||||
, lld
|
||||
, llvm
|
||||
, mesa
|
||||
, python2
|
||||
, rocclr
|
||||
, rocm-comgr
|
||||
, rocm-device-libs
|
||||
, rocm-runtime
|
||||
, rocm-thunk
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.5.0";
|
||||
tag = "roc-${version}";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
pname = "rocm-opencl-runtime";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-OpenCL-Runtime";
|
||||
rev = tag;
|
||||
sha256 = "1wrr6mmn4gf6i0vxp4yqk0ny2wglvj1jfj50il8czjwy0cwmhykk";
|
||||
name = "ROCm-OpenCL-Runtime-${tag}-src";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake rocm-cmake ];
|
||||
|
||||
buildInputs = [
|
||||
clang
|
||||
clang-unwrapped
|
||||
libGLU
|
||||
libX11
|
||||
lld
|
||||
llvm
|
||||
mesa
|
||||
python2
|
||||
rocclr
|
||||
rocm-comgr
|
||||
rocm-device-libs
|
||||
rocm-runtime
|
||||
rocm-thunk
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DAMDGPU_TARGET_TRIPLE='amdgcn-amd-amdhsa'"
|
||||
"-DCLANG_OPTIONS_APPEND=-Wno-bitwise-conditional-parentheses"
|
||||
"-DClang_DIR=${clang-unwrapped}/lib/cmake/clang"
|
||||
"-DLIBROCclr_STATIC_DIR=${rocclr}/lib/cmake"
|
||||
"-DLLVM_DIR=${llvm.out}/lib/cmake/llvm"
|
||||
"-DUSE_COMGR_LIBRARY='yes'"
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
# Fix the ICD installation path for NixOS
|
||||
postPatch = ''
|
||||
substituteInPlace khronos/icd/loader/linux/icd_linux.c \
|
||||
--replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"'
|
||||
echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
patchelf --set-rpath "$out/lib" $out/bin/clinfo
|
||||
'';
|
||||
|
||||
meta = with stdenv.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; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
41
pkgs/development/libraries/rocm-runtime/default.nix
Normal file
41
pkgs/development/libraries/rocm-runtime/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, elfutils, rocm-thunk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-runtime";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCR-Runtime";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "028x1f0if6lw41cpfpysp82ikp6c3fdxxd2a6ixs0vpm4424svb1";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
buildInputs = [ cmake elfutils ];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ];
|
||||
|
||||
# Use the ROCR_EXT_DIR environment variable to try to find
|
||||
# binary-only extension libraries. This environment variable is set
|
||||
# by the `rocr-ext` derivation. If that derivation is not in scope,
|
||||
# then the extension libraries are not loaded. Without this edit, we
|
||||
# would have to rely on LD_LIBRARY_PATH to let the HSA runtime
|
||||
# discover the shared libraries.
|
||||
patchPhase = ''
|
||||
sed 's/\(k\(Image\|Finalizer\)Lib\[os_index(os::current_os)\]\)/os::GetEnvVar("ROCR_EXT_DIR") + "\/" + \1/g' -i core/runtime/runtime.cpp
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
rm -r $out/lib $out/include
|
||||
mv $out/hsa/lib $out/hsa/include $out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Platform runtime for ROCm";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime";
|
||||
license = with licenses; [ ncsa ];
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
};
|
||||
}
|
||||
37
pkgs/development/libraries/rocm-thunk/default.nix
Normal file
37
pkgs/development/libraries/rocm-thunk/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, numactl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-thunk";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCT-Thunk-Interface";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "0xn1z0xc3phjc9vabwxgph5any4ffhc8wgs5yb15m5wpg87l8x1z";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export cmakeFlags="$cmakeFlags "
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ numactl ];
|
||||
|
||||
postInstall = ''
|
||||
cp -r $src/include $out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Radeon open compute thunk interface";
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface";
|
||||
license = with licenses; [ bsd2 mit ];
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,11 @@
|
|||
{ stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }:
|
||||
|
||||
let param = {
|
||||
let param =
|
||||
let v6_2 = {
|
||||
version = "6.2";
|
||||
sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5";
|
||||
}; in
|
||||
{
|
||||
"4.02" = {
|
||||
version = "5.0+4.02.0";
|
||||
sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; };
|
||||
|
|
@ -20,15 +25,10 @@ let param = {
|
|||
"4.07" = {
|
||||
version = "5.1+4.06.0";
|
||||
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
|
||||
"4.08" = {
|
||||
version = "5.3+4.08.0";
|
||||
sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
|
||||
"4.09" = {
|
||||
version = "6.0+4.08.0";
|
||||
sha256 = "056cmdajap8mbb8k0raj0cq0y4jf7pf5x0hlivm92w2v7xxf59ns"; };
|
||||
"4.10" = {
|
||||
version = "6.1+4.10.0";
|
||||
sha256 = "0ccx2g4zpwnv52bbzhgxji1nvzmn80jwiqalwwc4s60i9qg51llw"; };
|
||||
"4.08" = v6_2;
|
||||
"4.09" = v6_2;
|
||||
"4.10" = v6_2;
|
||||
"4.11" = v6_2;
|
||||
}.${ocaml.meta.branch};
|
||||
in
|
||||
|
||||
|
|
|
|||
32
pkgs/development/python-modules/bip_utils/default.nix
Normal file
32
pkgs/development/python-modules/bip_utils/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ecdsa
|
||||
, pysha3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bip_utils";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e8397a315c2f656ccf37ff1c43f5e0d496a10ea692c614fdf9bae1a3d5de3558";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ecdsa pysha3 ];
|
||||
|
||||
# tests are not packaged in the released tarball
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bip_utils"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation";
|
||||
homepage = "https://github.com/ebellocchia/bip_utils";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, libredirect
|
||||
, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet
|
||||
, case, pytest, boto3, moto, kombu, billiard, pytz, future, vine
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery";
|
||||
version = "4.4.4";
|
||||
version = "4.4.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zk42fxznrhww0dxak9b6nkfqg02z49zr839k6ql7nk3him7n0y2";
|
||||
sha256 = "1ni5c3qgbhb7871b3i55wc306m3g2n0qxp92g5gszdxiicjf8xzx";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
checkInputs = [ case pytest boto3 moto ];
|
||||
propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
|
||||
propagatedBuildInputs = [ kombu billiard pytz future vine ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/celery/celery/";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "discord.py";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
disabled = pythonOlder "3.5.3";
|
||||
|
||||
# only distributes wheels on pypi now
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Rapptz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ld92vh7kjk3f02nbqyib68844yi4p2kmkyir6v9wi00y1l287l3";
|
||||
sha256 = "1i4h6vq681x8s05wi0n3ykavsxjh9hxdxn6banwjcqzhxzkyhsxi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp websockets ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "2.2.13";
|
||||
version = "2.2.14";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4";
|
||||
sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optional withGdal
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, python, lxml }:
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, python, lxml, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gpxpy";
|
||||
version = "1.3.5";
|
||||
version = "1.4.2";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tkrajina";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "18r7pfda7g3l0hv8j9565n52cvvgjxiiqqzagfdfaba1djgl6p8b";
|
||||
sha256 = "1r5gb660nrkrdbw5m5h1n5k10npcfv9bxqv92z55ds8r7rw2saz6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lxml ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "kazoo";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1jvpn1rcnnq3by1y6wlhfl9jynb110xv5lvd0x0ifkld7vfzd0v8";
|
||||
sha256 = "1zpj5cc8624w6i0pxgcxqkjwbkm4pkrv19d7wh5df3jais32g3jq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyTelegramBotAPI";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8ef8e54098efd29a6bcac28d127480ae2b7491c1d33e4e0c7bbf0fc8949e0fae";
|
||||
sha256 = "1jbd2npa942f3bqwpvc6kb3b9jxk7ksczd4grrdimfb6w7binzv4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python3-openid";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "00l5hrjh19740w00b3fnsqldnla41wbr2rics09dl4kyd1fkd3b2";
|
||||
sha256 = "1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ defusedxml ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, buildPythonPackage, fetchPypi, isPy27, nose, six, colorama, termstyle }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
|
||||
, nose, six, colorama, termstyle }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rednose";
|
||||
|
|
@ -15,7 +16,8 @@ buildPythonPackage rec {
|
|||
|
||||
# Do not test on Python 2 because the tests suite gets stuck
|
||||
# https://github.com/NixOS/nixpkgs/issues/60786
|
||||
doCheck = !(isPy27);
|
||||
# Also macOS tests are broken on python38
|
||||
doCheck = !(isPy27 || (stdenv.isDarwin && pythonAtLeast "3.8"));
|
||||
|
||||
checkInputs = [ six ];
|
||||
propagatedBuildInputs = [ nose colorama termstyle ];
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1gy6jzpsz21lziv15gjasb3l7cyxnlivgsrks8106mcmp7vw83cg";
|
||||
sha256 = "07zf7kivj4r1n6xwisld7n90bpi095bqbc9xpv668grq1rpf53c1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "uamqp";
|
||||
version = "1.2.8";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12yq435h27iv1kzgq3gl7c7hxdivvc2sl0l1kslgf2wxw53n7jgj";
|
||||
sha256 = "1gqccakzivga3lb9sh4aniamqpnlbbwxfbkhrb6833k1zha01w8j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wurlitzer";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0xndv47iwc9k8cp5r9r1z3r0xww0r5x5b7qsmn39gk2gsg0119c6";
|
||||
sha256 = "0hvmbc41kdwrjns8z1s4a59a4azdvzb8q3vs7nn1li4qm4l0g3yh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ];
|
||||
|
|
|
|||
23
pkgs/development/tools/build-managers/rocm-cmake/default.nix
Normal file
23
pkgs/development/tools/build-managers/rocm-cmake/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-cmake";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "rocm-cmake";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "1x1mj1acarhin319zycms8sqm9ylw2mcdbkpqjlb8yfsgiaa99ja";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.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; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -27,6 +27,11 @@ let
|
|||
(mkOverride "astral" "1.10.1"
|
||||
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
|
||||
|
||||
# Required by cast component. Can probably be removed in 0.113.x
|
||||
# https://github.com/home-assistant/core/commit/86c27b50f1282658b75fe71f9f6fd2fcabc2eaa2
|
||||
(mkOverride "PyChromecast" "6.0.0"
|
||||
"05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm")
|
||||
|
||||
# We have 3.x in nixpkgs which is incompatible with home-assistant atm:
|
||||
# https://github.com/home-assistant/core/blob/dev/requirements_all.txt
|
||||
(mkOverride "pyowm" "2.10.0"
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "squid";
|
||||
version = "4.11";
|
||||
version = "4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
|
||||
sha256 = "0z986kykx539wjqd7mr8y0abf3z6hz8byf8fmmbky9hh4ihlgnaf";
|
||||
sha256 = "05z34ysy2zn7as11vd365xxhh36bm1ysiwcbr0i0f0nwng406apl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, writeText }:
|
||||
|
||||
let
|
||||
version = "3.9";
|
||||
version = "3.9.1";
|
||||
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
|
||||
in
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
|
||||
sha256 = "1splsxdxzwf49zxrdb4q05fj60agqyzv0ikvk05gaf49qqd8rznz";
|
||||
sha256 = "1ysnrk013gmc21ml3jwijvl16rx3p478a4vriy6h8hfli48460p9";
|
||||
};
|
||||
|
||||
phpConfig = writeText "config.php" ''
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2020-07-13";
|
||||
version = "2020-07-14";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "5c1a5c6ce924755095020fd829b08f0ee205a723";
|
||||
rev = "ff7618cf744a289a9ba9c332be08ed5304d2f45f";
|
||||
|
||||
src = fetchgit { inherit rev;
|
||||
url = "https://github.com/ohmyzsh/ohmyzsh";
|
||||
sha256 = "16xqb4f47fxsglpgkjjymydvy2niy84bc2vw6m02nia2pw1wccl5";
|
||||
sha256 = "00yvf5rbv2fspv12h0jlda063fv0kj6zaannz0xcqknaj2d8pyqz";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, perl, zlib, bzip2 }:
|
||||
{ stdenv, fetchurl, fetchpatch, perl, zlib, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "routino";
|
||||
|
|
@ -9,12 +9,26 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab";
|
||||
};
|
||||
|
||||
patchFlags = [ "-p0" ];
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff";
|
||||
sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-src_Makefile_dylib_extension.diff";
|
||||
sha256 = "1kigxcfr7977baxdsfvrw6q453cpqlzqakhj7av2agxkcvwyilpv";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
buildInputs = [ zlib bzip2 ];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
CLANG = stdenv.lib.optionalString stdenv.cc.isClang "1";
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -22,6 +36,6 @@ stdenv.mkDerivation rec {
|
|||
description = "OpenStreetMap Routing Software";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
36
pkgs/tools/misc/spigot/default.nix
Normal file
36
pkgs/tools/misc/spigot/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPackages
|
||||
, fetchgit
|
||||
, autoreconfHook
|
||||
, gmp
|
||||
, ncurses
|
||||
, halibut
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spigot";
|
||||
version = "20200101";
|
||||
src = fetchgit {
|
||||
url = "https://git.tartarus.org/simon/spigot.git";
|
||||
rev = "b1b0b202b3523b72f0638fb31fd49c47f4abb39c";
|
||||
sha256 = "0lh5v42aia1hvhsqzs515q0anrjc6c2s9bjklfaap5gz0cg59wbv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook halibut perl ];
|
||||
|
||||
configureFlags = [ "--with-gmp" ];
|
||||
|
||||
buildInputs = [ gmp ncurses ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line exact real calculator";
|
||||
homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with maintainers; [ mcbeth ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oneshot";
|
||||
version = "1.1.0";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphaelreyna";
|
||||
repo = "oneshot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gcxwamchznkzg3m0gfig7733z2w035lxxj6h18gc6zzcnf6p57w";
|
||||
sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/raphaelreyna/oneshot";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, openssl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "siege-4.0.5";
|
||||
name = "siege-4.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.joedog.org/siege/${name}.tar.gz";
|
||||
sha256 = "0c82h0idkvfbzspy7h6w97wyk671694nl1ir94zhzn54mw0p0jrv";
|
||||
sha256 = "03w0iska74nb6r8wnljn7inasbq7qflf55vjmxnb9jrc4pi7mpnw";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
|
|
|||
|
|
@ -6838,6 +6838,8 @@ in
|
|||
|
||||
spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { };
|
||||
|
||||
spigot = callPackage ../tools/misc/spigot { };
|
||||
|
||||
spiped = callPackage ../tools/networking/spiped { };
|
||||
|
||||
sqliteman = callPackage ../applications/misc/sqliteman { };
|
||||
|
|
@ -9124,6 +9126,8 @@ in
|
|||
|
||||
llvmPackages_latest = llvmPackages_10;
|
||||
|
||||
llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { };
|
||||
|
||||
lorri = callPackage ../tools/misc/lorri {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
|
|
@ -9256,6 +9260,32 @@ in
|
|||
|
||||
rgbds = callPackage ../development/compilers/rgbds { };
|
||||
|
||||
rocclr = callPackage ../development/libraries/rocclr {
|
||||
inherit (llvmPackages_rocm) clang;
|
||||
};
|
||||
|
||||
rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { };
|
||||
|
||||
rocm-comgr = callPackage ../development/libraries/rocm-comgr {
|
||||
inherit (llvmPackages_rocm) clang lld llvm;
|
||||
device-libs = rocm-device-libs;
|
||||
};
|
||||
|
||||
rocm-device-libs = callPackage ../development/libraries/rocm-device-libs {
|
||||
inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm;
|
||||
};
|
||||
|
||||
rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { };
|
||||
|
||||
rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime {
|
||||
stdenv = overrideCC stdenv llvmPackages_rocm.clang;
|
||||
inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm;
|
||||
};
|
||||
|
||||
rocm-runtime = callPackage ../development/libraries/rocm-runtime { };
|
||||
|
||||
rocm-thunk = callPackage ../development/libraries/rocm-thunk { };
|
||||
|
||||
rtags = callPackage ../development/tools/rtags {
|
||||
inherit (darwin) apple_sdk;
|
||||
};
|
||||
|
|
@ -11396,6 +11426,8 @@ in
|
|||
arrayfire = callPackage ../development/libraries/arrayfire {};
|
||||
|
||||
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
|
||||
# Workaround until #91984 is in, this will need to be removed later.
|
||||
zstd = zstd.override { enableShared = false; };
|
||||
} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
|
||||
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
|
||||
});
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ releaseTools.sourceTarball {
|
|||
echo -n '}' >> tmp
|
||||
packages=$out/packages.json.br
|
||||
< tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages
|
||||
rm tmp
|
||||
|
||||
echo "file json-br $packages" >> $out/nix-support/hydra-build-products
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -523,6 +523,8 @@ in {
|
|||
|
||||
biplist = callPackage ../development/python-modules/biplist { };
|
||||
|
||||
bip_utils = callPackage ../development/python-modules/bip_utils { };
|
||||
|
||||
bitarray = callPackage ../development/python-modules/bitarray { };
|
||||
|
||||
bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue