From 91953dbf607bee5508c8de785f42e01fe7339346 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Jun 2021 04:33:22 +0000 Subject: [PATCH 01/32] gpg-tui: 0.3.0 -> 0.4.0 --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 756dff04c91..8b45a675b1f 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-5vhFgJZY1yaYFPS2qvrYGX3xyT0PbRKW2jmR4gz12Co="; + sha256 = "sha256-5noaBfOpUck8+FQQDohKfThN3jJ9ogvZ8iMdySlwENE="; }; - cargoSha256 = "sha256-g38L/FgqAsFh/ECZnNkJVCC/44z5VW3WK8mgIEEy7BQ="; + cargoSha256 = "sha256-OMbyoAVKnnLbFSO7gqxjBXmIjJg4K2ioE0ClYu9UyW4="; nativeBuildInputs = [ gpgme # for gpgme-config From 38e40a73fe3787728c4e2ded6bc2483fb81838df Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Wed, 9 Jun 2021 10:03:12 +0100 Subject: [PATCH 02/32] aws-iam-authenticator: 0.5.2 -> 0.5.3 I had to work around inconsistent vendoring; see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 --- pkgs/tools/security/aws-iam-authenticator/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index f0eda76821d..d9f4f4a0173 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "1xfc3a0dik4930va30sbl6687v6i5irv96fwis9lrqh5rjqnblqp"; + sha256 = "0ga3vf5gn7533iqnxn7kchb6xg5wvk92livlqzkhi5qvqhl1sbw0"; }; - vendorSha256 = null; + # Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 + deleteVendor = true; + vendorSha256 = "+Z8sENIMWXP29Piwb/W6i7UdNXVq6ZnO7AZbSaUYCME="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; From cb51b41ccf84814c5ae45d7a5f219d25ea7bb4d1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 9 Jun 2021 18:49:41 +0200 Subject: [PATCH 03/32] llvmPackages_git: fix variable shadowing The first substitution was not passed to the 2nd re.sub call as seems to be the intention of the original change. --- pkgs/development/compilers/llvm/update-git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py index 119a050e470..ec1a30c6b0f 100755 --- a/pkgs/development/compilers/llvm/update-git.py +++ b/pkgs/development/compilers/llvm/update-git.py @@ -64,7 +64,7 @@ default_nix = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/defa with fileinput.FileInput(default_nix, inplace=True) as f: for line in f: result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) - result = re.sub(r'^ version = ".+";', f' version = "{version}";', line) + result = re.sub(r'^ version = ".+";', f' version = "{version}";', result) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result) print(result, end='') From cd92f32734cf1a73d66fdcc064561f0398c7fa15 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 9 Jun 2021 11:14:34 +0000 Subject: [PATCH 04/32] busybox: 1.32.1 -> 1.33.1; clarify license The patch for CVE-2021-28831 is included in this release. --- pkgs/os-specific/linux/busybox/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 63435e09168..4949cd7c14a 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab, fetchpatch +{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab , enableStatic ? stdenv.hostPlatform.isStatic , enableMinimal ? false # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: @@ -32,7 +32,7 @@ let CONFIG_FEATURE_WTMP n ''; - # The debian version lacks behind the upstream version and also contains + # The debian version lags behind the upstream version and also contains # a debian-specific suffix. We only fetch the debian repository to get the # default.script debianVersion = "1.30.1-6"; @@ -49,17 +49,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - # TODO: When bumping to next version, remove the patch - # for CVE-2021-28831 (assuming the patch was included in - # the next upstream release) - version = "1.32.1"; + version = "1.33.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx"; + sha256 = "0a0dcvsh7nxnhxc5y73fky0z30i9p7r30qfidm2akn0n5fywdkhj"; }; hardeningDisable = [ "format" "pie" ] @@ -67,11 +64,6 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - (fetchpatch { - name = "CVE-2021-28831.patch"; - url = "https://git.busybox.net/busybox/patch/?id=f25d254dfd4243698c31a4f3153d4ac72aa9e9bd"; - sha256 = "0y79flfbk45krwn963nnbqc21a88bsz4k4asqwvcnfk2lkciadxm"; - }) # TODO: Removing when bumping the version ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; @@ -142,7 +134,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ TethysSvensson ]; platforms = platforms.linux; priority = 10; From 83f6711464e03a856fb554693fe2e0f3af2ab0d5 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 8 Jun 2021 00:52:17 +0200 Subject: [PATCH 05/32] neovim.tests: added more tests to check for creation of vi/vim aliases. These tests also now follow the coding conventions of having tests in passthru.test . --- .../editors/neovim}/neovim-override.vim | 0 pkgs/applications/editors/neovim/tests.nix | 135 ++++++++++++++++++ pkgs/applications/editors/neovim/wrapper.nix | 4 + pkgs/test/vim/default.nix | 107 +------------- 4 files changed, 142 insertions(+), 104 deletions(-) rename pkgs/{test/vim => applications/editors/neovim}/neovim-override.vim (100%) create mode 100644 pkgs/applications/editors/neovim/tests.nix diff --git a/pkgs/test/vim/neovim-override.vim b/pkgs/applications/editors/neovim/neovim-override.vim similarity index 100% rename from pkgs/test/vim/neovim-override.vim rename to pkgs/applications/editors/neovim/neovim-override.vim diff --git a/pkgs/applications/editors/neovim/tests.nix b/pkgs/applications/editors/neovim/tests.nix new file mode 100644 index 00000000000..f9d0d659b73 --- /dev/null +++ b/pkgs/applications/editors/neovim/tests.nix @@ -0,0 +1,135 @@ +{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable +, neovim-unwrapped +, fetchFromGitLab +, pkgs +}: +let + inherit (vimUtils) buildVimPluginFrom2Nix; + inherit (neovimUtils) makeNeovimConfig; + + packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; + + plugins = with vimPlugins; [ + { + plugin = vim-obsession; + config = '' + map $ Obsession + ''; + } + ]; + + nvimConfNix = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + nvimAutoDisableWrap = makeNeovimConfig { }; + + nvimConfDontWrap = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + wrapNeovim2 = suffix: config: + wrapNeovimUnstable neovim-unwrapped (config // { + extraName = suffix; + }); + + nmt = fetchFromGitLab { + owner = "rycee"; + repo = "nmt"; + rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; + sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; + }; + + runTest = neovim-drv: buildCommand: + pkgs.runCommandLocal "test-${neovim-drv.name}" ({ + nativeBuildInputs = [ ]; + meta.platforms = neovim-drv.meta.platforms; + }) ('' + source ${nmt}/bash-lib/assertions.sh + vimrc="${writeText "init.vim" neovim-drv.initRc}" + vimrcGeneric="$out/patched.vim" + mkdir $out + ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" + '' + buildCommand); + +in + pkgs.recurseIntoAttrs ( +rec { + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; + + ### neovim tests + ################## + nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; + + nvim_via_override = neovim.override { + extraName = "-via-override"; + configure = { + packages.foo.start = [ vimPlugins.ale ]; + customRC = '' + :help ale + ''; + }; + }; + + nvim_with_aliases = neovim.override { + extraName = "-with-aliases"; + vimAlias = true; + viAlias = true; + }; + + # nixpkgs should detect that no wrapping is necessary + nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; + + # this will generate a neovimRc content but we disable wrapping + nvimDontWrap = wrapNeovim2 "-forced-nowrap" (makeNeovimConfig { + wrapRc = false; + customRC = '' + " this shouldn't trigger the creation of an init.vim + ''; + }); + + force-nowrap = runTest nvimDontWrap '' + ! grep "-u" ${nvimDontWrap}/bin/nvim + ''; + + nvim_via_override-test = runTest nvim_via_override '' + assertFileContent \ + "$vimrcGeneric" \ + "${./neovim-override.vim}" + ''; + + + checkAliases = runTest nvim_with_aliases '' + folder=${nvim_with_aliases}/bin + assertFileExists "$folder/vi" + assertFileExists "$folder/vim" + ''; + + # having no RC generated should autodisable init.vim wrapping + nvim_autowrap = runTest nvim_via_override '' + ! grep "-u" ${nvimShouldntWrap}/bin/nvim + ''; + + + # system remote plugin manifest should be generated, deoplete should be usable + # without the user having to do `UpdateRemotePlugins`. To test, launch neovim + # and do `:call deoplete#enable()`. It will print an error if the remote + # plugin is not registered. + test_nvim_with_remote_plugin = neovim.override { + extraName = "-pathogen-remote"; + configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + }; + + # only neovim makes use of `requiredPlugins`, test this here + test_nvim_with_vim_nix_using_pathogen = neovim.override { + extraName = "-pathogen"; + configure.pathogen.pluginNames = [ "vim-nix" ]; + }; +}) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 07a1dad7c09..96b61a43cca 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -4,6 +4,7 @@ , nodejs , nodePackages , python3Packages +, callPackage }: with lib; @@ -120,6 +121,9 @@ let passthru = { unwrapped = neovim; initRc = neovimRcContent; + + tests = callPackage ./tests.nix { + }; }; meta = neovim.meta // { diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 3bdc3234134..cb3953a63f5 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,104 +1,16 @@ -{ vimUtils, vim_configurable, writeText, neovim, vimPlugins -, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable -, neovim-unwrapped -, fetchFromGitLab +{ vimUtils, vim_configurable, writeText, vimPlugins +, lib, fetchFromGitHub , pkgs }: let inherit (vimUtils) buildVimPluginFrom2Nix; - inherit (neovimUtils) makeNeovimConfig; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - plugins = with vimPlugins; [ - { - plugin = vim-obsession; - config = '' - map $ Obsession - ''; - } - ]; - - nvimConfNix = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - - nvimConfDontWrap = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - - wrapNeovim2 = suffix: config: - wrapNeovimUnstable neovim-unwrapped (config // { - extraName = suffix; - }); - - nmt = fetchFromGitLab { - owner = "rycee"; - repo = "nmt"; - rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; - sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; - }; - - runTest = neovim-drv: buildCommand: - pkgs.runCommandLocal "test-${neovim-drv.name}" ({ - nativeBuildInputs = [ ]; - meta.platforms = neovim-drv.meta.platforms; - }) ('' - source ${nmt}/bash-lib/assertions.sh - vimrc="${writeText "init.vim" neovim-drv.initRc}" - vimrcGeneric="$out/patched.vim" - mkdir $out - ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" - '' + buildCommand); - in - pkgs.recurseIntoAttrs ( -rec { + pkgs.recurseIntoAttrs (rec { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; - ### neovim tests - ################## - nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; - - nvim_via_override = neovim.override { - extraName = "-via-override"; - configure = { - packages.foo.start = [ vimPlugins.ale ]; - customRC = '' - :help ale - ''; - }; - }; - - - # nixpkgs should detect that no wrapping is necessary - nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimConfNix; - - - # this will generate a neovimRc content but we disable wrapping - nvimDontWrap = wrapNeovim2 "-dont-wrap" (makeNeovimConfig { - wrapRc = false; - customRC = '' - " this shouldn't trigger the creation of an init.vim - ''; - }); - - nvim_dontwrap-test = runTest nvimDontWrap '' - ! grep "-u" ${nvimDontWrap}/bin/nvim - ''; - - nvim_via_override-test = runTest nvim_via_override '' - assertFileContent \ - "$vimrcGeneric" \ - "${./neovim-override.vim}" - ''; - ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { @@ -126,11 +38,6 @@ rec { vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; }; - # only neovim makes use of `requiredPlugins`, test this here - test_nvim_with_vim_nix_using_pathogen = neovim.override { - configure.pathogen.pluginNames = [ "vim-nix" ]; - }; - # regression test for https://github.com/NixOS/nixpkgs/issues/53112 # The user may have specified their own plugins which may not be formatted # exactly as the generated ones. In particular, they may not have the `pname` @@ -153,12 +60,4 @@ rec { }); vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; }; - - # system remote plugin manifest should be generated, deoplete should be usable - # without the user having to do `UpdateRemotePlugins`. To test, launch neovim - # and do `:call deoplete#enable()`. It will print an error if the remote - # plugin is not registered. - test_nvim_with_remote_plugin = neovim.override { - configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; - }; }) From 37da9fdd2241e86bba02bcdc7ce3927d1f5a8a38 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Wed, 9 Jun 2021 11:17:53 -0500 Subject: [PATCH 06/32] ligjpeg-turbo: v7 and 8 abi compatibility - Add build-time flags as explained in the BUILDING.md to build the library with v7 and v8 abi compatibility --- .../libraries/libjpeg-turbo/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 1ac842e5593..964a007cc80 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,10 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, nasm +{ lib +, stdenv +, fetchFromGitHub +, cmake +, nasm , openjdk , enableJava ? false # whether to build the java wrapper +, enableJpeg7 ? false # whether to build libjpeg with v7 compatibility +, enableJpeg8 ? false # whether to build libjpeg with v8 compatibility , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: +assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both + stdenv.mkDerivation rec { pname = "libjpeg-turbo"; @@ -20,7 +28,7 @@ stdenv.mkDerivation rec { # This is needed by freeimage patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ] ++ lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") - ./mingw-boolean.patch; + ./mingw-boolean.patch; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; @@ -40,6 +48,10 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=${if enableShared then "1" else "0"}" ] ++ lib.optionals enableJava [ "-DWITH_JAVA=1" + ] ++ lib.optionals enableJpeg7 [ + "-DWITH_JPEG7=1" + ] ++ lib.optionals enableJpeg8 [ + "-DWITH_JPEG8=1" ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75 @@ -53,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses - maintainers = with maintainers; [ vcunat colemickens ]; + maintainers = with maintainers; [ vcunat colemickens kamadorueda ]; platforms = platforms.all; }; } From 1c297849784f969e1654d76ab12b4bce7b01f152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=9B=87=E5=B4=A9=E4=B9=83=E9=9F=B3?= Date: Wed, 9 Jun 2021 22:41:53 +0200 Subject: [PATCH 07/32] grafana: updated license to AGPLv3 See: https://github.com/grafana/grafana/commit/8db3eb90ae8c20e1a2bbbad300e0683def9bf8fb --- pkgs/servers/monitoring/grafana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 24bb3633cae..c2d18ae2396 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -48,7 +48,7 @@ buildGoModule rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; - license = licenses.asl20; + license = licenses.agpl3; homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = platforms.linux; From b223fa619ed56bfa643f885767623ab1513838a8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Jun 2021 12:45:00 +0000 Subject: [PATCH 08/32] dbus: fix eval on BSD audit and libapparmor are libraries for Linux kernel features, so they should only be used on Linux, not excluded specifically for Darwin. --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index e9543fd95f9..1d1df0d24fc 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libICE libSM ] ++ lib.optional enableSystemd systemd - ++ lib.optionals (!stdenv.isDarwin) [ audit libapparmor ]; + ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; # ToDo: optional selinux? configureFlags = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ]; + ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ]; # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. From dbc6affe798ff152d2799994b73b5a77ff0d7fc5 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Jun 2021 20:40:05 +0200 Subject: [PATCH 09/32] lucenepp: use fetchFromGitHub --- pkgs/development/libraries/lucene++/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 2761329ea23..79e28cc7bb4 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, boost, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest }: stdenv.mkDerivation rec { pname = "lucene++"; version = "3.0.7"; - src = fetchurl { - url = "https://github.com/luceneplusplus/LucenePlusPlus/" - + "archive/rel_${version}.tar.gz"; - sha256 = "032yb35b381ifm7wb8cy2m3yndklnxyi5cgprjh48jqy641z46bc"; + src = fetchFromGitHub { + owner = "luceneplusplus"; + repo = "LucenePlusPlus"; + rev = "rel_${version}"; + sha256 = "06b37fly6l27zc6kbm93f6khfsv61w792j8xihfagpcm9cfz2zi1"; }; postPatch = '' From 3f2e9c6dccb2b7caa9311a9b01a4621d9a27d113 Mon Sep 17 00:00:00 2001 From: ash lea Date: Fri, 4 Jun 2021 18:17:46 -0700 Subject: [PATCH 10/32] netbsd: add aliases for i486 and i586 --- pkgs/os-specific/bsd/netbsd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index d53a1afe5e6..479ab92c797 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -67,6 +67,8 @@ in lib.makeScopeWithSplicing HOST_SH = stdenv'.shell; MACHINE_ARCH = { + i486 = "i386"; + i586 = "i386"; i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; @@ -74,6 +76,8 @@ in lib.makeScopeWithSplicing MACHINE = { x86_64 = "amd64"; aarch64 = "evbarm64"; + i486 = "i386"; + i586 = "i386"; i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; From 5452b7f24c6c0bb02db7e41fead3e28a3086f7d6 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Wed, 9 Jun 2021 18:38:05 -0400 Subject: [PATCH 11/32] acme-sh: fix missing runtime dependencies (#121322) acme.sh is a shell script and uses coreutils, sed and grep. If they are not found in $PATH, it fails with obscure error message: >= /usr/bin/env -i ./result/bin/acme.sh --help /nix/store/rcbiaxiszy5pl49flfimqrn81fa491l1-acme.sh-2.8.2/libexec/acme.sh: line 6926: --help: command not found Co-authored-by: Dmitry Bogatov --- pkgs/tools/admin/acme.sh/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 0417e3079ce..83d4387bd35 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, + unixtools, dnsutils, coreutils, gnugrep, gnused }: stdenv.mkDerivation rec { pname = "acme.sh"; version = "2.9.0"; @@ -13,11 +14,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out $out/bin $out/libexec cp -R $src/* $_ makeWrapper $out/libexec/acme.sh $out/bin/acme.sh \ --prefix PATH : "${ lib.makeBinPath [ + coreutils + gnugrep + gnused socat openssl curl @@ -25,6 +31,8 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then iproute2 else unixtools.netstat) ] }" + + runHook postInstall ''; meta = with lib; { From a7dbeef25977d4b790b8192b43939435e1858362 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Jun 2021 15:39:00 -0700 Subject: [PATCH 12/32] lego: 4.3.1 -> 4.4.0 (#126334) --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4553242d663..78f4b8cd2cb 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "0mmr7fcqgbmr0b1fc49p6wjn7axxayyj420fxhhdvkd4nv8fxh1q"; + sha256 = "sha256-+5uy6zVfC+utXfwBCEo597CRo4di73ff0eqHyDUxxII="; }; - vendorSha256 = "04d141kjzqcjiwv6sd0sbrgsr7a99dvblm19gwzczljkfgi60q8w"; + vendorSha256 = "sha256-JgGDP5H7zKQ8sk36JtM/FCWXl7oTScHNboQ/mE5AisU="; doCheck = false; From 90d944e42fdd0e2ee641312286aad6d2bb769ce7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 10:05:57 +0000 Subject: [PATCH 13/32] byacc: 20200910 -> 20210109 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 4f6f00e968e..756d99c6e7f 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20200910"; + version = "20210109"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "0c6gbvlgzi6yflri22w7fa2w3k5m3jk0xb5a43f3vwpa783hcn8a"; + sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c="; }; configureFlags = [ From 6960d3b17088433c63a8f6e39ef9b64c27e2f34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 10 Jun 2021 01:37:30 +0200 Subject: [PATCH 14/32] ansible_2_10: 2.10.9 -> 2.10.10 --- pkgs/development/python-modules/ansible/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index f3470f80b50..99a63d69939 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.9"; + version = "2.10.10"; src = fetchPypi { inherit pname version; - sha256 = "0l91bwbavjnaqsnb4c6f17xl7r0cvglz3rxqfs63aagw10z5sqq4"; + sha256 = "046ynyk9ldw35jbyw6jp0dmms735cd5i1f046f2lis8xv27bci3p"; }; # ansible_connection is already wrapped, so don't pass it through From 13a30b8e022734ca2569eea35f17967724950143 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:40:52 -0700 Subject: [PATCH 15/32] python3Packages.azure-core: 1.14.0 -> 1.15.0 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index e5394a616e8..6718ca1d504 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.14.0"; + version = "1.15.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f32bb64aabe61f496255c16dd6c555a027da628109460bf27311cee0caf78f96"; + sha256 = "197917b98fec661c35392e32abec4f690ac2117371a814e25e57c224ce23cf1f"; }; propagatedBuildInputs = [ From 087792492b5d9cfc3762dc42f962b5e42a882626 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:41 -0700 Subject: [PATCH 16/32] python3Packages.azure-mgmt-cognitiveservices: 11.0.0 -> 12.0.0 --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 09800f9cef3..cb782c6e58e 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "71414e3cd7445e44fc18f217f2d22df05c36877e1233328b2297d07ddf27e82a"; + sha256 = "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; }; propagatedBuildInputs = [ From 15cb243d1ba88df9c3f8edc1d8bc39b2aece791d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:41 -0700 Subject: [PATCH 17/32] python3Packages.azure-mgmt-compute: 20.0.0 -> 21.0.0 --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index c03855f816f..171c45220d1 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "20.0.0"; + version = "21.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8"; + sha256 = "9227c3755a70bc377d70e35e1fc6f1fab109dd88974fd2c7129867ccaa10f813"; }; propagatedBuildInputs = [ From 5068a827c0d980269435d9681acff2ce3d02dd90 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 18/32] python3Packages.azure-mgmt-containerregistry: 2.8.0 -> 8.0.0 --- .../azure-mgmt-containerregistry/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 821c7db0d32..8bc79a7df2f 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -1,21 +1,22 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "2.8.0"; + version = "8.0.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "193k07a77z7bj61zn2gxvvfqi20cgxksvxp7if71bwsl1l2y2jxj"; + sha256 = "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ azure-common azure-mgmt-core msrest msrestazure ]; # no tests included doCheck = false; From d85d463ba8a7145f0340c6f0113275ebf37d13ee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 19/32] python3Packages.azure-mgmt-eventgrid: 8.0.0 -> 9.0.0 --- .../python-modules/azure-mgmt-eventgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index 1b244818f91..c3ba311d4c4 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a8a6e1bb105a14f1d3545ecb07c190370f21a145f8ba51599ed169f1dc8d5dcc"; + sha256 = "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; }; propagatedBuildInputs = [ From ef4b195922d5f194668ae129e796083b61b86bcd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 20/32] python3Packages.azure-mgmt-eventhub: 8.0.0 -> 9.0.0 --- .../python-modules/azure-mgmt-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 6b86973bccd..5bd45d3609e 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ae02b1e3ccbb9ec45849de544dea4d8ef36ea767707207d055ae2b4f756c0d79"; + sha256 = "181f72adf9287741ded8e386c8934a722d08399d781ce1c452f0482aac1f019b"; }; propagatedBuildInputs = [ From d669a902f27780fe2ed0c28aae47ea7c1902bb74 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:42 -0700 Subject: [PATCH 21/32] python3Packages.azure-mgmt-hdinsight: 7.0.0 -> 8.0.0 --- .../python-modules/azure-mgmt-hdinsight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 5547eb032d0..02d2c6a013c 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "7.0.0"; + version = "8.0.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d0070817ee2be611d45af91eabc5665dd53f024eaa7a55e490ace4f71a55c733"; + sha256 = "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; extension = "zip"; }; From a0eeb74cd6867d41a44c478d0943b6fa2acfbef1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 22/32] python3Packages.azure-mgmt-managementgroups: 0.2.0 -> 1.0.0 --- .../python-modules/azure-mgmt-managementgroups/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix index e09646373b6..eb744b78ff7 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-managementgroups"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3d5237947458dc94b4a392141174b1c1258d26611241ee104e9006d1d798f682"; + sha256 = "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; From 8fb0e5d638ca1e1f62b6c60cb36d94a33b11ffb7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 23/32] python3Packages.azure-mgmt-managementpartner: 0.1.1 -> 1.0.0 --- .../python-modules/azure-mgmt-managementpartner/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix index d42fb5b05c3..169f52c86d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix @@ -3,22 +3,24 @@ , fetchPypi , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-managementpartner"; - version = "0.1.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1bvcmx7dkf2adi26z7c2ga63ggpzdfqj8q1gzcic1yn03v6nb8i7"; + sha256 = "1cd591848454a115c216d216a3fb7802c1b5de04b105e2696e4237b0f8768f2f"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From 755d9be64aaf53c90a8182c912844c966d312fdd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 24/32] python3Packages.azure-mgmt-media: 3.1.0 -> 7.0.0 --- .../development/python-modules/azure-mgmt-media/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 6320588ed43..b4d25a14938 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "3.1.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c35316d3d63dc99feb97ad7f12a7b411046537f5c6d79ef14f6067bcc379292f"; + sha256 = "b45e82a594ed91cd5aa7a5cd5d01f038b7ac3cf12233e7ba2beaaa3477900e8e"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; From be4ff987a803627e8e4be9845fa4418904f1bfd2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 25/32] python3Packages.azure-mgmt-netapp: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 35dc7ef05ab..ccb7c559247 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "3.0.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e"; + sha256 = "5a293118c5089c4ec81f676b76aa95c60408a3443a46131d22978ffb81fe4605"; extension = "zip"; }; From 5d4ef7d5f0ddc3dbeb3de3df6de19f877ab348fc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 26/32] python3Packages.azure-mgmt-rdbms: 8.0.0 -> 8.1.0 --- pkgs/development/python-modules/azure-mgmt-rdbms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index c7cb274d68b..56e53142163 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8b018543048fc4fddb4155d9f22246ad0c4be2fb582a29dbb21ec4022724a119"; + sha256 = "b30003a94c306533ebfb741b824dd1cc6c0a1810200926675e6b808bd0459d19"; }; propagatedBuildInputs = [ From e5561e72fe66869aecdedeb2986fc09c4bec54f7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:43 -0700 Subject: [PATCH 27/32] python3Packages.azure-mgmt-recoveryservicesbackup: 0.11.0 -> 1.0.0 --- .../azure-mgmt-recoveryservicesbackup/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 4ce18c4ae3b..25aae3ffad0 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -4,23 +4,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.11.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; + sha256 = "fd915aa6a76ef9e0e963615d4c909400c8d5646e26273ae25fa1418ce61e28d2"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From 14afdb6d4b6190798d49266c4187c6f52c8261cd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 28/32] python3Packages.azure-mgmt-servicefabric: 0.5.0 -> 1.0.0 --- .../python-modules/azure-mgmt-servicefabric/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index abb117d0046..661a507291d 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -6,23 +6,25 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-servicefabric"; - version = "0.5.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5771f24516c8d4a27f5569f23f3a606f6f106e4ad502eec7f38aedfcd3eadc74"; + sha256 = "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; From ce1a6f7e918623ff4bb962d80ce7ddf208ed8e49 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 29/32] python3Packages.azure-mgmt-sql: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index e41e13f2b58..83cffa0a295 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "191accd6e5b47f93a10cebb94e2ca5086f0b6f4afd0290b8596206cd4acb0d5c"; + sha256 = "5474387ec3417b0a277de2b42c6d1992256a6a9717ca1ada0e8dad01238b9919"; }; propagatedBuildInputs = [ From c8840a73c4b3291c892e38fa07d0ebf0e7ceef4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 30/32] python3Packages.azure-mgmt-web: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 9bd5371412d..b2643eb336c 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; + sha256 = "274239993a4705c9e1135842137d77a703f63d14ee5c1a5ee87fe1f8a471a061"; }; propagatedBuildInputs = [ From adb88eac2724aed21431c7d823724e799ed7bb74 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:05:44 -0700 Subject: [PATCH 31/32] python3Packages.knack: 0.8.0 -> 0.8.2 --- pkgs/development/python-modules/knack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 0b4c24afa4d..5a05449e610 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.8.0"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "16aa47240add6badd933a0b27576f3c090d7469177dc941e3ece05ca88123199"; + sha256 = "4eaa50a1c5e79d1c5c8e5e1705b661721b0b83a089695e59e229cc26c64963b9"; }; propagatedBuildInputs = [ From 0d977fbddb0cdef97b4e97e9c8f04820363c9ff3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Jun 2021 14:34:48 -0700 Subject: [PATCH 32/32] azure-cli: 2.23.0 -> 2.24.2 --- pkgs/tools/admin/azure-cli/default.nix | 5 +- .../tools/admin/azure-cli/python-packages.nix | 53 ++++++++++++------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index c037f661e61..ea0caf02055 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.23.0"; + version = "2.24.2"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-uIM1U9hub1A1YT6CzwQHmefNBuU4tDapu7VC6EP5kuM="; + sha256 = "sha256-4XmwM0/89hacA8ARs5Zq/ahzeqIc9wS18zT/ale+wQ4="; }; # put packages that needs to be overriden in the py package scope @@ -132,6 +132,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { mock paramiko pydocumentdb + PyGithub pygments pyopenssl pytz diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 421aa3da4a4..6dc575c6b60 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -153,8 +153,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip" "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.1.0" "zip" - "sha256-XPnO6OiwjTbfxz9Q3JkuCPnfTtmdU2cqP14w9ZVIcBE="; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "18.0.0" "zip" + "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; @@ -171,14 +171,14 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.1.0" "zip" - "sha256-7d9UlMudNd4hMcaNxJ+slL/tFyaI6BmBR6DlI3Blzq4="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.2.0" "zip" + "sha256-x2YJt+fX0B+YMn7+yYi4t21K518DQQ3kBHn1nCrDSqo="; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.2.0" "zip" - "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.3.0" "zip" + "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d"; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip" "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; @@ -192,8 +192,8 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip" - "187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.0.0" "zip" + "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; @@ -213,8 +213,8 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "18.0.0" "zip" - "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.0.0" "zip" + "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8"; azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "0.1.0" "zip" "sha256-wSDiELthdo2ineJNKLgvjUKuJOUjlutlabSZcJ4i8AY="; @@ -222,6 +222,9 @@ let azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; + azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "0.1.0" "zip" + "sha256-/2LZgu3aY0o2Fgyx0Vo2epVypay0GeXnrTcejIO9R8c="; + azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; @@ -231,8 +234,8 @@ let azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "0.1.0" "zip" - "sha256-0pz9jOyAbgZnPZOC0/V2b8Zdmp3nW0JHBQlKNKfbjSM="; + azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" + "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "2.0.0" "zip" "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; @@ -294,11 +297,11 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.1.0" "zip" - "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "18.0.0" "zip" + "d17beb34273797fa89863632ff0e1eb9b6a55198abb8c7f05d84980762e5f71f"; - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" - "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip" + "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; @@ -463,13 +466,25 @@ let doCheck = false; }); - knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.8.1"; + PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec { + version = "1.38"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-5h2a5OJxmaLXTCYfgen4L1NTpdHC4a0lYAp9UQkXTuA="; + sha256 = "sha256-HtCPd17FBnvIRStyveLbuVz05S/yvVDMMsackf+tknI="; + }; + + doCheck = false; + }); + + knack = super.knack.overridePythonAttrs(oldAttrs: rec { + version = "0.8.2"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-TqpQocXnnRxcjl4XBbZhchsLg6CJaV5Z4inMJsZJY7k="; }; });