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] 2021-10-06 12:02:08 +00:00 committed by GitHub
commit ffeeefedb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 117 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/misc/ids.nix
View File

@ -48,7 +48,7 @@ in
#disk = 6; # unused
#vsftpd = 7; # dynamically allocated ass of 2021-09-14
ftp = 8;
bitlbee = 9;
# bitlbee = 9; # removed 2021-10-05 #139765
#avahi = 10; # removed 2019-05-22
nagios = 11;
atd = 12;
@ -368,7 +368,7 @@ in
disk = 6;
#vsftpd = 7; # dynamically allocated as of 2021-09-14
ftp = 8;
bitlbee = 9;
# bitlbee = 9; # removed 2021-10-05 #139765
#avahi = 10; # removed 2019-05-22
#nagios = 11; # unused
atd = 12;

2
nixos/modules/programs/ccache.nix
View File

@ -28,7 +28,7 @@ in {
# "nix-ccache --show-stats" and "nix-ccache --clear"
security.wrappers.nix-ccache = {
owner = "nobody";
owner = "root";
group = "nixbld";
setuid = false;
setgid = true;

2
nixos/modules/programs/mosh.nix
View File

@ -33,7 +33,7 @@ in
security.wrappers = mkIf cfg.withUtempter {
utempter = {
source = "${pkgs.libutempter}/lib/utempter/utempter";
owner = "nobody";
owner = "root";
group = "utmp";
setuid = false;
setgid = true;

2
nixos/modules/services/mail/opensmtpd.nix
View File

@ -103,7 +103,7 @@ in {
};
security.wrappers.smtpctl = {
owner = "nobody";
owner = "root";
group = "smtpq";
setuid = false;
setgid = true;

8
nixos/modules/services/mail/postfix.nix
View File

@ -674,7 +674,7 @@ in
services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
program = "sendmail";
source = "${pkgs.postfix}/bin/sendmail";
owner = "nobody";
owner = "root";
group = setgidGroup;
setuid = false;
setgid = true;
@ -683,7 +683,7 @@ in
security.wrappers.mailq = {
program = "mailq";
source = "${pkgs.postfix}/bin/mailq";
owner = "nobody";
owner = "root";
group = setgidGroup;
setuid = false;
setgid = true;
@ -692,7 +692,7 @@ in
security.wrappers.postqueue = {
program = "postqueue";
source = "${pkgs.postfix}/bin/postqueue";
owner = "nobody";
owner = "root";
group = setgidGroup;
setuid = false;
setgid = true;
@ -701,7 +701,7 @@ in
security.wrappers.postdrop = {
program = "postdrop";
source = "${pkgs.postfix}/bin/postdrop";
owner = "nobody";
owner = "root";
group = setgidGroup;
setuid = false;
setgid = true;

20
nixos/modules/services/networking/bitlbee.nix
View File

@ -16,7 +16,6 @@ let
''
[settings]
RunMode = Daemon
User = bitlbee
ConfigDir = ${cfg.configDir}
DaemonInterface = ${cfg.interface}
DaemonPort = ${toString cfg.portNumber}
@ -166,24 +165,17 @@ in
config = mkMerge [
(mkIf config.services.bitlbee.enable {
users.users.bitlbee = {
uid = bitlbeeUid;
description = "BitlBee user";
home = "/var/lib/bitlbee";
createHome = true;
};
users.groups.bitlbee = {
gid = config.ids.gids.bitlbee;
};
systemd.services.bitlbee = {
environment.PURPLE_PLUGIN_PATH = purple_plugin_path;
description = "BitlBee IRC to other chat networks gateway";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.User = "bitlbee";
serviceConfig.ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
serviceConfig = {
DynamicUser = true;
StateDirectory = "bitlbee";
ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
};
};
environment.systemPackages = [ bitlbeePkg ];

2
nixos/modules/services/x11/desktop-managers/cde.nix
View File

@ -50,7 +50,7 @@ in {
security.wrappers = {
dtmail = {
setgid = true;
owner = "nobody";
owner = "root";
group = "mail";
source = "${pkgs.cdesktopenv}/bin/dtmail";
};

2
pkgs/applications/networking/p2p/retroshare/default.nix
View File

@ -45,7 +45,7 @@ mkDerivation rec {
meta = with lib; {
description = "Decentralized peer to peer chat application.";
homepage = "http://retroshare.sourceforge.net/";
homepage = "https://retroshare.cc/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ StijnDW ];

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1483,7 +1483,7 @@ self: super: {
addBuildDepend
(overrideCabal
(unmarkBroken super.hercules-ci-cli)
(drv: { hydraPlatforms = [ super.hercules-ci-cli.meta.platforms ]; }))
(drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; }))
super.hercules-ci-optparse-applicative
);

6
pkgs/development/libraries/ocl-icd/default.nix
View File

@ -25,14 +25,10 @@ stdenv.mkDerivation rec {
buildInputs = [ opencl-headers ];
postPatch = ''
sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c
'';
meta = with lib; {
description = "OpenCL ICD Loader for ${opencl-headers.name}";
homepage = "https://github.com/OCL-dev/ocl-icd";
license = licenses.bsd2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

1
pkgs/development/libraries/raylib/default.nix
View File

@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
license = licenses.zlib;
maintainers = with maintainers; [ adamlwgriffiths ];
platforms = platforms.linux;
changelog = "https://github.com/raysan5/raylib/blob/${version}/CHANGELOG";
};
}

4
pkgs/development/python-modules/azure-synapse-artifacts/default.nix
View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "azure-synapse-artifacts";
version = "0.8.0";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3d4fdfd0bd666984f7bdc7bc0c7a6018c35a5d46a81a32dd193b07c03b528b72";
sha256 = "5e1d8f03939eafe29c301659c7b819053513be6f224861388b0048ca62e7a75d";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-synapse-spark/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "azure-synapse-spark";
version = "0.6.0";
version = "0.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "ac7564a61ba314e0a9406c0f73c3cede04091a131a0c58971bcba0c158b7455d";
sha256 = "86fa29463a24b7c37025ff21509b70e36b4dace28e5d92001bc920488350acd5";
extension = "zip";
};

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

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-tCszN+sy4Z6nOwULj9ra5/TtW4YYi32fkbMKub5i2Xk=";
sha256 = "sha256-SO8vy9x2jwK5AOHety7RuxRK+OEIHpMXqetW3bqfzZI=";
};
sourceRoot = "source/${pname}";

32
pkgs/development/python-modules/class-registry/default.nix
View File

@ -1,32 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, nose
, pythonOlder
}:
buildPythonPackage rec {
pname = "class-registry";
version = "3.0.5";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "todofixthis";
repo = pname;
rev = version;
sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q";
};
checkInputs = [
nose
];
pythonImportsCheck = [ "class_registry" ];
meta = with lib; {
description = "Factory and registry pattern for Python classes";
homepage = "https://class-registry.readthedocs.io/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ kevincox ];
};
}

4
pkgs/development/python-modules/google-cloud-container/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.8.0";
version = "2.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "f58192b534b5324c874547835808ed7d5c116e986f07e57b27b0ac5e12baddca";
sha256 = "dc0302b1fa4a435ffd97c13d669ed5b1a60c5a0a21d5528418466ca54d0cd4d5";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

4
pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-runtimeconfig";
version = "0.32.5";
version = "0.32.6";
src = fetchPypi {
inherit pname version;
sha256 = "2f7b2a69f4506239a54f2d88dda872db27fdb0fdfa0d5a9494fefb7ae360aa20";
sha256 = "3f333aa1f6a47cb5a38f3416c4ac9a4bbeaceeb1f3f2381fef9553c9fb665cc7";
};
propagatedBuildInputs = [ google-api-core google-cloud-core ];

4
pkgs/development/python-modules/google-cloud-spanner/default.nix
View File

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.11.0";
version = "3.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "8ffb36f3c1392213c9dff57f1dcb18810f6e805898ee7b4626a4da2b9b6c4b63";
sha256 = "b993b4c68f11dd6fe0f66e0c437a71f9bed8d77f6bf1ddc4aad422ce3b330ecb";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-speech/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.9.1";
version = "2.9.3";
src = fetchPypi {
inherit pname version;
sha256 = "321a11863124d2fba73c519594d5a8803650f1f4323b08b9de3d096e536e98c1";
sha256 = "52b8a056f26e9ed082576b7b173c9a86f286a12c2883ec7cf5a0e8be68020bac";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "google-crc32c";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-crc32c";
rev = "v${version}";
sha256 = "0snpqmj2avgqvfd7w26g03w78s6phwd8h55bvpjwm4lwj8hm8id7";
sha256 = "005ra4pfv71rq53198k7q6k63f529q3g6hkbxbwfcf82jr77hxga";
};
buildInputs = [ crc32c ];

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

@ -5,7 +5,7 @@
}:
buildPythonPackage rec {
version = "0.8.0";
version = "0.8.1";
pname = "javaproperties";
format = "pyproject";
@ -13,7 +13,7 @@ buildPythonPackage rec {
owner = "jwodder";
repo = pname;
rev = "v${version}";
sha256 = "0n6dz6rnpq8wdwqyxqwv0q7vrl26vfmvvysdjvy557fck1q2l0kf";
sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp";
};
propagatedBuildInputs = [ six ];

36
pkgs/development/python-modules/phx-class-registry/default.nix
View File

@ -1,28 +1,34 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "phx-class-registry";
pname = "class-registry";
version = "3.0.5";
disabled = pythonOlder "3.5";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "14iap8db2ldmnlf5kvxs52aps31rl98kpa5nq8wdm30a86n6457i";
src = fetchFromGitHub {
owner = "todofixthis";
repo = pname;
rev = version;
sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q";
};
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
disabledTests = [
"test_branding"
"test_happy_path"
"test_len"
pythonImportsCheck = [
"class_registry"
];
meta = with lib; {
description = "Registry pattern for Python classes, with setuptools entry points integration";
homepage = "https://github.com/todofixthis/class-registry";
description = "Factory and registry pattern for Python classes";
homepage = "https://class-registry.readthedocs.io/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
maintainers = with maintainers; [ kevincox SuperSandro2000 ];
};
}

1
pkgs/development/tools/backblaze-b2/default.nix
View File

@ -29,7 +29,6 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
b2sdk
class-registry
phx-class-registry
setuptools
docutils

6
pkgs/games/steam/runtime.nix
View File

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "steam-runtime";
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/
version = "0.20210630.0";
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt
version = "0.20210906.1";
src = fetchurl {
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
sha256 = "sha256-vwSgk3hEaI/RO9uvehAx3+ZBynpqjwGDzuyeyGCnu18=";
sha256 = "1dkynar5y4q0pi32ihdhl7r81v9jxsb7lhc91mqhy43f6462qz1h";
name = "scout-runtime-${version}.tar.gz";
};

8
pkgs/games/steam/steam.nix
View File

@ -2,15 +2,15 @@
let
traceLog = "/tmp/steam-trace-dependencies.log";
version = "1.0.0.70";
version = "1.0.0.72";
in stdenv.mkDerivation {
pname = "steam-original";
inherit version;
src = fetchurl {
url = "https://repo.steampowered.com/steam/archive/stable/steam_${version}.tar.gz";
sha256 = "sha256-n/iKV3jHsA77GPMk1M0MKC1fQ42tEgG8Ppgi4/9qLf8=";
url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
sha256 = "0l54ljnlnx289i1ssnss78251vyga726dnzsrhgnxwn1p1125m45";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
@ -40,7 +40,7 @@ in stdenv.mkDerivation {
meta = with lib; {
description = "A digital distribution platform";
homepage = "http://store.steampowered.com/";
homepage = "https://store.steampowered.com/";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ jagajaga jonringer ];
};

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

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "8.1.5";
version = "8.1.6";
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-Tr5U+bXBW7UIcmqrbmt/e82sZWLDMEObYsxl0INqXxw=";
sha256 = "sha256-PUVRFa3b+O2lY6q3vO+rLUcC+fx80iB78tt60f6Vugk=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-yE7mhX3peYnTdiY0YwKJ7SMvz4iXmvJncz002vdFXFg=";
sha256 = "sha256-So9xzet9kPkjcDwNts3iXlCd+u2uiXTo0LVcLc8toyk=";
};
vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I=";
vendorSha256 = "sha256-dn4sliRp58oZALZ8Iu7kE83ntkcMIU84Xr5WoeXlhCI=";
preBuild = ''
# The testcase makes an API call against grafana.com:

17
pkgs/tools/admin/awscli2/default.nix
View File

@ -11,12 +11,12 @@ let
};
});
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0dev147";
version = "2.0.0dev148";
src = fetchFromGitHub {
owner = "boto";
repo = "botocore";
rev = "afa015418df6b3aeef0f5645e8704de64adea3d7";
sha256 = "sha256-ypqDhCQXPqG8JCsLWt1V/4s95Hm+lClz+eOA2GnIhYg=";
rev = "c0734f100f61bbef413cb04d9890bbffbccd230f";
sha256 = "sha256-ndSJdBF3NMNtpyHgYAksCUBDqlwPhugTkIK6Nby20oI=";
};
propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt];
});
@ -27,19 +27,26 @@ let
sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
};
});
s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec {
version = "0.4.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";
};
});
};
};
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.2.39"; # N.B: if you change this, change botocore to a matching version too
version = "2.2.40"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
sha256 = "sha256-3GYj6+08J05Lu17jjydmzlypI5TUuV+5HA398oExkiU=";
sha256 = "sha256-IHnNRER9ePKVI9ez15HgxLDR1n6QR0iRESgNqbxQPx8=";
};
patches = [

31
pkgs/tools/networking/ligolo-ng/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ligolo-ng";
version = "0.1";
src = fetchFromGitHub {
owner = "tnpitsecurity";
repo = "ligolo-ng";
rev = "v${version}";
sha256 = "sha256-Ipfp+Ke4iSJmvUtfNUt/XSPTSDSdeMs+Ss8acZHUYrE=";
};
postConfigure = ''
export CGO_ENABLED=0
'';
ldflags = [ "-s" "-w" "-extldflags '-static'" ];
vendorSha256 = "sha256-axRCThmFavR+GTRWSgdAr2mbrp07hsFea0rKLQNIhgU=";
doCheck = false; # tests require network access
meta = with lib; {
homepage = "https://github.com/tnpitsecurity/ligolo-ng";
description = "A tunneling/pivoting tool that uses a TUN interface";
platforms = platforms.linux;
license = licenses.gpl3Only;
maintainers = with maintainers; [ elohmeier ];
};
}

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

@ -18111,6 +18111,8 @@ with pkgs;
lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { };
ligolo-ng = callPackage ../tools/networking/ligolo-ng { };
linenoise = callPackage ../development/libraries/linenoise { };
linenoise-ng = callPackage ../development/libraries/linenoise-ng { };
@ -26800,9 +26802,7 @@ with pkgs;
owamp = callPackage ../applications/networking/owamp { };
vieb = callPackage ../applications/networking/browsers/vieb {
electron = electron_13;
};
vieb = callPackage ../applications/networking/browsers/vieb { };
vivaldi = callPackage ../applications/networking/browsers/vivaldi {};

1
pkgs/top-level/python-aliases.nix
View File

@ -36,6 +36,7 @@ mapAliases ({
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
bt_proximity = bt-proximity; # added 2021-07-02
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
class-registry = phx-class-registry; # added 2021-10-05
ConfigArgParse = configargparse; # added 2021-03-18
dateutil = python-dateutil; # added 2021-07-03
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04

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

@ -1501,8 +1501,6 @@ in {
ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { };
class-registry = callPackage ../development/python-modules/class-registry { };
claripy = callPackage ../development/python-modules/claripy { };
cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };