b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-09-24 06:01:02 +00:00 committed by GitHub
parent 40299257cc 3a6a3714f6
commit 213597c007
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 106 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/slack/default.nix
View file

@ -44,14 +44,14 @@ let
pname = "slack";
x86_64-darwin-version = "4.18.0";
x86_64-darwin-sha256 = "1qldmh0xdbl18gvxxsi2jvcq1ziwap3naxgax4gn36x5k25ipw5k";
x86_64-darwin-version = "4.19.0";
x86_64-darwin-sha256 = "0dj51lhxiba69as6x76ni8h20d36bcpf2xz3rxr1s8881mprpfsg";
x86_64-linux-version = "4.18.0";
x86_64-linux-sha256 = "1dhdmi2rvww8m6400c5dc0c6mrircvflgwcja2rr7ry0lv98n6kh";
x86_64-linux-version = "4.19.2";
x86_64-linux-sha256 = "02npmprwl1h7c2y03khvx8ifhk1gj1axbvlwigp2hkkjdw7y4b5a";
aarch64-darwin-version = "4.18.0";
aarch64-darwin-sha256 = "0qlfxskqq5gr45p1gfc2jcbr1abhc6di653jwjgh7yibim0hpjab";
aarch64-darwin-version = "4.19.0";
aarch64-darwin-sha256 = "1mvs1bdyyyrpqmrbqg4sxpy6ylgchwz39nr232s441iqdz45p87v";
version = {
x86_64-darwin = x86_64-darwin-version;

4
pkgs/development/libraries/libplctag/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.3.7";
version = "2.4.0";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "sha256-AGU1/56OO96njWLSS91HBSe2tFXBwKzJMSh2/m6Fv0E=";
sha256 = "sha256-ClNLU1BPNemUOu+nMHujFYQSE+wnYuUPhHytjD8snb4=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/libvmaf/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libvmaf";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "netflix";
repo = "vmaf";
rev = "v${version}";
sha256 = "1jlmivmdzlhizljbmsvqqxnhjfyjh8zxyf5xv6j040vbfj4mf14f";
sha256 = "sha256-t1dK4UnperX9YtvmTwIo/03Dxq/Pl+K6kZIL0uX1OcE=";
};
sourceRoot = "source/libvmaf";

4
pkgs/development/python-modules/APScheduler/default.nix
View file

@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "APScheduler";
version = "3.7.0";
version = "3.8.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1cab7f2521e107d07127b042155b632b7a1cd5e02c34be5a28ff62f77c900c6a";
sha256 = "793b2d37c52ece53e34626619e6142e99b20b59a12155f39e1e6932e324f079d";
};
buildInputs = [

4
pkgs/development/python-modules/deemix/default.nix
View file

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "deemix";
version = "3.4.4";
version = "3.5.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HZg2zys92gH1j8WWgrzH3fpxoFDi+LPULmvlkUeB9Fw=";
sha256 = "3347d07fab5dcadcfa7798383ba0a2e026d4bfdc0a7c2a7584d7fbf128a3c233";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pytorch/bin.nix
View file

@ -18,7 +18,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
version = "1.9.0";
version = "1.9.1";
in buildPythonPackage {
inherit version;
@ -67,6 +67,6 @@ in buildPythonPackage {
changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";
license = licenses.unfree; # Includes CUDA and Intel MKL.
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ junjihashimoto ];
};
}

39
pkgs/development/python-modules/pytorch/binary-hashes.nix
View file

@ -1,17 +1,26 @@
version: {
x86_64-linux-37 = {
name = "torch-${version}-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-GOTC4HpSxd+3V4LNPy3Ig1+IAhm3U+6s/gOkKxD4AJE=";
};
x86_64-linux-38 = {
name = "torch-${version}-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl";
hash = "sha256-29KiXQJWCRRn92+ZddBq3Q+zYIKavUxB5HL3HafO0gc=";
};
x86_64-linux-39 = {
name = "torch-${version}-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl";
hash = "sha256-VCLRkELiF8KqlAMLFrP+TaW+m6jupG5+WdQKEQlVli0=";
# Warning: use the same CUDA version as pytorch-bin.
#
# Precompiled wheels can be found at:
# https://download.pytorch.org/whl/torch_stable.html
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version {
"1.9.1" = {
x86_64-linux-37 = {
name = "torch-1.9.1-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-qzXbbpLX+ZlRv41oAyQRk3guU0n/6vuNzWw+nOieL6s=";
};
x86_64-linux-38 = {
name = "torch-1.9.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl";
hash = "sha256-JUbcqugax08/iN1LKfXq0ohSpejmbKhbT0by7qMGAzw=";
};
x86_64-linux-39 = {
name = "torch-1.9.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl";
hash = "sha256-wNLLtR9ZxKkVOTzwbAikM5H83pXyH+aPHVFyfrO4c1M=";
};
};
}

36
pkgs/development/python-modules/pytorch/prefetch.sh Executable file
View file

@ -0,0 +1,36 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-prefetch-scripts
version=$1
bucket="https://download.pytorch.org/whl/cu111"
url_and_key_list=(
"x86_64-linux-37 $bucket/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl"
"x86_64-linux-38 $bucket/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $bucket/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
)
hashfile=binary-hashes-"$version".nix
rm -f $hashfile
echo " \"$version\" = {" >> $hashfile
for url_and_key in "${url_and_key_list[@]}"; do
key=$(echo "$url_and_key" | cut -d' ' -f1)
url=$(echo "$url_and_key" | cut -d' ' -f2)
name=$(echo "$url_and_key" | cut -d' ' -f3)
echo "prefetching ${url}..."
hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`)
echo " $key = {" >> $hashfile
echo " name = \"$name\";" >> $hashfile
echo " url = \"$url\";" >> $hashfile
echo " hash = \"$hash\";" >> $hashfile
echo " };" >> $hashfile
echo
done
echo " };" >> $hashfile
echo "done."

4
pkgs/development/python-modules/pytwitchapi/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pytwitchapi";
version = "2.3.0";
version = "2.4.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Teekeks";
repo = "pyTwitchAPI";
rev = "v${version}";
sha256 = "sha256-ax3FHyyyRfXSWKsoUi8ao5TL2alo0bQP+lWiDaPjf34=";
sha256 = "0fq1ky6nbrb47mlznl3vq8m86lqb6p78fvbcy8x3rm3m5zngxnz7";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/robotframework-requests/default.nix
View file

@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
version = "0.9.1";
version = "0.9.2";
pname = "robotframework-requests";
src = fetchPypi {
inherit pname version;
sha256 = "22ea105846b28ddfc49713c59a363ad636ece5e308476dea59e73e3c9b544755";
sha256 = "b40f7869312b37975b6705057f73ee335dba8176bb784b607680c57d58c9ef62";
};
buildInputs = [ unittest2 ];

4
pkgs/development/python-modules/simple-salesforce/default.nix
View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "simple-salesforce";
version = "1.11.3";
version = "1.11.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "16bd40n0xy0vmsgi2499vc6mx57ksyjrm6v88bwxp49p9qrm4a23";
sha256 = "17d6g7zfhlgd2n4mimjarl2x4hl7ww2lb4izidlns1hzqm8igg4y";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/snowflake-connector-python/default.nix
View file

@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
version = "2.6.0";
version = "2.6.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0198d9c1934540ae9c7276d98f1048f3432160613d9d0e49398112bb21b0f0bb";
sha256 = "dbe6f7d84debd27b117e17fdb280be27695cf6ae54009c49495584d1b7776d1b";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-httpdomain";
version = "1.7.0";
version = "1.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "ac40b4fba58c76b073b03931c7b8ead611066a6aebccafb34dc19694f4eb6335";
sha256 = "2059cfabd0cca8fcc3455cc8ffad92f0915a7d3bb03bfddba078a6a0f35beec5";
};
propagatedBuildInputs = [ sphinx ];

2
pkgs/development/python-modules/torchvision/bin.nix
View file

@ -15,7 +15,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
version = "0.10.0";
version = "0.10.1";
in buildPythonPackage {
inherit version;

20
pkgs/development/python-modules/torchvision/binary-hashes.nix
View file

@ -6,21 +6,21 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version {
"0.10.0" = {
"0.10.1" = {
x86_64-linux-37 = {
name = "torchvision-0.10.0-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.0%2Bcu111-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-yMgRhp06/rYIIiDNehNrZYIrvIbPvusCxGJL0mL+Bs4=";
name = "torchvision-0.10.1-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-1MdsCrOLGkYpfbtv011/b6QG+yKaE+O0jUKeUVj2BJY=";
};
x86_64-linux-38 = {
name = "torchvision-0.10.0-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.0%2Bcu111-cp38-cp38-linux_x86_64.whl";
hash = "sha256-p1bw+4KsdTuXle+AwXYQVL8elPMroAHV9lkXJGWbtPc=";
name = "torchvision-0.10.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp38-cp38-linux_x86_64.whl";
hash = "sha256-LtmsnNSa9g3tCdjW1jhu7AZlGgfyYIVh5/2R+WwcxSo=";
};
x86_64-linux-39 = {
name = "torchvision-0.10.0-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.0%2Bcu111-cp39-cp39-linux_x86_64.whl";
hash = "sha256-AOfhnHThVdJx5qxj2LTj+T9dPMFxQoxP3duxIm1y7KE=";
name = "torchvision-0.10.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp39-cp39-linux_x86_64.whl";
hash = "sha256-ZOC/angyiLeOhe+7dAs0W6XlQRKK00T/iI+aBgFNpA0=";
};
};
}

4
pkgs/development/tools/continuous-integration/github-runner/default.nix
View file

@ -34,13 +34,13 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
version = "2.282.1";
version = "2.283.1";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
sha256 = "sha256-aDt+8vYR8bnaCmWUo3dqzVIekIr460/JzJkrpiPdIRw=";
sha256 = "sha256-S4Mql8lyHxahhYGoo91mlN6DrwKhyj1em0dv561j2l8=";
};
nativeBuildInputs = [

10
pkgs/tools/compression/upx/default.nix
View file

@ -8,15 +8,19 @@ stdenv.mkDerivation rec {
sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7";
};
CXXFLAGS = "-Wno-unused-command-line-argument";
buildInputs = [ ucl zlib perl ];
preConfigure = ''
export UPX_UCLDIR=${ucl}
'';
makeFlags = [ "-C" "src" "CHECK_WHITESPACE=true" ];
makeFlags = [
"-C" "src"
"CHECK_WHITESPACE=true"
# Disable blanket -Werror. Triggers failues on minor gcc-11 warnings.
"CXXFLAGS_WERROR="
];
installPhase = ''
mkdir -p $out/bin