From 71cda4fbef0c064b4df82ac65dd2cc868bb37c32 Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Fri, 27 Aug 2021 16:52:40 +0900 Subject: [PATCH 01/23] Bump the binaries of torchvision --- maintainers/maintainer-list.nix | 6 +++ .../python-modules/torchvision/bin.nix | 4 +- .../torchvision/binary-hashes.nix | 49 +++++++++++++------ .../python-modules/torchvision/prefetch.sh | 35 +++++++++++++ 4 files changed, 78 insertions(+), 16 deletions(-) create mode 100755 pkgs/development/python-modules/torchvision/prefetch.sh diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 43968e4d80d8..5401fbe800f2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5408,6 +5408,12 @@ githubId = 39434424; name = "Felix Springer"; }; + junjihashimoto = { + email = "junji.hashimoto@gmail.com"; + github = "junjihashimoto"; + githubId = 2469618; + name = "Junji Hashimoto"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 62980dcca8c4..35d2f8f13252 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -9,13 +9,13 @@ , pillow , python , pytorch-bin +, version ? "0.10.0" }: let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.9.1"; in buildPythonPackage { inherit version; @@ -54,6 +54,6 @@ in buildPythonPackage { changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ danieldk junjihashimoto ]; }; } diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index b9a991e24abb..0afd0a2f3a3a 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -3,20 +3,41 @@ # Precompiled wheels can be found at: # https://download.pytorch.org/whl/torch_stable.html -version: { - x86_64-linux-37 = { - name = "torchvision-${version}-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-7EMVB8KZg2I3P4RqnIVk/7OOAPA1OWOipns58cSCUrw="; +# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. + +version : builtins.getAttr version { + "0.9.1" = { + x86_64-linux-37 = { + name = "torchvision-0.9.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-0.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-7EMVB8KZg2I3P4RqnIVk/7OOAPA1OWOipns58cSCUrw="; + }; + x86_64-linux-38 = { + name = "torchvision-0.9.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-0.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-VjsCBW9Lusr4aDQLqaFh5dpV/5ZJ5PDs7nY4CbCHDTA="; + }; + x86_64-linux-39 = { + name = "torchvision-0.9.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-0.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-pzR7TBE+WcAmozskoeOVBuMkGJf9tvsaXsUkTcu86N8="; + }; }; - x86_64-linux-38 = { - name = "torchvision-${version}-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-VjsCBW9Lusr4aDQLqaFh5dpV/5ZJ5PDs7nY4CbCHDTA="; - }; - x86_64-linux-39 = { - name = "torchvision-${version}-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-pzR7TBE+WcAmozskoeOVBuMkGJf9tvsaXsUkTcu86N8="; + "0.10.0" = { + 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"; + sha256 = "1kh6zrid4jv2qh1fpgnghsy2p0k5dc9pmk90484bdziskn313j68"; + }; + 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"; + sha256 = "1xxlkdjj85sryvah381byfa1xgsl21vc307gjnbknxdchbxz0mm7"; + }; + 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"; + sha256 = "18gcf9nj5cfvvm7qqhkiq4y5sgzrwfsdhqxcwrqx4mg1fjff3rq0"; + }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh new file mode 100755 index 000000000000..5cb754a7bd6e --- /dev/null +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +version=$1 + +bucket="https://download.pytorch.org/whl/cu111" + +url_and_key_list=( +"x86_64-linux-37 $bucket/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" +"x86_64-linux-38 $bucket/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" +"x86_64-linux-39 $bucket/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torchvision-${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-prefetch-url "$url" --name "$name") + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " sha256 = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." From 129020eda640b37a977ff260d91ad12dc4e0581d Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Tue, 14 Sep 2021 04:25:30 +0000 Subject: [PATCH 02/23] Change hash-type from base32 to base64 --- .../python-modules/torchvision/binary-hashes.nix | 6 +++--- pkgs/development/python-modules/torchvision/prefetch.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 0afd0a2f3a3a..3b8fd7aaefa5 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -27,17 +27,17 @@ version : builtins.getAttr version { 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"; - sha256 = "1kh6zrid4jv2qh1fpgnghsy2p0k5dc9pmk90484bdziskn313j68"; + hash = "sha256-yMgRhp06/rYIIiDNehNrZYIrvIbPvusCxGJL0mL+Bs4="; }; 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"; - sha256 = "1xxlkdjj85sryvah381byfa1xgsl21vc307gjnbknxdchbxz0mm7"; + hash = "sha256-p1bw+4KsdTuXle+AwXYQVL8elPMroAHV9lkXJGWbtPc="; }; 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"; - sha256 = "18gcf9nj5cfvvm7qqhkiq4y5sgzrwfsdhqxcwrqx4mg1fjff3rq0"; + hash = "sha256-AOfhnHThVdJx5qxj2LTj+T9dPMFxQoxP3duxIm1y7KE="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 5cb754a7bd6e..57d35e591154 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -20,12 +20,12 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix-prefetch-url "$url" --name "$name") + hash=$(nix hash to-base64 --type sha256 `nix-prefetch-url "$url" --name "$name"`) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile echo " url = \"$url\";" >> $hashfile - echo " sha256 = \"$hash\";" >> $hashfile + echo " hash = \"sha256-$hash\";" >> $hashfile echo " };" >> $hashfile echo From 34e940938de9fdb0c8993841fe7a90f868b12bae Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Tue, 14 Sep 2021 04:33:32 +0000 Subject: [PATCH 03/23] Change nix-hash to nix-to-sri --- pkgs/development/python-modules/torchvision/prefetch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 57d35e591154..caa987d84409 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -20,12 +20,12 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-base64 --type sha256 `nix-prefetch-url "$url" --name "$name"`) + 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 = \"sha256-$hash\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile echo " };" >> $hashfile echo From 9b778be59d0d6ad65c38813deccd1170b5c6ba77 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 04:57:16 +0000 Subject: [PATCH 04/23] samba: 4.14.4 -> 4.14.7 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index d75b204db293..d7d545f19c61 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.14.4"; + version = "4.14.7"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "1fc9ix91hb1f35j69sk7rsi9pky2p0vsmw47s973bx801cm0kbw9"; + sha256 = "sha256-b1A1P5YCqiAkXrGM6wDn5ex5PfCXSuvVJUw48W2PGQY="; }; outputs = [ "out" "dev" "man" ]; From 60f4fa1efbec6c0364b0de1157ec69efe03ff143 Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Tue, 14 Sep 2021 15:52:13 +0000 Subject: [PATCH 05/23] Use nix-shell for prefetch.sh of torchvision --- pkgs/development/python-modules/torchvision/prefetch.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index caa987d84409..f57ac96bdb63 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -1,4 +1,5 @@ -#!/usr/bin/env bash +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts version=$1 From b1d9defabbf711a737bb5af036b1212f1375534d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 14 Sep 2021 23:48:36 +0200 Subject: [PATCH 06/23] mplayer: enable build on aarch64-darwin --- pkgs/applications/video/mplayer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1e439f57ef7b..644e35468fb5 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -223,11 +223,11 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with lib; { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; - license = "GPL"; - maintainers = [ lib.maintainers.eelco ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ eelco ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } From 4c89019ad9e111700de2d7ed2da5447feea742c4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 15 Sep 2021 08:47:30 +0200 Subject: [PATCH 07/23] cosign: 1.1.0 -> 1.2.0 https://github.com/sigstore/cosign/releases/tag/v1.2.0 --- pkgs/tools/security/cosign/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 0f81fb4a3d18..329040a4dba9 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FG6LAaz6n2l77Wr7SYmwzL10G5gyHPCPG05hQlsOQBI="; + sha256 = "sha256-KiXcAuww0dZ78ilRp7j0JX6VAbOvmfd9h+LrOjrKaJo="; }; buildInputs = @@ -17,9 +17,9 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-OKQVgF/pg4cigMkckX/dclieHCoD39ltR+DegaUfSDk="; + vendorSha256 = "sha256-yrUfSRCwoxoH2sM5KuApaIj7YF7SPXx9vTlXS+pA5CY="; - excludedPackages = "\\(copasetic\\)"; + excludedPackages = "\\(copasetic\\|sample\\|webhook\\)"; tags = lib.optionals pivKeySupport [ "pivkey" ]; From cb5023dbf14e997935c83434b976f553aef642f0 Mon Sep 17 00:00:00 2001 From: Junji Hashimoto Date: Wed, 15 Sep 2021 09:00:43 +0000 Subject: [PATCH 08/23] Revert the argument of version, and remove 0.9.1 --- .../python-modules/torchvision/bin.nix | 2 +- .../torchvision/binary-hashes.nix | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index cac01cbcb596..e874d22c1029 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -9,13 +9,13 @@ , pillow , python , pytorch-bin -, version ? "0.10.0" }: let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; + version = "0.10.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 3b8fd7aaefa5..c9b5a4df42ea 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,23 +6,6 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.9.1" = { - x86_64-linux-37 = { - name = "torchvision-0.9.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-7EMVB8KZg2I3P4RqnIVk/7OOAPA1OWOipns58cSCUrw="; - }; - x86_64-linux-38 = { - name = "torchvision-0.9.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-VjsCBW9Lusr4aDQLqaFh5dpV/5ZJ5PDs7nY4CbCHDTA="; - }; - x86_64-linux-39 = { - name = "torchvision-0.9.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-0.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-pzR7TBE+WcAmozskoeOVBuMkGJf9tvsaXsUkTcu86N8="; - }; - }; "0.10.0" = { x86_64-linux-37 = { name = "torchvision-0.10.0-cp37-cp37m-linux_x86_64.whl"; From 9c7aa4b83cbef56daae1f479e1fdc75d1895d98d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 10:51:34 +0000 Subject: [PATCH 09/23] python38Packages.progressbar2: 3.53.2 -> 3.53.3 --- pkgs/development/python-modules/progressbar2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 60844bdc9e6f..972c0f0bb754 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.53.2"; + version = "3.53.3"; src = fetchPypi { inherit pname version; - sha256 = "8c150baaa33448c1e34a2cafa5108285d96f2c877bdf64fcbd77f26cb135435d"; + sha256 = "f4e1c2d48e608850c59f793d6e74ccdebbcbaac7ffe917d45e9646ec0d664d6d"; }; propagatedBuildInputs = [ python-utils ]; From 2cae2dd51803d114a5f91ffb0e77fe319150edbc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 23:45:50 +0000 Subject: [PATCH 10/23] tanka: 0.17.2 -> 0.17.3 --- pkgs/applications/networking/cluster/tanka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 56642fb64d33..e1ea0a690c95 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a7utYYuCgFabKILUKnKF0fcrorlV1DYMOFMRkm5QMuU="; + sha256 = "sha256-Khu6ovtcXkqqt3W4OoJ09INgv80tw/6uDcJS+jt3y0Y="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; From 6e98c0ed8114be25701197d35d054e51a211828a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 07:02:11 +0000 Subject: [PATCH 11/23] dockle: 0.3.15 -> 0.4.2 --- pkgs/development/tools/dockle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index 084f5eea21d3..9d6510c89d8d 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.15"; + version = "0.4.2"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jxFlbGJ95cSv08HcqrVufpTE5KkvAC9zOTQ2+JZWe5A="; + sha256 = "sha256-H+qJBwKh+jh5ECMPbPgGtXzF+mm73ut0+URqpNBc3SM="; }; - vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw="; + vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; From 05f3789ef8f12ba3457a0d02024befcfdfa11c96 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Sep 2021 15:16:47 +0200 Subject: [PATCH 12/23] nixpkgs/manual: add mvapich to overlays/mpi section --- doc/using/overlays.chapter.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index 037580583b6b..d2e3b49a6aa9 100644 --- a/doc/using/overlays.chapter.md +++ b/doc/using/overlays.chapter.md @@ -138,6 +138,8 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas - [MPICH](https://www.mpich.org/), attribute name `mpich` +- [MVAPICH](https://mvapich.cse.ohio-state.edu/), attribute name `mvapich` + To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay: ```nix From 5ea9388abc67ffc72204afcd519245ab69563a85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Sep 2021 22:44:39 +0200 Subject: [PATCH 13/23] python3Packages.requests-pkcs12: 1.12 -> 1.13 --- pkgs/development/python-modules/requests-pkcs12/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index 9ebfaa77da5c..00277daf8a3e 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "sha256-fMmca3QNr9UBpSHcVf0nHmGmvkW99bnmigHcWj0D2g0="; + sha256 = "0mc9zpa0d9gijf56mxmsxy4qdcm200ixhnm6i3y5xc2yfv9r6xqy"; }; propagatedBuildInputs = [ From 97399a8a00bacca673fd330c1aceea174b0f3fd0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Sep 2021 22:52:19 +0200 Subject: [PATCH 14/23] python3Packages.slowapi: 0.1.4 -> 0.1.5 --- .../development/python-modules/slowapi/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index a1e54a6c5f93..9ae293e455c7 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fastapi , fetchFromGitHub -, fetchpatch , limits , mock , hiro @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "slowapi"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = "laurentS"; repo = pname; rev = "v${version}"; - sha256 = "0bnnzgv2wy145sdab54hljwv1b5029ndrr0y9rc2q0mraz8lf8lm"; + sha256 = "1wjnlhjfgil86h6i5yij723ncg18rqdprs1q6i68w4msaspwpxg9"; }; nativeBuildInputs = [ @@ -49,15 +48,6 @@ buildPythonPackage rec { "test_endpoint_response_param_invalid" ]; - patches = [ - # Switch to poetry-core, https://github.com/laurentS/slowapi/pull/54 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/laurentS/slowapi/commit/fe165f2d479f4f8e4b7dd9cd88ec0ae847b490c5.patch"; - sha256 = "16vjxdjjiyg8zjrgfyg9q2ym2lmnms2zy5d2cg3ccg51cfl715fi"; - }) - ]; - pythonImportsCheck = [ "slowapi" ]; meta = with lib; { From 7f39537c8dc8bb357c818e4c2622d0d5c0739f64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Sep 2021 22:58:29 +0200 Subject: [PATCH 15/23] python3Packages.slack-sdk: 3.10.1 -> 3.11.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 92712b2ce41f..c1933198af7e 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.10.1"; + version = "3.11.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "1m9jbn5wn892f22lxkxgahlbnwflak50hfjrydblp4agsag94nsg"; + sha256 = "0zwz36mpc7syrkslf1rf7c6sxfanw87mbr2758j01sph50m43g6m"; }; propagatedBuildInputs = [ From f1cae8a9148bed5ccaef8f5e7a645675846b07d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Sep 2021 23:03:08 +0200 Subject: [PATCH 16/23] python3Packages.minidump: 0.0.19 -> 0.0.20 --- pkgs/development/python-modules/minidump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 589b7e351c1e..2f1f4718c611 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.19"; + version = "0.0.20"; src = fetchPypi { inherit pname version; - sha256 = "67b3327cb96e319633653a353c6281703772335dc84797d6fdce7daf0b3be077"; + sha256 = "1rr91nnlzv7gnbcvv8qhbyx1kh2s4jdv7nv0qka5jya32rzjaigm"; }; # Upstream doesn't have tests From 4843b5658f4d1cf61d740fd9e5e6f47196458947 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 21:44:28 +0000 Subject: [PATCH 17/23] yq-go: 4.12.2 -> 4.13.0 --- pkgs/development/tools/yq-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 88d2c555b576..89844763514d 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.12.2"; + version = "4.13.0"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-sd9S9aWilFrdxKnUaZBWYPDvC5mPCjqwBjpIRHgd98k="; + sha256 = "sha256-9yKCFEtGg6TiHo3PGobVzQSbqc27ptKhH+2WgbLKXRI="; }; vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I="; From 344c501f8831f46c08a9d5836c9b9c5920d1367b Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 17 Sep 2021 00:20:45 +0200 Subject: [PATCH 18/23] qtile: 0.18.0 -> 0.18.1 --- pkgs/applications/window-managers/qtile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index ae62cdbbba14..786a47d49c34 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -11,13 +11,13 @@ let unwrapped = pythonPackages.buildPythonPackage rec { pname = "qtile"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "sha256-S9G/EI18p9EAyWgI1ajDrLimeE+ETBC9feUDb/QthqI="; + sha256 = "0ln0fxarin9liy9n76zywmbr31xrjw8f7d3nr1mphci7wkc9bqmm"; }; postPatch = '' From 7399c67273ca74f61aa7da208cd75d51453731c4 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 17 Sep 2021 05:41:58 +0000 Subject: [PATCH 19/23] exploitdb: 2021-09-14 -> 2021-09-17 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 31b7c9eb16a4..ecad16ad3dfe 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-14"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-6VTJzR0kdQEFLW0aG3iZGthJF9nYd7NIkzSNhHpgF44="; + sha256 = "sha256-vpRthxgvDK2J9OnhF1AQR3yKxvrETLDM1APas8ZM8W8="; }; installPhase = '' From a96fe065eee37d61972386b96d1573102b12b4a2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 17 Sep 2021 10:58:39 +0200 Subject: [PATCH 20/23] nix-output-monitor: 1.0.3.1 -> 1.0.3.2 --- pkgs/tools/nix/nix-output-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a9c83305df3e..94c5f0afb2c6 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.1"; + version = "1.0.3.2"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1kkf6cqq8aba8vmfcww30ah9j44bwakanyfdb6595vmaq5hrsq92"; + sha256 = "0srfclmqrqcx8b756yxww24ya0xn2ajxbgj07mcvdvwbwl09pys8"; rev = "v${version}"; }; isLibrary = true; From 076bb67140119547b17de0ed6597cf51fae55a13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 17 Sep 2021 09:54:54 +0000 Subject: [PATCH 21/23] macchina: 1.1.4 -> 1.1.5 --- pkgs/tools/misc/macchina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 5d85a80c6164..323429033b6c 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eZeS3lS/eKGvS7CoCnwhkX7jSwAqZOKLMWvLfZPzGtA="; + sha256 = "sha256-ZrBjpmyc9cHaaVzMAdksFVa3iEX/FWCCcdwyPH66E5s="; }; - cargoSha256 = "sha256-Ix+Zj5qj1So8Urobw+78yCdRAerFkPctIkousk266DU="; + cargoSha256 = "sha256-pINaBieDf+2GGid2vsgvNYy0zwjxXaPcBw0Yoy6KGi8="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; From 29f8f30b37c0fe0da9c64e38c9248e59869cb450 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 17 Sep 2021 11:36:46 +0200 Subject: [PATCH 22/23] zfsStable, zfsUnstable: fix eval --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 4d3716ef528b..e4c6faa94749 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_13 ? pkgs.linuxKernel.packages.linux_5_13 +, linuxPackages_5_14 ? pkgs.linuxKernel.packages.linux_5_14 }: with lib; From 38431cf21c59a84c0ddedccc0cd66540a550ec26 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 3 Aug 2021 15:24:34 +0200 Subject: [PATCH 23/23] nixos/wordpress: caddy support --- .../from_md/release-notes/rl-2111.section.xml | 4 +-- .../manual/release-notes/rl-2111.section.md | 2 +- nixos/modules/services/web-apps/wordpress.nix | 29 ++++++++++++++++++- nixos/tests/wordpress.nix | 18 +++++++++++- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 7a0406662b71..3c60226b224d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1056,8 +1056,8 @@ Superuser created successfully. The wordpress module provides a new interface which allows to use different webservers with the new option services.wordpress.webserver. - Currently httpd and - nginx are supported. The definitions of + Currently httpd, caddy + and nginx are supported. The definitions of wordpress sites should now be set in services.wordpress.sites. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 0ff62983b057..256c15fb4988 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -317,7 +317,7 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. -- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). +- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd`, `caddy` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 6f1ef815bc46..eb91256045cc 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -278,7 +278,7 @@ in }; options.webserver = mkOption { - type = types.enum [ "httpd" "nginx" ]; + type = types.enum [ "httpd" "nginx" "caddy" ]; default = "httpd"; description = '' Whether to use apache2 or nginx for virtual host management. @@ -458,5 +458,32 @@ in }; }) + (mkIf (cfg.webserver == "caddy") { + services.caddy = { + enable = true; + virtualHosts = mapAttrs' (hostName: cfg: ( + nameValuePair "http://${hostName}" { + extraConfig = '' + root * /${pkg hostName cfg}/share/wordpress + file_server + + php_fastcgi unix/${config.services.phpfpm.pools."wordpress-${hostName}".socket} + + @uploads { + path_regexp path /uploads\/(.*)\.php + } + rewrite @uploads / + + @wp-admin { + path not ^\/wp-admin/* + } + rewrite @wp-admin {path}/index.php?{query} + ''; + } + )) eachSite; + }; + }) + + ]); } diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 45c58b5b65c8..f7f39668c86e 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -45,6 +45,21 @@ import ./make-test-python.nix ({ pkgs, ... }: networking.firewall.allowedTCPPorts = [ 80 ]; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; + + wp_caddy = { ... }: { + services.wordpress.webserver = "caddy"; + services.wordpress.sites = { + "site1.local" = { + database.tablePrefix = "site1_"; + }; + "site2.local" = { + database.tablePrefix = "site2_"; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; + }; }; testScript = '' @@ -54,10 +69,11 @@ import ./make-test-python.nix ({ pkgs, ... }: wp_httpd.wait_for_unit("httpd") wp_nginx.wait_for_unit("nginx") + wp_caddy.wait_for_unit("caddy") site_names = ["site1.local", "site2.local"] - for machine in (wp_httpd, wp_nginx): + for machine in (wp_httpd, wp_nginx, wp_caddy): for site_name in site_names: machine.wait_for_unit(f"phpfpm-wordpress-{site_name}")