From 5346a90b83b92adbe2a1356726b7da6e224938a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Nov 2021 07:54:43 -0800 Subject: [PATCH 01/16] megapixels: 1.4.0 -> 1.4.2 --- pkgs/applications/graphics/megapixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 2204ebc745ee..9cb7bb2972ed 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - sha256 = "sha256-I7eevbIg+DEY9hnvat65J4Kem1FFNZc4XzaQQaewP/4="; + sha256 = "sha256-ebeKbAo03+jeMveySSIz36gbwslWVMRLj+/adW8rlEQ="; }; nativeBuildInputs = [ From d06436f798cdc47c3570d17773a4081475ef608b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:12:07 +0100 Subject: [PATCH 02/16] python3Packages.pep440: init at 0.1.0 --- .../python-modules/pep440/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pep440/default.nix diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix new file mode 100644 index 000000000000..83187327af17 --- /dev/null +++ b/pkgs/development/python-modules/pep440/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pep440"; + version = "0.1.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "m1H/yqqDiFrj6tmD9jo8nDakCBZxkBPq/HtSOXMH4ZQ="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pep440" + ]; + + meta = with lib; { + description = "Python module to check whether versions number match PEP 440"; + homepage = "https://github.com/Carreau/pep440"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87b06b9eb148..ff2d47073c71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5608,6 +5608,8 @@ in { pep257 = callPackage ../development/python-modules/pep257 { }; + pep440 = callPackage ../development/python-modules/pep440 { }; + pep517 = callPackage ../development/python-modules/pep517 { }; pep8 = callPackage ../development/python-modules/pep8 { }; From 44bd0265ba2fa225ca5bc2d13004190f43a0bb58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:20:38 +0100 Subject: [PATCH 03/16] python3Packages.setupmeta: init at 3.3.0 --- .../python-modules/setupmeta/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/setupmeta/default.nix diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix new file mode 100644 index 000000000000..07b521ee9495 --- /dev/null +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, git +, mock +, pep440 +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "setupmeta"; + version = "3.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "codrsquad"; + repo = pname; + rev = "v${version}"; + sha256 = "21hABRiY8CTKkpFjePgBAtjs4/G5eFS3aPNMCBC41CY="; + }; + + checkInputs = [ + git + mock + pep440 + pytestCheckHook + setuptools-scm + ]; + + disabledTests = [ + # Tests want to scan site-packages + "test_check_dependencies" + "test_scenario" + "test_git_versioning" + ]; + + pythonImportsCheck = [ + "setupmeta" + ]; + + meta = with lib; { + description = "Python module to simplify setup.py files"; + homepage = "https://github.com/codrsquad/setupmeta"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff2d47073c71..133ee6325e80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8509,6 +8509,8 @@ in { setproctitle = callPackage ../development/python-modules/setproctitle { }; + setupmeta = callPackage ../development/python-modules/setupmeta { }; + setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { }; setuptools-git = callPackage ../development/python-modules/setuptools-git { }; From 3aa5d80be94d37b39d9a87a726f7b9226d46162d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:22:48 +0100 Subject: [PATCH 04/16] stacs: init at 0.2.0 --- pkgs/tools/security/stacs/default.nix | 42 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/security/stacs/default.nix diff --git a/pkgs/tools/security/stacs/default.nix b/pkgs/tools/security/stacs/default.nix new file mode 100644 index 000000000000..352c217b76a4 --- /dev/null +++ b/pkgs/tools/security/stacs/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "stacs"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "stacscan"; + repo = pname; + rev = version; + sha256 = "00ZYdpJktqUXdzPcouHyZcOQyFm7jdFNVuDqsufOviE="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setupmeta + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + pydantic + typing-extensions + yara-python + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "stacs" + ]; + + meta = with lib; { + description = "Static token and credential scanner"; + homepage = "https://github.com/stacscan/stacs"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d022b844475c..6a35a13b741c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3543,6 +3543,8 @@ with pkgs; ssmsh = callPackage ../tools/admin/ssmsh { }; + stacs = callPackage ../tools/security/stacs { }; + stagit = callPackage ../development/tools/stagit { }; starboard = callPackage ../applications/networking/cluster/starboard { }; From 5ff62e34a64442fb1ba9bf0d6b7f8b2e4648537e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:36:40 +0100 Subject: [PATCH 05/16] boofuzz: init at 0.4.0 --- pkgs/tools/security/boofuzz/default.nix | 54 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/security/boofuzz/default.nix diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix new file mode 100644 index 000000000000..353758c3d5f9 --- /dev/null +++ b/pkgs/tools/security/boofuzz/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "boofuzz"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "jtpereyda"; + repo = pname; + rev = "v${version}"; + sha256 = "4WtTZ2S2rC2XXN0HbiEht9NW0JXcPnpp66AH67F88yk="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + click + colorama + flask + funcy + future + psutil + pyserial + pydot + six + tornado + ]; + + checkInputs = with python3.pkgs; [ + mock + netifaces + pytest-bdd + pytestCheckHook + ]; + + disabledTests = [ + # Tests require socket access + "test_raw_l2" + "test_raw_l3" + ]; + + pythonImportsCheck = [ + "boofuzz" + ]; + + meta = with lib; { + description = "Network protocol fuzzing tool"; + homepage = "https://github.com/jtpereyda/boofuzz"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d022b844475c..42f07f5ba723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3818,6 +3818,8 @@ with pkgs; bomutils = callPackage ../tools/archivers/bomutils { }; + boofuzz= callPackage ../tools/security/boofuzz { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; bsdiff = callPackage ../tools/compression/bsdiff { }; From 645cd20f666b4271b25474b361f82d3571a45bd0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:49:35 +0100 Subject: [PATCH 06/16] chopchop: init at 1.0.0 --- pkgs/tools/security/chopchop/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/chopchop/default.nix diff --git a/pkgs/tools/security/chopchop/default.nix b/pkgs/tools/security/chopchop/default.nix new file mode 100644 index 000000000000..10ac9e7f4a77 --- /dev/null +++ b/pkgs/tools/security/chopchop/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "chopchop"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "michelin"; + repo = "ChopChop"; + rev = "v${version}"; + sha256 = "qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E="; + }; + + vendorSha256 = "UxWARWOFp8AYKEdiJwRZNwFrphgMTJSZjnvktTNOsgU="; + + meta = with lib; { + description = "CLI to search for sensitive services/files/folders"; + homepage = "https://github.com/michelin/ChopChop"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d022b844475c..2704c5dfa02f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2515,6 +2515,8 @@ with pkgs; chntpw = callPackage ../tools/security/chntpw { }; + chopchop = callPackage ../tools/security/chopchop { }; + cliphist = callPackage ../tools/wayland/cliphist { }; clipman = callPackage ../tools/wayland/clipman { }; From e86fa71ba6785a563ae3c8b7ce4c8cf72f6ce3c0 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Sun, 21 Nov 2021 21:02:04 -0800 Subject: [PATCH 07/16] shaderc: include darwin libtool Signed-off-by: Ana Hobden --- pkgs/development/compilers/shaderc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 40c216d79c34..54238348f06d 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, darwin, python3 }: # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from # https://github.com/google/shaderc/blob/known-good/known_good.json @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake darwin.cctools python3 ]; postInstall = '' moveToOutput "lib/*.a" $static From bcb0427773687c04ee2c1c59e30d86ca31ef8942 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Mon, 22 Nov 2021 09:42:23 -0800 Subject: [PATCH 08/16] libtool: add meta.platforms and make cctools Darwin only Signed-off-by: Ana Hobden --- pkgs/development/compilers/shaderc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 54238348f06d..ae9d0f8810e6 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - nativeBuildInputs = [ cmake darwin.cctools python3 ]; + nativeBuildInputs = [ cmake python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; postInstall = '' moveToOutput "lib/*.a" $static @@ -53,6 +53,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation"; + platforms = platforms.all; license = [ licenses.asl20 ]; }; } From 528716bb8e61dfc443566c9f3345df4b25d72483 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Mon, 22 Nov 2021 12:14:18 -0800 Subject: [PATCH 09/16] ocaml: Fix aarch64-darwin build --- pkgs/development/compilers/ocaml/generic.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1b6a3b56e622..3aa90733a92d 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -64,7 +64,12 @@ stdenv.mkDerivation (args // { "-target ${stdenv.targetPlatform.config}" ]; dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; - configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ]; + + # on aarch64-darwin using --host and --target causes the build to invoke + # `aarch64-apple-darwin-clang` while using assembler. However, such binary + # does not exist. So, disable these configure flags on `aarch64-darwin`. + # See #144785 for details. + configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; From 3987f21582750fbcb18aa6f1d898f1a8bd0c2b9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 21:55:36 +0100 Subject: [PATCH 10/16] slowlorust: init at 0.1.1 --- pkgs/tools/networking/slowlorust/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/slowlorust/default.nix diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix new file mode 100644 index 000000000000..dc98d95828f5 --- /dev/null +++ b/pkgs/tools/networking/slowlorust/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "slowlorust"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "MJVL"; + repo = pname; + rev = version; + sha256 = "c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c="; + }; + + cargoSha256 = "Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; + + meta = with lib; { + description = "Lightweight slowloris (HTTP DoS) tool"; + homepage = "https://github.com/MJVL/slowlorust"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b36f2f8da7f6..eb46a6458eab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9492,6 +9492,8 @@ with pkgs; slirp4netns = callPackage ../tools/networking/slirp4netns { }; + slowlorust = callPackage ../tools/networking/slowlorust { }; + slsnif = callPackage ../tools/misc/slsnif { }; slstatus = callPackage ../applications/misc/slstatus { From fd5df16c244dc320a31fb2788153c8a109d81adc Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Sun, 21 Nov 2021 19:54:02 -0800 Subject: [PATCH 11/16] bwbasic: init at 3.20 --- .../interpreters/bwbasic/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/interpreters/bwbasic/default.nix diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix new file mode 100644 index 000000000000..4fec1cc7b3e4 --- /dev/null +++ b/pkgs/development/interpreters/bwbasic/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, dos2unix, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "bwbasic"; + version = "3.20"; + + src = fetchurl { + url = "mirror://sourceforge/project/bwbasic/bwbasic/version%203.20/bwbasic-3.20.zip"; + sha256 = "1w9r4cl7z1lh52c1jpjragbspi1qn0zb7jhcsldav4gdnzxfw67f"; + }; + + nativeBuildInputs = [ dos2unix unzip ]; + + unpackPhase = '' + unzip $src + ''; + + postPatch = '' + dos2unix configure + patchShebangs configure + chmod +x configure + ''; + + hardeningDisable = [ "format" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with lib; { + description = "Bywater BASIC Interpreter"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ irenes ]; + platforms = platforms.all; + homepage = "https://sourceforge.net/projects/bwbasic/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaf92ebfeffa..086843a0fa43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2296,6 +2296,8 @@ with pkgs; bwm_ng = callPackage ../tools/networking/bwm-ng { }; + bwbasic = callPackage ../development/interpreters/bwbasic { }; + byobu = callPackage ../tools/misc/byobu { # Choices: [ tmux screen ]; textual-window-manager = tmux; From dfcd49afe25d931432844f057cdc541c0ebe1018 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Nov 2021 22:00:05 -0800 Subject: [PATCH 12/16] python3Packages.numpy: remove unneeded patch Patch was already merged upstream, no longer relevant --- pkgs/development/python-modules/numpy/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index ce75f42c20ca..fef5dfb163bd 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -50,13 +50,7 @@ in buildPythonPackage rec { sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; }; - patches = [ - # fix https://github.com/numpy/numpy/issues/19624 - (fetchpatch { - url = "https://github.com/numpy/numpy/commit/ae279066d6bd253e8675428fac8946938b8d48d9.diff"; - sha256 = "sha256-q8SoF/pMzLI4zYCx2YAZzR31cARlZXerNnBSevBO5pE="; - }) - ] ++ lib.optionals python.hasDistutilsCxxPatch [ + patches = lib.optionals python.hasDistutilsCxxPatch [ # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 # Patching of numpy.distutils is needed to prevent it from undoing the # patch to distutils. From 67c9d4ae0086730668661af469886dfc99f1392e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 22 Nov 2021 11:14:58 +0100 Subject: [PATCH 13/16] glm: fix aarch64-darwin build by fixing cmake warnings --- pkgs/development/libraries/glm/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index ef8cd49ba297..81b0b47d5ba8 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: stdenv.mkDerivation rec { version = "0.9.9.8"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; + # https://github.com/g-truc/glm/pull/1055 + # Fix more implicit-int-float-conversion warnings + # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) + patches = [(fetchpatch { + url = "https://github.com/kraj/glm/commit/bd9b5060bc3b9581090d44f15b4e236566ea86a6.patch"; + sha256 = "sha256-QO4o/wV564kJimBcEyr9TWzREEnRJ1n0j0HPojN4pkI="; + })]; + outputs = [ "out" "doc" ]; nativeBuildInputs = [ cmake ]; From 712b402565e53a0e00113e9b617d4edd428d158c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 22 Nov 2021 23:24:50 +0000 Subject: [PATCH 14/16] python3Packages.cwcwidth: fix tests on darwin use the same locale settings used by upstream's CI: https://github.com/sebastinas/cwcwidth/blob/2bc4360474b524148ffde3c8b837cbb0a4f172f5/.github/workflows/build.yaml#L33 this has the effect of skipping some otherwise-failing tests on darwin. seems slightly counterproductive but who am i to judge? --- pkgs/development/python-modules/cwcwidth/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index 940d41129e57..ede96fc3b41d 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -13,12 +13,17 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; checkInputs = [ pytestCheckHook ]; - # Hack needed to make pytest + cython work - # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 preCheck = '' + # Hack needed to make pytest + cython work + # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 export HOME=$(mktemp -d) cp -r $TMP/$sourceRoot/tests $HOME pushd $HOME + + # locale settings used by upstream, has the effect of skipping + # otherwise-failing tests on darwin + export LC_ALL='C.UTF-8' + export LANG='C.UTF-8' ''; postCheck = "popd"; From 1e3ff0d215c263bb5a0038ea035ab335ad265329 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 09:23:48 +0100 Subject: [PATCH 15/16] tfsec: 0.60.0 -> 0.60.1 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 9d60879d8803..f28df20f1994 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.60.0"; + version = "0.60.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LBU2nXpmktjyy3x5cBGsrCM6k+6BEZaoDybHVrIrVBo="; + sha256 = "sha256-JbEqoPuvfG6SwG+uGsV5vy+d+cs/VoGCntq8oU48+y8="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From e40586575cffec1f8a8fbe20d608f5b6ce0c92fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 09:51:18 +0100 Subject: [PATCH 16/16] python3Packages.opensensemap-api: 0.1.6 -> 0.2.0 --- .../python-modules/opensensemap-api/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 8311cb6c57e1..56edc136c44f 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -1,17 +1,21 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp , async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.1.6"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e60aVIoKFqo++WJHUYGutugkjB8YgyNQgJbILgAyOOY="; + sha256 = "sha256-KSukSPpSbfbEEqTq4zqqo8OT7ptdPrGy2QyQYjErQWI="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests are present doCheck = false; - pythonImportsCheck = [ "opensensemap_api" ]; + pythonImportsCheck = [ + "opensensemap_api" + ]; meta = with lib; { description = "OpenSenseMap API Python client";