From ab3dd3dbc2c1a11f13077d40cc34d38fdae0305e Mon Sep 17 00:00:00 2001 From: Jack Michaud Date: Mon, 29 Mar 2021 10:58:52 -0700 Subject: [PATCH 1/7] python: mypy-protobuf: 1.23 -> 2.4 BREAKING CHANGE: Dropping compatibility with python <= 3.5 https://github.com/dropbox/mypy-protobuf/blob/master/CHANGELOG.md --- pkgs/development/python-modules/mypy-protobuf/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 69178edb6919..6c6ea7b7b1c9 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,12 +1,14 @@ -{ lib, fetchPypi, buildPythonApplication, protobuf }: +{ lib, fetchPypi, buildPythonApplication, protobuf, pythonOlder }: buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.23"; + version = "2.4"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cf79c77e828a2de9bdc74b43ad4abd4c2a3a30f0471b46e9b4e01b9877f166fb"; + sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; }; propagatedBuildInputs = [ protobuf ]; From 525420ef36e5de7ccb4ae97aa1e5d477410196aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Fri, 2 Apr 2021 20:36:31 +0200 Subject: [PATCH 2/7] gnuradio3_8: 3.8.2.0 -> 3.8.3.0 --- pkgs/applications/radio/gnuradio/3.8.nix | 30 +++++++----------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 799b429800da..7e2069c346c7 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -42,7 +42,7 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.8"; - minor = "2"; + minor = "3"; patch = "0"; } # We use our build of volk and not the one bundled with the release @@ -50,7 +50,7 @@ }: let - sourceSha256 = "SFDjtyQRp0fXijZukpLYtISpx8imxedlYN9mRibv1eA="; + sourceSha256 = "0lwbj3slhc8bjjvfw7yz45if21hajydgy2vsjvj2barzmhfb37fd"; featuresInfo = { # Needed always basic = { @@ -241,12 +241,17 @@ stdenv.mkDerivation rec { }; cmakeFlags = shared.cmakeFlags # From some reason, if these are not set, libcodec2 and gsm are not - # detected properly. NOTE: qradiolink needs libcodec2 to be detected in + # detected properly. The issue is reported upstream: + # https://github.com/gnuradio/gnuradio/issues/4278 + # + # NOTE: qradiolink needs libcodec2 to be detected in # order to build, see https://github.com/qradiolink/qradiolink/issues/67 ++ lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_FOUND=TRUE" "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" "-DLIBCODEC2_HAS_FREEDV_API=ON" + "-DLIBGSM_FOUND=TRUE" "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" ] @@ -262,23 +267,4 @@ stdenv.mkDerivation rec { ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; - patches = [ - # Don't install python referencing files if python support is disabled. - # See: https://github.com/gnuradio/gnuradio/pull/3839 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff"; - sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q="; - }) - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff"; - sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4="; - }) - # Needed to use boost 1.7x, see: - # https://github.com/gnuradio/gnuradio/issues/3720 - # https://github.com/gnuradio/gnuradio/pull/3967 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/cbcb968358fad56f3646619b258f18b0e6693a07.diff"; - sha256 = "1ajf4797f869lqv436xw61s29qdbn7f01i0970kfxv3yahd34p9v"; - }) - ]; } From 06021016f15ce33886fe3f7ee49d512a83ff2369 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 4 Apr 2021 04:20:00 +0000 Subject: [PATCH 3/7] tflint: 0.25.0 -> 0.26.0 https://github.com/terraform-linters/tflint/releases/tag/v0.26.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 8aa9c97a9a6f..c8ae231dea8d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1n234ivpjfvppfqcpgbvsqg869m4g5xyi536di3ckm3sba9r4jwr"; + sha256 = "054g0lr0r1xzbss4b4j9ixkls9p1llmw61afib1381z4k0lvzgwn"; }; - vendorSha256 = "101bw29c2dn0mf5n32r7rkqrb9r71z3afbhwnzrm31xckbkvlwsa"; + vendorSha256 = "0j2avkhyq6vz6113lkf004d4hysygc6iw78v70z98s6m15mg9imn"; doCheck = false; From f4593abda0dae0e4b0e42cbceb1681f29b82a479 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 4 Apr 2021 12:18:18 +0100 Subject: [PATCH 4/7] deno: 1.8.2 -> 1.8.3 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 8e45b0b337aa..cdb34aab45c4 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fZuhI+ZvYsFz2gDpHkRRqmmHRyEiEO+vWfqKYdeNtaU="; + sha256 = "sha256-QkVDIpJ4VW3DpcwhydDnt68zxVXwkitIiN8blGlqX1g="; }; - cargoSha256 = "sha256-us0Kzst7iq+H/WBAlSBQJSpnirsl4zImse2bFREoW4I="; + cargoSha256 = "sha256-pf/4/H3wNORNvAswz8+7B3x5T5MyQgW7HgtDLBhfE/o="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From d2076566908a3eb90f0b6ee58050527ac5f10ae8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Apr 2021 14:49:39 +0200 Subject: [PATCH 5/7] duplicity: reduce closure size --- pkgs/tools/backup/duplicity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 42db541cf3b7..24e1a2954ed6 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication rec { librsync ]; - propagatedBuildInputs = with pythonPackages; [ + pythonPath = with pythonPackages; [ b2sdk boto boto3 From 67f3319fb7ebd3284561246b3f2943b8db31d45f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 4 Apr 2021 12:41:14 -0400 Subject: [PATCH 6/7] wpa_supplicant: Enable bgscan 'learn' module --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index d9767cbdd934..f9198cc8ff4b 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { CONFIG_P2P=y CONFIG_TDLS=y CONFIG_BGSCAN_SIMPLE=y + CONFIG_BGSCAN_LEARN=y '' + optionalString (pcsclite != null) '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y From adfad6c5b88a2d720bb8baf944573a4626a3f8c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Apr 2021 17:49:57 +0000 Subject: [PATCH 7/7] crlfuzz: 1.4.0 -> 1.4.1 --- pkgs/tools/security/crlfuzz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/tools/security/crlfuzz/default.nix index 88bd45bb5e16..d203d0d7f463 100644 --- a/pkgs/tools/security/crlfuzz/default.nix +++ b/pkgs/tools/security/crlfuzz/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "crlfuzz"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "dwisiswant0"; repo = pname; rev = "v${version}"; - sha256 = "03g7z7cczn52hvg6srp1i5xhdbpia226adrh2d54cs640063bx3m"; + sha256 = "sha256-rqhdxOQmZCRtq+IZygKLleb5GoKP2akyEc3rbGcnZmw="; }; - vendorSha256 = "19cj07f7d3ksp7lh5amdjz1s8p7xmqbwal4vp61al82n8944ify8"; + vendorSha256 = "sha256-yLtISEJWIKqCuZtQxReu/Vykw5etqgLpuXqOdtwBkqU="; doCheck = true;