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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-08-11 18:01:23 +00:00 committed by GitHub
commit 3557ff24c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 122 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -6440,13 +6440,6 @@
githubId = 3267697;
name = "Joshua Potter";
};
jschievink = {
email = "jonasschievink@gmail.com";
matrix = "@jschievink:matrix.org";
github = "jonas-schievink";
githubId = 1786438;
name = "Jonas Schievink";
};
jshcmpbll = {
email = "me@joshuadcampbell.com";
github = "jshcmpbll";

12
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -392,6 +392,18 @@
as coreboot’s fork is no longer available.
</para>
</listitem>
<listitem>
<para>
The udisks2 service, available at
<literal>services.udisks2.enable</literal>, is now disabled by
default. It will automatically be enabled through services and
desktop environments as needed. This also means that polkit
will now actually be disabled by default. The default for
<literal>security.polkit.enable</literal> was already flipped
in the previous release, but udisks2 being enabled by default
re-enabled it.
</para>
</listitem>
<listitem>
<para>
Add udev rules for the Teensy family of microcontrollers.

3
nixos/doc/manual/release-notes/rl-2211.section.md
View File

@ -145,6 +145,9 @@ Use `configure.packages` instead.
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
- The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it.
- Add udev rules for the Teensy family of microcontrollers.
- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API.

2
nixos/modules/services/desktops/gvfs.nix
View File

@ -56,6 +56,8 @@ in
services.udev.packages = [ pkgs.libmtp.out ];
services.udisks2.enable = true;
# Needed for unwrapped applications
environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];

9
nixos/modules/services/hardware/udisks2.nix
View File

@ -19,14 +19,7 @@ in
services.udisks2 = {
enable = mkOption {
type = types.bool;
default = true;
description = lib.mdDoc ''
Whether to enable Udisks, a DBus service that allows
applications to query and manipulate storage devices.
'';
};
enable = mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices.";
settings = mkOption rec {
type = types.attrsOf settingsFormat.type;

3
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -435,13 +435,12 @@ in
# socket activation, it goes to the remote side (#19589).
exec >&2
mkdir -m 0755 -p /etc/ssh
${flip concatMapStrings cfg.hostKeys (k: ''
if ! [ -s "${k.path}" ]; then
if ! [ -h "${k.path}" ]; then
rm -f "${k.path}"
fi
mkdir -m 0755 -p "$(dirname '${k.path}')"
ssh-keygen \
-t "${k.type}" \
${if k ? bits then "-b ${toString k.bits}" else ""} \

1
nixos/modules/virtualisation/container-config.nix
View File

@ -8,7 +8,6 @@ with lib;
# Disable some features that are not useful in a container.
nix.optimise.automatic = mkDefault false; # the store is host managed
services.udisks2.enable = mkDefault false;
powerManagement.enable = mkDefault false;
documentation.nixos.enable = mkDefault false;

4
pkgs/applications/graphics/freecad/default.nix
View File

@ -49,13 +49,13 @@
mkDerivation rec {
pname = "freecad";
version = "0.20";
version = "0.20.1";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = version;
hash = "sha256-Em4XVxDfvVG1Kf7q+6uHNA/VcMGLKMTv5TCh2XF/BtQ=";
hash = "sha256-r2lhFv4ReASteoVxwwiW9TdSckpaju6QE8UegxeY4rE=";
};
nativeBuildInputs = [

1
pkgs/applications/graphics/inkscape/default.nix
View File

@ -48,6 +48,7 @@ let
cachecontrol
numpy
lxml
packaging
pillow
scour
pyserial

8
pkgs/applications/networking/cluster/openshift/default.nix
View File

@ -10,14 +10,14 @@
buildGoModule rec {
pname = "openshift";
version = "4.10.0";
gitCommit = "346b183";
version = "4.11.0";
gitCommit = "20dd77d5";
src = fetchFromGitHub {
owner = "openshift";
repo = "oc";
rev = "release-4.10";
sha256 = "Pdq3OwT5P7vvB70X+GVglT9CdJbhkm35nvEGurO1HPc=";
rev = "20dd77d5c889f86b05e2bdd182853ae702852c63";
sha256 = "wqLo/CKGzeMDJUoI9PUEjJER5hSPu+FmUCJLPZ9PJuw=";
};
vendorSha256 = null;

4
pkgs/development/libraries/intel-media-sdk/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-sdk";
version = "22.3.0";
version = "22.5.1";
src = fetchFromGitHub {
owner = "Intel-Media-SDK";
repo = "MediaSDK";
rev = "intel-mediasdk-${version}";
sha256 = "sha256-6/MOjISfLsrsocdeFC148hRwl2os5dvJV1eYq/jIMr4=";
sha256 = "sha256-HTCqJG//byTTlTRdE8IyFGuUaLiNVDfl9swbH6d5gCk=";
};
nativeBuildInputs = [ cmake pkg-config ];

1
pkgs/development/libraries/pc-ble-driver/default.nix
View File

@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/NordicSemiconductor/pc-ble-driver";
license = licenses.unfreeRedistributable;
platforms = platforms.unix;
maintainers = with maintainers; [ jschievink ];
};
}

5
pkgs/development/python-modules/levenshtein/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "levenshtein";
version = "0.19.3";
version = "0.20.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "Levenshtein";
rev = "refs/tags/v${version}";
hash = "sha256-4Oc1n/ZgLdq57ZeyZHzTQOjar9Ligeb4yqKeT0s5dHY=";
hash = "sha256-zVYfErh9tts3yPgXqqeX6xp8o+gLd7nN64+Ml6YZfjE=";
};
nativeBuildInputs = [
@ -51,6 +51,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Functions for fast computation of Levenshtein distance and string similarity";
homepage = "https://github.com/maxbachmann/Levenshtein";
changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fab ];
};

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

@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "mlflow";
version = "1.27.0";
version = "1.28.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ah401r4mZyXkHUVHVyqEJdhtZiPhyIiM8/IrkAGb4Ko=";
hash = "sha256-aXZp4eQuiHwzBQKuTw7WROgUvgas2pDOpEU57M4zSmQ=";
};
propagatedBuildInputs = [

20
pkgs/development/python-modules/pytorch-metric-learning/default.nix
View File

@ -8,11 +8,12 @@
, pytorch
, torchvision
, tqdm
, faiss
}:
buildPythonPackage rec {
pname = "pytorch-metric-learning";
version = "1.5.0";
version = "1.5.1";
disabled = isPy27;
@ -20,7 +21,7 @@ buildPythonPackage rec {
owner = "KevinMusgrave";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-ge6y5n1N/+nymgD4La3ger7N4vvcoo1Bxa+etirNFNI=";
sha256 = "sha256-d7Ngd4SzGTJXtpgs2Jqb+y1aeMt9YUqIOft5ByDtRsc=";
};
propagatedBuildInputs = [
@ -36,14 +37,18 @@ buildPythonPackage rec {
export TEST_DEVICE=cpu
export TEST_DTYPES=float32,float64 # half-precision tests fail on CPU
'';
# package only requires `unittest`, but use `pytest` to exclude tests
checkInputs = [ pytestCheckHook ];
checkInputs = [
faiss
pytestCheckHook
];
disabledTests = [
# requires FAISS (not in Nixpkgs)
"test_accuracy_calculator_and_faiss"
"test_global_embedding_space_tester"
"test_with_same_parent_label_tester"
# TypeError: setup() missing 1 required positional argument: 'world_size'
"TestDistributedLossWrapper"
# require network access:
"TestInference"
"test_get_nearest_neighbors"
"test_tuplestoweights_sampler"
"test_untrained_indexer"
@ -59,6 +64,5 @@ buildPythonPackage rec {
changelog = "https://github.com/KevinMusgrave/pytorch-metric-learning/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcdarwin ];
broken = true; # requires faiss which is unpackaged
};
}

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

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "2.4.2";
version = "2.4.3";
disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "refs/tags/v${version}";
hash = "sha256-nLYxPGK+7ThvpsmvF2zlo+DqykY8bW1j2si3Lnyq7oo=";
hash = "sha256-KKRqSMU1AzXYDB50CBQ1ZcL87KgG2/tL+cmR1jnrTVk=";
};
nativeBuildInputs = [

22
pkgs/development/python-modules/streamz/default.nix
View File

@ -20,28 +20,16 @@
buildPythonPackage rec {
pname = "streamz";
version = "0.6.3";
version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-0wZ1ldLFRAIL9R+gLfwsFbL+gvdORAkYWNjnDmeafm8=";
hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM=";
};
patches = [
# remove with next bump
(fetchpatch {
name = "fix-tests-against-distributed-2021.10.0.patch";
url = "https://github.com/python-streamz/streamz/commit/5bd3bc4d305ff40c740bc2550c8491be9162778a.patch";
sha256 = "1xzxcbf7yninkyizrwm3ahqk6ij2fmh0454iqjx2n7mmzx3sazx7";
includes = [
"streamz/tests/test_dask.py"
];
})
];
propagatedBuildInputs = [
networkx
six
@ -65,6 +53,12 @@ buildPythonPackage rec {
];
disabledTests = [
# Error with distutils version: fixture 'cleanup' not found
"test_separate_thread_without_time"
"test_await_syntax"
"test_partition_then_scatter_sync"
"test_sync"
"test_sync_2"
# Test fail in the sandbox
"test_tcp_async"
"test_tcp"

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

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.13.1";
version = "3.14.0";
disabled = pythonOlder "3.6";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "ietf-tools";
repo = "xml2rfc";
rev = "refs/tags/v${version}";
sha256 = "sha256-DRHhcMPLBr1SM6e3BCB8gfvadd8CeMIOsPT+uzcET+4=";
sha256 = "sha256-BuOHQ6LnfjdlE9+wdJbl6wdD/oddKIklabVBx1IJJBA=";
};
postPatch = ''

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "xsdata";
version = "22.5";
version = "22.7";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "701dcda5a4a07df3a642f8fb6f73f0e2e18224d359bcb7f4212b3c29d7af72c2";
sha256 = "sha256-2EpbTNYdjcHOQQqe+bEpMzGxD2Jh34P+eI+uK4SJPdo=";
};
postPatch = ''

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.346.2";
version = "2.346.3";
src = fetchurl {
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0ymp4zy73rxakk7i1pxai1i0hxp65ilzi57dan3mqspaprfllk7g";
sha256 = "12bxni81qldm7f3sbr2rhx6wghbkabhy634pgbrmq6m3j1c8q7hl";
};
nativeBuildInputs = [ makeWrapper ];

34
pkgs/development/tools/misc/texlab/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, rustPlatform
, fetchFromGitHub
, help2man
, installShellFiles
, libiconv
, Security
@ -9,34 +10,47 @@
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
in rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "4.2.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oYM+OAYjQ8aNAryg0Cthj14BsxMFnOtz38XdUQZZolk=";
rev = "refs/tags/v${version}";
sha256 = "sha256-za3TauhNoxGDphpY615EnTt46HpMgS+sYpBln/twefw=";
};
cargoSha256 = "sha256-TDGiqC9eNIJfLTc1R3nvE84rAsVE8jtTaeQbVNMeVgg=";
cargoSha256 = "sha256-wppaa3IGOqkFu/1CAp8g+PlPtMWm/7qNpPu0k4/mL3A=";
outputs = [ "out" "man" ];
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles ]
++ lib.optional (!isCross) help2man;
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security CoreServices ];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
Security
CoreServices
];
postInstall = ''
installManPage texlab.1
# Remove generated dylib of human_name dependency. TexLab statically
# links to the generated rlib and doesn't reference the dylib. I
# couldn't find any way to prevent building this by passing cargo flags.
# See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43
rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}"
rmdir "$out/lib"
''
# When we cross compile we cannot run the output executable to
# generate the man page
+ lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
# https://github.com/latex-lsp/texlab/blob/v4.2.1/.github/workflows/publish.yml#L131-L135
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';
passthru.updateScript = nix-update-script {

25
pkgs/development/tools/rust/cargo-pgx/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
version = "0.4.5";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-BcMGa/1ATwLG8VnwItfd5eqmrck/u0MEoR5sA2yuzyQ=";
};
cargoSha256 = "sha256-urlwqBCZMxlPEjLLPBhI2lDNTusCSZ1bZu1p8poVrtw=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy";
homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
license = licenses.mit;
maintainers = with maintainers; [ typetetris ];
};
}

6
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.0.6";
version = "9.0.7";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-at9JvFLP2xGIFQODHw8zi3kEqIKJ8SBwBbcjVLVeYRc=";
sha256 = "sha256-rmcoyYBTT1po0TphmoGSoiS13W98LvjBhizKkhZVMzE=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-92gWk5G6zLmesS0r5QRePdsVYJ9CFS/i0rsT8HOK1Js=";
sha256 = "sha256-9mXmot/UjMNrfDQ1MXSQvjn6cBBNQ4gP7bJvpBqBIKc=";
};
vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8=";

6
pkgs/tools/networking/ooniprobe-cli/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.15.1";
version = "3.15.3";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-s1q9QgdbLmMaEV2ovGRKWHRhUFvbTHhFvo7ALdhUG4Y=";
hash = "sha256-21D/1ImKOr9+GeSrIRCUGCcALU0WPohrnz1qqUXLy1A=";
};
vendorSha256 = "sha256-h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU=";
vendorSha256 = "sha256-tZHBcVTCll3dSfQnQDfo9z3ALAykRmFvH7vjLLtQHDc=";
subPackages = [ "cmd/ooniprobe" ];

6
pkgs/tools/security/spire/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "spire";
version = "1.3.3";
version = "1.4.0";
outputs = [ "out" "agent" "server" ];
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "spiffe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hkmmNY0L7yMH1DoPKHUq6F2lWpKnGj6Ftni8E+jIfH4=";
sha256 = "sha256-wyKluqYKNmaJaXK70v7/f2WEGgekd0Qgdu3UZnXm/UU=";
};
vendorSha256 = "sha256-sjR8HCEBWj4BAIMeYkQZqzuOVL3PDG7ELpRo8K5wn1A=";
vendorSha256 = "sha256-EZWoMSBxdvnrdBmSrRYf4+2d1LCka7oUIhRAW+2n7CU=";
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];

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

@ -14219,6 +14219,9 @@ with pkgs;
cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
cargo-pgx = callPackage ../development/tools/rust/cargo-pgx {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-release = callPackage ../development/tools/rust/cargo-release {
inherit (darwin.apple_sdk.frameworks) Security;
};