From ba0626eb7c8618ca7ce3404a6f533b4f3672b8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:25:23 +0100 Subject: [PATCH 01/14] mumble: remove unused inputs --- pkgs/applications/networking/mumble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 2eeb151bebeb..ba409223b648 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 +{ lib, stdenv, fetchFromGitHub, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python3 , rnnoise From c560f7954ec59cfb61c58021daadc16ec13ee481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:25:35 +0100 Subject: [PATCH 02/14] mumble: cleanup ? null and assertion, remove not required enableParallelBuilding due to qmake --- .../networking/mumble/default.nix | 45 ++++++++----------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index ba409223b648..4432d9ddeece 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -2,21 +2,14 @@ , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python3 , rnnoise -, jackSupport ? false, libjack2 ? null -, speechdSupport ? false, speechd ? null -, pulseSupport ? false, libpulseaudio ? null -, iceSupport ? false, zeroc-ice ? null -, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null +, jackSupport ? false, libjack2 +, speechdSupport ? false, speechd +, pulseSupport ? false, libpulseaudio +, iceSupport ? false, zeroc-ice +, grpcSupport ? false, grpc, c-ares, abseil-cpp, which , nixosTests }: -assert jackSupport -> libjack2 != null; -assert speechdSupport -> speechd != null; -assert pulseSupport -> libpulseaudio != null; -assert iceSupport -> zeroc-ice != null; -assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); - -with lib; let generic = overrides: source: qt5.mkDerivation (source // overrides // { pname = overrides.type; @@ -42,8 +35,8 @@ let "CONFIG+=no-bundled-opus" "CONFIG+=no-bundled-speex" "DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble" - ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" - ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" + ] ++ lib.optional (!speechdSupport) "CONFIG+=no-speechd" + ++ lib.optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ (overrides.configureFlags or [ ]); preConfigure = '' @@ -64,11 +57,9 @@ let runHook postInstall ''; - enableParallelBuilding = true; - passthru.tests.connectivity = nixosTests.mumble; - meta = { + meta = with lib; { description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; @@ -82,16 +73,16 @@ let nativeBuildInputs = [ qt5.qttools ]; buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ] - ++ optional stdenv.isLinux alsaLib - ++ optional jackSupport libjack2 - ++ optional speechdSupport speechd - ++ optional pulseSupport libpulseaudio; + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional jackSupport libjack2 + ++ lib.optional speechdSupport speechd + ++ lib.optional pulseSupport libpulseaudio; configureFlags = [ "CONFIG+=no-server" ]; - NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher"; installPhase = '' # bin stuff @@ -113,18 +104,18 @@ let server = source: generic { type = "murmur"; - postPatch = optional iceSupport '' + postPatch = lib.optional iceSupport '' grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g' ''; configureFlags = [ "CONFIG+=no-client" - ] ++ optional (!iceSupport) "CONFIG+=no-ice" - ++ optional grpcSupport "CONFIG+=grpc"; + ] ++ lib.optional (!iceSupport) "CONFIG+=no-ice" + ++ lib.optional grpcSupport "CONFIG+=grpc"; buildInputs = [ libcap ] - ++ optional iceSupport zeroc-ice - ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ]; + ++ lib.optional iceSupport zeroc-ice + ++ lib.optionals grpcSupport [ grpc c-ares abseil-cpp which ]; installPhase = '' # bin stuff From 05936dfc00bdab48cd5b5e2ac79e251c2236ca52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:25:54 +0100 Subject: [PATCH 03/14] rippled: remove unused inputs --- pkgs/servers/rippled/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 22223f2a27e6..cd19c77cab3e 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkg-config +{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config , openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }: let From 72a79cf5df6402f6b6bd6262b8ccc953cfa94b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:40:09 +0100 Subject: [PATCH 04/14] bee: remove unused inputs --- pkgs/applications/networking/bee/bee-clef.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/bee/bee-clef.nix b/pkgs/applications/networking/bee/bee-clef.nix index a94386ea3f11..9e36f8670d46 100644 --- a/pkgs/applications/networking/bee/bee-clef.nix +++ b/pkgs/applications/networking/bee/bee-clef.nix @@ -1,4 +1,4 @@ -{ version ? "release", stdenv, lib, substituteAll, fetchFromGitHub, go-ethereum }: +{ version ? "release", stdenv, lib, fetchFromGitHub, go-ethereum }: stdenv.mkDerivation rec { pname = "bee-clef"; From d4c5104100ef9ce95341c8622c6b3524041c436a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:40:16 +0100 Subject: [PATCH 05/14] pythonPackages.serverlessrepo: remove stale substituteInPlace --- pkgs/development/python-modules/serverlessrepo/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index 1e6f8307fbca..2a8267710a09 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -29,10 +29,6 @@ buildPythonPackage rec { pytest tests/unit ''; - postPatch = '' - substituteInPlace setup.py --replace "pyyaml~=3.12" "pyyaml~=5.1" - ''; - meta = with lib; { homepage = "https://github.com/awslabs/aws-serverlessrepo-python"; description = "Helpers for working with the AWS Serverless Application Repository"; From 99f1ba32587a0067568a84f781524f387c058885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:40:53 +0100 Subject: [PATCH 06/14] pythonPackages.kombu: remove stale substituteInPlace --- pkgs/development/python-modules/kombu/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 1aa22a62e19f..a5ca1a7ab2a4 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements/test.txt \ --replace "pytest-sugar" "" - substituteInPlace requirements/default.txt \ - --replace "amqp==2.5.1" "amqp~=2.5" ''; propagatedBuildInputs = [ From 54677510d7cd4fec5db6c6b8bbdf22f211e4b6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:41:19 +0100 Subject: [PATCH 07/14] pythonPackages.chalice: remove stale substituteInPlace --- pkgs/development/python-modules/chalice/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 5445157b8530..9115b1d57c3f 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -52,8 +52,7 @@ buildPythonPackage rec { postPatch = '' sed -i setup.py -e "/pip>=/c\'pip'," substituteInPlace setup.py \ - --replace 'typing==3.6.4' 'typing' \ - --replace 'attrs>=19.3.0,<20.3.0' 'attrs' + --replace 'typing==3.6.4' 'typing' ''; checkPhase = '' From c1b1ba0a6e67f795f1560e1b36aeb655845b24de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:41:40 +0100 Subject: [PATCH 08/14] pythonPackages.botocore: remove stale substituteInPlace --- pkgs/development/python-modules/botocore/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 065d4409ec1c..635203f94c2b 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -28,10 +28,6 @@ buildPythonPackage rec { urllib3 ]; - postPatch = '' - substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" - ''; - checkInputs = [ mock nose ]; checkPhase = '' From c602ee9bc9d600982c08d8410a659aa4ad0f4482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:42:04 +0100 Subject: [PATCH 09/14] pythonPackages.aiobotocore: remove ununsed inputs --- pkgs/development/python-modules/aiobotocore/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 2e7c9c2401c3..5d9c3fe16695 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -1,10 +1,7 @@ { lib - , buildPythonPackage , fetchPypi , pythonOlder -, pytestrunner -, typing-extensions , wrapt , aioitertools , aiohttp From c5473c8aa1db720f6339fd34a8cc48231125a1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:42:46 +0100 Subject: [PATCH 10/14] pythonPackages.smart_open: remove stale substituteInPlace --- pkgs/development/python-modules/smart_open/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 3a1c890f0481..389feef2b42c 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -21,11 +21,6 @@ buildPythonPackage rec { sha256 = "26af5c1a3f2b76aab8c3200310f0fc783790ec5a231ffeec102e620acdd6262e"; }; - # nixpkgs version of moto is >=1.2.0, remove version pin to fix build - postPatch = '' - substituteInPlace ./setup.py --replace "moto==0.4.31" "moto" - ''; - # moto>=1.0.0 is backwards-incompatible and some tests fail with it, # so disable tests for now doCheck = false; From a1e871a4c2c7ca11ad249cc24d2b0cf7891a65be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 08:43:56 +0100 Subject: [PATCH 11/14] aws-mfa: remove unused input --- pkgs/tools/admin/aws-mfa/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/tools/admin/aws-mfa/default.nix index 12f63e627e6d..53855b6d28de 100644 --- a/pkgs/tools/admin/aws-mfa/default.nix +++ b/pkgs/tools/admin/aws-mfa/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, pkgs , boto3 }: From 31fe1f430e7d0ea124cc7b4fe28de6b5131b2d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 23 Feb 2021 15:03:58 +0100 Subject: [PATCH 12/14] pythonPackages.pecan: remove unused input --- pkgs/development/python-modules/pecan/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index a66c4077c3c9..50b62503ff87 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -16,7 +16,6 @@ , Kajiki , mock , sqlalchemy -, uwsgi , virtualenv }: From 18370cd9d0ebe37e2903409c7175046590305e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Feb 2021 09:28:56 +0100 Subject: [PATCH 13/14] pythonPackages.shapely: fix tests, switch to pytestCheckHook --- .../development/python-modules/shapely/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index b5875818b952..91c34734a8c5 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, pythonOlder -, geos, pytest, cython +, geos, pytestCheckHook, cython , numpy }: @@ -18,10 +18,10 @@ buildPythonPackage rec { cython ]; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + checkInputs = [ pytestCheckHook ]; + # environment variable used in shapely/_buildcfg.py GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -38,12 +38,14 @@ buildPythonPackage rec { }) ]; - # Disable the tests that improperly try to use the built extensions - checkPhase = '' + preCheck = '' rm -r shapely # prevent import of local shapely - py.test tests ''; + disabledTests = [ + "test_collection" + ]; + meta = with lib; { description = "Geometric objects, predicates, and operations"; maintainers = with maintainers; [ knedlsepp ]; From e688a0124b3456eb6d4e8c507dab1ef6f75bde68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 23 Feb 2021 15:58:11 +0100 Subject: [PATCH 14/14] btrbk: remove unused input --- pkgs/tools/backup/btrbk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 63808d485128..c619a69c1118 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages +{ lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages , util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }: stdenv.mkDerivation rec {