From 2cb3d3be8a37b2fc2d2e3c2a52453867f42aea3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 06:17:43 +0000 Subject: [PATCH 01/11] argo: 2.12.7 -> 2.12.8 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 8460322f05b..fead762996a 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.12.7"; + version = "2.12.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-bMbfFAI4oGZc7FOlU8LczbjAq1cYmJg5WTXkQKS9vgo="; + sha256 = "sha256-JtT4SMoozfTWsQ4YsoQ8xLQ/vCO7hnVEp2umg+p7mRw="; }; vendorSha256 = "sha256-4XPMixVNj6PUKobNLwpsOBT7Zs/7pkhDtQacLIB5EfE="; From 60e0cc8cd8a7ee0007e9e0721d739ab0b5fc8318 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Feb 2021 22:38:51 +0000 Subject: [PATCH 02/11] rtsp-simple-server: 0.14.0 -> 0.14.1 --- pkgs/servers/rtsp-simple-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index b5861ce3221..4ea79ffe468 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PjITPuCndz/EuFEt9docmWN93TwZQbnyHV161hUwS0="; + sha256 = "sha256-+odGLuUU6KWcSukt/WpZnO1KMRTGY2fzPsXTL1xhlrk="; }; - vendorSha256 = "sha256-6tp1hN1dRKm523IegMpsTO+/gktywqdNZflUbE4TPuU="; + vendorSha256 = "sha256-P8NYnTItayuWLQpwl5D6I8K5MVm2Qh1hWl2c78n8CJo="; # Tests need docker doCheck = false; From 84786ebecd08ca6bf61ebda039ffc608a7f88083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 14 Feb 2021 11:15:02 +0100 Subject: [PATCH 03/11] cudnn_cudatoolkit_11: remove libcudnn_cnn_infer.so exception With the update to CuDNN 8.1, we do not get the "maximum file size exceeded" error anymore when patchelf'ing libcudnn_cnn_infer.so. This change removes the exception for that library. --- pkgs/development/libraries/science/math/cudnn/generic.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 59c0b7f4498..e5f09f142dd 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -38,13 +38,7 @@ stdenv.mkDerivation { # See the explanation in addOpenGLRunpath. postFixup = '' for lib in $out/lib/lib*.so; do - # patchelf fails on libcudnn_cnn_infer due to it being too big. - # Most programs will still get the RPATH since they link to - # other things. - # (https://github.com/NixOS/patchelf/issues/222) - if [ "$(basename $lib)" != libcudnn_cnn_infer.so ]; then - addOpenGLRunpath $lib - fi + addOpenGLRunpath $lib done ''; From 8dad19aebeef4c8775df46e3485c73cfd126c2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 14 Feb 2021 11:27:50 +0100 Subject: [PATCH 04/11] cudnn_cudatookit_11: add $ORIGIN/ to library RPATHs Starting with version 8, CuDNN consists of multiple libraries. Libraries (except libcudnn.so) are dlopen()ed on demand. Since the CuDNN library path itself was not added to the rpath of the libraries, use of CuDNN often fails with the following error: Could not load library libcudnn_cnn_train.so.8. Error: libcudnn_ops_train.so.8: cannot open shared object file: No such file or directory Please make sure libcudnn_cnn_train.so.8 is in your library path! This change fixes this by adding $ORIGIN/ to the rpath of all CuDNN libraries. --- pkgs/development/libraries/science/math/cudnn/generic.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index e5f09f142dd..566a17c6147 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -25,9 +25,12 @@ stdenv.mkDerivation { installPhase = '' function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1 } - fixRunPath lib64/libcudnn.so + + for lib in lib64/lib*.so; do + fixRunPath $lib + done mkdir -p $out cp -a include $out/include From 055b7e2a5d2652e5b110e2be80200187b556ce4e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 14 Feb 2021 12:23:16 +0100 Subject: [PATCH 05/11] nixos/nextcloud: fix regex to not return 404 on ACME challenges Fixes #113027 --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 60d40355335..9928bc20e69 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -614,7 +614,7 @@ in { "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)".extraConfig = '' return 404; ''; - "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = '' + "~ ^/(?:\\.(?!well-known)|autotest|occ|issue|indie|db_|console)".extraConfig = '' return 404; ''; "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = { From 4c521db1f90e3e221009288887c72787bd782a44 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 28 Dec 2020 11:31:04 -0500 Subject: [PATCH 06/11] ccls: use llvmPackages_latest --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0a3c3dee8d..9e343fa6993 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12026,8 +12026,7 @@ in cpplint = callPackage ../development/tools/analysis/cpplint { }; ccls = callPackage ../development/tools/misc/ccls { - llvmPackages = llvmPackages_8; - stdenv = llvmPackages_8.stdenv; + llvmPackages = llvmPackages_latest; }; credstash = with python3Packages; toPythonApplication credstash; From 53abd00b1f7e1b387aaa39dca3447e5e0308dfb3 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 13 Feb 2021 20:58:56 +0100 Subject: [PATCH 07/11] perlPackages.TextWrapI18N: don't propagate glibc --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f0ca4bdbaec..de618934d40 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21922,15 +21922,14 @@ let url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz"; sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"; }; - propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; + buildInputs = [ pkgs.glibcLocales ]; + propagatedBuildInputs = [ TextCharWidth ]; preConfigure = '' substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc.bin}/bin/locale' ''; meta = { description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words"; license = with lib.licenses; [ artistic1 gpl2 ]; - # bogus use of glibc, pretty sure, think this is what we have glibcLocales for? - broken = stdenv.hostPlatform.libc != "glibc"; }; }; From f89652a23e80ec0aa74220304f71aba893704947 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 15 Feb 2021 11:03:12 +0100 Subject: [PATCH 08/11] nixos/nextcloud: redirect /.well-known/*dav to https url Fixes #113155 --- nixos/modules/services/web-apps/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 60d40355335..c8cacdc5802 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -603,10 +603,10 @@ in { priority = 210; extraConfig = '' location = /.well-known/carddav { - return 301 $scheme://$host/remote.php/dav; + return 301 /remote.php/dav; } location = /.well-known/caldav { - return 301 $scheme://$host/remote.php/dav; + return 301 /remote.php/dav; } try_files $uri $uri/ =404; ''; From 2bf291a43618f47368f3a0cf52ebc9982da5041c Mon Sep 17 00:00:00 2001 From: ilian Date: Mon, 15 Feb 2021 14:50:48 +0100 Subject: [PATCH 09/11] yaml2json: unstable-2017-05-03 -> 1.3 --- pkgs/development/tools/yaml2json/default.nix | 10 ++++------ pkgs/development/tools/yaml2json/deps.nix | 11 ----------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/tools/yaml2json/deps.nix diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index 77f884b82b6..543ed7fc3ea 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -1,18 +1,16 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "yaml2json"; - version = "unstable-2017-05-03"; + version = "1.3"; goPackagePath = "github.com/bronze1man/yaml2json"; - goDeps = ./deps.nix; - src = fetchFromGitHub { - rev = "ee8196e587313e98831c040c26262693d48c1a0c"; owner = "bronze1man"; repo = "yaml2json"; - sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw"; + rev = "v${version}"; + sha256 = "0bhjzl4qibiyvn56wcsm85f3vwnlzf4gywy2gq9mrnbrl629amq1"; }; meta = with lib; { diff --git a/pkgs/development/tools/yaml2json/deps.nix b/pkgs/development/tools/yaml2json/deps.nix deleted file mode 100644 index f907520cc87..00000000000 --- a/pkgs/development/tools/yaml2json/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } -] From bb419e051d19e04046085f6c7d4ec1f363086a64 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Feb 2021 03:53:04 +1000 Subject: [PATCH 10/11] buildGoModule: use assert for checking goPackagePath (#113046) also remove a `disabled` leftover from 26117ed4b78020252e49fe75f562378063471f71 --- pkgs/development/go-modules/generic/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index c0f10ab5d8f..8246eaefed4 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -34,14 +34,16 @@ , meta ? {} # Not needed with buildGoModule -, goPackagePath ? null +, goPackagePath ? "" , ... }@args': with builtins; +assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; + let - args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ]; + args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" ]; go-modules = if vendorSha256 != null then stdenv.mkDerivation (let modArgs = { @@ -240,7 +242,5 @@ let [ lib.maintainers.kalbasit ]; }; }); -in if (goPackagePath != null) then - throw "`goPackagePath` not needed with `buildGoModule`" -else +in package From d9be3c767cbc2551f3e041add8b1a00ac10e8b21 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Feb 2021 04:06:35 +1000 Subject: [PATCH 11/11] go_bootstrap: remove top-level attribute (#113113) this package should only be used internally for go_* --- pkgs/development/compilers/go/1.14.nix | 7 ++++++- pkgs/development/compilers/go/1.15.nix | 7 ++++++- pkgs/development/compilers/go/2-dev.nix | 7 ++++++- pkgs/development/compilers/go/bootstrap.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ------------- 5 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/compilers/go/bootstrap.nix diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 43ae68ebc15..2720ad6cf0b 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -4,15 +4,20 @@ , buildPackages , pkgsBuildTarget , fetchpatch +, callPackage }: let inherit (lib) optionals optionalString; + go_bootstrap = callPackage ./bootstrap.nix { + inherit Security; + }; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 2f3c420e963..284ddd6451e 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -4,15 +4,20 @@ , buildPackages , pkgsBuildTarget , fetchpatch +, callPackage }: let inherit (lib) optionals optionalString; + go_bootstrap = callPackage ./bootstrap.nix { + inherit Security; + }; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix index 3e09f7c0fad..8b8df28e1b6 100644 --- a/pkgs/development/compilers/go/2-dev.nix +++ b/pkgs/development/compilers/go/2-dev.nix @@ -4,15 +4,20 @@ , buildPackages , pkgsBuildTarget , fetchpatch +, callPackage }: let inherit (lib) optionals optionalString; + go_bootstrap = callPackage ./bootstrap.nix { + inherit Security; + }; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ diff --git a/pkgs/development/compilers/go/bootstrap.nix b/pkgs/development/compilers/go/bootstrap.nix new file mode 100644 index 00000000000..12ef9a25a4e --- /dev/null +++ b/pkgs/development/compilers/go/bootstrap.nix @@ -0,0 +1,17 @@ +{ stdenv, srcOnly, fetchurl, callPackage, Security }: + +let +go_bootstrap = if stdenv.isAarch64 then + srcOnly { + name = "go-1.8-linux-arm64-bootstrap"; + src = fetchurl { + url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; + sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; + }; + } +else + callPackage ./1.4.nix { + inherit Security; + }; +in + go_bootstrap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09700ec4a41..36730983660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10143,19 +10143,6 @@ in glslang = callPackage ../development/compilers/glslang { }; - go_bootstrap = if stdenv.isAarch64 then - srcOnly { - name = "go-1.8-linux-arm64-bootstrap"; - src = fetchurl { - url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; - sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; - }; - } - else - callPackage ../development/compilers/go/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 {