dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-24 12:01:57 +00:00 committed by GitHub
commit 388b9c9b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 151 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -131,13 +131,26 @@
<listitem>
<para>
<link xlink:href="https://kops.sigs.k8s.io"><literal>kops</literal></link>
defaults to 1.22.4, which will enable
defaults to 1.23.2, which will enable
<link xlink:href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html">Instance
Metadata Service Version 2</link> 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
<link xlink:href="https://kops.sigs.k8s.io/releases/1.22-notes/">release
notes</link> for details.
clusters with Kubernetes &gt;= 1.22. This will increase
security by default, but may break some types of workloads.
The default behaviour for
<literal>spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS</literal>
has changed from <literal>true</literal> to
<literal>false</literal>. Cilium now has
<literal>disable-cnp-status-updates: true</literal> 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 &gt;= 1.23, CentOS
7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been
removed. See the
<link xlink:href="https://kops.sigs.k8s.io/releases/1.22-notes/">1.22
release notes</link> and
<link xlink:href="https://kops.sigs.k8s.io/releases/1.23-notes/">1.23
release notes</link> for more details, including other
significant changes.
</para>
</listitem>
<listitem>

2
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -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.

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -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";

4
pkgs/applications/networking/cluster/kops/default.nix
View File

@ -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}";
};
}

8
pkgs/desktops/pantheon/desktop/gala/default.nix
View File

@ -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 = [

4
pkgs/development/libraries/nix-plugins/default.nix
View File

@ -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 ];

4
pkgs/development/python-modules/boxx/default.nix
View File

@ -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 = [

4
pkgs/development/python-modules/broadlink/default.nix
View File

@ -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 = [

10
pkgs/development/python-modules/manticore/default.nix
View File

@ -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 = [
@ -128,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;
};
}

94
pkgs/development/python-modules/mlflow/default.nix
View File

@ -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 ];
};

55
pkgs/development/python-modules/pip-tools/default.nix
View File

@ -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.1";
version = "6.6.2";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Y04+jUcHJXwAQxPRap1sFMHOlNPA+h+Tw40mRAHy5PI=";
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/";

10
pkgs/development/python-modules/policyuniverse/default.nix
View File

@ -6,18 +6,22 @@
buildPythonPackage rec {
pname = "policyuniverse";
version = "1.5.0.20220426";
version = "1.5.0.20220523";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-lOis0JE0XI43KsuGgpG20iBRPttVJvRS225PInu7EUM=";
hash = "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";

4
pkgs/development/python-modules/stripe/default.nix
View File

@ -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 = [

1
pkgs/tools/admin/adtool/default.nix
View File

@ -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
};
}

11
pkgs/tools/filesystems/orangefs/default.nix
View File

@ -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 ];

4
pkgs/tools/virtualization/cri-tools/default.nix
View File

@ -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;

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };