From d1333319d2aac890d63a1b034c4c0956bc0d495b Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Sun, 19 Sep 2021 00:42:58 +0200 Subject: [PATCH 01/22] ligolo-ng: init at 0.1 --- pkgs/tools/networking/ligolo-ng/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/ligolo-ng/default.nix diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix new file mode 100644 index 000000000000..652bdc3717f6 --- /dev/null +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a87e8a3727..0dea254549d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17857,6 +17857,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 { }; From 31790c81dcffee8c267cbc01f16938497ed172af Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 Oct 2021 11:43:13 +0200 Subject: [PATCH 02/22] nixos: make setgid wrappers root-owned --- nixos/modules/programs/ccache.nix | 2 +- nixos/modules/programs/mosh.nix | 2 +- nixos/modules/services/mail/opensmtpd.nix | 2 +- nixos/modules/services/mail/postfix.nix | 8 ++++---- nixos/modules/services/x11/desktop-managers/cde.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix index 35a4373f6128..0f7fd0a3683c 100644 --- a/nixos/modules/programs/ccache.nix +++ b/nixos/modules/programs/ccache.nix @@ -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; diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix index 359fe23e0ecd..e08099e21a00 100644 --- a/nixos/modules/programs/mosh.nix +++ b/nixos/modules/programs/mosh.nix @@ -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; diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index ef7d53e7d927..e2647b90907d 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -103,7 +103,7 @@ in { }; security.wrappers.smtpctl = { - owner = "nobody"; + owner = "root"; group = "smtpq"; setuid = false; setgid = true; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index da18fae4ca7d..6610399cad68 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -673,7 +673,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; @@ -682,7 +682,7 @@ in security.wrappers.mailq = { program = "mailq"; source = "${pkgs.postfix}/bin/mailq"; - owner = "nobody"; + owner = "root"; group = setgidGroup; setuid = false; setgid = true; @@ -691,7 +691,7 @@ in security.wrappers.postqueue = { program = "postqueue"; source = "${pkgs.postfix}/bin/postqueue"; - owner = "nobody"; + owner = "root"; group = setgidGroup; setuid = false; setgid = true; @@ -700,7 +700,7 @@ in security.wrappers.postdrop = { program = "postdrop"; source = "${pkgs.postfix}/bin/postdrop"; - owner = "nobody"; + owner = "root"; group = setgidGroup; setuid = false; setgid = true; diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix index 24ca82fca796..9c0e482ea9f1 100644 --- a/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/nixos/modules/services/x11/desktop-managers/cde.nix @@ -50,7 +50,7 @@ in { security.wrappers = { dtmail = { setgid = true; - owner = "nobody"; + owner = "root"; group = "mail"; source = "${pkgs.cdesktopenv}/bin/dtmail"; }; From f4c69e198ce8a8208995e43133d4c32d2045a587 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Thu, 30 Sep 2021 09:54:49 +0200 Subject: [PATCH 03/22] nixos/bitlbee: switched to systemd DynamicUser --- nixos/modules/misc/ids.nix | 4 ++-- nixos/modules/services/networking/bitlbee.nix | 20 ++++++------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e760a18f5082..b77ef42a1657 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -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; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 59ad9e546863..f545852453ef 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -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 ]; From db26b5ce1769792951df844b193ee531013cc18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Oct 2021 18:06:28 -0700 Subject: [PATCH 04/22] python3Packages.class-registry: make alias of phx-class-registry --- .../python-modules/class-registry/default.nix | 32 ----------------- .../phx-class-registry/default.nix | 36 +++++++++++-------- .../tools/backblaze-b2/default.nix | 1 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 5 files changed, 22 insertions(+), 50 deletions(-) delete mode 100644 pkgs/development/python-modules/class-registry/default.nix diff --git a/pkgs/development/python-modules/class-registry/default.nix b/pkgs/development/python-modules/class-registry/default.nix deleted file mode 100644 index 1accefe5f1e5..000000000000 --- a/pkgs/development/python-modules/class-registry/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index 94538dc6e74d..0cb94be921db 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 070546a3ff91..a326f85eac0a 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -29,7 +29,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ b2sdk - class-registry phx-class-registry setuptools docutils diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 039b921ee982..ad0b39b27ac6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b317230c9a7d..7f370f947312 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; From 6ce13375ce2b29dfccecf2aa424b56cff00fbd8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 04:06:51 +0000 Subject: [PATCH 05/22] python38Packages.azure-synapse-artifacts: 0.8.0 -> 0.9.0 --- .../python-modules/azure-synapse-artifacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 8be13364e1b0..f500e9068adb 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -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 = [ From 66cada7957be0879f630772dd4dc0572ea0ac876 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 04:43:09 +0000 Subject: [PATCH 06/22] python38Packages.azure-synapse-spark: 0.6.0 -> 0.7.0 --- .../python-modules/azure-synapse-spark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix index db998e00e697..554b97c35619 100644 --- a/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -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"; }; From 7e5136fcc483af9ca14e3655c1a38bc056b6e26e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 6 Oct 2021 04:44:44 +0000 Subject: [PATCH 07/22] steamPackages.steam-runtime: 0.20210630.0 -> 0.20210906.1 --- pkgs/games/steam/runtime.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index a986e1baa2c3..fc38c2eab99f 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -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"; }; From 8a6c04cb8c9a4b78d55737a24a0972bbc88007b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 04:55:41 +0000 Subject: [PATCH 08/22] certbot: 1.19.0 -> 1.20.0 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index e5b6b6cc1cd7..6fe2bc2be08d 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -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}"; From 5ac32013ca5f58863e1846621c808c4d2819efcd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 6 Oct 2021 05:09:21 +0000 Subject: [PATCH 09/22] steam: 1.0.0.70 -> 1.0.0.72 --- pkgs/games/steam/steam.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index f9883633576c..74ee8778b393 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -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 ]; }; From 471c673d716fc0695557e302d18236cee2f0d1a4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 6 Oct 2021 08:14:34 +0200 Subject: [PATCH 10/22] grafana: 8.1.5 -> 8.1.6 Fixes CVE-2021-39226. https://grafana.com/blog/2021/10/05/grafana-7.5.11-and-8.1.6-released-with-critical-security-fix/ --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index bbcd7b6eadf9..848bcaca4340 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -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: From 22849ce37bcd5c2e2f20946869c29a4a6bf65c24 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 06:40:34 +0000 Subject: [PATCH 11/22] python38Packages.google-cloud-spanner: 3.11.0 -> 3.11.1 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index bb74540b0f55..50560585b4ee 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -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 = [ From beafc415378f72565daf76369388d99ab2fb6d01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 06:48:48 +0000 Subject: [PATCH 12/22] python38Packages.google-cloud-speech: 2.9.1 -> 2.9.3 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 9eb3fcf24239..90ec3078d24e 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -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 ]; From 6a3f62b11b3e8ed156c60e778bd61dfe0702c136 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 06:53:54 +0000 Subject: [PATCH 13/22] python38Packages.google-cloud-runtimeconfig: 0.32.5 -> 0.32.6 --- .../python-modules/google-cloud-runtimeconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 0da292a342c6..91a1e354acca 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -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 ]; From e6b118a209c05ba11bbb0cd09322a1275fa64bb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 07:01:47 +0000 Subject: [PATCH 14/22] python38Packages.google-crc32c: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/google-crc32c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index 1e010f956013..d3cc01e45380 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -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 ]; From f35a2f5fdb2ca18b2c4a971c0462c160d07bb7ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 07:29:42 +0000 Subject: [PATCH 15/22] python38Packages.javaproperties: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/javaproperties/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index 348d83e11059..e3eee7d72e9b 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -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 ]; From b862bde8b055a3894acc87eeac058ade0ccc007b Mon Sep 17 00:00:00 2001 From: Elliot <87149454+noch3@users.noreply.github.com> Date: Wed, 6 Oct 2021 03:30:32 -0400 Subject: [PATCH 16/22] ocl-icd: update platforms, remove outdated postPatch (#137342) Co-authored-by: Sandro --- pkgs/development/libraries/ocl-icd/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 75dd5ecd541f..7dbcecab0c86 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -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; }; } From b16c74abd3b149b09613629219716202c5436427 Mon Sep 17 00:00:00 2001 From: Albin Parou Date: Wed, 6 Oct 2021 09:43:48 +0200 Subject: [PATCH 17/22] awscli2: 2.2.39 -> 2.2.40 (#139020) --- pkgs/tools/admin/awscli2/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 4206136ec6d6..cf765a53c53f 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -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 = [ From 56db7926f08a7b70f9e867ce2b9b6bfbbb1d08fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 08:33:33 +0000 Subject: [PATCH 18/22] python38Packages.google-cloud-container: 2.8.0 -> 2.8.1 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 9bac30fd3c13..15f496c99182 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -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 ]; From 138b068c1a5066cd24f8c14e3cd2db20fd4d7415 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 3 Oct 2021 19:37:57 +0200 Subject: [PATCH 19/22] retroshare: update homepage --- pkgs/applications/networking/p2p/retroshare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index e69155d4c2f4..7a213b880348 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -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 ]; From 7e26b36f7a51ef422565d1476c52a93a868541f1 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 3 Oct 2021 19:39:57 +0200 Subject: [PATCH 20/22] raylib: add changelog --- pkgs/development/libraries/raylib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 9843141fc008..c8465dbf297b 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -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"; }; } From 5f3fee29e2637c0449aeaf5ddae1d97e79b91738 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 26 Sep 2021 12:30:15 +0200 Subject: [PATCH 21/22] vieb: use latest electron --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f5f4114b467..458e59520abc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26807,9 +26807,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 {}; From e8409249d9b3cb3c6944c028203c0fd7a99eb382 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 6 Oct 2021 12:28:35 +0200 Subject: [PATCH 22/22] hci: Fix hydraPlatforms --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 46d9bb767422..203398c95d7d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 );