From b12c35dcf6a26359f552e7f2085e1c761b16e4b8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 May 2022 18:33:18 +0100 Subject: [PATCH 01/18] orangefs: pull upstream fix for -fno-common toolchains Without the change upstream gcc-10 fails to build as: ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here --- pkgs/tools/filesystems/orangefs/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index f6a35437fb92..0b4ec481fc71 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, bison, flex, autoreconfHook , openssl, db, attr, perl, tcsh } : @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0c2yla615j04ygclfavh8g5miqhbml2r0zs2c5mvkacf9in7p7sq"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/waltligon/orangefs/commit/f472beb50356bea657d1c32f1ca8a73e4718fd57.patch"; + sha256 = "0jaq1ffdxgymjciddsy8h8r87nwbif4v5yv4wd7jxysn25a0hdai"; + }) + ]; + nativeBuildInputs = [ bison flex perl autoreconfHook ]; buildInputs = [ openssl db attr tcsh ]; From fd044175314798d06d142089cd98c6d32e5d35d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 May 2022 18:24:16 +0200 Subject: [PATCH 02/18] python39Packages.manticore: relax crytic-compile constraint --- pkgs/development/python-modules/manticore/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index 2e1bff7e21ef..e41edb488d27 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "manticore"; rev = version; - sha256 = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM="; + hash = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM="; }; propagatedBuildInputs = [ @@ -52,9 +52,11 @@ buildPythonPackage rec { unicorn ]; - # Python API is not used in the code, only z3 from PATH postPatch = '' - sed -ie s/z3-solver// setup.py + # Python API is not used in the code, only z3 from PATH + substituteInPlace setup.py \ + --replace "z3-solver" "" \ + --replace "crytic-compile==0.2.2" "crytic-compile>=0.2.2" ''; checkInputs = [ From 00004be60ea161a1a30f3b32d33cb3d43cd88d32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 May 2022 18:30:50 +0200 Subject: [PATCH 03/18] python310Packages.mlflow: 1.25.1 -> 1.26.0 --- .../python-modules/mlflow/default.nix | 94 ++++++++++--------- 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 10c69b076112..088318bc2e02 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -1,76 +1,86 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch +{ lib , alembic +, buildPythonPackage , click , cloudpickle -, requests -, six -, flask -, numpy -, scipy -, pandas -, python-dateutil -, protobuf -, GitPython -, pyyaml -, querystring_parser -, simplejson -, docker , databricks-cli +, docker , entrypoints -, sqlparse -, sqlalchemy +, fetchpatch +, fetchPypi +, flask +, GitPython , gorilla , gunicorn -, prometheus-flask-exporter , importlib-metadata +, numpy +, packaging +, pandas +, prometheus-flask-exporter +, protobuf +, python-dateutil +, pythonOlder +, pyyaml +, querystring_parser +, requests +, scipy +, simplejson +, six +, sqlalchemy +, sqlparse }: buildPythonPackage rec { pname = "mlflow"; - version = "1.25.1"; - disabled = isPy27; + version = "1.26.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jDePRRbWNz+VvFe2x8LcpD8mUNSc7lq2ucNFf8RvBgA="; + hash = "sha256-2D1glQkovCY0lN0kfxGeoLigTkkPpij13mTeou7CAw4="; }; - # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config - # also, tests use conda so can't run on NixOS without buildFHSUserEnv - doCheck = false; - propagatedBuildInputs = [ alembic click cloudpickle - requests - six - flask - numpy - scipy - pandas - python-dateutil - protobuf - GitPython - pyyaml - querystring_parser - simplejson - docker databricks-cli + docker entrypoints - sqlparse - sqlalchemy + flask + GitPython gorilla gunicorn - prometheus-flask-exporter importlib-metadata + numpy + packaging + pandas + prometheus-flask-exporter + protobuf + python-dateutil + pyyaml + querystring_parser + requests + scipy + simplejson + six + sqlalchemy + sqlparse ]; - pythonImportsCheck = [ "mlflow" ]; + pythonImportsCheck = [ + "mlflow" + ]; + + # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config + # also, tests use conda so can't run on NixOS without buildFHSUserEnv + doCheck = false; meta = with lib; { - homepage = "https://github.com/mlflow/mlflow"; description = "Open source platform for the machine learning lifecycle"; + homepage = "https://github.com/mlflow/mlflow"; license = licenses.asl20; maintainers = with maintainers; [ tbenst ]; }; From 75cfbd6bb0f660bcc984e400e911877795d12f00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 May 2022 22:35:37 +0200 Subject: [PATCH 04/18] python310Packages.broadlink: 0.18.1 -> 0.18.2 --- pkgs/development/python-modules/broadlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index ba635a39257d..e03fa1c2aef6 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "broadlink"; - version = "0.18.1"; + version = "0.18.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KMfL1mY4th87gjPrdhvzQjdXucgwSChsykOCO3cPAD8="; + hash = "sha256-2ktLSJ1Nsdry8dvWmY/BbhHApTYQMvSjCsNKX3PkocU="; }; propagatedBuildInputs = [ From 36ea50ffe5e9882185874823405882157c45b5e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 May 2022 22:52:03 +0200 Subject: [PATCH 05/18] python39Packages.manticore: mark as broken on darwin --- pkgs/development/python-modules/manticore/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index e41edb488d27..8b2be2626601 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -130,5 +130,7 @@ buildPythonPackage rec { license = licenses.agpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; + # m.c.manticore:WARNING: Manticore is only supported on Linux. Proceed at your own risk! + broken = stdenv.isDarwin; }; } From 620b891fd43b775c61c95ce031fb2a644cf8dd93 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Mon, 23 May 2022 21:11:20 -0300 Subject: [PATCH 06/18] vscode-extensions.ionide.ionide-fsharp: 6.0.1 -> 6.0.4 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index db018bfb67ef..ac8ae6885625 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1147,8 +1147,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "6.0.1"; - sha256 = "sha256-1W1qKnjmyK80np+J6S/nku3QJGypxYnuE0BPw8Onzas="; + version = "6.0.4"; + sha256 = "sha256-gdM7mG5ykBiwLHodZ2VyF4uYYuAPhXP2MturNvfQ5iM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; From 7d48c204efd169837a75c752d8c13515388c2a1b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 May 2022 10:22:17 +0800 Subject: [PATCH 07/18] pantheon.gala: save/restore easing on workspace switch --- pkgs/desktops/pantheon/desktop/gala/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 0cab4d2e08f5..862a52308d9a 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -38,6 +39,13 @@ stdenv.mkDerivation rec { # We look for plugins in `/run/current-system/sw/lib/` because # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch + + # WindowManager: save/restore easing on workspace switch + # https://github.com/elementary/gala/pull/1430 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/1f94db16c627f73af5dc69714611815e4691b5e8.patch"; + sha256 = "sha256-PLNbAXyOG0TMn1y2QIBnL6BOQVqBA+DBgPOVJo4nDr8="; + }) ]; nativeBuildInputs = [ From 37fa3c37322f7660dc3555f00c52272b422bc0f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 May 2022 03:51:07 +0000 Subject: [PATCH 08/18] python310Packages.stripe: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 8d6193f8905e..d277bf2970c2 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1/pMGFeNJqfn9onlF33Y67R/KHmxwGAZqguIji3Rrrk="; + hash = "sha256-2aR959ljz2mogPPQSWG3ksQPRWx04Jh4VRVV3jwiYfA="; }; propagatedBuildInputs = [ From ff6ad139da51b16ebc8bdb4f55c1a2e69f6fa237 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 May 2022 06:31:17 +0000 Subject: [PATCH 09/18] python310Packages.policyuniverse: 1.5.0.20220426 -> 1.5.0.20220523 --- pkgs/development/python-modules/policyuniverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index b8e6a790f745..ad33f08faad9 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.0.20220426"; + version = "1.5.0.20220523"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lOis0JE0XI43KsuGgpG20iBRPttVJvRS225PInu7EUM="; + sha256 = "sha256-gmcF8KdwGLMU5g1NYgxLKgBLk1yJrWi/dpVETDaY0Vo="; }; # Tests are not shipped and there are no GitHub tags From 9d8cfc22c36a802e3f57e8873103c5c769c4c6cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 23 May 2022 16:22:32 +0200 Subject: [PATCH 10/18] adtool: mark broken Broke when updating OpenLDAP>2.5 and has not seen a change since 2017, which is at this point 5y in the past. I think it's safe to say that this tool deserves to being marked broken. --- pkgs/tools/admin/adtool/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix index f1bc5851c793..ac009e1b091a 100644 --- a/pkgs/tools/admin/adtool/default.nix +++ b/pkgs/tools/admin/adtool/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://gp2x.org/adtool"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; + broken = true; # does not link against recent libldap versions and unmaintained since 2017 }; } From 0cfd23c34ee05322c0ccad06dc4e91365c65ef70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 May 2022 06:38:36 +0000 Subject: [PATCH 11/18] python310Packages.pip-tools: 6.6.1 -> 6.6.2 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2b079c8f00e3..ab48eb3e37b6 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.6.1"; + version = "6.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y04+jUcHJXwAQxPRap1sFMHOlNPA+h+Tw40mRAHy5PI="; + sha256 = "sha256-9jhQOp932Y2afXJYSxUI0/gu0Bm4+rJPTlrQeMG4yV4="; }; checkInputs = [ From 39f208db81e5b36134e77ce60bf345cf9fa3f7b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 May 2022 07:10:52 +0000 Subject: [PATCH 12/18] python310Packages.boxx: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/boxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 10032f0ae58f..3fc8a18c0a45 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.0"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1Q6wCloOCfyDmvC8VbK6GgfnxuliJ6Ze7UEvsNFBVa0="; + hash = "sha256-YYR13JS9otoylS3ds0jK7d0jOxbhafaQd8fSxIiREi4="; }; propagatedBuildInputs = [ From 17520867b018f0b4df63d85dc5b7ecb141ba9868 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 May 2022 09:49:38 +0200 Subject: [PATCH 13/18] python310Packages.policyuniverse: add format --- .../development/python-modules/policyuniverse/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index ad33f08faad9..ac7f53a54885 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -7,17 +7,21 @@ buildPythonPackage rec { pname = "policyuniverse"; version = "1.5.0.20220523"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gmcF8KdwGLMU5g1NYgxLKgBLk1yJrWi/dpVETDaY0Vo="; + has = "sha256-gmcF8KdwGLMU5g1NYgxLKgBLk1yJrWi/dpVETDaY0Vo="; }; # Tests are not shipped and there are no GitHub tags doCheck = false; - pythonImportsCheck = [ "policyuniverse" ]; + pythonImportsCheck = [ + "policyuniverse" + ]; meta = with lib; { description = "Parse and Process AWS IAM Policies, Statements, ARNs and wildcards"; From 6d3a164c742ed0f333fcbed512733343a708ee58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 May 2022 10:07:33 +0200 Subject: [PATCH 14/18] python310Packages.pip-tools: update disable - update inputs - add pythonImportsCheck --- .../python-modules/pip-tools/default.nix | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index ab48eb3e37b6..41e4edbb6ba9 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,37 +1,30 @@ { lib -, fetchPypi -, pythonOlder -, buildPythonPackage -, pip -, pytestCheckHook -, pytest-xdist -, click -, setuptools-scm -, pep517 , stdenv +, buildPythonPackage +, click +, fetchPypi +, pep517 +, pip +, pytest-xdist +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { pname = "pip-tools"; version = "6.6.2"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9jhQOp932Y2afXJYSxUI0/gu0Bm4+rJPTlrQeMG4yV4="; + hash = "sha256-9jhQOp932Y2afXJYSxUI0/gu0Bm4+rJPTlrQeMG4yV4="; }; - checkInputs = [ - pytestCheckHook - pytest-xdist - ]; - - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 - export no_proxy='*'; - ''; - nativeBuildInputs = [ setuptools-scm ]; @@ -40,14 +33,30 @@ buildPythonPackage rec { click pep517 pip + setuptools + wheel ]; + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 + export no_proxy='*'; + ''; + disabledTests = [ - # these want internet access + # Tests require network access "network" "test_direct_reference_with_extras" ]; + pythonImportsCheck = [ + "piptools" + ]; + meta = with lib; { description = "Keeps your pinned dependencies fresh"; homepage = "https://github.com/jazzband/pip-tools/"; From ad9a297ff4b7a0065c42c13553cc669f0b121f0c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 May 2022 04:27:22 -0400 Subject: [PATCH 15/18] nix-plugins: 8.0.0 -> 9.0.0 --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index c17a0e8c7fe7..1d3c32103803 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-Zz8cPHK4w0qimYu6III6XfiKVQIzEMMV9P6ER5fveZY="; + hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca4c1550b78b..7bf1b3daa468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19737,7 +19737,7 @@ with pkgs; ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; - nix-plugins = callPackage ../development/libraries/nix-plugins { nix = nixVersions.nix_2_5; }; + nix-plugins = callPackage ../development/libraries/nix-plugins { }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; From 9dc13fb95359fa78d5ad7580d1e52d87cbf11f4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 May 2022 10:32:17 +0200 Subject: [PATCH 16/18] python310Packages.policyuniverse: fix typo --- pkgs/development/python-modules/policyuniverse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index ac7f53a54885..739b586d0360 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - has = "sha256-gmcF8KdwGLMU5g1NYgxLKgBLk1yJrWi/dpVETDaY0Vo="; + hash = "sha256-gmcF8KdwGLMU5g1NYgxLKgBLk1yJrWi/dpVETDaY0Vo="; }; # Tests are not shipped and there are no GitHub tags From a434418bbe767329258f0c1da2c23ca5e00b1d48 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 24 May 2022 11:00:43 +0200 Subject: [PATCH 17/18] cri-tools: 1.23.0 -> 1.24.1 Signed-off-by: Sascha Grunert --- pkgs/tools/virtualization/cri-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 846e2ee27944..62a13499dd85 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.23.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b65GY08vykVp/PUBmBXKIfykyPEJRgGjgu7zBoXx3K0="; + sha256 = "sha256-7WZ7Kb3Rx/hq7LYaDN/B9CpPgr9+aR5+FKDG7G/JydA="; }; vendorSha256 = null; From 3798f3c16813373b434169d787f871b6276df507 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 24 May 2022 06:57:45 -0500 Subject: [PATCH 18/18] kops: 1.23.1 -> 1.23.2 (#174165) Also update 22.05 release notes, which still mentioned 1.22.4 as the default. --- .../from_md/release-notes/rl-2205.section.xml | 23 +++++++++++++++---- .../manual/release-notes/rl-2205.section.md | 2 +- .../networking/cluster/kops/default.nix | 4 ++-- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index cebb90bf32c8..d46d5e0f0345 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -131,13 +131,26 @@ kops - defaults to 1.22.4, which will enable + defaults to 1.23.2, which will enable Instance Metadata Service Version 2 and require tokens on new - clusters with Kubernetes 1.22. This will increase security by - default, but may break some types of workloads. See the - release - notes for details. + clusters with Kubernetes >= 1.22. This will increase + security by default, but may break some types of workloads. + The default behaviour for + spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS + has changed from true to + false. Cilium now has + disable-cnp-status-updates: true by + default. Set this to false if you rely on the + CiliumNetworkPolicy status fields. Support for Kubernetes + 1.17, the Lyft CNI, Weave CNI on Kubernetes >= 1.23, CentOS + 7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been + removed. See the + 1.22 + release notes and + 1.23 + release notes for more details, including other + significant changes. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 3136a9607b60..edb3758dd2f1 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -49,7 +49,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks. -- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details. +- [`kops`](https://kops.sigs.k8s.io) defaults to 1.23.2, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes >= 1.22. This will increase security by default, but may break some types of workloads. The default behaviour for `spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS` has changed from `true` to `false`. Cilium now has `disable-cnp-status-updates: true` by default. Set this to false if you rely on the CiliumNetworkPolicy status fields. Support for Kubernetes 1.17, the Lyft CNI, Weave CNI on Kubernetes >= 1.23, CentOS 7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been removed. See the [1.22 release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) and [1.23 release notes](https://kops.sigs.k8s.io/releases/1.23-notes/) for more details, including other significant changes. - Module authors can use `mkRenamedOptionModuleWith` to automate the deprecation cycle without annoying out-of-tree module authors and their users. diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 69eafdddf93f..2da8b7894f2b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -65,8 +65,8 @@ rec { }; kops_1_23 = mkKops rec { - version = "1.23.1"; - sha256 = "sha256-SiseHs5cMj8DR1f6z9PTbtF/h3Bn9riiLWW5KMYwVUg="; + version = "1.23.2"; + sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM="; rev = "v${version}"; }; }