Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
d9b4611dd4
@ -24,6 +24,7 @@ in
|
||||
_3proxy = handleTest ./3proxy.nix {};
|
||||
acme = handleTest ./acme.nix {};
|
||||
agda = handleTest ./agda.nix {};
|
||||
ammonite = handleTest ./ammonite.nix {};
|
||||
atd = handleTest ./atd.nix {};
|
||||
avahi = handleTest ./avahi.nix {};
|
||||
avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
|
||||
|
||||
@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
amm =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.ammonite ];
|
||||
environment.systemPackages = [ (pkgs.ammonite.override { jre = pkgs.jre8; }) ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mamba";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = "Mamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "02w47347cbfqxybh908ww5ifd9jcns8v0msycq59y9q7x0a2h6fh";
|
||||
sha256 = "1i78snpyxap2r4899967nyfr8hg20k45nsbshs9h6hdxbfwhikbc";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
30
pkgs/applications/misc/dasel/default.nix
Normal file
30
pkgs/applications/misc/dasel/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:11xm47p7n79mq2zkv9q9m5v4a1gga01pkzi2j42gq1ma9hwz4idz";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Query and update data structures from the command line";
|
||||
longDescription = ''
|
||||
Dasel (short for data-selector) allows you to query and modify data structures using selector strings.
|
||||
Comparable to jq / yq, but supports JSON, YAML, TOML and XML with zero runtime dependencies.
|
||||
'';
|
||||
homepage = "https://github.com/TomWright/dasel";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
, gtkmm3
|
||||
, pcre
|
||||
, swig
|
||||
, antlr4_7
|
||||
, antlr4_8
|
||||
, sudo
|
||||
, mysql
|
||||
, libxml2
|
||||
@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
|
||||
# have it look for 4.7.2 instead of 4.7.1
|
||||
preConfigure = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar"
|
||||
--replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
gtkmm3
|
||||
libX11
|
||||
antlr4_7.runtime.cpp
|
||||
antlr4_8.runtime.cpp
|
||||
python2
|
||||
mysql
|
||||
libxml2
|
||||
@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
|
||||
"-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
|
||||
"-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}"
|
||||
"-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}"
|
||||
# mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
|
||||
# Newer versions of connector still provide the legacy library when enabled
|
||||
# but the headers are in a different location.
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipfs-migrator";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "fs-repo-migrations";
|
||||
rev = "v${version}";
|
||||
sha256 = "13ah5jk8n3wznvag6dda1ssgpqsdr9pdgvqm9gcsb7zzls89j9x5";
|
||||
sha256 = "004qqcwcw55q13r3sr273dfa5zgxc275pcgqwihzbikl3i168d9f";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -340,7 +340,7 @@ rec {
|
||||
# Tar up the layer and throw it into 'layer.tar'.
|
||||
echo "Packing layer..."
|
||||
mkdir $out
|
||||
tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum)
|
||||
tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee -p $out/layer.tar | tarsum)
|
||||
|
||||
# Add a 'checksum' field to the JSON, with the value set to the
|
||||
# checksum of the tarball.
|
||||
@ -425,7 +425,7 @@ rec {
|
||||
echo "Packing layer..."
|
||||
mkdir -p $out
|
||||
tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf - . |
|
||||
tee $out/layer.tar |
|
||||
tee -p $out/layer.tar |
|
||||
${tarsum}/bin/tarsum)
|
||||
|
||||
cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
|
||||
|
||||
let
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "llvm-project";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6";
|
||||
sha256 = "01ljx6mhix3z2pgddgn0ymhrsbigs1nqlz3kkwkr6p2igprrly9f";
|
||||
};
|
||||
in rec {
|
||||
clang = wrapCCWith rec {
|
||||
|
||||
@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
|
||||
postInstall = ''
|
||||
moveToOutput include "$dev"
|
||||
moveToOutput lib "$dev"
|
||||
|
||||
# Fix lld binary path for CMake.
|
||||
substituteInPlace "$dev/lib/cmake/lld/LLDTargets-release.cmake" \
|
||||
--replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -32,6 +32,7 @@ import ./default.nix {
|
||||
armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54";
|
||||
aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49";
|
||||
x86_64-apple-darwin = "a5464e7bcbce9647607904a4afa8362382f1fc55d39e7bbaf4483ac00eb5d56a";
|
||||
powerpc64le-unknown-linux-gnu = "22deeca259459db31065af7c862fcab7fbfb623200520c65002ed2ba93d87ad2";
|
||||
};
|
||||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_45;
|
||||
|
||||
@ -34,6 +34,7 @@ import ./default.nix {
|
||||
armv7-unknown-linux-gnueabihf = "7c0640879d7f2c38db60352e3c0f09e3fc6fa3bac6ca8f22cbccb1eb5e950121";
|
||||
aarch64-unknown-linux-gnu = "f0c6d630f3dedb3db69d69ed9f833aa6b472363096f5164f1068c7001ca42aeb";
|
||||
x86_64-apple-darwin = "82d61582a3772932432a99789c3b3bd4abe6baca339e355048ca9efb9ea5b4db";
|
||||
powerpc64le-unknown-linux-gnu = "89e2f4761d257f017a4b6aa427f36ac0603195546fa2cfded8c899789832941c";
|
||||
};
|
||||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_47;
|
||||
|
||||
@ -14,6 +14,7 @@ PLATFORMS=(
|
||||
armv7-unknown-linux-gnueabihf
|
||||
aarch64-unknown-linux-gnu
|
||||
x86_64-apple-darwin
|
||||
powerpc64le-unknown-linux-gnu
|
||||
)
|
||||
BASEURL=https://static.rust-lang.org/dist
|
||||
VERSION=${1:-}
|
||||
|
||||
@ -19,9 +19,6 @@ in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
# passthru to prevent rebuild but allow pname and version
|
||||
passthru = { inherit pname version; };
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";
|
||||
sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e";
|
||||
@ -78,6 +75,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# passthru to prevent rebuild but allow pname and version
|
||||
inherit pname version;
|
||||
gtkExeEnvPostBuild = ''
|
||||
rm $out/lib/gtk-2.0/2.10.0/immodules.cache
|
||||
$out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Lode <johannes.lode@dynainstruments.com>
|
||||
Date: Thu, 14 Nov 2019 10:44:00 +0100
|
||||
Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as
|
||||
regular functions.
|
||||
|
||||
While cross-compiling there occurred "undefined reference to
|
||||
`rpl_malloc'", the suggested change fixes the problem.
|
||||
|
||||
Tested for native X86_64 and armv7a-unknown-linux-gnueabihf.
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 008499d..b492dc4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX],
|
||||
|
||||
# This is always checked (library needs this)
|
||||
AC_HEADER_STDC
|
||||
-AC_FUNC_MALLOC
|
||||
+# AC_FUNC_MALLOC -- does not work while cross-compiling
|
||||
+AC_CHECK_FUNC([malloc realloc])
|
||||
AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])])
|
||||
AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])])
|
||||
AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])])
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# cross compiling fix
|
||||
# https://github.com/brgl/libgpiod/pull/45
|
||||
./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch
|
||||
];
|
||||
|
||||
buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
|
||||
nativeBuildInputs = [
|
||||
autoconf-archive
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocclr";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ROCm-Developer-Tools";
|
||||
repo = "ROCclr";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf";
|
||||
sha256 = "193pd6lbnfjrmqsrlvkpadxxi908a9r0c41y8x1bkbbaviad39q0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake rocm-cmake ];
|
||||
@ -46,7 +46,10 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
# Work around broken cmake files
|
||||
ln -s $out/include/compiler/lib/include/* $out/include
|
||||
ln -s $out/include/elf/elfio $out/include/elfio
|
||||
|
||||
substituteInPlace $out/lib/cmake/rocclr/ROCclrConfig.cmake \
|
||||
--replace "/build/source/build" "$out"
|
||||
'';
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-comgr";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-CompilerSupport";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1";
|
||||
sha256 = "1lwgr6x2b6jisc2nxvr9m24zrc7f2vcgrbkj9sf2blpha61xgk14";
|
||||
};
|
||||
|
||||
sourceRoot = "source/lib/comgr";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-device-libs";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-Device-Libs";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4";
|
||||
sha256 = "1nil0nhlkszslgvqhim5vmcp3flfafydviq0zk7db8i6z17kq090";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-opencl-runtime";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-OpenCL-Runtime";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm";
|
||||
sha256 = "1qsgswm1wl2wknhgy6c9l6dnj0z1kwddimdzjmvjcpyxq987y2gv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake rocm-cmake ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-runtime";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCR-Runtime";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "1lm4cbx1d727zll85vjc1kykc72mk82nfhyyhjljv82gd4mnz00c";
|
||||
sha256 = "034qbqznfligg4lwd95zmqa7lwcda720zbfv066nqvarlcml0kr6";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ clang-unwrapped elfutils llvm ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBITCODE_DIR=${rocm-device-libs}/lib"
|
||||
"-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode"
|
||||
"-DCMAKE_PREFIX_PATH=${rocm-thunk}"
|
||||
];
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-thunk";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCT-Thunk-Interface";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k";
|
||||
sha256 = "0xkp50ik7miz9whywnmiiqiamc7g8flfr9g8c02kxr0cay1in6cj";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
{ lib, fetchurl, buildDunePackage, pkg-config, gsl
|
||||
, dune-configurator
|
||||
}:
|
||||
{ stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gsl";
|
||||
@ -14,11 +12,12 @@ buildDunePackage rec {
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator gsl pkg-config ];
|
||||
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://mmottl.github.io/gsl-ocaml/";
|
||||
description = "OCaml bindings to the GNU Scientific Library";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "caldav";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-caldav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83";
|
||||
sha256 = "1shfj67kq6qzd0ngyfk09hpzfggybcfxv5s7hqs87nq9l51bssv8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ];
|
||||
|
||||
@ -6,11 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cupy";
|
||||
version = "7.7.0";
|
||||
version = "8.1.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b4032adf839f63bab7fc9f3e7066ef86abe0928e834aa5d132e4e7ce907951ed";
|
||||
sha256 = "4dfa4a0cd0a752d980347c816cab2169f0938c1d37275311810396dcf3c27912";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-modelcluster";
|
||||
version = "5.0.2";
|
||||
version = "5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa";
|
||||
sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
pname = "elementpath";
|
||||
disabled = isPy27; # uses incompatible class syntax
|
||||
|
||||
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
owner = "sissaschool";
|
||||
repo = "elementpath";
|
||||
rev = "v${version}";
|
||||
sha256 = "16gs5glnlr4i41xbmd30x62zj85apmf69m9akvfnka0gkjlzv8in";
|
||||
sha256 = "0812il5xn7cq0qa0vmkszrvprakfpyxmilk7s918l9kavdy4al8x";
|
||||
};
|
||||
|
||||
# avoid circular dependency with xmlschema which directly depends on this
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ExifRead";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "269ff3a8eab8e082734a076182cce6fb126116619c0b7c2009bea34502cca213";
|
||||
sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jq";
|
||||
version = "1.0.2";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9fe6ce07bc8d209c385d8ba132a2971c69aef015103c46bea87a73a16c5ec147";
|
||||
sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e";
|
||||
};
|
||||
patches = [ ./jq-py-setup.patch ];
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.15";
|
||||
version = "2.1.20";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e1092ae52cfdef41c22d98fa98f9225ac21936a7d096131777ca3a7940fe1b2d";
|
||||
sha256 = "2f1cf9721aa5fce93b034d2a18922d34d6f5fb81236ab3a955706226b15658fd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pushbullet.py";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d";
|
||||
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests websocket_client python_magic ];
|
||||
|
||||
@ -1,29 +1,54 @@
|
||||
{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, requests
|
||||
, requests-mock, pytest
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry
|
||||
, aiohttp
|
||||
, numpy
|
||||
, pysmb
|
||||
, aresponses
|
||||
, asynctest
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyairvisual";
|
||||
version = "1.0.0";
|
||||
version = "5.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ng6k07n91k5l68zk3hl4fywb33admp84wqdm20qmmw9yc9c64fd";
|
||||
rev = version;
|
||||
sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest requests-mock ];
|
||||
propagatedBuildInputs = [ requests ];
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test tests
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
numpy
|
||||
pysmb
|
||||
];
|
||||
|
||||
disabled = !isPy3k;
|
||||
checkInputs = [
|
||||
aresponses
|
||||
asynctest
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A thin Python wrapper for the AirVisual API";
|
||||
description = "A simple, clean, well-tested Python library for interacting with AirVisual©";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/bachya/pyairvisual";
|
||||
};
|
||||
|
||||
@ -12,17 +12,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "4.1.0";
|
||||
disabled = pythonOlder "3.5"; # uses type hints
|
||||
version = "4.2.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jabesq";
|
||||
repo = "netatmo-api-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x3xq6ni9rl5k3vi0ydqafdzvza785ycnlgyikgqbkppbh3j33ig";
|
||||
sha256 = "0b2k1814zg3994k60xdw5gpsl8k1wy9zndd0b1p4dfb5qkx9f8kp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ oauthlib requests requests_oauthlib ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "oauthlib==3.1.0" "oauthlib"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
oauthlib
|
||||
requests
|
||||
requests_oauthlib
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-sql";
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0f0g10y0whvax8yv0rfs7b4yd68lbxbss1za0mvbvr65b8r3pdxz";
|
||||
sha256 = "306999bd311fbf50804d76f346655af0a6ff18881ce46c1329256fee40f492c0";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ stdenv, fetchurl, jre, disableRemoteLogging ? true }:
|
||||
{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git
|
||||
, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
repo = "git@github.com:lihaoyi/Ammonite.git";
|
||||
|
||||
common = { scalaVersion, sha256 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ammonite";
|
||||
@ -24,6 +27,37 @@ let
|
||||
sed -i '1i #!/bin/sh' $out/bin/amm
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) ammonite; };
|
||||
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!${stdenv.shell}
|
||||
set -o errexit
|
||||
PATH=${
|
||||
stdenv.lib.makeBinPath [
|
||||
common-updater-scripts
|
||||
coreutils
|
||||
git
|
||||
gnused
|
||||
nix
|
||||
nixfmt
|
||||
]
|
||||
}
|
||||
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
|
||||
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)"
|
||||
if [ "$oldVersion" != "$latestTag" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix"
|
||||
update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes
|
||||
sed -i "s|$latestTag|$oldVersion|g" "$default_nix"
|
||||
update-source-version ${pname}_2_13 "$latestTag" --version-key=version --print-changes
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Improved Scala REPL";
|
||||
longDescription = ''
|
||||
@ -41,10 +75,10 @@ let
|
||||
in {
|
||||
ammonite_2_12 = common {
|
||||
scalaVersion = "2.12";
|
||||
sha256 = "0nclfqwy3jfn1680z1hd0zzmc0b79wpvx6gn1jnm19aq7qcvh5zp";
|
||||
sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk=";
|
||||
};
|
||||
ammonite_2_13 = common {
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "104bnahn382sb6vwjvchsg0jrnkkwjn08rfh0g5ra7lwhgcj2719";
|
||||
sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl, stdenv, coreutils, makeWrapper }:
|
||||
|
||||
let version = "1.10.8"; in
|
||||
let version = "1.10.9"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ant";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
|
||||
sha256 = "0zh94csb2hl6ir2ccn18ps506mjgh3mffnrb8wpsmp1x5fcykha5";
|
||||
sha256 = "1ab8ybczvk12501dnj450a3d4v43ca0pjhk33s175hax46s58z47";
|
||||
};
|
||||
|
||||
contrib = fetchurl {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-cmake";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "rocm-cmake";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "1x1mj1acarhin319zycms8sqm9ylw2mcdbkpqjlb8yfsgiaa99ja";
|
||||
sha256 = "13j7gmcy1j6qsydgccmgiacg6sj38l5mlwn4ck8qizl0cpc14gfm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
|
||||
|
||||
let
|
||||
version = "4.7.2";
|
||||
version = "4.8";
|
||||
source = fetchFromGitHub {
|
||||
owner = "antlr";
|
||||
repo = "antlr4";
|
||||
rev = version;
|
||||
sha256 = "1pl0zs6c6wx9nmq30s7ccpc3dl72az55i8vfp574fw9sywmvxmlj";
|
||||
sha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m";
|
||||
};
|
||||
|
||||
runtime = {
|
||||
@ -41,7 +41,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
|
||||
sha256 = "1d40nfkq3ws8g4ksx4gj6l6m2l9j4b605q6sf68z5vvmg5nkhlk8";
|
||||
sha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
@ -8,6 +8,6 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "15.0.1";
|
||||
sha256 = "03xxnl7q96fmm7lalliwb9kmllz52jqrcsqn9cx9pzhwd1x97l5q";
|
||||
version = "15.1.0";
|
||||
sha256 = "1fd0ck6nlmp937j00y17q2k9xszzwf4s383p1z4v4qzj0qzxflvk";
|
||||
}
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nsd";
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v";
|
||||
sha256 = "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "0.117.2";
|
||||
version = "0.117.4";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
||||
@ -67,7 +67,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "0.117.2";
|
||||
hassVersion = "0.117.4";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -83,13 +83,16 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "1mpvskr0zjvl065ldw05kc0x5yvibwfm2nmv478wznw3vwmbqrzn";
|
||||
sha256 = "0f5a5y6d9wxdfd5l526dz34xz2n1a6ia7vdcr7sqf2qp51brpw52";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
patches = [];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
|
||||
--replace "cryptography==3.2.0" "cryptography" \
|
||||
--replace "cryptography==3.2" "cryptography" \
|
||||
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
|
||||
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
|
||||
'';
|
||||
|
||||
@ -23,6 +23,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
||||
substituteInPlace setup.py \
|
||||
--replace "javaproperties==0.5.1" "javaproperties" \
|
||||
--replace "pytz==2019.1" "pytz" \
|
||||
--replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \
|
||||
--replace "mock~=4.0" "mock"
|
||||
|
||||
# remove namespace hacks
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20200505";
|
||||
version = "20200929";
|
||||
pname = "mbuffer";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
|
||||
sha256 = "02qzy3appah0llg6aa71isl2a5nc93bkzy5r4d682lcy2j1n216c";
|
||||
sha256 = "1s6lxbqba2hwnvrdrwk0fpnff62gv0ynah4ql0c9y14s9v0y79jk";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
||||
dontDisableStatic = true; # the build fails without this. should probably be reported upstream
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open source version of Mellanox Firmware Tools (MFT)";
|
||||
homepage = "https://github.com/Mellanox/mstflint";
|
||||
license = with licenses; [ gpl2 bsd2 ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
30
pkgs/tools/system/mlc/default.nix
Normal file
30
pkgs/tools/system/mlc/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchurl, patchelf }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlc";
|
||||
version = "3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://software.intel.com/content/dam/develop/external/us/en/protected/mlc_v${version}.tgz";
|
||||
sha256 = "1x7abm9hbv9hkqa3cgxz6l04m3ycyl40i4zgx1w819pc10n6dhdb";
|
||||
};
|
||||
|
||||
sourceRoot = "Linux";
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 mlc $out/bin/mlc
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ patchelf ];
|
||||
|
||||
fixupPhase = ''
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html";
|
||||
description = "Intel Memory Latency Checker";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ basvandijk ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rocm-smi";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROC-smi";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "00g9cbni73x9da05lx7hiffp303mdkj1wpxiavfylr4q4z84yhrz";
|
||||
sha256 = "190x31s7mjpyp7hr6cgdnvn2s20qj3sqcxywycjm2i9ar429l2ni";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -1854,6 +1854,8 @@ in
|
||||
|
||||
dapr-cli = callPackage ../development/tools/dapr/cli {};
|
||||
|
||||
dasel = callPackage ../applications/misc/dasel { };
|
||||
|
||||
dasher = callPackage ../applications/accessibility/dasher { };
|
||||
|
||||
datamash = callPackage ../tools/misc/datamash { };
|
||||
@ -10687,10 +10689,11 @@ in
|
||||
};
|
||||
antlr3 = antlr3_5;
|
||||
|
||||
antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix {
|
||||
antlr4_8 = callPackage ../development/tools/parsing/antlr/4.8.nix {
|
||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
antlr4 = antlr4_7;
|
||||
|
||||
antlr4 = antlr4_8;
|
||||
|
||||
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
|
||||
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
|
||||
@ -14669,6 +14672,8 @@ in
|
||||
withGUI = false;
|
||||
};
|
||||
|
||||
mlc = callPackage ../tools/system/mlc { };
|
||||
|
||||
mlt = callPackage ../development/libraries/mlt { };
|
||||
|
||||
mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user