From ab03ddc8f441a11644a4ce3d29eb290fa02b11e3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 14 Mar 2022 10:14:18 +0100 Subject: [PATCH 01/23] lib.generators: add toINIWithGlobalSection As discussed in https://github.com/NixOS/nixpkgs/pull/118925#issuecomment-821112723, this is the best way of adding global sections to `toINI` without employing heuristics (i.e. checking whether something is an attrset). --- lib/generators.nix | 45 ++++++++++++++++++++++++++++++++++ lib/tests/misc.nix | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/lib/generators.nix b/lib/generators.nix index 79ae9055ce3d..c421573a727b 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -130,6 +130,51 @@ rec { # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; + /* Generate an INI-style config file from an attrset + * specifying the global section (no header), and an + * attrset of sections to an attrset of key-value pairs. + * + * generators.toINIWithGlobalSection {} { + * globalSection = { + * someGlobalKey = "hi"; + * }; + * sections = { + * foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; + * baz = { "also, integers" = 42; }; + * } + * + *> someGlobalKey=hi + *> + *> [baz] + *> also, integers=42 + *> + *> [foo] + *> ciao=bar + *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 + * + * The mk* configuration attributes can generically change + * the way sections and key-value strings are generated. + * + * For more examples see the test cases in ./tests.nix. + * + * If you don’t need a global section, you can also use + * `generators.toINI` directly, which only takes + * the part in `sections`. + */ + toINIWithGlobalSection = { + # apply transformations (e.g. escapes) to section names + mkSectionName ? (name: libStr.escape [ "[" "]" ] name), + # format a setting line from key and value + mkKeyValue ? mkKeyValueDefault {} "=", + # allow lists as values for duplicate keys + listsAsDuplicateKeys ? false + }: { globalSection, sections }: + ( if globalSection == {} + then "" + else (toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } globalSection) + + "\n") + + (toINI { inherit mkSectionName mkKeyValue listsAsDuplicateKeys; } sections); + /* Generate a git-config file from an attrset. * * It has two major differences from the regular INI format: diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 5fa95828df69..6687b9bebaee 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -471,6 +471,66 @@ runTests { ''; }; + testToINIWithGlobalSectionEmpty = { + expr = generators.toINIWithGlobalSection {} { + globalSection = { + }; + sections = { + }; + }; + expected = '' + ''; + }; + + testToINIWithGlobalSectionGlobalEmptyIsTheSameAsToINI = + let + sections = { + "section 1" = { + attribute1 = 5; + x = "Me-se JarJar Binx"; + }; + "foo" = { + "he\\h=he" = "this is okay"; + }; + }; + in { + expr = + generators.toINIWithGlobalSection {} { + globalSection = {}; + sections = sections; + }; + expected = generators.toINI {} sections; + }; + + testToINIWithGlobalSectionFull = { + expr = generators.toINIWithGlobalSection {} { + globalSection = { + foo = "bar"; + test = false; + }; + sections = { + "section 1" = { + attribute1 = 5; + x = "Me-se JarJar Binx"; + }; + "foo" = { + "he\\h=he" = "this is okay"; + }; + }; + }; + expected = '' + foo=bar + test=false + + [foo] + he\h\=he=this is okay + + [section 1] + attribute1=5 + x=Me-se JarJar Binx + ''; + }; + /* right now only invocation check */ testToJSONSimple = let val = { From 626ecc7bd72668e8624bfc3eac3635a1a31d1bf3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 14 Mar 2022 10:30:20 +0100 Subject: [PATCH 02/23] lib.generators: fix references to test file --- lib/generators.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index c421573a727b..3bc0fee332ae 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -10,7 +10,7 @@ * are mostly generators themselves, called with * their respective default values; they can be reused. * - * Tests can be found in ./tests.nix + * Tests can be found in ./tests/misc.nix * Documentation in the manual, #sec-generators */ { lib }: @@ -108,7 +108,7 @@ rec { * The mk* configuration attributes can generically change * the way sections and key-value strings are generated. * - * For more examples see the test cases in ./tests.nix. + * For more examples see the test cases in ./tests/misc.nix. */ toINI = { # apply transformations (e.g. escapes) to section names @@ -155,7 +155,7 @@ rec { * The mk* configuration attributes can generically change * the way sections and key-value strings are generated. * - * For more examples see the test cases in ./tests.nix. + * For more examples see the test cases in ./tests/misc.nix. * * If you don’t need a global section, you can also use * `generators.toINI` directly, which only takes From bbe25ed9daa0215b12a4e3f45894d5f5515b46dc Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 26 Mar 2022 09:54:27 -0700 Subject: [PATCH 03/23] saleae-logic-2: 2.3.45 -> 2.3.47 --- pkgs/development/tools/misc/saleae-logic-2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 242d76174ce9..3b9ae267d70a 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.45"; + version = "2.3.47"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-kX8jMCUkz7B0muxsEwEttEX+DA2P+6swdZJGHyo7ScA="; + sha256 = "sha256-6/FtdupveKnbAK6LizmJ6BokE0kXgUaMz0sOWi+Fq8k="; }; desktopItem = makeDesktopItem { inherit name; @@ -70,6 +70,6 @@ appimageTools.wrapType2 { description = "Software for Saleae logic analyzers"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.j-hui ]; + maintainers = with maintainers; [ j-hui newam ]; }; } From 03c128cc4b2fcecc630ab75bb6e46282cfd429b8 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 30 Mar 2022 22:41:50 +0200 Subject: [PATCH 04/23] hydrus: 478 -> 479 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 1d0cf4bec7d0..63174ecba98d 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "478"; + version = "479"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-ZsQzKc2fOFTzI/kBS8ws2+XT9kRAn4L55n1EZgVy4Kk="; + sha256 = "sha256-hP+tOrtYfxAKmNCJSYWQzmd0hjxktNEjJqb42lPG9IM="; }; nativeBuildInputs = [ From 2edc9024234e4393ff9f23d837ca4c5b58a5d2f5 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Thu, 31 Mar 2022 12:07:26 +0200 Subject: [PATCH 05/23] ntfy-sh: 1.18.1 -> 1.19.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 6f5a0b011633..c916f61f0d4c 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-rXdkNJYpQ8s2BeFRR4fSIuCrdq60me4B3wee64ei8qM="; + sha256 = "sha256-su4Q41x0PrKHRg2R6jxo1KUmWaaLSrU9UZSDsonKNyA="; }; - vendorSha256 = "sha256-7b3cQczQLUZ//5ubKvq8s9U75qJpJaieLN+kzjXIyHg="; + vendorSha256 = "sha256-eZmvngNSYY5Z5Xd5tPXzxv9GkosUMueaBGjZ6L7o/yU="; doCheck = false; From 38b7c3bf7722e5cf0ddf5d9b5afe232aa65535e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Apr 2022 06:01:55 +0000 Subject: [PATCH 06/23] x11docker: 7.1.3 -> 7.1.4 --- pkgs/applications/virtualization/x11docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index bad1e98296c2..621514ad4c82 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.1.3"; + version = "7.1.4"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-eSarw5RG2ckup9pNlZtAyZAN8IPZy94RRfej9ppiLfo="; + sha256 = "sha256-geYn1ir8h1EAUpTWsTS7giQt5eQwIBFeemS+a940ORg="; }; nativeBuildInputs = [ makeWrapper ]; From 9dc7fafa420430bd5b3cd19e5079af7d8c255bf6 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 1 Apr 2022 12:06:15 +0200 Subject: [PATCH 07/23] nodePackages.postcss-cli: add Luflosi as maintainer --- pkgs/development/node-packages/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 07ed3d19e4eb..ec995bad5ae6 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -349,7 +349,10 @@ let inherit (self) postcss-cli; }; }; - meta.mainProgram = "postcss"; + meta = { + mainProgram = "postcss"; + maintainers = with lib.maintainers; [ Luflosi ]; + }; }; prisma = super.prisma.override rec { From 757affafd3f357ebb94db66b773fe7466cb5433f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 1 Apr 2022 12:19:25 +0200 Subject: [PATCH 08/23] nodePackages.postcss-cli: fix execution of binary Without this change, executing the postcss binary results in the following error: Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'postcss' Thanks to https://github.com/NixOS/nixpkgs/issues/145618#issuecomment-1051347961 I finally managed to fix this. For some reason `wrapProgram` is still needed though. Fixes https://github.com/NixOS/nixpkgs/issues/145618. --- pkgs/development/node-packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ec995bad5ae6..23f41b7b4d2a 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -343,6 +343,7 @@ let wrapProgram "$out/bin/postcss" \ --prefix NODE_PATH : ${self.postcss}/lib/node_modules \ --prefix NODE_PATH : ${self.autoprefixer}/lib/node_modules + ln -s '${self.postcss}/lib/node_modules/postcss' "$out/lib/node_modules/postcss" ''; passthru.tests = { simple-execution = pkgs.callPackage ./package-tests/postcss-cli.nix { From 967eb265e497d2d9d82b97a24b4d4b2244279d57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Apr 2022 13:24:50 +0000 Subject: [PATCH 09/23] python310Packages.srp: 1.0.18 -> 1.0.19 --- pkgs/development/python-modules/srp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 17a3ab51cc7a..83661ea5030f 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "srp"; - version = "1.0.18"; + version = "1.0.19"; src = fetchPypi { inherit pname version; - sha256 = "1582317ccd383dc39d54f223424c588254d73d1cfb2c5c24d945e018ec9516bb"; + sha256 = "sha256-SOZT6MP1kJCbpAcwbrLoRgosfR+GxWvOWc9Cr1T/XSo="; }; propagatedBuildInputs = [ six ]; From 4ea204571a376f7c1b44a0357a54f768313ebc0a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 1 Apr 2022 18:19:09 +0200 Subject: [PATCH 10/23] apfsprogs: unstable-2021-10-26 -> unstable-2022-02-23 --- pkgs/tools/filesystems/apfsprogs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/tools/filesystems/apfsprogs/default.nix index 2c2aa108077f..a9f9a746d98b 100644 --- a/pkgs/tools/filesystems/apfsprogs/default.nix +++ b/pkgs/tools/filesystems/apfsprogs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "apfsprogs"; - version = "unstable-2021-10-26"; + version = "unstable-2022-02-23"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "05ecfa367a8142e289dc76333294271b5edfe395"; - sha256 = "sha256-McGQG8f12DTp/It8KjMHGyfE5tgmgLd7MZlZIn/xC+E="; + rev = "5bce5c7f42843dfbbed90767640e748062e23dd2"; + sha256 = "sha256-0N+aC5paP6ZoXUD7A9lLnF2onbOJU+dqZ8oKs+dCUcg="; }; buildPhase = '' From ef14112293521359d22530f343bd39191dc19adc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Apr 2022 20:25:02 +0000 Subject: [PATCH 11/23] go-task: 3.11.0 -> 3.12.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index d6e5855d992c..ff8a8174fd75 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-KHeZ0UH7qa+fii+sT7q9ri3DpLOKqQZqCAKQYn4l5M8="; + sha256 = "sha256-FArt9w4nZJW/Kql3Y2rr/IVz+SnWCS2lzNMWF6TN0Bg="; }; - vendorSha256 = "sha256-u+LeH9GijquBeYlA3f2GcyoSP/S7BtBqb8C9OgEA9fY="; + vendorSha256 = "sha256-73DtLYyq3sltzv4VtZMlZaSbP9zA9RZw2wgXVkzwrso="; doCheck = false; From efac54701a2bfb202be80756ec87c49bd968c359 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 23:08:41 +0000 Subject: [PATCH 12/23] steampipe: 0.13.3 -> 0.13.4 --- pkgs/tools/misc/steampipe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index ee97166deb11..664290dbc93a 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-zU/FWrlE4TQhzRNOVED7hFub+lehPFD+fEJ3v0PFGdM="; + sha256 = "sha256-Qq8i/uU2TtrEpvTPFmnZdku2vNo5O240dAT2OQKel1U="; }; - vendorSha256 = "sha256-0jixQcgSXQJAd899EWOUKde5OXZcSZwQfH7LRdQlm7c="; + vendorSha256 = "sha256-pEQG9BHhsVDVSOoKJBocLXMLjmP72RM+GXz4nYD4D7s="; proxyVendor = true; # tests are failing for no obvious reasons From db1698ddde1599b19a2d04b01134bb3c5e1a2e8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Apr 2022 06:43:13 +0000 Subject: [PATCH 13/23] xfce.mousepad: 0.5.8 -> 0.5.9 --- pkgs/desktops/xfce/applications/mousepad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 2b794aa4b8ab..1da88a0104f8 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.8"; + version = "0.5.9"; odd-unstable = false; - sha256 = "sha256-Q5coRO2Swo0LpB+pzi+fxrwNyhcDbQXLuQtepPlCyxY="; + sha256 = "sha256-xuSv2H1+/NNUAm+D8f+f5fPVR97iJ5vIDzPa3S0HLM0="; nativeBuildInputs = [ gobject-introspection ]; From ef7be2a3f659030c5daaa0edc870d5a8c147e996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 5 Apr 2022 11:02:41 +0200 Subject: [PATCH 14/23] linuxPackages_4_14.wireguard: 1.0.20210606 -> 1.0.20211208 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 32389d27369c..f10a44710727 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20210606"; + version = "1.0.20211208"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-ha7x6+41oPRRhuRwEb1ojRWLF1dlEMoJtqXrzRKQ408="; + sha256 = "sha256-MHC4ojhRD8IGwTUE8oEew8IVof9hQCC7CPgVQIBfBRQ="; }; hardeningDisable = [ "pic" ]; From f7eb323b86d79e315936ec31cd5cbfbf98388cc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 07:54:31 +0000 Subject: [PATCH 15/23] python310Packages.hatchling: 0.20.1 -> 0.22.0 --- pkgs/development/python-modules/hatchling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 09cbdead671a..045bbafd6360 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,7 +21,7 @@ let pname = "hatchling"; - version = "0.20.1"; + version = "0.22.0"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-l1VRce5H3CSAwZBeuxRyy7bNpOM6zX5s2L1/DXPo/Bg="; + hash = "sha256-BUJ24F4oON/9dWpnnDNM5nIOuh3yuwlvDnLA9uQAIXo="; }; # listed in backend/src/hatchling/ouroboros.py From 955cb0340858480612efd3f23e86e5db551bd62c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 09:26:20 +0000 Subject: [PATCH 16/23] python310Packages.tweepy: 4.6.0 -> 4.8.0 --- pkgs/development/python-modules/tweepy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index c97fd85a8be4..6b7dbee8fa5a 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.6.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-7ogsocRTMTO5yegyY7BADu9NrHK7zMMbihBu8oF4UlQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RaM2JN2WOHyZY+AxzgQLvhXg6UnevDbSFSR4jFLsYrc="; }; propagatedBuildInputs = [ From 0d79899aaa6c1f836574f38d30c482aa04d7eec0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Apr 2022 12:44:38 +0200 Subject: [PATCH 17/23] python310Packages.srp: disable on older Python releases - Add description - Add pythonImportsCheck --- .../python-modules/srp/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 83661ea5030f..13820a236346 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -1,20 +1,35 @@ -{ buildPythonPackage, fetchPypi, six, lib }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, pythonOlder +}: buildPythonPackage rec { pname = "srp"; version = "1.0.19"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SOZT6MP1kJCbpAcwbrLoRgosfR+GxWvOWc9Cr1T/XSo="; + hash = "sha256-SOZT6MP1kJCbpAcwbrLoRgosfR+GxWvOWc9Cr1T/XSo="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # Tests ends up with libssl.so cannot load shared doCheck = false; + pythonImportsCheck = [ + "srp" + ]; + meta = with lib; { + description = "Implementation of the Secure Remote Password protocol (SRP)"; longDescription = '' This package provides an implementation of the Secure Remote Password protocol (SRP). SRP is a cryptographically strong authentication protocol for password-based, mutual authentication over an insecure network connection. From c28846f1ec1628fff05f16580b2f3097e68010cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 12:08:32 +0000 Subject: [PATCH 18/23] python310Packages.types-cryptography: 3.3.18 -> 3.3.19 --- .../development/python-modules/types-cryptography/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-cryptography/default.nix b/pkgs/development/python-modules/types-cryptography/default.nix index dd68bfddef7b..508824720366 100644 --- a/pkgs/development/python-modules/types-cryptography/default.nix +++ b/pkgs/development/python-modules/types-cryptography/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "types-cryptography"; - version = "3.3.18"; + version = "3.3.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RI/q+a4xImFJvGvOHPj/9U2mYe8Eg398DDFoKYhcNig="; + sha256 = "sha256-+VcTjwczMrnAfq2wgx76pXj9tgTlU6w41yxGeutLfCM="; }; pythonImportsCheck = [ From caa91541bc483f009693fbaf0497f13fcd85f2f7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 6 Apr 2022 13:22:24 +0100 Subject: [PATCH 19/23] go_1_18: don't force gcc8 on aarch64-linux --- pkgs/top-level/all-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c73778efa654..e69fa48b8fe9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12712,12 +12712,9 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go_1_18 = callPackage ../development/compilers/go/1.18.nix ({ + go_1_18 = callPackage ../development/compilers/go/1.18.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); + }; go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; From 2b6e571f8f6e7414486a8730f32708773cbaa2d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 13:58:17 +0000 Subject: [PATCH 20/23] python310Packages.azure-identity: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/azure-identity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 44660e56f426..c4897fb306f9 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; + sha256 = "sha256-CFTRnaTFZEZBgU3E+VHELgFAC1eS8J37a/+nJti5Fg0="; }; postPatch = '' From 041060b41517ae4823ad7f0268f662aeb7279f5f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 6 Apr 2022 12:00:11 -0300 Subject: [PATCH 21/23] goreman: enable tests (#167538) --- pkgs/tools/system/goreman/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix index 8257e930779d..51d70fbc9333 100644 --- a/pkgs/tools/system/goreman/default.nix +++ b/pkgs/tools/system/goreman/default.nix @@ -20,8 +20,6 @@ buildGoModule rec { vendorSha256 = "sha256-87aHBRWm5Odv6LeshZty5N31sC+vdSwGlTYhk3BZkPo="; - doCheck = false; - meta = with lib; { description = "foreman clone written in go language"; homepage = "https://github.com/mattn/goreman"; From 7eb1a32324f039230261195ee8f913bfb4617f91 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 6 Apr 2022 16:35:11 +0200 Subject: [PATCH 22/23] subversion-client: remove appendToName to have a consistent package name for repology --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 4789d654ae68..0f88a18a4787 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -22,10 +22,10 @@ let common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec { inherit version; - pname = "subversion"; + pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}"; src = fetchurl { - url = "mirror://apache/subversion/${pname}-${version}.tar.bz2"; + url = "mirror://apache/subversion/subversion-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e69fa48b8fe9..539761165cb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29273,11 +29273,11 @@ with pkgs; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) subversion_1_10 subversion; - subversionClient = appendToName "client" (subversion.override { + subversionClient = subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; - }); + }; sublime-music = callPackage ../applications/audio/sublime-music { }; From 59d06e482608eeaf1eda9281be22bfdaa72a47bc Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 4 Apr 2022 19:52:26 -0700 Subject: [PATCH 23/23] wireshark-cli: support cross compile --- .../networking/sniffers/wireshark/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 468a06af2091..0947686144e5 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpg-error, geoip, openssl, lua5, python3, libcap, glib , libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook , withQt ? true, qt5 ? null @@ -29,22 +29,30 @@ in stdenv.mkDerivation { "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444 "-DCMAKE_INSTALL_LIBDIR=lib" + "-DLEMON_C_COMPILER=cc" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DHAVE_C99_VSNPRINTF_EXITCODE=0" + "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT=" ]; # Avoid referencing -dev paths because of debug assertions. NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config ] + nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ - gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt - libgpg-error gnutls geoip c-ares python3 glib zlib + gettext pcre libpcap lua5 libssh nghttp2 openssl libgcrypt + libgpg-error gnutls geoip c-ares glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + strictDeps = true; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postPatch = ''