b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-03-09 06:01:01 +00:00 committed by GitHub
parent c8c1423cd9 a71e45961e
commit 98d00577f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 81 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/virtualisation/qemu-vm.nix
View file

@ -895,7 +895,7 @@ in
${optionalString cfg.writableStore '' ${optionalString cfg.writableStore ''
echo "mounting overlay filesystem on /nix/store..." echo "mounting overlay filesystem on /nix/store..."
mkdir -p 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store mkdir -p -m 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store
mount -t overlay overlay $targetRoot/nix/store \ mount -t overlay overlay $targetRoot/nix/store \
-o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail
''} ''}
@ -1099,7 +1099,7 @@ in
}; };
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "/bin/mkdir -p 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store"; ExecStart = "/bin/mkdir -p -m 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store";
}; };
}; };
}; };

6
pkgs/applications/audio/reaper/default.nix
View file

@ -25,13 +25,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "reaper"; pname = "reaper";
version = "6.75"; version = "6.77";
src = fetchurl { src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch; url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = { hash = {
x86_64-linux = "sha256-wtXClHL+SeuLxMROaZKZOwYnLo6MXC7lAiwCj80X0Ck="; x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc=";
aarch64-linux = "sha256-xCkAbKzXH7E1Ud6iGsnzgZT/2Sy6qpRItYUHFF6ggpQ="; aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60=";
}.${stdenv.hostPlatform.system}; }.${stdenv.hostPlatform.system};
}; };

30
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -219,13 +219,13 @@
"vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M=" "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M="
}, },
"cloudflare": { "cloudflare": {
"hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=", "hash": "sha256-LBMFszTXxiK1ZvqP6VjSCWk06/IVbJV9yEGkn6olM6k=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare", "owner": "cloudflare",
"repo": "terraform-provider-cloudflare", "repo": "terraform-provider-cloudflare",
"rev": "v4.0.0", "rev": "v4.1.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo=" "vendorHash": "sha256-ofuLOrJSztgwtohDoZdgd9DMJSK77z93L2NlqO5bmCM="
}, },
"cloudfoundry": { "cloudfoundry": {
"hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=", "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=",
@ -684,13 +684,13 @@
"vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw="
}, },
"local": { "local": {
"hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=", "hash": "sha256-LN9mYtFNPPlG3Wdz0ggS57zYMO2chf6JipRmn+OKCnw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/local", "homepage": "https://registry.terraform.io/providers/hashicorp/local",
"owner": "hashicorp", "owner": "hashicorp",
"repo": "terraform-provider-local", "repo": "terraform-provider-local",
"rev": "v2.3.0", "rev": "v2.4.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug=" "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ="
}, },
"lxd": { "lxd": {
"hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=", "hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=",
@ -811,11 +811,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
}, },
"oci": { "oci": {
"hash": "sha256-PsTlJY9Y4o7qmA2h+jbIARB9N7+Qku8CaOAYkQ2CKBU=", "hash": "sha256-ZERJIZ1nsvvMhZe9hjcZt5F1lFNFV4TP0ifNin+MC5M=",
"homepage": "https://registry.terraform.io/providers/oracle/oci", "homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle", "owner": "oracle",
"repo": "terraform-provider-oci", "repo": "terraform-provider-oci",
"rev": "v4.110.0", "rev": "v4.111.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },
@ -964,11 +964,11 @@
"vendorHash": null "vendorHash": null
}, },
"scaleway": { "scaleway": {
"hash": "sha256-gscuuaohIOIdDAAUWKg82fm9iY51ZxoN4EeAxAzTvjI=", "hash": "sha256-4xHPQFmOAqEpqfJ6ng5z3wcuNZF8jNqu+4ZNJNxaBaI=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway", "owner": "scaleway",
"repo": "terraform-provider-scaleway", "repo": "terraform-provider-scaleway",
"rev": "v2.12.1", "rev": "v2.13.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0=" "vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0="
}, },
@ -1045,13 +1045,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
}, },
"spotinst": { "spotinst": {
"hash": "sha256-bUFX6Ok7cYyaoYHElUIcEwl6DRGK8q+opKBCABo8CVM=", "hash": "sha256-OroABl6G5nCatoyPxHZkM9I7qidxwMlgFjWC9Ljshik=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst", "owner": "spotinst",
"repo": "terraform-provider-spotinst", "repo": "terraform-provider-spotinst",
"rev": "v1.103.0", "rev": "v1.104.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-IlztpEAI/Z7DUQ5pMaGSQnXWPedAIJlS773nxsRMCYg=" "vendorHash": "sha256-juso8uzTjqf/vxUmpiv/07WkqMJRS1CqHQhu6pHf7QY="
}, },
"stackpath": { "stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@ -1099,11 +1099,11 @@
"vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI=" "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI="
}, },
"tencentcloud": { "tencentcloud": {
"hash": "sha256-91efifPY9ErjqtNPzm3+XSy1Jy+eQs2znxYzez74J/0=", "hash": "sha256-+VzUyIDQcDyoMVH113cMd6jCUIsAIw/Ir1wM+/YIefM=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack", "owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud", "repo": "terraform-provider-tencentcloud",
"rev": "v1.79.13", "rev": "v1.79.14",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },

4
pkgs/applications/version-management/gh/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "2.24.0"; version = "2.24.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-5ccvdm0BQZ0+yccB+TjlVt5ZAPxKuEInOed2D9AzMjc="; hash = "sha256-W0wl9I5FblbUBi1kZ7X+lhnhDahrggm9ooTaTWqATLg=";
}; };
vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY="; vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY=";

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle"; pname = "numix-icon-theme-circle";
version = "23.02.28"; version = "23.03.04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "numixproject"; owner = "numixproject";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-dSD5mjWH7ho+1LiZgzVjDkAIbj4XubC3ZKamyMokkds="; sha256 = "sha256-2do/8NKO47zj3+V5+P79el41jy7q6aXdhYXVRRoVusI=";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];

7
pkgs/development/node-packages/node-env.nix
View file

@ -530,12 +530,15 @@ let
then then
ln -s $out/lib/node_modules/.bin $out/bin ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables # Fixup all executables
ls $out/bin/* | while read i ls $out/bin/* | while read i
do do
file="$(readlink -f "$i")" file="$(readlink -f "$i")"
chmod u+rwx "$file" chmod u+rwx "$file"
patchShebangs "$file" if isScript "$file"
then
sed -i 's/\r$//' "$file" # convert crlf to lf
fi
done done
fi fi

22
pkgs/development/node-packages/overrides.nix
View file

@ -340,14 +340,22 @@ final: prev: {
}; };
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = let postInstall = let
# Needed to fix Node.js 16+ - PR svanderburg/node2nix#302 patches = [
npmPatch = fetchpatch { # Needed to fix Node.js 16+ - PR svanderburg/node2nix#302
name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch"; (fetchpatch {
url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch"; name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch";
hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8="; url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch";
}; hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8=";
})
# Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314
(fetchpatch {
name = "convert-crlf-for-script-bin-files.patch";
url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch";
hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU=";
})
];
in '' in ''
patch -d $out/lib/node_modules/node2nix -p1 < ${npmPatch} ${lib.concatStringsSep "\n" (map (patch: "patch -d $out/lib/node_modules/node2nix -p1 < ${patch}") patches)}
wrapProgram "$out/bin/node2nix" --prefix PATH : ${lib.makeBinPath [ pkgs.nix ]} wrapProgram "$out/bin/node2nix" --prefix PATH : ${lib.makeBinPath [ pkgs.nix ]}
''; '';
}; };

25
pkgs/development/python-modules/mixins/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "mixins";
version = "0.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ=";
};
pythonImportsCheck = [
"mixins"
];
meta = with lib; {
homepage = "https://github.com/nickderobertis/py-mixins";
description = "Mixin classes which may be added to your own classes to add certain functionality to them";
maintainers = with maintainers; [ aanderse ];
license = licenses.mit;
};
}

4
pkgs/tools/misc/parallel/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "parallel"; pname = "parallel";
version = "20221222"; version = "20230222";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
sha256 = "sha256-TakMe+wYqUQxtOPbSd1WP2XPIM6v0kX3zHtC74v4WX8="; sha256 = "sha256-bTal6gl2aN23gOdOL/ACUtoWOZWkselu9jOpmyCcmA4=";
}; };
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];

6
pkgs/tools/misc/xcp/default.nix
View file

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "xcp"; pname = "xcp";
version = "0.9.3"; version = "0.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tarka"; owner = "tarka";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Gn6qTfQjHuQUcfaZN48qCI7u8E7PtJAZlyrPqyjop5U="; sha256 = "sha256-MvtMgdlMVMp2qWN+EbAKZwBwW0TA8aivlJY8KZm+7jM=";
}; };
# no such file or directory errors # no such file or directory errors
doCheck = false; doCheck = false;
cargoHash = "sha256-3vz92fHjLUMWVBpq71hxqqU0WiHdLbOst9vr8zbo6/U="; cargoHash = "sha256-vxfoJnyG0wWgkcZpQYiKkQaHl01VDuQ0kA26MXVCgY8=";
meta = with lib; { meta = with lib; {
description = "An extended cp(1)"; description = "An extended cp(1)";

4
pkgs/tools/networking/netbird/default.nix
View file

@ -14,13 +14,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "netbird"; pname = "netbird";
version = "0.14.1"; version = "0.14.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netbirdio"; owner = "netbirdio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-H4jqpy1ELRfTUhLO8Ylv6a/uKkvapdVhIGM0e3WPdlo="; sha256 = "sha256-qrXD/jRLyQR4T3tffCs+Nby+cvRPVvGNHy0NQAmYYAg=";
}; };
vendorHash = "sha256-2/kk4qTO85fYnNO5vXIFxxFR55xZ5wenogJTMsLfYsg="; vendorHash = "sha256-2/kk4qTO85fYnNO5vXIFxxFR55xZ5wenogJTMsLfYsg=";

6
pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "shadowsocks-v2ray-plugin"; pname = "shadowsocks-v2ray-plugin";
version = "1.3.1"; version = "1.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shadowsocks"; owner = "shadowsocks";
repo = "v2ray-plugin"; repo = "v2ray-plugin";
rev = "v${version}"; rev = "v${version}";
sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk=";
}; };
vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; vendorHash = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8=";
meta = with lib; { meta = with lib; {
description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; description = "Yet another SIP003 plugin for shadowsocks, based on v2ray";

2
pkgs/top-level/python-packages.nix
View file

@ -6012,6 +6012,8 @@ self: super: with self; {
mitogen = callPackage ../development/python-modules/mitogen { }; mitogen = callPackage ../development/python-modules/mitogen { };
mixins = callPackage ../development/python-modules/mixins { };
mixpanel = callPackage ../development/python-modules/mixpanel { }; mixpanel = callPackage ../development/python-modules/mixpanel { };
mizani = callPackage ../development/python-modules/mizani { }; mizani = callPackage ../development/python-modules/mizani { };