From 3c379af10b8a5f75b1d7561d951aa49d628adf00 Mon Sep 17 00:00:00 2001 From: cw <789@webuhu.at> Date: Thu, 24 Sep 2020 15:14:52 +0200 Subject: elixir_1_6: remove Additionally removed the now obsolete rebar build dependency for elixir. --- pkgs/development/beam-modules/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index efd68988c9b..7fbec79cbd4 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -39,27 +39,22 @@ let elixir = elixir_1_10; elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { - inherit rebar erlang; - debugInfo = true; - }; - - elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; -- cgit 1.4.1 From 5a558ea4d9a99f10440dfdb738e726ea09be51dd Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Mon, 14 Sep 2020 12:48:14 -0400 Subject: build-erlang-mk: add support for buildFlags --- pkgs/development/beam-modules/build-erlang-mk.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index 4dedf782b75..4ea8a52601c 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -12,6 +12,7 @@ , configurePhase ? null , meta ? {} , enableDebugInfo ? false +, buildFlags ? [] , ... }@attrs: with stdenv.lib; @@ -42,6 +43,10 @@ let buildInputs = [ erlang perl which gitMinimal wget ]; propagatedBuildInputs = beamDeps; + buildFlags = [ "SKIP_DEPS=1" ] + ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"'' + ++ buildFlags; + configurePhase = if configurePhase == null then '' runHook preConfigure @@ -58,7 +63,7 @@ let then '' runHook preBuild - make SKIP_DEPS=1 ERL_OPTS="$ERL_OPTS ${debugInfoFlag}" + make $buildFlags "''${buildFlagsArray[@]}" runHook postBuild '' -- cgit 1.4.1 From 8ddc83c67fb5d962cdf898aa21e77bad6860c894 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Tue, 15 Sep 2020 16:47:55 -0400 Subject: build-erlang-mk: preserve passed buildInputs --- pkgs/development/beam-modules/build-erlang-mk.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index 4ea8a52601c..c2d1ebabae2 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -40,7 +40,7 @@ let '' else setupHook; - buildInputs = [ erlang perl which gitMinimal wget ]; + buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ]; propagatedBuildInputs = beamDeps; buildFlags = [ "SKIP_DEPS=1" ] -- cgit 1.4.1 From 26857cc8515c62b2e51b907ff197f1622b983d57 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 6 Oct 2020 19:36:43 +0200 Subject: elixir_1_11: init at 1.11.0 Set elixir_1_11 as default elixir version. --- pkgs/development/beam-modules/default.nix | 7 ++++++- pkgs/development/interpreters/elixir/1.11.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.11.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 7fbec79cbd4..a5de4dfb3bb 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -36,7 +36,12 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_10; + elixir = elixir_1_11; + + elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix { + inherit erlang; + debugInfo = true; + }; elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { inherit erlang; diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix new file mode 100644 index 00000000000..c84968ae92a --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.11.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz +mkDerivation { + version = "1.11.0"; + sha256 = "0mxckjdy2gbmymvbi1bf146nhmz4icvq6917g8nbyi1gaz5l8rn2"; + minimumOTPVersion = "21"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60f13ff9ec3..9d53b47bf88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9981,7 +9981,7 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (beam.packages.erlang) rebar rebar3 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 139749e7d39..14399d7ac95 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -96,8 +96,8 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use - # `beam.packages.erlangR22.elixir`. - inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + # `beam.packages.erlangR23.elixir`. + inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; -- cgit 1.4.1 From 8dd78bb4fbb51227c3bf3547add972c175e83ba9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 16 Jan 2021 11:20:42 +0700 Subject: treewide: fix double quoted strings in meta.description --- pkgs/applications/audio/AMB-plugins/default.nix | 2 +- pkgs/applications/audio/FIL-plugins/default.nix | 2 +- pkgs/applications/audio/mi2ly/default.nix | 2 +- pkgs/applications/graphics/rapcad/default.nix | 2 +- pkgs/applications/misc/slmenu/default.nix | 2 +- pkgs/applications/misc/vifm/default.nix | 2 +- pkgs/data/fonts/tempora-lgc/default.nix | 2 +- pkgs/data/fonts/unscii/default.nix | 2 +- pkgs/development/beam-modules/pc/default.nix | 2 +- pkgs/development/compilers/abcl/default.nix | 2 +- pkgs/development/compilers/clasp/default.nix | 2 +- pkgs/development/compilers/obliv-c/default.nix | 2 +- pkgs/development/interpreters/icon-lang/default.nix | 2 +- pkgs/development/interpreters/rebol/default.nix | 2 +- pkgs/development/interpreters/unicon-lang/default.nix | 2 +- pkgs/development/libraries/arb/default.nix | 2 +- pkgs/development/libraries/cddlib/default.nix | 2 +- pkgs/development/libraries/dxflib/default.nix | 2 +- pkgs/development/libraries/eclib/default.nix | 2 +- pkgs/development/libraries/fflas-ffpack/default.nix | 2 +- pkgs/development/libraries/flint/default.nix | 2 +- pkgs/development/libraries/fplll/20160331.nix | 2 +- pkgs/development/libraries/fplll/default.nix | 2 +- pkgs/development/libraries/gf2x/default.nix | 2 +- pkgs/development/libraries/givaro/3.7.nix | 2 +- pkgs/development/libraries/givaro/3.nix | 2 +- pkgs/development/libraries/givaro/default.nix | 2 +- pkgs/development/libraries/gle/default.nix | 2 +- pkgs/development/libraries/qtinstaller/default.nix | 2 +- pkgs/development/libraries/tachyon/default.nix | 2 +- pkgs/development/lisp-modules/asdf/2.26.nix | 2 +- pkgs/development/lisp-modules/asdf/3.1.nix | 2 +- pkgs/development/lisp-modules/asdf/default.nix | 2 +- pkgs/development/lisp-modules/clwrapper/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 2 +- pkgs/development/perl-modules/Percona-Toolkit/default.nix | 2 +- pkgs/development/python-modules/spark_parser/default.nix | 2 +- pkgs/os-specific/linux/sinit/default.nix | 2 +- pkgs/servers/http/nix-binary-cache/default.nix | 2 +- pkgs/servers/nosql/apache-jena/binary.nix | 2 +- pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 2 +- pkgs/tools/X11/ratmen/default.nix | 2 +- pkgs/tools/X11/skippy-xd/default.nix | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index 2e2af8f3a9a..eac2b4c783b 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preInstall="mkdir -p $out/lib/ladspa"; meta = { - description = ''A set of ambisonics ladspa plugins''; + description = "A set of ambisonics ladspa plugins"; longDescription = '' Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. ''; diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index 253e724cd31..89bda1387d9 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preInstall="mkdir -p $out/lib/ladspa"; meta = { - description = ''a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed''; + description = "a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed"; longDescription = '' Each section has an active/bypass switch, frequency, bandwidth and gain controls. There is also a global bypass switch and gain control. diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index 58c1690a9bb..bc74a73b643 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''MIDI to Lilypond converter''; + description = "MIDI to Lilypond converter"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index e86436cd06f..904c9f8f402 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - description = ''Constructive solid geometry package''; + description = "Constructive solid geometry package"; broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix index 122006647cb..16145a915fe 100644 --- a/pkgs/applications/misc/slmenu/default.nix +++ b/pkgs/applications/misc/slmenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; - description = ''A console dmenu-like tool''; + description = "A console dmenu-like tool"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 64f0f6b7f5f..4cf13c9c7aa 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}''; + description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}"; maintainers = with maintainers; [ raskin ]; platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index c7be70f800d..6bcceff16d2 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw"; meta = { - description = ''Tempora font''; + description = "Tempora font"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; }; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 5aaa68f9796..066a4d4d922 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''Bitmapped character-art-friendly Unicode fonts''; + description = "Bitmapped character-art-friendly Unicode fonts"; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. license = "http://unifoundry.com/LICENSE.txt"; diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index d30b0fbdbd2..fac3b298835 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/pkgs/development/beam-modules/pc/default.nix @@ -6,7 +6,7 @@ buildHex { sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0"; meta = { - description = ''a rebar3 port compiler for native code''; + description = "a rebar3 port compiler for native code"; license = stdenv.lib.licenses.mit; homepage = "https://github.com/blt/port_compiler"; }; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 22f6ca7a0dd..aa537169aaf 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [jre ant jdk jre]; meta = { inherit version; - description = ''A JVM-based Common Lisp implementation''; + description = "A JVM-based Common Lisp implementation"; license = stdenv.lib.licenses.gpl3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 664d8492113..b7da76d38f9 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A Common Lisp implementation based on LLVM with C++ integration''; + description = "A Common Lisp implementation based on LLVM with C++ integration"; license = stdenv.lib.licenses.lgpl21Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 8fd6f33740e..cdd0cf375bc 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs''; + description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 02992e71871..30e260eee46 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = ''A very high level general-purpose programming language''; + description = "A very high level general-purpose programming language"; maintainers = with maintainers; [ vrthra yurrriq ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos; license = licenses.publicDomain; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index b26af7f0b1b..4206e1e1604 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = ''Relative expression based object language, a language where code is data''; + description = "Relative expression based object language, a language where code is data"; maintainers = with maintainers; [ vrthra ]; platforms = [ "x86_64-linux" ]; license = licenses.asl20; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 9bdd31f400a..4889a21ddfd 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = ''A very high level, goal-directed, object-oriented, general purpose applications language''; + description = "A very high level, goal-directed, object-oriented, general purpose applications language"; maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index a9fb5de0bd9..79a0df9a103 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { inherit version; - description = ''A library for arbitrary-precision interval arithmetic''; + description = "A library for arbitrary-precision interval arithmetic"; homepage = "http://arblib.org/"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index cebe6fb2bf6..4b745a2a348 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { inherit version; - description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; + description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 1b63d8805fd..f0f96273bea 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { meta = { maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; - description = ''DXF file format library''; + description = "DXF file format library"; }; } diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 9273fb7fd78..278099b8ca7 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { inherit version; - description = ''Elliptic curve tools''; + description = "Elliptic curve tools"; homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index faa8ed3c70e..decea9bfb79 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - description = ''Finite Field Linear Algebra Subroutines''; + description = "Finite Field Linear Algebra Subroutines"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 3c768fc472c..96c53698401 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { inherit version; - description = ''Fast Library for Number Theory''; + description = "Fast Library for Number Theory"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix index aabbfd14a78..05a6a30a6ec 100644 --- a/pkgs/development/libraries/fplll/20160331.nix +++ b/pkgs/development/libraries/fplll/20160331.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [gmp mpfr]; meta = { inherit version; - description = ''Lattice algorithms using floating-point arithmetic''; + description = "Lattice algorithms using floating-point arithmetic"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 82d56ea2af4..e15479bafcf 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = ''Lattice algorithms using floating-point arithmetic''; + description = "Lattice algorithms using floating-point arithmetic"; changelog = [ # Some release notes are added to the github tags, though they are not # always complete. diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 14ea3021914..3440697989e 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = ''Routines for fast arithmetic in GF(2)[x]''; + description = "Routines for fast arithmetic in GF(2)[x]"; homepage = "http://gf2x.gforge.inria.fr"; license = licenses.gpl2Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index debddc6723f..1de84afe621 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; - description = ''A C++ library for arithmetic and algebraic computations''; + description = "A C++ library for arithmetic and algebraic computations"; license = stdenv.lib.licenses.cecill-b; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index efed0926bb3..fc9bb18988f 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; - description = ''A C++ library for arithmetic and algebraic computations''; + description = "A C++ library for arithmetic and algebraic computations"; license = stdenv.lib.licenses.cecill-b; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 78b6b088270..4da5a0cb75c 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A C++ library for arithmetic and algebraic computations''; + description = "A C++ library for arithmetic and algebraic computations"; license = stdenv.lib.licenses.cecill-b; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index d656473ba80..d0667b0f270 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; }; meta = { - description = ''Tubing and extrusion library''; + description = "Tubing and extrusion library"; license = stdenv.lib.licenses.gpl2 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index 3c4c192bd4b..91f85371106 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Qt installer framework''; + description = "Qt installer framework"; inherit (qtbase.meta) platforms license homepage; }; } diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 20dc80b253d..90aa62d946f 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''A Parallel / Multiprocessor Ray Tracing System''; + description = "A Parallel / Multiprocessor Ray Tracing System"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix index 2afdf05546f..41b971ebae2 100644 --- a/pkgs/development/lisp-modules/asdf/2.26.nix +++ b/pkgs/development/lisp-modules/asdf/2.26.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Standard software-system definition library for Common Lisp''; + description = "Standard software-system definition library for Common Lisp"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix index 445295830b2..9149155fb2f 100644 --- a/pkgs/development/lisp-modules/asdf/3.1.nix +++ b/pkgs/development/lisp-modules/asdf/3.1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Standard software-system definition library for Common Lisp''; + description = "Standard software-system definition library for Common Lisp"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 2b1b846d319..57978819447 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Standard software-system definition library for Common Lisp''; + description = "Standard software-system definition library for Common Lisp"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 3cb8219e687..821fe892048 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { }; meta = { - description = ''Script used to wrap Common Lisp implementations''; + description = "Script used to wrap Common Lisp implementations"; maintainers = [stdenv.lib.maintainers.raskin]; }; } diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index f8338e48e19..491597d760d 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -85,7 +85,7 @@ let lispPackages = rec { buildSystems = [ "clx-truetype" ]; parasites = [ "clx-truetype-test" ]; - description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.''; + description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension."; deps = with pkgs.lispPackages; [ alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 85a11aaed46..3c555ca37ab 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -24,7 +24,7 @@ buildPerlPackage rec { ''; meta = with lib; { - description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; + description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks."; homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index cfb641ddcfb..ba927431f2c 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; meta = with lib; { - description = ''An Early-Algorithm Context-free grammar Parser''; + description = "An Early-Algorithm Context-free grammar Parser"; homepage = "https://github.com/rocky/python-spark"; license = licenses.mit; maintainers = with maintainers; [raskin]; diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 71bd887535b..6a479453489 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ; meta = { inherit (s) version; - description = ''A very minimal Linux init implementation from suckless.org''; + description = "A very minimal Linux init implementation from suckless.org"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 1403516876f..a174d4dcb1a 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''A set of scripts to serve the Nix store as a binary cache''; + description = "A set of scripts to serve the Nix store as a binary cache"; longDescription = '' This package installs a CGI script that serves Nix store path in the binary cache format. It also installs a launcher called diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 4bf6693d3f9..71c8c4a45dc 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''RDF database''; + description = "RDF database"; license = lib.licenses.asl20; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 17cf175b896..7084130eaef 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''SPARQL server''; + description = "SPARQL server"; license = lib.licenses.asl20; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index eabe14649e1..9c662a638e8 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; meta = { inherit (s) version; - description = ''A minimalistic X11 menu creator''; + description = "A minimalistic X11 menu creator"; license = lib.licenses.free ; # 9menu derivative with 9menu license maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index a52b7fa8c0d..f38aa2c2c18 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''Expose-style compositing-based standalone window switcher''; + description = "Expose-style compositing-based standalone window switcher"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; -- cgit 1.4.1 From 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 24 Jan 2021 00:15:07 +0700 Subject: pkgs/development: stdenv.lib -> lib --- .../androidndk-pkgs/androidndk-pkgs.nix | 4 +-- pkgs/development/androidndk-pkgs/default.nix | 4 ++- pkgs/development/beam-modules/build-erlang-mk.nix | 2 +- pkgs/development/beam-modules/build-hex.nix | 4 +-- pkgs/development/beam-modules/build-mix.nix | 2 +- pkgs/development/beam-modules/build-rebar3.nix | 2 +- pkgs/development/beam-modules/default.nix | 22 ++++++------ pkgs/development/beam-modules/fetch-hex.nix | 4 +-- pkgs/development/beam-modules/fetch-rebar-deps.nix | 6 ++-- pkgs/development/beam-modules/hex/default.nix | 6 ++-- pkgs/development/beam-modules/lib.nix | 4 +-- pkgs/development/beam-modules/pc/default.nix | 2 +- pkgs/development/beam-modules/pgsql/default.nix | 6 ++-- pkgs/development/beam-modules/rebar3-release.nix | 2 +- .../development/beam-modules/webdriver/default.nix | 6 ++-- .../haskell-modules/configuration-nix.nix | 4 +-- .../haskell-modules/generic-builder.nix | 40 +++++++++++----------- pkgs/development/haskell-modules/hoogle.nix | 4 +-- .../haskell-modules/make-package-set.nix | 8 ++--- .../java-modules/build-maven-package.nix | 6 ++-- pkgs/development/java-modules/junit/default.nix | 8 ++--- .../java-modules/maven-hello/default.nix | 8 ++--- pkgs/development/java-modules/maven-minimal.nix | 4 +-- pkgs/development/libraries/SDL/default.nix | 2 +- pkgs/development/libraries/SDL2/default.nix | 2 +- pkgs/development/libraries/aravis/default.nix | 2 +- pkgs/development/libraries/atk/default.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 4 +-- pkgs/development/libraries/clutter-gst/default.nix | 2 +- pkgs/development/libraries/clutter-gtk/default.nix | 2 +- pkgs/development/libraries/gts/default.nix | 2 +- pkgs/development/libraries/irrlicht/default.nix | 2 +- pkgs/development/libraries/java/hsqldb/default.nix | 2 +- .../libraries/java/junixsocket/default.nix | 2 +- pkgs/development/libraries/libgpod/default.nix | 2 +- pkgs/development/libraries/libre/default.nix | 2 +- pkgs/development/libraries/librem/default.nix | 4 +-- .../development/libraries/libsmartcols/default.nix | 2 +- pkgs/development/libraries/libsmi/default.nix | 2 +- pkgs/development/libraries/libsnark/default.nix | 2 +- pkgs/development/libraries/libvirt/default.nix | 2 +- pkgs/development/libraries/libxmi/default.nix | 2 +- pkgs/development/libraries/muparser/default.nix | 2 +- pkgs/development/libraries/qt-3/default.nix | 4 +-- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- pkgs/development/libraries/qt-5/5.12/default.nix | 8 ++--- pkgs/development/libraries/qt-5/5.14/default.nix | 4 +-- pkgs/development/libraries/qt-5/5.15/default.nix | 4 +-- .../libraries/qt-5/modules/qtconnectivity.nix | 4 +-- .../libraries/qt-5/modules/qtlocation.nix | 4 +-- .../libraries/qt-5/modules/qtmacextras.nix | 4 +-- .../libraries/qt-5/modules/qtmultimedia.nix | 4 +-- .../libraries/qt-5/modules/qtwebengine.nix | 2 +- .../libraries/qt-5/modules/qtwebkit.nix | 4 +-- .../libraries/qt-5/modules/qtwebview.nix | 4 +-- .../development/libraries/tokyo-tyrant/default.nix | 2 +- pkgs/development/libraries/wiredtiger/default.nix | 2 +- .../libraries/wxwidgets/2.8/default.nix | 4 +-- .../libraries/wxwidgets/2.9/default.nix | 4 +-- .../libraries/wxwidgets/3.0/default.nix | 2 +- .../libraries/wxwidgets/3.1/default.nix | 2 +- pkgs/development/libraries/xalanc/default.nix | 2 +- pkgs/development/libraries/xercesc/default.nix | 2 +- pkgs/development/misc/avr8-burn-omat/default.nix | 2 +- pkgs/development/misc/google-clasp/default.nix | 6 ++-- .../misc/haskell/hasura/ci-info/default.nix | 4 +-- .../misc/haskell/hasura/graphql-engine/default.nix | 6 ++-- .../misc/haskell/hasura/graphql-parser/default.nix | 4 +-- .../misc/haskell/hasura/pg-client/default.nix | 4 +-- pkgs/development/misc/loc/default.nix | 4 +-- pkgs/development/misc/msp430/mspdebug.nix | 18 +++++----- pkgs/development/misc/resholve/deps.nix | 6 ++-- pkgs/development/misc/yelp-tools/default.nix | 2 +- pkgs/development/pharo/vm/build-vm-legacy.nix | 10 +++--- pkgs/development/pharo/vm/build-vm.nix | 4 +-- pkgs/development/pharo/vm/share.nix | 4 +-- pkgs/development/pharo/wrapper/default.nix | 12 +++---- pkgs/development/pure-modules/audio/default.nix | 8 ++--- pkgs/development/pure-modules/avahi/default.nix | 8 ++--- pkgs/development/pure-modules/csv/default.nix | 8 ++--- pkgs/development/pure-modules/doc/default.nix | 8 ++--- pkgs/development/pure-modules/fastcgi/default.nix | 8 ++--- pkgs/development/pure-modules/faust/default.nix | 8 ++--- pkgs/development/pure-modules/ffi/default.nix | 8 ++--- pkgs/development/pure-modules/gen/default.nix | 8 ++--- pkgs/development/pure-modules/gl/default.nix | 8 ++--- pkgs/development/pure-modules/glpk/default.nix | 6 ++-- pkgs/development/pure-modules/gplot/default.nix | 8 ++--- pkgs/development/pure-modules/gsl/default.nix | 8 ++--- pkgs/development/pure-modules/gtk/default.nix | 8 ++--- pkgs/development/pure-modules/liblo/default.nix | 8 ++--- pkgs/development/pure-modules/lilv/default.nix | 8 ++--- pkgs/development/pure-modules/lv2/default.nix | 8 ++--- pkgs/development/pure-modules/midi/default.nix | 8 ++--- pkgs/development/pure-modules/mpfr/default.nix | 8 ++--- pkgs/development/pure-modules/octave/default.nix | 8 ++--- pkgs/development/pure-modules/odbc/default.nix | 8 ++--- pkgs/development/pure-modules/pandoc/default.nix | 8 ++--- pkgs/development/pure-modules/rational/default.nix | 8 ++--- pkgs/development/pure-modules/readline/default.nix | 8 ++--- pkgs/development/pure-modules/sockets/default.nix | 8 ++--- pkgs/development/pure-modules/sql3/default.nix | 8 ++--- pkgs/development/pure-modules/stldict/default.nix | 8 ++--- pkgs/development/pure-modules/stllib/default.nix | 8 ++--- pkgs/development/pure-modules/tk/default.nix | 8 ++--- pkgs/development/pure-modules/xml/default.nix | 8 ++--- pkgs/development/web/deno/default.nix | 2 +- pkgs/development/web/grails/default.nix | 6 ++-- pkgs/development/web/insomnia/default.nix | 2 +- pkgs/development/web/kcgi/default.nix | 4 +-- pkgs/development/web/kore/default.nix | 4 +-- pkgs/development/web/nodejs/nodejs.nix | 4 +-- pkgs/development/web/nodejs/v10.nix | 4 +-- pkgs/development/web/nodejs/v12.nix | 4 +-- pkgs/development/web/nodejs/v14.nix | 4 +-- pkgs/development/web/postman/default.nix | 2 +- pkgs/development/web/remarkjs/default.nix | 4 +-- pkgs/development/web/twitter-bootstrap/default.nix | 4 +-- pkgs/development/web/woff2/default.nix | 4 +-- pkgs/development/web/xmlindent/default.nix | 6 ++-- pkgs/top-level/all-packages.nix | 6 ++-- 121 files changed, 324 insertions(+), 322 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 995789b8c1b..04dfbcbedf0 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , makeWrapper , runCommand, wrapBintoolsWith, wrapCCWith , buildAndroidndk, androidndk, targetAndroidndkPkgs @@ -48,7 +48,7 @@ let hostInfo = ndkInfoFun stdenv.hostPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform; - prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); + prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); in rec { diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 10819d49ed3..5f71304d385 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -1,4 +1,4 @@ -{ androidenv, buildPackages, pkgs, targetPackages +{ lib, androidenv, buildPackages, pkgs, targetPackages }: { @@ -17,6 +17,7 @@ }; in import ./androidndk-pkgs.nix { + inherit lib; inherit (buildPackages) makeWrapper; inherit (pkgs) @@ -46,6 +47,7 @@ }; in import ./androidndk-pkgs.nix { + inherit lib; inherit (buildPackages) makeWrapper; inherit (pkgs) diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index c2d1ebabae2..a94524276b2 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -15,7 +15,7 @@ , buildFlags ? [] , ... }@attrs: -with stdenv.lib; +with lib; let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info"; diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix index 27ce64582f3..e0d9dfc4288 100644 --- a/pkgs/development/beam-modules/build-hex.nix +++ b/pkgs/development/beam-modules/build-hex.nix @@ -1,11 +1,11 @@ -{ stdenv, buildRebar3, fetchHex }: +{ lib, stdenv, buildRebar3, fetchHex }: { name, version, sha256 , builder ? buildRebar3 , hexPkg ? name , ... }@attrs: -with stdenv.lib; +with lib; let pkg = self: builder (attrs // { diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 9aebad2dabf..45f5e367442 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -15,7 +15,7 @@ , enableDebugInfo ? false , ... }@attrs: -with stdenv.lib; +with lib; let diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 224d111026a..63832dc91ac 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -14,7 +14,7 @@ , enableDebugInfo ? false , ... }@attrs: -with stdenv.lib; +with lib; let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index a5de4dfb3bb..4c25522635e 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,12 +1,12 @@ -{ stdenv, pkgs, erlang }: +{ lib, stdenv, pkgs, erlang }: let - inherit (stdenv.lib) makeExtensible; + inherit (lib) makeExtensible; - lib = pkgs.callPackage ./lib.nix {}; + lib' = pkgs.callPackage ./lib.nix {}; # FIXME: add support for overrideScope - callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; + callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args; mkScope = scope: pkgs // scope; packages = self: @@ -38,27 +38,27 @@ let # BEAM-based languages. elixir = elixir_1_11; - elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix { + elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix { inherit erlang; debugInfo = true; }; - elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { + elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix { inherit erlang; debugInfo = true; }; - elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { + elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix { inherit erlang; debugInfo = true; }; - elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { + elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { inherit erlang; debugInfo = true; }; - elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { + elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix { inherit erlang; debugInfo = true; }; @@ -67,8 +67,8 @@ let # https://hexdocs.pm/elixir/compatibility-and-deprecations.html lfe = lfe_1_3; - lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; - lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; + lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; + lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index c55a7a80ff3..7f84e236070 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: { pkg, version, sha256 , meta ? {} }: -with stdenv.lib; +with lib; stdenv.mkDerivation ({ name = "hex-source-${pkg}-${version}"; diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix index 389e07beca6..d858b3d81af 100644 --- a/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -1,10 +1,10 @@ -{ stdenv, rebar3 }: +{ lib, stdenv, rebar3 }: { name, version, sha256, src , meta ? {} }: -with stdenv.lib; +with lib; stdenv.mkDerivation ({ name = "rebar-deps-${name}-${version}"; @@ -28,6 +28,6 @@ stdenv.mkDerivation ({ outputHashMode = "recursive"; outputHash = sha256; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit meta; }) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 26070ce73bf..e12f0ba4b74 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -45,13 +45,13 @@ let meta = { description = "Package manager for the Erlang VM https://hex.pm"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/hexpm/hex"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + maintainers = with lib.maintainers; [ ericbmerritt ]; }; passthru = { env = shell self; }; }; -in stdenv.lib.fix pkg +in lib.fix pkg diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index db40c47794f..7ae2e0e2606 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs, lib, stdenv }: rec { @@ -7,7 +7,7 @@ rec { callPackageWith = autoArgs: fn: args: let f = if pkgs.lib.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs; + auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; in f (auto // args); callPackage = callPackageWith pkgs; diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index fac3b298835..8b5836f4c62 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/pkgs/development/beam-modules/pc/default.nix @@ -7,7 +7,7 @@ buildHex { meta = { description = "a rebar3 port compiler for native code"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/blt/port_compiler"; }; } diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index c7e7aee1001..e64476212dd 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -21,9 +21,9 @@ let meta = { description = "Erlang PostgreSQL Driver"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/semiocast/pgsql"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + maintainers = with lib.maintainers; [ ericbmerritt ]; }; passthru = { @@ -31,4 +31,4 @@ let }; }; -in stdenv.lib.fix pkg +in lib.fix pkg diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 1ec9f244d6c..bbc130725c0 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -15,7 +15,7 @@ , enableDebugInfo ? false , ... }@attrs: -with stdenv.lib; +with lib; let shell = drv: stdenv.mkDerivation { diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index 8f06f8ed7a8..da6cb127342 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -27,9 +27,9 @@ let meta = { description = "WebDriver implementation in Erlang"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/Quviq/webdrv"; - maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + maintainers = with lib.maintainers; [ ericbmerritt ]; }; passthru = { @@ -37,4 +37,4 @@ let }; }; -in stdenv.lib.fix pkg +in lib.fix pkg diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a4674e356cc..06578f56535 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -610,12 +610,12 @@ self: super: builtins.intersectAttrs super { git-annex = with pkgs; if (!stdenv.isLinux) then - let path = stdenv.lib.makeBinPath [ coreutils ]; + let path = lib.makeBinPath [ coreutils ]; in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { # This is an instance of https://github.com/NixOS/nix/pull/1085 # Fails with: # gpg: can't connect to the agent: File name too long - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Test.hs \ --replace ', testCase "crypto" test_crypto' "" ''; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bf4f7bd3bbf..582cf6df010 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, buildHaskellPackages, ghc +{ lib, stdenv, buildPackages, buildHaskellPackages, ghc , jailbreak-cabal, hscolour, cpphs, nodejs , ghcWithHoogle, ghcWithPackages }: @@ -22,10 +22,10 @@ in , buildFlags ? [] , haddockFlags ? [] , description ? null -, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version +, doCheck ? !isCross && lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true -, doHaddockQuickjump ? doHoogle && stdenv.lib.versionAtLeast ghc.version "8.6" +, doHaddockQuickjump ? doHoogle && lib.versionAtLeast ghc.version "8.6" , editedCabalFile ? null # aarch64 outputs otherwise exceed 2GB limit , enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false) @@ -36,14 +36,14 @@ in , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) -, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" +, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] # On macOS, statically linking against system frameworks is not supported; # see https://developer.apple.com/library/content/qa/qa1118/_index.html # They must be propagated to the environment of any executable linking with the library , libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" -, platforms ? with stdenv.lib.platforms; all # GHC can cross-compile +, platforms ? with lib.platforms; all # GHC can cross-compile , hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable @@ -71,7 +71,7 @@ in , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" +, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" , enableSeparateBinOutput ? false , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock @@ -95,7 +95,7 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false; let - inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast + inherit (lib) optional optionals optionalString versionOlder versionAtLeast concatStringsSep enableFeature optionalAttrs; isGhcjs = ghc.isGhcjs or false; @@ -182,7 +182,7 @@ let parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS"; crossCabalFlagsString = - stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); + lib.optionalString isCross (" " + lib.concatStringsSep " " crossCabalFlags); buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags); @@ -213,7 +213,7 @@ let (enableFeature doBenchmark "benchmarks") "--enable-library-vanilla" # TODO: Should this be configurable? (enableFeature enableLibraryForGhci "library-for-ghci") - ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ + ] ++ optionals (enableDeadCodeElimination && (lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" ] ++ optionals dontStrip [ "--disable-library-stripping" @@ -283,7 +283,7 @@ let continue fi ''; -in stdenv.lib.fix (drv: +in lib.fix (drv: assert allPkgconfigDepends != [] -> pkg-config != null; @@ -423,7 +423,7 @@ stdenv.mkDerivation ({ echo configureFlags: $configureFlags ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" - ${stdenv.lib.optionalString (!allowInconsistentDependencies) '' + ${lib.optionalString (!allowInconsistentDependencies) '' if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then echo >&2 "*** abort because of serious configure-time warning from Cabal" exit 1 @@ -455,7 +455,7 @@ stdenv.mkDerivation ({ ${optionalString doHoogle "--hoogle"} \ ${optionalString doHaddockQuickjump "--quickjump"} \ ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ - ${stdenv.lib.concatStringsSep " " haddockFlags} + ${lib.concatStringsSep " " haddockFlags} ''} runHook postHaddock ''; @@ -492,7 +492,7 @@ stdenv.mkDerivation ({ done ''} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} - ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' + ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") '' for exe in "${binDir}/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done @@ -535,7 +535,7 @@ stdenv.mkDerivation ({ pkg-configDepends setupHaskellDepends ; - } // stdenv.lib.optionalAttrs doCheck { + } // lib.optionalAttrs doCheck { inherit testDepends testFrameworkDepends @@ -544,7 +544,7 @@ stdenv.mkDerivation ({ testSystemDepends testToolDepends ; - } // stdenv.lib.optionalAttrs doBenchmark { + } // lib.optionalAttrs doBenchmark { inherit benchmarkDepends benchmarkFrameworkDepends @@ -561,7 +561,7 @@ stdenv.mkDerivation ({ inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends; haskellBuildInputs = isHaskellPartition.right; systemBuildInputs = isHaskellPartition.wrong; - isHaskellPartition = stdenv.lib.partition + isHaskellPartition = lib.partition isHaskellPkg (propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs); }; @@ -608,13 +608,13 @@ stdenv.mkDerivation ({ ghcEnv = withPackages (_: otherBuildInputsHaskell ++ propagatedBuildInputs ++ - stdenv.lib.optionals (!isCross) setupHaskellDepends); + lib.optionals (!isCross) setupHaskellDepends); - ghcCommandCaps = stdenv.lib.toUpper ghcCommand'; + ghcCommandCaps = lib.toUpper ghcCommand'; in stdenv.mkDerivation ({ inherit name shellHook; - depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild; + depsBuildBuild = lib.optional isCross ghcEnvForBuild; nativeBuildInputs = [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++ collectedToolDepends; @@ -623,7 +623,7 @@ stdenv.mkDerivation ({ phases = ["installPhase"]; installPhase = "echo $nativeBuildInputs $buildInputs > $out"; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg"; # TODO: is this still valid? diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 0f620d46ccc..f47ac076f13 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -120,7 +120,7 @@ buildPackages.stdenv.mkDerivation { meta = { description = "A local Hoogle database"; platforms = ghc.meta.platforms; - hydraPlatforms = with stdenv.lib.platforms; none; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + hydraPlatforms = with lib.platforms; none; + maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 91937b88eaf..28b48bfcbc4 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -41,7 +41,7 @@ self: let inherit (stdenv) buildPlatform hostPlatform; - inherit (stdenv.lib) fix' extends makeOverridable; + inherit (lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { @@ -84,8 +84,8 @@ let # lost on `.override`) but determine the auto-args based on `drv` (the problem here # is that nix has no way to "passthrough" args while preserving the reflection # info that callPackage uses to determine the arguments). - drv = if stdenv.lib.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope; + drv = if lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (lib.functionArgs drv) scope; # this wraps the `drv` function to add a `overrideScope` function to the result. drvScope = allArgs: drv allArgs // { @@ -98,7 +98,7 @@ let # nothing. in callPackageWithScope newScope drv manualArgs; }; - in stdenv.lib.makeOverridable drvScope (auto // manualArgs); + in lib.makeOverridable drvScope (auto // manualArgs); mkScope = scope: let ps = pkgs.__splicedPackages; diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index a7196c6e031..cb895d9c672 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -1,11 +1,11 @@ -{ stdenv, maven, pkgs }: +{ lib, stdenv, maven, pkgs }: { mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }: with builtins; -with stdenv.lib; +with lib; let - mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; }; + mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; }; in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index dbbce6b6262..c4b02071ec0 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, mavenbuild, fetchMaven }: +{ lib, stdenv, pkgs, mavenbuild, fetchMaven }: with pkgs.javaPackages; @@ -21,9 +21,9 @@ in rec { meta = { homepage = "https://junit.org/junit4/"; description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks"; - license = stdenv.lib.licenses.epl10; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; + license = lib.licenses.epl10; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ nequissimus ]; }; }; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index b4639d9ee1d..e0087e857a4 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, mavenbuild }: +{ lib, stdenv, pkgs, mavenbuild }: with pkgs.javaPackages; @@ -20,9 +20,9 @@ in rec { meta = { homepage = "https://github.com/NeQuissimus/maven-hello/"; description = "Maven Hello World"; - license = stdenv.lib.licenses.unlicense; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; + license = lib.licenses.unlicense; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ nequissimus ]; }; }; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index 52edcd2104f..9019e3ba28e 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: -with stdenv.lib; +with lib; with pkgs.javaPackages; let diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 252d38d1192..b51bc3f7cdd 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index ddde76cac64..5212421a7b8 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, config, fetchurl, pkg-config -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 62a5c54e676..e2371292e12 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -20,7 +20,7 @@ let gstreamerAtLeastVersion1 = lib.all - (pkg: pkg != null && lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0") + (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0") [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; in assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 4cb2d6b2aec..53eb4459770 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 26e37738d55..839b7e9f40b 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -3,7 +3,7 @@ , x11Support? !stdenv.isDarwin, libXext, libXrender , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) , libGL ? null # libGLU libGL is no longer a big dependency , pdfSupport ? true @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; + url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 264c382338c..166d4e12c25 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lethalman ]; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 902a2af62bd..0dfb8c7b9df 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://www.clutter-project.org/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lethalman ]; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 3204811ec6b..815dfb634c9 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 5214fa9e149..e283a290947 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "http://irrlicht.sourceforge.net/"; license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 433cf75ad5a..32b00062239 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "hsqldb"; version = "2.5.1"; - underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); + underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index b9b00223186..7a7d6a933bc 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "A Java/JNI library for using Unix Domain Sockets from Java"; homepage = "https://github.com/kohlschutter/junixsocket"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index c7c9de67592..49dcec3ee78 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://gtkpod.sourceforge.net/"; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index d2f6e31596f..e960fe8f4b2 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; meta = { description = "A library for real-time communications with async IO support and a complete SIP stack"; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 4e8d6fca616..6dd44a0f202 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" ''PREFIX=$(out)'' ] - ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}" - ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; meta = { description = " A library for real-time audio and video processing"; diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index a3a19522f69..3ef1f314899 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "smart column output alignment library"; homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ rb2k ]; }; } diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index ab9d7d85c86..9b71a91efed 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "A Library to Access SMI MIB Information"; homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; license = licenses.free; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index fc3e15f688d..3864a99f5e9 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -24,6 +24,6 @@ in stdenv.mkDerivation rec { description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b162ab50810..f3f48cec770 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references '' - + (lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides)); + + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); mesonAutoFeatures = "auto"; diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index cc1ae013a0e..037e7036f49 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Library for rasterizing 2-D vector graphics"; homepage = "https://www.gnu.org/software/libxmi/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index b1951bdb226..85c9f781cc6 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://muparser.sourceforge.net"; description = "An extensible high performance math expression parser library written in C++"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 0bc7d938be6..b2d818a2972 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -6,8 +6,8 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, libmysqlclient ? null -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, openglSupport ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGL ? null, libGLU ? null, libXmu ? null , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 9ddb2cc5bac..7dddd2bc67d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -4,7 +4,7 @@ , libmng, which, libGLU, openssl, dbus, cups, pkg-config , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk-pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 87a88ddf9b0..cf5a0de11ad 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`. debug ? false, }: -with stdenv.lib; +with lib; let @@ -119,7 +119,7 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = @@ -136,7 +136,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 926510293b5..7139a3b7354 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`. debug ? false, }: -with stdenv.lib; +with lib; let diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 08fd3a9720c..a3a0496f160 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`. debug ? false, }: -with stdenv.lib; +with lib; let diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 36a736d03dc..f6aeb23fb7b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -1,8 +1,8 @@ -{ qtModule, stdenv, qtbase, qtdeclarative, bluez }: +{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }: qtModule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = stdenv.lib.optional stdenv.isLinux bluez; + buildInputs = lib.optional stdenv.isLinux bluez; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index a80785d8099..182b5f5bc33 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -1,10 +1,10 @@ -{ stdenv, qtModule, qtbase, qtmultimedia }: +{ lib, stdenv, qtModule, qtbase, qtmultimedia }: qtModule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; - qmakeFlags = stdenv.lib.optional stdenv.isDarwin [ + qmakeFlags = lib.optional stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx # This flag re-enables this feature # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 11964caf17b..6639e4c8d69 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -1,9 +1,9 @@ -{ stdenv, qtModule, qtbase }: +{ lib, stdenv, qtModule, qtbase }: qtModule { name = "qtmacextras"; qtInputs = [ qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index b9e757833b3..eb2c3bc7431 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,8 +1,8 @@ -{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config +{ qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config , alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland }: -with stdenv.lib; +with lib; qtModule { name = "qtmultimedia"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index e6ab23073b1..1ad254ffcd0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -18,7 +18,7 @@ , lib, stdenv, fetchpatch }: -with stdenv.lib; +with lib; qtModule { name = "qtwebengine"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index d8d53690b24..ed41a4ac9bc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -43,7 +43,7 @@ qtModule { # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. - preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) '' + preConfigure = lib.optionalString (!usingAnnulenWebkitFork) '' QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fixQtBuiltinPaths . '*.pr?' # Fix hydra's "Log limit exceeded" @@ -72,6 +72,6 @@ qtModule { preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; meta = { - maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + maintainers = with lib.maintainers; [ abbradar periklis ]; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix index 906d750c5d3..4034dce49f5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -1,6 +1,6 @@ -{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }: +{ darwin, lib, stdenv, qtModule, qtdeclarative, qtwebengine }: -with stdenv.lib; +with lib; qtModule { name = "qtwebview"; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index e5aeae6aae0..6431e6a1a7a 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 7b636e984de..469da2523d9 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -14,7 +14,7 @@ let mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 93529ef430f..8029477708d 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , libX11, cairo -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 358b45fbf0c..77e0e20eaf5 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index c97a9778d5d..a1c2820a5fd 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -2,7 +2,7 @@ , libXinerama, libSM, libXxf86vm , gtk2, gtk3 , xorgproto, gst_all_1, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index cbacf4ec762..cab0197c939 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -12,7 +12,7 @@ , xorgproto , gst_all_1 , setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null , libGL ? null diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 242788723fb..b757b737f97 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { homepage = "http://xalan.apache.org/"; description = "A XSLT processor for transforming XML documents"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index dec42c0243e..f5109a1ebd6 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://xerces.apache.org/xerces-c/"; description = "Validating XML parser written in a portable subset of C++"; license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 1f504ac280e..0a9d666f8b7 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "GUI tool for avrdude"; homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = platforms.all; }; } diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix index 1e138aaa8f7..12598e9fd86 100644 --- a/pkgs/development/misc/google-clasp/default.nix +++ b/pkgs/development/misc/google-clasp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: let version = "2.2.1"; in @@ -12,8 +12,8 @@ in meta = { description = "Command Line tool for Google Apps Script Projects"; homepage = "https://developers.google.com/apps-script/guides/clasp"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.michojel ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.michojel ]; priority = 100; }; } diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix index 53c85a2e5ba..55b070a9f77 100644 --- a/pkgs/development/misc/haskell/hasura/ci-info/default.nix +++ b/pkgs/development/misc/haskell/hasura/ci-info/default.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable -, hpack, stdenv, template-haskell, text, th-lift-instances +, hpack, lib, stdenv, template-haskell, text, th-lift-instances , unordered-containers }: mkDerivation { @@ -18,5 +18,5 @@ mkDerivation { libraryToolDepends = [ hpack ]; prePatch = "hpack"; homepage = "https://github.com/hasura/ci-info-hs#readme"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix index 055459514e4..3cf840c15e1 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -13,7 +13,7 @@ , optparse-applicative, pem, pg-client, postgresql-binary , postgresql-libpq, process, profunctors, psqueues, QuickCheck , regex-tdfa, safe, scientific, semver, shakespeare, split -, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text , text-builder, text-conversions, th-lift-instances, these, time , transformers, transformers-base, unix, unordered-containers , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets @@ -68,8 +68,8 @@ mkDerivation { doCheck = false; homepage = "https://www.hasura.io"; description = "GraphQL API over Postgres"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ offline ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ offline ]; hydraPlatforms = []; broken = true; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix index 991b5384d5c..82314a7485b 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, attoparsec, base, bytestring, containers , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter -, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text , text-builder, th-lift-instances, unordered-containers, vector }: mkDerivation { @@ -32,5 +32,5 @@ mkDerivation { doCheck = false; prePatch = "hpack"; homepage = "https://github.com/hasura/graphql-parser-hs#readme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix index 725e5e7f640..aa780abd8e9 100644 --- a/pkgs/development/misc/haskell/hasura/pg-client/default.nix +++ b/pkgs/development/misc/haskell/hasura/pg-client/default.nix @@ -2,7 +2,7 @@ , criterion, fetchgit, file-embed, hashable, hashtables, hasql , hasql-pool, hasql-transaction, monad-control, mtl , postgresql-binary, postgresql-libpq, resource-pool, retry -, scientific, stdenv, template-haskell, text, text-builder, th-lift +, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift , th-lift-instances, time, transformers-base, uuid, vector }: mkDerivation { @@ -26,5 +26,5 @@ mkDerivation { hasql-transaction mtl postgresql-libpq text text-builder ]; homepage = "https://github.com/hasura/platform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 33de722baa2..74b5ca09d2a 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -18,8 +18,8 @@ buildRustPackage rec { meta = with lib; { homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index f8616ff0bc4..122b3cec4b7 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config - ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config + ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; buildInputs = [ libusb-compat-0_1 ] - ++ stdenv.lib.optional stdenv.isDarwin hidapi - ++ stdenv.lib.optional enableReadline readline; + ++ lib.optional stdenv.isDarwin hidapi + ++ lib.optional enableReadline readline; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # TODO: remove once a new 0.26+ release is made substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { ''; # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ - runtimeDependencies = stdenv.lib.optional enableMspds mspds; - postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) '' + runtimeDependencies = lib.optional enableMspds mspds; + postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) '' # autoPatchelfHook only works on linux so... for dep in $runtimeDependencies; do install_name_tool -add_rpath $dep/lib $out/bin/$pname @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; makeFlags = [ "UNAME_S=$(unameS)" ] ++ - stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; - unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin"; + lib.optional (!enableReadline) "WITHOUT_READLINE=1"; + unameS = lib.optionalString stdenv.isDarwin "Darwin"; meta = with lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix index 9be283e4933..86bcba57075 100644 --- a/pkgs/development/misc/resholve/deps.nix +++ b/pkgs/development/misc/resholve/deps.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python27Packages , fetchFromGitHub , makeWrapper @@ -106,12 +106,12 @@ rec { _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; # See earlier note on glibcLocales - LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; meta = { description = "A new unix shell"; homepage = "https://www.oilshell.org/"; - license = with stdenv.lib.licenses; [ + license = with lib.licenses; [ psfl # Includes a portion of the python interpreter and standard library asl20 # Licence for Oil itself ]; diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index fae1c1731ae..9d5eb2af496 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; }; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index d85dab861e7..bd5d1e91602 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { inherit name src; - pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; + pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; }; hardeningDisable = [ "format" "pic" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath + LD_LIBRARY_PATH = lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; @@ -89,9 +89,9 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) - platforms = stdenv.lib.filter - (system: with stdenv.lib.systems.elaborate { inherit system; }; + platforms = lib.filter + (system: with lib.systems.elaborate { inherit system; }; isUnix && !isDarwin) - stdenv.lib.platforms.mesaPlatforms; + lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 28525ac475e..5427e36746c 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported."; # Shared data (for the sources file) - pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; + pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; }; # Note: -fPIC causes the VM to segfault. hardeningDisable = [ "format" "pic" @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs} + libs=$out:$(patchelf --print-rpath "$out/pharo"):${lib.makeLibraryPath libs} # Create the script cat > "$out/bin/${cmd}" < Date: Sun, 24 Jan 2021 09:19:10 +0000 Subject: treewide: fix double quoted strings in meta.description Signed-off-by: Ben Siraphob --- lib/licenses.nix | 4 +-- nixos/modules/config/console.nix | 2 +- nixos/modules/config/fonts/fontconfig.nix | 2 +- nixos/modules/config/i18n.nix | 2 +- nixos/modules/config/networking.nix | 3 +- nixos/modules/config/pulseaudio.nix | 2 +- nixos/modules/config/users-groups.nix | 4 +-- nixos/modules/hardware/video/bumblebee.nix | 2 +- nixos/modules/misc/locate.nix | 2 +- nixos/modules/misc/nixpkgs.nix | 2 +- nixos/modules/programs/captive-browser.nix | 14 ++++----- nixos/modules/programs/ssh.nix | 2 +- nixos/modules/programs/xss-lock.nix | 2 +- nixos/modules/services/audio/mpd.nix | 6 ++-- nixos/modules/services/backup/bacula.nix | 3 +- nixos/modules/services/backup/tarsnap.nix | 2 +- nixos/modules/services/cluster/hadoop/default.nix | 3 +- nixos/modules/services/computing/slurm/slurm.nix | 6 ++-- nixos/modules/services/databases/couchdb.nix | 3 +- nixos/modules/services/databases/firebird.nix | 2 +- nixos/modules/services/databases/neo4j.nix | 8 ++--- nixos/modules/services/development/bloop.nix | 2 +- nixos/modules/services/editors/infinoted.nix | 8 ++--- nixos/modules/services/games/openarena.nix | 2 +- nixos/modules/services/logging/logstash.nix | 4 +-- nixos/modules/services/mail/postgrey.nix | 2 +- nixos/modules/services/misc/cgminer.nix | 2 +- nixos/modules/services/misc/dictd.nix | 2 +- nixos/modules/services/misc/exhibitor.nix | 2 +- nixos/modules/services/misc/gitea.nix | 3 +- nixos/modules/services/misc/matrix-synapse.nix | 3 +- nixos/modules/services/monitoring/apcupsd.nix | 2 +- nixos/modules/services/monitoring/graphite.nix | 6 ++-- nixos/modules/services/monitoring/incron.nix | 2 +- .../monitoring/prometheus/exporters/collectd.nix | 2 +- nixos/modules/services/monitoring/telegraf.nix | 2 +- nixos/modules/services/monitoring/thanos.nix | 4 +-- nixos/modules/services/monitoring/ups.nix | 2 +- .../modules/services/network-filesystems/ceph.nix | 4 +-- nixos/modules/services/networking/amuled.nix | 2 +- nixos/modules/services/networking/cntlm.nix | 4 +-- nixos/modules/services/networking/connman.nix | 3 +- nixos/modules/services/networking/dnsdist.nix | 3 +- nixos/modules/services/networking/gateone.nix | 4 +-- nixos/modules/services/networking/hostapd.nix | 4 +-- .../services/networking/hylafax/modem-default.nix | 6 ++-- .../services/networking/hylafax/options.nix | 20 ++++++------ .../services/networking/hylafax/systemd.nix | 28 ++++++++--------- nixos/modules/services/networking/kippo.nix | 14 ++++----- nixos/modules/services/networking/owamp.nix | 2 +- nixos/modules/services/networking/quassel.nix | 2 +- nixos/modules/services/networking/smokeping.nix | 2 +- nixos/modules/services/networking/ssh/lshd.nix | 12 ++++---- .../strongswan-swanctl/swanctl-params.nix | 2 +- nixos/modules/services/networking/supybot.nix | 2 +- .../modules/services/networking/wpa_supplicant.nix | 4 +-- nixos/modules/services/security/usbguard.nix | 2 +- nixos/modules/services/system/cloud-init.nix | 2 +- nixos/modules/services/web-apps/dokuwiki.nix | 2 +- nixos/modules/services/web-apps/keycloak.nix | 2 +- nixos/modules/services/web-apps/moodle.nix | 2 +- .../services/web-servers/lighttpd/default.nix | 2 +- .../system/boot/loader/raspberrypi/raspberrypi.nix | 3 +- nixos/modules/tasks/filesystems/zfs.nix | 2 +- nixos/modules/virtualisation/nixos-containers.nix | 4 +-- nixos/modules/virtualisation/qemu-vm.nix | 9 ++---- nixos/modules/virtualisation/railcar.nix | 2 +- pkgs/applications/audio/lsp-plugins/default.nix | 2 +- pkgs/applications/audio/zam-plugins/default.nix | 2 +- pkgs/applications/editors/manuskript/default.nix | 2 +- pkgs/applications/editors/rstudio/default.nix | 2 +- pkgs/applications/editors/vim/configurable.nix | 3 +- pkgs/applications/graphics/ahoviewer/default.nix | 2 +- pkgs/applications/graphics/ipe/default.nix | 2 +- .../applications/graphics/mandelbulber/default.nix | 2 +- pkgs/applications/graphics/pinta/default.nix | 6 ++-- pkgs/applications/misc/bleachbit/default.nix | 2 +- pkgs/applications/misc/digitalbitbox/default.nix | 2 +- pkgs/applications/misc/dupeguru/default.nix | 2 +- pkgs/applications/misc/ikiwiki/default.nix | 14 ++++----- pkgs/applications/misc/lutris/default.nix | 2 +- pkgs/applications/misc/osm2xmap/default.nix | 6 ++-- .../misc/plasma-applet-volumewin7mixer/default.nix | 2 +- .../instant-messengers/baresip/default.nix | 2 +- .../instant-messengers/jitsi/default.nix | 2 +- pkgs/applications/networking/owamp/default.nix | 2 +- .../networking/remote/x2goclient/default.nix | 2 +- pkgs/applications/office/docear/default.nix | 2 +- pkgs/applications/office/planner/default.nix | 2 +- pkgs/applications/radio/gnuradio/3.7.nix | 3 +- pkgs/applications/radio/gnuradio/default.nix | 3 +- pkgs/applications/radio/gnuradio/shared.nix | 3 +- .../science/biology/migrate/default.nix | 2 +- .../science/biology/ncbi-tools/default.nix | 4 +-- pkgs/applications/science/biology/paml/default.nix | 2 +- .../applications/science/logic/iprover/default.nix | 2 +- pkgs/applications/science/logic/lci/default.nix | 2 +- .../science/logic/satallax/default.nix | 2 +- pkgs/applications/science/logic/yices/default.nix | 2 +- pkgs/applications/science/logic/z3/tptp.nix | 2 +- pkgs/applications/science/math/gfan/default.nix | 4 +-- pkgs/applications/science/math/nauty/default.nix | 2 +- .../science/math/ratpoints/default.nix | 2 +- .../science/math/symmetrica/default.nix | 2 +- .../terminal-emulators/guake/default.nix | 2 +- .../terminal-emulators/wezterm/default.nix | 3 +- .../version-management/cvsps/default.nix | 2 +- .../version-management/cvsq/default.nix | 2 +- .../version-management/monotone-viz/default.nix | 2 +- pkgs/applications/video/makemkv/default.nix | 2 +- pkgs/applications/video/mythtv/default.nix | 2 +- pkgs/applications/video/xawtv/default.nix | 2 +- .../applications/virtualization/docker/default.nix | 3 +- pkgs/applications/virtualization/xen/generic.nix | 2 +- pkgs/build-support/skaware/clean-packaging.nix | 2 +- pkgs/data/fonts/orbitron/default.nix | 3 +- pkgs/data/fonts/twitter-color-emoji/default.nix | 14 ++++----- .../gnome-3/extensions/gsconnect/default.nix | 2 +- pkgs/development/beam-modules/build-rebar3.nix | 2 +- pkgs/development/beam-modules/rebar3-release.nix | 12 ++++---- .../compilers/crystal/build-package.nix | 10 +++--- pkgs/development/compilers/osl/default.nix | 2 +- pkgs/development/compilers/ponyc/default.nix | 7 ++--- pkgs/development/compilers/rust/rustc.nix | 2 +- pkgs/development/compilers/stalin/default.nix | 2 +- pkgs/development/compilers/swift/default.nix | 2 +- .../haskell-modules/hackage-packages.nix | 2 +- pkgs/development/haskell-modules/hoogle.nix | 4 +-- .../interpreters/lua-5/build-lua-package.nix | 2 +- .../interpreters/python/mk-python-derivation.nix | 2 +- pkgs/development/interpreters/quickjs/default.nix | 2 +- pkgs/development/libraries/aravis/default.nix | 2 +- pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +- pkgs/development/libraries/capstone/default.nix | 2 +- pkgs/development/libraries/dbus/default.nix | 10 +++--- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- pkgs/development/libraries/gaia/default.nix | 6 ++-- pkgs/development/libraries/gcab/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/glui/default.nix | 2 +- pkgs/development/libraries/gtdialog/default.nix | 2 +- pkgs/development/libraries/hspell/default.nix | 2 +- pkgs/development/libraries/iml/default.nix | 2 +- .../libraries/java/dbus-java/default.nix | 2 +- .../libraries/java/libmatthew-java/default.nix | 2 +- .../libraries/libatomic_ops/default.nix | 2 +- pkgs/development/libraries/libe-book/default.nix | 2 +- pkgs/development/libraries/liblangtag/default.nix | 2 +- pkgs/development/libraries/libmwaw/default.nix | 2 +- pkgs/development/libraries/libodfgen/default.nix | 2 +- pkgs/development/libraries/librem/default.nix | 2 +- pkgs/development/libraries/librevenge/default.nix | 2 +- pkgs/development/libraries/libvpx/1_8.nix | 2 +- pkgs/development/libraries/libxml2/default.nix | 2 +- pkgs/development/libraries/libzmf/default.nix | 2 +- pkgs/development/libraries/mpfi/default.nix | 2 +- pkgs/development/libraries/mpir/default.nix | 2 +- pkgs/development/libraries/msgpuck/default.nix | 2 +- pkgs/development/libraries/openpa/default.nix | 2 +- pkgs/development/libraries/qca-qt5/default.nix | 2 +- .../libraries/science/math/caffe2/default.nix | 36 +++++++++++----------- pkgs/development/libraries/speechd/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 8 ++--- .../_3bmd-ext-code-blocks.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/_3bmd.nix | 10 +++--- .../quicklisp-to-nix-output/access.nix | 8 ++--- .../quicklisp-to-nix-output/acclimation.nix | 10 +++--- .../quicklisp-to-nix-output/alexandria.nix | 10 +++--- .../quicklisp-to-nix-output/anaphora.nix | 10 +++--- .../quicklisp-to-nix-output/arnesi.nix | 10 +++--- .../quicklisp-to-nix-output/array-utils.nix | 10 +++--- .../asdf-package-system.nix | 10 +++--- .../asdf-system-connections.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/babel.nix | 10 +++--- .../quicklisp-to-nix-output/blackbird.nix | 10 +++--- .../quicklisp-to-nix-output/bordeaux-threads.nix | 10 +++--- .../quicklisp-to-nix-output/buildnode-xhtml.nix | 10 +++--- .../quicklisp-to-nix-output/buildnode.nix | 10 +++--- .../quicklisp-to-nix-output/caveman.nix | 10 +++--- .../quicklisp-to-nix-output/cffi-grovel.nix | 10 +++--- .../quicklisp-to-nix-output/cffi-toolchain.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/cffi.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/chanl.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/chipz.nix | 10 +++--- .../quicklisp-to-nix-output/chunga.nix | 10 +++--- .../quicklisp-to-nix-output/circular-streams.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/cl-aa.nix | 10 +++--- .../quicklisp-to-nix-output/cl-annot.nix | 10 +++--- .../quicklisp-to-nix-output/cl-anonfun.nix | 10 +++--- .../quicklisp-to-nix-output/cl-ansi-text.nix | 10 +++--- .../quicklisp-to-nix-output/cl-async-repl.nix | 10 +++--- .../quicklisp-to-nix-output/cl-async-ssl.nix | 10 +++--- .../quicklisp-to-nix-output/cl-async.nix | 10 +++--- .../quicklisp-to-nix-output/cl-base64.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix | 10 +++--- .../cl-cffi-gtk-gdk-pixbuf.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cffi-gtk-gio.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cffi-gtk-glib.nix | 10 +++--- .../cl-cffi-gtk-gobject.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cffi-gtk-pango.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cffi-gtk.nix | 10 +++--- .../quicklisp-to-nix-output/cl-change-case.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cli.nix | 10 +++--- .../quicklisp-to-nix-output/cl-colors.nix | 10 +++--- .../quicklisp-to-nix-output/cl-colors2.nix | 10 +++--- .../quicklisp-to-nix-output/cl-containers.nix | 10 +++--- .../quicklisp-to-nix-output/cl-cookie.nix | 10 +++--- .../quicklisp-to-nix-output/cl-css.nix | 10 +++--- .../quicklisp-to-nix-output/cl-csv.nix | 10 +++--- .../quicklisp-to-nix-output/cl-dbi.nix | 10 +++--- .../quicklisp-to-nix-output/cl-dot.nix | 10 +++--- .../quicklisp-to-nix-output/cl-emb.nix | 10 +++--- .../quicklisp-to-nix-output/cl-fad.nix | 10 +++--- .../quicklisp-to-nix-output/cl-fuse-meta-fs.nix | 10 +++--- .../quicklisp-to-nix-output/cl-fuse.nix | 10 +++--- .../quicklisp-to-nix-output/cl-hooks.nix | 8 ++--- .../quicklisp-to-nix-output/cl-html-parse.nix | 10 +++--- .../quicklisp-to-nix-output/cl-html5-parser.nix | 10 +++--- .../quicklisp-to-nix-output/cl-interpol.nix | 10 +++--- .../quicklisp-to-nix-output/cl-jpeg.nix | 10 +++--- .../quicklisp-to-nix-output/cl-json.nix | 10 +++--- .../quicklisp-to-nix-output/cl-l10n-cldr.nix | 10 +++--- .../quicklisp-to-nix-output/cl-l10n.nix | 10 +++--- .../quicklisp-to-nix-output/cl-libuv.nix | 10 +++--- .../quicklisp-to-nix-output/cl-locale.nix | 10 +++--- .../quicklisp-to-nix-output/cl-markup.nix | 10 +++--- .../quicklisp-to-nix-output/cl-mysql.nix | 10 +++--- .../quicklisp-to-nix-output/cl-paths-ttf.nix | 10 +++--- .../quicklisp-to-nix-output/cl-paths.nix | 10 +++--- .../quicklisp-to-nix-output/cl-pdf.nix | 10 +++--- .../quicklisp-to-nix-output/cl-postgres.nix | 10 +++--- .../quicklisp-to-nix-output/cl-ppcre-template.nix | 8 ++--- .../quicklisp-to-nix-output/cl-ppcre-unicode.nix | 10 +++--- .../quicklisp-to-nix-output/cl-ppcre.nix | 10 +++--- .../quicklisp-to-nix-output/cl-prevalence.nix | 10 +++--- .../quicklisp-to-nix-output/cl-project.nix | 10 +++--- .../quicklisp-to-nix-output/cl-protobufs.nix | 10 +++--- .../quicklisp-to-nix-output/cl-qprint.nix | 10 +++--- .../quicklisp-to-nix-output/cl-reexport.nix | 10 +++--- .../quicklisp-to-nix-output/cl-slice.nix | 10 +++--- .../quicklisp-to-nix-output/cl-smtp.nix | 10 +++--- .../quicklisp-to-nix-output/cl-store.nix | 10 +++--- .../quicklisp-to-nix-output/cl-syntax-annot.nix | 10 +++--- .../quicklisp-to-nix-output/cl-syntax-anonfun.nix | 10 +++--- .../quicklisp-to-nix-output/cl-syntax-markup.nix | 10 +++--- .../quicklisp-to-nix-output/cl-syntax.nix | 10 +++--- .../quicklisp-to-nix-output/cl-test-more.nix | 10 +++--- .../quicklisp-to-nix-output/cl-typesetting.nix | 10 +++--- .../quicklisp-to-nix-output/cl-unicode.nix | 10 +++--- .../quicklisp-to-nix-output/cl-unification.nix | 8 ++--- .../quicklisp-to-nix-output/cl-utilities.nix | 10 +++--- .../quicklisp-to-nix-output/cl-vectors.nix | 10 +++--- .../quicklisp-to-nix-output/cl-webkit2.nix | 10 +++--- .../quicklisp-to-nix-output/cl-who.nix | 10 +++--- .../quicklisp-to-nix-output/cl-xmlspam.nix | 10 +++--- .../quicklisp-to-nix-output/cl_plus_ssl.nix | 10 +++--- .../clack-handler-hunchentoot.nix | 10 +++--- .../quicklisp-to-nix-output/clack-socket.nix | 10 +++--- .../quicklisp-to-nix-output/clack-test.nix | 10 +++--- .../quicklisp-to-nix-output/clack-v1-compat.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/clack.nix | 10 +++--- .../quicklisp-to-nix-output/clfswm.nix | 10 +++--- .../quicklisp-to-nix-output/closer-mop.nix | 10 +++--- .../quicklisp-to-nix-output/closure-common.nix | 10 +++--- .../quicklisp-to-nix-output/closure-html.nix | 10 +++--- .../clsql-postgresql-socket.nix | 10 +++--- .../quicklisp-to-nix-output/clsql-postgresql.nix | 10 +++--- .../quicklisp-to-nix-output/clsql-sqlite3.nix | 10 +++--- .../quicklisp-to-nix-output/clsql-uffi.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/clsql.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/clss.nix | 10 +++--- .../quicklisp-to-nix-output/clump-2-3-tree.nix | 10 +++--- .../quicklisp-to-nix-output/clump-binary-tree.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/clump.nix | 10 +++--- .../quicklisp-to-nix-output/clunit.nix | 10 +++--- .../quicklisp-to-nix-output/clunit2.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/clx.nix | 10 +++--- .../quicklisp-to-nix-output/collectors.nix | 8 ++--- .../quicklisp-to-nix-output/colorize.nix | 10 +++--- .../command-line-arguments.nix | 10 +++--- .../quicklisp-to-nix-output/css-lite.nix | 10 +++--- .../css-selectors-simple-tree.nix | 10 +++--- .../quicklisp-to-nix-output/css-selectors-stp.nix | 10 +++--- .../quicklisp-to-nix-output/css-selectors.nix | 10 +++--- .../quicklisp-to-nix-output/cxml-stp.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/cxml.nix | 10 +++--- .../quicklisp-to-nix-output/dbd-mysql.nix | 10 +++--- .../quicklisp-to-nix-output/dbd-postgres.nix | 10 +++--- .../quicklisp-to-nix-output/dbd-sqlite3.nix | 10 +++--- .../quicklisp-to-nix-output/dbi-test.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/dbi.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/dbus.nix | 10 +++--- .../quicklisp-to-nix-output/dexador.nix | 10 +++--- .../quicklisp-to-nix-output/dissect.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/djula.nix | 10 +++--- .../quicklisp-to-nix-output/do-urlencode.nix | 10 +++--- .../documentation-utils.nix | 10 +++--- .../quicklisp-to-nix-output/drakma.nix | 10 +++--- .../quicklisp-to-nix-output/enchant.nix | 10 +++--- .../quicklisp-to-nix-output/esrap-peg.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/esrap.nix | 10 +++--- .../quicklisp-to-nix-output/external-program.nix | 10 +++--- .../quicklisp-to-nix-output/fare-csv.nix | 10 +++--- .../quicklisp-to-nix-output/fare-mop.nix | 10 +++--- .../fare-quasiquote-extras.nix | 10 +++--- .../fare-quasiquote-optima.nix | 10 +++--- .../fare-quasiquote-readtable.nix | 10 +++--- .../quicklisp-to-nix-output/fare-quasiquote.nix | 10 +++--- .../quicklisp-to-nix-output/fare-utils.nix | 10 +++--- .../quicklisp-to-nix-output/fast-http.nix | 10 +++--- .../quicklisp-to-nix-output/fast-io.nix | 10 +++--- .../quicklisp-to-nix-output/fiasco.nix | 10 +++--- .../quicklisp-to-nix-output/fiveam.nix | 10 +++--- .../quicklisp-to-nix-output/flexi-streams.nix | 10 +++--- .../quicklisp-to-nix-output/form-fiddle.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/fset.nix | 8 ++--- .../quicklisp-to-nix-output/gettext.nix | 10 +++--- .../quicklisp-to-nix-output/global-vars.nix | 10 +++--- .../quicklisp-to-nix-output/html-encode.nix | 10 +++--- .../quicklisp-to-nix-output/http-body.nix | 10 +++--- .../hu_dot_dwim_dot_asdf.nix | 10 +++--- .../hu_dot_dwim_dot_defclass-star.nix | 10 +++--- .../hu_dot_dwim_dot_stefil.nix | 10 +++--- .../quicklisp-to-nix-output/hunchentoot.nix | 8 ++--- .../lisp-modules/quicklisp-to-nix-output/idna.nix | 10 +++--- .../quicklisp-to-nix-output/ieee-floats.nix | 10 +++--- .../quicklisp-to-nix-output/inferior-shell.nix | 10 +++--- .../introspect-environment.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/iolib.nix | 10 +++--- .../quicklisp-to-nix-output/iolib_dot_asdf.nix | 10 +++--- .../quicklisp-to-nix-output/iolib_dot_base.nix | 10 +++--- .../iolib_dot_common-lisp.nix | 10 +++--- .../quicklisp-to-nix-output/iolib_dot_conf.nix | 10 +++--- .../quicklisp-to-nix-output/iolib_dot_grovel.nix | 10 +++--- .../quicklisp-to-nix-output/ironclad.nix | 10 +++--- .../quicklisp-to-nix-output/iterate.nix | 10 +++--- .../quicklisp-to-nix-output/jonathan.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/kmrcl.nix | 10 +++--- .../quicklisp-to-nix-output/lack-component.nix | 10 +++--- .../lack-middleware-backtrace.nix | 10 +++--- .../quicklisp-to-nix-output/lack-util.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/lack.nix | 10 +++--- .../quicklisp-to-nix-output/let-plus.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/lev.nix | 10 +++--- .../quicklisp-to-nix-output/lfarm-client.nix | 10 +++--- .../quicklisp-to-nix-output/lfarm-common.nix | 8 ++--- .../quicklisp-to-nix-output/lfarm-server.nix | 10 +++--- .../quicklisp-to-nix-output/lfarm-ssl.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/lift.nix | 10 +++--- .../quicklisp-to-nix-output/lisp-namespace.nix | 10 +++--- .../quicklisp-to-nix-output/lisp-unit2.nix | 10 +++--- .../quicklisp-to-nix-output/local-time.nix | 10 +++--- .../quicklisp-to-nix-output/log4cl.nix | 10 +++--- .../quicklisp-to-nix-output/lparallel.nix | 10 +++--- .../quicklisp-to-nix-output/lquery.nix | 10 +++--- .../quicklisp-to-nix-output/map-set.nix | 10 +++--- .../quicklisp-to-nix-output/marshal.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/md5.nix | 10 +++--- .../quicklisp-to-nix-output/metabang-bind.nix | 10 +++--- .../quicklisp-to-nix-output/metatilities-base.nix | 10 +++--- .../quicklisp-to-nix-output/mgl-pax.nix | 8 ++--- .../quicklisp-to-nix-output/misc-extensions.nix | 10 +++--- .../quicklisp-to-nix-output/mk-string-metrics.nix | 10 +++--- .../quicklisp-to-nix-output/moptilities.nix | 10 +++--- .../quicklisp-to-nix-output/more-conditions.nix | 8 ++--- .../quicklisp-to-nix-output/mt19937.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/myway.nix | 10 +++--- .../quicklisp-to-nix-output/named-readtables.nix | 8 ++--- .../quicklisp-to-nix-output/net-telent-date.nix | 10 +++--- .../net_dot_didierverna_dot_asdf-flv.nix | 10 +++--- .../quicklisp-to-nix-output/nibbles.nix | 10 +++--- .../quicklisp-to-nix-output/optima.nix | 10 +++--- .../quicklisp-to-nix-output/osicat.nix | 10 +++--- .../quicklisp-to-nix-output/parenscript.nix | 10 +++--- .../parse-declarations-1_dot_0.nix | 10 +++--- .../quicklisp-to-nix-output/parse-number.nix | 10 +++--- .../quicklisp-to-nix-output/parser-combinators.nix | 10 +++--- .../parser_dot_common-rules.nix | 10 +++--- .../quicklisp-to-nix-output/pcall-queue.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/pcall.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/plump.nix | 10 +++--- .../quicklisp-to-nix-output/postmodern.nix | 10 +++--- .../quicklisp-to-nix-output/proc-parse.nix | 10 +++--- .../quicklisp-to-nix-output/prove-asdf.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/prove.nix | 10 +++--- .../quicklisp-to-nix-output/ptester.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/puri.nix | 10 +++--- .../pythonic-string-reader.nix | 8 ++--- .../quicklisp-to-nix-output/query-fs.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/quri.nix | 10 +++--- .../quicklisp-to-nix-output/rfc2388.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/rove.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/rt.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/s-sql.nix | 10 +++--- .../quicklisp-to-nix-output/s-sysdeps.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/s-xml.nix | 10 +++--- .../quicklisp-to-nix-output/salza2.nix | 8 ++--- .../quicklisp-to-nix-output/serapeum.nix | 10 +++--- .../quicklisp-to-nix-output/simple-date-time.nix | 10 +++--- .../quicklisp-to-nix-output/simple-date.nix | 10 +++--- .../quicklisp-to-nix-output/simple-tasks.nix | 10 +++--- .../quicklisp-to-nix-output/smart-buffer.nix | 10 +++--- .../quicklisp-to-nix-output/split-sequence.nix | 8 ++--- .../quicklisp-to-nix-output/sqlite.nix | 10 +++--- .../quicklisp-to-nix-output/static-vectors.nix | 10 +++--- .../quicklisp-to-nix-output/stefil.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/str.nix | 10 +++--- .../quicklisp-to-nix-output/string-case.nix | 10 +++--- .../quicklisp-to-nix-output/stumpwm.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/swank.nix | 10 +++--- .../quicklisp-to-nix-output/swap-bytes.nix | 10 +++--- .../quicklisp-to-nix-output/symbol-munger.nix | 8 ++--- .../quicklisp-to-nix-output/trivia.nix | 10 +++--- .../trivia_dot_balland2006.nix | 10 +++--- .../quicklisp-to-nix-output/trivia_dot_level0.nix | 10 +++--- .../quicklisp-to-nix-output/trivia_dot_level1.nix | 10 +++--- .../quicklisp-to-nix-output/trivia_dot_level2.nix | 10 +++--- .../trivia_dot_quasiquote.nix | 10 +++--- .../quicklisp-to-nix-output/trivia_dot_trivial.nix | 8 ++--- .../quicklisp-to-nix-output/trivial-backtrace.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-clipboard.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-cltl2.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-features.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-file-size.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-garbage.nix | 10 +++--- .../trivial-gray-streams.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-indent.nix | 10 +++--- .../trivial-macroexpand-all.nix | 10 +++--- .../trivial-main-thread.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-mimes.nix | 10 +++--- .../trivial-package-local-nicknames.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-types.nix | 10 +++--- .../quicklisp-to-nix-output/trivial-utf-8.nix | 10 +++--- .../quicklisp-to-nix-output/type-i.nix | 10 +++--- .../quicklisp-to-nix-output/uax-15.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/uffi.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/uiop.nix | 10 +++--- .../quicklisp-to-nix-output/unit-test.nix | 10 +++--- .../quicklisp-to-nix-output/unix-options.nix | 10 +++--- .../quicklisp-to-nix-output/unix-opts.nix | 10 +++--- .../quicklisp-to-nix-output/usocket-server.nix | 10 +++--- .../quicklisp-to-nix-output/usocket.nix | 10 +++--- .../utilities_dot_print-items.nix | 10 +++--- .../utilities_dot_print-tree.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/uuid.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/vom.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/woo.nix | 10 +++--- .../quicklisp-to-nix-output/wookie.nix | 10 +++--- .../quicklisp-to-nix-output/xembed.nix | 10 +++--- .../quicklisp-to-nix-output/xkeyboard.nix | 10 +++--- .../quicklisp-to-nix-output/xml_dot_location.nix | 8 ++--- .../lisp-modules/quicklisp-to-nix-output/xmls.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/xpath.nix | 10 +++--- .../quicklisp-to-nix-output/xsubseq.nix | 8 ++--- .../lisp-modules/quicklisp-to-nix-output/yacc.nix | 10 +++--- .../lisp-modules/quicklisp-to-nix-output/yason.nix | 10 +++--- .../quicklisp-to-nix-output/zpb-ttf.nix | 10 +++--- pkgs/development/ocaml-modules/torch/default.nix | 2 +- pkgs/development/pure-modules/gl/default.nix | 4 +-- .../python-modules/apptools/default.nix | 2 +- .../python-modules/betacode/default.nix | 2 +- .../python-modules/bravado-core/default.nix | 2 +- pkgs/development/python-modules/emoji/default.nix | 2 +- .../development/python-modules/ftputil/default.nix | 2 +- .../python-modules/inflection/default.nix | 2 +- .../python-modules/jenkins-job-builder/default.nix | 2 +- pkgs/development/python-modules/nuitka/default.nix | 2 +- .../python-modules/pytest-virtualenv/default.nix | 2 +- .../development/python-modules/rarfile/default.nix | 3 +- .../tools/build-managers/bam/default.nix | 4 +-- pkgs/development/tools/go-motion/default.nix | 2 +- pkgs/development/tools/go2nix/default.nix | 2 +- pkgs/development/tools/gocode-gomod/default.nix | 2 +- pkgs/development/tools/gocode/default.nix | 2 +- pkgs/development/tools/iaca/2.1.nix | 2 +- pkgs/development/tools/ineffassign/default.nix | 2 +- pkgs/development/tools/interfacer/default.nix | 2 +- pkgs/development/tools/misc/bossa/default.nix | 4 +-- pkgs/development/tools/misc/cl-launch/default.nix | 2 +- pkgs/development/tools/misc/luarocks/default.nix | 2 +- pkgs/development/tools/misc/tet/default.nix | 8 ++--- .../tools/poetry2nix/poetry2nix/pep508.nix | 2 +- pkgs/development/tools/setupcfg2nix/info.nix | 6 ++-- pkgs/development/tools/slimerjs/default.nix | 2 +- pkgs/development/tools/yj/default.nix | 2 +- pkgs/games/blobby/default.nix | 2 +- pkgs/games/fairymax/default.nix | 2 +- pkgs/games/fish-fillets-ng/default.nix | 2 +- pkgs/games/liquidwar/5.nix | 2 +- pkgs/games/moon-buggy/default.nix | 2 +- pkgs/games/n2048/default.nix | 4 +-- pkgs/games/pingus/default.nix | 2 +- pkgs/games/quantumminigolf/default.nix | 2 +- pkgs/games/xboard/default.nix | 2 +- pkgs/games/xbomb/default.nix | 2 +- pkgs/games/xpilot/bloodspilot-client.nix | 2 +- pkgs/games/xskat/default.nix | 4 +-- pkgs/misc/drivers/xow/default.nix | 10 +++--- pkgs/misc/emulators/termtekst/default.nix | 2 +- pkgs/misc/vscode-extensions/vscodeExts2nix.nix | 4 +-- .../vscode-extensions/vscodeWithConfiguration.nix | 12 ++++---- pkgs/os-specific/darwin/trash/default.nix | 2 +- pkgs/os-specific/linux/apparmor/default.nix | 2 +- pkgs/os-specific/linux/atop/default.nix | 2 +- pkgs/os-specific/linux/eudev/default.nix | 6 ++-- pkgs/os-specific/linux/firejail/default.nix | 2 +- pkgs/os-specific/linux/forktty/default.nix | 2 +- pkgs/os-specific/linux/gfxtablet/default.nix | 4 +-- pkgs/os-specific/linux/gradm/default.nix | 2 +- pkgs/os-specific/linux/libaio/default.nix | 2 +- pkgs/os-specific/linux/pcmciautils/default.nix | 3 +- pkgs/servers/computing/storm/default.nix | 2 +- pkgs/servers/fingerd/bsd-fingerd/default.nix | 2 +- pkgs/servers/firebird/default.nix | 2 +- .../servers/http/apache-modules/mod_ca/default.nix | 4 +-- pkgs/servers/hylafaxplus/default.nix | 6 ++-- pkgs/servers/x11/xorg/overrides.nix | 18 +++++------ pkgs/shells/mksh/default.nix | 2 +- pkgs/stdenv/freebsd/default.nix | 2 +- pkgs/tools/X11/xmagnify/default.nix | 2 +- pkgs/tools/X11/xprintidle-ng/default.nix | 2 +- pkgs/tools/X11/xwinmosaic/default.nix | 2 +- pkgs/tools/archivers/unzip/default.nix | 2 +- pkgs/tools/archivers/zip/default.nix | 2 +- pkgs/tools/audio/pa-applet/default.nix | 3 +- pkgs/tools/backup/mydumper/default.nix | 2 +- pkgs/tools/compression/advancecomp/default.nix | 2 +- pkgs/tools/compression/pixz/default.nix | 2 +- pkgs/tools/filesystems/catcli/default.nix | 2 +- pkgs/tools/filesystems/glusterfs/default.nix | 2 +- pkgs/tools/filesystems/irods/default.nix | 6 ++-- pkgs/tools/graphics/argyllcms/default.nix | 2 +- pkgs/tools/graphics/cfdg/src-info-for-default.nix | 2 +- pkgs/tools/graphics/convchain/default.nix | 2 +- pkgs/tools/graphics/gmic-qt/default.nix | 2 +- pkgs/tools/graphics/qrcode/default.nix | 2 +- pkgs/tools/graphics/quirc/default.nix | 2 +- pkgs/tools/graphics/syntex/default.nix | 2 +- .../graphics/wavefunctioncollapse/default.nix | 2 +- pkgs/tools/graphics/zxing/default.nix | 2 +- .../ibus-engines/ibus-uniemoji/default.nix | 4 +-- pkgs/tools/inputmethods/ibus/default.nix | 4 +-- pkgs/tools/misc/ccze/default.nix | 2 +- pkgs/tools/misc/debian-devscripts/default.nix | 2 +- pkgs/tools/networking/badvpn/default.nix | 2 +- pkgs/tools/networking/bgpdump/default.nix | 2 +- pkgs/tools/networking/bsd-finger/default.nix | 2 +- pkgs/tools/networking/jnettop/default.nix | 2 +- pkgs/tools/networking/mailsend/default.nix | 2 +- pkgs/tools/networking/persepolis/default.nix | 2 +- .../disnix/DisnixWebService/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- pkgs/tools/security/gencfsm/default.nix | 2 +- pkgs/tools/security/pbis/default.nix | 2 +- pkgs/tools/security/tcpcrypt/default.nix | 2 +- pkgs/tools/system/at/default.nix | 2 +- pkgs/tools/system/ipmitool/default.nix | 2 +- pkgs/tools/system/socklog/default.nix | 4 +-- pkgs/tools/system/throttled/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 4 +-- 563 files changed, 1884 insertions(+), 1911 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/lib/licenses.nix b/lib/licenses.nix index ebeb1377339..190eeefc1bf 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -87,7 +87,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { beerware = spdx { spdxId = "Beerware"; - fullName = ''Beerware License''; + fullName = "Beerware License"; }; blueOak100 = spdx { @@ -107,7 +107,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { bsd2Patent = spdx { spdxId = "BSD-2-Clause-Patent"; - fullName = ''BSD-2-Clause Plus Patent License''; + fullName = "BSD-2-Clause Plus Patent License"; }; bsd3 = spdx { diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index ab166760517..1339227f1e0 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -83,7 +83,7 @@ in packages = mkOption { type = types.listOf types.package; default = with pkgs.kbdKeymaps; [ dvp neo ]; - defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]''; + defaultText = "with pkgs.kbdKeymaps; [ dvp neo ]"; description = '' List of additional packages that provide console fonts, keymaps and other resources for virtual consoles use. diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 5b681ca5946..6e7b8c4b88a 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -436,7 +436,7 @@ in useEmbeddedBitmaps = mkOption { type = types.bool; default = false; - description = ''Use embedded bitmaps in fonts like Calibri.''; + description = "Use embedded bitmaps in fonts like Calibri."; }; }; diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index feb76581a72..991b449d80b 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -84,7 +84,7 @@ with lib; environment.etc."locale.conf".source = pkgs.writeText "locale.conf" '' LANG=${config.i18n.defaultLocale} - ${concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${v}'') config.i18n.extraLocaleSettings)} + ${concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${v}") config.i18n.extraLocaleSettings)} ''; }; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index ef747774b25..dba8977e482 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -195,8 +195,7 @@ in ''; # /etc/netgroup: Network-wide groups. - netgroup.text = mkDefault '' - ''; + netgroup.text = mkDefault ""; # /etc/host.conf: resolver configuration file "host.conf".text = '' diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index a77524d75d8..c0e90a8c26e 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -183,7 +183,7 @@ in { config = mkOption { type = types.attrsOf types.unspecified; default = {}; - description = ''Config of the pulse daemon. See man pulse-daemon.conf.''; + description = "Config of the pulse daemon. See man pulse-daemon.conf."; example = literalExample ''{ realtime-scheduling = "yes"; }''; }; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index e90a7d567d4..5b3e9a8ceb7 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -364,7 +364,7 @@ let count = mkOption { type = types.int; default = 1; - description = ''Count of subordinate user ids''; + description = "Count of subordinate user ids"; }; }; }; @@ -381,7 +381,7 @@ let count = mkOption { type = types.int; default = 1; - description = ''Count of subordinate group ids''; + description = "Count of subordinate group ids"; }; }; }; diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 2278c7b4061..b6af4f80445 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -40,7 +40,7 @@ in default = "wheel"; example = "video"; type = types.str; - description = ''Group for bumblebee socket''; + description = "Group for bumblebee socket"; }; connectDisplay = mkOption { diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 426281c9412..1d2bc8c7281 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -215,7 +215,7 @@ in { '' else '' exec ${cfg.locate}/bin/updatedb \ - ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ + ${optionalString (cfg.localuser != null && ! isMLocate) "--localuser=${cfg.localuser}"} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; environment = optionalAttrs (!isMLocate) { diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 25ac94b8e0f..8160bfef4a3 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -73,7 +73,7 @@ in } ''; type = pkgsType; - example = literalExample ''import {}''; + example = literalExample "import {}"; description = '' If set, the pkgs argument to all NixOS modules is the value of this option, extended with nixpkgs.overlays, if diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 26db1675072..4d59ea8d0fd 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -27,14 +27,14 @@ in # the options below are the same as in "captive-browser.toml" browser = mkOption { type = types.str; - default = concatStringsSep " " [ ''${pkgs.chromium}/bin/chromium'' - ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' + default = concatStringsSep " " [ "${pkgs.chromium}/bin/chromium" + "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" ''--proxy-server="socks5://$PROXY"'' ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' - ''--no-first-run'' - ''--new-window'' - ''--incognito'' - ''http://cache.nixos.org/'' + "--no-first-run" + "--new-window" + "--incognito" + "http://cache.nixos.org/" ]; description = '' The shell (/bin/sh) command executed once the proxy starts. @@ -62,7 +62,7 @@ in socks5-addr = mkOption { type = types.str; default = "localhost:1666"; - description = ''the listen address for the SOCKS5 proxy server''; + description = "the listen address for the SOCKS5 proxy server"; }; bindInterface = mkOption { diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 40af4d0ff5a..d4a7769bbd6 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -36,7 +36,7 @@ in askPassword = mkOption { type = types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; - description = ''Program used by SSH to ask for passwords.''; + description = "Program used by SSH to ask for passwords."; }; forwardX11 = mkOption { diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix index 83ed7138640..ceb7259b3d7 100644 --- a/nixos/modules/programs/xss-lock.nix +++ b/nixos/modules/programs/xss-lock.nix @@ -11,7 +11,7 @@ in lockerCommand = mkOption { default = "${pkgs.i3lock}/bin/i3lock"; - example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy''; + example = literalExample "\${pkgs.i3lock-fancy}/bin/i3lock-fancy"; type = types.separatedString " "; description = "Locker to be used with xsslock"; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 2e5953dc6f4..9f01e29dd0e 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -74,7 +74,7 @@ in { musicDirectory = mkOption { type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; - defaultText = ''''${dataDir}/music''; + defaultText = "\${dataDir}/music"; description = '' The directory or NFS/SMB network share where MPD reads music from. If left as the default value this directory will automatically be created before @@ -86,7 +86,7 @@ in { playlistDirectory = mkOption { type = types.path; default = "${cfg.dataDir}/playlists"; - defaultText = ''''${dataDir}/playlists''; + defaultText = "\${dataDir}/playlists"; description = '' The directory where MPD stores playlists. If left as the default value this directory will automatically be created before the MPD server starts, @@ -155,7 +155,7 @@ in { dbFile = mkOption { type = types.nullOr types.str; default = "${cfg.dataDir}/tag_cache"; - defaultText = ''''${dataDir}/tag_cache''; + defaultText = "\${dataDir}/tag_cache"; description = '' The path to MPD's database. If set to null the parameter is omitted from the configuration. diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 3d69a69038a..b485602aab8 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -190,8 +190,7 @@ let }; devices = mkOption { - description = '' - ''; + description = ""; }; extraAutochangerConfig = mkOption { diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index d31b92abde0..8187042b4b8 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -354,7 +354,7 @@ in script = let tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"''; - lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)''; + lastArchive = "$(${tarsnap} --list-archives | sort | tail -1)"; run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}''; in if (cfg.cachedir != null) then '' diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index bfb73f68371..171d4aced65 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -50,8 +50,7 @@ with lib; default = pkgs.hadoop; defaultText = "pkgs.hadoop"; example = literalExample "pkgs.hadoop"; - description = '' - ''; + description = ""; }; }; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 302f058926c..7363441e538 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -14,8 +14,8 @@ let ClusterName=${cfg.clusterName} StateSaveLocation=${cfg.stateSaveLocation} SlurmUser=${cfg.user} - ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} - ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} + ${optionalString (cfg.controlMachine != null) "controlMachine=${cfg.controlMachine}"} + ${optionalString (cfg.controlAddr != null) "controlAddr=${cfg.controlAddr}"} ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)} ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)} PlugStackConfig=${plugStackConfig}/plugstack.conf @@ -25,7 +25,7 @@ let plugStackConfig = pkgs.writeTextDir "plugstack.conf" '' - ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''} + ${optionalString cfg.enableSrunX11 "optional ${pkgs.slurm-spank-x11}/lib/x11.so"} ${cfg.extraPlugstackConfig} ''; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index f385331e878..c99a7529213 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -16,8 +16,7 @@ let [admins] ${cfg.adminUser} = ${cfg.adminPass} '' else - '' - '') + (if useVersion2 then + "") + (if useVersion2 then '' [chttpd] '' else diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 36dbb87f730..ed47f647edd 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -117,7 +117,7 @@ in serviceConfig.User = cfg.user; serviceConfig.LogsDirectory = "firebird"; serviceConfig.LogsDirectoryMode = "0700"; - serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d''; + serviceConfig.ExecStart = "${firebird}/bin/fbserver -d"; # TODO think about shutdown }; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 09b453e7584..53760bb24c4 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -16,14 +16,14 @@ let ''} dbms.ssl.policy.${name}.client_auth=${conf.clientAuth} ${if length (splitString "/" conf.privateKey) > 1 then - ''dbms.ssl.policy.${name}.private_key=${conf.privateKey}'' + "dbms.ssl.policy.${name}.private_key=${conf.privateKey}" else - ''dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}'' + "dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}" } ${if length (splitString "/" conf.privateKey) > 1 then - ''dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}'' + "dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}" else - ''dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}'' + "dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}" } dbms.ssl.policy.${name}.revoked_dir=${conf.revokedDir} dbms.ssl.policy.${name}.tls_versions=${concatStringsSep "," conf.tlsVersions} diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix index 226718a9e80..c1180a8bbdd 100644 --- a/nixos/modules/services/development/bloop.nix +++ b/nixos/modules/services/development/bloop.nix @@ -44,7 +44,7 @@ in { }; serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.bloop}/bin/bloop server''; + ExecStart = "${pkgs.bloop}/bin/bloop server"; Restart = "always"; }; }; diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 8b997ccbf66..10d868b7f16 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -141,14 +141,14 @@ in { install -o ${cfg.user} -g ${cfg.group} -m 0600 /dev/null /var/lib/infinoted/infinoted.conf cat >>/var/lib/infinoted/infinoted.conf <oa_ded''; + description = "Extra flags to pass to oa_ded"; example = [ "+set dedicated 2" "+set sv_hostname 'My NixOS OpenArena Server'" diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index bf92425f998..a4fc315d080 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -100,7 +100,7 @@ in inputConfig = mkOption { type = types.lines; - default = ''generator { }''; + default = "generator { }"; description = "Logstash input configuration."; example = '' # Read from journal @@ -131,7 +131,7 @@ in outputConfig = mkOption { type = types.lines; - default = ''stdout { codec => rubydebug }''; + default = "stdout { codec => rubydebug }"; description = "Logstash output configuration."; example = '' redis { host => ["localhost"] data_type => "list" key => "logstash" codec => json } diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 709f6b21aa0..7c206e3725e 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -163,7 +163,7 @@ in { systemd.services.postgrey = let bind-flag = if cfg.socket ? path then - ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}'' + "--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}" else ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}''; in { diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index fa9c8c54509..b80a4746fd1 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -120,7 +120,7 @@ in wantedBy = [ "multi-user.target" ]; environment = { - LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib''; + LD_LIBRARY_PATH = "/run/opengl-driver/lib:/run/opengl-driver-32/lib"; DISPLAY = ":${toString config.services.xserver.display}"; GPU_MAX_ALLOC_PERCENT = "100"; GPU_USE_SYNC_OBJECTS = "1"; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index d175854d2d1..6e796a3a1fc 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -27,7 +27,7 @@ in default = with pkgs.dictdDBs; [ wiktionary wordnet ]; defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]"; example = literalExample "[ pkgs.dictdDBs.nld2eng ]"; - description = ''List of databases to make available.''; + description = "List of databases to make available."; }; }; diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index f8c79f892da..28c98edf47a 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -185,7 +185,7 @@ in }; zkExtraCfg = mkOption { type = types.str; - default = ''initLimit=5&syncLimit=2&tickTime=2000''; + default = "initLimit=5&syncLimit=2&tickTime=2000"; description = '' Extra options to pass into Zookeeper ''; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 2735185ec88..434e2d2429b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -597,8 +597,7 @@ in users.groups.gitea = {}; warnings = - optional (cfg.database.password != "") '' - config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead.'' ++ + optional (cfg.database.password != "") "config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead." ++ optional (cfg.extraConfig != null) '' services.gitea.`extraConfig` is deprecated, please use services.gitea.`settings`. ''; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 3abb9b7d69c..8e3fa60206c 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -504,8 +504,7 @@ in { report_stats = mkOption { type = types.bool; default = false; - description = '' - ''; + description = ""; }; servers = mkOption { type = types.attrsOf (types.attrsOf types.str); diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 75218aa1d46..1dccbc93edf 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -104,7 +104,7 @@ in hooks = mkOption { default = {}; example = { - doshutdown = ''# shell commands to notify that the computer is shutting down''; + doshutdown = "# shell commands to notify that the computer is shutting down"; }; type = types.attrsOf types.lines; description = '' diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 64d9d61950d..9213748d3c9 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -25,10 +25,10 @@ let graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' search_index: ${dataDir}/index - ${optionalString (config.time.timeZone != null) ''time_zone: ${config.time.timeZone}''} - ${optionalString (cfg.api.finders != []) ''finders:''} + ${optionalString (config.time.timeZone != null) "time_zone: ${config.time.timeZone}"} + ${optionalString (cfg.api.finders != []) "finders:"} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} - ${optionalString (cfg.api.functions != []) ''functions:''} + ${optionalString (cfg.api.functions != []) "functions:"} ${concatMapStringsSep "\n" (f: " - " + f) cfg.api.functions} ${cfg.api.extraConfig} ''; diff --git a/nixos/modules/services/monitoring/incron.nix b/nixos/modules/services/monitoring/incron.nix index 1789fd9f205..dc97af58562 100644 --- a/nixos/modules/services/monitoring/incron.nix +++ b/nixos/modules/services/monitoring/incron.nix @@ -67,7 +67,7 @@ in config = mkIf cfg.enable { warnings = optional (cfg.allow != null && cfg.deny != null) - ''If `services.incron.allow` is set then `services.incron.deny` will be ignored.''; + "If `services.incron.allow` is set then `services.incron.deny` will be ignored."; environment.systemPackages = [ pkgs.incron ]; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index 97210463027..a3b2b92bc34 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -20,7 +20,7 @@ in port = mkOption { type = types.int; default = 25826; - description = ''Network address on which to accept collectd binary network packets.''; + description = "Network address on which to accept collectd binary network packets."; }; listenAddress = mkOption { diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index b341a9005c2..bc30ca3b77c 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -69,7 +69,7 @@ in { umask 077 ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /var/run/telegraf/config.toml ''); - ExecStart=''${cfg.package}/bin/telegraf -config ${finalConfigFile}''; + ExecStart="${cfg.package}/bin/telegraf -config ${finalConfigFile}"; ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; RuntimeDirectory = "telegraf"; User = "telegraf"; diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 52dab28cf72..474ea4b2505 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -12,7 +12,7 @@ let }; optionToArgs = opt: v : optional (v != null) ''--${opt}="${toString v}"''; - flagToArgs = opt: v : optional v ''--${opt}''; + flagToArgs = opt: v : optional v "--${opt}"; listToArgs = opt: vs : map (v: ''--${opt}="${v}"'') vs; attrsToArgs = opt: kvs: mapAttrsToList (k: v: ''--${opt}=${k}=\"${v}\"'') kvs; @@ -67,7 +67,7 @@ let preferLocalBuild = true; json = builtins.toFile "${name}.json" (builtins.toJSON attrs); nativeBuildInputs = [ pkgs.remarshal ]; - } ''json2yaml -i $json -o $out''; + } "json2yaml -i $json -o $out"; thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" + (let args = cfg.${cmd}.arguments; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index a45e806d4ad..ae5097c5442 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -205,7 +205,7 @@ in after = [ "upsd.service" ]; wantedBy = [ "multi-user.target" ]; # TODO: replace 'root' by another username. - script = ''${pkgs.nut}/bin/upsdrvctl -u root start''; + script = "${pkgs.nut}/bin/upsdrvctl -u root start"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index f2dc740fd88..632c3fb1059 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -48,7 +48,7 @@ let ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \ -f --cluster ${clusterName} --id ${daemonId}''; } // optionalAttrs (daemonType == "osd") { - ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}''; + ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; RestartSec = "20s"; PrivateDevices = "no"; # osd needs disk access } // optionalAttrs ( daemonType == "mon") { @@ -353,7 +353,7 @@ in ]; warnings = optional (cfg.global.monInitialMembers == null) - ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function''; + "Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function"; environment.etc."ceph/ceph.conf".text = let # Merge the extraConfig set for mgr daemons, as mgr don't have their own section diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index c843d892193..39320643dd5 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -25,7 +25,7 @@ in dataDir = mkOption { type = types.str; - default = ''/home/${user}/''; + default = "/home/${user}/"; description = '' The directory holding configuration, incoming and temporary files. ''; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 5b5068e43d7..c8e08fdefaa 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -42,13 +42,13 @@ in }; domain = mkOption { - description = ''Proxy account domain/workgroup name.''; + description = "Proxy account domain/workgroup name."; }; password = mkOption { default = "/etc/cntlm.password"; type = types.str; - description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.''; + description = "Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security."; }; netbios_hostname = mkOption { diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 6ccc2dffb26..11f66b05df1 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -42,8 +42,7 @@ in { extraConfig = mkOption { type = types.lines; - default = '' - ''; + default = ""; description = '' Configuration lines appended to the generated connman configuration file. ''; diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix index 05c2bdef83e..3584915d0aa 100644 --- a/nixos/modules/services/networking/dnsdist.nix +++ b/nixos/modules/services/networking/dnsdist.nix @@ -26,8 +26,7 @@ in { extraConfig = mkOption { type = types.lines; - default = '' - ''; + default = ""; description = '' Extra lines to be added verbatim to dnsdist.conf. ''; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 56f2ba21a12..3e3a3c1aa94 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -10,12 +10,12 @@ options = { pidDir = mkOption { default = "/run/gateone"; type = types.path; - description = ''Path of pid files for GateOne.''; + description = "Path of pid files for GateOne."; }; settingsDir = mkOption { default = "/var/lib/gateone"; type = types.path; - description = ''Path of configuration files for GateOne.''; + description = "Path of configuration files for GateOne."; }; }; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 5d73038363a..e9569b2ba6b 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -20,8 +20,8 @@ let ssid=${cfg.ssid} hw_mode=${cfg.hwMode} channel=${toString cfg.channel} - ${optionalString (cfg.countryCode != null) ''country_code=${cfg.countryCode}''} - ${optionalString (cfg.countryCode != null) ''ieee80211d=1''} + ${optionalString (cfg.countryCode != null) "country_code=${cfg.countryCode}"} + ${optionalString (cfg.countryCode != null) "ieee80211d=1"} # logging (debug level) logger_syslog=-1 diff --git a/nixos/modules/services/networking/hylafax/modem-default.nix b/nixos/modules/services/networking/hylafax/modem-default.nix index 7529b5b0aaf..707b8209282 100644 --- a/nixos/modules/services/networking/hylafax/modem-default.nix +++ b/nixos/modules/services/networking/hylafax/modem-default.nix @@ -5,7 +5,7 @@ { TagLineFont = "etc/LiberationSans-25.pcf"; - TagLineLocale = ''en_US.UTF-8''; + TagLineLocale = "en_US.UTF-8"; AdminGroup = "root"; # groups that can change server config AnswerRotary = "fax"; # don't accept anything else but faxes @@ -16,7 +16,7 @@ SessionTracing = "0x78701"; UUCPLockDir = "/var/lock"; - SendPageCmd = ''${pkgs.coreutils}/bin/false''; # prevent pager transmit - SendUUCPCmd = ''${pkgs.coreutils}/bin/false''; # prevent UUCP transmit + SendPageCmd = "${pkgs.coreutils}/bin/false"; # prevent pager transmit + SendUUCPCmd = "${pkgs.coreutils}/bin/false"; # prevent UUCP transmit } diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 9e28d09dffc..7f18c0d39ab 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -85,8 +85,8 @@ let # Otherwise, we use `false` to provoke # an error if hylafax tries to use it. c.sendmailPath = mkMerge [ - (mkIfDefault noWrapper ''${pkgs.coreutils}/bin/false'') - (mkIfDefault (!noWrapper) ''${wrapperDir}/${program}'') + (mkIfDefault noWrapper "${pkgs.coreutils}/bin/false") + (mkIfDefault (!noWrapper) "${wrapperDir}/${program}") ]; importDefaultConfig = file: lib.attrsets.mapAttrs @@ -121,7 +121,7 @@ in options.services.hylafax = { - enable = mkEnableOption ''HylaFAX server''; + enable = mkEnableOption "HylaFAX server"; autostart = mkOption { type = bool; @@ -139,28 +139,28 @@ in type = nullOr str1; default = null; example = "49"; - description = ''Country code for server and all modems.''; + description = "Country code for server and all modems."; }; areaCode = mkOption { type = nullOr str1; default = null; example = "30"; - description = ''Area code for server and all modems.''; + description = "Area code for server and all modems."; }; longDistancePrefix = mkOption { type = nullOr str; default = null; example = "0"; - description = ''Long distance prefix for server and all modems.''; + description = "Long distance prefix for server and all modems."; }; internationalPrefix = mkOption { type = nullOr str; default = null; example = "00"; - description = ''International prefix for server and all modems.''; + description = "International prefix for server and all modems."; }; spoolAreaPath = mkOption { @@ -267,7 +267,7 @@ in spoolExtraInit = mkOption { type = lines; default = ""; - example = ''chmod 0755 . # everyone may read my faxes''; + example = "chmod 0755 . # everyone may read my faxes"; description = '' Additional shell code that is executed within the spooling area directory right after its setup. @@ -345,7 +345,7 @@ in faxqclean.doneqMinutes = mkOption { type = int1; default = 15; - example = literalExample ''24*60''; + example = literalExample "24*60"; description = '' Set the job age threshold (in minutes) that controls how long @@ -355,7 +355,7 @@ in faxqclean.docqMinutes = mkOption { type = int1; default = 60; - example = literalExample ''24*60''; + example = literalExample "24*60"; description = '' Set the document age threshold (in minutes) that controls how long diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index b9b9b9dca4f..f63f7c97ad1 100644 --- a/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -16,12 +16,12 @@ let mkLines = conf: (lib.concatLists (lib.flip lib.mapAttrsToList conf - (k: map (v: ''${k}: ${v}'') + (k: map (v: "${k}: ${v}") ))); include = mkLines { Include = conf.Include or []; }; other = mkLines ( conf // { Include = []; } ); in - pkgs.writeText ''hylafax-config${name}'' + pkgs.writeText "hylafax-config${name}" (concatStringsSep "\n" (include ++ other)); globalConfigPath = mkConfigFile "" cfg.faxqConfig; @@ -29,7 +29,7 @@ let modemConfigPath = let mkModemConfigFile = { config, name, ... }: - mkConfigFile ''.${name}'' + mkConfigFile ".${name}" (cfg.commonModemConfig // config); mkLine = { name, type, ... }@modem: '' # check if modem config file exists: @@ -81,7 +81,7 @@ let description = "HylaFAX queue manager sendq watch"; documentation = [ "man:faxq(8)" "man:sendq(5)" ]; wantedBy = [ "multi-user.target" ]; - pathConfig.PathExistsGlob = [ ''${cfg.spoolAreaPath}/sendq/q*'' ]; + pathConfig.PathExistsGlob = [ "${cfg.spoolAreaPath}/sendq/q*" ]; }; timers = mkMerge [ @@ -134,7 +134,7 @@ let exit 1 fi ''; - serviceConfig.ExecStop = ''${setupSpoolScript}''; + serviceConfig.ExecStop = "${setupSpoolScript}"; serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ]; @@ -145,7 +145,7 @@ let documentation = [ "man:faxq(8)" ]; requires = [ "hylafax-spool.service" ]; after = [ "hylafax-spool.service" ]; - wants = mapModems ( { name, ... }: ''hylafax-faxgetty@${name}.service'' ); + wants = mapModems ( { name, ... }: "hylafax-faxgetty@${name}.service" ); wantedBy = mkIf cfg.autostart [ "multi-user.target" ]; serviceConfig.Type = "forking"; serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/faxq -q "${cfg.spoolAreaPath}"''; @@ -155,7 +155,7 @@ let # stopped will always yield a failed send attempt: # The fax service is started when the job is created with # `sendfax`, but modems need some time to initialize. - serviceConfig.ExecStartPost = [ ''${waitFaxqScript}'' ]; + serviceConfig.ExecStartPost = [ "${waitFaxqScript}" ]; # faxquit fails if the pipe is already gone # (e.g. the service is already stopping) serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}"''; @@ -186,7 +186,7 @@ let wantedBy = mkIf cfg.faxcron.enable.spoolInit requires; startAt = mkIf (cfg.faxcron.enable.frequency!=null) cfg.faxcron.enable.frequency; serviceConfig.ExecStart = concatStringsSep " " [ - ''${pkgs.hylafaxplus}/spool/bin/faxcron'' + "${pkgs.hylafaxplus}/spool/bin/faxcron" ''-q "${cfg.spoolAreaPath}"'' ''-info ${toString cfg.faxcron.infoDays}'' ''-log ${toString cfg.faxcron.logDays}'' @@ -202,18 +202,18 @@ let wantedBy = mkIf cfg.faxqclean.enable.spoolInit requires; startAt = mkIf (cfg.faxqclean.enable.frequency!=null) cfg.faxqclean.enable.frequency; serviceConfig.ExecStart = concatStringsSep " " [ - ''${pkgs.hylafaxplus}/spool/bin/faxqclean'' + "${pkgs.hylafaxplus}/spool/bin/faxqclean" ''-q "${cfg.spoolAreaPath}"'' - ''-v'' - (optionalString (cfg.faxqclean.archiving!="never") ''-a'') - (optionalString (cfg.faxqclean.archiving=="always") ''-A'') + "-v" + (optionalString (cfg.faxqclean.archiving!="never") "-a") + (optionalString (cfg.faxqclean.archiving=="always") "-A") ''-j ${toString (cfg.faxqclean.doneqMinutes*60)}'' ''-d ${toString (cfg.faxqclean.docqMinutes*60)}'' ]; }; mkFaxgettyService = { name, ... }: - lib.nameValuePair ''hylafax-faxgetty@${name}'' rec { + lib.nameValuePair "hylafax-faxgetty@${name}" rec { description = "HylaFAX faxgetty for %I"; documentation = [ "man:faxgetty(8)" ]; bindsTo = [ "dev-%i.device" ]; @@ -221,7 +221,7 @@ let after = bindsTo ++ requires; before = [ "hylafax-faxq.service" "getty.target" ]; unitConfig.StopWhenUnneeded = true; - unitConfig.AssertFileNotEmpty = ''${cfg.spoolAreaPath}/etc/config.%I''; + unitConfig.AssertFileNotEmpty = "${cfg.spoolAreaPath}/etc/config.%I"; serviceConfig.UtmpIdentifier = "%I"; serviceConfig.TTYPath = "/dev/%I"; serviceConfig.Restart = "always"; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 553415a2f32..6fedb0a270f 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -17,37 +17,37 @@ in enable = mkOption { default = false; type = types.bool; - description = ''Enable the kippo honeypot ssh server.''; + description = "Enable the kippo honeypot ssh server."; }; port = mkOption { default = 2222; type = types.int; - description = ''TCP port number for kippo to bind to.''; + description = "TCP port number for kippo to bind to."; }; hostname = mkOption { default = "nas3"; type = types.str; - description = ''Hostname for kippo to present to SSH login''; + description = "Hostname for kippo to present to SSH login"; }; varPath = mkOption { default = "/var/lib/kippo"; type = types.path; - description = ''Path of read/write files needed for operation and configuration.''; + description = "Path of read/write files needed for operation and configuration."; }; logPath = mkOption { default = "/var/log/kippo"; type = types.path; - description = ''Path of log files needed for operation and configuration.''; + description = "Path of log files needed for operation and configuration."; }; pidPath = mkOption { default = "/run/kippo"; type = types.path; - description = ''Path of pid files needed for operation.''; + description = "Path of pid files needed for operation."; }; extraConfig = mkOption { default = ""; type = types.lines; - description = ''Extra verbatim configuration added to the end of kippo.cfg.''; + description = "Extra verbatim configuration added to the end of kippo.cfg."; }; }; diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix index 637ed618b89..baf64347b09 100644 --- a/nixos/modules/services/networking/owamp.nix +++ b/nixos/modules/services/networking/owamp.nix @@ -10,7 +10,7 @@ in ###### interface options = { - services.owamp.enable = mkEnableOption ''Enable OWAMP server''; + services.owamp.enable = mkEnableOption "Enable OWAMP server"; }; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index da723ec86ad..2958fb9a8b3 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -61,7 +61,7 @@ in }; dataDir = mkOption { - default = ''/home/${user}/.config/quassel-irc.org''; + default = "/home/${user}/.config/quassel-irc.org"; description = '' The directory holding configuration files, the SQlite database and the SSL Cert. ''; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 37ee2a80389..0747ff6dd5a 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -303,7 +303,7 @@ in ${cfg.package}/bin/smokeping --check --config=${configPath} ${cfg.package}/bin/smokeping --static --config=${configPath} ''; - script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon''; + script = "${cfg.package}/bin/smokeping --config=${configPath} --nodaemon"; }; systemd.services.thttpd = mkIf cfg.webService { wantedBy = [ "multi-user.target"]; diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index 41d0584080e..e46d62bf1e8 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -56,25 +56,25 @@ in syslog = mkOption { type = types.bool; default = true; - description = ''Whether to enable syslog output.''; + description = "Whether to enable syslog output."; }; passwordAuthentication = mkOption { type = types.bool; default = true; - description = ''Whether to enable password authentication.''; + description = "Whether to enable password authentication."; }; publicKeyAuthentication = mkOption { type = types.bool; default = true; - description = ''Whether to enable public key authentication.''; + description = "Whether to enable public key authentication."; }; rootLogin = mkOption { type = types.bool; default = false; - description = ''Whether to enable remote root login.''; + description = "Whether to enable remote root login."; }; loginShell = mkOption { @@ -96,13 +96,13 @@ in tcpForwarding = mkOption { type = types.bool; default = true; - description = ''Whether to enable TCP/IP forwarding.''; + description = "Whether to enable TCP/IP forwarding."; }; x11Forwarding = mkOption { type = types.bool; default = true; - description = ''Whether to enable X11 forwarding.''; + description = "Whether to enable X11 forwarding."; }; subsystems = mkOption { diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 1d1e0bd1ca1..8ae62931a8f 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -1273,7 +1273,7 @@ in { provided the user is prompted during an interactive --load-creds call. ''; - } ''Definition for a private key that's stored on a token/smartcard/TPM.''; + } "Definition for a private key that's stored on a token/smartcard/TPM."; }; diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 7a62e04ec7c..864c3319c54 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -70,7 +70,7 @@ in value must be a function which receives the attrset defined in python3Packages as the sole argument. ''; - example = literalExample ''p: [ p.lxml p.requests ]''; + example = literalExample "p: [ p.lxml p.requests ]"; }; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 39513987903..61482596763 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -14,8 +14,8 @@ let then ''"${psk}"'' else pskRaw; baseAuth = if key != null - then ''psk=${key}'' - else ''key_mgmt=NONE''; + then "psk=${key}" + else "key_mgmt=NONE"; in '' network={ ssid="${ssid}" diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 71fd71a2cab..4cdb3a041b5 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -173,7 +173,7 @@ in serviceConfig = { Type = "simple"; - ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}''; + ExecStart = "${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}"; Restart = "on-failure"; StateDirectory = [ diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 3518e0ee9dc..f83db30c1f0 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -98,7 +98,7 @@ in - final-message - power-state-change ''; - description = ''cloud-init configuration.''; + description = "cloud-init configuration."; }; }; diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d9ebb3a9880..9567223ebc7 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -336,7 +336,7 @@ in locations."/" = { priority = 1; index = "doku.php"; - extraConfig = ''try_files $uri $uri/ @dokuwiki;''; + extraConfig = "try_files $uri $uri/ @dokuwiki;"; }; locations."@dokuwiki" = { diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index bbb0c8d0483..a93e9327933 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -565,7 +565,7 @@ in assertions = [ { assertion = (cfg.databaseUseSSL && cfg.databaseType == "postgresql") -> (cfg.databaseCaCert != null); - message = ''A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL''; + message = "A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL"; } ]; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 8887136ea5e..ad1e55d62d1 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -84,7 +84,7 @@ in type = mkOption { type = types.enum [ "mysql" "pgsql" ]; default = "mysql"; - description = ''Database engine to use.''; + description = "Database engine to use."; }; host = mkOption { diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 7a3df26e47a..d1cb8a8dc25 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -193,7 +193,7 @@ in configText = mkOption { default = ""; type = types.lines; - example = ''...verbatim config file contents...''; + example = "...verbatim config file contents..."; description = '' Overridable config file contents to use for lighttpd. By default, use the contents automatically generated by NixOS. diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index db22dd36cbe..061f2967350 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -60,8 +60,7 @@ in version = mkOption { default = 2; type = types.enum [ 0 1 2 3 4 ]; - description = '' - ''; + description = ""; }; uboot = { diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 9638a7cb3e5..16ba0b74678 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -662,7 +662,7 @@ in # - HDDs are mixed with SSDs # - There is a SSDs in a pool that is currently trimmed. # - There are only HDDs and we would set the system in a degraded state - serviceConfig.ExecStart = ''${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' ''; + serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' "; }; systemd.timers.zpool-trim.timerConfig.Persistent = "yes"; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 757d73421b8..7bec1b1ff26 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -170,7 +170,7 @@ let ${concatStringsSep "\n" ( mapAttrsToList (name: cfg: - ''ip link del dev ${name} 2> /dev/null || true '' + "ip link del dev ${name} 2> /dev/null || true " ) cfg.extraVeths )} ''; @@ -185,7 +185,7 @@ let fi '' else - ''${ipcmd} add ${cfg.${attribute}} dev $ifaceHost''; + "${ipcmd} add ${cfg.${attribute}} dev $ifaceHost"; renderExtraVeth = name: cfg: if cfg.hostBridge != null then '' diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 447d1f091c8..bf3615f2fe7 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -136,10 +136,8 @@ let cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS" || exit 1 chmod 0644 "$NIX_EFI_VARS" || exit 1 fi - '' else '' - ''} - '' else '' - ''} + '' else ""} + '' else ""} cd $TMPDIR idx=0 @@ -187,8 +185,7 @@ let efiVars=$out/efi-vars.fd cp ${efiVarsDefault} $efiVars chmod 0644 $efiVars - '' else '' - ''} + '' else ""} ''; buildInputs = [ pkgs.util-linux ]; QEMU_OPTS = "-nographic -serial stdio -monitor none" diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix index 10464f62898..b603effef6e 100644 --- a/nixos/modules/virtualisation/railcar.nix +++ b/nixos/modules/virtualisation/railcar.nix @@ -105,7 +105,7 @@ in stateDir = mkOption { type = types.path; - default = ''/var/railcar''; + default = "/var/railcar"; description = "Railcar persistent state directory"; }; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 6dc57cae0d6..a25c522e12f 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "ETC_PATH=$(out)/etc" ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 233961ad111..777ac79a22d 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 2dd9174d6dd..cc39da90c23 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { --replace sample-projects $out/share/${pname}/sample-projects ''; - buildPhase = ''''; + buildPhase = ""; installPhase = '' mkdir -p $out/share/${pname} diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 97e8378d94e..00d0259a7a9 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -122,7 +122,7 @@ mkDerivation rec { mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; }; - qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ]; + qtWrapperArgs = [ "--suffix PATH : ${gnumake}/bin" ]; postInstall = '' mkdir $out/share diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e611e486288..734b189d1e4 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -137,8 +137,7 @@ in stdenv.mkDerivation rec { ++ lib.optional tclSupport tcl ++ lib.optional rubySupport ruby; - preConfigure = '' - '' + lib.optionalString ftNixSupport '' + preConfigure = "" + lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 0a611515b0d..0459d1d04ac 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpthread"; - postPatch = ''patchShebangs version.sh''; + postPatch = "patchShebangs version.sh"; postInstall = '' wrapProgram $out/bin/ahoviewer \ diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 2c9430ded73..1ea21506e31 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ]; + qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index 384ddac5b4c..0800ee0c437 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { sourceRoot = "${src.name}/mandelbulber2"; qmakeFlags = [ - "SHARED_PATH=${placeholder ''out''}" + "SHARED_PATH=${placeholder "out"}" (if withOpenCL then "qmake/mandelbulber-opencl.pro" else "qmake/mandelbulber.pro") diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index c3dd9f548d2..8b6e581ae0b 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -56,9 +56,9 @@ buildDotnetPackage rec { ''; makeWrapperArgs = [ - ''--prefix MONO_GAC_PREFIX : ${gtksharp}'' - ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib'' - ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib'' + "--prefix MONO_GAC_PREFIX : ${gtksharp}" + "--prefix LD_LIBRARY_PATH : ${gtksharp}/lib" + "--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib" ]; postInstall = '' diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 31da1e8d495..89686e50d17 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { # prevent double wrapping from wrapGApps and wrapPythonProgram dontWrapGApps = true; makeWrapperArgs = [ - ''''${gappsWrapperArgs[@]}'' + "\${gappsWrapperArgs[@]}" ]; strictDeps = false; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index ea78924574f..4771cebc341 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -94,7 +94,7 @@ in mkDerivation rec { "format" ]; - qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ]; + qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : $out/lib" ]; postInstall = '' mkdir -p "$out/lib" diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 7a9e2939640..418658fec22 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "NO_VENV=1" ]; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 161005d1280..8865435339c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ - ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \ - ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \ - ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \ - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \ - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \ - ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \ - ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ + ${lib.optionalString gitSupport "--prefix PATH : ${git}/bin "} \ + ${lib.optionalString monotoneSupport "--prefix PATH : ${monotone}/bin "} \ + ${lib.optionalString bazaarSupport "--prefix PATH : ${breezy}/bin "} \ + ${lib.optionalString cvsSupport "--prefix PATH : ${cvs}/bin "} \ + ${lib.optionalString cvsSupport "--prefix PATH : ${cvsps}/bin "} \ + ${lib.optionalString subversionSupport "--prefix PATH : ${subversion.out}/bin "} \ + ${lib.optionalString mercurialSupport "--prefix PATH : ${mercurial}/bin "} \ ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \ ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index b3a68cffeff..cb8494e1c48 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -101,7 +101,7 @@ in buildPythonApplication rec { dontWrapGApps = true; makeWrapperArgs = [ "--prefix PATH : ${binPath}" - ''''${gappsWrapperArgs[@]}'' + "\${gappsWrapperArgs[@]}" ]; # needed for glib-schemas to work correctly (will crash on dialogues otherwise) # see https://github.com/NixOS/nixpkgs/issues/56943 diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 858a8fa1475..4f2af99ab14 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { makeFlags = [ "GIT_VERSION=${version}" "GIT_TIMESTAMP=" - "SHAREDIR=${placeholder ''out''}/share/osm2xmap" - "INSTALL_BINDIR=${placeholder ''out''}/bin" - "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1" + "SHAREDIR=${placeholder "out"}/share/osm2xmap" + "INSTALL_BINDIR=${placeholder "out"}/bin" + "INSTALL_MANDIR=${placeholder "out"}/share/man/man1" ]; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index d9feb28c037..57ec820a090 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; patches = [ ./cmake.patch ]; - postPatch = '' rm build ''; + postPatch = "rm build "; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 77a7dcca747..e3a8e682577 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" "LIBRE_SO=${libre}/lib" "LIBREM_PATH=${librem}" - ''PREFIX=$(out)'' + "PREFIX=$(out)" "USE_VIDEO=1" "CCACHE_DISABLE=1" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 137ad4d49b0..5fa5c2a2864 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ ant jdk ]; - buildPhase = ''ant make''; + buildPhase = "ant make"; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 24369bfc8d5..c357e78ccf2 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://software.internet2.edu/owamp/"; - description = ''A tool for performing one-way active measurements''; + description = "A tool for performing one-way active measurements"; platforms = platforms.linux; maintainers = [maintainers.teto]; license = licenses.asl20; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index dc828b58825..7441cdf4eef 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -28,7 +28,7 @@ mkDerivation { installTargets = [ "install_client" "install_man" ]; - qtWrapperArgs = [ ''--suffix PATH : ${nx-libs}/bin:${openssh}/libexec'' ]; + qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix index cedc85d53f6..683e6681573 100644 --- a/pkgs/applications/office/docear/default.nix +++ b/pkgs/applications/office/docear/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { # The wrapper ensures oraclejre is used makeWrapper ${runtimeShell} $out/bin/docear \ - --set _JAVA_OPTIONS "${lib.optionalString antialiasFont ''-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on''}" \ + --set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \ --set JAVA_HOME ${oraclejre.home} \ --add-flags "$out/share/docear.sh" diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 0df6070319d..f0237c4cecf 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - preConfigure = ''./autogen.sh''; + preConfigure = "./autogen.sh"; configureFlags = [ "--enable-python" "--enable-python-plugin" diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index a8f96fac44a..a48efb9aa6d 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -241,8 +241,7 @@ let # gr-fcd feature was dropped in 3.8 ++ lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] ; - preConfigure = '' - '' + preConfigure = "" # wxgui and pygtk are not looked up properly, so we force them to be # detected as found, if they are requested by the `features` attrset. + lib.optionalString (hasFeature "gr-wxgui" features) '' diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index e99a1bfd7a1..9223f160db3 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -240,8 +240,7 @@ let ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; - preConfigure = '' - '' + preConfigure = "" # If python-support is disabled, don't install volk's (git submodule) # volk_modtool - it references python. # diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index e30831f87ee..1d5d84f4649 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -83,8 +83,7 @@ rec { ++ lib.optionals (hasFeature "gr-uhd" features) [ "share/gnuradio/examples/uhd" ] ++ lib.optionals (hasFeature "gr-qtgui" features) [ "share/gnuradio/examples/qt-gui" ] ; - postInstall = '' - '' + postInstall = "" # Gcc references + lib.optionalString (hasFeature "volk" features) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 41a2e89f02c..36790b22b22 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -10,7 +10,7 @@ gccStdenv.mkDerivation rec { }; buildInputs = [ zlib mpi ]; - setSourceRoot = ''sourceRoot=$(echo */src)''; + setSourceRoot = "sourceRoot=$(echo */src)"; buildFlags = [ "thread" "mpis" ]; preInstall = "mkdir -p $out/man/man1"; diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index c5220ebc83b..0e273dbefaa 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ cpio ]; meta = { - description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; - longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; + description = "NCBI Bioinformatics toolbox (incl. BLAST)"; + longDescription = "The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support"; homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; license = "GPL"; priority = 5; # zlib.so gives a conflict with zlib diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 7a2dc2782ab..d288edca933 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; - longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; + longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; license = "non-commercial"; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; }; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 1f02d30cf25..ff88586e035 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml eprover zlib ]; - preConfigure = ''patchShebangs .''; + preConfigure = "patchShebangs ."; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index a0897135fbb..593b2c54c5c 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/pkgs/applications/science/logic/lci/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [readline]; meta = { - description = ''Lambda calculus interpreter''; + description = "Lambda calculus interpreter"; maintainers = with lib.maintainers; [raskin]; platforms = with lib.platforms; linux; license = lib.licenses.gpl3; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 02d9408383a..dffb66b2fcf 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''Automated theorem prover for higher-order logic''; + description = "Automated theorem prover for higher-order logic"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 67009657363..c26504bf7bd 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; # Usual shenanigans - patchPhase = ''patchShebangs tests/regress/check.sh''; + patchPhase = "patchShebangs tests/regress/check.sh"; # Includes a fix for the embedded soname being libyices.so.2.5, but # only installing the libyices.so.2.5.x file. diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix index c63fad93f07..bb912742b7c 100644 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { inherit version; inherit (z3.meta) license homepage platforms; - description = ''TPTP wrapper for Z3 prover''; + description = "TPTP wrapper for Z3 prover"; maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index fd657963c39..587568f8c29 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { ''; buildFlags = [ "CC=cc" "CXX=c++" ]; - installFlags = [ ''PREFIX=$(out)'' ]; + installFlags = [ "PREFIX=$(out)" ]; buildInputs = [ gmp mpir cddlib ]; meta = { inherit version; - description = ''A software package for computing Gröbner fans and tropical varieties''; + description = "A software package for computing Gröbner fans and tropical varieties"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 94b7ad266c4..05a7d874d91 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { checkTarget = "checks"; meta = with lib; { inherit version; - description = ''Programs for computing automorphism groups of graphs and digraphs''; + description = "Programs for computing automorphism groups of graphs and digraphs"; license = licenses.asl20; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 823c8abf529..eed1c8e3fd4 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A program to find rational points on hyperelliptic curves''; + description = "A program to find rational points on hyperelliptic curves"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index ca752259797..ed9e64347a8 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = ''A collection of routines for representation theory and combinatorics''; + description = "A collection of routines for representation theory and combinatorics"; license = licenses.isc; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index f90be38ebd1..77a052a4f1d 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var makeFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" ]; preFixup = '' diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 8fce22089e9..12abd98beb4 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -77,8 +77,7 @@ rustPlatform.buildRustPackage { buildInputs = runtimeDeps; - installPhase = '' - '' + lib.optionalString stdenv.isLinux '' + installPhase = "" + lib.optionalString stdenv.isLinux '' for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact install -D $releaseDir/$artifact -t $out/bin diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index f87e3f7cdaf..7423726ac3b 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; meta = { - description = ''A tool to generate CVS patch set information''; + description = "A tool to generate CVS patch set information"; longDescription = '' CVSps is a program for generating `patchset' information from a CVS repository. A patchset in this case is defined as a set of diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index dfffdb08238..89fe6e89f48 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''A collection of tools to work locally with CVS''; + description = "A collection of tools to work locally with CVS"; longDescription = '' cvsq is a collection of tools to work locally with CVS. diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 5c260cc8e6c..d6d55eaa4eb 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''Monotone ancestry visualiser''; + description = "Monotone ancestry visualiser"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index a2aa45a6e06..29676abb755 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -45,7 +45,7 @@ in mkDerivation { let binPath = lib.makeBinPath [ jre_headless ]; in lib.optionals withJava [ - ''--prefix PATH : ${binPath}'' + "--prefix PATH : ${binPath}" ]; installPhase = '' diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index bd8eb26895c..a58c32dc563 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { ./disable-os-detection.patch ]; - setSourceRoot = ''sourceRoot=$(echo */mythtv)''; + setSourceRoot = "sourceRoot=$(echo */mythtv)"; buildInputs = [ freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index e891d4ab5ac..0945c5b3f3f 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SUID_ROOT=" # do not try to setuid - "resdir=${placeholder ''out''}/share/X11" + "resdir=${placeholder "out"}/share/X11" ]; meta = { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ed30c380a2c..e9496247f06 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -55,8 +55,7 @@ rec { }; # Do not remove static from make files as we want a static binary - patchPhase = '' - ''; + patchPhase = ""; NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 3fdda810789..5019ce23282 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation (rec { " (${args.meta.description})"; longDescription = (args.meta.longDescription or "") + "\nIncludes:\n" - + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); + + withXenfiles (name: x: "* ${name}: ${x.meta.description or "(No description)"}."); platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ eelco tstrobel oxij ]; license = lib.licenses.gpl2; diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix index 421d00ad24a..d51cbec8aeb 100644 --- a/pkgs/build-support/skaware/clean-packaging.nix +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -8,7 +8,7 @@ let globWith = lib.concatMapStringsSep "\n"; rmNoise = noiseGlobs: globWith (f: - ''rm -rf ${f}'') noiseGlobs; + "rm -rf ${f}") noiseGlobs; mvDoc = docGlobs: globWith (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') docGlobs; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index 4c00b086e10..f4a0a9600a1 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -20,8 +20,7 @@ in fetchFromGitHub { meta = with lib; { homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; - description = '' - Geometric sans-serif for display purposes by Matt McInerney''; + description = "Geometric sans-serif for display purposes by Matt McInerney"; longDescription = '' Orbitron is a geometric sans-serif typeface intended for display purposes. It features four weights (light, medium, bold, and diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index f86c4799492..e74e51a95dc 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -56,15 +56,15 @@ stdenv.mkDerivation rec { postPatch = let templateSubstitutions = lib.concatStringsSep "; " [ - ''s#Noto Color Emoji#Twitter Color Emoji#'' - ''s#NotoColorEmoji#TwitterColorEmoji#'' + "s#Noto Color Emoji#Twitter Color Emoji#" + "s#NotoColorEmoji#TwitterColorEmoji#" ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#'' - ''s# Version .*# ${version}#'' - ''s#.*is a trademark.*##'' + "s# Version .*# ${version}#" + "s#.*is a trademark.*##" ''s#Google, Inc\.#Twitter, Inc and other contributors#'' - ''s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#'' - ''s#.*is licensed under.*# Creative Commons Attribution 4.0 International#'' - ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' + "s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#" + "s#.*is licensed under.*# Creative Commons Attribution 4.0 International#" + "s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#" ]; in '' ${noto-fonts-emoji.postPatch} diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index abb9d9d1bb3..0bdc3974d97 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { "-Dsshkeygen_path=${openssh}/bin/ssh-keygen" "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services" "-Dpost_install=true" - "-Dinstalled_test_prefix=${placeholder ''installedTests''}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; postPatch = '' diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 63832dc91ac..2e2f0a50b31 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -64,7 +64,7 @@ let HOME=. rebar3 compile ${if compilePorts then '' HOME=. rebar3 pc compile - '' else ''''} + '' else ""} runHook postBuild ''; diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index bbc130725c0..1b0e27891d8 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -46,25 +46,25 @@ let configurePhase = '' runHook preConfigure ${if checkouts != null then - ''cp --no-preserve=all -R ${checkouts}/_checkouts .'' + "cp --no-preserve=all -R ${checkouts}/_checkouts ." else - ''''} + ""} runHook postConfigure ''; buildPhase = '' runHook preBuild HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript" - then '' escriptize'' - else '' release''} + then "escriptize" + else "release"} runHook postBuild ''; installPhase = '' runHook preInstall dir=${if releaseType == "escript" - then ''bin'' - else ''rel''} + then "bin" + else "rel"} mkdir -p "$out/$dir" cp -R --preserve=mode "_build/${profile}/$dir" "$out" runHook postInstall diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 1d8b0137eb0..67c8128f6b5 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (mkDerivationArgs // { buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" ] ++ lib.optional (format == "make") - ''make ''${buildTargets:-build} $makeFlags'' + "make \${buildTargets:-build} $makeFlags" ++ lib.optionals (format == "crystal") (lib.mapAttrsToList (bin: attrs: '' crystal ${lib.escapeShellArgs ([ @@ -84,14 +84,14 @@ stdenv.mkDerivation (mkDerivationArgs // { installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ "runHook preInstall" ] ++ lib.optional (format == "make") - ''make ''${installTargets:-install} $installFlags'' + "make \${installTargets:-install} $installFlags" ++ lib.optionals (format == "crystal") (map (bin: '' install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} '') (lib.attrNames crystalBinaries)) ++ lib.optional (format == "shards") - ''install -Dm555 bin/* -t $out/bin'' + "install -Dm555 bin/* -t $out/bin" ++ [ '' for f in README* *.md LICENSE; do @@ -111,9 +111,9 @@ stdenv.mkDerivation (mkDerivationArgs // { checkPhase = args.checkPhase or (lib.concatStringsSep "\n" ([ "runHook preCheck" ] ++ lib.optional (format == "make") - ''make ''${checkTarget:-test} $checkFlags'' + "make \${checkTarget:-test} $checkFlags" ++ lib.optional (format != "make") - ''crystal ''${checkTarget:-spec} $checkFlags'' + "crystal \${checkTarget:-spec} $checkFlags" ++ [ "runHook postCheck" ])); doInstallCheck = args.doInstallCheck or true; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index a4111f71998..d3de5cad2f6 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; - preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash ''; + preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; nativeBuildInputs = [ cmake boost_static flex bison]; buildInputs = [ diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e34ed4b157d..3a2e3c4b944 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -87,10 +87,9 @@ stdenv.mkDerivation (rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; - installPhase = '' - make config=release prefix=$out '' - + lib.optionalString stdenv.isDarwin '' bits=64 '' - + lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no '' + installPhase = "make config=release prefix=$out " + + lib.optionalString stdenv.isDarwin "bits=64 " + + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no " + '' install wrapProgram $out/bin/ponyc \ diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e27c190acd7..315fe7c0c6d 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs src/etc - ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} + ${optionalString (!withBundledLLVM) "rm -rf src/llvm"} # Fix the configure script to not require curl as we won't use it sed -i configure \ diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index 40ab4abf885..f47086b1ca2 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncompress libX11 ]; - buildPhase = '' ./build ''; + buildPhase = "./build "; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index bf181d07f28..26e9f2b87e1 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -321,7 +321,7 @@ stdenv.mkDerivation { ''; # Hack to avoid build and install directories in RPATHs. - preFixup = ''rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR''; + preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; meta = with lib; { description = "The Swift Programming Language"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 17d5c8968e6..1c760b056e0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -99684,7 +99684,7 @@ self: { sed -i "s|\"-s\"|\"\"|" ./Setup.hs sed -i "s|numJobs (bf bi)++||" ./Setup.hs ''; - preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH''; + preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"; description = "Grammatical Framework"; license = "unknown"; hydraPlatforms = lib.platforms.none; diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index f47ac076f13..cfa06b045de 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -38,8 +38,8 @@ let else "haddock-ghcjs"; ghcDocLibDir = if !isGhcjs - then ghc.doc + ''/share/doc/ghc*/html/libraries'' - else ghc + ''/doc/lib''; + then ghc.doc + "/share/doc/ghc*/html/libraries" + else ghc + "/doc/lib"; # On GHCJS, use a stripped down version of GHC's prologue.txt prologue = if !isGhcjs diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 98a98c0dd34..74f5b2b7b39 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -207,7 +207,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab postFixup = lib.optionalString (!dontWrapLuaPrograms) '' wrapLuaPrograms - '' + attrs.postFixup or ''''; + '' + attrs.postFixup or ""; installPhase = attrs.installPhase or '' runHook preInstall diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 670c870f107..175454ea055 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -162,7 +162,7 @@ let postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms - '' + attrs.postFixup or ''''; + '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index b9d2b9deb79..23fe1dc7800 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p"; }; - makeFlags = [ "prefix=${placeholder ''out''}" ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; enableParallelBuilding = true; doInstallCheck = true; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index e2371292e12..a915723e2ca 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -58,7 +58,7 @@ in ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; - preAutoreconf = ''./autogen.sh''; + preAutoreconf = "./autogen.sh"; configureFlags = lib.optional enableUsb "--enable-usb" diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 215fbeb7071..7b10fc463dd 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { postFixupHooks = [ # This bodge is necessary so that the file that the generated -config.cmake file # points to an existing directory. - ''mkdir -p $out/include'' + "mkdir -p $out/include" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 623021f1dda..cce14951c8b 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile ''; - configurePhase = '' patchShebangs make.sh ''; + configurePhase = "patchShebangs make.sh "; buildPhase = "PREFIX=$out ./make.sh"; doCheck = true; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 14b6f1fb4cd..1f1eff18959 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-user-session" "--enable-xml-docs" - "--libexecdir=${placeholder ''out''}/libexec" + "--libexecdir=${placeholder "out"}/libexec" "--datadir=/etc" "--localstatedir=/var" "--runstatedir=/run" @@ -87,8 +87,8 @@ stdenv.mkDerivation rec { "--with-session-socket-dir=/tmp" "--with-system-pid-file=/run/dbus/pid" "--with-system-socket=/run/dbus/system_bus_socket" - "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" - "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ]; @@ -103,8 +103,8 @@ stdenv.mkDerivation rec { doCheck = true; installFlags = [ - "sysconfdir=${placeholder ''out''}/etc" - "datadir=${placeholder ''out''}/share" + "sysconfdir=${placeholder "out"}/etc" + "datadir=${placeholder "out"}/share" ]; # it's executed from $lib by absolute path diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 0dfa639c338..99a08470396 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - postPatch = ''patchShebangs .''; + postPatch = "patchShebangs ."; inherit patches; outputs = [ "bin" "dev" "out" "man" ] diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index 701ee355667..088354aecb2 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { }; # Fix installation error when waf tries to put files in /etc/ - prePatch = '' - '' + lib.optionalString cyclopsSupport '' + prePatch = "" + lib.optionalString cyclopsSupport '' substituteInPlace src/wscript \ --replace "/etc/cyclops" "$out/etc/cyclops" \ --replace "/etc/init.d" "$out/etc/init.d" @@ -72,8 +71,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (cyclopsSupport) [ "--with-cyclops" ] ; - postFixup = '' - '' + postFixup = "" + lib.optionalString pythonSupport '' wrapPythonPrograms '' diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 8f62483d3b7..0ad9f607dfe 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder ''installedTests''}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; doCheck = true; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index a67ea503776..0e8ed605a2d 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { # Instead we just copy them over from the native output. "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" "-Dnls=enabled" - "-Ddevbindir=${placeholder ''dev''}/bin" + "-Ddevbindir=${placeholder "dev"}/bin" ]; NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 5eead23b825..511ec60db2f 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A user interface library using OpenGL''; + description = "A user interface library using OpenGL"; license = licenses.zlib ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 1dbcd37cf4b..0e467b29433 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { makeFlags = ["PREFIX=$(out)"]; meta = { inherit (s) version; - description = ''Cross-platform helper for creating interactive dialogs''; + description = "Cross-platform helper for creating interactive dialogs"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 137ccfeaf84..9cf98bbbdc5 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6"; }; - patchPhase = ''patchShebangs .''; + patchPhase = "patchShebangs ."; buildInputs = [ perl zlib ]; meta = with lib; { diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index c666a15b63b..09ae213eb5d 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { inherit version; - description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers''; + description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 505d60e2c8d..9fbcf8b020c 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; JAVA_HOME=jdk; JAVA="${jdk}/bin/java"; - PREFIX=''''${out}''; + PREFIX="\${out}"; JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni"; JAVAUNIXJARDIR="${libmatthew_java}/share/java"; buildInputs = [ gettext jdk ]; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index b0173cbdb84..a3cdaa37ed0 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; - PREFIX=''''${out}''; + PREFIX="\${out}"; buildInputs = [ jdk ]; meta = with lib; { diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 995d3809e4e..f9e850f91ff 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; + description = "A library for semi-portable access to hardware-provided atomic memory update operations"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; platforms = with lib.platforms; unix ++ windows; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 5575d8b2c5e..f467a01ea7a 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; meta = { inherit (s) version; - description = ''Library for import of reflowable e-book formats''; + description = "Library for import of reflowable e-book formats"; license = lib.licenses.lgpl21Plus ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 0198888f2b5..5a7f2fe4b36 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias'' + "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias" ]; buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 0c56964bfed..17e20e3d399 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { }; meta = { inherit (s) version; - description = ''Import library for some old mac text documents''; + description = "Import library for some old mac text documents"; license = lib.licenses.mpl20 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index e93bafe2b56..b891c320e86 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; meta = { inherit (s) version; - description = ''A base library for generating ODF documents''; + description = "A base library for generating ODF documents"; license = lib.licenses.mpl20 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 6dd44a0f202..349384b4674 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" - ''PREFIX=$(out)'' + "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 32628695966..1d7754bfcae 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''A base library for writing document import filters''; + description = "A base library for writing document import filters"; license = lib.licenses.mpl20 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix index e78a96784d9..f1a2bf377cc 100644 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch ]; - postPatch = ''patchShebangs .''; + postPatch = "patchShebangs ."; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 10ad110d24e..30a65e3a0a3 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; installFlags = lib.optional pythonSupport - "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\""; + "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\""; postFixup = '' moveToOutput bin/xml2-config "$dev" diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index ee19734a0c0..f71b6d0c0b9 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A library that parses the file format of Zoner Callisto/Draw documents''; + description = "A library that parses the file format of Zoner Callisto/Draw documents"; license = lib.licenses.mpl20; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index eaaa3d9e215..399c5416d78 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [mpfr]; meta = { inherit version; - description = ''A multiple precision interval arithmetic library based on MPFR''; + description = "A multiple precision interval arithmetic library based on MPFR"; homepage = "https://gforge.inria.fr/projects/mpfi/"; license = lib.licenses.lgpl21Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 7f1374df280..7f7df407e4e 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A highly optimised library for bignum arithmetic forked from GMP''; + description = "A highly optimised library for bignum arithmetic forked from GMP"; license = lib.licenses.lgpl3Plus; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index e65b7453dc3..53fb3bec908 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; + description = "A simple and efficient MsgPack binary serialization library in a self-contained header file"; homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index 3a6416122bf..bc8efdc857e 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy"; }; - prePatch = ''substituteInPlace configure --replace /usr/bin/file ${file}/bin/file''; + prePatch = "substituteInPlace configure --replace /usr/bin/file ${file}/bin/file"; doCheck = true; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 2b16f0f09b0..d1b545884b5 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./move-project.patch ; # tells CMake to use this CA bundle file if it is accessible - preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; + preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 56c2b70eeac..fe9a8b67145 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -90,26 +90,26 @@ stdenv.mkDerivation rec { ./fix_compilation_on_gcc7.patch ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ]; - cmakeFlags = [ ''-DBUILD_TEST=OFF'' - ''-DBUILD_PYTHON=ON'' - ''-DUSE_CUDA=${if useCuda then ''ON''else ''OFF''}'' - ''-DUSE_OPENMP=${if useOpenmp then ''ON''else ''OFF''}'' - ''-DUSE_OPENCV=${if useOpencv3 then ''ON''else ''OFF''}'' - ''-DUSE_MPI=${if useMpi then ''ON''else ''OFF''}'' - ''-DUSE_LEVELDB=${if useLeveldb then ''ON''else ''OFF''}'' - ''-DUSE_LMDB=${if useLmdb then ''ON''else ''OFF''}'' - ''-DUSE_ROCKSDB=${if useRocksdb then ''ON''else ''OFF''}'' - ''-DUSE_ZMQ=${if useZeromq then ''ON''else ''OFF''}'' - ''-DUSE_GLOO=OFF'' - ''-DUSE_NNPACK=OFF'' - ''-DUSE_NCCL=OFF'' - ''-DUSE_REDIS=OFF'' - ''-DUSE_FFMPEG=OFF'' + cmakeFlags = [ "-DBUILD_TEST=OFF" + "-DBUILD_PYTHON=ON" + ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}'' + ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}'' + ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}'' + ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}'' + ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}'' + ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}'' + ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}'' + ''-DUSE_ZMQ=${if useZeromq then "ON"else "OFF"}'' + "-DUSE_GLOO=OFF" + "-DUSE_NNPACK=OFF" + "-DUSE_NCCL=OFF" + "-DUSE_REDIS=OFF" + "-DUSE_FFMPEG=OFF" ] ++ lib.optional useCuda [ - ''-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}'' - ''-DCUDA_FAST_MATH=ON'' - ''-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc'' + "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}" + "-DCUDA_FAST_MATH=ON" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" ]; preConfigure = '' diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 6e8e6948af0..e85b6d4cbf4 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { configureFlags = [ # Audio method falls back from left to right. "--with-default-audio-method=\"libao,pulse,alsa,oss\"" - "--with-systemdsystemunitdir=${placeholder ''out''}/lib/systemd/system" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ] ++ optional withPulse "--with-pulse" ++ optional withAlsa "--with-alsa" ++ optional withLibao "--with-libao" diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 491597d760d..63b9540522e 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -27,7 +27,7 @@ let lispPackages = rec { url = "https://beta.quicklisp.org/dist/quicklisp/2020-10-16/distinfo.txt"; sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65"; }; - buildPhase = '' true; ''; + buildPhase = "true; "; postInstall = '' substituteAll ${./quicklisp.sh} "$out"/bin/quicklisp chmod a+x "$out"/bin/quicklisp @@ -80,7 +80,7 @@ let lispPackages = rec { clx-truetype = buildLispPackage rec { baseName = "clx-truetype"; - version = ''20160825-git''; + version = "20160825-git"; buildSystems = [ "clx-truetype" ]; parasites = [ "clx-truetype-test" ]; @@ -91,8 +91,8 @@ let lispPackages = rec { cl-vectors clx trivial-features zpb-ttf ]; src = pkgs.fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; - sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67''; + url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz"; + sha256 = "0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67"; }; packageName = "clx-truetype"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix index 6c08e0e1c95..70de895a586 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''_3bmd-ext-code-blocks''; - version = ''3bmd-20200925-git''; + baseName = "_3bmd-ext-code-blocks"; + version = "3bmd-20200925-git"; - description = ''extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma''; + description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma"; deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz''; - sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw''; + url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz"; + sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw"; }; packageName = "3bmd-ext-code-blocks"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index dd1959893fd..b49b183b24c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''_3bmd''; - version = ''20200925-git''; + baseName = "_3bmd"; + version = "20200925-git"; - description = ''markdown processor in CL using esrap parser.''; + description = "markdown processor in CL using esrap parser."; deps = [ args."alexandria" args."esrap" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz''; - sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw''; + url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz"; + sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw"; }; packageName = "3bmd"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix index deb0c7f89cb..d4f68526f18 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''access''; - version = ''20151218-git''; + baseName = "access"; + version = "20151218-git"; parasites = [ "access-test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz''; - sha256 = ''0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl''; + url = "http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz"; + sha256 = "0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl"; }; packageName = "access"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix index f93506505a1..69d28a65c14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''acclimation''; - version = ''20200925-git''; + baseName = "acclimation"; + version = "20200925-git"; - description = ''Library supporting internationalization''; + description = "Library supporting internationalization"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz''; - sha256 = ''11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw''; + url = "http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz"; + sha256 = "11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw"; }; packageName = "acclimation"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 7f257bc4baf..f1eaf587426 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''alexandria''; - version = ''20200925-git''; + baseName = "alexandria"; + version = "20200925-git"; - description = ''Alexandria is a collection of portable public domain utilities.''; + description = "Alexandria is a collection of portable public domain utilities."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz''; - sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl''; + url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz"; + sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl"; }; packageName = "alexandria"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index 9af6ed36980..1d5e3a5997a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''anaphora''; - version = ''20191007-git''; + baseName = "anaphora"; + version = "20191007-git"; parasites = [ "anaphora/test" ]; - description = ''The Anaphoric Macro Package from Hell''; + description = "The Anaphoric Macro Package from Hell"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz''; - sha256 = ''0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv''; + url = "http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz"; + sha256 = "0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv"; }; packageName = "anaphora"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix index 97ae196c0f5..5ac59f713e9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''arnesi''; - version = ''20170403-git''; + baseName = "arnesi"; + version = "20170403-git"; parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ]; - description = ''A bag-of-tools utilities library used to aid in implementing the bese.it toolkit''; + description = "A bag-of-tools utilities library used to aid in implementing the bese.it toolkit"; deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz''; - sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4''; + url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; + sha256 = "01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4"; }; packageName = "arnesi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index efa5dc6e769..07aca0eb9df 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''array-utils''; - version = ''20190710-git''; + baseName = "array-utils"; + version = "20190710-git"; - description = ''A few utilities for working with arrays.''; + description = "A few utilities for working with arrays."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz''; - sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh''; + url = "http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz"; + sha256 = "1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh"; }; packageName = "array-utils"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix index 1a56676f036..b0fa6289936 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''asdf-package-system''; - version = ''20150608-git''; + baseName = "asdf-package-system"; + version = "20150608-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz''; - sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29''; + url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz"; + sha256 = "17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29"; }; packageName = "asdf-package-system"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a5..7133bf25770 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''asdf-system-connections''; - version = ''20170124-git''; + baseName = "asdf-system-connections"; + version = "20170124-git"; - description = ''Allows for ASDF system to be connected so that auto-loading may occur.''; + description = "Allows for ASDF system to be connected so that auto-loading may occur."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz''; - sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq''; + url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz"; + sha256 = "0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq"; }; packageName = "asdf-system-connections"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index 5a362fc1f03..1c99fc6944e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''babel''; - version = ''20200925-git''; + baseName = "babel"; + version = "20200925-git"; - description = ''Babel, a charset conversion library.''; + description = "Babel, a charset conversion library."; deps = [ args."alexandria" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz''; - sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi''; + url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz"; + sha256 = "1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi"; }; packageName = "babel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index a660882f36b..15100222894 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''blackbird''; - version = ''20160531-git''; + baseName = "blackbird"; + version = "20160531-git"; - description = ''A promise implementation for Common Lisp.''; + description = "A promise implementation for Common Lisp."; deps = [ args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz''; - sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9''; + url = "http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz"; + sha256 = "0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9"; }; packageName = "blackbird"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index cef514715e0..b8c225174a8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''bordeaux-threads''; - version = ''v0.8.8''; + baseName = "bordeaux-threads"; + version = "v0.8.8"; parasites = [ "bordeaux-threads/test" ]; - description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.''; + description = "Bordeaux Threads makes writing portable multi-threaded apps simple."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz''; - sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp''; + url = "http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz"; + sha256 = "1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp"; }; packageName = "bordeaux-threads"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index 5d7f3f2dd10..18d22d1cf32 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''buildnode-xhtml''; - version = ''buildnode-20170403-git''; + baseName = "buildnode-xhtml"; + version = "buildnode-20170403-git"; - description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; + description = "Tool for building up an xml dom of an excel spreadsheet nicely."; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; - sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; }; packageName = "buildnode-xhtml"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 0a2e56a9c9b..b3a281ed3a0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''buildnode''; - version = ''20170403-git''; + baseName = "buildnode"; + version = "20170403-git"; parasites = [ "buildnode-test" ]; - description = ''Tool for building up an xml dom nicely.''; + description = "Tool for building up an xml dom nicely."; deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; - sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; }; packageName = "buildnode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index c90021bbeec..3b44cbbb971 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''caveman''; - version = ''20200325-git''; + baseName = "caveman"; + version = "20200325-git"; - description = ''Web Application Framework for Common Lisp''; + description = "Web Application Framework for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-colors2" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz''; - sha256 = ''0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py''; + url = "http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz"; + sha256 = "0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py"; }; packageName = "caveman"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index e4d6546e901..97328db2543 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cffi-grovel''; - version = ''cffi_0.23.0''; + baseName = "cffi-grovel"; + version = "cffi_0.23.0"; - description = ''The CFFI Groveller''; + description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi-grovel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index ad5ecb7acc8..51fe6a00f1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cffi-toolchain''; - version = ''cffi_0.23.0''; + baseName = "cffi-toolchain"; + version = "cffi_0.23.0"; - description = ''The CFFI toolchain''; + description = "The CFFI toolchain"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi-toolchain"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index e234301f1fe..a56fbf6b265 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cffi''; - version = ''cffi_0.23.0''; + baseName = "cffi"; + version = "cffi_0.23.0"; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; - description = ''The Common Foreign Function Interface''; + description = "The Common Foreign Function Interface"; deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix index b0dea4fbd22..3b9e089b313 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''chanl''; - version = ''20201016-git''; + baseName = "chanl"; + version = "20201016-git"; parasites = [ "chanl/examples" "chanl/tests" ]; - description = ''Communicating Sequential Process support for Common Lisp''; + description = "Communicating Sequential Process support for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz''; - sha256 = ''13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1''; + url = "http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz"; + sha256 = "13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1"; }; packageName = "chanl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c30c68e53c8..3c05684de53 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''chipz''; - version = ''20190202-git''; + baseName = "chipz"; + version = "20190202-git"; - description = ''A library for decompressing deflate, zlib, and gzip data''; + description = "A library for decompressing deflate, zlib, and gzip data"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz''; - sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a''; + url = "http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz"; + sha256 = "1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a"; }; packageName = "chipz"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 644daa8af92..e08a2efe96e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''chunga''; - version = ''20200427-git''; + baseName = "chunga"; + version = "20200427-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz''; - sha256 = ''0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk''; + url = "http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz"; + sha256 = "0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk"; }; packageName = "chunga"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index 2e387d29833..f0b211d27d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''circular-streams''; - version = ''20161204-git''; + baseName = "circular-streams"; + version = "20161204-git"; - description = ''Circularly readable streams for Common Lisp''; + description = "Circularly readable streams for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; - sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128''; + url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; + sha256 = "1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128"; }; packageName = "circular-streams"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df24..8f1448e436b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-aa''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-aa"; + version = "cl-vectors-20180228-git"; - description = ''cl-aa: polygon rasterizer''; + description = "cl-aa: polygon rasterizer"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-aa"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index 5f93167a114..c85c60a0f1d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-annot''; - version = ''20150608-git''; + baseName = "cl-annot"; + version = "20150608-git"; - description = ''Python-like Annotation Syntax for Common Lisp''; + description = "Python-like Annotation Syntax for Common Lisp"; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz''; - sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3''; + url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz"; + sha256 = "0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3"; }; packageName = "cl-annot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8d..2ae0f7d36de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-anonfun''; - version = ''20111203-git''; + baseName = "cl-anonfun"; + version = "20111203-git"; - description = ''Anonymous function helpers for Common Lisp''; + description = "Anonymous function helpers for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz''; - sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m''; + url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz"; + sha256 = "16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m"; }; packageName = "cl-anonfun"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 33f696f3616..dd6eeba98af 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ansi-text''; - version = ''20200218-git''; + baseName = "cl-ansi-text"; + version = "20200218-git"; - description = ''ANSI control string characters, focused on color''; + description = "ANSI control string characters, focused on color"; deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz''; - sha256 = ''1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r''; + url = "http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz"; + sha256 = "1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r"; }; packageName = "cl-ansi-text"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 83d32317b5b..5a5a8b362fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-async-repl''; - version = ''cl-async-20200610-git''; + baseName = "cl-async-repl"; + version = "cl-async-20200610-git"; - description = ''REPL integration for CL-ASYNC.''; + description = "REPL integration for CL-ASYNC."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; - sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; + url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz"; + sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h"; }; packageName = "cl-async-repl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 606a4ffc213..93de96b5ea6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-async-ssl''; - version = ''cl-async-20200610-git''; + baseName = "cl-async-ssl"; + version = "cl-async-20200610-git"; - description = ''SSL Wrapper around cl-async socket implementation.''; + description = "SSL Wrapper around cl-async socket implementation."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; - sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; + url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz"; + sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h"; }; packageName = "cl-async-ssl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index f2ad6b509d0..ce188aeee1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-async''; - version = ''20200610-git''; + baseName = "cl-async"; + version = "20200610-git"; parasites = [ "cl-async-base" "cl-async-util" ]; - description = ''Asynchronous operations for Common Lisp.''; + description = "Asynchronous operations for Common Lisp."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; - sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; + url = "http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz"; + sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h"; }; packageName = "cl-async"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index 15843d1c2fe..37a0fa0c32f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-base64''; - version = ''20201016-git''; + baseName = "cl-base64"; + version = "20201016-git"; parasites = [ "cl-base64/test" ]; - description = ''Base64 encoding and decoding with URI support.''; + description = "Base64 encoding and decoding with URI support."; deps = [ args."kmrcl" args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz''; - sha256 = ''1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z''; + url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; + sha256 = "1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z"; }; packageName = "cl-base64"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix index d240e3e842d..be751aa0e12 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-cairo''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-cairo"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to Cairo''; + description = "A Lisp binding to Cairo"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-cairo"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix index 0c2d3abc282..a331c048fdb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gdk-pixbuf''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gdk-pixbuf"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GDK Pixbuf 2''; + description = "A Lisp binding to GDK Pixbuf 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gdk-pixbuf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix index 748cc9a0d6c..02140a47a33 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gdk''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gdk"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GDK 3''; + description = "A Lisp binding to GDK 3"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gdk"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix index af53a594587..920fc4edecc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gio''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gio"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GIO 2''; + description = "A Lisp binding to GIO 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gio"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix index 4ad75bf507a..429dfb7889b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-glib''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-glib"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to GLib 2''; + description = "A Lisp binding to GLib 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-glib"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix index c2e2deef003..d2f7f2e164f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gobject''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-gobject"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding GObject 2''; + description = "A Lisp binding GObject 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-gobject"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix index 896528cf166..72b3ad647c7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-pango''; - version = ''cl-cffi-gtk-20201016-git''; + baseName = "cl-cffi-gtk-pango"; + version = "cl-cffi-gtk-20201016-git"; - description = ''A Lisp binding to Pango''; + description = "A Lisp binding to Pango"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk-pango"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix index 7055aec5121..98256cc740d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk''; - version = ''20201016-git''; + baseName = "cl-cffi-gtk"; + version = "20201016-git"; - description = ''A Lisp binding to GTK 3''; + description = "A Lisp binding to GTK 3"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; - sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz"; + sha256 = "1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55"; }; packageName = "cl-cffi-gtk"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix index 158158fefad..ce74ce967e2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-change-case''; - version = ''20191007-git''; + baseName = "cl-change-case"; + version = "20191007-git"; - description = ''Convert strings between camelCase, param-case, PascalCase and more''; + description = "Convert strings between camelCase, param-case, PascalCase and more"; deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz''; - sha256 = ''097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1''; + url = "http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz"; + sha256 = "097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1"; }; packageName = "cl-change-case"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix index 36641b73b75..cbc4deba6b5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cli''; - version = ''20151218-git''; + baseName = "cl-cli"; + version = "20151218-git"; - description = ''Command line parser''; + description = "Command line parser"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz''; - sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay''; + url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz"; + sha256 = "0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay"; }; packageName = "cl-cli"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 0d0337a65ce..8882b1473c2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-colors''; - version = ''20180328-git''; + baseName = "cl-colors"; + version = "20180328-git"; parasites = [ "cl-colors-tests" ]; - description = ''Simple color library for Common Lisp''; + description = "Simple color library for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz''; - sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a''; + url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; + sha256 = "0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a"; }; packageName = "cl-colors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix index 519f43ff324..3432660cffd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-colors2''; - version = ''20200218-git''; + baseName = "cl-colors2"; + version = "20200218-git"; parasites = [ "cl-colors2/tests" ]; - description = ''Simple color library for Common Lisp''; + description = "Simple color library for Common Lisp"; deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz''; - sha256 = ''0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29''; + url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz"; + sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29"; }; packageName = "cl-colors2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix index bd0483b4524..c8dc5ca9a99 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-containers''; - version = ''20200427-git''; + baseName = "cl-containers"; + version = "20200427-git"; parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ]; - description = ''A generic container library for Common Lisp''; + description = "A generic container library for Common Lisp"; deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz''; - sha256 = ''0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy''; + url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; + sha256 = "0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy"; }; packageName = "cl-containers"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index ddc3611d50d..f35d40fb41c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-cookie''; - version = ''20191007-git''; + baseName = "cl-cookie"; + version = "20191007-git"; - description = ''HTTP cookie manager''; + description = "HTTP cookie manager"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz''; - sha256 = ''1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh''; + url = "http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz"; + sha256 = "1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh"; }; packageName = "cl-cookie"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix index ba295b6e43a..0d0b2aa1dcf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-css''; - version = ''20140914-git''; + baseName = "cl-css"; + version = "20140914-git"; - description = ''Simple inline CSS generator''; + description = "Simple inline CSS generator"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz''; - sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n''; + url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz"; + sha256 = "16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n"; }; packageName = "cl-css"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 051ffabfc56..c9badad400e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-csv''; - version = ''20201016-git''; + baseName = "cl-csv"; + version = "20201016-git"; parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; - description = ''Facilities for reading and writing CSV format files''; + description = "Facilities for reading and writing CSV format files"; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz''; - sha256 = ''1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf''; + url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; + sha256 = "1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf"; }; packageName = "cl-csv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index c5d0f114e10..8dc68dc36fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-dbi''; - version = ''20200610-git''; + baseName = "cl-dbi"; + version = "20200610-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "cl-dbi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix index 53cf2214ed2..a01f8be3536 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-dot''; - version = ''20200925-git''; + baseName = "cl-dot"; + version = "20200925-git"; - description = ''Generate Dot Output from Arbitrary Lisp Data''; + description = "Generate Dot Output from Arbitrary Lisp Data"; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz''; - sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla''; + url = "http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz"; + sha256 = "01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla"; }; packageName = "cl-dot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 1510495a4cb..b78dd2339b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-emb''; - version = ''20190521-git''; + baseName = "cl-emb"; + version = "20190521-git"; - description = ''A templating system for Common Lisp''; + description = "A templating system for Common Lisp"; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz''; - sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d''; + url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz"; + sha256 = "1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d"; }; packageName = "cl-emb"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index 12d7a7ae273..28cf369206c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-fad''; - version = ''20200610-git''; + baseName = "cl-fad"; + version = "20200610-git"; parasites = [ "cl-fad-test" ]; - description = ''Portable pathname library''; + description = "Portable pathname library"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz''; - sha256 = ''08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x''; + url = "http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz"; + sha256 = "08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x"; }; packageName = "cl-fad"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 6a40d0fa8c9..bf3c36d62b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-fuse-meta-fs''; - version = ''20190710-git''; + baseName = "cl-fuse-meta-fs"; + version = "20190710-git"; - description = ''CFFI bindings to FUSE (Filesystem in user space)''; + description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz''; - sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7''; + url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz"; + sha256 = "1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7"; }; packageName = "cl-fuse-meta-fs"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index b0a549096b2..a2384c0ffaa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-fuse''; - version = ''20200925-git''; + baseName = "cl-fuse"; + version = "20200925-git"; - description = ''CFFI bindings to FUSE (Filesystem in user space)''; + description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz''; - sha256 = ''1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp''; + url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz"; + sha256 = "1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp"; }; packageName = "cl-fuse"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix index 72eafacb190..f7b78782791 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-hooks''; - version = ''architecture.hooks-20181210-git''; + baseName = "cl-hooks"; + version = "architecture.hooks-20181210-git"; parasites = [ "cl-hooks/test" ]; @@ -11,8 +11,8 @@ mechanism (as known, e.g., from GNU Emacs).''; deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz''; - sha256 = ''04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns''; + url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; + sha256 = "04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns"; }; packageName = "cl-hooks"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 6cd859c2cad..60cb467f9a0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-html-parse''; - version = ''20200925-git''; + baseName = "cl-html-parse"; + version = "20200925-git"; - description = ''HTML Parser''; + description = "HTML Parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz''; - sha256 = ''14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f''; + url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz"; + sha256 = "14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f"; }; packageName = "cl-html-parse"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index dde2cc31dd0..64a87763810 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-html5-parser''; - version = ''20190521-git''; + baseName = "cl-html5-parser"; + version = "20190521-git"; - description = ''A HTML5 parser for Common Lisp''; + description = "A HTML5 parser for Common Lisp"; deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz''; - sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p''; + url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; + sha256 = "055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p"; }; packageName = "cl-html5-parser"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index 50ad66faa23..8719adf631c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-interpol''; - version = ''20200715-git''; + baseName = "cl-interpol"; + version = "20200715-git"; parasites = [ "cl-interpol-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz''; - sha256 = ''0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw''; + url = "http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz"; + sha256 = "0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw"; }; packageName = "cl-interpol"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix index 713aff0ea40..1f9fdc420fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-jpeg''; - version = ''20170630-git''; + baseName = "cl-jpeg"; + version = "20170630-git"; - description = ''A self-contained baseline JPEG codec implementation''; + description = "A self-contained baseline JPEG codec implementation"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz''; - sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0''; + url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz"; + sha256 = "1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0"; }; packageName = "cl-jpeg"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index d8bc535f355..00f8b90e485 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-json''; - version = ''20141217-git''; + baseName = "cl-json"; + version = "20141217-git"; parasites = [ "cl-json.test" ]; - description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.''; + description = "JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format."; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz''; - sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g''; + url = "http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz"; + sha256 = "00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g"; }; packageName = "cl-json"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428f..3162edc3862 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-l10n-cldr''; - version = ''20120909-darcs''; + baseName = "cl-l10n-cldr"; + version = "20120909-darcs"; - description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.''; + description = "The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz''; - sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv''; + url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz"; + sha256 = "03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv"; }; packageName = "cl-l10n-cldr"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index f37e653bc56..61c37acb829 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-l10n''; - version = ''20161204-darcs''; + baseName = "cl-l10n"; + version = "20161204-darcs"; parasites = [ "cl-l10n/test" ]; - description = ''Portable CL Locale Support''; + description = "Portable CL Locale Support"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; - sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl''; + url = "http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz"; + sha256 = "1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl"; }; packageName = "cl-l10n"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index ad4780cebe0..7c3f1b7c069 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-libuv''; - version = ''20200610-git''; + baseName = "cl-libuv"; + version = "20200610-git"; - description = ''Low-level libuv bindings for Common Lisp.''; + description = "Low-level libuv bindings for Common Lisp."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz''; - sha256 = ''1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19''; + url = "http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz"; + sha256 = "1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19"; }; packageName = "cl-libuv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix index f0d727a633f..656cb704634 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-locale''; - version = ''20151031-git''; + baseName = "cl-locale"; + version = "20151031-git"; - description = ''Simple i18n library for Common Lisp''; + description = "Simple i18n library for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz''; - sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg''; + url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; + sha256 = "14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg"; }; packageName = "cl-locale"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index b1916c27bfd..56853f0dfcd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-markup''; - version = ''20131003-git''; + baseName = "cl-markup"; + version = "20131003-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz''; - sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r''; + url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; + sha256 = "1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r"; }; packageName = "cl-markup"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index 97b714d8b64..c2ede1ee6ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-mysql''; - version = ''20200610-git''; + baseName = "cl-mysql"; + version = "20200610-git"; - description = ''Common Lisp MySQL library bindings''; + description = "Common Lisp MySQL library bindings"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz''; - sha256 = ''0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w''; + url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; + sha256 = "0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w"; }; packageName = "cl-mysql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index cfca59e3b50..249a54ed0fb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-paths-ttf''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-paths-ttf"; + version = "cl-vectors-20180228-git"; - description = ''cl-paths-ttf: vectorial paths manipulation''; + description = "cl-paths-ttf: vectorial paths manipulation"; deps = [ args."cl-paths" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-paths-ttf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c23..9f7fc95a919 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-paths''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-paths"; + version = "cl-vectors-20180228-git"; - description = ''cl-paths: vectorial paths manipulation''; + description = "cl-paths: vectorial paths manipulation"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-paths"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix index 16bf7d3a638..35deef0c2a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-pdf''; - version = ''20191007-git''; + baseName = "cl-pdf"; + version = "20191007-git"; - description = ''Common Lisp PDF Generation Library''; + description = "Common Lisp PDF Generation Library"; deps = [ args."iterate" args."uiop" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz''; - sha256 = ''0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd''; + url = "http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz"; + sha256 = "0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd"; }; packageName = "cl-pdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 85212e61328..f26326f307e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-postgres''; - version = ''postmodern-20201016-git''; + baseName = "cl-postgres"; + version = "postmodern-20201016-git"; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; - description = ''Low-level client library for PostgreSQL''; + description = "Low-level client library for PostgreSQL"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "cl-postgres"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 3856d777c56..f681b384b54 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre-template''; - version = ''cl-unification-20200925-git''; + baseName = "cl-ppcre-template"; + version = "cl-unification-20200925-git"; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; - sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; + url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; + sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; }; packageName = "cl-ppcre-template"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 27887f12497..8002137e77b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-20190521-git''; + baseName = "cl-ppcre-unicode"; + version = "cl-ppcre-20190521-git"; parasites = [ "cl-ppcre-unicode-test" ]; - description = ''Perl-compatible regular expression library (Unicode)''; + description = "Perl-compatible regular expression library (Unicode)"; deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; - sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; + sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; }; packageName = "cl-ppcre-unicode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 8bb8fb2478d..3d038b19dce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre''; - version = ''20190521-git''; + baseName = "cl-ppcre"; + version = "20190521-git"; parasites = [ "cl-ppcre-test" ]; - description = ''Perl-compatible regular expression library''; + description = "Perl-compatible regular expression library"; deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; - sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; + sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; }; packageName = "cl-ppcre"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix index ddfc92b2cb3..3fa35243c2f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-prevalence''; - version = ''20200715-git''; + baseName = "cl-prevalence"; + version = "20200715-git"; - description = ''Common Lisp Prevalence Package''; + description = "Common Lisp Prevalence Package"; deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz''; - sha256 = ''1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd''; + url = "http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz"; + sha256 = "1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd"; }; packageName = "cl-prevalence"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index e88b9efe366..55edc3cf121 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-project''; - version = ''20200715-git''; + baseName = "cl-project"; + version = "20200715-git"; - description = ''Generate a skeleton for modern project''; + description = "Generate a skeleton for modern project"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-emb" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz''; - sha256 = ''044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306''; + url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz"; + sha256 = "044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306"; }; packageName = "cl-project"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 7339fcdffeb..fdbb48c3754 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-protobufs''; - version = ''20200325-git''; + baseName = "cl-protobufs"; + version = "20200325-git"; - description = ''Protobufs for Common Lisp''; + description = "Protobufs for Common Lisp"; deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz''; - sha256 = ''1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin''; + url = "http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz"; + sha256 = "1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin"; }; packageName = "cl-protobufs"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix index 1ccf6af5cba..72f7d85bc2c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-qprint''; - version = ''20150804-git''; + baseName = "cl-qprint"; + version = "20150804-git"; - description = ''Encode and decode quoted-printable encoded strings.''; + description = "Encode and decode quoted-printable encoded strings."; deps = [ args."flexi-streams" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz''; - sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28''; + url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz"; + sha256 = "042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28"; }; packageName = "cl-qprint"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index 916af5b2972..a4ada8ee9e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-reexport''; - version = ''20150709-git''; + baseName = "cl-reexport"; + version = "20150709-git"; - description = ''Reexport external symbols in other packages.''; + description = "Reexport external symbols in other packages."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz''; - sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi''; + url = "http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz"; + sha256 = "1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi"; }; packageName = "cl-reexport"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix index 2c4fd03f94d..464cddbd5f7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-slice''; - version = ''20171130-git''; + baseName = "cl-slice"; + version = "20171130-git"; parasites = [ "cl-slice-tests" ]; - description = ''DSL for array slices in Common Lisp.''; + description = "DSL for array slices in Common Lisp."; deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz''; - sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn''; + url = "http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz"; + sha256 = "0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn"; }; packageName = "cl-slice"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index accb8a014c8..58957c7826a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-smtp''; - version = ''20191130-git''; + baseName = "cl-smtp"; + version = "20191130-git"; - description = ''Common Lisp smtp client.''; + description = "Common Lisp smtp client."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz''; - sha256 = ''04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq''; + url = "http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz"; + sha256 = "04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq"; }; packageName = "cl-smtp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index d97bd34f275..f7571c4bfcc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-store''; - version = ''20200925-git''; + baseName = "cl-store"; + version = "20200925-git"; parasites = [ "cl-store-tests" ]; - description = ''Serialization package''; + description = "Serialization package"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz''; - sha256 = ''0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3''; + url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz"; + sha256 = "0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3"; }; packageName = "cl-store"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index add200b09a1..6cedd33973d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-annot''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-annot"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for cl-annot''; + description = "CL-Syntax Reader Syntax for cl-annot"; deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-annot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index c19a47df6c2..c862b137b02 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-anonfun''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-anonfun"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for cl-anonfun''; + description = "CL-Syntax Reader Syntax for cl-anonfun"; deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-anonfun"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index cded8dc2d06..ed1158f0998 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-markup''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-markup"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for CL-Markup''; + description = "CL-Syntax Reader Syntax for CL-Markup"; deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-markup"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index 353c8210885..195071e88ce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax''; - version = ''20150407-git''; + baseName = "cl-syntax"; + version = "20150407-git"; - description = ''Reader Syntax Coventions for Common Lisp and SLIME''; + description = "Reader Syntax Coventions for Common Lisp and SLIME"; deps = [ args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 419994fb248..8b5bff40c60 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-test-more''; - version = ''prove-20200218-git''; + baseName = "cl-test-more"; + version = "prove-20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."prove" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "cl-test-more"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 358666877a6..2e43b2c37ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-typesetting''; - version = ''20170830-git''; + baseName = "cl-typesetting"; + version = "20170830-git"; - description = ''Common Lisp Typesetting system''; + description = "Common Lisp Typesetting system"; deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz''; - sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3''; + url = "http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz"; + sha256 = "1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3"; }; packageName = "cl-typesetting"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 7849acb57c0..f7ad7a8592c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-unicode''; - version = ''20190521-git''; + baseName = "cl-unicode"; + version = "20190521-git"; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; - description = ''Portable Unicode Library''; + description = "Portable Unicode Library"; deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz''; - sha256 = ''0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc''; + url = "http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz"; + sha256 = "0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc"; }; packageName = "cl-unicode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 38903abe98b..d4328b7319e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-unification''; - version = ''20200925-git''; + baseName = "cl-unification"; + version = "20200925-git"; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; - sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; + url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; + sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; }; packageName = "cl-unification"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index ba8be7927f0..1304b11990a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-utilities''; - version = ''1.2.4''; + baseName = "cl-utilities"; + version = "1.2.4"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz''; - sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87''; + url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz"; + sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; }; packageName = "cl-utilities"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index f44bd0f22e0..14cee317612 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-vectors''; - version = ''20180228-git''; + baseName = "cl-vectors"; + version = "20180228-git"; - description = ''cl-paths: vectorial paths manipulation''; + description = "cl-paths: vectorial paths manipulation"; deps = [ args."cl-aa" args."cl-paths" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-vectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix index 01a2732a7ec..9c547943317 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-webkit2''; - version = ''cl-webkit-20201016-git''; + baseName = "cl-webkit2"; + version = "cl-webkit-20201016-git"; - description = ''An FFI binding to WebKit2GTK+''; + description = "An FFI binding to WebKit2GTK+"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz''; - sha256 = ''15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh''; + url = "http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz"; + sha256 = "15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh"; }; packageName = "cl-webkit2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 3be45384d41..4b4f4314251 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-who''; - version = ''20190710-git''; + baseName = "cl-who"; + version = "20190710-git"; parasites = [ "cl-who-test" ]; - description = ''(X)HTML generation macros''; + description = "(X)HTML generation macros"; deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz''; - sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir''; + url = "http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz"; + sha256 = "0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir"; }; packageName = "cl-who"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix index 223c50f4716..86c9f0c594a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl-xmlspam''; - version = ''20101006-http''; + baseName = "cl-xmlspam"; + version = "20101006-http"; - description = ''Streaming pattern matching for XML''; + description = "Streaming pattern matching for XML"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz''; - sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h''; + url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz"; + sha256 = "1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h"; }; packageName = "cl-xmlspam"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 5a1ae8550aa..1826e79f5a9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20200610-git''; + baseName = "cl_plus_ssl"; + version = "cl+ssl-20200610-git"; - description = ''Common Lisp interface to OpenSSL.''; + description = "Common Lisp interface to OpenSSL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz''; - sha256 = ''1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql''; + url = "http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz"; + sha256 = "1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql"; }; packageName = "cl+ssl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 5a831da39b8..75a30decba4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-handler-hunchentoot''; - version = ''clack-20191007-git''; + baseName = "clack-handler-hunchentoot"; + version = "clack-20191007-git"; - description = ''Clack handler for Hunchentoot.''; + description = "Clack handler for Hunchentoot."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-handler-hunchentoot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index a9294b293cc..5b39ac9e5a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-socket''; - version = ''clack-20191007-git''; + baseName = "clack-socket"; + version = "clack-20191007-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-socket"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 64e6a694628..b990af44397 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-test''; - version = ''clack-20191007-git''; + baseName = "clack-test"; + version = "clack-20191007-git"; - description = ''Testing Clack Applications.''; + description = "Testing Clack Applications."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-test"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index d52c21e7c00..5c0a5864314 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack-v1-compat''; - version = ''clack-20191007-git''; + baseName = "clack-v1-compat"; + version = "clack-20191007-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-v1-compat"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 1453232cb66..878b037cb3e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clack''; - version = ''20191007-git''; + baseName = "clack"; + version = "20191007-git"; - description = ''Web application environment for Common Lisp''; + description = "Web application environment for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix index 81b335520b0..b7073858601 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clfswm''; - version = ''20161204-git''; + baseName = "clfswm"; + version = "20161204-git"; - description = ''CLFSWM: Fullscreen Window Manager''; + description = "CLFSWM: Fullscreen Window Manager"; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz''; - sha256 = ''1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73''; + url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz"; + sha256 = "1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73"; }; packageName = "clfswm"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index a942542e336..5c7f91ac88c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''closer-mop''; - version = ''20201016-git''; + baseName = "closer-mop"; + version = "20201016-git"; - description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; + description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz''; - sha256 = ''1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd''; + url = "http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz"; + sha256 = "1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd"; }; packageName = "closer-mop"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index c1b36b6b653..86e19bc347f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''closure-common''; - version = ''20181018-git''; + baseName = "closure-common"; + version = "20181018-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz''; - sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn''; + url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz"; + sha256 = "18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn"; }; packageName = "closure-common"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index 7d9d8730f29..d1d07573809 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''closure-html''; - version = ''20180711-git''; + baseName = "closure-html"; + version = "20180711-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz''; - sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq''; + url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz"; + sha256 = "0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq"; }; packageName = "closure-html"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index cbe9caf93ce..a01522b032f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-postgresql-socket''; - version = ''clsql-20201016-git''; + baseName = "clsql-postgresql-socket"; + version = "clsql-20201016-git"; - description = ''Common Lisp SQL PostgreSQL Socket Driver''; + description = "Common Lisp SQL PostgreSQL Socket Driver"; deps = [ args."clsql" args."md5" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-postgresql-socket"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index 9e449d55553..1c5ee972844 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-postgresql''; - version = ''clsql-20201016-git''; + baseName = "clsql-postgresql"; + version = "clsql-20201016-git"; - description = ''Common Lisp PostgreSQL API Driver''; + description = "Common Lisp PostgreSQL API Driver"; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-postgresql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index 1756cea10bb..500eddc5c50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-sqlite3''; - version = ''clsql-20201016-git''; + baseName = "clsql-sqlite3"; + version = "clsql-20201016-git"; - description = ''Common Lisp Sqlite3 Driver''; + description = "Common Lisp Sqlite3 Driver"; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-sqlite3"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index 41399891206..898df293193 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql-uffi''; - version = ''clsql-20201016-git''; + baseName = "clsql-uffi"; + version = "clsql-20201016-git"; - description = ''Common UFFI Helper functions for Common Lisp SQL Interface Library''; + description = "Common UFFI Helper functions for Common Lisp SQL Interface Library"; deps = [ args."clsql" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql-uffi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index 6a202f7efa2..3ec38263224 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clsql''; - version = ''20201016-git''; + baseName = "clsql"; + version = "20201016-git"; - description = ''Common Lisp SQL Interface library''; + description = "Common Lisp SQL Interface library"; deps = [ args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; - sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; + url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz"; + sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8"; }; packageName = "clsql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index aa89d5e45cc..19a1e5ebb16 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clss''; - version = ''20191130-git''; + baseName = "clss"; + version = "20191130-git"; - description = ''A DOM tree searching engine based on CSS selectors.''; + description = "A DOM tree searching engine based on CSS selectors."; deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz''; - sha256 = ''0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka''; + url = "http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz"; + sha256 = "0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka"; }; packageName = "clss"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix index 10ab18a8caf..bc9a8beb66a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clump-2-3-tree''; - version = ''clump-20160825-git''; + baseName = "clump-2-3-tree"; + version = "clump-20160825-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."acclimation" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump-2-3-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix index ad284471540..96543b9ba80 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clump-binary-tree''; - version = ''clump-20160825-git''; + baseName = "clump-binary-tree"; + version = "clump-20160825-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."acclimation" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump-binary-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix index 476cacb6f32..8c6c9e02200 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clump''; - version = ''20160825-git''; + baseName = "clump"; + version = "20160825-git"; - description = ''Library for operations on different kinds of trees''; + description = "Library for operations on different kinds of trees"; deps = [ args."acclimation" args."clump-2-3-tree" args."clump-binary-tree" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix index 7ab00c03446..7ef0b4a52dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clunit''; - version = ''20171019-git''; + baseName = "clunit"; + version = "20171019-git"; - description = ''CLUnit is a Common Lisp unit testing framework.''; + description = "CLUnit is a Common Lisp unit testing framework."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz''; - sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5''; + url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz"; + sha256 = "1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5"; }; packageName = "clunit"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix index 6a143073b5c..c62d20e6e2b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''clunit2''; - version = ''20201016-git''; + baseName = "clunit2"; + version = "20201016-git"; - description = ''CLUnit is a Common Lisp unit testing framework.''; + description = "CLUnit is a Common Lisp unit testing framework."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz''; - sha256 = ''1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp''; + url = "http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz"; + sha256 = "1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp"; }; packageName = "clunit2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 856d5411557..9592921de1d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''clx''; - version = ''20200715-git''; + baseName = "clx"; + version = "20200715-git"; parasites = [ "clx/test" ]; - description = ''An implementation of the X Window System protocol in Lisp.''; + description = "An implementation of the X Window System protocol in Lisp."; deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz''; - sha256 = ''1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra''; + url = "http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz"; + sha256 = "1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra"; }; packageName = "clx"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix index 7375b8dd709..20b0435fafa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''collectors''; - version = ''20161204-git''; + baseName = "collectors"; + version = "20161204-git"; parasites = [ "collectors-test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz''; - sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf''; + url = "http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz"; + sha256 = "0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf"; }; packageName = "collectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix index 9084d6a309b..2abbb956551 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''colorize''; - version = ''20180228-git''; + baseName = "colorize"; + version = "20180228-git"; - description = ''A Syntax highlighting library''; + description = "A Syntax highlighting library"; deps = [ args."alexandria" args."html-encode" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz''; - sha256 = ''1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h''; + url = "http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz"; + sha256 = "1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h"; }; packageName = "colorize"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index ed4e48cd83b..1beb758a79f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''command-line-arguments''; - version = ''20200325-git''; + baseName = "command-line-arguments"; + version = "20200325-git"; - description = ''small library to deal with command-line arguments''; + description = "small library to deal with command-line arguments"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz''; - sha256 = ''0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz''; + url = "http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz"; + sha256 = "0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz"; }; packageName = "command-line-arguments"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index 38ea5aa106c..41ac2a90aae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-lite''; - version = ''20120407-git''; + baseName = "css-lite"; + version = "20120407-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz''; - sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg''; + url = "http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz"; + sha256 = "1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg"; }; packageName = "css-lite"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index 98c565648dc..5fc683cdc95 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors-simple-tree''; - version = ''css-selectors-20160628-git''; + baseName = "css-selectors-simple-tree"; + version = "css-selectors-20160628-git"; - description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree''; + description = "An implementation of css selectors that interacts with cl-html5-parser's simple-tree"; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors-simple-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index fcdb69f3c35..9d03244efa1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors-stp''; - version = ''css-selectors-20160628-git''; + baseName = "css-selectors-stp"; + version = "css-selectors-20160628-git"; - description = ''An implementation of css selectors that interacts with cxml-stp''; + description = "An implementation of css selectors that interacts with cxml-stp"; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors-stp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index aa523d6f838..b18d3a03b63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors''; - version = ''20160628-git''; + baseName = "css-selectors"; + version = "20160628-git"; parasites = [ "css-selectors-test" ]; - description = ''An implementation of css selectors''; + description = "An implementation of css selectors"; deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 2816b451087..4491687d612 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cxml-stp''; - version = ''20200325-git''; + baseName = "cxml-stp"; + version = "20200325-git"; parasites = [ "cxml-stp/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml_slash_test" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz''; - sha256 = ''1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n''; + url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; + sha256 = "1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n"; }; packageName = "cxml-stp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 8f5e05048c6..cd7ac83f2e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''cxml''; - version = ''20200610-git''; + baseName = "cxml"; + version = "20200610-git"; parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ]; - description = ''Closure XML - a Common Lisp XML parser''; + description = "Closure XML - a Common Lisp XML parser"; deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz''; - sha256 = ''0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq''; + url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; + sha256 = "0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq"; }; packageName = "cxml"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 9dcea72f391..1b84a8c038e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbd-mysql''; - version = ''cl-dbi-20200610-git''; + baseName = "dbd-mysql"; + version = "cl-dbi-20200610-git"; - description = ''Database driver for MySQL.''; + description = "Database driver for MySQL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbd-mysql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 5a7b261f724..7590319fbc2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbd-postgres''; - version = ''cl-dbi-20200610-git''; + baseName = "dbd-postgres"; + version = "cl-dbi-20200610-git"; - description = ''Database driver for PostgreSQL.''; + description = "Database driver for PostgreSQL."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbd-postgres"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 5566e807549..b2a26415917 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20200610-git''; + baseName = "dbd-sqlite3"; + version = "cl-dbi-20200610-git"; - description = ''Database driver for SQLite3.''; + description = "Database driver for SQLite3."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbd-sqlite3"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix index 889afc1231d..f24003e87cf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbi-test''; - version = ''cl-dbi-20200610-git''; + baseName = "dbi-test"; + version = "cl-dbi-20200610-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbi-test"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 75fab11cf44..b4f9fc45de0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbi''; - version = ''cl-20200610-git''; + baseName = "dbi"; + version = "cl-20200610-git"; parasites = [ "dbi/test" ]; - description = ''Database independent interface for Common Lisp''; + description = "Database independent interface for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; - sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz"; + sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas"; }; packageName = "dbi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix index 1ea512d0ab7..b5ebe86a190 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dbus''; - version = ''20200610-git''; + baseName = "dbus"; + version = "20200610-git"; - description = ''A D-BUS client library for Common Lisp''; + description = "A D-BUS client library for Common Lisp"; deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz''; - sha256 = ''1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79''; + url = "http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz"; + sha256 = "1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79"; }; packageName = "dbus"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 1fb2381ffc2..d5af479b22c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dexador''; - version = ''20200427-git''; + baseName = "dexador"; + version = "20200427-git"; - description = ''Yet another HTTP client for Common Lisp''; + description = "Yet another HTTP client for Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz''; - sha256 = ''0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld''; + url = "http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz"; + sha256 = "0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld"; }; packageName = "dexador"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix index 2df2c14c129..54f55a4d3ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''dissect''; - version = ''20200427-git''; + baseName = "dissect"; + version = "20200427-git"; - description = ''A lib for introspecting the call stack and active restarts.''; + description = "A lib for introspecting the call stack and active restarts."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz''; - sha256 = ''1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a''; + url = "http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz"; + sha256 = "1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a"; }; packageName = "dissect"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix index 1b919e63a5f..7010a186bfc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''djula''; - version = ''20201016-git''; + baseName = "djula"; + version = "20201016-git"; - description = ''An implementation of Django templates for Common Lisp.''; + description = "An implementation of Django templates for Common Lisp."; deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz''; - sha256 = ''09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy''; + url = "http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz"; + sha256 = "09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy"; }; packageName = "djula"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 3dbacdf0f81..09a27df91e0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''do-urlencode''; - version = ''20181018-git''; + baseName = "do-urlencode"; + version = "20181018-git"; - description = ''Percent Encoding (aka URL Encoding) library''; + description = "Percent Encoding (aka URL Encoding) library"; deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz''; - sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2''; + url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz"; + sha256 = "1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2"; }; packageName = "do-urlencode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 7c25ed9a037..27e05af70be 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''documentation-utils''; - version = ''20190710-git''; + baseName = "documentation-utils"; + version = "20190710-git"; - description = ''A few simple tools to help you with documenting your library.''; + description = "A few simple tools to help you with documenting your library."; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz''; - sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3''; + url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz"; + sha256 = "1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3"; }; packageName = "documentation-utils"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index e880d94f433..7ba2b4f9a37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''drakma''; - version = ''v2.0.7''; + baseName = "drakma"; + version = "v2.0.7"; - description = ''Full-featured http/https client based on usocket''; + description = "Full-featured http/https client based on usocket"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz''; - sha256 = ''1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw''; + url = "http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz"; + sha256 = "1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw"; }; packageName = "drakma"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix index a5e44cefa4b..f0bdf6d0376 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''enchant''; - version = ''cl-20190521-git''; + baseName = "enchant"; + version = "cl-20190521-git"; - description = ''Programming interface for Enchant spell-checker library''; + description = "Programming interface for Enchant spell-checker library"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz''; - sha256 = ''16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14''; + url = "http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz"; + sha256 = "16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14"; }; packageName = "enchant"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix index d8258ea57df..367e268f344 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''esrap-peg''; - version = ''20191007-git''; + baseName = "esrap-peg"; + version = "20191007-git"; - description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions''; + description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions"; deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz''; - sha256 = ''0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis''; + url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz"; + sha256 = "0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis"; }; packageName = "esrap-peg"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 946c71a2f5b..7eca78ca53e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''esrap''; - version = ''20200325-git''; + baseName = "esrap"; + version = "20200325-git"; parasites = [ "esrap/tests" ]; - description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.''; + description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz''; - sha256 = ''1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68''; + url = "http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz"; + sha256 = "1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68"; }; packageName = "esrap"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index 4fd75234253..f0936fe5c4b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''external-program''; - version = ''20190307-git''; + baseName = "external-program"; + version = "20190307-git"; parasites = [ "external-program-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz''; - sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz''; + url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; + sha256 = "1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz"; }; packageName = "external-program"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix index 67d75b89dbd..8c088a149f7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-csv''; - version = ''20171227-git''; + baseName = "fare-csv"; + version = "20171227-git"; - description = ''Robust CSV parser and printer''; + description = "Robust CSV parser and printer"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz''; - sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x''; + url = "http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz"; + sha256 = "1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x"; }; packageName = "fare-csv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix index a5cec39c15f..929f0f820bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-mop''; - version = ''20151218-git''; + baseName = "fare-mop"; + version = "20151218-git"; - description = ''Utilities using the MOP; notably make informative pretty-printing trivial''; + description = "Utilities using the MOP; notably make informative pretty-printing trivial"; deps = [ args."closer-mop" args."fare-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz''; - sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9''; + url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz"; + sha256 = "0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9"; }; packageName = "fare-mop"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix index ff03567a1a6..1b9be4dea1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-extras''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-extras"; + version = "fare-quasiquote-20200925-git"; - description = ''fare-quasiquote plus extras''; + description = "fare-quasiquote plus extras"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-extras"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix index 2f1ef3e5b12..2f1c97bbb6b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-optima''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-optima"; + version = "fare-quasiquote-20200925-git"; - description = ''fare-quasiquote extension for optima''; + description = "fare-quasiquote extension for optima"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-optima"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix index 7d332085e20..47c7c3851bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-readtable''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-readtable"; + version = "fare-quasiquote-20200925-git"; - description = ''Using fare-quasiquote with named-readtable''; + description = "Using fare-quasiquote with named-readtable"; deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-readtable"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix index d5b282e289a..3560c48fee3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote''; - version = ''20200925-git''; + baseName = "fare-quasiquote"; + version = "20200925-git"; - description = ''Portable, matchable implementation of quasiquote''; + description = "Portable, matchable implementation of quasiquote"; deps = [ args."fare-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix index d7af897eafb..b4e77dad912 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fare-utils''; - version = ''20170124-git''; + baseName = "fare-utils"; + version = "20170124-git"; - description = ''Basic functions and macros, interfaces, pure and stateful datastructures''; + description = "Basic functions and macros, interfaces, pure and stateful datastructures"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz''; - sha256 = ''0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq''; + url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz"; + sha256 = "0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq"; }; packageName = "fare-utils"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index cea5d251d72..345b94124d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fast-http''; - version = ''20191007-git''; + baseName = "fast-http"; + version = "20191007-git"; - description = ''A fast HTTP protocol parser in Common Lisp''; + description = "A fast HTTP protocol parser in Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz''; - sha256 = ''00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32''; + url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz"; + sha256 = "00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32"; }; packageName = "fast-http"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 9d7999b750c..22ccfd78de9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''fast-io''; - version = ''20200925-git''; + baseName = "fast-io"; + version = "20200925-git"; - description = ''Alternative I/O mechanism to a stream or vector''; + description = "Alternative I/O mechanism to a stream or vector"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz''; - sha256 = ''1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975''; + url = "http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz"; + sha256 = "1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975"; }; packageName = "fast-io"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 68e5e00085c..ab8118deac5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''fiasco''; - version = ''20200610-git''; + baseName = "fiasco"; + version = "20200610-git"; parasites = [ "fiasco-self-tests" ]; - description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; + description = "A Common Lisp test framework that treasures your failures, logical continuation of Stefil."; deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz''; - sha256 = ''1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4''; + url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; + sha256 = "1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4"; }; packageName = "fiasco"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index 45af1934223..d02f9de5b0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''fiveam''; - version = ''20200925-git''; + baseName = "fiveam"; + version = "20200925-git"; parasites = [ "fiveam/test" ]; - description = ''A simple regression testing framework''; + description = "A simple regression testing framework"; deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz''; - sha256 = ''0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d''; + url = "http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz"; + sha256 = "0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d"; }; packageName = "fiveam"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index a1828981c07..328c91cd2bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''flexi-streams''; - version = ''20200925-git''; + baseName = "flexi-streams"; + version = "20200925-git"; parasites = [ "flexi-streams-test" ]; - description = ''Flexible bivalent streams for Common Lisp''; + description = "Flexible bivalent streams for Common Lisp"; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz''; - sha256 = ''1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2''; + url = "http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz"; + sha256 = "1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2"; }; packageName = "flexi-streams"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 90ce8b83dde..56de0edc9c9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''form-fiddle''; - version = ''20190710-git''; + baseName = "form-fiddle"; + version = "20190710-git"; - description = ''A collection of utilities to destructure lambda forms.''; + description = "A collection of utilities to destructure lambda forms."; deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz''; - sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl''; + url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz"; + sha256 = "12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl"; }; packageName = "form-fiddle"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index 12e168e44f6..20f41296a8e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''fset''; - version = ''20200925-git''; + baseName = "fset"; + version = "20200925-git"; parasites = [ "fset/test" ]; @@ -12,8 +12,8 @@ See: http://www.ergy.com/FSet.html deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz''; - sha256 = ''19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv''; + url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz"; + sha256 = "19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv"; }; packageName = "fset"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix index ffc517973d5..0a9d812d5fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''gettext''; - version = ''20171130-git''; + baseName = "gettext"; + version = "20171130-git"; - description = ''An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.''; + description = "An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems."; deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz''; - sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd''; + url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; + sha256 = "0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd"; }; packageName = "gettext"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix index 42cdca06d90..a4d135188fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''global-vars''; - version = ''20141106-git''; + baseName = "global-vars"; + version = "20141106-git"; - description = ''Define efficient global variables.''; + description = "Define efficient global variables."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz''; - sha256 = ''0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j''; + url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; + sha256 = "0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j"; }; packageName = "global-vars"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix index 9f4672644fa..646bcff4720 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''html-encode''; - version = ''1.2''; + baseName = "html-encode"; + version = "1.2"; - description = ''A library for encoding text in various web-savvy encodings.''; + description = "A library for encoding text in various web-savvy encodings."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz''; - sha256 = ''06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf''; + url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz"; + sha256 = "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf"; }; packageName = "html-encode"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 4242d959046..09ba474e5a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''http-body''; - version = ''20190813-git''; + baseName = "http-body"; + version = "20190813-git"; - description = ''HTTP POST data parser for Common Lisp''; + description = "HTTP POST data parser for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz''; - sha256 = ''1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8''; + url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; + sha256 = "1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8"; }; packageName = "http-body"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 074e2ac9671..ed8b80752d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20200925-darcs''; + baseName = "hu_dot_dwim_dot_asdf"; + version = "20200925-darcs"; - description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; + description = "Various ASDF extensions such as attached test and documentation system, explicit development support, etc."; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz''; - sha256 = ''1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h''; + url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz"; + sha256 = "1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h"; }; packageName = "hu.dwim.asdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix index a554ef8d680..13f4d11fb56 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_defclass-star''; - version = ''20150709-darcs''; + baseName = "hu_dot_dwim_dot_defclass-star"; + version = "20150709-darcs"; - description = ''Simplify class like definitions with defclass* and friends.''; + description = "Simplify class like definitions with defclass* and friends."; deps = [ args."hu_dot_dwim_dot_asdf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz''; - sha256 = ''032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs''; + url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz"; + sha256 = "032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs"; }; packageName = "hu.dwim.defclass-star"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index d49a382a3a3..af6529582a4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_stefil''; - version = ''20200218-darcs''; + baseName = "hu_dot_dwim_dot_stefil"; + version = "20200218-darcs"; parasites = [ "hu.dwim.stefil/test" ]; - description = ''A Simple Test Framework In Lisp.''; + description = "A Simple Test Framework In Lisp."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz''; - sha256 = ''16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf''; + url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz"; + sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf"; }; packageName = "hu.dwim.stefil"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index d874120e7d8..883d7554900 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''hunchentoot''; - version = ''v1.3.0''; + baseName = "hunchentoot"; + version = "v1.3.0"; parasites = [ "hunchentoot-test" ]; @@ -13,8 +13,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz''; - sha256 = ''08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8''; + url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; + sha256 = "08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8"; }; packageName = "hunchentoot"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index 1b948bcf325..8c3ffe879c4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''idna''; - version = ''20120107-git''; + baseName = "idna"; + version = "20120107-git"; - description = ''IDNA (international domain names) string encoding and decoding routines''; + description = "IDNA (international domain names) string encoding and decoding routines"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz''; - sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c''; + url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz"; + sha256 = "0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c"; }; packageName = "idna"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 4211dfbc919..2544cd99dff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''ieee-floats''; - version = ''20170830-git''; + baseName = "ieee-floats"; + version = "20170830-git"; parasites = [ "ieee-floats-tests" ]; - description = ''Convert floating point values to IEEE 754 binary representation''; + description = "Convert floating point values to IEEE 754 binary representation"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz''; - sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk''; + url = "http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz"; + sha256 = "15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk"; }; packageName = "ieee-floats"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix index 2072945f264..5aa30e92cdc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''inferior-shell''; - version = ''20200925-git''; + baseName = "inferior-shell"; + version = "20200925-git"; parasites = [ "inferior-shell/test" ]; - description = ''spawn local or remote processes and shell pipes''; + description = "spawn local or remote processes and shell pipes"; deps = [ args."alexandria" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz''; - sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80''; + url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz"; + sha256 = "1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80"; }; packageName = "inferior-shell"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix index 68024ad2a5a..4590e55ffd6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''introspect-environment''; - version = ''20200715-git''; + baseName = "introspect-environment"; + version = "20200715-git"; - description = ''Small interface to portable but nonstandard introspection of CL environments.''; + description = "Small interface to portable but nonstandard introspection of CL environments."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz''; - sha256 = ''1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns''; + url = "http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz"; + sha256 = "1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns"; }; packageName = "introspect-environment"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index c4ae44cd676..8d547d93b59 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib''; - version = ''v0.8.3''; + baseName = "iolib"; + version = "v0.8.3"; parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/trivial-sockets" "iolib/zstreams" ]; - description = ''I/O library.''; + description = "I/O library."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index 195b52c08c4..b4136a5dc86 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_asdf''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_asdf"; + version = "iolib-v0.8.3"; - description = ''A few ASDF component classes.''; + description = "A few ASDF component classes."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.asdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index aa650edde02..97763556c1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_base''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_base"; + version = "iolib-v0.8.3"; - description = ''Base IOlib package, used instead of CL.''; + description = "Base IOlib package, used instead of CL."; deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.base"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index c0ec72d4869..2482a76453b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_common-lisp''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_common-lisp"; + version = "iolib-v0.8.3"; - description = ''Slightly modified Common Lisp.''; + description = "Slightly modified Common Lisp."; deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.common-lisp"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 4ba0cfa1ce2..d9d055fab06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_conf''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_conf"; + version = "iolib-v0.8.3"; - description = ''Compile-time configuration for IOLib.''; + description = "Compile-time configuration for IOLib."; deps = [ args."alexandria" args."iolib_dot_asdf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.conf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index 7a1a12243fe..5e7df7a5c76 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_grovel''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_grovel"; + version = "iolib-v0.8.3"; - description = ''The CFFI Groveller''; + description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.grovel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 84298e81820..48e7595f3e0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''ironclad''; - version = ''v0.51''; + baseName = "ironclad"; + version = "v0.51"; parasites = [ "ironclad/tests" ]; - description = ''A cryptographic toolkit written in pure Common Lisp''; + description = "A cryptographic toolkit written in pure Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz''; - sha256 = ''0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn''; + url = "http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz"; + sha256 = "0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn"; }; packageName = "ironclad"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index e3e1fa689a0..d82d371ca0c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''iterate''; - version = ''20200610-git''; + baseName = "iterate"; + version = "20200610-git"; parasites = [ "iterate/tests" ]; - description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility''; + description = "Jonathan Amsterdam's iterator/gatherer/accumulator facility"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz''; - sha256 = ''0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb''; + url = "http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz"; + sha256 = "0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb"; }; packageName = "iterate"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index a29a02c5e61..547a909c067 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''jonathan''; - version = ''20200925-git''; + baseName = "jonathan"; + version = "20200925-git"; - description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; + description = "High performance JSON encoder and decoder. Currently support: SBCL, CCL."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz''; - sha256 = ''1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx''; + url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; + sha256 = "1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx"; }; packageName = "jonathan"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index 49bc7d4cab5..d785fbd2257 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''kmrcl''; - version = ''20201016-git''; + baseName = "kmrcl"; + version = "20201016-git"; parasites = [ "kmrcl/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz''; - sha256 = ''0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf''; + url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; + sha256 = "0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf"; }; packageName = "kmrcl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 0260d37f0bb..2af6575754a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack-component''; - version = ''lack-20201016-git''; + baseName = "lack-component"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-component"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 610950054fa..edadaa07c14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack-middleware-backtrace''; - version = ''lack-20201016-git''; + baseName = "lack-middleware-backtrace"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-middleware-backtrace"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 1af4ec3f430..ad8bdc84b59 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack-util''; - version = ''lack-20201016-git''; + baseName = "lack-util"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-util"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index a85fab15c42..06f596509a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lack''; - version = ''20201016-git''; + baseName = "lack"; + version = "20201016-git"; - description = ''A minimal Clack''; + description = "A minimal Clack"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index 9d130c2b053..791c7f0a2d2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''let-plus''; - version = ''20191130-git''; + baseName = "let-plus"; + version = "20191130-git"; parasites = [ "let-plus/tests" ]; - description = ''Destructuring extension of LET*.''; + description = "Destructuring extension of LET*."; deps = [ args."alexandria" args."anaphora" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz''; - sha256 = ''0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p''; + url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; + sha256 = "0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p"; }; packageName = "let-plus"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 9dd6baad1bd..e4bbb44a468 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lev''; - version = ''20150505-git''; + baseName = "lev"; + version = "20150505-git"; - description = ''libev bindings for Common Lisp''; + description = "libev bindings for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz''; - sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl''; + url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz"; + sha256 = "0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl"; }; packageName = "lev"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix index 10977c16f83..448f41e5b51 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-client''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-client"; + version = "lfarm-20150608-git"; - description = ''Client component of lfarm, a library for distributing work across machines.''; + description = "Client component of lfarm, a library for distributing work across machines."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-client"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix index 4a5fe87982a..fc92bbe89b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-common''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-common"; + version = "lfarm-20150608-git"; description = ''(private) Common components of lfarm, a library for distributing work across machines.''; @@ -9,8 +9,8 @@ work across machines.''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-common"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix index 354d6c31507..5cc5cc1e9da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-server''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-server"; + version = "lfarm-20150608-git"; - description = ''Server component of lfarm, a library for distributing work across machines.''; + description = "Server component of lfarm, a library for distributing work across machines."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-server"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix index 348c71fe966..0ba638611c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-ssl''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-ssl"; + version = "lfarm-20150608-git"; - description = ''SSL support for lfarm''; + description = "SSL support for lfarm"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-ssl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index 1edb65596a6..c0e4f0caee3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lift''; - version = ''20190521-git''; + baseName = "lift"; + version = "20190521-git"; - description = ''LIsp Framework for Testing''; + description = "LIsp Framework for Testing"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz''; - sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9''; + url = "http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz"; + sha256 = "0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9"; }; packageName = "lift"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 7f88beb974b..80b0431799b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lisp-namespace''; - version = ''20171130-git''; + baseName = "lisp-namespace"; + version = "20171130-git"; - description = ''Provides LISP-N --- extensible namespaces in Common Lisp.''; + description = "Provides LISP-N --- extensible namespaces in Common Lisp."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz''; - sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j''; + url = "http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz"; + sha256 = "0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j"; }; packageName = "lisp-namespace"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 8d21f88cbf8..12d82701e08 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''lisp-unit2''; - version = ''20180131-git''; + baseName = "lisp-unit2"; + version = "20180131-git"; parasites = [ "lisp-unit2-test" ]; - description = ''Common Lisp library that supports unit testing.''; + description = "Common Lisp library that supports unit testing."; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz''; - sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7''; + url = "http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz"; + sha256 = "04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7"; }; packageName = "lisp-unit2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index c7d2f061f4b..9bf7ea7fa14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''local-time''; - version = ''20200925-git''; + baseName = "local-time"; + version = "20200925-git"; parasites = [ "local-time/test" ]; - description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; + description = "A library for manipulating dates and times, based on a paper by Erik Naggum"; deps = [ args."stefil" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz''; - sha256 = ''0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f''; + url = "http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz"; + sha256 = "0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f"; }; packageName = "local-time"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix index 222178b1556..e4b4795fe0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''log4cl''; - version = ''20200925-git''; + baseName = "log4cl"; + version = "20200925-git"; parasites = [ "log4cl/syslog" "log4cl/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz''; - sha256 = ''1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf''; + url = "http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz"; + sha256 = "1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf"; }; packageName = "log4cl"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix index 1a6f217a2f9..73b42c3fc9a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lparallel''; - version = ''20160825-git''; + baseName = "lparallel"; + version = "20160825-git"; - description = ''Parallelism for Common Lisp''; + description = "Parallelism for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz''; - sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1''; + url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; + sha256 = "0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1"; }; packageName = "lparallel"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index cf27f8ceaa3..e287b7519a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''lquery''; - version = ''20200715-git''; + baseName = "lquery"; + version = "20200715-git"; - description = ''A library to allow jQuery-like HTML/DOM manipulation.''; + description = "A library to allow jQuery-like HTML/DOM manipulation."; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz''; - sha256 = ''1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd''; + url = "http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz"; + sha256 = "1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd"; }; packageName = "lquery"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index 8187c99f94a..fd6213f3076 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''map-set''; - version = ''20190307-hg''; + baseName = "map-set"; + version = "20190307-hg"; - description = ''Set-like data structure.''; + description = "Set-like data structure."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz''; - sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9''; + url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz"; + sha256 = "1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9"; }; packageName = "map-set"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 414dee98b71..94b8e64bfb4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''marshal''; - version = ''cl-20201016-git''; + baseName = "marshal"; + version = "cl-20201016-git"; - description = ''marshal: Simple (de)serialization of Lisp datastructures.''; + description = "marshal: Simple (de)serialization of Lisp datastructures."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz''; - sha256 = ''03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz''; + url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz"; + sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz"; }; packageName = "marshal"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a4..845c235d49d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''md5''; - version = ''20180228-git''; + baseName = "md5"; + version = "20180228-git"; - description = ''The MD5 Message-Digest Algorithm RFC 1321''; + description = "The MD5 Message-Digest Algorithm RFC 1321"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz''; - sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4''; + url = "http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz"; + sha256 = "1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4"; }; packageName = "md5"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index 6e0339bf9f9..993f3639203 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''metabang-bind''; - version = ''20200218-git''; + baseName = "metabang-bind"; + version = "20200218-git"; - description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; + description = "Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz''; - sha256 = ''0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq''; + url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz"; + sha256 = "0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq"; }; packageName = "metabang-bind"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 1cac2408837..bf553ddf370 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''metatilities-base''; - version = ''20191227-git''; + baseName = "metatilities-base"; + version = "20191227-git"; - description = ''These are metabang.com's Common Lisp basic utilities.''; + description = "These are metabang.com's Common Lisp basic utilities."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz''; - sha256 = ''1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil''; + url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; + sha256 = "1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil"; }; packageName = "metatilities-base"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix index 0271bf98cf7..33cc8bc90bf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''mgl-pax''; - version = ''20201016-git''; + baseName = "mgl-pax"; + version = "20201016-git"; parasites = [ "mgl-pax/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz''; - sha256 = ''0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li''; + url = "http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz"; + sha256 = "0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li"; }; packageName = "mgl-pax"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 16609db5c22..163f85182e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''misc-extensions''; - version = ''20150608-git''; + baseName = "misc-extensions"; + version = "20150608-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz''; - sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj''; + url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz"; + sha256 = "0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj"; }; packageName = "misc-extensions"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix index dc63474679a..3bd71c00d94 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''mk-string-metrics''; - version = ''20180131-git''; + baseName = "mk-string-metrics"; + version = "20180131-git"; - description = ''efficient implementations of various string metric algorithms''; + description = "efficient implementations of various string metric algorithms"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz''; - sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4''; + url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; + sha256 = "10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4"; }; packageName = "mk-string-metrics"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix index 1f2dd20ee4b..458acc6e94e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''moptilities''; - version = ''20170403-git''; + baseName = "moptilities"; + version = "20170403-git"; - description = ''Common Lisp MOP utilities''; + description = "Common Lisp MOP utilities"; deps = [ args."closer-mop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz''; - sha256 = ''0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8''; + url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; + sha256 = "0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8"; }; packageName = "moptilities"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix index 9a014c41603..40460f6d71c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''more-conditions''; - version = ''20180831-git''; + baseName = "more-conditions"; + version = "20180831-git"; parasites = [ "more-conditions/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz''; - sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x''; + url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz"; + sha256 = "0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x"; }; packageName = "more-conditions"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf9..a5628dddeca 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''mt19937''; - version = ''1.1.1''; + baseName = "mt19937"; + version = "1.1.1"; - description = ''Portable MT19937 Mersenne Twister random number generator''; + description = "Portable MT19937 Mersenne Twister random number generator"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz''; - sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv''; + url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz"; + sha256 = "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv"; }; packageName = "mt19937"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 415b508713c..cb35cd2c4ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''myway''; - version = ''20200325-git''; + baseName = "myway"; + version = "20200325-git"; - description = ''Sinatra-compatible routing library.''; + description = "Sinatra-compatible routing library."; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz''; - sha256 = ''07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15''; + url = "http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz"; + sha256 = "07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15"; }; packageName = "myway"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 3504443d453..9479bf85d01 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''named-readtables''; - version = ''20200925-git''; + baseName = "named-readtables"; + version = "20200925-git"; parasites = [ "named-readtables/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz''; - sha256 = ''0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl''; + url = "http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz"; + sha256 = "0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl"; }; packageName = "named-readtables"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix index a9c49279563..0bb4d755d62 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''net-telent-date''; - version = ''net-telent-date_0.42''; + baseName = "net-telent-date"; + version = "net-telent-date_0.42"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz''; - sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1''; + url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz"; + sha256 = "06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1"; }; packageName = "net-telent-date"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a0..039277bcc0e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''net_dot_didierverna_dot_asdf-flv''; - version = ''asdf-flv-version-2.1''; + baseName = "net_dot_didierverna_dot_asdf-flv"; + version = "asdf-flv-version-2.1"; - description = ''ASDF extension to provide support for file-local variables.''; + description = "ASDF extension to provide support for file-local variables."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz''; - sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc''; + url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz"; + sha256 = "12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc"; }; packageName = "net.didierverna.asdf-flv"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index 75ea9b55220..f6fbd1e1b63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''nibbles''; - version = ''20200925-git''; + baseName = "nibbles"; + version = "20200925-git"; parasites = [ "nibbles/tests" ]; - description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; + description = "A library for accessing octet-addressed blocks of data in big- and little-endian orders"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz''; - sha256 = ''14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4''; + url = "http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz"; + sha256 = "14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4"; }; packageName = "nibbles"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index 07b86f58fe7..487fd2c50aa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''optima''; - version = ''20150709-git''; + baseName = "optima"; + version = "20150709-git"; - description = ''Optimized Pattern Matching Library''; + description = "Optimized Pattern Matching Library"; deps = [ args."alexandria" args."closer-mop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz''; - sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc''; + url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; + sha256 = "0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc"; }; packageName = "optima"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix index cb05bef0a1c..bc7f59d5fb7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''osicat''; - version = ''20200925-git''; + baseName = "osicat"; + version = "20200925-git"; parasites = [ "osicat/tests" ]; - description = ''A lightweight operating system interface''; + description = "A lightweight operating system interface"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz''; - sha256 = ''191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk''; + url = "http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz"; + sha256 = "191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk"; }; packageName = "osicat"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bf6216dcadd..952b9cbdf0d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''parenscript''; - version = ''Parenscript-2.7.1''; + baseName = "parenscript"; + version = "Parenscript-2.7.1"; - description = ''Lisp to JavaScript transpiler''; + description = "Lisp to JavaScript transpiler"; deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz''; - sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f''; + url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; + sha256 = "1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f"; }; packageName = "parenscript"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix index ea153987c0b..3e59fcfa5f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''parse-declarations-1_dot_0''; - version = ''parse-declarations-20101006-darcs''; + baseName = "parse-declarations-1_dot_0"; + version = "parse-declarations-20101006-darcs"; - description = ''Library to parse and rebuild declarations.''; + description = "Library to parse and rebuild declarations."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz''; - sha256 = ''0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd''; + url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz"; + sha256 = "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd"; }; packageName = "parse-declarations-1.0"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e..a4b9488a34a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''parse-number''; - version = ''v1.7''; + baseName = "parse-number"; + version = "v1.7"; parasites = [ "parse-number/tests" ]; - description = ''Number parsing library''; + description = "Number parsing library"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz''; - sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha''; + url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz"; + sha256 = "11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha"; }; packageName = "parse-number"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix index 5105ec99235..391f04bd767 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''parser-combinators''; - version = ''cl-20131111-git''; + baseName = "parser-combinators"; + version = "cl-20131111-git"; - description = ''An implementation of parser combinators for Common Lisp''; + description = "An implementation of parser combinators for Common Lisp"; deps = [ args."alexandria" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz''; - sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds''; + url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; + sha256 = "0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds"; }; packageName = "parser-combinators"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix index ee6532261c0..d438d4b157b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''parser_dot_common-rules''; - version = ''20200715-git''; + baseName = "parser_dot_common-rules"; + version = "20200715-git"; parasites = [ "parser.common-rules/test" ]; - description = ''Provides common parsing rules that are useful in many grammars.''; + description = "Provides common parsing rules that are useful in many grammars."; deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz''; - sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy''; + url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; + sha256 = "17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy"; }; packageName = "parser.common-rules"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index fe9ccae2886..a60f3f377b5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''pcall-queue''; - version = ''pcall-0.3''; + baseName = "pcall-queue"; + version = "pcall-0.3"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; - sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; }; packageName = "pcall-queue"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index 99e9517e50e..6b3ef96ca1c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''pcall''; - version = ''0.3''; + baseName = "pcall"; + version = "0.3"; parasites = [ "pcall-tests" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; - sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; }; packageName = "pcall"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 5490b882c81..a82c9c54c63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''plump''; - version = ''20200427-git''; + baseName = "plump"; + version = "20200427-git"; - description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; + description = "An XML / XHTML / HTML parser that aims to be as lenient as possible."; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz''; - sha256 = ''0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic''; + url = "http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz"; + sha256 = "0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic"; }; packageName = "plump"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index 7dc27566bca..32345ee367a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''postmodern''; - version = ''20201016-git''; + baseName = "postmodern"; + version = "20201016-git"; parasites = [ "postmodern/tests" ]; - description = ''PostgreSQL programming API''; + description = "PostgreSQL programming API"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "postmodern"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index d9146cede10..8cb24f674fd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''proc-parse''; - version = ''20190813-git''; + baseName = "proc-parse"; + version = "20190813-git"; - description = ''Procedural vector parser''; + description = "Procedural vector parser"; deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz''; - sha256 = ''126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j''; + url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; + sha256 = "126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j"; }; packageName = "proc-parse"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix index 21babe8f015..379fbbbe9ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''prove-asdf''; - version = ''prove-20200218-git''; + baseName = "prove-asdf"; + version = "prove-20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "prove-asdf"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index c3aa1dcaafe..9bb12d3e3c0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''prove''; - version = ''20200218-git''; + baseName = "prove"; + version = "20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "prove"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c26..fef37625dd0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''ptester''; - version = ''20160929-git''; + baseName = "ptester"; + version = "20160929-git"; - description = ''Portable test harness package''; + description = "Portable test harness package"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz''; - sha256 = ''04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz''; + url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz"; + sha256 = "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz"; }; packageName = "ptester"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index e45802c194d..b349fccd6d3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''puri''; - version = ''20201016-git''; + baseName = "puri"; + version = "20201016-git"; parasites = [ "puri/test" ]; - description = ''Portable Universal Resource Indentifier Library''; + description = "Portable Universal Resource Indentifier Library"; deps = [ args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz''; - sha256 = ''16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx''; + url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; + sha256 = "16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx"; }; packageName = "puri"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix index ae810d34790..ff6cdb460e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''pythonic-string-reader''; - version = ''20180711-git''; + baseName = "pythonic-string-reader"; + version = "20180711-git"; description = ''A simple and unintrusive read table modification that allows for simple string literal definition that doesn't require escaping characters.''; @@ -9,8 +9,8 @@ simple string literal definition that doesn't require escaping characters.''; deps = [ args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz''; - sha256 = ''0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx''; + url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz"; + sha256 = "0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx"; }; packageName = "pythonic-string-reader"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 06957e45f81..1cac12f8600 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''query-fs''; - version = ''20200610-git''; + baseName = "query-fs"; + version = "20200610-git"; - description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; + description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz''; - sha256 = ''1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413''; + url = "http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz"; + sha256 = "1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413"; }; packageName = "query-fs"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 1972f6b8d4a..a38d024ea88 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''quri''; - version = ''20200610-git''; + baseName = "quri"; + version = "20200610-git"; - description = ''Yet another URI library for Common Lisp''; + description = "Yet another URI library for Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz''; - sha256 = ''1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6''; + url = "http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz"; + sha256 = "1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6"; }; packageName = "quri"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 25d535176a6..bc94b7fe3de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''rfc2388''; - version = ''20180831-git''; + baseName = "rfc2388"; + version = "20180831-git"; - description = ''Implementation of RFC 2388''; + description = "Implementation of RFC 2388"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz''; - sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33''; + url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz"; + sha256 = "1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33"; }; packageName = "rfc2388"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix index b3fc3b0cd2d..91e94b2cc73 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''rove''; - version = ''20200325-git''; + baseName = "rove"; + version = "20200325-git"; - description = ''Yet another testing framework intended to be a successor of Prove''; + description = "Yet another testing framework intended to be a successor of Prove"; deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz''; - sha256 = ''0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5''; + url = "http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz"; + sha256 = "0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5"; }; packageName = "rove"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7daf..7a53315daf6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''rt''; - version = ''20101006-git''; + baseName = "rt"; + version = "20101006-git"; - description = ''MIT Regression Tester''; + description = "MIT Regression Tester"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz''; - sha256 = ''1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v''; + url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz"; + sha256 = "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v"; }; packageName = "rt"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index 1f896dc4158..d4397b82217 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''s-sql''; - version = ''postmodern-20201016-git''; + baseName = "s-sql"; + version = "postmodern-20201016-git"; parasites = [ "s-sql/tests" ]; - description = ''Lispy DSL for SQL''; + description = "Lispy DSL for SQL"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "s-sql"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix index b35f44067d3..3d9e001dde4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''s-sysdeps''; - version = ''20200427-git''; + baseName = "s-sysdeps"; + version = "20200427-git"; - description = ''An abstraction layer over platform dependent functionality''; + description = "An abstraction layer over platform dependent functionality"; deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz''; - sha256 = ''04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy''; + url = "http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz"; + sha256 = "04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy"; }; packageName = "s-sysdeps"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix index ec12dde5223..08bd208a89f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''s-xml''; - version = ''20150608-git''; + baseName = "s-xml"; + version = "20150608-git"; parasites = [ "s-xml.examples" "s-xml.test" ]; - description = ''Simple Common Lisp XML Parser''; + description = "Simple Common Lisp XML Parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz''; - sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq''; + url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; + sha256 = "0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq"; }; packageName = "s-xml"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcca..f5f294cfdbb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''salza2''; - version = ''2.0.9''; + baseName = "salza2"; + version = "2.0.9"; description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP data formats''; @@ -9,8 +9,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz''; - sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va''; + url = "http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz"; + sha256 = "1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va"; }; packageName = "salza2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix index 85d85463c3d..143a8fad1df 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''serapeum''; - version = ''20201016-git''; + baseName = "serapeum"; + version = "20201016-git"; - description = ''Utilities beyond Alexandria.''; + description = "Utilities beyond Alexandria."; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz''; - sha256 = ''0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq''; + url = "http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz"; + sha256 = "0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq"; }; packageName = "serapeum"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix index 1f2759cf388..31f818a8e69 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''simple-date-time''; - version = ''20160421-git''; + baseName = "simple-date-time"; + version = "20160421-git"; - description = ''date and time library for common lisp''; + description = "date and time library for common lisp"; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz''; - sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h''; + url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz"; + sha256 = "1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h"; }; packageName = "simple-date-time"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 55671ce1336..c4bae5608ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''simple-date''; - version = ''postmodern-20201016-git''; + baseName = "simple-date"; + version = "postmodern-20201016-git"; parasites = [ "simple-date/tests" ]; - description = ''Simple date library that can be used with postmodern''; + description = "Simple date library that can be used with postmodern"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; - sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; + url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz"; + sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n"; }; packageName = "simple-date"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix index 55d35ba8c0f..596e509608a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''simple-tasks''; - version = ''20190710-git''; + baseName = "simple-tasks"; + version = "20190710-git"; - description = ''A very simple task scheduling framework.''; + description = "A very simple task scheduling framework."; deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz''; - sha256 = ''12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3''; + url = "http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz"; + sha256 = "12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3"; }; packageName = "simple-tasks"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index 63adab55741..18d669225a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''smart-buffer''; - version = ''20160628-git''; + baseName = "smart-buffer"; + version = "20160628-git"; - description = ''Smart octets buffer''; + description = "Smart octets buffer"; deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz''; - sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s''; + url = "http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz"; + sha256 = "1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s"; }; packageName = "smart-buffer"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index a22076facd3..3971d410441 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''split-sequence''; - version = ''v2.0.0''; + baseName = "split-sequence"; + version = "v2.0.0"; parasites = [ "split-sequence/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz''; - sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba''; + url = "http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz"; + sha256 = "09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba"; }; packageName = "split-sequence"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index ac04ba80a0d..145156be45d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''sqlite''; - version = ''cl-20190813-git''; + baseName = "sqlite"; + version = "cl-20190813-git"; - description = ''CL-SQLITE package is an interface to the SQLite embedded relational database engine.''; + description = "CL-SQLITE package is an interface to the SQLite embedded relational database engine."; deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz''; - sha256 = ''07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk''; + url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz"; + sha256 = "07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk"; }; packageName = "sqlite"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 7a84f077711..cf1f1655a36 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''static-vectors''; - version = ''v1.8.6''; + baseName = "static-vectors"; + version = "v1.8.6"; parasites = [ "static-vectors/test" ]; - description = ''Create vectors allocated in static memory.''; + description = "Create vectors allocated in static memory."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz''; - sha256 = ''0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc''; + url = "http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz"; + sha256 = "0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc"; }; packageName = "static-vectors"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index df63a5c9836..a4a688e1243 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''stefil''; - version = ''20181210-git''; + baseName = "stefil"; + version = "20181210-git"; parasites = [ "stefil-test" ]; - description = ''Stefil - Simple Test Framework In Lisp''; + description = "Stefil - Simple Test Framework In Lisp"; deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz''; - sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g''; + url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; + sha256 = "10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g"; }; packageName = "stefil"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix index 1109c9da04c..5fff3b8c568 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''str''; - version = ''cl-20200925-git''; + baseName = "str"; + version = "cl-20200925-git"; - description = ''Modern, consistent and terse Common Lisp string manipulation library.''; + description = "Modern, consistent and terse Common Lisp string manipulation library."; deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz''; - sha256 = ''06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn''; + url = "http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz"; + sha256 = "06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn"; }; packageName = "str"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 17a56c09b7e..616d3aa88b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''string-case''; - version = ''20180711-git''; + baseName = "string-case"; + version = "20180711-git"; - description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality''; + description = "string-case is a macro that generates specialised decision trees to dispatch on string equality"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz''; - sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z''; + url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz"; + sha256 = "1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z"; }; packageName = "string-case"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index 2ad15d1bd13..fe13a7d8c17 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''stumpwm''; - version = ''20201016-git''; + baseName = "stumpwm"; + version = "20201016-git"; - description = ''A tiling, keyboard driven window manager''; + description = "A tiling, keyboard driven window manager"; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz''; - sha256 = ''06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2''; + url = "http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz"; + sha256 = "06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2"; }; packageName = "stumpwm"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 69deb9044c3..e2f1ba6bd26 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''swank''; - version = ''slime-v2.26''; + baseName = "swank"; + version = "slime-v2.26"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz''; - sha256 = ''0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc''; + url = "http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz"; + sha256 = "0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc"; }; packageName = "swank"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index de11d48c934..7c19a271354 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''swap-bytes''; - version = ''v1.2''; + baseName = "swap-bytes"; + version = "v1.2"; parasites = [ "swap-bytes/test" ]; - description = ''Optimized byte-swapping primitives.''; + description = "Optimized byte-swapping primitives."; deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz''; - sha256 = ''05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8''; + url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; + sha256 = "05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8"; }; packageName = "swap-bytes"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix index 4bae3cc1cee..30a4a0bcbb0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''symbol-munger''; - version = ''20150407-git''; + baseName = "symbol-munger"; + version = "20150407-git"; description = ''Functions to convert between the spacing and capitalization conventions of various environments''; @@ -9,8 +9,8 @@ rec { deps = [ args."alexandria" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz''; - sha256 = ''0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6''; + url = "http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz"; + sha256 = "0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6"; }; packageName = "symbol-munger"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix index 141937219cd..bd318dcad1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia''; - version = ''20200925-git''; + baseName = "trivia"; + version = "20200925-git"; - description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix index 6b5e161a214..3f66d67eac3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_balland2006''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_balland2006"; + version = "trivia-20200925-git"; - description = ''Optimizer for Trivia based on (Balland 2006)''; + description = "Optimizer for Trivia based on (Balland 2006)"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.balland2006"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix index 1c883c07ab0..d6885e3f500 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level0''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_level0"; + version = "trivia-20200925-git"; - description = ''Bootstrapping Pattern Matching Library for implementing Trivia''; + description = "Bootstrapping Pattern Matching Library for implementing Trivia"; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.level0"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix index 1e9394d6447..d208c06e8b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level1''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_level1"; + version = "trivia-20200925-git"; - description = ''Core patterns of Trivia''; + description = "Core patterns of Trivia"; deps = [ args."alexandria" args."trivia_dot_level0" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.level1"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix index 75ee2bd8ee7..c6ce58bceb7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level2''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_level2"; + version = "trivia-20200925-git"; - description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.level2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix index 07ad7a56c2e..1dd17765257 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_quasiquote''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_quasiquote"; + version = "trivia-20200925-git"; - description = ''fare-quasiquote extension for trivia''; + description = "fare-quasiquote extension for trivia"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.quasiquote"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix index e2b8add6dfc..ef84229d7a0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_trivial''; - version = ''trivia-20200925-git''; + baseName = "trivia_dot_trivial"; + version = "trivia-20200925-git"; description = ''Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; - sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; + url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz"; + sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z"; }; packageName = "trivia.trivial"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 2d2bc4110dc..f095ecc223b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-backtrace''; - version = ''20200610-git''; + baseName = "trivial-backtrace"; + version = "20200610-git"; - description = ''trivial-backtrace''; + description = "trivial-backtrace"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz''; - sha256 = ''0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks''; + url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz"; + sha256 = "0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks"; }; packageName = "trivial-backtrace"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix index 3e21ceab87d..c72e79dac51 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-clipboard''; - version = ''20200925-git''; + baseName = "trivial-clipboard"; + version = "20200925-git"; - description = ''trivial-clipboard let access system clipboard.''; + description = "trivial-clipboard let access system clipboard."; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz''; - sha256 = ''1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc''; + url = "http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz"; + sha256 = "1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc"; }; packageName = "trivial-clipboard"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix index 278ad5b0ac4..a73c24e9f5e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-cltl2''; - version = ''20200325-git''; + baseName = "trivial-cltl2"; + version = "20200325-git"; - description = ''Compatibility package exporting CLtL2 functionality''; + description = "Compatibility package exporting CLtL2 functionality"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz''; - sha256 = ''0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys''; + url = "http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz"; + sha256 = "0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys"; }; packageName = "trivial-cltl2"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 53669a4675b..5988055841c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-features''; - version = ''20200715-git''; + baseName = "trivial-features"; + version = "20200715-git"; - description = ''Ensures consistent *FEATURES* across multiple CLs.''; + description = "Ensures consistent *FEATURES* across multiple CLs."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz''; - sha256 = ''0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2''; + url = "http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz"; + sha256 = "0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2"; }; packageName = "trivial-features"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix index 892e1d49d50..a06eda6ff18 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-file-size''; - version = ''20200427-git''; + baseName = "trivial-file-size"; + version = "20200427-git"; parasites = [ "trivial-file-size/tests" ]; - description = ''Stat a file's size.''; + description = "Stat a file's size."; deps = [ args."fiveam" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz''; - sha256 = ''1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa''; + url = "http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz"; + sha256 = "1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa"; }; packageName = "trivial-file-size"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index ce1f75522aa..7804dc8b9ab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-garbage''; - version = ''20200925-git''; + baseName = "trivial-garbage"; + version = "20200925-git"; parasites = [ "trivial-garbage/tests" ]; - description = ''Portable finalizers, weak hash-tables and weak pointers.''; + description = "Portable finalizers, weak hash-tables and weak pointers."; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz''; - sha256 = ''00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83''; + url = "http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz"; + sha256 = "00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83"; }; packageName = "trivial-garbage"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index acefb692184..2b763b0480d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-gray-streams''; - version = ''20200925-git''; + baseName = "trivial-gray-streams"; + version = "20200925-git"; - description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; + description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz''; - sha256 = ''1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b''; + url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz"; + sha256 = "1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b"; }; packageName = "trivial-gray-streams"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index de16d810824..42e09023af3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-indent''; - version = ''20191007-git''; + baseName = "trivial-indent"; + version = "20191007-git"; - description = ''A very simple library to allow indentation hints for SWANK.''; + description = "A very simple library to allow indentation hints for SWANK."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz''; - sha256 = ''0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv''; + url = "http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz"; + sha256 = "0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv"; }; packageName = "trivial-indent"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix index 473a41063e7..b4164949203 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-macroexpand-all''; - version = ''20171023-git''; + baseName = "trivial-macroexpand-all"; + version = "20171023-git"; - description = ''Call each implementation's macroexpand-all equivalent''; + description = "Call each implementation's macroexpand-all equivalent"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz''; - sha256 = ''0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm''; + url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz"; + sha256 = "0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm"; }; packageName = "trivial-macroexpand-all"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix index dc0de9da624..de53bf5bd05 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-main-thread''; - version = ''20190710-git''; + baseName = "trivial-main-thread"; + version = "20190710-git"; - description = ''Compatibility library to run things in the main thread.''; + description = "Compatibility library to run things in the main thread."; deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" args."simple-tasks" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz''; - sha256 = ''1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h''; + url = "http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz"; + sha256 = "1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h"; }; packageName = "trivial-main-thread"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 2e2888444e5..36c6e31cc8d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-mimes''; - version = ''20200715-git''; + baseName = "trivial-mimes"; + version = "20200715-git"; - description = ''Tiny library to detect mime types in files.''; + description = "Tiny library to detect mime types in files."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz''; - sha256 = ''10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1''; + url = "http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz"; + sha256 = "10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1"; }; packageName = "trivial-mimes"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix index 9cd37f80723..78dcc5163b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-package-local-nicknames''; - version = ''20200610-git''; + baseName = "trivial-package-local-nicknames"; + version = "20200610-git"; - description = ''Portability library for package-local nicknames''; + description = "Portability library for package-local nicknames"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz''; - sha256 = ''1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5''; + url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz"; + sha256 = "1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5"; }; packageName = "trivial-package-local-nicknames"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64a..83785140dbd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-types''; - version = ''20120407-git''; + baseName = "trivial-types"; + version = "20120407-git"; - description = ''Trivial type definitions''; + description = "Trivial type definitions"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz''; - sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx''; + url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz"; + sha256 = "0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx"; }; packageName = "trivial-types"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index e01eac48a2d..c38ca16d2ff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''trivial-utf-8''; - version = ''20200925-git''; + baseName = "trivial-utf-8"; + version = "20200925-git"; parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ]; - description = ''A small library for doing UTF-8-based input and output.''; + description = "A small library for doing UTF-8-based input and output."; deps = [ args."mgl-pax" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz''; - sha256 = ''06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b''; + url = "http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz"; + sha256 = "06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b"; }; packageName = "trivial-utf-8"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix index e76be59540b..bc08f1683de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''type-i''; - version = ''20191227-git''; + baseName = "type-i"; + version = "20191227-git"; - description = ''Type Inference Utility on Fundamentally 1-arg Predicates''; + description = "Type Inference Utility on Fundamentally 1-arg Predicates"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz''; - sha256 = ''0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5''; + url = "http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz"; + sha256 = "0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5"; }; packageName = "type-i"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix index a2980a9d40e..35754246347 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''uax-15''; - version = ''20200325-git''; + baseName = "uax-15"; + version = "20200325-git"; parasites = [ "uax-15/tests" ]; - description = ''Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)''; + description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)"; deps = [ args."cl-ppcre" args."fiveam" args."split-sequence" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz''; - sha256 = ''0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc''; + url = "http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz"; + sha256 = "0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc"; }; packageName = "uax-15"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f7..2c36113658a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''uffi''; - version = ''20180228-git''; + baseName = "uffi"; + version = "20180228-git"; - description = ''Universal Foreign Function Library for Common Lisp''; + description = "Universal Foreign Function Library for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz''; - sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479''; + url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; + sha256 = "1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479"; }; packageName = "uffi"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index ab96b032257..b5a77d6ea34 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''uiop''; - version = ''3.3.4''; + baseName = "uiop"; + version = "3.3.4"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz''; - sha256 = ''0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav''; + url = "http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz"; + sha256 = "0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav"; }; packageName = "uiop"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c456496732..8f54a89416e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''unit-test''; - version = ''20120520-git''; + baseName = "unit-test"; + version = "20120520-git"; - description = ''unit-testing framework for common lisp''; + description = "unit-testing framework for common lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz''; - sha256 = ''1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l''; + url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz"; + sha256 = "1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l"; }; packageName = "unit-test"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix index 7243d5a17ed..250ef24f9ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''unix-options''; - version = ''20151031-git''; + baseName = "unix-options"; + version = "20151031-git"; - description = ''Easy to use command line option parser''; + description = "Easy to use command line option parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz''; - sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5''; + url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz"; + sha256 = "0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5"; }; packageName = "unix-options"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix index 8475b8e4ffd..b7af624f7a5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''unix-opts''; - version = ''20200925-git''; + baseName = "unix-opts"; + version = "20200925-git"; parasites = [ "unix-opts/tests" ]; - description = ''minimalistic parser of command line arguments''; + description = "minimalistic parser of command line arguments"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz''; - sha256 = ''0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35''; + url = "http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz"; + sha256 = "0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35"; }; packageName = "unix-opts"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix index 04a09a8ab40..977ee934c90 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''usocket-server''; - version = ''usocket-0.8.3''; + baseName = "usocket-server"; + version = "usocket-0.8.3"; - description = ''Universal socket library for Common Lisp (server side)''; + description = "Universal socket library for Common Lisp (server side)"; deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz''; - sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7''; + url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; + sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; }; packageName = "usocket-server"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index 6b75384ea10..4dbf781f968 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''usocket''; - version = ''0.8.3''; + baseName = "usocket"; + version = "0.8.3"; - description = ''Universal socket library for Common Lisp''; + description = "Universal socket library for Common Lisp"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz''; - sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7''; + url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; + sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; }; packageName = "usocket"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix index b672d0c2ec5..5b992620ecd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''utilities_dot_print-items''; - version = ''20190813-git''; + baseName = "utilities_dot_print-items"; + version = "20190813-git"; parasites = [ "utilities.print-items/test" ]; - description = ''A protocol for flexible and composable printing.''; + description = "A protocol for flexible and composable printing."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz''; - sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2''; + url = "http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz"; + sha256 = "12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2"; }; packageName = "utilities.print-items"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix index 80ff6d9ff76..2f2345fe0be 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''utilities_dot_print-tree''; - version = ''20200325-git''; + baseName = "utilities_dot_print-tree"; + version = "20200325-git"; parasites = [ "utilities.print-tree/test" ]; - description = ''This system provides simple facilities for printing tree structures.''; + description = "This system provides simple facilities for printing tree structures."; deps = [ args."alexandria" args."fiveam" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz''; - sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww''; + url = "http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz"; + sha256 = "1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww"; }; packageName = "utilities.print-tree"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix index 43ae799961d..a64d913d1d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''uuid''; - version = ''20200715-git''; + baseName = "uuid"; + version = "20200715-git"; - description = ''UUID Generation''; + description = "UUID Generation"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz''; - sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0''; + url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz"; + sha256 = "1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0"; }; packageName = "uuid"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799e..401466e8a59 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''vom''; - version = ''20160825-git''; + baseName = "vom"; + version = "20160825-git"; - description = ''A tiny logging utility.''; + description = "A tiny logging utility."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz''; - sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93''; + url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz"; + sha256 = "0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93"; }; packageName = "vom"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 78c2e30d7ee..e4ddb59c398 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''woo''; - version = ''20200427-git''; + baseName = "woo"; + version = "20200427-git"; - description = ''An asynchronous HTTP server written in Common Lisp''; + description = "An asynchronous HTTP server written in Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz''; - sha256 = ''1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29''; + url = "http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz"; + sha256 = "1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29"; }; packageName = "woo"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 257ed57df4e..b28c751fdd4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''wookie''; - version = ''20191130-git''; + baseName = "wookie"; + version = "20191130-git"; - description = ''An evented webserver for Common Lisp.''; + description = "An evented webserver for Common Lisp."; deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz''; - sha256 = ''13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2''; + url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz"; + sha256 = "13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2"; }; packageName = "wookie"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 5a1b9039425..5130b81c91a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''xembed''; - version = ''clx-20191130-git''; + baseName = "xembed"; + version = "clx-20191130-git"; - description = ''An implementation of the XEMBED protocol that integrates with CLX.''; + description = "An implementation of the XEMBED protocol that integrates with CLX."; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz''; - sha256 = ''1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd''; + url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz"; + sha256 = "1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd"; }; packageName = "xembed"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix index 4bfc0678f0f..f46bff1f58f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''xkeyboard''; - version = ''clx-20120811-git''; + baseName = "xkeyboard"; + version = "clx-20120811-git"; parasites = [ "xkeyboard-test" ]; - description = ''XKeyboard is X11 extension for clx of the same name.''; + description = "XKeyboard is X11 extension for clx of the same name."; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz''; - sha256 = ''11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n''; + url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; + sha256 = "11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n"; }; packageName = "xkeyboard"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix index 35854cd6b96..730b1287ba2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { - baseName = ''xml_dot_location''; - version = ''20200325-git''; + baseName = "xml_dot_location"; + version = "20200325-git"; parasites = [ "xml.location/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz''; - sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx''; + url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; + sha256 = "0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx"; }; packageName = "xml.location"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index c02e6e24818..e1da47fe37a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''xmls''; - version = ''3.0.2''; + baseName = "xmls"; + version = "3.0.2"; parasites = [ "xmls/test" "xmls/unit-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz''; - sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi''; + url = "http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz"; + sha256 = "1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi"; }; packageName = "xmls"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 3e14a5ba9f0..1f062549a0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { - baseName = ''xpath''; - version = ''plexippus-20190521-git''; + baseName = "xpath"; + version = "plexippus-20190521-git"; parasites = [ "xpath/test" ]; - description = ''An implementation of the XML Path Language (XPath) Version 1.0''; + description = "An implementation of the XML Path Language (XPath) Version 1.0"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz''; - sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa''; + url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; + sha256 = "15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa"; }; packageName = "xpath"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c3..7d0c52d28a7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''xsubseq''; - version = ''20170830-git''; + baseName = "xsubseq"; + version = "20170830-git"; description = ''Efficient way to manage "subseq"s in Common Lisp''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz''; - sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml''; + url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; + sha256 = "1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml"; }; packageName = "xsubseq"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3f..5ec84290c4d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''yacc''; - version = ''cl-20101006-darcs''; + baseName = "yacc"; + version = "cl-20101006-darcs"; - description = ''A LALR(1) parser generator for Common Lisp''; + description = "A LALR(1) parser generator for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz''; - sha256 = ''0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7''; + url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz"; + sha256 = "0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7"; }; packageName = "yacc"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index 9f6ac0a84ca..727bb74e57b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''yason''; - version = ''v0.7.8''; + baseName = "yason"; + version = "v0.7.8"; - description = ''JSON parser/encoder''; + description = "JSON parser/encoder"; deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz''; - sha256 = ''11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1''; + url = "http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz"; + sha256 = "11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1"; }; packageName = "yason"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 74e5d7e97e9..bed825c24b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { - baseName = ''zpb-ttf''; - version = ''1.0.3''; + baseName = "zpb-ttf"; + version = "1.0.3"; - description = ''Access TrueType font metrics and outlines from Common Lisp''; + description = "Access TrueType font metrics and outlines from Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz''; - sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6''; + url = "http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz"; + sha256 = "1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6"; }; packageName = "zpb-ttf"; diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index ebb5b9b9c25..d90a80c5648 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -46,7 +46,7 @@ buildDunePackage rec { stdio ]; - preBuild = ''export LIBTORCH=${pytorch.dev}/''; + preBuild = "export LIBTORCH=${pytorch.dev}/"; doCheck = !stdenv.isAarch64; checkPhase = "dune runtest"; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 369dc1bc39b..952d583bfd8 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ]; makeFlags = [ - "libdir=${placeholder ''out''}/lib" - "prefix=${placeholder ''out''}/" + "libdir=${placeholder "out"}/lib" + "prefix=${placeholder "out"}/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 47144fc07aa..a03b051b11d 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; doCheck = true; - checkPhase = ''HOME=$TMP nosetests''; + checkPhase = "HOME=$TMP nosetests"; meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications."; diff --git a/pkgs/development/python-modules/betacode/default.nix b/pkgs/development/python-modules/betacode/default.nix index 8bd78fb49d2..79136e479d2 100644 --- a/pkgs/development/python-modules/betacode/default.nix +++ b/pkgs/development/python-modules/betacode/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5"; }; - preBuild = ''echo > README.rst''; + preBuild = "echo > README.rst"; # setup.py uses a python3 os.path.join disabled = !isPy3k; propagatedBuildInputs = [ pygtrie ]; diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 55a12009a15..8c65cca07b2 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pytest-benchmark ]; - checkPhase = ''pytest --benchmark-skip''; + checkPhase = "pytest --benchmark-skip"; propagatedBuildInputs = [ python-dateutil diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index aabebe1c521..d15185e1447 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - checkPhase = ''nosetests''; + checkPhase = "nosetests"; meta = with lib; { description = "Emoji for Python"; diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index f38f5d74097..883ff69c6d6 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { and not test_conditional_upload and not test_conditional_download_with_older_target \ '' # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed - + lib.optionalString stdenv.isDarwin ''and not test_error_message_reuse'' + + lib.optionalString stdenv.isDarwin "and not test_error_message_reuse" + ''"''; meta = with lib; { diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index 6f439f0f69a..f6d327d229d 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; # Suppress overly verbose output if tests run successfully - checkPhase = ''pytest >/dev/null || pytest''; + checkPhase = "pytest >/dev/null || pytest"; meta = { homepage = "https://github.com/jpvanhal/inflection"; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 371fd4b8830..7d4f6dd9363 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ]; # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs - checkPhase = ''$out/bin/jenkins-jobs --help''; + checkPhase = "$out/bin/jenkins-jobs --help"; meta = with lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 7c2125c7b77..44ee4597dbe 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -31,7 +31,7 @@ in buildPythonPackage rec { ''; # We do not want any wrappers here. - postFixup = ''''; + postFixup = ""; checkPhase = '' tests/run-tests diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 5234723a536..a910bf3245f 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; - checkPhase = '' py.test tests/unit ''; + checkPhase = "py.test tests/unit "; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 6b875528d1d..22c34b82a5f 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -28,8 +28,7 @@ buildPythonPackage rec { else ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\"" '') - + '' - ''; + + ""; # the tests only work with the standard unrar package doCheck = useUnrar; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index 8eb197151a3..a828c57b8c0 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ lua5_3 python ]; - buildPhase = ''${stdenv.shell} make_unix.sh''; + buildPhase = "${stdenv.shell} make_unix.sh"; - checkPhase = ''${python.interpreter} scripts/test.py''; + checkPhase = "${python.interpreter} scripts/test.py"; installPhase = '' mkdir -p "$out/share/bam" diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 824668055b1..9ece650f0cb 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "218875ebe23806e7af82f3b5b14bb3355534f679"; goPackagePath = "github.com/fatih/motion"; - excludedPackages = ''testdata''; + excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 618ddc7d450..bcd1f56f525 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { nativeBuildInputs = [ go-bindata gotools makeWrapper ]; - preBuild = ''go generate ./...''; + preBuild = "go generate ./..."; postInstall = '' wrapProgram $out/bin/go2nix \ diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 59f17e8acfd..995bd3102cc 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { # standard packages. allowGoReference = true; - excludedPackages = ''internal/suggest/testdata''; + excludedPackages = "internal/suggest/testdata"; src = fetchFromGitHub { owner = "stamblerre"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index a50c5969167..9bed4073b2b 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c"; goPackagePath = "github.com/mdempsky/gocode"; - excludedPackages = ''internal/suggest/testdata''; + excludedPackages = "internal/suggest/testdata"; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 0fc1dcfbae0..6170cbb4318 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { --set-rpath $out/lib:"${libPath}" \ $out/bin/iaca ''; - postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib''; + postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib"; meta = { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 0d0f6824ce7..21580957752 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; goPackagePath = "github.com/gordonklaus/ineffassign"; - excludedPackages = ''testdata''; + excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index b7f568f4d2b..4358ee24489 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/pkgs/development/tools/interfacer/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { rev = "c20040233aedb03da82d460eca6130fcd91c629a"; goPackagePath = "mvdan.cc/interfacer"; - excludedPackages = ''check/testdata''; + excludedPackages = "check/testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index bb14e26bfd9..74073722857 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -8,8 +8,8 @@ let name = "bossa-bin2c"; src = ./bin2c.c; dontUnpack = true; - buildPhase = ''cc $src -o bin2c''; - installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; + buildPhase = "cc $src -o bin2c"; + installPhase = "mkdir -p $out/bin; cp bin2c $out/bin/"; }; in diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 1d3a36c5773..4fe93694ab7 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''Common Lisp launcher script''; + description = "Common Lisp launcher script"; license = lib.licenses.llgpl21 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 9f83ca5565f..77f34cca7de 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; - description = ''A package manager for Lua''; + description = "A package manager for Lua"; license = licenses.mit ; maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index 5e66b974337..6bfcb312923 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation ({ buildInputs = [ ]; - patchPhase = ''chmod +x configure''; + patchPhase = "chmod +x configure"; - configurePhase = ''./configure -t lite''; + configurePhase = "./configure -t lite"; - buildPhase = ''cd src; make; cd -''; + buildPhase = "cd src; make; cd -"; - installPhase = ''cd src; make install; cd -; cp -vr $PWD $out''; + installPhase = "cd src; make install; cd -; cp -vr $PWD $out"; meta = { description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program"; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ea2f27b0e22..e8d4159deee 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -132,7 +132,7 @@ let mVal = ''[a-zA-Z0-9\'"_\. ]+''; mOp = "in|[!=<>]+"; e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + m = builtins.map stripStr (builtins.match "^(${mVal}) *(${mOp}) *(${mVal})$" e); m0 = processVar (builtins.elemAt m 0); m2 = processVar (builtins.elemAt m 2); in diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix index 6b65632bf7d..17e888fee41 100644 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -1,7 +1,7 @@ { - pname = ''setupcfg2nix''; - version = ''2.0.1''; + pname = "setupcfg2nix"; + version = "2.0.1"; install_requires = [ - ''setuptools'' + "setuptools" ]; } diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index b64776bac3c..76728c5f2d8 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Gecko-based programmatically-driven browser''; + description = "Gecko-based programmatically-driven browser"; license = lib.licenses.mpl20 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 3244d7a0c84..68ecaf6479e 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; meta = with lib; { - description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; + description = "Convert YAML <=> TOML <=> JSON <=> HCL"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; homepage = "https://github.com/sclevine/yj"; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index afa0a22722a..9dad0b84d1e 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A blobby volleyball game''; + description = "A blobby volleyball game"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index e0d2fdd8252..5c7cad879d1 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''A small chess engine supporting fairy pieces''; + description = "A small chess engine supporting fairy pieces"; longDescription = '' A version of micro-Max that reads the piece description from a file fmax.ini, so that arbitrary fairy pieces can be diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 8870fe21ab9..aa93633906f 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; - description = ''A puzzle game''; + description = "A puzzle game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index db0c7a61ddb..e95371ec5ea 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-lm" ]; meta = with lib; { - description = ''The classic version of a quick tactics game LiquidWar''; + description = "The classic version of a quick tactics game LiquidWar"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 6f099a88b2c..b623d7bd539 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; meta = { - description = ''A simple character graphics game where you drive some kind of car across the moon's surface''; + description = "A simple character graphics game where you drive some kind of car across the moon's surface"; license = lib.licenses.gpl2; maintainers = [lib.maintainers.rybern]; platforms = lib.platforms.linux; diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix index 42424fe9ef4..b3d06a51fd3 100644 --- a/pkgs/games/n2048/default.nix +++ b/pkgs/games/n2048/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation { inherit (s) url sha256; }; makeFlags = [ - ''DESTDIR=$(out)'' + "DESTDIR=$(out)" ]; preInstall = '' mkdir -p "$out"/{share/man,bin} ''; meta = { inherit (s) version; - description = ''Console implementation of 2048 game''; + description = "Console implementation of 2048 game"; license = lib.licenses.bsd2; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 60609759559..fd0ebddfc32 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; meta = { - description = ''A puzzle game with mechanics similar to Lemmings''; + description = "A puzzle game with mechanics similar to Lemmings"; platforms = lib.platforms.linux; maintainers = [lib.maintainers.raskin]; license = lib.licenses.gpl3; diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 524559bc6f7..61e2e1c4eb3 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = { inherit (s) version; - description = ''Quantum mechanics-based minigolf-like game''; + description = "Quantum mechanics-based minigolf-like game"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 23cfa69fce6..90c0f3707cd 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; meta = { inherit (s) version; - description = ''GUI for chess engines''; + description = "GUI for chess engines"; homepage = "https://www.gnu.org/software/xboard/"; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 8ec625a0b6b..2d9f57d1e73 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXaw ]; makeFlags = [ - "INSTDIR=${placeholder ''out''}" + "INSTDIR=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 66f329ed0b9..8e603ef53f7 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11"; meta = { - description = ''A multiplayer space combat game (client part)''; + description = "A multiplayer space combat game (client part)"; homepage = "http://bloodspilot.sf.net/"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index c84f5222e68..74c2be586ce 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = with lib; { - description = ''Famous german card game''; + description = "Famous german card game"; platforms = platforms.unix; license = licenses.free; - longDescription = ''Play the german card game Skat against the AI or over IRC.''; + longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "http://www.xskat.de/"; }; } diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix index 309db8908c7..b095d61d987 100644 --- a/pkgs/misc/drivers/xow/default.nix +++ b/pkgs/misc/drivers/xow/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILD=RELEASE" "VERSION=${version}" - "BINDIR=${placeholder ''out''}/bin" - "UDEVDIR=${placeholder ''out''}/lib/udev/rules.d" - "MODLDIR=${placeholder ''out''}/lib/modules-load.d" - "MODPDIR=${placeholder ''out''}/lib/modprobe.d" - "SYSDDIR=${placeholder ''out''}/lib/systemd/system" + "BINDIR=${placeholder "out"}/bin" + "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" + "MODLDIR=${placeholder "out"}/lib/modules-load.d" + "MODPDIR=${placeholder "out"}/lib/modprobe.d" + "SYSDDIR=${placeholder "out"}/lib/systemd/system" ]; postUnpack = '' diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/misc/emulators/termtekst/default.nix index 8186aba1ee5..56f56cffad9 100644 --- a/pkgs/misc/emulators/termtekst/default.nix +++ b/pkgs/misc/emulators/termtekst/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = ''Console NOS Teletekst viewer in Python''; + description = "Console NOS Teletekst viewer in Python"; longDescription = '' Small Python app using curses to display Dutch NOS Teletekst on the Linux console. The original Teletekst font includes 2x6 diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix index 58ad5866c93..58cbe663c90 100644 --- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix @@ -18,7 +18,7 @@ writeShellScriptBin "vscodeExts2nix" '' for line in $(${vscode}/bin/code --list-extensions --show-versions \ ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' + | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : "${e.publisher}.${e.name}") extensionsToIgnore}\)' ''} ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] @@ -26,7 +26,7 @@ writeShellScriptBin "vscodeExts2nix" '' publisher=''${BASH_REMATCH[1]} version=''${BASH_REMATCH[3]} - extensions="${lib.concatMapStringsSep "." (e : ''${e.publisher}${e.name}@${e.sha256}'') extensions}" + extensions="${lib.concatMapStringsSep "." (e : "${e.publisher}${e.name}@${e.sha256}") extensions}" reCurrentExt=$publisher$name"@([^.]*)" if [[ $extensions =~ $reCurrentExt ]]; then sha256=''${BASH_REMATCH[1]} diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix index e20c631f8c0..39479d7c2f2 100644 --- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix @@ -18,22 +18,22 @@ let mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; mutableExtsPaths = lib.forEach mutExtsDrvs ( e: { - origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}''; - target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; + origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}"; + target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; } ); #removed not defined extensions rmExtensions = lib.optionalString (nixExtensions++mutableExtensions != []) '' find ${vscodeExtsFolderName} -mindepth 1 -maxdepth 1 ${ - lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name} '') nixExtensions + lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name} ") nixExtensions + - lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name}-${e.version} '') mutableExtensions + lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name}-${e.version} ") mutableExtensions } -exec rm -rf {} \; ''; #copy mutable extension out of the nix store cpExtensions = '' - ${lib.concatMapStringsSep "\n" (e : ''ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/'') nixExtsDrvs} + ${lib.concatMapStringsSep "\n" (e : "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/") nixExtsDrvs} ${lib.concatMapStringsSep "\n" (ePath : '' if [ ! -d ${ePath.target} ]; then cp -a ${ePath.origin} ${ePath.target} @@ -49,6 +49,6 @@ in ${cpExtensions} fi ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ - lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }'' + lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}" } "$@" '' diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index ea5786f6a56..a239f6607b1 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./trash.diff ]; - buildPhase = ''make all docs''; + buildPhase = "make all docs"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index ee167b31c96..935b5e65b1f 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -237,7 +237,7 @@ let name = "apparmor-kernel-patches-${apparmor-version}"; src = apparmor-sources; - phases = ''unpackPhase installPhase''; + phases = "unpackPhase installPhase"; installPhase = '' mkdir "$out" diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index f3df61c1510..e1b64c0a4b5 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; - description = ''Console system performance monitor''; + description = "Console system performance monitor"; longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 30f33262bc9..3d26fc3b005 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -49,12 +49,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { inherit (s) version; - description = ''An udev fork by Gentoo''; + description = "An udev fork by Gentoo"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; - homepage = ''https://www.gentoo.org/proj/en/eudev/''; - downloadPage = ''http://dev.gentoo.org/~blueness/eudev/''; + homepage = "https://www.gentoo.org/proj/en/eudev/"; + downloadPage = "http://dev.gentoo.org/~blueness/eudev/"; updateWalker = true; }; } diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index ce3d99b0409..6c0b5117e9d 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''Namespace-based sandboxing tool for Linux''; + description = "Namespace-based sandboxing tool for Linux"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index 88b5a308ee7..c2e49399582 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" "manprefix=$(out)/share/" ]; meta = { inherit (s) version; - description = ''Tool to detach from controlling TTY and attach to another''; + description = "Tool to detach from controlling TTY and attach to another"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix index 5bb6a85438d..608ca8e58cc 100644 --- a/pkgs/os-specific/linux/gfxtablet/default.nix +++ b/pkgs/os-specific/linux/gfxtablet/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1i2m98yypfa9phshlmvjlgw7axfisxmldzrvnbzm5spvv5s4kvvb"; }; - preBuild = ''cd driver-uinput''; + preBuild = "cd driver-uinput"; installPhase = '' mkdir -p "$out/bin" @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Uinput driver for Android GfxTablet tablet-as-input-device app''; + description = "Uinput driver for Android GfxTablet tablet-as-input-device app"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 90f8df63e3b..cdfc91a6837 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/etc/udev/rules.d" ''; - postInstall = ''rmdir $out/dev''; + postInstall = "rmdir $out/dev"; meta = with lib; { description = "grsecurity RBAC administration and policy analysis utility"; diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 83e06bbe6f3..8cbc8466a91 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" ]; hardeningDisable = lib.optional (stdenv.isi686) "stackprotector"; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 15bd499650c..ff3100cbb22 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if configOpts == null then "" else '' - ln -sf ${configOpts} ./config/config.opts'') + + (if configOpts == null then "" else "ln -sf ${configOpts} ./config/config.opts") ; makeFlags = [ "LEX=flex" ]; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index e961e1cf2c9..daebf174faf 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \ -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \ defaults.yaml - ${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""} + ${if confFile != "" then "cat ${confFile} >> defaults.yaml" else ""} mv defaults.yaml $out/conf; # Link to extra jars diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index eac51beadcb..d03cd1c915a 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { preBuild = "cd fingerd"; - preInstall = '' mkdir -p $out/man/man8 $out/sbin ''; + preInstall = "mkdir -p $out/man/man8 $out/sbin "; meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index eb45cb3bfc5..2d4e22ba244 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # dosen't work. Copying the files manually which can be found # in ubuntu -dev -classic, -example packages: # maybe some of those files can be removed again - installPhase = ''cp -r gen/firebird $out''; + installPhase = "cp -r gen/firebird $out"; meta = { description = "SQL relational database management system"; diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index 3f2792f6498..a357f0291ce 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ]; installFlags = [ - "INCLUDEDIR=${placeholder ''out''}/include" - "LIBEXECDIR=${placeholder ''out''}/modules" + "INCLUDEDIR=${placeholder "out"}/include" + "LIBEXECDIR=${placeholder "out"}/modules" ]; meta = with lib; { diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 1bbaacd5844..fc75003f392 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -83,10 +83,10 @@ stdenv.mkDerivation { openldap # optional pam # optional ]; - postPatch = ''. ${postPatch}''; + postPatch = ". ${postPatch}"; dontAddPrefix = true; - postInstall = ''. ${postInstall}''; - postInstallCheck = ''. ${./post-install-check.sh}''; + postInstall = ". ${postInstall}"; + postInstallCheck = ". ${./post-install-check.sh}"; meta = { description = "enterprise-class system for sending and receiving facsimiles"; downloadPage = "https://hylafax.sourceforge.io/download.php"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 458bc7ea845..ddd05150806 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -364,42 +364,42 @@ self: super: outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" + "sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" + "sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" + "sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; installFlags = [ - "sdkdir=${placeholder ''dev''}/include/xorg" + "sdkdir=${placeholder "dev"}/include/xorg" ]; }); xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev installFlags = [ - "sdkdir=${placeholder ''out''}/include/xorg" - "configdir=${placeholder ''out''}/share/X11/xorg.conf.d" + "sdkdir=${placeholder "out"}/include/xorg" + "configdir=${placeholder "out"}/share/X11/xorg.conf.d" ]; }); xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: { configureFlags = [ - "--sysconfdir=${placeholder ''out''}/etc" - "--with-xorg-conf-dir=${placeholder ''out''}/share/X11/xorg.conf.d" - "--with-udev-rules-dir=${placeholder ''out''}/lib/udev/rules.d" + "--sysconfdir=${placeholder "out"}/etc" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" + "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" ]; meta = attrs.meta // { diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 7022f6b37e3..c10537959d7 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - buildPhase = ''sh ./Build.sh -r''; + buildPhase = "sh ./Build.sh -r"; installPhase = '' install -D -m 755 mksh $out/bin/mksh diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index dbb4a056455..38b168c0e72 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -87,7 +87,7 @@ let inherit (localSystem) system; in isClang = true; }; - preHook = ''export NIX_NO_SELF_RPATH=1''; + preHook = "export NIX_NO_SELF_RPATH=1"; }; }) diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index 797d624323b..b4df0f00342 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh"; }; - prePatch = ''substituteInPlace ./Makefile --replace /usr $out''; + prePatch = "substituteInPlace ./Makefile --replace /usr $out"; buildInputs = [ libX11 xorgproto ]; diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 9e7b85f6ef9..758450d3654 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A command-line tool to print idle time from libXss''; + description = "A command-line tool to print idle time from libXss"; homepage = "http://taktoa.me/xprintidle-ng/"; license = lib.licenses.gpl2; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 81cefb01c7f..311f1e42901 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''X window switcher drawing a colourful grid''; + description = "X window switcher drawing a colourful grid"; license = lib.licenses.bsd2 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index cfd764aa11e..e74637ca25e 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { ''; installFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index f8131046df1..58c748fe4e8 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; buildFlags = if stdenv.isCygwin then [ "cygwin" ] else [ "generic" ]; installFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" "INSTALL=cp" ]; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index c5083bbb05a..358e662ca1e 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -21,8 +21,7 @@ stdenv.mkDerivation { # work around a problem related to gtk3 updates NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - postInstall = '' - ''; + postInstall = ""; meta = with lib; { description = ""; diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 0804b5132c5..a923724419d 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" ]; meta = with lib; { - description = ''High-perfomance MySQL backup tool''; + description = "High-perfomance MySQL backup tool"; homepage = "https://github.com/maxbube/mydumper"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index b0e7f9e8f6b..7f8733b9b4e 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A set of tools to optimize deflate-compressed files''; + description = "A set of tools to optimize deflate-compressed files"; license = licenses.gpl3 ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index b55c1a887ff..833dcae8850 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - description = ''A parallel compressor/decompressor for xz format''; + description = "A parallel compressor/decompressor for xz format"; license = lib.licenses.bsd2; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index f5dbabaf583..8f4e9941029 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ docopt anytree ]; - postPatch = '' patchShebangs . ''; + postPatch = "patchShebangs . "; meta = with lib; { description = "The command line catalog tool for your offline data"; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5145889407e..a1e9fad4540 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - ''--localstatedir=/var'' + "--localstatedir=/var" ]; nativeBuildInputs = [ rpcsvc-proto ]; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 8dfdd96dbeb..0dce22b8bbb 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -57,8 +57,7 @@ in rec { ''; meta = common.meta // { - longDescription = common.meta.longDescription + '' - This package provides the servers and libraries.''; + longDescription = common.meta.longDescription + "This package provides the servers and libraries."; }; }); @@ -93,8 +92,7 @@ in rec { meta = common.meta // { description = common.meta.description + " CLI clients"; - longDescription = common.meta.longDescription + '' - This package provides the CLI clients, called 'icommands'.''; + longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; }; }); } diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 727aa1dc56e..9dc2ad4d5f5 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; # Install udev rules, but remove lines that set up the udev-acl diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/tools/graphics/cfdg/src-info-for-default.nix index 0e2018b6bfd..b84376e9882 100644 --- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-info-for-default.nix @@ -1,6 +1,6 @@ { downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page"; baseName = "cfdg"; - sourceRegexp = ''.*[.]tgz''; + sourceRegexp = ".*[.]tgz"; versionExtractorSedScript = ''s/[^0-9]*([0-9.]*)[.]tgz/\1/''; } diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix index 4a4920ec6b9..714cdd656df 100644 --- a/pkgs/tools/graphics/convchain/default.nix +++ b/pkgs/tools/graphics/convchain/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [mono]; meta = { inherit version; - description = ''Bitmap generation from a single example with convolutions and MCMC''; + description = "Bitmap generation from a single example with convolutions and MCMC"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index c8e3e8012b1..1d26379c396 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -51,7 +51,7 @@ assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${v assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies."; mkDerivation rec { - pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}"; + pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; version = "2.7.1"; gmic-community = fetchFromGitHub { diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 82c0332689b..4f1770be17e 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = ''A small QR-code tool''; + description = "A small QR-code tool"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index bfa9bb36ce7..8ca8ecf2c89 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; - description = ''A small QR code decoding library''; + description = "A small QR code decoding library"; license = lib.licenses.isc; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix index e39742d76d0..a076e97d056 100644 --- a/pkgs/tools/graphics/syntex/default.nix +++ b/pkgs/tools/graphics/syntex/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [mono]; meta = { inherit version; - description = ''Texture synthesis from examples''; + description = "Texture synthesis from examples"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix index 4e84380f959..f761e2bbde6 100644 --- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [mono]; meta = { inherit version; - description = ''A generator of bitmaps that are locally similar to the input bitmap''; + description = "A generator of bitmaps that are locally similar to the input bitmap"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index c3f03da8bc5..f4eeb50fc03 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { inherit version; - description = ''1D and 2D code reading library''; + description = "1D and 2D code reading library"; license = lib.licenses.asl20; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 38f746e3cee..f78d52f5b67 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -42,8 +42,8 @@ in stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" - "SYSCONFDIR=${placeholder ''out''}/etc" + "PREFIX=${placeholder "out"}" + "SYSCONFDIR=${placeholder "out"}/etc" "PYTHON=${python.interpreter}" ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 7374733f542..c555c507d7b 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -101,8 +101,8 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "test_execsdir=${placeholder ''installedTests''}/libexec/installed-tests/ibus" - "test_sourcesdir=${placeholder ''installedTests''}/share/installed-tests/ibus" + "test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus" + "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus" ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index 140e09c010a..af37d7a33c1 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf ncurses pcre ]; - preConfigure = '' autoheader && autoconf ''; + preConfigure = "autoheader && autoconf "; meta = with lib; { description = "Fast, modular log colorizer"; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 9b97886682f..8de7cc99336 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''Debian package maintenance scripts''; + description = "Debian package maintenance scripts"; license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with maintainers; [raskin]; platforms = with platforms; linux; diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index 0445a424a40..fd7c3b23adf 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; - description = ''A set of network-related (mostly VPN-related) tools''; + description = "A set of network-related (mostly VPN-related) tools"; license = lib.licenses.bsd3 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index e5159fef101..18d72daa009 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bitbucket.org/ripencc/bgpdump/"; - description = ''Analyze dump files produced by Zebra/Quagga or MRT''; + description = "Analyze dump files produced by Zebra/Quagga or MRT"; license = lib.licenses.hpnd; maintainers = with lib.maintainers; [ lewo ]; platforms = with lib.platforms; linux; diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index f3ecf7a9702..189f636cd1f 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preBuild = "cd finger"; - preInstall = '' mkdir -p $out/man/man1 $out/bin ''; + preInstall = "mkdir -p $out/man/man1 $out/bin "; meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index e311fef339f..bd31235b6f9 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { }) ]; - preConfigure = '' autoconf ''; + preConfigure = "autoconf "; meta = { description = "Network traffic visualizer"; diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index dd09d91a203..9856634116e 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; meta = { inherit (s) version; - description = ''CLI email sending tool''; + description = "CLI email sending tool"; license = lib.licenses.bsd3 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index fd36680c992..2ebec34b219 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -47,7 +47,7 @@ buildPythonApplication rec { # feed args to wrapPythonApp makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}" - ''''${qtWrapperArgs[@]}'' + "\${qtWrapperArgs[@]}" ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 1d2f3ab0fee..ba3c51822e9 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; }; buildInputs = [ apacheAnt jdk ]; - PREFIX = ''''${env.out}''; + PREFIX = "\${env.out}"; AXIS2_LIB = "${axis2}/lib"; AXIS2_WEBAPP = "${axis2}/webapps/axis2"; DBUS_JAVA_LIB = "${dbus_java}/share/java"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2437613755d..c980fda3c86 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -126,7 +126,7 @@ common = ] ++ lib.optional ( stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system - ) ''--with-system=${stdenv.hostPlatform.nix.system}'' + ) "--with-system=${stdenv.hostPlatform.nix.system}" # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index d19f07595e8..53127173f79 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-appindicator" ]; - preFixup = ''gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)''; + preFixup = "gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)"; enableParallelBuilding = true; diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix index a2533c1c6a0..7561b1fae98 100644 --- a/pkgs/tools/security/pbis/default.nix +++ b/pkgs/tools/security/pbis/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { fi NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" ''; - configureScript = ''../configure''; + configureScript = "../configure"; configureFlags = [ "CFLAGS=-O" "--docdir=${placeholder "prefix"}/share/doc" diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 23b79af73cd..eb889cfef16 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w"; }; - postUnpack = ''mkdir -vp $sourceRoot/m4''; + postUnpack = "mkdir -vp $sourceRoot/m4"; outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index db3c066c0ba..11a45fbe391 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''The classical Unix `at' job scheduling command''; + description = "The classical Unix `at' job scheduling command"; license = lib.licenses.gpl2Plus; homepage = "https://packages.qa.debian.org/at"; platforms = lib.platforms.linux; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 1d315004018..2f0e2c600d0 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { dontDisableStatic = static; meta = with lib; { - description = ''Command-line interface to IPMI-enabled devices''; + description = "Command-line interface to IPMI-enabled devices"; license = licenses.bsd3; homepage = "https://sourceforge.net/projects/ipmitool/"; platforms = platforms.unix; diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index a235ea09d35..a87beb14a84 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { echo "$NIX_CC/bin/cc -s" >src/conf-ld ''; - buildPhase = ''package/compile''; + buildPhase = "package/compile"; installPhase = '' mkdir -p $out/bin @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mv doc/*.html $doc/share/doc/socklog/html/ ''; - checkPhase = ''package/check''; + checkPhase = "package/check"; doCheck = true; diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index d0458660c20..9b92635d1d7 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = ''wrapPythonPrograms''; + postFixup = "wrapPythonPrograms"; meta = with lib; { description = "Fix for Intel CPU throttling issues"; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index d0fa04aa83f..3f71f8abc5a 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { }) ]; - makeFlags = [ ''prefix=$(out)'' ] + makeFlags = [ "prefix=$(out)" ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" ++ optional stdenv.isDarwin "SYS=darwin" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71ec34213a3..78c500f8897 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23874,7 +23874,7 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; ocrad = callPackage ../applications/graphics/ocrad { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 186eb13a2b7..b87e528d4af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17986,7 +17986,7 @@ let sha256 = "0wfdixpm3p94mnng474l0nh9mjiy8q8hbrbh2af4vwn2hmazr91f"; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; - preBuild = ''ls''; + preBuild = "ls"; meta = { homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; @@ -22930,7 +22930,7 @@ let }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = "sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm"; meta = { description = "Get the idle time of X11"; }; -- cgit 1.4.1 From 6a30c02ac3856f75be7c03721fe3cc950dc8f71d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 24 Jan 2021 21:00:19 +0100 Subject: beamPackages: add missing lib where needed (#110708) changes in 2f78ee7 missed some places where lib had to be added --- pkgs/development/beam-modules/hex/default.nix | 2 +- pkgs/development/beam-modules/pc/default.nix | 2 +- pkgs/development/beam-modules/pgsql/default.nix | 2 +- pkgs/development/beam-modules/webdriver/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index e12f0ba4b74..794b9e5cf22 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText, elixir }: +{ lib, stdenv, fetchFromGitHub, writeText, elixir }: let shell = drv: stdenv.mkDerivation { diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index 8b5836f4c62..a6d7c1c44de 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/pkgs/development/beam-modules/pc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildHex }: +{ lib, buildHex }: buildHex { name = "pc"; diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index e64476212dd..df6561b7cf1 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, buildRebar3 }: +{ lib, stdenv, fetchFromGitHub, buildRebar3 }: let shell = drv: stdenv.mkDerivation { diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index da6cb127342..1255ec59c3a 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, writeText, erlang }: +{ lib, stdenv, fetchFromGitHub, writeText, erlang }: let shell = drv: stdenv.mkDerivation { -- cgit 1.4.1 From a35934f5d3d11ef0ee87f1ae62d7db2b27c5ad6e Mon Sep 17 00:00:00 2001 From: Milan Pässler Date: Sun, 24 Jan 2021 21:15:18 +0100 Subject: beamPackages: use callPackagesWith from nixpkgs lib 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 accidentally changed this from (nixpkgs) stdenv.lib to (beam-modules) lib', which broke things. This changes it back to (nixpkgs) lib. --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 4c25522635e..4f312129b38 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -6,7 +6,7 @@ let lib' = pkgs.callPackage ./lib.nix {}; # FIXME: add support for overrideScope - callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args; + callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args; mkScope = scope: pkgs // scope; packages = self: -- cgit 1.4.1 From a6ce00c50c36624fec06b2b756a766d4d0f4a888 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 25 Jan 2021 09:26:54 +0100 Subject: treewide: remove stdenv where not needed --- pkgs/applications/accessibility/contrast/default.nix | 2 +- pkgs/applications/audio/cadence/default.nix | 3 +-- pkgs/applications/audio/clementine/default.nix | 2 +- pkgs/applications/audio/cozy-audiobooks/default.nix | 2 +- pkgs/applications/audio/curseradio/default.nix | 2 +- pkgs/applications/audio/dfasma/default.nix | 2 +- pkgs/applications/audio/dr14_tmeter/default.nix | 2 +- pkgs/applications/audio/faust/faust2jackrust.nix | 3 +-- pkgs/applications/audio/fmit/default.nix | 2 +- pkgs/applications/audio/gnome-podcasts/default.nix | 2 +- pkgs/applications/audio/gpodder/default.nix | 2 +- pkgs/applications/audio/greg/default.nix | 2 +- pkgs/applications/audio/gtklick/default.nix | 2 +- pkgs/applications/audio/jamulus/default.nix | 2 +- pkgs/applications/audio/librespot/default.nix | 2 +- pkgs/applications/audio/lmms/default.nix | 2 +- pkgs/applications/audio/mimms/default.nix | 2 +- pkgs/applications/audio/mixxx/default.nix | 2 +- pkgs/applications/audio/mopidy/gmusic.nix | 2 +- pkgs/applications/audio/mopidy/iris.nix | 2 +- pkgs/applications/audio/mopidy/moped.nix | 2 +- pkgs/applications/audio/mopidy/mopify.nix | 2 +- pkgs/applications/audio/mopidy/mpd.nix | 2 +- pkgs/applications/audio/mopidy/mpris.nix | 2 +- pkgs/applications/audio/mopidy/scrobbler.nix | 2 +- pkgs/applications/audio/mopidy/somafm.nix | 2 +- pkgs/applications/audio/mopidy/soundcloud.nix | 2 +- pkgs/applications/audio/mopidy/spotify-tunigo.nix | 2 +- pkgs/applications/audio/mopidy/spotify.nix | 2 +- pkgs/applications/audio/mopidy/tunein.nix | 2 +- pkgs/applications/audio/mopidy/youtube.nix | 2 +- pkgs/applications/audio/munt/default.nix | 2 +- pkgs/applications/audio/musescore/default.nix | 2 +- pkgs/applications/audio/noisetorch/default.nix | 2 +- pkgs/applications/audio/padthv1/default.nix | 2 +- pkgs/applications/audio/picard/default.nix | 2 +- pkgs/applications/audio/pithos/default.nix | 2 +- pkgs/applications/audio/polyphone/default.nix | 2 +- pkgs/applications/audio/puddletag/default.nix | 2 +- pkgs/applications/audio/pulseaudio-dlna/default.nix | 2 +- pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix | 2 +- pkgs/applications/audio/qjackctl/default.nix | 2 +- pkgs/applications/audio/qmmp/default.nix | 2 +- pkgs/applications/audio/qsampler/default.nix | 2 +- pkgs/applications/audio/qsynth/default.nix | 2 +- pkgs/applications/audio/qtractor/default.nix | 2 +- pkgs/applications/audio/shortwave/default.nix | 2 +- pkgs/applications/audio/sonata/default.nix | 2 +- pkgs/applications/audio/spotify-cli-linux/default.nix | 2 +- pkgs/applications/audio/synthv1/default.nix | 2 +- pkgs/applications/audio/traverso/default.nix | 2 +- pkgs/applications/audio/whipper/default.nix | 2 +- pkgs/applications/blockchains/ethabi.nix | 2 +- .../blockchains/ledger-live-desktop/default.nix | 2 +- pkgs/applications/blockchains/quorum.nix | 2 +- pkgs/applications/blockchains/turbo-geth.nix | 2 +- .../editors/emacs-modes/sv-kalender/default.nix | 2 +- pkgs/applications/editors/featherpad/default.nix | 2 +- pkgs/applications/editors/focuswriter/default.nix | 2 +- pkgs/applications/editors/hecate/default.nix | 2 +- pkgs/applications/editors/hexdino/default.nix | 2 +- pkgs/applications/editors/kibi/default.nix | 2 +- pkgs/applications/editors/manuskript/default.nix | 2 +- pkgs/applications/editors/mindforger/default.nix | 2 +- pkgs/applications/editors/neovim/gnvim/default.nix | 2 +- pkgs/applications/editors/neovim/neovim-remote.nix | 2 +- pkgs/applications/editors/okteta/default.nix | 2 +- pkgs/applications/editors/retext/default.nix | 2 +- pkgs/applications/editors/sigil/default.nix | 2 +- pkgs/applications/editors/texmacs/common.nix | 2 +- pkgs/applications/editors/thonny/default.nix | 2 +- pkgs/applications/editors/tiled/default.nix | 2 +- pkgs/applications/graphics/displaycal/default.nix | 2 +- pkgs/applications/graphics/dosage/default.nix | 2 +- pkgs/applications/graphics/freecad/default.nix | 2 +- pkgs/applications/graphics/gimp/wrapper.nix | 2 +- pkgs/applications/graphics/gscan2pdf/default.nix | 2 +- pkgs/applications/graphics/hydrus/default.nix | 2 +- pkgs/applications/graphics/ipe/default.nix | 2 +- pkgs/applications/graphics/kgraphviewer/default.nix | 2 +- pkgs/applications/graphics/krop/default.nix | 2 +- pkgs/applications/graphics/luminance-hdr/default.nix | 2 +- pkgs/applications/graphics/mcomix3/default.nix | 3 +-- pkgs/applications/graphics/meme/default.nix | 2 +- pkgs/applications/graphics/mypaint/default.nix | 2 +- pkgs/applications/graphics/nomacs/default.nix | 2 +- pkgs/applications/graphics/paraview/default.nix | 2 +- pkgs/applications/graphics/pdfcpu/default.nix | 2 +- pkgs/applications/graphics/photoflare/default.nix | 2 +- pkgs/applications/graphics/photoqt/default.nix | 2 +- pkgs/applications/graphics/phototonic/default.nix | 2 +- .../applications/graphics/pick-colour-picker/default.nix | 2 +- pkgs/applications/graphics/pinta/default.nix | 2 +- pkgs/applications/graphics/qcomicbook/default.nix | 2 +- .../graphics/rapid-photo-downloader/default.nix | 2 +- pkgs/applications/graphics/renderdoc/default.nix | 2 +- pkgs/applications/graphics/scantailor/advanced.nix | 2 +- pkgs/applications/graphics/tesseract/wrapper.nix | 2 +- pkgs/applications/logging/humioctl/default.nix | 2 +- pkgs/applications/misc/antfs-cli/default.nix | 2 +- pkgs/applications/misc/ape/apeclex.nix | 2 +- pkgs/applications/misc/archivy/default.nix | 2 +- pkgs/applications/misc/ausweisapp2/default.nix | 2 +- pkgs/applications/misc/autospotting/default.nix | 2 +- pkgs/applications/misc/barrier/default.nix | 2 +- pkgs/applications/misc/bibletime/default.nix | 2 +- pkgs/applications/misc/bleachbit/default.nix | 2 +- pkgs/applications/misc/break-time/default.nix | 2 +- pkgs/applications/misc/buku/default.nix | 2 +- pkgs/applications/misc/candle/default.nix | 2 +- pkgs/applications/misc/cheat/default.nix | 2 +- pkgs/applications/misc/chewing-editor/default.nix | 2 +- pkgs/applications/misc/coursera-dl/default.nix | 2 +- pkgs/applications/misc/crow-translate/default.nix | 2 +- pkgs/applications/misc/cum/default.nix | 2 +- pkgs/applications/misc/cura/lulzbot/libarcus.nix | 2 +- pkgs/applications/misc/cura/lulzbot/libsavitar.nix | 2 +- pkgs/applications/misc/cura/lulzbot/uranium.nix | 2 +- pkgs/applications/misc/dasel/default.nix | 2 +- pkgs/applications/misc/devdocs-desktop/default.nix | 2 +- pkgs/applications/misc/dfilemanager/default.nix | 2 +- pkgs/applications/misc/diffpdf/default.nix | 2 +- pkgs/applications/misc/dmensamenu/default.nix | 2 +- pkgs/applications/misc/dockbarx/default.nix | 2 +- pkgs/applications/misc/dotfiles/default.nix | 2 +- pkgs/applications/misc/dstask/default.nix | 2 +- pkgs/applications/misc/dupeguru/default.nix | 2 +- pkgs/applications/misc/electrum/dash.nix | 2 +- pkgs/applications/misc/electrum/ltc.nix | 2 +- pkgs/applications/misc/elfx86exts/default.nix | 2 +- pkgs/applications/misc/exercism/default.nix | 2 +- pkgs/applications/misc/expenses/default.nix | 2 +- pkgs/applications/misc/fbmenugen/default.nix | 2 +- pkgs/applications/misc/geoipupdate/default.nix | 2 +- pkgs/applications/misc/get_iplayer/default.nix | 2 +- pkgs/applications/misc/go-jira/default.nix | 2 +- pkgs/applications/misc/golden-cheetah/default.nix | 2 +- pkgs/applications/misc/gpsbabel/gui.nix | 2 +- pkgs/applications/misc/gramps/default.nix | 2 +- pkgs/applications/misc/gsctl/default.nix | 2 +- pkgs/applications/misc/hamster/default.nix | 2 +- pkgs/applications/misc/haxor-news/default.nix | 2 +- pkgs/applications/misc/hivemind/default.nix | 2 +- pkgs/applications/misc/hugo/default.nix | 2 +- pkgs/applications/misc/jrnl/default.nix | 2 +- pkgs/applications/misc/k4dirstat/default.nix | 2 +- pkgs/applications/misc/keepass/default.nix | 2 +- pkgs/applications/misc/khard/default.nix | 2 +- pkgs/applications/misc/kondo/default.nix | 2 +- pkgs/applications/misc/kupfer/default.nix | 2 +- pkgs/applications/misc/loxodo/default.nix | 2 +- pkgs/applications/misc/madonctl/default.nix | 2 +- pkgs/applications/misc/mediaelch/default.nix | 2 +- pkgs/applications/misc/menumaker/default.nix | 2 +- pkgs/applications/misc/mop/default.nix | 2 +- pkgs/applications/misc/mqtt-bench/default.nix | 2 +- pkgs/applications/misc/multibootusb/default.nix | 2 +- pkgs/applications/misc/nixnote2/default.nix | 2 +- pkgs/applications/misc/ocropus/default.nix | 2 +- pkgs/applications/misc/onboard/default.nix | 2 +- pkgs/applications/misc/opentx/default.nix | 2 +- pkgs/applications/misc/orca/default.nix | 2 +- pkgs/applications/misc/pass-secret-service/default.nix | 2 +- pkgs/applications/misc/pdf-quench/default.nix | 2 +- pkgs/applications/misc/pdfarranger/default.nix | 2 +- pkgs/applications/misc/pdfdiff/default.nix | 2 +- pkgs/applications/misc/pgmodeler/default.nix | 3 +-- pkgs/applications/misc/pipr/default.nix | 3 +-- pkgs/applications/misc/plover/default.nix | 2 +- pkgs/applications/misc/prevo/default.nix | 2 +- pkgs/applications/misc/printrun/default.nix | 2 +- pkgs/applications/misc/pydf/default.nix | 2 +- pkgs/applications/misc/pyditz/cerberus.nix | 2 +- pkgs/applications/misc/pyditz/default.nix | 2 +- pkgs/applications/misc/pytrainer/default.nix | 2 +- pkgs/applications/misc/qdirstat/default.nix | 2 +- pkgs/applications/misc/qlcplus/default.nix | 2 +- pkgs/applications/misc/qpdfview/default.nix | 2 +- pkgs/applications/misc/qsudo/default.nix | 2 +- pkgs/applications/misc/qt-box-editor/default.nix | 2 +- pkgs/applications/misc/qtbitcointrader/default.nix | 2 +- pkgs/applications/misc/ranger/default.nix | 2 +- .../misc/remarkable/remarkable-mouse/default.nix | 2 +- pkgs/applications/misc/remarkable/rmapi/default.nix | 2 +- pkgs/applications/misc/remarkable/rmview/default.nix | 2 +- pkgs/applications/misc/rsclock/default.nix | 2 +- pkgs/applications/misc/rss-bridge-cli/default.nix | 2 +- pkgs/applications/misc/rtv/default.nix | 2 +- pkgs/applications/misc/snapper-gui/default.nix | 2 +- pkgs/applications/misc/syncthing-tray/default.nix | 2 +- pkgs/applications/misc/taskwarrior-tui/default.nix | 2 +- pkgs/applications/misc/termdown/default.nix | 2 +- pkgs/applications/misc/terminal-parrot/default.nix | 2 +- pkgs/applications/misc/termpdf.py/default.nix | 2 +- pkgs/applications/misc/tickrs/default.nix | 2 +- pkgs/applications/misc/tipp10/default.nix | 2 +- pkgs/applications/misc/todiff/default.nix | 2 +- pkgs/applications/misc/toot/default.nix | 2 +- pkgs/applications/misc/topydo/default.nix | 2 +- pkgs/applications/misc/tty-share/default.nix | 2 +- pkgs/applications/misc/tut/default.nix | 2 +- pkgs/applications/misc/tzupdate/default.nix | 2 +- pkgs/applications/misc/udiskie/default.nix | 2 +- pkgs/applications/misc/ulauncher/default.nix | 2 +- pkgs/applications/misc/urlscan/default.nix | 2 +- pkgs/applications/misc/valentina/default.nix | 2 +- pkgs/applications/misc/vym/default.nix | 2 +- pkgs/applications/misc/wego/default.nix | 2 +- pkgs/applications/misc/wikicurses/default.nix | 2 +- pkgs/applications/misc/xdgmenumaker/default.nix | 2 +- pkgs/applications/misc/yokadi/default.nix | 2 +- pkgs/applications/misc/zk-shell/default.nix | 2 +- pkgs/applications/misc/zscroll/default.nix | 2 +- pkgs/applications/networking/brig/default.nix | 2 +- pkgs/applications/networking/browsers/browsh/default.nix | 2 +- pkgs/applications/networking/browsers/castor/default.nix | 2 +- .../networking/browsers/chromium/browser.nix | 2 +- pkgs/applications/networking/browsers/eolie/default.nix | 2 +- .../networking/browsers/qutebrowser/default.nix | 2 +- pkgs/applications/networking/c14/default.nix | 2 +- pkgs/applications/networking/cloudflared/default.nix | 2 +- .../applications/networking/cluster/atlantis/default.nix | 2 +- .../networking/cluster/docker-machine/default.nix | 2 +- .../networking/cluster/docker-machine/kvm.nix | 2 +- pkgs/applications/networking/cluster/fluxcd/default.nix | 2 +- pkgs/applications/networking/cluster/fluxctl/default.nix | 2 +- pkgs/applications/networking/cluster/habitat/default.nix | 2 +- pkgs/applications/networking/cluster/helm/default.nix | 2 +- pkgs/applications/networking/cluster/k9s/default.nix | 2 +- pkgs/applications/networking/cluster/kops/default.nix | 2 +- .../applications/networking/cluster/kubeless/default.nix | 2 +- .../networking/cluster/kubelogin/default.nix | 2 +- .../applications/networking/cluster/kubernix/default.nix | 2 +- pkgs/applications/networking/cluster/kubeval/default.nix | 2 +- pkgs/applications/networking/cluster/linkerd/default.nix | 2 +- .../networking/cluster/openshift/default.nix | 2 +- pkgs/applications/networking/cluster/popeye/default.nix | 2 +- .../networking/cluster/ssm-agent/default.nix | 2 +- .../networking/cluster/terraform-inventory/default.nix | 2 +- .../cluster/terraform-providers/ansible/default.nix | 2 +- .../cluster/terraform-providers/cloudfoundry/default.nix | 2 +- .../terraform-providers/elasticsearch/default.nix | 2 +- .../cluster/terraform-providers/gandi/default.nix | 2 +- .../cluster/terraform-providers/hcloud/default.nix | 2 +- .../cluster/terraform-providers/keycloak/default.nix | 2 +- .../cluster/terraform-providers/libvirt/default.nix | 2 +- .../cluster/terraform-providers/linuxbox/default.nix | 2 +- .../cluster/terraform-providers/lxd/default.nix | 2 +- .../cluster/terraform-providers/shell/default.nix | 2 +- .../cluster/terraform-providers/vercel/default.nix | 2 +- .../cluster/terraform-providers/vpsadmin/default.nix | 2 +- pkgs/applications/networking/cluster/tilt/default.nix | 2 +- pkgs/applications/networking/cluster/velero/default.nix | 2 +- pkgs/applications/networking/datovka/default.nix | 2 +- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 2 +- .../networking/feedreaders/canto-curses/default.nix | 2 +- .../networking/feedreaders/canto-daemon/default.nix | 2 +- .../networking/feedreaders/feeds/default.nix | 2 +- .../networking/feedreaders/rawdog/default.nix | 2 +- pkgs/applications/networking/flent/default.nix | 2 +- pkgs/applications/networking/gdrive/default.nix | 2 +- pkgs/applications/networking/gns3/server.nix | 2 +- .../networking/instant-messengers/blink/default.nix | 2 +- .../networking/instant-messengers/cordless/default.nix | 2 +- .../networking/instant-messengers/coyim/default.nix | 2 +- .../instant-messengers/element/element-desktop.nix | 2 +- .../networking/instant-messengers/ferdi/default.nix | 2 +- .../networking/instant-messengers/franz/default.nix | 2 +- .../networking/instant-messengers/linphone/default.nix | 2 +- .../networking/instant-messengers/matrixcli/default.nix | 2 +- .../networking/instant-messengers/mm/default.nix | 2 +- .../networking/instant-messengers/neochat/default.nix | 2 +- .../instant-messengers/pybitmessage/default.nix | 2 +- .../networking/instant-messengers/rambox/rambox.nix | 2 +- .../networking/instant-messengers/ricochet/default.nix | 2 +- .../networking/instant-messengers/scudcloud/default.nix | 2 +- .../networking/instant-messengers/slack-term/default.nix | 2 +- .../networking/instant-messengers/swift-im/default.nix | 2 +- .../networking/instant-messengers/tensor/default.nix | 2 +- .../networking/instant-messengers/turses/default.nix | 2 +- .../networking/instant-messengers/twinkle/default.nix | 2 +- .../instant-messengers/xmpp-client/default.nix | 2 +- pkgs/applications/networking/ipfs-cluster/default.nix | 2 +- pkgs/applications/networking/ipfs/default.nix | 2 +- pkgs/applications/networking/ipget/default.nix | 2 +- pkgs/applications/networking/irc/qweechat/default.nix | 2 +- .../irc/weechat/scripts/weechat-matrix/default.nix | 2 +- pkgs/applications/networking/lieer/default.nix | 2 +- pkgs/applications/networking/maestral-qt/default.nix | 3 +-- .../applications/networking/mailreaders/aerc/default.nix | 2 +- .../applications/networking/mailreaders/afew/default.nix | 2 +- .../networking/mailreaders/mailpile/default.nix | 2 +- .../applications/networking/mailreaders/meli/default.nix | 3 +-- .../networking/mailreaders/mlarchive2maildir/default.nix | 2 +- pkgs/applications/networking/owncloud-client/default.nix | 2 +- pkgs/applications/networking/p2p/deluge/default.nix | 2 +- pkgs/applications/networking/p2p/zeronet/default.nix | 2 +- pkgs/applications/networking/protocol/default.nix | 2 +- pkgs/applications/networking/pyload/default.nix | 2 +- pkgs/applications/networking/qv2ray/default.nix | 2 +- .../networking/remote/x2goclient/default.nix | 2 +- pkgs/applications/networking/shellhub-agent/default.nix | 2 +- .../networking/soulseek/nicotine-plus/default.nix | 2 +- pkgs/applications/networking/sync/acd_cli/default.nix | 2 +- pkgs/applications/networking/sync/desync/default.nix | 2 +- pkgs/applications/networking/syncthing-gtk/default.nix | 2 +- pkgs/applications/networking/twtxt/default.nix | 2 +- pkgs/applications/networking/versus/default.nix | 2 +- pkgs/applications/office/beamerpresenter/default.nix | 2 +- pkgs/applications/office/espanso/default.nix | 2 +- pkgs/applications/office/fava/default.nix | 2 +- pkgs/applications/office/gtg/default.nix | 2 +- pkgs/applications/office/keepnote/default.nix | 2 +- pkgs/applications/office/ledger-autosync/default.nix | 2 +- .../office/libreoffice/src-fresh/override.nix | 2 +- .../office/libreoffice/src-still/override.nix | 2 +- pkgs/applications/office/mytetra/default.nix | 2 +- pkgs/applications/office/qnotero/default.nix | 2 +- pkgs/applications/office/scribus/unstable.nix | 2 +- pkgs/applications/office/skanlite/default.nix | 2 +- pkgs/applications/office/timeular/default.nix | 2 +- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/applications/office/tryton/default.nix | 2 +- pkgs/applications/office/watson/default.nix | 2 +- pkgs/applications/radio/chirp/default.nix | 2 +- pkgs/applications/radio/gqrx/default.nix | 2 +- pkgs/applications/radio/qsstv/default.nix | 2 +- pkgs/applications/radio/quisk/default.nix | 2 +- pkgs/applications/radio/urh/default.nix | 2 +- .../science/biology/eggnog-mapper/default.nix | 2 +- pkgs/applications/science/biology/obitools/obitools3.nix | 2 +- pkgs/applications/science/biology/poretools/default.nix | 2 +- pkgs/applications/science/biology/tebreak/default.nix | 2 +- pkgs/applications/science/chemistry/d-seams/default.nix | 2 +- pkgs/applications/science/chemistry/pymol/default.nix | 2 +- pkgs/applications/science/electronics/caneda/default.nix | 2 +- .../science/electronics/fritzing/default.nix | 2 +- pkgs/applications/science/logic/petrinizer/default.nix | 2 +- pkgs/applications/science/logic/petrinizer/sbv-7.13.nix | 2 +- pkgs/applications/science/logic/petrinizer/z3.nix | 2 +- .../science/machine-learning/labelimg/default.nix | 2 +- pkgs/applications/science/math/almonds/default.nix | 2 +- pkgs/applications/science/math/cemu/default.nix | 2 +- pkgs/applications/science/misc/rink/default.nix | 2 +- pkgs/applications/science/misc/snakemake/default.nix | 2 +- pkgs/applications/terminal-emulators/guake/default.nix | 2 +- .../terminal-emulators/terminator/default.nix | 2 +- .../git-and-tools/bump2version/default.nix | 2 +- .../version-management/git-and-tools/ghorg/default.nix | 2 +- .../version-management/git-and-tools/ghq/default.nix | 2 +- .../git-and-tools/git-annex-metadata-gui/default.nix | 2 +- .../git-and-tools/git-annex-remote-b2/default.nix | 2 +- .../git-and-tools/git-appraise/default.nix | 2 +- .../git-and-tools/git-big-picture/default.nix | 2 +- .../version-management/git-and-tools/git-bug/default.nix | 2 +- .../git-and-tools/git-cola/default.nix | 2 +- .../git-and-tools/git-fame/default.nix | 2 +- .../git-and-tools/git-remote-hg/default.nix | 2 +- .../git-and-tools/git-vanity-hash/default.nix | 2 +- .../git-and-tools/gitbatch/default.nix | 2 +- .../version-management/git-and-tools/gitin/default.nix | 2 +- .../version-management/git-and-tools/gitweb/default.nix | 2 +- .../version-management/git-and-tools/grv/default.nix | 2 +- .../version-management/git-and-tools/hub/default.nix | 2 +- .../git-and-tools/lefthook/default.nix | 2 +- .../git-and-tools/pass-git-helper/default.nix | 2 +- .../version-management/git-and-tools/scmpuff/default.nix | 2 +- .../version-management/git-and-tools/stgit/default.nix | 2 +- .../version-management/git-crecord/default.nix | 2 +- pkgs/applications/version-management/git-lfs/1.nix | 2 +- pkgs/applications/version-management/git-up/default.nix | 2 +- pkgs/applications/version-management/gitea/default.nix | 2 +- .../version-management/gitinspector/default.nix | 2 +- .../version-management/gitlab/gitaly/default.nix | 2 +- .../version-management/gitlab/gitlab-shell/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- pkgs/applications/version-management/gitless/default.nix | 2 +- pkgs/applications/version-management/gogs/default.nix | 2 +- pkgs/applications/version-management/meld/default.nix | 2 +- pkgs/applications/version-management/nitpick/default.nix | 2 +- pkgs/applications/version-management/peru/default.nix | 2 +- .../applications/version-management/sourcehut/builds.nix | 2 +- pkgs/applications/version-management/sourcehut/core.nix | 2 +- .../version-management/sourcehut/dispatch.nix | 2 +- pkgs/applications/version-management/sourcehut/git.nix | 2 +- pkgs/applications/version-management/sourcehut/hg.nix | 2 +- pkgs/applications/version-management/sourcehut/hub.nix | 2 +- pkgs/applications/version-management/sourcehut/lists.nix | 2 +- pkgs/applications/version-management/sourcehut/man.nix | 2 +- pkgs/applications/version-management/sourcehut/meta.nix | 2 +- pkgs/applications/version-management/sourcehut/paste.nix | 2 +- pkgs/applications/version-management/sourcehut/scm.nix | 2 +- pkgs/applications/version-management/sourcehut/todo.nix | 2 +- pkgs/applications/video/clipgrab/default.nix | 2 +- pkgs/applications/video/devede/default.nix | 2 +- .../applications/video/electronplayer/electronplayer.nix | 2 +- pkgs/applications/video/jellyfin-mpv-shim/default.nix | 2 +- pkgs/applications/video/kazam/default.nix | 2 +- pkgs/applications/video/kodi/wrapper.nix | 2 +- pkgs/applications/video/makemkv/default.nix | 2 +- pkgs/applications/video/mythtv/default.nix | 2 +- pkgs/applications/video/pitivi/default.nix | 2 +- pkgs/applications/video/plex-media-player/default.nix | 2 +- pkgs/applications/video/plex-mpv-shim/default.nix | 2 +- pkgs/applications/video/pyca/default.nix | 2 +- pkgs/applications/video/qmediathekview/default.nix | 2 +- pkgs/applications/video/shotcut/default.nix | 2 +- pkgs/applications/video/tartube/default.nix | 3 +-- pkgs/applications/video/vokoscreen/default.nix | 2 +- pkgs/applications/virtualization/aqemu/default.nix | 2 +- pkgs/applications/virtualization/cntr/default.nix | 2 +- pkgs/applications/virtualization/cri-o/default.nix | 2 +- .../virtualization/docker-compose/default.nix | 2 +- pkgs/applications/virtualization/docker-slim/default.nix | 2 +- pkgs/applications/virtualization/docker/buildx.nix | 2 +- pkgs/applications/virtualization/docker/distribution.nix | 2 +- pkgs/applications/virtualization/docker/proxy.nix | 2 +- pkgs/applications/virtualization/ecs-agent/default.nix | 2 +- pkgs/applications/virtualization/firectl/default.nix | 2 +- pkgs/applications/virtualization/gvisor/default.nix | 2 +- pkgs/applications/virtualization/qtemu/default.nix | 2 +- pkgs/applications/virtualization/singularity/default.nix | 3 +-- .../applications/virtualization/virt-manager/default.nix | 2 +- pkgs/applications/virtualization/xen/4.10.nix | 2 +- pkgs/applications/virtualization/xen/packages.nix | 2 +- pkgs/applications/window-managers/btops/default.nix | 2 +- pkgs/applications/window-managers/dwm/dwm-status.nix | 2 +- pkgs/applications/window-managers/i3/gaps.nix | 2 +- pkgs/applications/window-managers/i3/pystatus.nix | 2 +- pkgs/applications/window-managers/i3/status-rust.nix | 2 +- pkgs/applications/window-managers/i3/wk-switch.nix | 2 +- pkgs/applications/window-managers/i3/wmfocus.nix | 2 +- pkgs/applications/window-managers/leftwm/default.nix | 2 +- pkgs/applications/window-managers/qtile/default.nix | 2 +- pkgs/applications/window-managers/sway/wrapper.nix | 2 +- pkgs/build-support/appimage/default.nix | 2 +- .../build-fhs-userenv-bubblewrap/default.nix | 2 +- pkgs/build-support/emacs/trivial.nix | 2 +- pkgs/build-support/fetchdocker/fetchDockerConfig.nix | 2 +- pkgs/build-support/fetchdocker/fetchDockerLayer.nix | 2 +- pkgs/build-support/plugins.nix | 2 +- pkgs/common-updater/unstable-updater.nix | 3 +-- pkgs/data/documentation/zeal/default.nix | 2 +- pkgs/data/fonts/et-book/default.nix | 2 +- pkgs/data/fonts/fira-code/default.nix | 2 +- pkgs/data/fonts/fira-code/symbols.nix | 2 +- pkgs/data/fonts/fira-mono/default.nix | 2 +- pkgs/data/fonts/fixedsys-excelsior/default.nix | 2 +- pkgs/data/fonts/go-font/default.nix | 2 +- pkgs/data/fonts/jost/default.nix | 2 +- pkgs/data/fonts/paratype-pt/mono.nix | 2 +- pkgs/data/fonts/paratype-pt/sans.nix | 2 +- pkgs/data/fonts/paratype-pt/serif.nix | 2 +- pkgs/data/fonts/ttf-bitstream-vera/default.nix | 2 +- pkgs/data/fonts/ttf-tw-moe/default.nix | 2 +- pkgs/data/fonts/vista-fonts/default.nix | 2 +- pkgs/data/misc/iana-etc/default.nix | 2 +- pkgs/data/misc/mime-types/default.nix | 2 +- pkgs/data/misc/unicode-emoji/default.nix | 3 +-- .../cinnamon/cinnamon-gsettings-overrides/default.nix | 2 +- pkgs/desktops/cinnamon/warpinator/default.nix | 2 +- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-tour/default.nix | 2 +- pkgs/desktops/lumina/lumina-calculator/default.nix | 2 +- pkgs/desktops/lumina/lumina-pdf/default.nix | 2 +- pkgs/desktops/lumina/lumina/default.nix | 2 +- pkgs/desktops/mate/mate-tweak/default.nix | 2 +- pkgs/desktops/mate/mozo/default.nix | 2 +- .../desktop/elementary-gsettings-schemas/default.nix | 2 +- pkgs/desktops/xfce/applications/catfish/default.nix | 2 +- .../xfce/panel-plugins/xfce4-datetime-plugin/default.nix | 2 +- pkgs/desktops/xfce/thunar-plugins/archive/default.nix | 2 +- pkgs/development/arduino/ino/default.nix | 2 +- pkgs/development/beam-modules/build-hex.nix | 2 +- pkgs/development/beam-modules/default.nix | 2 +- pkgs/development/beam-modules/lib.nix | 2 +- pkgs/development/compilers/carp/default.nix | 2 +- pkgs/development/compilers/chicken/4/egg2nix.nix | 2 +- pkgs/development/compilers/chicken/4/eggs.nix | 2 +- pkgs/development/compilers/chicken/5/egg2nix.nix | 2 +- pkgs/development/compilers/chicken/5/eggs.nix | 2 +- pkgs/development/compilers/elm/packages/elm-format.nix | 2 +- .../compilers/elm/packages/elm-instrument.nix | 2 +- pkgs/development/compilers/elm/packages/elm.nix | 2 +- pkgs/development/compilers/elm/packages/elmi-to-json.nix | 2 +- pkgs/development/compilers/elm/packages/indents.nix | 2 +- pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix | 2 +- pkgs/development/compilers/ios-cross-compile/9.2.nix | 2 +- pkgs/development/compilers/jetbrains-jdk/default.nix | 2 +- .../meta-environment/meta-build-env/default.nix | 4 +++- pkgs/development/compilers/osl/default.nix | 2 +- pkgs/development/compilers/pakcs/curry-base.nix | 2 +- pkgs/development/compilers/pakcs/curry-frontend.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 2 +- pkgs/development/idris-modules/tfrandom.nix | 4 ++-- pkgs/development/idris-modules/with-packages.nix | 2 +- pkgs/development/interpreters/hy/default.nix | 2 +- pkgs/development/interpreters/joker/default.nix | 2 +- pkgs/development/interpreters/lfe/generic-builder.nix | 2 +- pkgs/development/interpreters/perl/wrapper.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.5.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.6.nix | 2 +- pkgs/development/java-modules/build-maven-package.nix | 2 +- pkgs/development/java-modules/junit/default.nix | 2 +- pkgs/development/java-modules/maven-hello/default.nix | 2 +- pkgs/development/java-modules/maven-minimal.nix | 2 +- pkgs/development/libraries/agda/agda-prelude/default.nix | 2 +- .../libraries/agda/functional-linear-algebra/default.nix | 2 +- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 +- .../libraries/agda/standard-library/default.nix | 2 +- pkgs/development/libraries/appstream/qt.nix | 2 +- pkgs/development/libraries/boost/1.59.nix | 2 +- pkgs/development/libraries/boost/1.60.nix | 2 +- pkgs/development/libraries/boost/1.65.nix | 2 +- pkgs/development/libraries/boost/1.66.nix | 2 +- pkgs/development/libraries/boost/1.68.nix | 2 +- pkgs/development/libraries/boost/1.69.nix | 2 +- pkgs/development/libraries/boost/1.70.nix | 2 +- pkgs/development/libraries/boost/1.71.nix | 2 +- pkgs/development/libraries/boost/1.72.nix | 2 +- pkgs/development/libraries/boost/1.73.nix | 2 +- pkgs/development/libraries/boost/1.74.nix | 2 +- pkgs/development/libraries/boost/1.75.nix | 2 +- pkgs/development/libraries/cxxtest/default.nix | 2 +- pkgs/development/libraries/ffmpeg/3.4.nix | 2 +- pkgs/development/libraries/ffmpeg/4.nix | 2 +- pkgs/development/libraries/java/junit/default.nix | 2 +- pkgs/development/libraries/libcollectdclient/default.nix | 2 +- pkgs/development/libraries/libmicrohttpd/0.9.70.nix | 2 +- pkgs/development/libraries/libmicrohttpd/0.9.71.nix | 2 +- pkgs/development/libraries/libmicrohttpd/0.9.72.nix | 2 +- pkgs/development/libraries/lief/default.nix | 2 +- pkgs/development/libraries/mlt/qt-5.nix | 2 +- pkgs/development/libraries/packr/default.nix | 2 +- pkgs/development/libraries/pkger/default.nix | 2 +- pkgs/development/libraries/prototypejs/default.nix | 2 +- pkgs/development/libraries/psol/generic.nix | 2 +- pkgs/development/libraries/qt-5/modules/qtmacextras.nix | 2 +- pkgs/development/libraries/qtstyleplugins/default.nix | 2 +- pkgs/development/libraries/scriptaculous/default.nix | 4 +++- pkgs/development/libraries/smarty3-i18n/default.nix | 4 +++- pkgs/development/libraries/smarty3/default.nix | 4 +++- pkgs/development/libraries/stellarsolver/default.nix | 2 +- pkgs/development/libraries/vapoursynth/editor.nix | 2 +- pkgs/development/lua-modules/generated-packages.nix | 2 +- pkgs/development/misc/haskell/hasura/ci-info/default.nix | 2 +- .../misc/haskell/hasura/graphql-engine/default.nix | 2 +- .../misc/haskell/hasura/graphql-parser/default.nix | 2 +- .../misc/haskell/hasura/pg-client/default.nix | 2 +- pkgs/development/misc/loc/default.nix | 2 +- .../development/ocaml-modules/janestreet/variantslib.nix | 2 +- pkgs/development/ocaml-modules/kafka/default.nix | 2 +- pkgs/development/ocaml-modules/parany/default.nix | 2 +- pkgs/development/ocaml-modules/phylogenetics/default.nix | 2 +- pkgs/development/ocaml-modules/wtf8/default.nix | 2 +- pkgs/development/perl-modules/MNI/default.nix | 2 +- .../development/perl-modules/Percona-Toolkit/default.nix | 2 +- pkgs/development/perl-modules/maatkit/default.nix | 2 +- pkgs/development/python-modules/FormEncode/default.nix | 2 +- pkgs/development/python-modules/HTSeq/default.nix | 2 +- pkgs/development/python-modules/IPy/default.nix | 2 +- pkgs/development/python-modules/PyLD/default.nix | 2 +- pkgs/development/python-modules/ROPGadget/default.nix | 2 +- pkgs/development/python-modules/Wand/default.nix | 2 +- .../python-modules/WazeRouteCalculator/default.nix | 2 +- pkgs/development/python-modules/aadict/default.nix | 2 +- pkgs/development/python-modules/aafigure/default.nix | 2 +- pkgs/development/python-modules/acebinf/default.nix | 2 +- pkgs/development/python-modules/acme-tiny/default.nix | 2 +- pkgs/development/python-modules/actdiag/default.nix | 2 +- pkgs/development/python-modules/adal/default.nix | 2 +- pkgs/development/python-modules/aenum/default.nix | 2 +- pkgs/development/python-modules/agate-dbf/default.nix | 2 +- pkgs/development/python-modules/agate-sql/default.nix | 2 +- pkgs/development/python-modules/aiobotocore/default.nix | 2 +- pkgs/development/python-modules/aiodns/default.nix | 2 +- pkgs/development/python-modules/aioeventlet/default.nix | 2 +- pkgs/development/python-modules/aioitertools/default.nix | 2 +- pkgs/development/python-modules/aioredis/default.nix | 2 +- pkgs/development/python-modules/aiozeroconf/default.nix | 2 +- pkgs/development/python-modules/ajpy/default.nix | 2 +- pkgs/development/python-modules/alabaster/default.nix | 2 +- pkgs/development/python-modules/alarmdecoder/default.nix | 2 +- pkgs/development/python-modules/alembic/default.nix | 2 +- .../development/python-modules/alerta-server/default.nix | 2 +- pkgs/development/python-modules/alerta/default.nix | 2 +- pkgs/development/python-modules/alot/default.nix | 2 +- pkgs/development/python-modules/altair/default.nix | 2 +- pkgs/development/python-modules/amazon_kclpy/default.nix | 2 +- pkgs/development/python-modules/amply/default.nix | 2 +- pkgs/development/python-modules/amqp/default.nix | 2 +- pkgs/development/python-modules/amqplib/default.nix | 2 +- pkgs/development/python-modules/aniso8601/default.nix | 2 +- pkgs/development/python-modules/annoy/default.nix | 2 +- pkgs/development/python-modules/anonip/default.nix | 2 +- pkgs/development/python-modules/ansicolor/default.nix | 2 +- pkgs/development/python-modules/ansicolors/default.nix | 2 +- pkgs/development/python-modules/ansiconv/default.nix | 2 +- pkgs/development/python-modules/apipkg/default.nix | 2 +- .../development/python-modules/approvaltests/default.nix | 2 +- pkgs/development/python-modules/apsw/default.nix | 2 +- pkgs/development/python-modules/argh/default.nix | 2 +- pkgs/development/python-modules/args/default.nix | 2 +- pkgs/development/python-modules/aria2p/default.nix | 2 +- pkgs/development/python-modules/arrow/default.nix | 2 +- pkgs/development/python-modules/asana/default.nix | 2 +- pkgs/development/python-modules/asn1ate/default.nix | 2 +- pkgs/development/python-modules/astral/default.nix | 2 +- pkgs/development/python-modules/astunparse/default.nix | 2 +- pkgs/development/python-modules/asyncssh/default.nix | 2 +- pkgs/development/python-modules/atomiclong/default.nix | 2 +- pkgs/development/python-modules/atomicwrites/default.nix | 2 +- pkgs/development/python-modules/atomman/default.nix | 2 +- .../python-modules/atsim_potentials/default.nix | 2 +- pkgs/development/python-modules/attrdict/default.nix | 2 +- pkgs/development/python-modules/authlib/default.nix | 2 +- pkgs/development/python-modules/authres/default.nix | 2 +- pkgs/development/python-modules/autograd/default.nix | 2 +- pkgs/development/python-modules/autologging/default.nix | 2 +- pkgs/development/python-modules/automat/default.nix | 2 +- pkgs/development/python-modules/autopep8/default.nix | 2 +- pkgs/development/python-modules/avro-python3/default.nix | 2 +- pkgs/development/python-modules/avro/default.nix | 2 +- pkgs/development/python-modules/avro3k/default.nix | 2 +- .../python-modules/awesome-slugify/default.nix | 2 +- pkgs/development/python-modules/b2sdk/default.nix | 2 +- pkgs/development/python-modules/babelfish/default.nix | 2 +- .../python-modules/babelgladeextractor/default.nix | 3 +-- .../python-modules/backports-shutil-which/default.nix | 2 +- .../development/python-modules/backports_csv/default.nix | 2 +- pkgs/development/python-modules/backports_os/default.nix | 2 +- .../python-modules/backports_unittest-mock/default.nix | 2 +- .../python-modules/backports_weakref/default.nix | 2 +- pkgs/development/python-modules/bacpypes/default.nix | 2 +- pkgs/development/python-modules/bap/default.nix | 2 +- pkgs/development/python-modules/base58/default.nix | 2 +- pkgs/development/python-modules/basemap/default.nix | 2 +- pkgs/development/python-modules/batinfo/default.nix | 2 +- pkgs/development/python-modules/bayespy/default.nix | 2 +- pkgs/development/python-modules/bcdoc/default.nix | 2 +- pkgs/development/python-modules/bcrypt/3_1.nix | 2 +- pkgs/development/python-modules/bcrypt/default.nix | 2 +- pkgs/development/python-modules/beancount/default.nix | 2 +- pkgs/development/python-modules/beanstalkc/default.nix | 2 +- .../python-modules/beautifulsoup4/default.nix | 2 +- pkgs/development/python-modules/bedup/default.nix | 2 +- pkgs/development/python-modules/bellows/default.nix | 2 +- pkgs/development/python-modules/bespon/default.nix | 2 +- .../python-modules/betamax-matchers/default.nix | 2 +- .../python-modules/betamax-serializers/default.nix | 2 +- pkgs/development/python-modules/betamax/default.nix | 2 +- pkgs/development/python-modules/billiard/default.nix | 2 +- pkgs/development/python-modules/binwalk/default.nix | 2 +- .../development/python-modules/bitbucket-api/default.nix | 2 +- .../development/python-modules/bitbucket-cli/default.nix | 2 +- pkgs/development/python-modules/bitmath/default.nix | 2 +- pkgs/development/python-modules/bitstring/default.nix | 2 +- pkgs/development/python-modules/bjoern/default.nix | 2 +- .../python-modules/black-macchiato/default.nix | 2 +- pkgs/development/python-modules/bleak/default.nix | 2 +- pkgs/development/python-modules/blessed/default.nix | 2 +- pkgs/development/python-modules/blessings/default.nix | 2 +- pkgs/development/python-modules/blinker/default.nix | 2 +- pkgs/development/python-modules/blis/default.nix | 2 +- pkgs/development/python-modules/blist/default.nix | 2 +- pkgs/development/python-modules/blivet/default.nix | 2 +- pkgs/development/python-modules/block-io/default.nix | 2 +- pkgs/development/python-modules/blockdiag/default.nix | 2 +- pkgs/development/python-modules/bluepy/default.nix | 2 +- pkgs/development/python-modules/boltons/default.nix | 2 +- pkgs/development/python-modules/boltztrap2/default.nix | 2 +- pkgs/development/python-modules/bottle/default.nix | 2 +- pkgs/development/python-modules/box2d/default.nix | 2 +- pkgs/development/python-modules/bpython/default.nix | 2 +- pkgs/development/python-modules/bsddb3/default.nix | 2 +- pkgs/development/python-modules/bsdiff4/default.nix | 2 +- pkgs/development/python-modules/bt-proximity/default.nix | 2 +- pkgs/development/python-modules/btchip/default.nix | 2 +- pkgs/development/python-modules/btrees/default.nix | 2 +- pkgs/development/python-modules/btrfs/default.nix | 2 +- pkgs/development/python-modules/bugsnag/default.nix | 2 +- pkgs/development/python-modules/bugwarrior/default.nix | 2 +- pkgs/development/python-modules/bugz/default.nix | 2 +- pkgs/development/python-modules/bugzilla/default.nix | 2 +- pkgs/development/python-modules/buildout/default.nix | 2 +- pkgs/development/python-modules/bumps/default.nix | 2 +- pkgs/development/python-modules/bunch/default.nix | 2 +- pkgs/development/python-modules/bwapy/default.nix | 2 +- pkgs/development/python-modules/cachecontrol/default.nix | 2 +- pkgs/development/python-modules/cachelib/default.nix | 2 +- pkgs/development/python-modules/cachetools/default.nix | 2 +- pkgs/development/python-modules/cairosvg/1_x.nix | 2 +- pkgs/development/python-modules/cairosvg/default.nix | 2 +- .../development/python-modules/canonicaljson/default.nix | 2 +- pkgs/development/python-modules/carbon/default.nix | 2 +- pkgs/development/python-modules/carrot/default.nix | 2 +- pkgs/development/python-modules/case/default.nix | 2 +- .../python-modules/cassandra-driver/default.nix | 2 +- pkgs/development/python-modules/casttube/default.nix | 2 +- pkgs/development/python-modules/catalogue/default.nix | 2 +- pkgs/development/python-modules/cbor/default.nix | 2 +- pkgs/development/python-modules/cccolutils/default.nix | 2 +- pkgs/development/python-modules/cement/default.nix | 2 +- pkgs/development/python-modules/cerberus/default.nix | 2 +- pkgs/development/python-modules/certipy/default.nix | 2 +- pkgs/development/python-modules/cgroup-utils/default.nix | 2 +- pkgs/development/python-modules/chai/default.nix | 2 +- pkgs/development/python-modules/chainmap/default.nix | 2 +- pkgs/development/python-modules/chameleon/default.nix | 2 +- .../python-modules/channels-redis/default.nix | 2 +- pkgs/development/python-modules/channels/default.nix | 2 +- pkgs/development/python-modules/chardet/default.nix | 2 +- .../python-modules/check-manifest/default.nix | 2 +- pkgs/development/python-modules/cjson/default.nix | 2 +- .../development/python-modules/ckcc-protocol/default.nix | 3 +-- pkgs/development/python-modules/clf/default.nix | 2 +- pkgs/development/python-modules/cliapp/default.nix | 2 +- .../python-modules/click-completion/default.nix | 2 +- .../python-modules/click-didyoumean/default.nix | 2 +- .../python-modules/click-help-colors/default.nix | 2 +- pkgs/development/python-modules/click-log/default.nix | 2 +- .../development/python-modules/click-plugins/default.nix | 2 +- pkgs/development/python-modules/click-repl/default.nix | 2 +- pkgs/development/python-modules/clickclick/default.nix | 2 +- pkgs/development/python-modules/cligj/default.nix | 2 +- pkgs/development/python-modules/clint/default.nix | 2 +- pkgs/development/python-modules/clize/default.nix | 2 +- .../python-modules/closure-linter/default.nix | 2 +- pkgs/development/python-modules/cloudpickle/default.nix | 2 +- pkgs/development/python-modules/clustershell/default.nix | 2 +- pkgs/development/python-modules/cmdline/default.nix | 2 +- pkgs/development/python-modules/cmdtest/default.nix | 2 +- pkgs/development/python-modules/cocotb/default.nix | 2 +- pkgs/development/python-modules/cogapp/default.nix | 2 +- pkgs/development/python-modules/coilmq/default.nix | 2 +- .../python-modules/colanderalchemy/default.nix | 2 +- pkgs/development/python-modules/colorama/default.nix | 2 +- pkgs/development/python-modules/colorcet/default.nix | 2 +- pkgs/development/python-modules/colorclass/default.nix | 2 +- pkgs/development/python-modules/colored/default.nix | 2 +- pkgs/development/python-modules/colour/default.nix | 2 +- pkgs/development/python-modules/configobj/default.nix | 2 +- pkgs/development/python-modules/configshell/default.nix | 2 +- .../python-modules/confluent-kafka/default.nix | 2 +- pkgs/development/python-modules/constantly/default.nix | 2 +- pkgs/development/python-modules/consul/default.nix | 2 +- pkgs/development/python-modules/contexter/default.nix | 2 +- pkgs/development/python-modules/convertdate/default.nix | 2 +- pkgs/development/python-modules/cookiecutter/default.nix | 2 +- pkgs/development/python-modules/cookies/default.nix | 2 +- pkgs/development/python-modules/coreapi/default.nix | 2 +- pkgs/development/python-modules/coreschema/default.nix | 2 +- pkgs/development/python-modules/cornice/default.nix | 2 +- pkgs/development/python-modules/cov-core/default.nix | 2 +- .../python-modules/cppheaderparser/default.nix | 2 +- pkgs/development/python-modules/crate/default.nix | 2 +- pkgs/development/python-modules/crayons/default.nix | 2 +- pkgs/development/python-modules/crc16/default.nix | 2 +- pkgs/development/python-modules/crccheck/default.nix | 2 +- pkgs/development/python-modules/crcmod/default.nix | 2 +- pkgs/development/python-modules/credstash/default.nix | 2 +- pkgs/development/python-modules/cryptacular/default.nix | 2 +- pkgs/development/python-modules/cssmin/default.nix | 2 +- pkgs/development/python-modules/cssselect/default.nix | 2 +- pkgs/development/python-modules/cssutils/default.nix | 2 +- pkgs/development/python-modules/cupy/default.nix | 2 +- pkgs/development/python-modules/curtsies/default.nix | 2 +- .../python-modules/curve25519-donna/default.nix | 2 +- pkgs/development/python-modules/cvxopt/default.nix | 3 +-- pkgs/development/python-modules/cx_freeze/default.nix | 2 +- pkgs/development/python-modules/cx_oracle/default.nix | 2 +- pkgs/development/python-modules/cymem/default.nix | 2 +- pkgs/development/python-modules/cypari2/default.nix | 2 +- pkgs/development/python-modules/daemonize/default.nix | 2 +- pkgs/development/python-modules/darcsver/default.nix | 2 +- pkgs/development/python-modules/dask-glm/default.nix | 2 +- pkgs/development/python-modules/dask-image/default.nix | 2 +- .../development/python-modules/dask-jobqueue/default.nix | 2 +- pkgs/development/python-modules/dask-ml/default.nix | 2 +- pkgs/development/python-modules/dask-mpi/default.nix | 2 +- pkgs/development/python-modules/dask-xgboost/default.nix | 2 +- .../python-modules/databricks-cli/default.nix | 2 +- pkgs/development/python-modules/dataclasses/default.nix | 2 +- pkgs/development/python-modules/datadiff/default.nix | 2 +- .../development/python-modules/datamodeldict/default.nix | 2 +- pkgs/development/python-modules/dateutil/default.nix | 2 +- pkgs/development/python-modules/datrie/default.nix | 2 +- pkgs/development/python-modules/dbf/default.nix | 2 +- pkgs/development/python-modules/dbfread/default.nix | 2 +- pkgs/development/python-modules/dbus-next/default.nix | 2 +- pkgs/development/python-modules/dbutils/default.nix | 2 +- pkgs/development/python-modules/dcmstack/default.nix | 2 +- pkgs/development/python-modules/deap/default.nix | 2 +- .../development/python-modules/deluge-client/default.nix | 2 +- pkgs/development/python-modules/demjson/default.nix | 2 +- .../python-modules/dependency-injector/default.nix | 2 +- pkgs/development/python-modules/deprecated/default.nix | 2 +- pkgs/development/python-modules/derpconf/default.nix | 2 +- pkgs/development/python-modules/descartes/default.nix | 2 +- pkgs/development/python-modules/deskcon/default.nix | 2 +- pkgs/development/python-modules/diff_cover/default.nix | 2 +- pkgs/development/python-modules/digi-xbee/default.nix | 2 +- .../python-modules/discogs_client/default.nix | 2 +- pkgs/development/python-modules/distlib/default.nix | 2 +- pkgs/development/python-modules/distorm3/default.nix | 2 +- pkgs/development/python-modules/distro/default.nix | 2 +- .../python-modules/distutils_extra/default.nix | 2 +- pkgs/development/python-modules/dj-email-url/default.nix | 2 +- .../development/python-modules/dj-search-url/default.nix | 2 +- .../python-modules/django-allauth/default.nix | 2 +- .../python-modules/django-anymail/default.nix | 2 +- .../python-modules/django-auth-ldap/default.nix | 2 +- .../python-modules/django-cache-url/default.nix | 2 +- .../python-modules/django-cleanup/default.nix | 2 +- .../development/python-modules/django-compat/default.nix | 2 +- .../python-modules/django-configurations/default.nix | 2 +- pkgs/development/python-modules/django-csp/default.nix | 2 +- .../python-modules/django-discover-runner/default.nix | 2 +- .../django-dynamic-preferences/default.nix | 2 +- .../development/python-modules/django-filter/default.nix | 2 +- .../python-modules/django-gravatar2/default.nix | 2 +- .../python-modules/django-hijack-admin/default.nix | 2 +- .../development/python-modules/django-hijack/default.nix | 2 +- .../python-modules/django-logentry-admin/default.nix | 2 +- .../python-modules/django-mailman3/default.nix | 2 +- .../python-modules/django-maintenance-mode/default.nix | 2 +- .../python-modules/django-oauth-toolkit/default.nix | 2 +- .../python-modules/django-paintstore/default.nix | 2 +- .../python-modules/django-polymorphic/default.nix | 2 +- .../django-postgresql-netfields/default.nix | 2 +- pkgs/development/python-modules/django-q/default.nix | 2 +- .../python-modules/django-ranged-response/default.nix | 2 +- .../development/python-modules/django-raster/default.nix | 2 +- .../python-modules/django-storages/default.nix | 2 +- .../django-versatileimagefield/default.nix | 2 +- .../python-modules/django-webpack-loader/default.nix | 2 +- .../python-modules/django-widget-tweaks/default.nix | 2 +- .../python-modules/django_appconf/default.nix | 2 +- .../python-modules/django_classytags/default.nix | 2 +- .../python-modules/django_colorful/default.nix | 2 +- .../python-modules/django_compressor/default.nix | 2 +- .../python-modules/django_contrib_comments/default.nix | 2 +- .../python-modules/django_environ/default.nix | 2 +- .../python-modules/django_evolution/default.nix | 2 +- .../python-modules/django_guardian/default.nix | 2 +- .../python-modules/django_modelcluster/default.nix | 2 +- pkgs/development/python-modules/django_nose/default.nix | 2 +- pkgs/development/python-modules/django_redis/default.nix | 2 +- .../python-modules/django_reversion/default.nix | 2 +- pkgs/development/python-modules/django_silk/default.nix | 2 +- .../development/python-modules/django_taggit/default.nix | 2 +- .../python-modules/django_treebeard/default.nix | 2 +- .../python-modules/djangorestframework/default.nix | 2 +- pkgs/development/python-modules/dkimpy/default.nix | 2 +- .../python-modules/docker-pycreds/default.nix | 2 +- .../python-modules/dockerfile-parse/default.nix | 2 +- pkgs/development/python-modules/dockerpty/default.nix | 2 +- pkgs/development/python-modules/docopt/default.nix | 2 +- .../python-modules/doctest-ignore-unicode/default.nix | 2 +- .../development/python-modules/dogpile.cache/default.nix | 2 +- pkgs/development/python-modules/dogpile.core/default.nix | 2 +- pkgs/development/python-modules/dot2tex/default.nix | 2 +- pkgs/development/python-modules/dpath/default.nix | 2 +- pkgs/development/python-modules/dpkt/default.nix | 2 +- pkgs/development/python-modules/drf-yasg/default.nix | 2 +- pkgs/development/python-modules/dropbox/default.nix | 2 +- pkgs/development/python-modules/dtopt/default.nix | 2 +- pkgs/development/python-modules/dufte/default.nix | 2 +- pkgs/development/python-modules/dyn/default.nix | 2 +- pkgs/development/python-modules/dynd/default.nix | 2 +- pkgs/development/python-modules/easygui/default.nix | 2 +- pkgs/development/python-modules/easyprocess/default.nix | 2 +- pkgs/development/python-modules/easysnmp/default.nix | 3 +-- pkgs/development/python-modules/ecdsa/default.nix | 2 +- pkgs/development/python-modules/ed25519/default.nix | 2 +- pkgs/development/python-modules/editorconfig/default.nix | 2 +- pkgs/development/python-modules/edward/default.nix | 2 +- pkgs/development/python-modules/eggdeps/default.nix | 2 +- .../python-modules/elasticsearch-dsl/default.nix | 2 +- .../development/python-modules/elasticsearch/default.nix | 2 +- pkgs/development/python-modules/eliot/default.nix | 2 +- pkgs/development/python-modules/emcee/default.nix | 2 +- pkgs/development/python-modules/emv/default.nix | 2 +- pkgs/development/python-modules/enum/default.nix | 2 +- pkgs/development/python-modules/enum34/default.nix | 2 +- pkgs/development/python-modules/epc/default.nix | 2 +- pkgs/development/python-modules/ephem/default.nix | 2 +- pkgs/development/python-modules/et_xmlfile/default.nix | 2 +- pkgs/development/python-modules/etcd/default.nix | 2 +- pkgs/development/python-modules/eve/default.nix | 2 +- pkgs/development/python-modules/eventlib/default.nix | 2 +- pkgs/development/python-modules/evernote/default.nix | 2 +- pkgs/development/python-modules/exchangelib/default.nix | 2 +- pkgs/development/python-modules/execnet/default.nix | 3 +-- pkgs/development/python-modules/exifread/default.nix | 2 +- pkgs/development/python-modules/eyed3/default.nix | 3 +-- pkgs/development/python-modules/ezdxf/default.nix | 2 +- pkgs/development/python-modules/face/default.nix | 2 +- .../python-modules/face_recognition/default.nix | 2 +- .../python-modules/face_recognition_models/default.nix | 2 +- .../python-modules/fake-useragent/default.nix | 2 +- pkgs/development/python-modules/fake_factory/default.nix | 2 +- pkgs/development/python-modules/falcon/default.nix | 2 +- pkgs/development/python-modules/fasteners/default.nix | 2 +- .../python-modules/fastentrypoints/default.nix | 2 +- pkgs/development/python-modules/fastimport/default.nix | 2 +- pkgs/development/python-modules/fastpair/default.nix | 2 +- pkgs/development/python-modules/fastpbkdf2/default.nix | 2 +- pkgs/development/python-modules/fastprogress/default.nix | 2 +- pkgs/development/python-modules/fastrlock/default.nix | 2 +- pkgs/development/python-modules/fasttext/default.nix | 2 +- pkgs/development/python-modules/fdint/default.nix | 2 +- pkgs/development/python-modules/feedgen/default.nix | 2 +- .../development/python-modules/feedgenerator/default.nix | 2 +- pkgs/development/python-modules/feedparser/5.nix | 2 +- pkgs/development/python-modules/feedparser/default.nix | 2 +- .../python-modules/filebrowser_safe/default.nix | 2 +- pkgs/development/python-modules/filebytes/default.nix | 2 +- pkgs/development/python-modules/filelock/default.nix | 2 +- pkgs/development/python-modules/filterpy/default.nix | 2 +- pkgs/development/python-modules/fints/default.nix | 2 +- pkgs/development/python-modules/fire/default.nix | 2 +- pkgs/development/python-modules/first/default.nix | 2 +- pkgs/development/python-modules/flake8/default.nix | 2 +- pkgs/development/python-modules/flaky/default.nix | 2 +- pkgs/development/python-modules/flask-babel/default.nix | 2 +- pkgs/development/python-modules/flask-common/default.nix | 2 +- .../python-modules/flask-compress/default.nix | 2 +- pkgs/development/python-modules/flask-cors/default.nix | 2 +- .../development/python-modules/flask-elastic/default.nix | 2 +- .../python-modules/flask-jwt-extended/default.nix | 2 +- .../python-modules/flask-ldap-login/default.nix | 2 +- .../development/python-modules/flask-limiter/default.nix | 2 +- pkgs/development/python-modules/flask-login/default.nix | 2 +- .../python-modules/flask-reverse-proxy-fix/default.nix | 2 +- pkgs/development/python-modules/flask-silk/default.nix | 2 +- .../python-modules/flask-sqlalchemy/default.nix | 2 +- .../python-modules/flask-swagger-ui/default.nix | 2 +- .../development/python-modules/flask-swagger/default.nix | 2 +- .../python-modules/flask-versioned/default.nix | 2 +- pkgs/development/python-modules/flask-wtf/default.nix | 2 +- pkgs/development/python-modules/flask/default.nix | 2 +- pkgs/development/python-modules/flaskbabel/default.nix | 2 +- .../python-modules/flowlogs_reader/default.nix | 2 +- pkgs/development/python-modules/flup/default.nix | 2 +- pkgs/development/python-modules/flux-led/default.nix | 2 +- pkgs/development/python-modules/foolscap/default.nix | 2 +- .../python-modules/forbiddenfruit/default.nix | 2 +- pkgs/development/python-modules/foxdot/default.nix | 2 +- pkgs/development/python-modules/freezegun/0.3.nix | 2 +- pkgs/development/python-modules/freezegun/default.nix | 2 +- .../python-modules/fritzconnection/default.nix | 2 +- pkgs/development/python-modules/frozendict/default.nix | 2 +- pkgs/development/python-modules/ftfy/default.nix | 2 +- pkgs/development/python-modules/fudge/default.nix | 2 +- .../development/python-modules/funcparserlib/default.nix | 2 +- pkgs/development/python-modules/funcsigs/default.nix | 2 +- pkgs/development/python-modules/functools32/default.nix | 2 +- pkgs/development/python-modules/funcy/default.nix | 2 +- pkgs/development/python-modules/furl/default.nix | 2 +- pkgs/development/python-modules/fuse-python/default.nix | 2 +- pkgs/development/python-modules/fusepy/default.nix | 2 +- pkgs/development/python-modules/fuzzywuzzy/default.nix | 2 +- pkgs/development/python-modules/gast/default.nix | 2 +- pkgs/development/python-modules/gateone/default.nix | 2 +- pkgs/development/python-modules/gcovr/default.nix | 2 +- pkgs/development/python-modules/gdata/default.nix | 2 +- pkgs/development/python-modules/gdrivefs/default.nix | 2 +- pkgs/development/python-modules/geeknote/default.nix | 2 +- pkgs/development/python-modules/genanki/default.nix | 2 +- pkgs/development/python-modules/genshi/default.nix | 2 +- pkgs/development/python-modules/genzshcomp/default.nix | 2 +- pkgs/development/python-modules/geoalchemy2/default.nix | 2 +- .../development/python-modules/geographiclib/default.nix | 2 +- pkgs/development/python-modules/geopy/2.nix | 2 +- .../python-modules/gevent-socketio/default.nix | 2 +- .../python-modules/gevent-websocket/default.nix | 2 +- pkgs/development/python-modules/gevent/default.nix | 2 +- .../python-modules/geventhttpclient/default.nix | 2 +- pkgs/development/python-modules/ghdiff/default.nix | 2 +- pkgs/development/python-modules/gipc/default.nix | 2 +- .../python-modules/git-annex-adapter/default.nix | 2 +- pkgs/development/python-modules/git-sweep/default.nix | 2 +- pkgs/development/python-modules/globre/default.nix | 2 +- pkgs/development/python-modules/glom/default.nix | 2 +- pkgs/development/python-modules/gmpy2/default.nix | 2 +- pkgs/development/python-modules/gmusicapi/default.nix | 2 +- pkgs/development/python-modules/gnureadline/default.nix | 2 +- pkgs/development/python-modules/gnutls/default.nix | 2 +- pkgs/development/python-modules/goobook/default.nix | 2 +- .../python-modules/google-apputils/default.nix | 2 +- pkgs/development/python-modules/google-auth/default.nix | 2 +- .../python-modules/google-cloud-asset/default.nix | 2 +- .../python-modules/google-cloud-automl/default.nix | 2 +- .../google-cloud-bigquery-datatransfer/default.nix | 2 +- .../python-modules/google-cloud-bigquery/default.nix | 2 +- .../python-modules/google-cloud-bigtable/default.nix | 2 +- .../python-modules/google-cloud-container/default.nix | 2 +- .../python-modules/google-cloud-core/default.nix | 2 +- .../python-modules/google-cloud-dataproc/default.nix | 2 +- .../python-modules/google-cloud-datastore/default.nix | 2 +- .../python-modules/google-cloud-dlp/default.nix | 2 +- .../python-modules/google-cloud-dns/default.nix | 2 +- .../google-cloud-error-reporting/default.nix | 2 +- .../python-modules/google-cloud-firestore/default.nix | 2 +- .../python-modules/google-cloud-iot/default.nix | 2 +- .../python-modules/google-cloud-kms/default.nix | 2 +- .../python-modules/google-cloud-language/default.nix | 2 +- .../python-modules/google-cloud-logging/default.nix | 2 +- .../python-modules/google-cloud-monitoring/default.nix | 2 +- .../python-modules/google-cloud-pubsub/default.nix | 2 +- .../python-modules/google-cloud-redis/default.nix | 2 +- .../google-cloud-resource-manager/default.nix | 2 +- .../google-cloud-runtimeconfig/default.nix | 2 +- .../google-cloud-securitycenter/default.nix | 2 +- .../python-modules/google-cloud-spanner/default.nix | 2 +- .../python-modules/google-cloud-speech/default.nix | 2 +- .../python-modules/google-cloud-tasks/default.nix | 2 +- .../python-modules/google-cloud-testutils/default.nix | 2 +- .../python-modules/google-cloud-texttospeech/default.nix | 2 +- .../python-modules/google-cloud-trace/default.nix | 2 +- .../python-modules/google-cloud-translate/default.nix | 2 +- .../google-cloud-videointelligence/default.nix | 2 +- .../python-modules/google-cloud-vision/default.nix | 2 +- .../google-cloud-websecurityscanner/default.nix | 2 +- .../python-modules/googleapis_common_protos/default.nix | 2 +- pkgs/development/python-modules/googlemaps/default.nix | 2 +- pkgs/development/python-modules/gorilla/default.nix | 2 +- pkgs/development/python-modules/gpapi/default.nix | 2 +- pkgs/development/python-modules/gphoto2/default.nix | 2 +- pkgs/development/python-modules/gplaycli/default.nix | 2 +- pkgs/development/python-modules/gpsoauth/default.nix | 2 +- pkgs/development/python-modules/gpyopt/default.nix | 2 +- pkgs/development/python-modules/gradient_sdk/default.nix | 2 +- .../python-modules/gradient_statsd/default.nix | 2 +- pkgs/development/python-modules/graphite-web/default.nix | 2 +- .../python-modules/graphite_beacon/default.nix | 2 +- .../python-modules/grappelli_safe/default.nix | 2 +- pkgs/development/python-modules/grequests/default.nix | 2 +- pkgs/development/python-modules/grip/default.nix | 2 +- .../python-modules/grpc_google_iam_v1/default.nix | 2 +- pkgs/development/python-modules/grpcio-gcp/default.nix | 2 +- pkgs/development/python-modules/gsd/1.7.nix | 2 +- pkgs/development/python-modules/gspread/default.nix | 2 +- pkgs/development/python-modules/gst-python/default.nix | 2 +- pkgs/development/python-modules/gtimelog/default.nix | 2 +- pkgs/development/python-modules/guestfs/default.nix | 2 +- pkgs/development/python-modules/gunicorn/19.nix | 2 +- pkgs/development/python-modules/gunicorn/default.nix | 2 +- .../python-modules/guzzle_sphinx_theme/default.nix | 2 +- pkgs/development/python-modules/h2/default.nix | 2 +- pkgs/development/python-modules/ha-ffmpeg/default.nix | 2 +- pkgs/development/python-modules/handout/default.nix | 2 +- pkgs/development/python-modules/hawkauthlib/default.nix | 2 +- pkgs/development/python-modules/hbmqtt/default.nix | 2 +- pkgs/development/python-modules/hcs_utils/default.nix | 2 +- pkgs/development/python-modules/hdmedians/default.nix | 2 +- pkgs/development/python-modules/heapdict/default.nix | 2 +- pkgs/development/python-modules/helper/default.nix | 2 +- pkgs/development/python-modules/hetzner/default.nix | 2 +- pkgs/development/python-modules/heudiconv/default.nix | 2 +- pkgs/development/python-modules/hglib/default.nix | 2 +- pkgs/development/python-modules/hgsvn/default.nix | 2 +- pkgs/development/python-modules/hieroglyph/default.nix | 2 +- pkgs/development/python-modules/hiredis/default.nix | 2 +- pkgs/development/python-modules/hiro/default.nix | 2 +- pkgs/development/python-modules/hjson/default.nix | 2 +- pkgs/development/python-modules/hkdf/default.nix | 2 +- pkgs/development/python-modules/hocr-tools/default.nix | 2 +- pkgs/development/python-modules/holidays/default.nix | 2 +- pkgs/development/python-modules/hpack/default.nix | 2 +- pkgs/development/python-modules/hsaudiotag/default.nix | 2 +- pkgs/development/python-modules/hsaudiotag3k/default.nix | 2 +- pkgs/development/python-modules/html2text/2018.nix | 2 +- pkgs/development/python-modules/html5-parser/default.nix | 2 +- pkgs/development/python-modules/htmllaundry/default.nix | 2 +- pkgs/development/python-modules/httmock/default.nix | 2 +- .../python-modules/http_signature/default.nix | 2 +- pkgs/development/python-modules/httpauth/default.nix | 2 +- pkgs/development/python-modules/httpbin/default.nix | 2 +- pkgs/development/python-modules/humanize/default.nix | 2 +- pkgs/development/python-modules/hyperframe/default.nix | 2 +- pkgs/development/python-modules/hyperopt/default.nix | 2 +- pkgs/development/python-modules/i3-py/default.nix | 2 +- pkgs/development/python-modules/i3ipc/default.nix | 2 +- pkgs/development/python-modules/icalendar/default.nix | 2 +- pkgs/development/python-modules/ics/default.nix | 2 +- pkgs/development/python-modules/ifaddr/default.nix | 2 +- .../python-modules/ifconfig-parser/default.nix | 2 +- pkgs/development/python-modules/ijson/default.nix | 2 +- pkgs/development/python-modules/image-match/default.nix | 2 +- .../python-modules/imagecorruptions/default.nix | 2 +- pkgs/development/python-modules/imageio/default.nix | 2 +- pkgs/development/python-modules/imagesize/default.nix | 2 +- pkgs/development/python-modules/imapclient/default.nix | 2 +- pkgs/development/python-modules/imbalanced-learn/0.4.nix | 2 +- .../python-modules/imbalanced-learn/default.nix | 2 +- pkgs/development/python-modules/imgaug/default.nix | 2 +- pkgs/development/python-modules/imgsize/default.nix | 2 +- pkgs/development/python-modules/importmagic/default.nix | 2 +- pkgs/development/python-modules/imread/default.nix | 2 +- pkgs/development/python-modules/imutils/default.nix | 2 +- pkgs/development/python-modules/influxdb/default.nix | 2 +- pkgs/development/python-modules/influxgraph/default.nix | 2 +- pkgs/development/python-modules/infoqscraper/default.nix | 2 +- pkgs/development/python-modules/inifile/default.nix | 2 +- pkgs/development/python-modules/iniparse/default.nix | 2 +- pkgs/development/python-modules/inquirer/default.nix | 2 +- .../python-modules/interruptingcow/default.nix | 2 +- pkgs/development/python-modules/intervaltree/default.nix | 2 +- pkgs/development/python-modules/ipaddr/default.nix | 2 +- pkgs/development/python-modules/ipaddress/default.nix | 2 +- pkgs/development/python-modules/ipdb/default.nix | 2 +- pkgs/development/python-modules/ipdbplugin/default.nix | 2 +- pkgs/development/python-modules/ipfsapi/default.nix | 2 +- pkgs/development/python-modules/iptools/default.nix | 2 +- pkgs/development/python-modules/iso3166/default.nix | 2 +- pkgs/development/python-modules/isodate/default.nix | 2 +- pkgs/development/python-modules/itsdangerous/default.nix | 2 +- pkgs/development/python-modules/itypes/default.nix | 2 +- pkgs/development/python-modules/j2cli/default.nix | 2 +- pkgs/development/python-modules/jabberbot/default.nix | 2 +- pkgs/development/python-modules/jc/default.nix | 2 +- pkgs/development/python-modules/jdatetime/default.nix | 2 +- pkgs/development/python-modules/jedi/default.nix | 2 +- .../python-modules/jinja2_pluralize/default.nix | 2 +- pkgs/development/python-modules/jinja2_time/default.nix | 2 +- pkgs/development/python-modules/jmespath/default.nix | 2 +- pkgs/development/python-modules/jpylyzer/default.nix | 2 +- pkgs/development/python-modules/jsonfield/default.nix | 2 +- pkgs/development/python-modules/jsonpath_rw/default.nix | 2 +- pkgs/development/python-modules/jsonref/default.nix | 2 +- .../development/python-modules/jsonrpc-async/default.nix | 2 +- pkgs/development/python-modules/jsonrpc-base/default.nix | 2 +- .../python-modules/jsonrpc-websocket/default.nix | 2 +- pkgs/development/python-modules/jsonwatch/default.nix | 2 +- pkgs/development/python-modules/jug/default.nix | 2 +- pkgs/development/python-modules/junos-eznc/default.nix | 2 +- .../python-modules/jupyter-repo2docker/default.nix | 2 +- .../python-modules/jupyter-telemetry/default.nix | 3 +-- pkgs/development/python-modules/jupyter/default.nix | 2 +- .../python-modules/jupyterlab_server/default.nix | 2 +- pkgs/development/python-modules/kaa-base/default.nix | 2 +- pkgs/development/python-modules/kaa-metadata/default.nix | 2 +- pkgs/development/python-modules/kafka-python/default.nix | 2 +- pkgs/development/python-modules/kaitaistruct/default.nix | 2 +- pkgs/development/python-modules/kajiki/default.nix | 2 +- pkgs/development/python-modules/kaptan/default.nix | 2 +- pkgs/development/python-modules/kazoo/default.nix | 2 +- pkgs/development/python-modules/keep/default.nix | 2 +- pkgs/development/python-modules/keepalive/default.nix | 2 +- pkgs/development/python-modules/keepkey/default.nix | 2 +- .../development/python-modules/keepkey_agent/default.nix | 2 +- pkgs/development/python-modules/keras/default.nix | 2 +- pkgs/development/python-modules/kerberos/default.nix | 2 +- pkgs/development/python-modules/keyrings-alt/default.nix | 2 +- pkgs/development/python-modules/kitchen/default.nix | 2 +- pkgs/development/python-modules/knack/default.nix | 3 +-- .../python-modules/korean-lunar-calendar/default.nix | 2 +- pkgs/development/python-modules/kubernetes/default.nix | 2 +- pkgs/development/python-modules/larch/default.nix | 2 +- pkgs/development/python-modules/lasagne/default.nix | 2 +- .../python-modules/lazy-object-proxy/default.nix | 2 +- pkgs/development/python-modules/lazy_import/default.nix | 2 +- pkgs/development/python-modules/ldap3/default.nix | 2 +- pkgs/development/python-modules/le/default.nix | 2 +- pkgs/development/python-modules/leather/default.nix | 2 +- pkgs/development/python-modules/ledger_agent/default.nix | 2 +- pkgs/development/python-modules/ledgerblue/default.nix | 2 +- pkgs/development/python-modules/libagent/default.nix | 2 +- pkgs/development/python-modules/libais/default.nix | 2 +- pkgs/development/python-modules/libarcus/default.nix | 2 +- pkgs/development/python-modules/libasyncns/default.nix | 2 +- pkgs/development/python-modules/libkeepass/default.nix | 2 +- pkgs/development/python-modules/liblarch/default.nix | 2 +- pkgs/development/python-modules/libmr/default.nix | 2 +- pkgs/development/python-modules/librosa/default.nix | 2 +- pkgs/development/python-modules/libsavitar/default.nix | 2 +- .../development/python-modules/libsoundtouch/default.nix | 2 +- pkgs/development/python-modules/libthumbor/default.nix | 2 +- pkgs/development/python-modules/libtmux/default.nix | 2 +- pkgs/development/python-modules/libversion/default.nix | 2 +- pkgs/development/python-modules/libvirt/5.9.0.nix | 2 +- pkgs/development/python-modules/libvirt/default.nix | 2 +- pkgs/development/python-modules/lightblue/default.nix | 2 +- pkgs/development/python-modules/lightning/default.nix | 2 +- pkgs/development/python-modules/limits/default.nix | 2 +- pkgs/development/python-modules/limnoria/default.nix | 2 +- pkgs/development/python-modules/linecache2/default.nix | 2 +- pkgs/development/python-modules/linode-api/default.nix | 2 +- pkgs/development/python-modules/linode/default.nix | 2 +- pkgs/development/python-modules/livelossplot/default.nix | 2 +- .../python-modules/livestreamer-curses/default.nix | 2 +- pkgs/development/python-modules/livestreamer/default.nix | 2 +- pkgs/development/python-modules/lmdb/default.nix | 2 +- pkgs/development/python-modules/lmtpd/default.nix | 2 +- pkgs/development/python-modules/localzone/default.nix | 2 +- pkgs/development/python-modules/locket/default.nix | 2 +- pkgs/development/python-modules/logilab/common.nix | 2 +- pkgs/development/python-modules/logilab/constraint.nix | 2 +- .../development/python-modules/logilab_astng/default.nix | 2 +- pkgs/development/python-modules/logutils/default.nix | 2 +- pkgs/development/python-modules/lpod/default.nix | 2 +- pkgs/development/python-modules/lsi/default.nix | 2 +- pkgs/development/python-modules/lxc/default.nix | 2 +- pkgs/development/python-modules/lyricwikia/default.nix | 2 +- pkgs/development/python-modules/m2crypto/default.nix | 3 +-- pkgs/development/python-modules/m2r/default.nix | 2 +- .../magic-wormhole-mailbox-server/default.nix | 2 +- pkgs/development/python-modules/mailcap-fix/default.nix | 2 +- pkgs/development/python-modules/mailchimp/default.nix | 2 +- .../python-modules/mailman-hyperkitty/default.nix | 2 +- pkgs/development/python-modules/mailman-rss/default.nix | 2 +- .../development/python-modules/mailmanclient/default.nix | 2 +- pkgs/development/python-modules/manuel/default.nix | 2 +- pkgs/development/python-modules/mapsplotlib/default.nix | 2 +- .../python-modules/marionette-harness/mozinfo.nix | 2 +- pkgs/development/python-modules/marisa/default.nix | 2 +- .../python-modules/markdown-macros/default.nix | 2 +- pkgs/development/python-modules/markdown2/default.nix | 2 +- pkgs/development/python-modules/markerlib/default.nix | 2 +- pkgs/development/python-modules/markupsafe/default.nix | 2 +- .../development/python-modules/matrix-client/default.nix | 2 +- pkgs/development/python-modules/maya/default.nix | 2 +- pkgs/development/python-modules/mccabe/default.nix | 2 +- pkgs/development/python-modules/mdp/default.nix | 2 +- pkgs/development/python-modules/mechanize/default.nix | 2 +- pkgs/development/python-modules/meinheld/default.nix | 2 +- pkgs/development/python-modules/meld3/default.nix | 2 +- pkgs/development/python-modules/meliae/default.nix | 2 +- pkgs/development/python-modules/memcached/default.nix | 2 +- .../python-modules/memory_profiler/default.nix | 2 +- pkgs/development/python-modules/mergedeep/default.nix | 2 +- pkgs/development/python-modules/mesa/default.nix | 2 +- pkgs/development/python-modules/metaphone/default.nix | 2 +- pkgs/development/python-modules/mezzanine/default.nix | 2 +- pkgs/development/python-modules/micawber/default.nix | 2 +- pkgs/development/python-modules/midiutil/default.nix | 2 +- pkgs/development/python-modules/milc/default.nix | 2 +- pkgs/development/python-modules/minimock/default.nix | 2 +- pkgs/development/python-modules/miniupnpc/default.nix | 2 +- pkgs/development/python-modules/mlflow/default.nix | 2 +- pkgs/development/python-modules/mlrose/default.nix | 2 +- pkgs/development/python-modules/mlxtend/default.nix | 2 +- pkgs/development/python-modules/mmpython/default.nix | 2 +- pkgs/development/python-modules/mockito/default.nix | 2 +- pkgs/development/python-modules/modestmaps/default.nix | 2 +- pkgs/development/python-modules/mongodict/default.nix | 2 +- pkgs/development/python-modules/moretools/default.nix | 2 +- pkgs/development/python-modules/moviepy/default.nix | 2 +- pkgs/development/python-modules/mox/default.nix | 2 +- pkgs/development/python-modules/mox3/default.nix | 2 +- pkgs/development/python-modules/mozsvc/default.nix | 2 +- pkgs/development/python-modules/mpd/default.nix | 2 +- pkgs/development/python-modules/mpd2/default.nix | 2 +- pkgs/development/python-modules/mpmath/default.nix | 2 +- pkgs/development/python-modules/mrbob/default.nix | 2 +- .../development/python-modules/msgpack-numpy/default.nix | 2 +- pkgs/development/python-modules/msrplib/default.nix | 2 +- .../python-modules/multi_key_dict/default.nix | 2 +- pkgs/development/python-modules/munch/default.nix | 2 +- pkgs/development/python-modules/munkres/default.nix | 2 +- pkgs/development/python-modules/murmurhash/default.nix | 2 +- .../python-modules/musicbrainzngs/default.nix | 2 +- pkgs/development/python-modules/mutag/default.nix | 2 +- pkgs/development/python-modules/muttils/default.nix | 2 +- pkgs/development/python-modules/mwclient/default.nix | 2 +- pkgs/development/python-modules/mwlib-ext/default.nix | 2 +- pkgs/development/python-modules/mwlib-rl/default.nix | 2 +- pkgs/development/python-modules/mwlib/default.nix | 2 +- .../python-modules/mwparserfromhell/default.nix | 2 +- .../development/python-modules/mypy-protobuf/default.nix | 2 +- pkgs/development/python-modules/mypy/extensions.nix | 2 +- pkgs/development/python-modules/mysqlclient/default.nix | 2 +- pkgs/development/python-modules/namebench/default.nix | 2 +- pkgs/development/python-modules/nameparser/default.nix | 2 +- pkgs/development/python-modules/nanoleaf/default.nix | 2 +- .../python-modules/nanomsg-python/default.nix | 2 +- pkgs/development/python-modules/nbclient/default.nix | 2 +- pkgs/development/python-modules/nbxmpp/default.nix | 2 +- pkgs/development/python-modules/ncclient/default.nix | 2 +- .../python-modules/ndg-httpsclient/default.nix | 2 +- pkgs/development/python-modules/netaddr/default.nix | 2 +- pkgs/development/python-modules/netcdf4/default.nix | 2 +- pkgs/development/python-modules/netdisco/default.nix | 2 +- pkgs/development/python-modules/netifaces/default.nix | 2 +- pkgs/development/python-modules/neuronpy/default.nix | 2 +- pkgs/development/python-modules/nevow/default.nix | 2 +- pkgs/development/python-modules/nimfa/default.nix | 2 +- pkgs/development/python-modules/nine/default.nix | 2 +- pkgs/development/python-modules/nipy/default.nix | 2 +- pkgs/development/python-modules/nixpkgs/default.nix | 2 +- pkgs/development/python-modules/node-semver/default.nix | 2 +- pkgs/development/python-modules/noise/default.nix | 2 +- pkgs/development/python-modules/nose-cover3/default.nix | 2 +- pkgs/development/python-modules/nose-cprof/default.nix | 2 +- pkgs/development/python-modules/nose-focus/default.nix | 2 +- pkgs/development/python-modules/nose-of-yeti/default.nix | 2 +- .../python-modules/nose-pattern-exclude/default.nix | 2 +- pkgs/development/python-modules/nose/default.nix | 2 +- pkgs/development/python-modules/nose2/default.nix | 2 +- .../python-modules/nose_progressive/default.nix | 2 +- pkgs/development/python-modules/nosejs/default.nix | 2 +- pkgs/development/python-modules/nosexcover/default.nix | 2 +- pkgs/development/python-modules/notmuch/2.nix | 2 +- pkgs/development/python-modules/notmuch/default.nix | 2 +- pkgs/development/python-modules/ntplib/default.nix | 2 +- .../python-modules/numericalunits/default.nix | 2 +- pkgs/development/python-modules/nvchecker/default.nix | 2 +- pkgs/development/python-modules/nwdiag/default.nix | 2 +- pkgs/development/python-modules/nxt-python/default.nix | 2 +- pkgs/development/python-modules/oath/default.nix | 2 +- pkgs/development/python-modules/oauth/default.nix | 2 +- pkgs/development/python-modules/oauth2/default.nix | 2 +- pkgs/development/python-modules/oauthlib/3.1.nix | 2 +- pkgs/development/python-modules/oauthlib/default.nix | 2 +- pkgs/development/python-modules/obfsproxy/default.nix | 2 +- pkgs/development/python-modules/objgraph/default.nix | 2 +- pkgs/development/python-modules/offtrac/default.nix | 2 +- pkgs/development/python-modules/ofxclient/default.nix | 2 +- pkgs/development/python-modules/ofxhome/default.nix | 2 +- pkgs/development/python-modules/ofxparse/default.nix | 2 +- pkgs/development/python-modules/ofxtools/default.nix | 2 +- pkgs/development/python-modules/olefile/default.nix | 2 +- pkgs/development/python-modules/omegaconf/default.nix | 2 +- pkgs/development/python-modules/onkyo-eiscp/default.nix | 2 +- pkgs/development/python-modules/openant/default.nix | 2 +- .../python-modules/openbabel-bindings/default.nix | 2 +- .../python-modules/openidc-client/default.nix | 2 +- pkgs/development/python-modules/openrazer/common.nix | 2 +- pkgs/development/python-modules/openrazer/daemon.nix | 3 +-- pkgs/development/python-modules/openrazer/pylib.nix | 3 +-- pkgs/development/python-modules/ordereddict/default.nix | 2 +- .../python-modules/orderedmultidict/default.nix | 2 +- pkgs/development/python-modules/orderedset/default.nix | 2 +- pkgs/development/python-modules/osc/default.nix | 2 +- pkgs/development/python-modules/osmnx/default.nix | 2 +- pkgs/development/python-modules/packaging/2.nix | 2 +- pkgs/development/python-modules/packaging/default.nix | 2 +- pkgs/development/python-modules/pagelabels/default.nix | 2 +- pkgs/development/python-modules/pagerduty/default.nix | 2 +- pkgs/development/python-modules/palettable/default.nix | 2 +- pkgs/development/python-modules/pamqp/default.nix | 2 +- .../python-modules/pandas-datareader/default.nix | 2 +- .../development/python-modules/pandocfilters/default.nix | 2 +- pkgs/development/python-modules/paperspace/default.nix | 2 +- .../development/python-modules/parameterized/default.nix | 2 +- pkgs/development/python-modules/paramz/default.nix | 2 +- pkgs/development/python-modules/parse-type/default.nix | 2 +- pkgs/development/python-modules/parse/default.nix | 2 +- .../development/python-modules/parsedatetime/default.nix | 2 +- pkgs/development/python-modules/parsimonious/default.nix | 2 +- pkgs/development/python-modules/paste/default.nix | 2 +- pkgs/development/python-modules/pastedeploy/default.nix | 2 +- pkgs/development/python-modules/pastescript/default.nix | 2 +- pkgs/development/python-modules/patator/default.nix | 2 +- pkgs/development/python-modules/patch-ng/default.nix | 2 +- pkgs/development/python-modules/patch/default.nix | 2 +- .../python-modules/path-and-address/default.nix | 2 +- pkgs/development/python-modules/pathos/default.nix | 2 +- pkgs/development/python-modules/pathtools/default.nix | 2 +- pkgs/development/python-modules/patool/default.nix | 2 +- pkgs/development/python-modules/paver/default.nix | 2 +- pkgs/development/python-modules/pbkdf2/default.nix | 2 +- .../python-modules/pc-ble-driver-py/default.nix | 2 +- pkgs/development/python-modules/pcpp/default.nix | 2 +- pkgs/development/python-modules/pdf2image/default.nix | 2 +- pkgs/development/python-modules/pdfkit/default.nix | 2 +- pkgs/development/python-modules/pdfminer_six/default.nix | 2 +- pkgs/development/python-modules/pdfposter/default.nix | 2 +- pkgs/development/python-modules/pdfrw/default.nix | 2 +- pkgs/development/python-modules/pdfx/default.nix | 2 +- pkgs/development/python-modules/pecan/default.nix | 2 +- pkgs/development/python-modules/pelican/default.nix | 2 +- pkgs/development/python-modules/pep257/default.nix | 2 +- pkgs/development/python-modules/pep8/default.nix | 2 +- pkgs/development/python-modules/peppercorn/default.nix | 2 +- .../python-modules/persisting-theory/default.nix | 2 +- pkgs/development/python-modules/pex/default.nix | 2 +- pkgs/development/python-modules/pexif/default.nix | 2 +- pkgs/development/python-modules/pg8000/1_12.nix | 2 +- pkgs/development/python-modules/pg8000/default.nix | 2 +- pkgs/development/python-modules/pgpdump/default.nix | 2 +- pkgs/development/python-modules/pgspecial/default.nix | 2 +- pkgs/development/python-modules/phe/default.nix | 2 +- pkgs/development/python-modules/phonopy/default.nix | 2 +- .../python-modules/phx-class-registry/default.nix | 2 +- pkgs/development/python-modules/pickleshare/default.nix | 2 +- pkgs/development/python-modules/pid/default.nix | 2 +- pkgs/development/python-modules/piep/default.nix | 2 +- pkgs/development/python-modules/pika-pool/default.nix | 2 +- pkgs/development/python-modules/pika/default.nix | 2 +- pkgs/development/python-modules/pikepdf/default.nix | 2 +- pkgs/development/python-modules/pilkit/default.nix | 2 +- pkgs/development/python-modules/pillowfight/default.nix | 2 +- pkgs/development/python-modules/pims/default.nix | 2 +- pkgs/development/python-modules/pivy/default.nix | 2 +- pkgs/development/python-modules/pkginfo/default.nix | 2 +- pkgs/development/python-modules/pkuseg/default.nix | 2 +- pkgs/development/python-modules/plac/default.nix | 2 +- pkgs/development/python-modules/pluginbase/default.nix | 2 +- pkgs/development/python-modules/plyvel/default.nix | 2 +- pkgs/development/python-modules/pocket/default.nix | 2 +- pkgs/development/python-modules/polib/default.nix | 2 +- pkgs/development/python-modules/pomegranate/default.nix | 2 +- pkgs/development/python-modules/pony/default.nix | 2 +- pkgs/development/python-modules/pooch/default.nix | 2 +- pkgs/development/python-modules/poppler-qt5/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 2 +- pkgs/development/python-modules/posix_ipc/default.nix | 2 +- pkgs/development/python-modules/potr/default.nix | 2 +- pkgs/development/python-modules/power/default.nix | 2 +- pkgs/development/python-modules/pox/default.nix | 2 +- pkgs/development/python-modules/poyo/default.nix | 2 +- pkgs/development/python-modules/ppscore/default.nix | 2 +- pkgs/development/python-modules/praw/6.3.nix | 2 +- pkgs/development/python-modules/praw/default.nix | 2 +- pkgs/development/python-modules/prawcore/default.nix | 2 +- pkgs/development/python-modules/preggy/default.nix | 2 +- pkgs/development/python-modules/preshed/default.nix | 2 +- pkgs/development/python-modules/pretend/default.nix | 2 +- pkgs/development/python-modules/prettytable/1.nix | 2 +- pkgs/development/python-modules/prettytable/default.nix | 2 +- pkgs/development/python-modules/proboscis/default.nix | 2 +- .../development/python-modules/process-tests/default.nix | 2 +- pkgs/development/python-modules/proglog/default.nix | 2 +- pkgs/development/python-modules/progress/default.nix | 2 +- pkgs/development/python-modules/progressbar/default.nix | 2 +- pkgs/development/python-modules/progressbar2/default.nix | 2 +- .../python-modules/progressbar231/default.nix | 2 +- .../development/python-modules/progressbar33/default.nix | 2 +- pkgs/development/python-modules/proto-plus/default.nix | 2 +- pkgs/development/python-modules/prov/default.nix | 2 +- pkgs/development/python-modules/ptable/default.nix | 2 +- pkgs/development/python-modules/ptest/default.nix | 2 +- pkgs/development/python-modules/ptpython/default.nix | 2 +- pkgs/development/python-modules/publicsuffix/default.nix | 2 +- .../development/python-modules/publicsuffix2/default.nix | 2 +- pkgs/development/python-modules/pudb/default.nix | 2 +- pkgs/development/python-modules/pure-pcapy3/default.nix | 2 +- pkgs/development/python-modules/purepng/default.nix | 2 +- pkgs/development/python-modules/pushover/default.nix | 2 +- pkgs/development/python-modules/pvlib/default.nix | 2 +- pkgs/development/python-modules/pweave/default.nix | 2 +- pkgs/development/python-modules/pwntools/default.nix | 2 +- pkgs/development/python-modules/pxml/default.nix | 2 +- pkgs/development/python-modules/py-radix/default.nix | 2 +- pkgs/development/python-modules/py/default.nix | 2 +- pkgs/development/python-modules/py3dns/default.nix | 2 +- pkgs/development/python-modules/py3status/default.nix | 2 +- pkgs/development/python-modules/py4j/default.nix | 2 +- pkgs/development/python-modules/pyGithub/default.nix | 2 +- pkgs/development/python-modules/py_scrypt/default.nix | 2 +- pkgs/development/python-modules/pyacoustid/default.nix | 2 +- pkgs/development/python-modules/pyalgotrade/default.nix | 2 +- pkgs/development/python-modules/pyamf/default.nix | 2 +- pkgs/development/python-modules/pyannotate/default.nix | 2 +- .../python-modules/pyasn1-modules/default.nix | 2 +- pkgs/development/python-modules/pyasn1/default.nix | 2 +- pkgs/development/python-modules/pyatv/default.nix | 2 +- pkgs/development/python-modules/pyaudio/default.nix | 2 +- pkgs/development/python-modules/pyaxmlparser/default.nix | 2 +- pkgs/development/python-modules/pybase64/default.nix | 2 +- pkgs/development/python-modules/pybindgen/default.nix | 2 +- pkgs/development/python-modules/pyblosxom/default.nix | 2 +- pkgs/development/python-modules/pybluez/default.nix | 2 +- pkgs/development/python-modules/pybrowserid/default.nix | 2 +- pkgs/development/python-modules/pycallgraph/default.nix | 2 +- pkgs/development/python-modules/pycangjie/default.nix | 2 +- pkgs/development/python-modules/pycapnp/default.nix | 2 +- pkgs/development/python-modules/pycarddav/default.nix | 2 +- pkgs/development/python-modules/pycares/default.nix | 2 +- pkgs/development/python-modules/pychart/default.nix | 2 +- pkgs/development/python-modules/pychef/default.nix | 2 +- pkgs/development/python-modules/pyclipper/default.nix | 2 +- pkgs/development/python-modules/pycm/default.nix | 2 +- pkgs/development/python-modules/pycoin/default.nix | 2 +- pkgs/development/python-modules/pycollada/default.nix | 2 +- pkgs/development/python-modules/pycontracts/default.nix | 2 +- pkgs/development/python-modules/pycountry/default.nix | 2 +- pkgs/development/python-modules/pycparser/default.nix | 2 +- pkgs/development/python-modules/pycryptopp/default.nix | 2 +- pkgs/development/python-modules/pydenticon/default.nix | 2 +- pkgs/development/python-modules/pydicom/default.nix | 2 +- pkgs/development/python-modules/pydispatcher/default.nix | 2 +- pkgs/development/python-modules/pydns/default.nix | 2 +- pkgs/development/python-modules/pyechonest/default.nix | 2 +- pkgs/development/python-modules/pyee/default.nix | 2 +- pkgs/development/python-modules/pyemd/default.nix | 2 +- .../development/python-modules/pyexcelerator/default.nix | 2 +- pkgs/development/python-modules/pyext/default.nix | 2 +- pkgs/development/python-modules/pyfantom/default.nix | 2 +- pkgs/development/python-modules/pyfftw/default.nix | 2 +- pkgs/development/python-modules/pyfiglet/default.nix | 2 +- pkgs/development/python-modules/pyflakes/default.nix | 2 +- pkgs/development/python-modules/pyftpdlib/default.nix | 2 +- pkgs/development/python-modules/pyfttt/default.nix | 2 +- pkgs/development/python-modules/pygal/default.nix | 2 +- pkgs/development/python-modules/pygame_sdl2/default.nix | 2 +- pkgs/development/python-modules/pygccxml/default.nix | 2 +- pkgs/development/python-modules/pygeoip/default.nix | 2 +- .../python-modules/pygments-better-html/default.nix | 2 +- .../python-modules/pygments-markdown-lexer/default.nix | 2 +- pkgs/development/python-modules/pygpgme/default.nix | 2 +- pkgs/development/python-modules/pygraphviz/default.nix | 2 +- pkgs/development/python-modules/pygreat/default.nix | 2 +- pkgs/development/python-modules/pygrok/default.nix | 2 +- pkgs/development/python-modules/pyhamcrest/1.nix | 2 +- pkgs/development/python-modules/pyhamcrest/default.nix | 2 +- pkgs/development/python-modules/pyhomematic/default.nix | 2 +- pkgs/development/python-modules/pyicu/default.nix | 2 +- pkgs/development/python-modules/pyinotify/default.nix | 2 +- pkgs/development/python-modules/pyinputevent/default.nix | 2 +- pkgs/development/python-modules/pykdtree/default.nix | 2 +- pkgs/development/python-modules/pykerberos/default.nix | 2 +- pkgs/development/python-modules/pykickstart/default.nix | 2 +- pkgs/development/python-modules/pylast/default.nix | 2 +- pkgs/development/python-modules/pylibconfig2/default.nix | 2 +- pkgs/development/python-modules/pyliblo/default.nix | 2 +- pkgs/development/python-modules/pylibmc/default.nix | 2 +- pkgs/development/python-modules/pymaging/default.nix | 2 +- pkgs/development/python-modules/pymaging_png/default.nix | 2 +- pkgs/development/python-modules/pymatgen/default.nix | 2 +- pkgs/development/python-modules/pymeeus/default.nix | 2 +- pkgs/development/python-modules/pymemoize/default.nix | 2 +- pkgs/development/python-modules/pymetar/default.nix | 2 +- pkgs/development/python-modules/pymetno/default.nix | 2 +- pkgs/development/python-modules/pymsgbox/default.nix | 2 +- pkgs/development/python-modules/pymupdf/default.nix | 2 +- pkgs/development/python-modules/pymysqlsa/default.nix | 2 +- pkgs/development/python-modules/pynac/default.nix | 2 +- pkgs/development/python-modules/pynacl/default.nix | 2 +- pkgs/development/python-modules/pynest2d/default.nix | 2 +- pkgs/development/python-modules/pynisher/default.nix | 2 +- pkgs/development/python-modules/pynzb/default.nix | 2 +- pkgs/development/python-modules/pyodbc/default.nix | 2 +- pkgs/development/python-modules/pyopencl/default.nix | 2 +- .../python-modules/pyopengl-accelerate/default.nix | 3 +-- pkgs/development/python-modules/pypandoc/default.nix | 2 +- pkgs/development/python-modules/pypdf/default.nix | 2 +- pkgs/development/python-modules/pypdf2/default.nix | 2 +- pkgs/development/python-modules/pypeg2/default.nix | 2 +- pkgs/development/python-modules/pyphen/default.nix | 2 +- .../development/python-modules/pypillowfight/default.nix | 2 +- pkgs/development/python-modules/pyplatec/default.nix | 2 +- pkgs/development/python-modules/pypoppler/default.nix | 2 +- pkgs/development/python-modules/pyprind/default.nix | 2 +- pkgs/development/python-modules/pyptlib/default.nix | 2 +- pkgs/development/python-modules/pypugjs/default.nix | 2 +- pkgs/development/python-modules/pyqtgraph/default.nix | 2 +- pkgs/development/python-modules/pyquery/default.nix | 2 +- pkgs/development/python-modules/pyramid/default.nix | 2 +- .../python-modules/pyramid_beaker/default.nix | 2 +- .../python-modules/pyramid_chameleon/default.nix | 2 +- .../python-modules/pyramid_exclog/default.nix | 2 +- .../python-modules/pyramid_hawkauth/default.nix | 2 +- .../python-modules/pyramid_jinja2/default.nix | 2 +- pkgs/development/python-modules/pyramid_mako/default.nix | 2 +- .../python-modules/pyramid_multiauth/default.nix | 2 +- pkgs/development/python-modules/pyreport/default.nix | 2 +- pkgs/development/python-modules/pyres/default.nix | 2 +- pkgs/development/python-modules/pyrfc3339/default.nix | 2 +- pkgs/development/python-modules/pyro4/default.nix | 3 +-- pkgs/development/python-modules/pyroma/default.nix | 2 +- pkgs/development/python-modules/pyroute2/default.nix | 2 +- pkgs/development/python-modules/pyrr/default.nix | 2 +- pkgs/development/python-modules/pyrsistent/default.nix | 2 +- pkgs/development/python-modules/pyrss2gen/default.nix | 2 +- pkgs/development/python-modules/pysaml2/default.nix | 2 +- pkgs/development/python-modules/pyscss/default.nix | 2 +- pkgs/development/python-modules/pysendfile/default.nix | 2 +- pkgs/development/python-modules/pysensors/default.nix | 2 +- .../python-modules/pyserial-asyncio/default.nix | 2 +- pkgs/development/python-modules/pysftp/default.nix | 2 +- pkgs/development/python-modules/pyshp/default.nix | 2 +- pkgs/development/python-modules/pysigset/default.nix | 2 +- pkgs/development/python-modules/pysmbc/default.nix | 2 +- pkgs/development/python-modules/pysmf/default.nix | 2 +- pkgs/development/python-modules/pysmi/default.nix | 2 +- pkgs/development/python-modules/pysnmp/default.nix | 2 +- pkgs/development/python-modules/pysocks/default.nix | 2 +- pkgs/development/python-modules/pyspark/default.nix | 2 +- pkgs/development/python-modules/pysqueezebox/default.nix | 2 +- pkgs/development/python-modules/pysrt/default.nix | 2 +- pkgs/development/python-modules/pyssim/default.nix | 2 +- pkgs/development/python-modules/pystache/default.nix | 2 +- pkgs/development/python-modules/pystemd/default.nix | 2 +- pkgs/development/python-modules/pystemmer/default.nix | 2 +- pkgs/development/python-modules/pytabix/default.nix | 2 +- pkgs/development/python-modules/pytado/default.nix | 2 +- pkgs/development/python-modules/pyte/default.nix | 2 +- .../python-modules/pytest-aiohttp/default.nix | 2 +- .../python-modules/pytest-annotate/default.nix | 2 +- .../python-modules/pytest-ansible/default.nix | 2 +- .../python-modules/pytest-asyncio/default.nix | 2 +- pkgs/development/python-modules/pytest-bdd/default.nix | 2 +- .../python-modules/pytest-catchlog/default.nix | 2 +- .../development/python-modules/pytest-celery/default.nix | 2 +- pkgs/development/python-modules/pytest-check/default.nix | 2 +- pkgs/development/python-modules/pytest-cov/default.nix | 2 +- .../python-modules/pytest-datadir/default.nix | 2 +- .../python-modules/pytest-datafiles/default.nix | 2 +- .../python-modules/pytest-dependency/default.nix | 2 +- .../development/python-modules/pytest-django/default.nix | 2 +- .../python-modules/pytest-fixture-config/default.nix | 2 +- .../development/python-modules/pytest-flakes/default.nix | 2 +- pkgs/development/python-modules/pytest-flask/default.nix | 2 +- .../python-modules/pytest-helpers-namespace/default.nix | 2 +- pkgs/development/python-modules/pytest-html/default.nix | 2 +- .../python-modules/pytest-metadata/default.nix | 2 +- pkgs/development/python-modules/pytest-mpl/default.nix | 2 +- .../development/python-modules/pytest-pep257/default.nix | 2 +- .../python-modules/pytest-quickcheck/default.nix | 2 +- .../python-modules/pytest-raisesregexp/default.nix | 2 +- .../python-modules/pytest-random-order/default.nix | 2 +- .../python-modules/pytest-relaxed/default.nix | 2 +- .../python-modules/pytest-rerunfailures/default.nix | 2 +- .../python-modules/pytest-server-fixtures/default.nix | 2 +- .../development/python-modules/pytest-shutil/default.nix | 2 +- .../python-modules/pytest-subtesthack/default.nix | 2 +- .../python-modules/pytest-virtualenv/default.nix | 2 +- pkgs/development/python-modules/pytest-xdist/1.nix | 2 +- pkgs/development/python-modules/pytest-xdist/default.nix | 2 +- pkgs/development/python-modules/pytest/4.nix | 2 +- pkgs/development/python-modules/pytest/5.nix | 2 +- pkgs/development/python-modules/pytest/default.nix | 2 +- pkgs/development/python-modules/pytestcache/default.nix | 2 +- pkgs/development/python-modules/pytestrunner/default.nix | 2 +- pkgs/development/python-modules/python-doi/default.nix | 2 +- .../development/python-modules/python-editor/default.nix | 2 +- pkgs/development/python-modules/python-efl/default.nix | 2 +- pkgs/development/python-modules/python-etcd/default.nix | 2 +- .../python-modules/python-forecastio/default.nix | 2 +- .../python-modules/python-frontmatter/default.nix | 2 +- .../development/python-modules/python-gitlab/default.nix | 2 +- pkgs/development/python-modules/python-gnupg/default.nix | 2 +- pkgs/development/python-modules/python-hosts/default.nix | 2 +- pkgs/development/python-modules/python-jose/default.nix | 2 +- .../python-modules/python-json-logger/default.nix | 2 +- .../python-modules/python-jsonrpc-server/default.nix | 2 +- .../python-modules/python-language-server/default.nix | 2 +- .../python-modules/python-ldap-test/default.nix | 2 +- .../python-modules/python-levenshtein/default.nix | 2 +- pkgs/development/python-modules/python-ly/default.nix | 2 +- pkgs/development/python-modules/python-lzf/default.nix | 2 +- .../development/python-modules/python-mapnik/default.nix | 2 +- pkgs/development/python-modules/python-miio/default.nix | 2 +- pkgs/development/python-modules/python-mnist/default.nix | 2 +- pkgs/development/python-modules/python-nomad/default.nix | 2 +- pkgs/development/python-modules/python-otr/default.nix | 2 +- .../development/python-modules/python-packer/default.nix | 2 +- .../python-modules/python-pipedrive/default.nix | 2 +- .../development/python-modules/python-ptrace/default.nix | 2 +- .../python-modules/python-rapidjson/default.nix | 2 +- .../python-modules/python-redis-lock/default.nix | 2 +- .../python-modules/python-simple-hipchat/default.nix | 2 +- .../python-modules/python-slugify/default.nix | 2 +- .../python-modules/python-socketio/default.nix | 2 +- .../python-modules/python-telegram-bot/default.nix | 2 +- .../python-modules/python-twitter/default.nix | 2 +- .../python-modules/python-u2flib-host/default.nix | 2 +- .../development/python-modules/python-uinput/default.nix | 2 +- .../python-modules/python-unshare/default.nix | 2 +- .../python-modules/python-vipaccess/default.nix | 2 +- pkgs/development/python-modules/python-wifi/default.nix | 2 +- .../python-modules/python2-pythondialog/default.nix | 2 +- .../python-modules/python3-openid/default.nix | 2 +- .../development/python-modules/python_fedora/default.nix | 2 +- .../python-modules/python_keyczar/default.nix | 2 +- .../python-modules/python_mimeparse/default.nix | 2 +- .../python-modules/python_openzwave/default.nix | 2 +- .../development/python-modules/python_statsd/default.nix | 2 +- pkgs/development/python-modules/pythondialog/default.nix | 2 +- pkgs/development/python-modules/pythonirclib/default.nix | 2 +- pkgs/development/python-modules/pythonix/default.nix | 2 +- pkgs/development/python-modules/pytimeparse/default.nix | 2 +- pkgs/development/python-modules/pytoml/default.nix | 2 +- pkgs/development/python-modules/pytrends/default.nix | 2 +- pkgs/development/python-modules/pytricia/default.nix | 2 +- pkgs/development/python-modules/pytun/default.nix | 2 +- pkgs/development/python-modules/pytzdata/default.nix | 2 +- pkgs/development/python-modules/pyunifi/default.nix | 2 +- pkgs/development/python-modules/pyupdate/default.nix | 2 +- pkgs/development/python-modules/pyutil/default.nix | 2 +- pkgs/development/python-modules/pyuv/default.nix | 2 +- pkgs/development/python-modules/pyvoro/default.nix | 2 +- pkgs/development/python-modules/pywatchman/default.nix | 2 +- pkgs/development/python-modules/pywebdav/default.nix | 2 +- pkgs/development/python-modules/pyx/default.nix | 2 +- pkgs/development/python-modules/pyzufall/default.nix | 2 +- pkgs/development/python-modules/qpid-python/default.nix | 2 +- pkgs/development/python-modules/qrcode/default.nix | 2 +- pkgs/development/python-modules/qscintilla/default.nix | 2 +- pkgs/development/python-modules/qserve/default.nix | 2 +- pkgs/development/python-modules/qtawesome/default.nix | 2 +- pkgs/development/python-modules/qtpy/default.nix | 2 +- .../python-modules/querystring-parser/default.nix | 2 +- pkgs/development/python-modules/queuelib/default.nix | 2 +- pkgs/development/python-modules/rabbitpy/default.nix | 2 +- .../python-modules/radicale_infcloud/default.nix | 2 +- .../development/python-modules/rainbowstream/default.nix | 2 +- .../development/python-modules/ramlfications/default.nix | 2 +- pkgs/development/python-modules/random2/default.nix | 2 +- pkgs/development/python-modules/rarfile/default.nix | 2 +- pkgs/development/python-modules/ratelimiter/default.nix | 2 +- pkgs/development/python-modules/rawkit/default.nix | 2 +- pkgs/development/python-modules/rcssmin/default.nix | 2 +- pkgs/development/python-modules/readchar/default.nix | 2 +- pkgs/development/python-modules/readme/default.nix | 2 +- pkgs/development/python-modules/rebulk/default.nix | 2 +- .../python-modules/recaptcha_client/default.nix | 2 +- pkgs/development/python-modules/reedsolo/default.nix | 2 +- pkgs/development/python-modules/remotecv/default.nix | 2 +- pkgs/development/python-modules/rencode/default.nix | 2 +- .../development/python-modules/repeated_test/default.nix | 2 +- pkgs/development/python-modules/repocheck/default.nix | 2 +- pkgs/development/python-modules/repoze_lru/default.nix | 2 +- .../repoze_sphinx_autointerface/default.nix | 2 +- pkgs/development/python-modules/repoze_who/default.nix | 2 +- .../python-modules/requests-cache/default.nix | 2 +- .../python-modules/requests-http-signature/default.nix | 2 +- .../python-modules/requests-kerberos/default.nix | 2 +- pkgs/development/python-modules/requests/default.nix | 2 +- pkgs/development/python-modules/resampy/default.nix | 2 +- pkgs/development/python-modules/rethinkdb/default.nix | 2 +- .../python-modules/retry_decorator/default.nix | 2 +- pkgs/development/python-modules/retrying/default.nix | 2 +- pkgs/development/python-modules/rfc-bibtex/default.nix | 2 +- pkgs/development/python-modules/rfc3986/default.nix | 2 +- pkgs/development/python-modules/rfc3987/default.nix | 2 +- pkgs/development/python-modules/rich/default.nix | 2 +- pkgs/development/python-modules/rjsmin/default.nix | 2 +- pkgs/development/python-modules/rl-coach/default.nix | 3 +-- pkgs/development/python-modules/robomachine/default.nix | 2 +- .../python-modules/robot-detection/default.nix | 2 +- .../robotframework-databaselibrary/default.nix | 2 +- .../python-modules/robotframework-requests/default.nix | 2 +- .../python-modules/robotframework-ride/default.nix | 2 +- .../robotframework-selenium2library/default.nix | 2 +- .../robotframework-seleniumlibrary/default.nix | 2 +- .../python-modules/robotframework-sshlibrary/default.nix | 2 +- .../python-modules/robotframework-tools/default.nix | 2 +- .../python-modules/robotframework/default.nix | 2 +- .../python-modules/robotstatuschecker/default.nix | 2 +- pkgs/development/python-modules/robotsuite/default.nix | 2 +- pkgs/development/python-modules/roku/default.nix | 2 +- pkgs/development/python-modules/roman/default.nix | 2 +- pkgs/development/python-modules/rope/default.nix | 2 +- pkgs/development/python-modules/ropper/default.nix | 2 +- pkgs/development/python-modules/routes/default.nix | 2 +- pkgs/development/python-modules/rpdb/default.nix | 2 +- pkgs/development/python-modules/rpkg/default.nix | 2 +- pkgs/development/python-modules/rply/default.nix | 2 +- pkgs/development/python-modules/rpmfluff/default.nix | 2 +- pkgs/development/python-modules/rq/default.nix | 2 +- pkgs/development/python-modules/rsa/4_0.nix | 2 +- pkgs/development/python-modules/rsa/default.nix | 2 +- pkgs/development/python-modules/rtslib/default.nix | 2 +- pkgs/development/python-modules/ruamel_base/default.nix | 2 +- .../python-modules/ruamel_ordereddict/default.nix | 2 +- .../python-modules/ruamel_yaml_clib/default.nix | 2 +- pkgs/development/python-modules/rubymarshal/default.nix | 2 +- pkgs/development/python-modules/runsnakerun/default.nix | 2 +- pkgs/development/python-modules/s3fs/default.nix | 2 +- pkgs/development/python-modules/sacremoses/default.nix | 2 +- pkgs/development/python-modules/safe/default.nix | 2 +- pkgs/development/python-modules/salmon-mail/default.nix | 2 +- pkgs/development/python-modules/samplerate/default.nix | 2 +- pkgs/development/python-modules/sandboxlib/default.nix | 2 +- .../python-modules/sapi-python-client/default.nix | 2 +- pkgs/development/python-modules/scales/default.nix | 2 +- pkgs/development/python-modules/schedule/default.nix | 2 +- pkgs/development/python-modules/schema/default.nix | 2 +- pkgs/development/python-modules/scikit-bio/default.nix | 2 +- pkgs/development/python-modules/scikits-odes/default.nix | 3 +-- pkgs/development/python-modules/scp/default.nix | 2 +- .../python-modules/scrapy-deltafetch/default.nix | 2 +- .../python-modules/scrapy-fake-useragent/default.nix | 2 +- .../development/python-modules/scrapy-splash/default.nix | 2 +- pkgs/development/python-modules/screeninfo/default.nix | 2 +- pkgs/development/python-modules/scripttest/default.nix | 2 +- pkgs/development/python-modules/sdnotify/default.nix | 2 +- pkgs/development/python-modules/seabreeze/default.nix | 2 +- pkgs/development/python-modules/seekpath/default.nix | 2 +- pkgs/development/python-modules/selectors2/default.nix | 2 +- pkgs/development/python-modules/selectors34/default.nix | 2 +- pkgs/development/python-modules/semantic/default.nix | 2 +- pkgs/development/python-modules/semver/default.nix | 2 +- .../development/python-modules/sentencepiece/default.nix | 2 +- pkgs/development/python-modules/sentry-sdk/default.nix | 2 +- pkgs/development/python-modules/sepaxml/default.nix | 2 +- pkgs/development/python-modules/seqdiag/default.nix | 2 +- pkgs/development/python-modules/serpent/default.nix | 3 +-- .../python-modules/serversyncstorage/default.nix | 2 +- pkgs/development/python-modules/setproctitle/default.nix | 2 +- .../python-modules/setuptools-git/default.nix | 2 +- .../python-modules/setuptools-lint/default.nix | 2 +- .../python-modules/setuptools-rust/default.nix | 2 +- .../setuptools-scm-git-archive/default.nix | 2 +- .../python-modules/setuptools_scm/default.nix | 2 +- .../python-modules/setuptoolsdarcs/default.nix | 2 +- .../python-modules/setuptoolstrial/default.nix | 2 +- pkgs/development/python-modules/sexpdata/default.nix | 2 +- pkgs/development/python-modules/sgmllib3k/default.nix | 3 +-- pkgs/development/python-modules/shap/default.nix | 2 +- pkgs/development/python-modules/shellingham/default.nix | 2 +- pkgs/development/python-modules/shippai/default.nix | 2 +- pkgs/development/python-modules/shortuuid/default.nix | 2 +- pkgs/development/python-modules/should-dsl/default.nix | 2 +- pkgs/development/python-modules/shouldbe/default.nix | 2 +- pkgs/development/python-modules/signedjson/default.nix | 2 +- pkgs/development/python-modules/sigtools/default.nix | 2 +- pkgs/development/python-modules/simanneal/default.nix | 2 +- .../python-modules/simple-websocket-server/default.nix | 2 +- pkgs/development/python-modules/simpleai/default.nix | 2 +- pkgs/development/python-modules/simplebayes/default.nix | 2 +- pkgs/development/python-modules/simpleparse/default.nix | 2 +- pkgs/development/python-modules/skein/default.nix | 2 +- pkgs/development/python-modules/sklearn-deap/default.nix | 2 +- pkgs/development/python-modules/slackclient/default.nix | 2 +- pkgs/development/python-modules/sleekxmpp/default.nix | 2 +- pkgs/development/python-modules/slicer/default.nix | 2 +- pkgs/development/python-modules/slicerator/default.nix | 2 +- pkgs/development/python-modules/slob/default.nix | 2 +- pkgs/development/python-modules/slowaes/default.nix | 2 +- pkgs/development/python-modules/smartdc/default.nix | 2 +- pkgs/development/python-modules/smartypants/default.nix | 2 +- pkgs/development/python-modules/snakeviz/default.nix | 2 +- pkgs/development/python-modules/snapcast/default.nix | 2 +- .../python-modules/snowballstemmer/default.nix | 2 +- .../python-modules/socksipy-branch/default.nix | 2 +- pkgs/development/python-modules/somajo/default.nix | 2 +- pkgs/development/python-modules/sopel/default.nix | 2 +- .../python-modules/sorl_thumbnail/default.nix | 2 +- pkgs/development/python-modules/spark_parser/default.nix | 2 +- .../development/python-modules/sparqlwrapper/default.nix | 2 +- pkgs/development/python-modules/speaklater/default.nix | 2 +- pkgs/development/python-modules/spglib/default.nix | 2 +- .../python-modules/sphinx_pypi_upload/default.nix | 2 +- .../python-modules/sphinx_rtd_theme/default.nix | 2 +- .../python-modules/sphinxcontrib-applehelp/default.nix | 2 +- .../python-modules/sphinxcontrib-autoapi/default.nix | 2 +- .../python-modules/sphinxcontrib-blockdiag/default.nix | 2 +- .../python-modules/sphinxcontrib-devhelp/default.nix | 2 +- .../python-modules/sphinxcontrib-htmlhelp/default.nix | 2 +- .../python-modules/sphinxcontrib-jsmath/default.nix | 2 +- .../python-modules/sphinxcontrib-openapi/default.nix | 2 +- .../python-modules/sphinxcontrib-qthelp/default.nix | 2 +- .../sphinxcontrib-serializinghtml/default.nix | 2 +- .../python-modules/sphinxcontrib-spelling/default.nix | 3 +-- .../python-modules/sphinxcontrib_httpdomain/default.nix | 2 +- .../python-modules/sphinxcontrib_newsfeed/default.nix | 2 +- .../python-modules/sphinxcontrib_plantuml/default.nix | 2 +- .../python-modules/spyder-kernels/default.nix | 2 +- pkgs/development/python-modules/spyder/3.nix | 2 +- pkgs/development/python-modules/spyder/default.nix | 2 +- .../python-modules/sqlalchemy-continuum/default.nix | 3 +-- .../python-modules/sqlalchemy-i18n/default.nix | 3 +-- .../python-modules/sqlalchemy-imageattach/default.nix | 2 +- pkgs/development/python-modules/sqlite3dbm/default.nix | 2 +- pkgs/development/python-modules/sqlobject/default.nix | 2 +- pkgs/development/python-modules/squaremap/default.nix | 2 +- pkgs/development/python-modules/srp/default.nix | 2 +- pkgs/development/python-modules/srptools/default.nix | 2 +- pkgs/development/python-modules/srsly/default.nix | 3 +-- pkgs/development/python-modules/srvlookup/default.nix | 2 +- pkgs/development/python-modules/ssdeep/default.nix | 2 +- pkgs/development/python-modules/ssdp/default.nix | 2 +- pkgs/development/python-modules/sseclient/default.nix | 2 +- pkgs/development/python-modules/sslib/default.nix | 2 +- pkgs/development/python-modules/statsd/default.nix | 2 +- pkgs/development/python-modules/stompclient/default.nix | 2 +- .../python-modules/strict-rfc3339/default.nix | 2 +- pkgs/development/python-modules/stringcase/default.nix | 2 +- .../development/python-modules/subdownloader/default.nix | 2 +- pkgs/development/python-modules/suds-jurko/default.nix | 2 +- pkgs/development/python-modules/suds/default.nix | 2 +- pkgs/development/python-modules/sumo/default.nix | 2 +- pkgs/development/python-modules/sure/default.nix | 2 +- pkgs/development/python-modules/survey/default.nix | 2 +- pkgs/development/python-modules/svg-path/default.nix | 2 +- pkgs/development/python-modules/svg2tikz/default.nix | 2 +- .../python-modules/swagger-ui-bundle/default.nix | 2 +- pkgs/development/python-modules/swspotify/default.nix | 2 +- pkgs/development/python-modules/sybase/default.nix | 2 +- pkgs/development/python-modules/systemd/default.nix | 2 +- pkgs/development/python-modules/sysv_ipc/default.nix | 2 +- pkgs/development/python-modules/tarman/default.nix | 2 +- pkgs/development/python-modules/taskw/default.nix | 2 +- pkgs/development/python-modules/tatsu/default.nix | 2 +- pkgs/development/python-modules/tblib/default.nix | 2 +- pkgs/development/python-modules/telegram/default.nix | 2 +- .../python-modules/tensorflow-estimator/default.nix | 2 +- pkgs/development/python-modules/termcolor/default.nix | 2 +- .../python-modules/terminaltables/default.nix | 2 +- pkgs/development/python-modules/testpath/default.nix | 2 +- .../python-modules/testrepository/default.nix | 2 +- .../development/python-modules/testscenarios/default.nix | 2 +- pkgs/development/python-modules/threadpool/default.nix | 2 +- pkgs/development/python-modules/thrift/default.nix | 2 +- pkgs/development/python-modules/thumborpexif/default.nix | 2 +- pkgs/development/python-modules/tilestache/default.nix | 2 +- pkgs/development/python-modules/timelib/default.nix | 2 +- .../python-modules/timeout-decorator/default.nix | 2 +- pkgs/development/python-modules/tissue/default.nix | 2 +- pkgs/development/python-modules/tlsh/default.nix | 2 +- pkgs/development/python-modules/tlslite-ng/default.nix | 2 +- pkgs/development/python-modules/tlslite/default.nix | 2 +- pkgs/development/python-modules/toggl-cli/default.nix | 2 +- pkgs/development/python-modules/tokenizers/default.nix | 2 +- pkgs/development/python-modules/tokenlib/default.nix | 2 +- pkgs/development/python-modules/toml/default.nix | 2 +- pkgs/development/python-modules/toposort/default.nix | 2 +- pkgs/development/python-modules/torchvision/default.nix | 2 +- pkgs/development/python-modules/traceback2/default.nix | 2 +- pkgs/development/python-modules/tracing/default.nix | 2 +- pkgs/development/python-modules/traits/default.nix | 2 +- pkgs/development/python-modules/transaction/default.nix | 2 +- pkgs/development/python-modules/transformers/default.nix | 2 +- pkgs/development/python-modules/transip/default.nix | 2 +- .../python-modules/translationstring/default.nix | 2 +- .../python-modules/transmissionrpc/default.nix | 2 +- pkgs/development/python-modules/treq/default.nix | 2 +- pkgs/development/python-modules/trezor_agent/default.nix | 2 +- pkgs/development/python-modules/trueskill/default.nix | 2 +- pkgs/development/python-modules/ttystatus/default.nix | 2 +- pkgs/development/python-modules/tvdb_api/default.nix | 2 +- pkgs/development/python-modules/tvnamer/default.nix | 2 +- pkgs/development/python-modules/twiggy/default.nix | 2 +- pkgs/development/python-modules/twilio/default.nix | 2 +- .../twitter-common-collections/default.nix | 2 +- .../python-modules/twitter-common-confluence/default.nix | 2 +- .../python-modules/twitter-common-dirutil/default.nix | 2 +- .../python-modules/twitter-common-lang/default.nix | 2 +- .../python-modules/twitter-common-log/default.nix | 2 +- .../python-modules/twitter-common-options/default.nix | 2 +- pkgs/development/python-modules/twitter/default.nix | 2 +- pkgs/development/python-modules/txaio/default.nix | 2 +- pkgs/development/python-modules/txamqp/default.nix | 2 +- pkgs/development/python-modules/txdbus/default.nix | 2 +- pkgs/development/python-modules/txgithub/default.nix | 2 +- pkgs/development/python-modules/txrequests/default.nix | 2 +- pkgs/development/python-modules/typeguard/default.nix | 2 +- pkgs/development/python-modules/typogrify/default.nix | 2 +- pkgs/development/python-modules/tzlocal/default.nix | 2 +- pkgs/development/python-modules/ua-parser/default.nix | 2 +- pkgs/development/python-modules/ujson/2.nix | 2 +- pkgs/development/python-modules/ujson/default.nix | 2 +- pkgs/development/python-modules/umalqurra/default.nix | 2 +- pkgs/development/python-modules/umemcache/default.nix | 2 +- .../development/python-modules/uncertainties/default.nix | 2 +- pkgs/development/python-modules/uncompyle6/default.nix | 2 +- .../python-modules/unicode-slugify/default.nix | 2 +- pkgs/development/python-modules/unicodecsv/default.nix | 2 +- pkgs/development/python-modules/unidecode/default.nix | 2 +- pkgs/development/python-modules/unifi/default.nix | 2 +- pkgs/development/python-modules/unittest2/default.nix | 2 +- .../python-modules/unpaddedbase64/default.nix | 2 +- pkgs/development/python-modules/upass/default.nix | 2 +- .../python-modules/update_checker/default.nix | 2 +- .../python-modules/uproot3-methods/default.nix | 2 +- pkgs/development/python-modules/uptime/default.nix | 2 +- pkgs/development/python-modules/uranium/default.nix | 2 +- pkgs/development/python-modules/uritools/default.nix | 2 +- pkgs/development/python-modules/urlgrabber/default.nix | 2 +- pkgs/development/python-modules/urwid/default.nix | 2 +- pkgs/development/python-modules/urwidtrees/default.nix | 2 +- pkgs/development/python-modules/usbtmc/default.nix | 2 +- pkgs/development/python-modules/user-agents/default.nix | 2 +- .../python-modules/validate-email/default.nix | 2 +- pkgs/development/python-modules/validictory/default.nix | 2 +- pkgs/development/python-modules/vcversioner/default.nix | 2 +- pkgs/development/python-modules/vdf/default.nix | 2 +- pkgs/development/python-modules/vdirsyncer/default.nix | 2 +- pkgs/development/python-modules/vega/default.nix | 2 +- pkgs/development/python-modules/venusian/default.nix | 2 +- pkgs/development/python-modules/versioneer/default.nix | 2 +- pkgs/development/python-modules/versiontools/default.nix | 2 +- .../python-modules/veryprettytable/default.nix | 2 +- pkgs/development/python-modules/vidstab/default.nix | 2 +- pkgs/development/python-modules/vine/default.nix | 2 +- .../python-modules/virtualenv-clone/default.nix | 2 +- .../python-modules/virtualenvwrapper/default.nix | 2 +- pkgs/development/python-modules/vmprof/default.nix | 2 +- pkgs/development/python-modules/vncdo/default.nix | 2 +- pkgs/development/python-modules/voluptuous/default.nix | 2 +- pkgs/development/python-modules/vultr/default.nix | 2 +- pkgs/development/python-modules/vxi11/default.nix | 2 +- pkgs/development/python-modules/w3lib/default.nix | 2 +- pkgs/development/python-modules/waitress/default.nix | 2 +- pkgs/development/python-modules/wakeonlan/default.nix | 2 +- pkgs/development/python-modules/warlock/default.nix | 2 +- pkgs/development/python-modules/wasabi/default.nix | 2 +- pkgs/development/python-modules/web/default.nix | 2 +- pkgs/development/python-modules/webapp2/default.nix | 2 +- pkgs/development/python-modules/webhelpers/default.nix | 2 +- pkgs/development/python-modules/webob/default.nix | 2 +- pkgs/development/python-modules/websockify/default.nix | 2 +- pkgs/development/python-modules/webtest/default.nix | 2 +- pkgs/development/python-modules/whisper/default.nix | 2 +- pkgs/development/python-modules/whitenoise/default.nix | 2 +- pkgs/development/python-modules/whoosh/default.nix | 2 +- pkgs/development/python-modules/willow/default.nix | 2 +- pkgs/development/python-modules/word2vec/default.nix | 2 +- pkgs/development/python-modules/wordcloud/default.nix | 2 +- pkgs/development/python-modules/worldengine/default.nix | 2 +- pkgs/development/python-modules/wrapio/default.nix | 2 +- pkgs/development/python-modules/ws4py/default.nix | 2 +- pkgs/development/python-modules/wsgiproxy/default.nix | 2 +- pkgs/development/python-modules/wsgiproxy2/default.nix | 2 +- pkgs/development/python-modules/wtforms/default.nix | 2 +- pkgs/development/python-modules/x11_hash/default.nix | 2 +- pkgs/development/python-modules/x256/default.nix | 2 +- pkgs/development/python-modules/xapp/default.nix | 2 +- pkgs/development/python-modules/xattr/default.nix | 2 +- pkgs/development/python-modules/xcaplib/default.nix | 2 +- pkgs/development/python-modules/xdot/default.nix | 2 +- pkgs/development/python-modules/xhtml2pdf/default.nix | 2 +- pkgs/development/python-modules/xkcdpass/default.nix | 2 +- pkgs/development/python-modules/xlrd/default.nix | 2 +- pkgs/development/python-modules/xlsx2csv/default.nix | 2 +- pkgs/development/python-modules/xml2rfc/default.nix | 2 +- pkgs/development/python-modules/xmodem/default.nix | 2 +- pkgs/development/python-modules/xmpppy/default.nix | 2 +- pkgs/development/python-modules/xvfbwrapper/default.nix | 2 +- pkgs/development/python-modules/xxhash/default.nix | 2 +- pkgs/development/python-modules/yamllint/default.nix | 2 +- pkgs/development/python-modules/yanc/default.nix | 2 +- pkgs/development/python-modules/yapf/default.nix | 2 +- pkgs/development/python-modules/yapsy/default.nix | 2 +- pkgs/development/python-modules/yarl/default.nix | 3 +-- pkgs/development/python-modules/ydiff/default.nix | 2 +- pkgs/development/python-modules/yowsup/default.nix | 2 +- .../python-modules/z3c-checkversions/default.nix | 2 +- pkgs/development/python-modules/zake/default.nix | 2 +- pkgs/development/python-modules/zbaemon/default.nix | 2 +- pkgs/development/python-modules/zbase32/default.nix | 2 +- pkgs/development/python-modules/zc_lockfile/default.nix | 2 +- pkgs/development/python-modules/zdaemon/default.nix | 2 +- pkgs/development/python-modules/zerobin/default.nix | 2 +- pkgs/development/python-modules/zeroc-ice/default.nix | 2 +- pkgs/development/python-modules/zfec/default.nix | 2 +- pkgs/development/python-modules/zict/default.nix | 2 +- pkgs/development/python-modules/zigpy-znp/default.nix | 2 +- pkgs/development/python-modules/zodb/default.nix | 2 +- pkgs/development/python-modules/zope_broken/default.nix | 2 +- .../python-modules/zope_component/default.nix | 2 +- .../python-modules/zope_configuration/default.nix | 2 +- .../python-modules/zope_contenttype/default.nix | 2 +- .../python-modules/zope_deprecation/default.nix | 2 +- .../python-modules/zope_dottedname/default.nix | 2 +- pkgs/development/python-modules/zope_event/default.nix | 2 +- .../python-modules/zope_exceptions/default.nix | 2 +- .../python-modules/zope_filerepresentation/default.nix | 2 +- .../python-modules/zope_i18nmessageid/default.nix | 2 +- .../python-modules/zope_interface/default.nix | 2 +- .../python-modules/zope_lifecycleevent/default.nix | 2 +- .../development/python-modules/zope_location/default.nix | 2 +- pkgs/development/python-modules/zope_proxy/default.nix | 2 +- pkgs/development/python-modules/zope_schema/default.nix | 2 +- pkgs/development/python-modules/zope_size/default.nix | 2 +- pkgs/development/python-modules/zope_testing/default.nix | 2 +- .../python-modules/zope_testrunner/default.nix | 2 +- pkgs/development/python-modules/zstd/default.nix | 2 +- pkgs/development/ruby-modules/bundler-app/default.nix | 2 +- pkgs/development/ruby-modules/testing/driver.nix | 2 +- pkgs/development/tools/ameba/default.nix | 2 +- pkgs/development/tools/analysis/autoflake/default.nix | 2 +- pkgs/development/tools/analysis/bingrep/default.nix | 2 +- pkgs/development/tools/analysis/checkov/default.nix | 2 +- pkgs/development/tools/analysis/egypt/default.nix | 2 +- pkgs/development/tools/analysis/evmdis/default.nix | 2 +- pkgs/development/tools/analysis/hotspot/default.nix | 2 +- pkgs/development/tools/analysis/panopticon/default.nix | 2 +- pkgs/development/tools/analysis/snowman/default.nix | 2 +- .../tools/analysis/uefi-firmware-parser/default.nix | 2 +- pkgs/development/tools/asn2quickder/default.nix | 2 +- pkgs/development/tools/async/default.nix | 2 +- pkgs/development/tools/azcopy/default.nix | 2 +- pkgs/development/tools/bazelisk/default.nix | 2 +- .../tools/build-managers/bazel/bazel-remote/default.nix | 2 +- .../tools/build-managers/bazel/buildtools/default.nix | 2 +- pkgs/development/tools/build-managers/fac/default.nix | 2 +- pkgs/development/tools/build-managers/meson/default.nix | 2 +- pkgs/development/tools/build-managers/pants/default.nix | 2 +- pkgs/development/tools/build-managers/scons/common.nix | 2 +- pkgs/development/tools/build-managers/shards/default.nix | 2 +- pkgs/development/tools/clog-cli/default.nix | 2 +- pkgs/development/tools/compile-daemon/default.nix | 2 +- .../continuous-integration/buildkite-agent/default.nix | 2 +- .../continuous-integration/buildkite-agent/generic.nix | 2 +- .../tools/continuous-integration/drone-cli/default.nix | 2 +- .../tools/continuous-integration/drone/default.nix | 2 +- pkgs/development/tools/corgi/default.nix | 2 +- pkgs/development/tools/cppclean/default.nix | 2 +- pkgs/development/tools/cue/default.nix | 2 +- pkgs/development/tools/dapr/cli/default.nix | 2 +- pkgs/development/tools/database/dbmate/default.nix | 2 +- pkgs/development/tools/database/pyrseas/default.nix | 2 +- .../tools/database/timescaledb-parallel-copy/default.nix | 2 +- .../tools/database/timescaledb-tune/default.nix | 2 +- pkgs/development/tools/deis/default.nix | 2 +- pkgs/development/tools/deisctl/default.nix | 2 +- pkgs/development/tools/delve/default.nix | 2 +- pkgs/development/tools/dep/default.nix | 2 +- pkgs/development/tools/dep2nix/default.nix | 2 +- pkgs/development/tools/devd/default.nix | 2 +- pkgs/development/tools/devpi-client/default.nix | 2 +- pkgs/development/tools/devpi-server/default.nix | 2 +- pkgs/development/tools/documentation/antora/default.nix | 2 +- .../tools/documentation/gnome-doc-utils/default.nix | 2 +- pkgs/development/tools/documentation/gtk-doc/default.nix | 2 +- pkgs/development/tools/documentation/mdsh/default.nix | 2 +- pkgs/development/tools/documentation/mkdocs/default.nix | 2 +- pkgs/development/tools/easyjson/default.nix | 2 +- pkgs/development/tools/eliot-tree/default.nix | 2 +- pkgs/development/tools/fac/default.nix | 2 +- pkgs/development/tools/fedpkg/default.nix | 2 +- pkgs/development/tools/flootty/default.nix | 2 +- pkgs/development/tools/gauge/default.nix | 2 +- pkgs/development/tools/gdm/default.nix | 2 +- pkgs/development/tools/ginkgo/default.nix | 2 +- pkgs/development/tools/gir/default.nix | 2 +- pkgs/development/tools/git-series/default.nix | 2 +- pkgs/development/tools/github/cligh/default.nix | 2 +- pkgs/development/tools/glide/default.nix | 2 +- pkgs/development/tools/gllvm/default.nix | 2 +- pkgs/development/tools/glock/default.nix | 2 +- pkgs/development/tools/go-bindata-assetfs/default.nix | 2 +- pkgs/development/tools/go-bindata/default.nix | 2 +- pkgs/development/tools/go-junit-report/default.nix | 2 +- pkgs/development/tools/go-langserver/default.nix | 2 +- pkgs/development/tools/go-migrate/default.nix | 2 +- pkgs/development/tools/go-outline/default.nix | 2 +- pkgs/development/tools/go-protobuf/default.nix | 2 +- pkgs/development/tools/go-repo-root/default.nix | 2 +- pkgs/development/tools/go-symbols/default.nix | 2 +- pkgs/development/tools/go2nix/default.nix | 2 +- pkgs/development/tools/goa/default.nix | 2 +- pkgs/development/tools/gocode-gomod/default.nix | 2 +- pkgs/development/tools/gocode/default.nix | 2 +- pkgs/development/tools/goconvey/default.nix | 2 +- pkgs/development/tools/godef/default.nix | 2 +- pkgs/development/tools/godot/headless.nix | 2 +- pkgs/development/tools/godot/server.nix | 2 +- pkgs/development/tools/gojsontoyaml/default.nix | 2 +- pkgs/development/tools/golint/default.nix | 2 +- pkgs/development/tools/gomodifytags/default.nix | 2 +- pkgs/development/tools/gomplate/default.nix | 2 +- pkgs/development/tools/gopkgs/default.nix | 2 +- pkgs/development/tools/gopls/default.nix | 2 +- pkgs/development/tools/gore/default.nix | 2 +- pkgs/development/tools/gosec/default.nix | 2 +- pkgs/development/tools/gotags/default.nix | 2 +- pkgs/development/tools/gotests/default.nix | 2 +- pkgs/development/tools/gotestsum/default.nix | 2 +- pkgs/development/tools/gotools/default.nix | 2 +- pkgs/development/tools/govendor/default.nix | 2 +- pkgs/development/tools/govers/default.nix | 2 +- pkgs/development/tools/gox/default.nix | 2 +- pkgs/development/tools/gron/default.nix | 2 +- pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix | 2 +- .../tools/haskell/haskell-language-server/default.nix | 2 +- .../haskell/haskell-language-server/hls-class-plugin.nix | 2 +- .../haskell/haskell-language-server/hls-eval-plugin.nix | 2 +- .../hls-explicit-imports-plugin.nix | 2 +- .../haskell/haskell-language-server/hls-hlint-plugin.nix | 2 +- .../haskell-language-server/hls-retrie-plugin.nix | 2 +- .../haskell-language-server/hls-tactics-plugin.nix | 2 +- pkgs/development/tools/haskell/vaultenv/default.nix | 2 +- pkgs/development/tools/hcloud/default.nix | 2 +- pkgs/development/tools/icr/default.nix | 3 +-- pkgs/development/tools/jd/default.nix | 2 +- pkgs/development/tools/jid/default.nix | 2 +- pkgs/development/tools/jira_cli/default.nix | 2 +- pkgs/development/tools/jl/default.nix | 2 +- pkgs/development/tools/jmespath/default.nix | 2 +- pkgs/development/tools/jp/default.nix | 2 +- pkgs/development/tools/just/default.nix | 2 +- pkgs/development/tools/k6/default.nix | 2 +- pkgs/development/tools/kcli/default.nix | 2 +- pkgs/development/tools/kind/default.nix | 2 +- pkgs/development/tools/krew/default.nix | 2 +- pkgs/development/tools/kubectx/default.nix | 2 +- pkgs/development/tools/kubeprompt/default.nix | 2 +- pkgs/development/tools/kubicorn/default.nix | 2 +- pkgs/development/tools/lazygit/default.nix | 2 +- pkgs/development/tools/leaps/default.nix | 2 +- pkgs/development/tools/manul/default.nix | 2 +- pkgs/development/tools/misc/circleci-cli/default.nix | 2 +- pkgs/development/tools/misc/d-feet/default.nix | 2 +- pkgs/development/tools/misc/docopts/default.nix | 2 +- pkgs/development/tools/misc/elfinfo/default.nix | 2 +- pkgs/development/tools/misc/gdbgui/default.nix | 2 +- pkgs/development/tools/misc/itm-tools/default.nix | 2 +- pkgs/development/tools/misc/loccount/default.nix | 2 +- pkgs/development/tools/misc/nrfutil/default.nix | 2 +- pkgs/development/tools/misc/perfect-hash/default.nix | 2 +- pkgs/development/tools/misc/ptags/default.nix | 2 +- pkgs/development/tools/misc/scc/default.nix | 2 +- pkgs/development/tools/misc/unused/default.nix | 2 +- pkgs/development/tools/misc/whatstyle/default.nix | 2 +- pkgs/development/tools/modd/default.nix | 2 +- pkgs/development/tools/mustache-go/default.nix | 2 +- pkgs/development/tools/ofono-phonesim/default.nix | 2 +- pkgs/development/tools/out-of-tree/default.nix | 2 +- pkgs/development/tools/packer/default.nix | 2 +- pkgs/development/tools/packet-cli/default.nix | 2 +- pkgs/development/tools/packet/default.nix | 2 +- pkgs/development/tools/parinfer-rust/default.nix | 2 +- pkgs/development/tools/pax-rs/default.nix | 2 +- pkgs/development/tools/pew/default.nix | 2 +- pkgs/development/tools/profiling/pprof/default.nix | 2 +- pkgs/development/tools/purescript/spago/spago.nix | 2 +- pkgs/development/tools/quicktemplate/default.nix | 2 +- pkgs/development/tools/rdbtools/default.nix | 2 +- pkgs/development/tools/remarshal/default.nix | 2 +- pkgs/development/tools/renderizer/default.nix | 2 +- pkgs/development/tools/reno/default.nix | 2 +- pkgs/development/tools/richgo/default.nix | 2 +- pkgs/development/tools/run/default.nix | 2 +- pkgs/development/tools/rust/bindgen/default.nix | 2 +- pkgs/development/tools/rust/cargo-binutils/default.nix | 2 +- pkgs/development/tools/rust/cargo-embed/default.nix | 2 +- pkgs/development/tools/rust/cargo-flash/default.nix | 2 +- pkgs/development/tools/rust/cargo-fuzz/default.nix | 2 +- pkgs/development/tools/rust/cargo-readme/default.nix | 2 +- pkgs/development/tools/rust/cargo-sweep/default.nix | 2 +- .../development/tools/rust/cargo-sync-readme/default.nix | 2 +- pkgs/development/tools/rust/cargo-wipe/default.nix | 2 +- pkgs/development/tools/rust/cargo-xbuild/default.nix | 2 +- pkgs/development/tools/rust/svd2rust/default.nix | 2 +- pkgs/development/tools/sourcetrail/jedi.nix | 2 +- pkgs/development/tools/summon/default.nix | 2 +- pkgs/development/tools/systemfd/default.nix | 2 +- pkgs/development/tools/textql/default.nix | 2 +- pkgs/development/tools/unityhub/default.nix | 2 +- pkgs/development/tools/vcstool/default.nix | 2 +- pkgs/development/tools/vend/default.nix | 2 +- pkgs/development/tools/vultr-cli/default.nix | 2 +- pkgs/development/tools/vultr/default.nix | 2 +- pkgs/development/tools/winpdb/default.nix | 2 +- pkgs/development/tools/wllvm/default.nix | 2 +- pkgs/development/tools/ws/default.nix | 2 +- pkgs/development/tools/yaml2json/default.nix | 2 +- pkgs/development/tools/yj/default.nix | 2 +- pkgs/development/web/shopify-themekit/default.nix | 2 +- pkgs/development/web/wml/default.nix | 2 +- pkgs/games/20kly/default.nix | 2 +- pkgs/games/boohu/default.nix | 2 +- pkgs/games/chessx/default.nix | 2 +- pkgs/games/cockatrice/default.nix | 2 +- pkgs/games/eidolon/default.nix | 2 +- pkgs/games/endgame-singularity/default.nix | 2 +- pkgs/games/enyo-doom/default.nix | 2 +- pkgs/games/factorio/mods.nix | 2 +- pkgs/games/frogatto/default.nix | 2 +- pkgs/games/frozen-bubble/default.nix | 2 +- pkgs/games/gscrabble/default.nix | 2 +- pkgs/games/gshogi/default.nix | 2 +- pkgs/games/harmonist/default.nix | 2 +- pkgs/games/lunar-client/default.nix | 2 +- pkgs/games/multimc/default.nix | 2 +- pkgs/games/openra/common.nix | 2 +- pkgs/games/pokerth/default.nix | 2 +- pkgs/games/portmod/default.nix | 2 +- pkgs/games/pro-office-calculator/default.nix | 2 +- pkgs/games/pysolfc/default.nix | 2 +- pkgs/games/the-butterfly-effect/default.nix | 2 +- pkgs/games/wyvern/default.nix | 2 +- pkgs/misc/doge/default.nix | 2 +- pkgs/misc/drivers/steamcontroller/default.nix | 2 +- pkgs/misc/emulators/citra/default.nix | 2 +- pkgs/misc/emulators/firebird-emu/default.nix | 2 +- pkgs/misc/emulators/melonDS/default.nix | 2 +- pkgs/misc/emulators/ruffle/default.nix | 2 +- pkgs/misc/emulators/wine/staging.nix | 2 +- pkgs/misc/emulators/yabause/default.nix | 2 +- pkgs/misc/lilypond/with-fonts.nix | 2 +- pkgs/misc/logging/beats/6.x.nix | 2 +- pkgs/misc/logging/beats/7.x.nix | 2 +- pkgs/misc/vscode-extensions/cpptools/default.nix | 2 +- pkgs/misc/vscode-extensions/default.nix | 2 +- pkgs/misc/vscode-extensions/remote-ssh/default.nix | 2 +- pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 2 +- pkgs/misc/vscode-extensions/wakatime/default.nix | 2 +- .../apple-source-releases/CarbonHeaders/default.nix | 2 +- .../apple-source-releases/CommonCrypto/default.nix | 2 +- .../darwin/apple-source-releases/Csu/default.nix | 2 +- .../darwin/apple-source-releases/IOKit/default.nix | 2 +- .../darwin/apple-source-releases/Librpcsvc/default.nix | 2 +- .../darwin/apple-source-releases/Libsystem/default.nix | 2 +- .../darwin/apple-source-releases/adv_cmds/boot.nix | 2 +- .../darwin/apple-source-releases/adv_cmds/default.nix | 2 +- .../apple-source-releases/architecture/default.nix | 2 +- .../darwin/apple-source-releases/basic_cmds/default.nix | 2 +- .../apple-source-releases/bootstrap_cmds/default.nix | 2 +- .../darwin/apple-source-releases/bsdmake/default.nix | 2 +- .../apple-source-releases/developer_cmds/default.nix | 2 +- .../apple-source-releases/diskdev_cmds/default.nix | 2 +- .../darwin/apple-source-releases/dyld/default.nix | 2 +- .../darwin/apple-source-releases/file_cmds/default.nix | 2 +- .../darwin/apple-source-releases/libpthread/default.nix | 2 +- .../darwin/apple-source-releases/libunwind/default.nix | 2 +- .../apple-source-releases/network_cmds/default.nix | 2 +- .../darwin/apple-source-releases/shell_cmds/default.nix | 2 +- .../darwin/apple-source-releases/text_cmds/default.nix | 2 +- pkgs/os-specific/darwin/stubs/default.nix | 2 +- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 2 +- pkgs/os-specific/linux/busybox/sandbox-shell.nix | 2 +- pkgs/os-specific/linux/cpuset/default.nix | 2 +- pkgs/os-specific/linux/ffado/default.nix | 2 +- pkgs/os-specific/linux/firmware/zd1211/default.nix | 2 +- pkgs/os-specific/linux/fscrypt/default.nix | 2 +- pkgs/os-specific/linux/iotop/default.nix | 2 +- pkgs/os-specific/linux/iproute/mptcp.nix | 2 +- pkgs/os-specific/linux/kernel/hardened/config.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.14.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.19.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.4.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.9.nix | 2 +- pkgs/os-specific/linux/kernel/linux-5.10.nix | 2 +- pkgs/os-specific/linux/kernel/linux-5.4.nix | 2 +- pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 2 +- pkgs/os-specific/linux/kernel/linux-lqx.nix | 2 +- pkgs/os-specific/linux/kernel/linux-mptcp-95.nix | 2 +- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 2 +- pkgs/os-specific/linux/kernel/linux-testing.nix | 2 +- pkgs/os-specific/linux/kernel/linux-zen.nix | 2 +- pkgs/os-specific/linux/net-tools/mptcp.nix | 2 +- pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix | 2 +- pkgs/os-specific/linux/openrazer/driver.nix | 2 +- pkgs/os-specific/linux/piper/default.nix | 2 +- pkgs/os-specific/linux/s6-linux-init/default.nix | 2 +- pkgs/os-specific/linux/s6-linux-utils/default.nix | 2 +- pkgs/os-specific/linux/sd-switch/default.nix | 2 +- pkgs/os-specific/linux/setools/default.nix | 2 +- pkgs/os-specific/linux/targetcli/default.nix | 2 +- pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 2 +- pkgs/os-specific/linux/undervolt/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 +- pkgs/servers/caddy/default.nix | 2 +- pkgs/servers/cayley/default.nix | 2 +- pkgs/servers/cloud-print-connector/default.nix | 2 +- pkgs/servers/consul/default.nix | 2 +- pkgs/servers/demoit/default.nix | 2 +- pkgs/servers/dns/coredns/default.nix | 2 +- pkgs/servers/foundationdb/default.nix | 2 +- pkgs/servers/gotty/default.nix | 2 +- pkgs/servers/headphones/default.nix | 2 +- pkgs/servers/holochain-go/default.nix | 2 +- pkgs/servers/http/hyp/default.nix | 2 +- pkgs/servers/hydron/default.nix | 2 +- pkgs/servers/icingaweb2/default.nix | 8 +++++--- pkgs/servers/icingaweb2/theme-april/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-lsd/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-particles/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-snow/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-spring/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-unicorn/default.nix | 10 ++++++++-- pkgs/servers/identd/nullidentdmod/default.nix | 4 +++- pkgs/servers/irc/robustirc-bridge/default.nix | 2 +- pkgs/servers/isso/default.nix | 2 +- pkgs/servers/kapowbang/default.nix | 2 +- pkgs/servers/livepeer/default.nix | 2 +- pkgs/servers/mail/mailhog/default.nix | 2 +- pkgs/servers/mail/mailman/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/servers/mail/mailman/postorius.nix | 2 +- pkgs/servers/mail/postfix/pflogsumm.nix | 2 +- pkgs/servers/mail/postgrey/default.nix | 2 +- pkgs/servers/mail/spamassassin/default.nix | 2 +- pkgs/servers/matterbridge/default.nix | 2 +- pkgs/servers/mattermost/matterircd.nix | 2 +- pkgs/servers/mautrix-whatsapp/default.nix | 2 +- pkgs/servers/miniflux/default.nix | 2 +- pkgs/servers/minio/default.nix | 2 +- pkgs/servers/misc/client-ip-echo/client-ip-echo.nix | 2 +- pkgs/servers/monitoring/alertmanager-bot/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- pkgs/servers/monitoring/consul-alerts/default.nix | 2 +- pkgs/servers/monitoring/fusion-inventory/default.nix | 2 +- pkgs/servers/monitoring/grafana-reporter/default.nix | 2 +- pkgs/servers/monitoring/plugins/esxi.nix | 2 +- pkgs/servers/monitoring/prometheus/alertmanager.nix | 2 +- pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/bind-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/bird-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/collectd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/consul-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/dovecot-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix | 2 +- .../prometheus/gitlab-ci-pipelines-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/haproxy-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/keylight-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/lnd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mail-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mesos-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix | 2 +- .../monitoring/prometheus/minio-exporter/default.nix | 2 +- .../monitoring/prometheus/modemmanager-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/node-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/openvpn-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/process-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/prom2json.nix | 2 +- pkgs/servers/monitoring/prometheus/promscale.nix | 2 +- pkgs/servers/monitoring/prometheus/pushgateway.nix | 2 +- pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/sql-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/statsd-exporter.nix | 2 +- .../servers/monitoring/prometheus/surfboard-exporter.nix | 2 +- .../monitoring/prometheus/unifi-exporter/default.nix | 2 +- pkgs/servers/monitoring/thanos/default.nix | 2 +- pkgs/servers/monitoring/unifi-poller/default.nix | 2 +- pkgs/servers/nextcloud/news-updater.nix | 2 +- pkgs/servers/nginx-sso/default.nix | 2 +- pkgs/servers/nosql/mongodb/v3_4.nix | 2 +- pkgs/servers/openxpki/default.nix | 2 +- pkgs/servers/radicale/1.x.nix | 2 +- pkgs/servers/radicale/2.x.nix | 2 +- pkgs/servers/routinator/default.nix | 2 +- pkgs/servers/rtsp-simple-server/default.nix | 2 +- pkgs/servers/scylladb/default.nix | 2 +- pkgs/servers/serf/default.nix | 2 +- pkgs/servers/sickbeard/sickrage.nix | 2 +- pkgs/servers/simplehttp2server/default.nix | 2 +- pkgs/servers/skydns/default.nix | 2 +- pkgs/servers/slimserver/default.nix | 2 +- pkgs/servers/sql/dolt/default.nix | 2 +- pkgs/servers/tarssh/default.nix | 2 +- pkgs/servers/tegola/default.nix | 2 +- pkgs/servers/teleport/default.nix | 2 +- pkgs/servers/traefik/default.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- pkgs/servers/trickster/trickster.nix | 2 +- pkgs/servers/tt-rss/plugin-ff-instagram/default.nix | 4 +++- pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix | 4 +++- pkgs/servers/tt-rss/theme-feedly/default.nix | 4 +++- pkgs/servers/udpt/default.nix | 2 +- pkgs/servers/unpfs/default.nix | 2 +- pkgs/servers/web-apps/morty/default.nix | 2 +- pkgs/servers/web-apps/shiori/default.nix | 2 +- pkgs/servers/webmetro/default.nix | 2 +- pkgs/servers/x11/xorg/xwayland.nix | 2 +- pkgs/servers/xandikos/default.nix | 2 +- pkgs/servers/zigbee2mqtt/default.nix | 2 +- pkgs/shells/elvish/default.nix | 2 +- pkgs/shells/fish/babelfish.nix | 2 +- pkgs/shells/oh/default.nix | 2 +- pkgs/shells/pash/default.nix | 2 +- pkgs/shells/zsh/zsh-git-prompt/default.nix | 2 +- pkgs/test/haskell-shellFor/default.nix | 2 +- pkgs/test/install-shell-files/default.nix | 2 +- pkgs/tools/X11/arandr/default.nix | 2 +- pkgs/tools/X11/go-sct/default.nix | 2 +- pkgs/tools/X11/grobi/default.nix | 2 +- pkgs/tools/X11/wpgtk/default.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/admin/afterburn/default.nix | 2 +- pkgs/tools/admin/aws-nuke/default.nix | 2 +- pkgs/tools/admin/aws-rotate-key/default.nix | 2 +- pkgs/tools/admin/awslogs/default.nix | 2 +- pkgs/tools/admin/berglas/default.nix | 2 +- pkgs/tools/admin/certigo/default.nix | 2 +- pkgs/tools/admin/chkcrontab/default.nix | 2 +- pkgs/tools/admin/credhub-cli/default.nix | 2 +- pkgs/tools/admin/docker-credential-gcr/default.nix | 2 +- pkgs/tools/admin/exoscale-cli/default.nix | 2 +- pkgs/tools/admin/iamy/default.nix | 2 +- pkgs/tools/admin/lxd/default.nix | 2 +- pkgs/tools/admin/s3bro/default.nix | 2 +- pkgs/tools/admin/scaleway-cli/default.nix | 2 +- pkgs/tools/admin/sewer/default.nix | 2 +- pkgs/tools/admin/simp_le/default.nix | 2 +- pkgs/tools/admin/ssh-import-id/default.nix | 2 +- pkgs/tools/admin/ssmsh/default.nix | 2 +- pkgs/tools/admin/stripe-cli/default.nix | 2 +- pkgs/tools/audio/beets/plugins/alternatives.nix | 2 +- pkgs/tools/audio/beets/plugins/check.nix | 2 +- pkgs/tools/audio/beets/plugins/copyartifacts.nix | 2 +- pkgs/tools/audio/mididings/default.nix | 2 +- pkgs/tools/audio/mpd-mpris/default.nix | 2 +- pkgs/tools/audio/mpdris2/default.nix | 2 +- pkgs/tools/audio/opl3bankeditor/default.nix | 2 +- pkgs/tools/audio/video2midi/default.nix | 2 +- pkgs/tools/audio/volctl/default.nix | 2 +- pkgs/tools/backup/bupstash/default.nix | 2 +- pkgs/tools/backup/diskrsync/default.nix | 2 +- pkgs/tools/backup/grab-site/default.nix | 2 +- pkgs/tools/backup/httrack/qt.nix | 2 +- pkgs/tools/backup/iceshelf/default.nix | 2 +- pkgs/tools/backup/luckybackup/default.nix | 2 +- pkgs/tools/backup/rdiff-backup/default.nix | 2 +- pkgs/tools/backup/s3ql/default.nix | 2 +- pkgs/tools/backup/ugarit-manifest-maker/default.nix | 2 +- pkgs/tools/backup/ugarit/default.nix | 2 +- pkgs/tools/backup/wal-e/default.nix | 2 +- pkgs/tools/backup/zfs-replicate/default.nix | 2 +- pkgs/tools/cd-dvd/isolyzer/default.nix | 2 +- pkgs/tools/compression/dtrx/default.nix | 2 +- pkgs/tools/filesystems/android-file-transfer/default.nix | 2 +- pkgs/tools/filesystems/catcli/default.nix | 2 +- pkgs/tools/filesystems/convoy/default.nix | 2 +- pkgs/tools/filesystems/gitfs/default.nix | 2 +- pkgs/tools/filesystems/gocryptfs/default.nix | 2 +- pkgs/tools/filesystems/nixpart/default.nix | 2 +- pkgs/tools/filesystems/sandboxfs/default.nix | 2 +- pkgs/tools/filesystems/tmsu/default.nix | 2 +- pkgs/tools/filesystems/ubidump/default.nix | 2 +- pkgs/tools/graphics/feedgnuplot/default.nix | 2 +- pkgs/tools/graphics/gifski/default.nix | 2 +- pkgs/tools/graphics/graph-easy/default.nix | 2 +- pkgs/tools/graphics/ldgallery/compiler/default.nix | 2 +- pkgs/tools/graphics/pdfredacttools/default.nix | 2 +- pkgs/tools/graphics/puppeteer-cli/default.nix | 2 +- pkgs/tools/graphics/rocket/default.nix | 2 +- pkgs/tools/graphics/shotgun/default.nix | 2 +- pkgs/tools/graphics/svgcleaner/default.nix | 2 +- pkgs/tools/inputmethods/evdevremapkeys/default.nix | 2 +- pkgs/tools/inputmethods/evscript/default.nix | 2 +- pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 2 +- pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 2 +- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 2 +- pkgs/tools/inputmethods/ibus/wrapper.nix | 2 +- pkgs/tools/misc/3mux/default.nix | 2 +- pkgs/tools/misc/adafruit-ampy/default.nix | 2 +- pkgs/tools/misc/apt-offline/default.nix | 2 +- pkgs/tools/misc/aptly/default.nix | 2 +- pkgs/tools/misc/asciinema-scenario/default.nix | 2 +- pkgs/tools/misc/azure-vhd-utils/default.nix | 2 +- pkgs/tools/misc/bashplotlib/default.nix | 2 +- pkgs/tools/misc/bmap-tools/default.nix | 2 +- pkgs/tools/misc/bonfire/default.nix | 2 +- pkgs/tools/misc/broadlink-cli/default.nix | 2 +- pkgs/tools/misc/chezmoi/default.nix | 2 +- pkgs/tools/misc/ckb-next/default.nix | 2 +- pkgs/tools/misc/claws/default.nix | 2 +- pkgs/tools/misc/cloud-sql-proxy/default.nix | 2 +- pkgs/tools/misc/code-minimap/default.nix | 2 +- pkgs/tools/misc/codebraid/default.nix | 2 +- pkgs/tools/misc/crudini/default.nix | 2 +- pkgs/tools/misc/dashing/default.nix | 2 +- pkgs/tools/misc/diskonaut/default.nix | 2 +- pkgs/tools/misc/docker-ls/default.nix | 2 +- pkgs/tools/misc/docui/default.nix | 2 +- pkgs/tools/misc/doitlive/default.nix | 2 +- pkgs/tools/misc/dust/default.nix | 2 +- pkgs/tools/misc/envdir-go/default.nix | 2 +- pkgs/tools/misc/esptool/default.nix | 2 +- pkgs/tools/misc/eva/default.nix | 2 +- pkgs/tools/misc/fselect/default.nix | 2 +- pkgs/tools/misc/fsql/default.nix | 2 +- pkgs/tools/misc/g933-utils/default.nix | 2 +- pkgs/tools/misc/gawp/default.nix | 2 +- pkgs/tools/misc/gh-ost/default.nix | 2 +- pkgs/tools/misc/gif-for-cli/default.nix | 2 +- pkgs/tools/misc/git-town/default.nix | 2 +- pkgs/tools/misc/go.rice/default.nix | 2 +- pkgs/tools/misc/gosu/default.nix | 2 +- pkgs/tools/misc/grc/default.nix | 2 +- pkgs/tools/misc/hacksaw/default.nix | 2 +- pkgs/tools/misc/heatseeker/default.nix | 2 +- pkgs/tools/misc/hexyl/default.nix | 2 +- pkgs/tools/misc/hyperledger-fabric/default.nix | 2 +- pkgs/tools/misc/i3cat/default.nix | 2 +- pkgs/tools/misc/i3minator/default.nix | 2 +- pkgs/tools/misc/ical2org/default.nix | 2 +- pkgs/tools/misc/kargo/default.nix | 2 +- pkgs/tools/misc/kt/default.nix | 2 +- pkgs/tools/misc/lazydocker/default.nix | 2 +- pkgs/tools/misc/lice/default.nix | 2 +- pkgs/tools/misc/lnch/default.nix | 2 +- pkgs/tools/misc/lokalise2-cli/default.nix | 2 +- pkgs/tools/misc/loop/default.nix | 2 +- pkgs/tools/misc/lsd/default.nix | 2 +- pkgs/tools/misc/me_cleaner/default.nix | 2 +- pkgs/tools/misc/microplane/default.nix | 2 +- pkgs/tools/misc/mimeo/default.nix | 2 +- pkgs/tools/misc/mmake/default.nix | 2 +- pkgs/tools/misc/mongodb-tools/default.nix | 3 +-- pkgs/tools/misc/nagstamon/default.nix | 2 +- pkgs/tools/misc/noteshrink/default.nix | 2 +- pkgs/tools/misc/ntfy/default.nix | 2 +- pkgs/tools/misc/pdd/default.nix | 2 +- pkgs/tools/misc/pdf-parser/default.nix | 2 +- pkgs/tools/misc/pgcenter/default.nix | 2 +- pkgs/tools/misc/pgmetrics/default.nix | 2 +- pkgs/tools/misc/phraseapp-client/default.nix | 2 +- pkgs/tools/misc/pistol/default.nix | 2 +- pkgs/tools/misc/powerline-go/default.nix | 2 +- pkgs/tools/misc/pubs/default.nix | 2 +- pkgs/tools/misc/rargs/default.nix | 2 +- pkgs/tools/misc/rename/default.nix | 2 +- pkgs/tools/misc/shelldap/default.nix | 2 +- pkgs/tools/misc/swaglyrics/default.nix | 2 +- pkgs/tools/misc/systrayhelper/default.nix | 2 +- pkgs/tools/misc/tagref/default.nix | 2 +- pkgs/tools/misc/tensorman/default.nix | 2 +- pkgs/tools/misc/tewisay/default.nix | 2 +- pkgs/tools/misc/thefuck/default.nix | 2 +- pkgs/tools/misc/tmuxp/default.nix | 2 +- pkgs/tools/misc/togglesg-download/default.nix | 2 +- pkgs/tools/misc/trash-cli/default.nix | 2 +- pkgs/tools/misc/trillian/default.nix | 16 ++++++---------- pkgs/tools/misc/tydra/default.nix | 2 +- pkgs/tools/misc/unicode/default.nix | 2 +- pkgs/tools/misc/upower-notify/default.nix | 2 +- pkgs/tools/misc/vimwiki-markdown/default.nix | 2 +- pkgs/tools/misc/vivid/default.nix | 2 +- pkgs/tools/misc/void/default.nix | 2 +- pkgs/tools/misc/wakatime/default.nix | 2 +- pkgs/tools/misc/xdxf2slob/default.nix | 2 +- pkgs/tools/misc/xflux/gui.nix | 2 +- pkgs/tools/misc/xmonad-log/default.nix | 2 +- pkgs/tools/misc/yle-dl/default.nix | 2 +- pkgs/tools/misc/you-get/default.nix | 2 +- pkgs/tools/misc/yubikey-neo-manager/default.nix | 2 +- pkgs/tools/misc/yubikey-personalization-gui/default.nix | 2 +- pkgs/tools/misc/zabbixctl/default.nix | 2 +- pkgs/tools/networking/assh/default.nix | 2 +- pkgs/tools/networking/brook/default.nix | 2 +- pkgs/tools/networking/bukubrow/default.nix | 2 +- pkgs/tools/networking/circus/default.nix | 2 +- pkgs/tools/networking/clash/default.nix | 2 +- pkgs/tools/networking/connman/connman-notify/default.nix | 2 +- pkgs/tools/networking/corerad/default.nix | 2 +- pkgs/tools/networking/croc/default.nix | 2 +- pkgs/tools/networking/curl-unix-socket/default.nix | 2 +- pkgs/tools/networking/dd-agent/datadog-agent.nix | 2 +- pkgs/tools/networking/dd-agent/datadog-process-agent.nix | 2 +- pkgs/tools/networking/ddclient/default.nix | 2 +- pkgs/tools/networking/dnscrypt-proxy2/default.nix | 2 +- pkgs/tools/networking/dnsproxy/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/networking/getmail/default.nix | 2 +- pkgs/tools/networking/goklp/default.nix | 2 +- pkgs/tools/networking/goreplay/default.nix | 2 +- pkgs/tools/networking/http-prompt/default.nix | 2 +- pkgs/tools/networking/httpie/default.nix | 2 +- pkgs/tools/networking/httplab/default.nix | 2 +- pkgs/tools/networking/httpstat/default.nix | 2 +- pkgs/tools/networking/ipgrep/default.nix | 2 +- pkgs/tools/networking/kail/default.nix | 2 +- pkgs/tools/networking/minio-client/default.nix | 2 +- pkgs/tools/networking/offlineimap/default.nix | 2 +- pkgs/tools/networking/persepolis/default.nix | 2 +- pkgs/tools/networking/photon/default.nix | 2 +- pkgs/tools/networking/pirate-get/default.nix | 2 +- pkgs/tools/networking/pixiecore/default.nix | 2 +- pkgs/tools/networking/polysh/default.nix | 2 +- pkgs/tools/networking/proxify/default.nix | 2 +- pkgs/tools/networking/pssh/default.nix | 2 +- pkgs/tools/networking/pykms/default.nix | 2 +- pkgs/tools/networking/s3cmd/default.nix | 2 +- pkgs/tools/networking/s3gof3r/default.nix | 2 +- pkgs/tools/networking/s4cmd/default.nix | 2 +- pkgs/tools/networking/shadowfox/default.nix | 2 +- pkgs/tools/networking/subfinder/default.nix | 2 +- pkgs/tools/networking/tdns-cli/default.nix | 2 +- pkgs/tools/networking/tendermint/default.nix | 2 +- pkgs/tools/networking/termshark/default.nix | 2 +- pkgs/tools/networking/tox-node/default.nix | 2 +- pkgs/tools/networking/ua/default.nix | 2 +- pkgs/tools/networking/urlwatch/default.nix | 2 +- pkgs/tools/networking/waitron/default.nix | 2 +- pkgs/tools/networking/wifite2/default.nix | 2 +- pkgs/tools/networking/wireguard-go/default.nix | 2 +- pkgs/tools/networking/wormhole-william/default.nix | 2 +- pkgs/tools/networking/wstunnel/default.nix | 2 +- pkgs/tools/networking/wuzz/default.nix | 2 +- pkgs/tools/networking/yrd/default.nix | 2 +- pkgs/tools/nix/cached-nix-shell/default.nix | 2 +- pkgs/tools/nix/nar-serve/default.nix | 2 +- pkgs/tools/nix/nix-output-monitor/default.nix | 2 +- pkgs/tools/nix/nix-query-tree-viewer/default.nix | 2 +- pkgs/tools/package-management/cargo-kcov/default.nix | 3 +-- pkgs/tools/package-management/gx/default.nix | 2 +- pkgs/tools/package-management/gx/go/default.nix | 2 +- pkgs/tools/package-management/mynewt-newt/default.nix | 2 +- pkgs/tools/package-management/nix-doc/default.nix | 2 +- .../package-management/nix-simple-deploy/default.nix | 2 +- pkgs/tools/package-management/nixpkgs-review/default.nix | 3 +-- pkgs/tools/package-management/python2nix/default.nix | 2 +- pkgs/tools/security/2fa/default.nix | 2 +- pkgs/tools/security/aws-iam-authenticator/default.nix | 2 +- pkgs/tools/security/aws-okta/default.nix | 2 +- pkgs/tools/security/certmgr/default.nix | 2 +- pkgs/tools/security/certstrap/default.nix | 2 +- pkgs/tools/security/cfssl/default.nix | 2 +- pkgs/tools/security/chrome-token-signing/default.nix | 2 +- pkgs/tools/security/cloudbrute/default.nix | 2 +- pkgs/tools/security/creddump/default.nix | 2 +- pkgs/tools/security/crlfuzz/default.nix | 2 +- pkgs/tools/security/crowbar/default.nix | 2 +- pkgs/tools/security/deepsea/default.nix | 2 +- pkgs/tools/security/dnsrecon/default.nix | 2 +- pkgs/tools/security/dnsx/default.nix | 2 +- pkgs/tools/security/ffuf/default.nix | 2 +- pkgs/tools/security/fido2luks/default.nix | 2 +- pkgs/tools/security/fierce/default.nix | 2 +- pkgs/tools/security/gau/default.nix | 2 +- pkgs/tools/security/gnome-keysign/default.nix | 2 +- pkgs/tools/security/gospider/default.nix | 2 +- pkgs/tools/security/grype/default.nix | 2 +- pkgs/tools/security/hologram/default.nix | 2 +- pkgs/tools/security/httpx/default.nix | 2 +- pkgs/tools/security/keybase/kbfs.nix | 2 +- pkgs/tools/security/knockknock/default.nix | 2 +- pkgs/tools/security/lesspass-cli/default.nix | 2 +- pkgs/tools/security/notary/default.nix | 2 +- pkgs/tools/security/nuclei/default.nix | 2 +- pkgs/tools/security/onioncircuits/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- pkgs/tools/security/pyrit/default.nix | 2 +- pkgs/tools/security/qdigidoc/default.nix | 2 +- pkgs/tools/security/safe/default.nix | 2 +- pkgs/tools/security/saml2aws/default.nix | 2 +- pkgs/tools/security/sops/default.nix | 2 +- pkgs/tools/security/subjs/default.nix | 2 +- pkgs/tools/security/sudolikeaboss/default.nix | 2 +- pkgs/tools/security/teler/default.nix | 2 +- pkgs/tools/security/urlhunter/default.nix | 2 +- pkgs/tools/security/vault/default.nix | 2 +- pkgs/tools/security/volatility/default.nix | 2 +- pkgs/tools/security/vulnix/default.nix | 2 +- pkgs/tools/system/auto-cpufreq/default.nix | 2 +- pkgs/tools/system/awstats/default.nix | 2 +- pkgs/tools/system/cm-rgb/default.nix | 2 +- pkgs/tools/system/consul-template/default.nix | 2 +- pkgs/tools/system/envconsul/default.nix | 2 +- pkgs/tools/system/gdu/default.nix | 2 +- pkgs/tools/system/gotop/default.nix | 2 +- pkgs/tools/system/honcho/default.nix | 2 +- pkgs/tools/system/journalwatch/default.nix | 2 +- pkgs/tools/system/localtime/default.nix | 2 +- pkgs/tools/system/pcstat/default.nix | 2 +- pkgs/tools/system/ps_mem/default.nix | 2 +- pkgs/tools/system/s-tui/default.nix | 2 +- pkgs/tools/system/s6-rc/default.nix | 2 +- pkgs/tools/system/systemd-journal2gelf/default.nix | 2 +- pkgs/tools/system/tre-command/default.nix | 2 +- pkgs/tools/text/angle-grinder/default.nix | 2 +- pkgs/tools/text/choose/default.nix | 2 +- pkgs/tools/text/codesearch/default.nix | 2 +- pkgs/tools/text/fanficfare/default.nix | 2 +- pkgs/tools/text/gjo/default.nix | 2 +- pkgs/tools/text/grin/default.nix | 2 +- pkgs/tools/text/gucci/default.nix | 2 +- pkgs/tools/text/icdiff/default.nix | 2 +- pkgs/tools/text/invoice2data/default.nix | 2 +- pkgs/tools/text/markdown-pp/default.nix | 2 +- pkgs/tools/text/pbgopy/default.nix | 2 +- pkgs/tools/text/platinum-searcher/default.nix | 2 +- pkgs/tools/text/proselint/default.nix | 2 +- pkgs/tools/text/rpl/default.nix | 2 +- pkgs/tools/text/schema2ldif/default.nix | 4 +++- pkgs/tools/text/transifex-client/default.nix | 2 +- pkgs/tools/text/xurls/default.nix | 2 +- pkgs/tools/typesetting/mmark/default.nix | 2 +- pkgs/tools/typesetting/odpdown/default.nix | 2 +- pkgs/tools/typesetting/tikzit/default.nix | 2 +- pkgs/tools/video/vnc2flv/default.nix | 2 +- pkgs/tools/virtualization/awless/default.nix | 2 +- pkgs/tools/virtualization/awsebcli/default.nix | 2 +- pkgs/tools/virtualization/distrobuilder/default.nix | 2 +- pkgs/tools/virtualization/euca2ools/default.nix | 2 +- pkgs/tools/virtualization/marathonctl/default.nix | 2 +- pkgs/tools/virtualization/udocker/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2779 files changed, 2844 insertions(+), 2834 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 2899d4ea6ef..689ad273575 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , cairo , dbus diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index d71420d0722..2d3ac0c314e 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , a2jmidid , coreutils -, lib , libjack2 , fetchpatch , fetchzip diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 12aec0d4cbb..be0f2f72529 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm , qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index e78e50877d3..bcad36e2da9 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , ninja , meson , pkg-config diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/applications/audio/curseradio/default.nix index 82f3b130e6e..94059e06e54 100644 --- a/pkgs/applications/audio/curseradio/default.nix +++ b/pkgs/applications/audio/curseradio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }: +{ lib, fetchFromGitHub, substituteAll, python3Packages, mpv }: python3Packages.buildPythonApplication rec { version = "0.2"; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 20a1044fe24..3d4e5e5e5b9 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: +{ mkDerivation, lib, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 92e6eb2b323..80b2cff3ce0 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, pkgs }: +{ lib, fetchFromGitHub, python3Packages, pkgs }: python3Packages.buildPythonApplication rec { pname = "dr14_tmeter"; diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix index 77335da2ce7..a93251c8d2d 100644 --- a/pkgs/applications/audio/faust/faust2jackrust.nix +++ b/pkgs/applications/audio/faust/faust2jackrust.nix @@ -1,5 +1,4 @@ -{ stdenv -, faust +{ faust , libjack2 , cargo , binutils diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index e22067c38fc..b91c72a5c75 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index ed51304b225..1733aef4177 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitLab , fetchpatch diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index dea1f5fe7bc..229050654cd 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, python3Packages, intltool +{ lib, fetchFromGitHub, python3, python3Packages, intltool , glibcLocales, gnome3, gtk3, wrapGAppsHook , gobject-introspection }: diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index 46e1baed07d..95f3bf9988c 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: with pythonPackages; buildPythonApplication rec { pname = "greg"; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index ddd09ce4452..b3b95ca057e 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, gettext, klick}: +{ lib, fetchurl, pythonPackages, gettext, klick}: pythonPackages.buildPythonApplication rec { pname = "gtklick"; diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index c6510f5469c..13b488ce7d7 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 }: mkDerivation rec { diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 7ba47be686e..13aa4fe5bc2 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 4d52a286aba..11a7d0cf3c6 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 +{ lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index 793ee3d263a..9811998c368 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pythonPackages, libmms }: +{ fetchurl, lib, pythonPackages, libmms }: pythonPackages.buildPythonApplication rec { pname = "mimms"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 70e6616482f..7af4b585adf 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint +{ lib, mkDerivation, fetchurl, fetchFromGitHub, chromaprint , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 54af3bc68f1..6e76d6af87d 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 05827b0bb56..c2171d4cecc 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index 8daaef7d45d..c191eba4c4d 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, mopidy, glibcLocales }: +{ lib, pythonPackages, mopidy, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Moped"; diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index 17e68c16539..670b1a9c509 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, mopidy }: +{ lib, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "Mopidy-Mopify"; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 8d6d7a1528b..d686d492898 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 868dbaf3035..6327ba020bf 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-mpris"; diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix index be38c6a7040..621ced53646 100644 --- a/pkgs/applications/audio/mopidy/scrobbler.nix +++ b/pkgs/applications/audio/mopidy/scrobbler.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Scrobbler"; diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index afa46726db7..0637731dcb5 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-somafm"; diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index bdc3523652c..d8a244b5146 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-soundcloud"; diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 8fafab0970f..70d076190cd 100644 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: +{ lib, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify-tunigo"; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 57ba6ea1f61..e44b9f35daa 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, mopidy }: +{ lib, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index d8a6d6eacca..4a3edd2a434 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index 35a85b95801..b84a756c2ce 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, mopidy }: +{ lib, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 6d010c6cd95..0efe034034a 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }: let desktopItem = makeDesktopItem rec { diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index ff39e62e729..47f8e5a22e6 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index bb22b3cec22..fea6e097de7 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }: +{ lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }: buildGoModule rec { pname = "NoiseTorch"; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 1d84aed8b2e..f238a687609 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 733cb702c7e..200e457c568 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 , enablePlayback ? true , gst_all_1 }: diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index c64371f091c..939b53c44fb 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib +{ lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection , libnotify, libsecret, gst_all_1 }: diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index 05800c360fa..a331952aa81 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 94a571df294..efa1d943610 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: python3Packages.buildPythonApplication rec { pname = "puddletag"; diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index a19a03d4bd2..83de192c6b3 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pythonPackages +{ fetchFromGitHub, lib, pythonPackages , mp3Support ? true, lame ? null , opusSupport ? true, opusTools ? null , faacSupport ? false, faac ? null diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index 0e3eeac984a..d4f3306697d 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ifaddr diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 719ddd28e2a..586dfeae733 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras # Enable jack session support , jackSession ? false diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 950e16cedc8..f079b99af77 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper +{ lib, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 03f519d3816..bb40e0b3eeb 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, qttools +{ lib, fetchurl, autoconf, automake, libtool, pkg-config, qttools , liblscp, libgig, qtbase, mkDerivation }: mkDerivation rec { diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 4b712bf1d25..f708207cce9 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config +{ lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config , mkDerivation, qtbase, qttools, qtx11extras }: diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 493a99f6b71..f19d0f70fdf 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -24,7 +24,7 @@ , serd , sord , sratom -, lib, stdenv +, lib , suil }: diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 2cc8c53f607..a503d3b344c 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , cargo , dbus diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index bc098cedaf4..83af7985dbe 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, gettext +{ lib, fetchFromGitHub, wrapGAppsHook, gettext , python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix index 593ad9468eb..e473d97ce56 100644 --- a/pkgs/applications/audio/spotify-cli-linux/default.nix +++ b/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, dbus }: +{ lib, python3Packages, dbus }: python3Packages.buildPythonApplication rec { pname = "spotify-cli-linux"; version = "1.6.0"; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 8097ee90930..50e16c355e2 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 1cb9795005c..71a91dc3105 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config +{ mkDerivation, lib, fetchurl, cmake, pkg-config , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 8a46a06efce..97d42eb9c69 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac +{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac , sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index ec142cc723e..8cf3295ccab 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "ethabi"; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 54805f2512f..21e5a124f7d 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index 499e2a77c6f..1424ddc9516 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: +{ lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: buildGoPackage rec { pname = "quorum"; diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index 79a1eda3495..dcfba417149 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "turbo-geth"; diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix index dd553fc1998..ea871ccf414 100644 --- a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, trivialBuild }: +{ fetchurl, lib, trivialBuild }: trivialBuild { pname = "sv-kalender"; diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 059d49151d8..c73238ce366 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +{ lib, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: mkDerivation rec { pname = "featherpad"; version = "0.10.0"; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 31a7026106e..d47c315f613 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: +{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: mkDerivation rec { pname = "focuswriter"; diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix index a0fdcfbb3f6..5429497d209 100644 --- a/pkgs/applications/editors/hecate/default.nix +++ b/pkgs/applications/editors/hecate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "0.0.1"; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 5d782aa1abc..f92a4557ac7 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, ncurses }: +{ lib, fetchFromGitHub, rustPlatform, ncurses }: rustPlatform.buildRustPackage { pname = "hexdino"; diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix index 07454d331c6..71833be3300 100644 --- a/pkgs/applications/editors/kibi/default.nix +++ b/pkgs/applications/editors/kibi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index cc39da90c23..49dafe8fc1a 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "manuskript"; diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index a8e60cddfbb..512e0f12441 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -4,7 +4,7 @@ , qmake , qtbase , qtwebkit -, lib, stdenv +, lib , wrapGAppsHook }: diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index f1d56584e49..208339c2e38 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: +{ lib, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: rustPlatform.buildRustPackage rec { pname = "gnvim-unwrapped"; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 1d82e70f5c4..867e2275128 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: with lib; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index d51f46b9e0a..b2011c5d8e6 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , qca-qt5, shared-mime-info }: diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 99f7340f753..6bf0f191ece 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts +{ lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # available. , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 1094c3c7553..b34441d100c 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper , boost, xercesc, hunspell, zlib, pcre16 , qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index 3ffcc8ecf45..e52d95f837d 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: +{ lib, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: rec { extraFontsSrc = fetchurl { url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index e98d57420e8..39aefe3fa16 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: with python3.pkgs; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index f5306e75a56..b6222c8a6d2 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake +{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake , python, qtbase, qttools }: mkDerivation rec { diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index d1cee064aee..3b6bb01bb15 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,5 +1,5 @@ { python2 -, lib, stdenv +, lib , fetchurl , pkg-config , libXext diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index b2997c2c474..db0012a184b 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dosage"; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 3563220f2b8..1c4f05b42da 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }: diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 094dcf0703e..8fde04d0d1d 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: +{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 30c21149827..0e65d3199ab 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, wrapGAppsHook, +{ lib, fetchurl, perlPackages, wrapGAppsHook, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 95b96bcff1b..f5b8b806215 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , lzma , qt5 diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 1ea21506e31..d9c51d38802 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript +{ lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, libpng, qtbase, mkDerivation }: diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 283ed117954..294b6c4ca70 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 314e4c6ec14..ef335cd6be2 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: +{ lib, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: python3Packages.buildPythonApplication rec { pname = "krop"; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 36154af137b..c44ff57d18f 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkg-config +{ lib, mkDerivation, cmake, fetchFromGitHub, pkg-config , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix index 81077578eb2..add40043c0f 100644 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ b/pkgs/applications/graphics/mcomix3/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , wrapGAppsHook , installShellFiles diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix index c894de2c933..d06ff027c5b 100644 --- a/pkgs/applications/graphics/meme/default.nix +++ b/pkgs/applications/graphics/meme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , unstableGitUpdater , buildGoModule , fetchFromGitHub diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 9da9c20942e..7b83bdec8c6 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , gtk3 , gettext diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 8a3e41965ff..bd6d732ac68 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , fetchpatch diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 7bbff5499f6..79feab3ab7a 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,6 +1,6 @@ { boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, - mkDerivation, ninja, mpi, python3, lib, stdenv, tbb, libGLU, libGL }: + mkDerivation, ninja, mpi, python3, lib, tbb, libGLU, libGL }: mkDerivation rec { pname = "paraview"; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index bcc09498121..857a68df092 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pdfcpu"; diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index ca2455dd048..0c25364b76a 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +{ mkDerivation, lib, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index fe49d5fa154..52e38b23c1f 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch +{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 21960358a7b..5044e60161c 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }: mkDerivation rec { pname = "phototonic"; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index d4788b3c1e7..e3ab0c772a1 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pygobject3 diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 8b6e581ae0b..2635b2d3d88 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, +{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, gettext }: let diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index c4fc79c7fec..47bf2d95028 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }: mkDerivation rec { pname = "qcomicbook"; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 26522d78bcd..f444ebfe5be 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivationWith, fetchurl, python3Packages +{ lib, mkDerivationWith, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev , udisks, gexiv2, gst_all_1, libnotify , exiftool, gdk-pixbuf, libmediainfo, vmtouch diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index b985ae7d571..c51794881e9 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mkDerivation +{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 361f1fa1809..048b8b56fc0 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation +{ lib, fetchFromGitHub, mkDerivation , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 22751f38fe1..313920d8154 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, tesseractBase, languages +{ lib, makeWrapper, tesseractBase, languages # A list of languages like [ "eng" "spa" … ] or `null` for all available languages , enableLanguages ? null diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 0130017356c..f3aef213ad2 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }: +{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: let humioCtlVersion = "0.28.2"; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 133194f7af5..516b786222d 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "antfs-cli"; diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix index b01bfbedb8a..81096d9877f 100644 --- a/pkgs/applications/misc/ape/apeclex.nix +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, attemptoClex, callPackage }: +{ lib, attemptoClex, callPackage }: callPackage ./. { pname = "ape-clex"; diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index c94011466ec..4fa3d5cf419 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchPypi, appdirs, attrs, requests, +{ lib, python3, fetchPypi, appdirs, attrs, requests, beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, pypandoc, python-dotenv, python-frontmatter, tinydb, validators, watchdog, wtforms }: diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 82e7c1bb21b..bd3194e3fea 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets , qtquickcontrols2, qtgraphicaleffects }: mkDerivation rec { diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 0b57ad29266..ac929bfa5b1 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "autospotting"; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index fa5980b115e..b9dbcf529be 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, +{ lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, openssl, wrapGAppsHook, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 3213ed9edf0..eb909155e4e 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, stdenv, fetchurl, cmake, pkg-config, sword, boost, clucene_core +{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 89686e50d17..952d1fe16db 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , fetchurl , gettext diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index 05815e242f0..3458ac3f250 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , rustPlatform -, lib, stdenv +, lib , wrapGAppsHook }: diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 772754ecc6d..68b4f7b3e56 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { version = "4.5"; diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index d3357b41bd2..8df75b0cbd1 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qtserialport, qmake }: mkDerivation rec { pname = "candle"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 988af330deb..90eb38329a3 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , buildGoModule, installShellFiles }: buildGoModule rec { diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index fb5d9aed959..13ee17999fe 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase , qttools }: mkDerivation rec { diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 631d53b506f..56938f5338d 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }: +{ lib, fetchFromGitHub, glibcLocales, pandoc, python3 }: let pythonPackages = python3.pkgs; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 7b9d7faba94..8cb87274c1d 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , mkDerivation , fetchFromGitHub , substituteAll diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index 6b851e80f34..42df68f6721 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 1e186bdf5fd..7b1dbf4d85e 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: +{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: buildPythonPackage { pname = "libarcus"; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index fb920235031..f12059e6317 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: +{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: buildPythonPackage { pname = "libsavitar-lulzbot"; diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix index 77a4f3edef6..01166092b2b 100644 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: buildPythonPackage { diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 3a46b5e2f9a..20742311375 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index 3425ceb44a9..fe15d90f254 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: +{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: let version = "0.7.1"; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 6af92285c2b..19cfa95a88e 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: +{ lib, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: mkDerivation { pname = "dfilemanager"; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index c1a4d5e4440..30715dd51f3 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: +{ lib, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: mkDerivation rec { version = "2.1.3"; diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index a0b4237c7f6..a8817a542e3 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: +{ lib, buildPythonApplication, fetchFromGitHub, substituteAll, requests, dmenu }: buildPythonApplication rec { pname = "dmensamenu"; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index e0e9fcd6feb..b31c17cc319 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }: +{ lib, fetchFromGitHub, pythonPackages, gnome2, keybinder }: pythonPackages.buildPythonApplication rec { ver = "0.93"; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 913ed9523ba..911a319a963 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "dotfiles"; diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index 78efa133c1e..cd1c659ec5b 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dstask"; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 418658fec22..d2332b4d9c7 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: +{lib, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index 29ac8b4484b..d0606001ad4 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { version = "2.9.3.1"; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index ad6ed6f7a78..bd015afdc57 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python3Packages , wrapQtAppsHook diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix index 8fc7fb32743..690b88d8417 100644 --- a/pkgs/applications/misc/elfx86exts/default.nix +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 1eeeba1b439..79420eacec8 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "exercism"; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 7f932b5b1e5..63f942c2c59 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildGoModule , fetchFromGitHub , sqlite diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index 26b8beab19c..36629179ab5 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fluxbox , gnused diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 1e0aba0400f..12b5a38877a 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "geoipupdate"; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 6664974a41a..d4f50451719 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: +{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: with lib; diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index c2871766deb..2f2a0a22126 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-jira"; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 57e2d95f043..fa58c2d3965 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix index 3de63203f24..4025b313128 100644 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ b/pkgs/applications/misc/gpsbabel/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: +{ lib, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: mkDerivation { pname = "gpsbabel-gui"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 4fc4586ca4e..1628f0473fa 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, +{ lib, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index 101baa09396..15d8b966396 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gsctl"; diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index 855123ef793..dbf7e1aee74 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool +{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 467cbfad656..fc9607e7be6 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, fetchpatch }: +{ lib, fetchFromGitHub, python3, fetchpatch }: let diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index fc22d3a854a..6ada1fd749b 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, runtimeShell }: +{ lib, buildGoPackage, fetchFromGitHub, runtimeShell }: buildGoPackage rec { pname = "hivemind"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 2d2ccefe934..35246a45da2 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hugo"; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 7fc8ef88330..79f87612e49 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 }: diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 341341c3ca8..467945af6ac 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -6,7 +6,7 @@ , kio , kjobwidgets , kxmlgui -, lib, stdenv +, lib }: mkDerivation rec { diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index c1d9448c6a6..59d986321dd 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, +{ lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }: with builtins; buildDotnetPackage rec { diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 5effc88acb0..3bec8db0687 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibcLocales, python3 }: +{ lib, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { version = "0.17.0"; diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index 545dc85efeb..dcbeb408759 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "kondo"; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index ce21ea75b30..243583b8762 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , intltool , python3Packages diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index e32535d4445..65f9a9f0f17 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python27Packages, fetchgit }: +{ lib, python27Packages, fetchgit }: let py = python27Packages; python = py.python; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 249ed48bd1c..2a65fc25af2 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "madonctl"; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index f19cbee8b79..4adfe0f6526 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 192228de5d9..086db35a5ad 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "menumaker"; diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index 07102fe56f2..007965f868b 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "mop"; diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix index c01a1b9cbc6..657ac9645de 100644 --- a/pkgs/applications/misc/mqtt-bench/default.nix +++ b/pkgs/applications/misc/mqtt-bench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "mqtt-bench"; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 173291183da..fd1ca666589 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, lib, stdenv, util-linux, wrapQtAppsHook }: + python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index b23c41e6fee..cbb7a110c4c 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, boost +{ lib, mkDerivation, fetchFromGitHub, boost , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 2b0986eeba6..507399c012b 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }: +{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }: let getmodel = name: sha256: { diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 42433936aba..d52120e0fb7 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,5 +1,5 @@ { fetchurl -, lib, stdenv +, lib , substituteAll , aspellWithDicts , at-spi2-core ? null diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index bb8f8d4013f..2ca4e3203ac 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages , qtbase, qtmultimedia, qttranslations, SDL, gtest , dfu-util, avrdude diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 25cca1536f8..72d68431b8c 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pkg-config , fetchurl , buildPythonApplication diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index f2386a5cd83..932fa588d27 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, dbus, gnupg }: +{ lib, fetchFromGitHub, python3, dbus, gnupg }: python3.pkgs.buildPythonApplication rec { pname = "pass-secret-service"; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 907cceeb58b..4255127b3df 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 8c8413b2ce6..73dd9390382 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib +{ fetchFromGitHub, lib , wrapGAppsHook, intltool , python3Packages, gtk3, poppler_gi }: diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 31719cdfef2..5e489bebb25 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchurl, xpdf }: +{ lib, pythonPackages, fetchurl, xpdf }: let py = pythonPackages; in diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 67010e713c3..0a99d357e68 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , pkg-config , qmake diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index 7332f201689..6ca315b1092 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , fetchFromGitHub , rustPlatform , bubblewrap , makeWrapper -, lib }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 2a3368e351f..05886a85bf0 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python27Packages, python36Packages, wmctrl, +{ lib, fetchurl, python27Packages, python36Packages, wmctrl, qtbase, mkDerivationWith }: { diff --git a/pkgs/applications/misc/prevo/default.nix b/pkgs/applications/misc/prevo/default.nix index 92d78869503..45f5889d4d5 100644 --- a/pkgs/applications/misc/prevo/default.nix +++ b/pkgs/applications/misc/prevo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: +{ lib, symlinkJoin, prevo-tools, prevo-data, makeWrapper }: symlinkJoin rec { name = "prevo-${version}"; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 13f9178f330..63160955130 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "printrun"; diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix index 0135e10d6df..afec377e9b6 100644 --- a/pkgs/applications/misc/pydf/default.nix +++ b/pkgs/applications/misc/pydf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "pydf"; diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index a26b6b014da..5eb43c0e357 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 268d2fb2860..5765aeba7dd 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: with pythonPackages; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index eb775a1f602..4e1e1f31f19 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , perl , python3 diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index a51bd3a80c0..7830f2035d9 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qmake +{ lib, fetchFromGitHub, qmake , coreutils, xdg_utils, bash , makeWrapper, perlPackages, mkDerivation }: diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index c6306294ecd..721c95c028b 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 0892632c1d8..6ae81fca27c 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups +{lib, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups , file, ghostscript }: let diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index f7dbc9a9058..5f9958f2d5d 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 5de2428250a..9480a32aae3 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , fetchFromGitHub , qtbase , qtsvg diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 4ab70a5a8d7..fafd91f7811 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, qt5, mkDerivation }: +{ lib, fetchzip, qt5, mkDerivation }: let version = "1.40.43"; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 8394fd4c534..619b2ba9955 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight +{ lib, fetchFromGitHub, python3Packages, file, less, highlight , imagePreviewSupport ? true, w3m ? null}: with lib; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 77538f24361..800170b314a 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, python3Packages }: +{ lib, buildPythonApplication, fetchPypi, python3Packages }: buildPythonApplication rec { pname = "remarkable-mouse"; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 22a154da4fd..e2a5f348da5 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "rmapi"; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index 3148bf0ccf3..385607ec709 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "rmview"; diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index d7b38e2d665..bc36b2f379e 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rsClock"; diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix index 4ab79440b23..7550e6bcb95 100644 --- a/pkgs/applications/misc/rss-bridge-cli/default.nix +++ b/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeShellScriptBin, rss-bridge, php }: +{ lib, writeShellScriptBin, rss-bridge, php }: let phpWithExts = (php.withExtensions diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 34393696232..be539a37a30 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index e41860551fc..5beacfad2f9 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, python3Packages +{ lib, fetchFromGitHub, python3, python3Packages , gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper , gobject-introspection }: diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index 15ef1654e70..db734bff587 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: +{ lib, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: buildGoPackage rec { pname = "syncthing-tray"; diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index ae730d597ce..1a97f6c0feb 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index d8bb03138f3..562a0f0bdcb 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonApplication , click diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index e3e64cfd68a..b44b4bd0a70 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terminal-parrot"; diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 2541a17fc20..95937ea5f2e 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchFromGitHub , fetchPypi diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index ced50748d0f..856fa60d8e6 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, perl }: +{ lib, rustPlatform, fetchFromGitHub, perl }: rustPlatform.buildRustPackage rec { pname = "tickrs"; diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 0658b43626e..3333760a759 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -1,4 +1,4 @@ -{ cmake, lib, stdenv, mkDerivation, fetchFromGitLab, +{ cmake, lib, mkDerivation, fetchFromGitLab, qtmultimedia, qttools, ... }: mkDerivation rec { diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index bc172c9b49f..069a63fb66b 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "todiff"; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index d992d9cdc41..2a322b20881 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.27.0"; diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 4ff3090d1f8..3ea3511308b 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index be9a0bafcc6..a402a669fbe 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: # Upstream has a `./vendor` directory with all deps which we rely upon. buildGoPackage rec { diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 1fa3e9b7883..893f901044a 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tut"; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 3873f8d248e..f6416f0f352 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: let inherit (python3.pkgs) buildPythonApplication fetchPypi requests; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index e2178850da1..87c49a19a19 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, asciidoc-full, gettext +{ lib, fetchFromGitHub, asciidoc-full, gettext , gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg , udisks2, wrapGAppsHook , python3Packages diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 8c17d264293..989649ec414 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , nix-update-script , python3Packages diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 3e97088371a..a56a09a8e34 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "urlscan"; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 1818ed9a215..7329d8204cd 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchhg +{ mkDerivation, lib, fetchhg , qmake, qttools , qtbase, qtsvg, qtxmlpatterns , poppler_utils diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index b4591d8717c..9d820fc4da7 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }: +{ lib, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }: mkDerivation rec { pname = "vym"; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 74c424a277b..4bbd0289a15 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "wego"; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index e234a9007fd..ec7dff14143 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.4"; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index c1af7ae373c..00ae2df100e 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index ca329521142..e31a69963ff 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, dateutil, +{ lib, fetchurl, buildPythonApplication, dateutil, sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index 5e27f9d45b6..1dbaa842ba4 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.0.0"; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 748bc21ee35..3acac8b3c68 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, python3Packages, fetchFromGitHub }: +{ lib, python3, python3Packages, fetchFromGitHub }: let version = "1.0"; in diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index a56a586b82a..20b685a162f 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brig"; diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index aa57b9a17f6..e106eb7ff66 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: +{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let version = "1.6.4"; diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 6482ce59da6..be3d8295f99 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , rustPlatform , pkg-config diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 22d21a5efa5..c4a5508b753 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }: +{ lib, mkChromiumDerivation, channel, enableWideVine, ungoogled }: with lib; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 6b3b6351230..874a73dae8e 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, meson, ninja, pkg-config, nix-update-script +{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook, gnome3 }: diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 753ea1dc08d..35130ab3393 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, python3 +{ lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 572975f78d0..3a9192164ad 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "c14-cli"; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index c82b297f9d6..810ea11b017 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cloudflared"; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index c6f83535106..728e23ff380 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "atlantis"; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 5a4f6b7db0e..c483125d851 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "machine"; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index c833dea21c7..4940f6331d4 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: +{ lib, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: buildGoPackage rec { pname = "docker-machine-kvm"; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 1dadc0b7f08..39399a7dbcf 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxcd"; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 896c04d6879..4a8f42e3cc7 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "fluxctl"; diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index f9b67b6821a..d9827039500 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config +{ lib, fetchFromGitHub, rustPlatform, pkg-config , libsodium, libarchive, openssl, zeromq }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 7d97896c360..d823e38f3f2 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "helm"; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index abc23058303..11e2b0a2915 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "k9s"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 98ffcd6fe67..9b1a155a25b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: let goPackagePath = "k8s.io/kops"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index fd7eabf1276..38323b98b19 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kubeless"; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index c72702fdc77..d7f829dc00e 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, go }: +{ lib, fetchFromGitHub, buildGoModule, go }: buildGoModule rec { pname = "kubelogin"; diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/applications/networking/cluster/kubernix/default.nix index 1411892b75b..88cacfea4f1 100644 --- a/pkgs/applications/networking/cluster/kubernix/default.nix +++ b/pkgs/applications/networking/cluster/kubernix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "kubernix"; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index d26f8ed5dc6..28b3b719997 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }: +{ lib, fetchFromGitHub, buildGoModule, makeWrapper }: buildGoModule rec { pname = "kubeval"; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 8718da46246..11b62f479c7 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule { pname = "linkerd-unstable"; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 09bf82e43fe..53209d2edd6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux +{ lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux , coreutils, kerberos, ncurses, clang, installShellFiles , components ? [ "cmd/oc" diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 650532ae8b9..89802f12be5 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "popeye"; diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 80c8244bee1..928fb351c6a 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: +{ lib, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: buildGoPackage rec { pname = "amazon-ssm-agent"; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 7b9bf354af7..085b504314e 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub}: +{ lib, buildGoPackage, fetchFromGitHub}: buildGoPackage rec { pname = "terraform-inventory"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix index 14d411c0239..b8e3c1540e9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-ansible"; version = "1.0.3"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix index 0528bce81e3..1ee986d2030 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-cloudfoundry"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 47e4f30d009..6ae781046df 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-elasticsearch"; version = "0.7.0"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix index fe508f4fa2e..13afa8d3818 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "terraform-provider-gandi"; version = "1.0.0"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix index 97331e683ef..f9a84866934 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-hcloud"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix index f2244345a9c..043e081d94e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 6a1f895c053..ed2409ead9a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch, libvirt, pkg-config, makeWrapper, cdrtools }: # USAGE: # install the following package globally or in nix-shell: diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix index f445d48eaee..4f8c44aad3f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-linuxbox"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index 6ccc551b4d3..23d41ce7f1f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-lxd"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix index 2bf76758752..f2e9b86a646 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-shell"; version = "1.6.0"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix index f4cfe6ba02f..f37d1ac5d87 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-provider-vercel"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix index 4f56070fa51..93401dfc635 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-vpsadmin"; version = "0.1.0"; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 9f2a223c448..2a6a808b0c9 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "tilt"; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index ec95b090c2e..250d6cfc1a0 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "velero"; diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index ca675dd7836..a48bd4ae44d 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , libxml2 diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index 23f557a1e6d..dae9ad3bc33 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: with rustPlatform; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 39d9aa90596..729d12c1e5b 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: +{ lib, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: python3Packages.buildPythonApplication rec { version = "0.9.9"; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index a67e0c3aed2..5eb8c9d7437 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, }: +{ lib, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonApplication rec { version = "0.9.8"; diff --git a/pkgs/applications/networking/feedreaders/feeds/default.nix b/pkgs/applications/networking/feedreaders/feeds/default.nix index 243999553e6..8b83762089d 100644 --- a/pkgs/applications/networking/feedreaders/feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/feeds/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, stdenv + , fetchFromGitLab , appstream diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index d24e0fbf717..f840c191f90 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "rawdog"; diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 5f9350b70cd..bcff9e4f8b7 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python +{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python , pythonPackages, qt5, sphinx, xvfb_run }: buildPythonApplication rec { diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index b51512332c5..b62bda3c469 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdrive"; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index c2ca0f580c3..62fdfd71f23 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,6 +1,6 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: let defaultOverrides = commonOverrides ++ [ diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 9dd6754af0c..7ed3b167383 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchdarcs, pythonPackages, libvncserver, zlib +{ lib, fetchdarcs, pythonPackages, libvncserver, zlib , gnutls, libvpx, makeDesktopItem, mkDerivationWith }: mkDerivationWith pythonPackages.buildPythonApplication rec { diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix index 5d95eddb6b6..a906c46c4ae 100644 --- a/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cordless"; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 0de7e264ec4..31896f20184 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, +{ lib, buildGoPackage, fetchFromGitHub, pkg-config, cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index fcd06326e21..274298226ec 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage , electron, element-web }: diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 458808c832d..e4f8d3c99ee 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkFranzDerivation, fetchurl }: +{ lib, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "ferdi"; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a72ff17abcd..9f772bf3f6d 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkFranzDerivation, fetchurl }: +{ lib, mkFranzDerivation, fetchurl }: mkFranzDerivation rec { pname = "franz"; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index a3df74a0016..f0846fc63f7 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -45,7 +45,7 @@ , readline , speex , sqlite -, stdenv + , udev , zlib }: diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index bca999f5762..aadb18606e1 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit +{ lib, fetchgit , buildPythonApplication, buildPythonPackage , pygobject3, pytestrunner, requests, responses, pytest, python-olm , canonicaljson, olm diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index 7229218a704..c8f24e72a9a 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule { pname = "mm"; diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index bcd6fdc9f3e..cd456b336dd 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , fetchFromGitLab , pkg-config , cmake diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 06f02fa8094..279eea2f2d7 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, openssl }: +{ lib, fetchFromGitHub, python2Packages, openssl }: python2Packages.buildPythonApplication rec { pname = "pybitmessage"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix index 6881ae270f9..56930f561c7 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -1,6 +1,6 @@ { pname, version, src, meta, desktopName ? "Rambox" }: -{ appimageTools, stdenv, lib, fetchurl, makeDesktopItem }: +{ appimageTools, lib, fetchurl, makeDesktopItem }: let name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 2a234edaa08..97d8d39f656 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkg-config, makeDesktopItem +{ mkDerivation, lib, fetchurl, pkg-config, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 55935f69e1c..29d4c3600c3 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: let version = "1.63"; in python3Packages.buildPythonPackage { diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 66d59346c4b..30cc7396c56 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { # https://github.com/erroneousboat/slack-term diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 1dadc728eee..58335bed421 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qttools, sconsPackages +{ mkDerivation, lib, fetchurl, pkg-config, qttools, sconsPackages , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 93b3315c1ef..114b3ab8f4d 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 4c49f41f623..256e026a060 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, python3Packages }: +{ lib, fetchpatch, python3Packages }: with lib; with python3Packages; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 004a4dab823..8b306c07506 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , cmake , libxml2 diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index fb1f5a0a69c..4367230f775 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmpp-client"; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index dcb25c73657..67d45c44868 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipfs-cluster"; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index fd9d8bd0d34..c54b4428819 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl, nixosTests }: +{ lib, buildGoModule, fetchurl, nixosTests }: buildGoModule rec { pname = "ipfs"; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index ded83f30a1a..8817d90dd6e 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipget"; diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix index 18a4872a44f..c4a67c8098a 100644 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ b/pkgs/applications/networking/irc/qweechat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python27Packages }: +{ lib, fetchFromGitHub, python27Packages }: python27Packages.buildPythonApplication rec { version = "2016-07-29"; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index b77d9c984de..07e4dd54e5e 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , python , fetchFromGitHub , pyopenssl diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index aee21dca645..3ad2762a2cf 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "lieer"; diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index dbcae7a0ec3..b568775481c 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3 , wrapQtAppsHook diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index b01ec9ef2cd..b43e6bb093c 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl +{ lib, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc , python3, perl, w3m, dante , fetchFromGitHub diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index dbc55850f9f..8a5f607dd32 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, notmuch }: +{ lib, python3Packages, notmuch }: python3Packages.buildPythonApplication rec { pname = "afew"; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 2cb1fd56ecc..1d1dc030c31 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: +{ lib, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { pname = "mailpile"; diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 2ced5e60db4..ec50e913176 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchgit , rustPlatform , pkg-config diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index ea10bf89248..6cd0b3db786 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, notmuch }: +{ lib, python3, notmuch }: python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 452acc1c7ca..761d0e6b244 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: +{ lib, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 068776fe17a..4587da48a4a 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages +{ lib, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 7deddf8578b..4440b24a2b1 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "zeronet"; diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 70723f48646..6690a75485b 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonApplication, fetchFromGitHub }: buildPythonApplication { pname = "protocol-unstable"; diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index dcfa88d9d4c..f70359cf7ac 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: +{ lib, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }: let beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 7c3c23a89ee..7b97bd8543d 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , qmake diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 7441cdf4eef..4156c82f91b 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh +{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: mkDerivation { diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index db9e112a063..f66df96e9db 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , genericUpdater diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 7cfe9ddfc97..045120813f0 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python27Packages, geoip }: +{ lib, fetchFromGitHub, python27Packages, geoip }: with lib; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index 2f83873fbf8..49fc578377c 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, fuse +{ lib, fetchFromGitHub, buildPythonApplication, fuse , appdirs, colorama, dateutil, requests, requests_toolbelt , fusepy, sqlalchemy }: diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 689a2b3fdda..bc2776657c2 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "desync"; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index a7f9c5f9f4b..015033d6ca5 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall +{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index 98877880255..ff6e61c614f 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "twtxt"; diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/applications/networking/versus/default.nix index 5e1b1e873c9..1e3dd211326 100644 --- a/pkgs/applications/networking/versus/default.nix +++ b/pkgs/applications/networking/versus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "versus"; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index c07b4c5e1aa..4e8bcaee019 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, installShellFiles, +{ lib, mkDerivation, fetchFromGitHub, installShellFiles, qmake, qtbase, poppler, qtmultimedia }: mkDerivation rec { diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 808811e20e8..d20e19c6859 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform , pkg-config diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fd5f3b8d7c5..b070683e6f2 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, beancount }: +{ lib, python3, beancount }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 52558df5da8..4c892b2605b 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , meson , python3Packages diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 30b4d5fa690..14f48da2230 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication { name = "keepnote-0.7.8"; diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 81e49e6e0aa..90e5995669e 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: +{ lib, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 8586fa1f673..0141b74c389 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kdeIntegration, ... }: +{ lib, kdeIntegration, ... }: attrs: { postConfigure = attrs.postConfigure + '' diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 119b5a645d6..50812d0efb9 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kdeIntegration, fetchpatch, ... }: +{ lib, kdeIntegration, fetchpatch, ... }: attrs: { patches = attrs.patches or [ ] ++ [ diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index f48ec3fb237..384d7fadaf0 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: +{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: let version = "1.44.55"; diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 6ffdd5fefed..4459e42356a 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { pname = "qnotero"; diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 7f4054bfb4e..acf44880452 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -22,7 +22,7 @@ , qtbase , qtimageformats , qttools -, lib, stdenv +, lib }: let diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix index 7436054715d..89cf2add212 100644 --- a/pkgs/applications/office/skanlite/default.nix +++ b/pkgs/applications/office/skanlite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, libksane }: diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 63f86171dce..6c1068d4584 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchurl, appimageTools, libsecret diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index dc788a6f195..4011879ddb8 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 , glibcLocales , installShellFiles diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 6b49a27a08a..65eb48f3b2d 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , pkg-config , librsvg diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 30992e60a6f..18c1b9469e7 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, installShellFiles }: +{ lib, fetchFromGitHub, pythonPackages, installShellFiles }: with pythonPackages; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 6b84e47909d..e9b446dc584 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python2 }: diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 8a612309909..217818f67c2 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr +{ lib, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr , mkDerivation # drivers (optional): , rtl-sdr, hackrf diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index d92cf9e25cd..e6fa95b5dc7 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, +{ mkDerivation, lib, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: mkDerivation rec { diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index c0dab8773c7..19a4e715013 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python38Packages, fetchPypi +{ lib, python38Packages, fetchPypi , fftw, alsaLib, pulseaudio, wxPython_4_0 }: python38Packages.buildPythonApplication rec { diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 3a51f77d7bd..00d3431b6e3 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages +{ lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio , qt5 , USRPSupport ? false, uhd }: diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index c6defb245c7..7eb3afd437a 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: +{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: python27Packages.buildPythonApplication rec { pname = "eggnog-mapper"; diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index 55a9612c62d..082a779e12b 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, cmake, python3 }: +{ lib, fetchurl, python3Packages, cmake, python3 }: let pythonPackages = python3Packages; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index 454843e2f32..b2cefefb5cb 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonPackage rec { pname = "poretools"; diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix index b70ac29e38f..cb606a6b346 100644 --- a/pkgs/applications/science/biology/tebreak/default.nix +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa +{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa , samtools, findutils, python }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index cbe73bb7edc..f5e21db4b55 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, stdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake +{ clangStdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 47498690122..2df8b0e6d47 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, makeDesktopItem +{ lib, fetchurl, fetchFromGitHub, makeDesktopItem , python3, python3Packages , glew, glm, freeglut, libpng, libxml2, tk, freetype, msgpack }: diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 14c654bd697..6a9a491af1e 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: mkDerivation rec { pname = "caneda"; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index b25f76800e8..79c01d3ec71 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkg-config +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config , qtbase, qtsvg, qttools, qtserialport, boost, libgit2 }: diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index 5118795978d..38039f61fda 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, callPackage, buildPackages , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, lib, stdenv, stm, transformers +, parallel-io, parsec, lib, stm, transformers }: let z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix index 96e216417df..f0c8dd24904 100644 --- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix +++ b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix @@ -1,7 +1,7 @@ { mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random -, lib, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , template-haskell, time, z3 }: mkDerivation { diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix index 3574954c376..a20ccea16dc 100644 --- a/pkgs/applications/science/logic/petrinizer/z3.nix +++ b/pkgs/applications/science/logic/petrinizer/z3.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchpatch -, base, containers, gomp, hspec, QuickCheck, lib, stdenv +, base, containers, gomp, hspec, QuickCheck, lib , transformers, z3 }: mkDerivation { diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 4bfd4b9421f..50d0aa6f9d1 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, qt5 }: +{ lib, python3Packages, fetchFromGitHub, qt5 }: python3Packages.buildPythonApplication rec { pname = "labelImg"; version = "1.8.3"; diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index 7271b6d8755..ec3891667c5 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, ncurses }: +{ lib, python3, fetchFromGitHub, ncurses }: with python3.pkgs; buildPythonApplication rec { pname = "almonds"; diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index cc8c3514a0b..9d56ac70d92 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, lib, stdenv +, lib , mkDerivation , SDL2 , libGL diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 5670969e7a2..4f0d1eae487 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: +{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: rustPlatform.buildRustPackage rec { version = "0.5.1"; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 6b3c405a9ac..edf26f7ec23 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "snakemake"; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 77a052a4f1d..62cb6707c1b 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3 , glibcLocales diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 80698c56cde..433e5c30618 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3 , keybinder3 diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 393edc57dcc..47d31d6c18f 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: +{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: buildPythonApplication rec { pname = "bump2version"; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index b038e98e2db..4bfe06fee74 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghorg"; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index c6fbf3b9569..f56ce386e42 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index 1908b753924..4d57820c84e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: +{ lib, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: buildPythonApplication rec { pname = "git-annex-metadata-gui"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 95e583585f1..6d3b6554733 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "git-annex-remote-b2"; diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index ba4cd42d29d..33580712932 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-appraise-unstable"; diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index ec832866c71..5f84d423573 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, python3Packages, lib, stdenv, git, graphviz }: +{ fetchFromGitHub, python3Packages, lib, git, graphviz }: python3Packages.buildPythonApplication rec { pname = "git-big-picture"; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 9ca5c707b5c..7a24fe8e035 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-bug"; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index e7e0e009d11..5e105ad9dd3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 216a1035c72..4dc9c4f8453 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index dd4e6e011a6..69689a49a92 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages +{ lib, fetchFromGitHub, python3Packages , asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix index 77e07743616..85a84103118 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "git-vanity-hash"; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index dc853be6772..25f7e95d184 100644 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitbatch-unstable"; diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix index e2aaafea202..3d429b7c561 100644 --- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub , pkg-config diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index 6f5ce3358a3..1fa2ebc6f74 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildEnv, git, fetchFromGitHub +{ lib, buildEnv, git, fetchFromGitHub , gitwebTheme ? false }: let diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index 04103465189..e43c602d6d9 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline +{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline , cmake }: let version = "0.3.2"; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 4b189c55c8a..e0d7e46d22a 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: buildGoPackage rec { pname = "hub"; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index ce749308843..18f2e5ad487 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: # Currently `buildGo114Module` is passed as `buildGoModule` from # `../default.nix`. Please remove the fixed 1.14 once a new release has been diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 5feb71c7931..1821dba0f00 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }: +{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }: buildPythonApplication rec { pname = "pass-git-helper"; diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index 69062d305b7..1e65834f519 100644 --- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "scmpuff"; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 3a37c798a08..4ee92c1d5e6 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }: +{ lib, python3Packages, fetchFromGitHub, git, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "stgit"; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index 3b906e4dc2e..5dc75ce4d70 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "git-crecord"; diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 3c758908cd4..f72f5190750 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-lfs"; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 57a40de9d4a..06a2bb48989 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, git }: +{ lib, fetchurl, pythonPackages, git }: pythonPackages.buildPythonApplication rec { pname = "git-up"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 68b3a3e9099..f2d258ea1af 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchurl, makeWrapper +{ lib, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 68dd3c190be..384f5d0f01f 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, python2Packages}: +{ lib, fetchzip, python2Packages}: python2Packages.buildPythonApplication rec { pname = "gitinspector"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index acfd91be331..d61c97f9bb1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby +{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index d1b5958c751..a1a9df57f04 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, buildGoModule, ruby }: +{ lib, fetchFromGitLab, buildGoModule, ruby }: buildGoModule rec { pname = "gitlab-shell"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b38485716d7..883753616c9 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, git, buildGoModule }: +{ lib, fetchFromGitLab, git, buildGoModule }: buildGoModule rec { pname = "gitlab-workhorse"; diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index e53da902e13..310158e3eea 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, python, lib, stdenv }: +{ fetchFromGitHub, python, lib }: with python.pkgs; buildPythonApplication rec { diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index fed2fd9ea33..c0b0021f8cb 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper +{ lib, buildGoModule, fetchFromGitHub, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 4f94e2926c4..268098b2d2d 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , gettext , itstool diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index ba1f3bbb93b..56d3531f721 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , buildPythonPackage -, lib, stdenv +, lib , isPy27 }: diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index d7ad9060879..b7b6d62e4b4 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "peru"; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 200d1d5384f..3e89fe0a4dc 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , srht, redis, celery, pyyaml, markdown }: diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index bcc47920ebe..69f8a7d4e45 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchNodeModules, buildPythonPackage +{ lib, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client , celery, alembic, importlib-metadata, mistletoe diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index c7c11cafc8b..ea3f58e3890 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pyyaml, PyGithub }: diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 3ef49b79664..8966cbe0800 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , srht, minio, pygit2, scmsrht }: diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index d0e14090846..fae311831f2 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchhg, buildPythonPackage +{ lib, fetchhg, buildPythonPackage , python , srht, hglib, scmsrht, unidiff }: diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 8ea4961e7d4..99b5663a9b8 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht }: diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index a0b52a2d564..25d22dede35 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, asyncpg, aiosmtpd, pygit2, emailthreads }: diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 26939d2bebe..24a31a3ef17 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pygit2 }: diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index b6622d97487..d07bd29357a 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index eaec8b710dd..12747f98103 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, pyyaml }: diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 6e8b03835bc..615716d03af 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , srht, redis, pyyaml, buildsrht , writeText }: diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 357dcd4d2e2..85ae3b2cf14 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, buildPythonPackage +{ lib, fetchgit, buildPythonPackage , python , srht, redis, alembic, pystache , pytest, factory_boy, writeText }: diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index c1701dd5174..6db2450d136 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, ffmpeg_3 +{ lib, fetchurl, makeDesktopItem, ffmpeg_3 , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 4b1b7ae0b60..6a4d0dc1b8d 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ lib, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix index a4ebbf159b8..15f5b60a09a 100644 --- a/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/pkgs/applications/video/electronplayer/electronplayer.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, stdenv, fetchurl }: +{ appimageTools, lib, fetchurl }: let pname = "electronplayer"; version = "2.0.8"; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index fe06e9431f9..6dc42a47685 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, callPackage +{ lib, buildPythonApplication, fetchFromGitHub, callPackage , mpv, python-mpv-jsonipc, jellyfin-apiclient-python , pillow, tkinter, pystray, jinja2, pywebview }: diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index e6e971ad438..35b7d173257 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection +{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection , gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio , fetchpatch }: diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 6bec8f9c891..80a36df3de7 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }: +{ lib, makeWrapper, buildEnv, kodi, plugins }: let drvName = builtins.parseDrvName kodi.name; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 29676abb755..cec6468c43b 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , autoPatchelfHook diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index a58c32dc563..236aec2ee56 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 1b2af7614ab..e388d5a67fe 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchurl , pkg-config diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index e690c507024..e7a735f167c 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation +{ lib, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras , libvdpau, SDL2, mpv, libGL }: let diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 7738dd99d21..d0904790a9e 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: +{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: buildPythonApplication rec { pname = "plex-mpv-shim"; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index bf54c0a2d6c..df42bbec156 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ lib, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index b05fa113a30..d0f41413570 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: mkDerivation rec { pname = "QMediathekView"; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index ade4b61931b..d580d98a6c1 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch , mkDerivation diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 3bd48019d0d..12525da35c4 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , gdk-pixbuf , gobject-introspection diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 06e91218cac..598a162f399 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation +{ lib, fetchFromGitHub, mkDerivation , pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index d31523e946a..2d865f41818 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib, stdenv +{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib }: mkDerivation rec { diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index f7b7c99b554..2283b45aee4 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cntr"; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 388cf328ff5..99505371507 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , btrfs-progs , buildGoModule , fetchFromGitHub diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 3dabcf57daf..e4e7a204934 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder +{ lib, buildPythonApplication, fetchPypi, pythonOlder , installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 6c1ef95cd6f..59c59426830 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub , makeWrapper diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 9eb03508572..84019395853 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docker-buildx"; diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix index f41862c0dd1..96722fe393f 100644 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "distribution"; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 7fd7cda81e2..59fc80eefbf 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "docker-proxy-${rev}"; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 41a09315333..390f3049c02 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "amazon-ecs-agent"; diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index 0b5fc5dac52..ac531b36dd2 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "firectl"; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 2d423911c99..fd001d598ad 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildBazelPackage , fetchFromGitHub , cacert diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 00dffc385a1..3a5f26bfcc8 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: +{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: mkDerivation rec { pname = "qtemu"; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 6961dcf7b89..24b71b46165 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -1,5 +1,4 @@ -{stdenv -, lib +{ lib , fetchurl , util-linux , gpgme diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 8fe9caf0e57..11ddaff8d3b 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, intltool, file +{ lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3 diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 2f9882dee9b..bc9003e128a 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, fetchpatch, fetchgit +{ lib, callPackage, fetchurl, fetchpatch, fetchgit , ocaml-ng , withInternalQemu ? true , withInternalTraditionalQemu ? true diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 55e3b12c3b7..5ff263dc8ff 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -1,5 +1,5 @@ { callPackage -, stdenv + }: # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index f0bb26f43e2..5f107337ee4 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "btops"; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 1724a2c9824..d419b0ebe3a 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg +{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils , enableNetwork ? true, dnsutils, iproute, wirelesstools }: diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 52322d8e194..1a11d40e3df 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, i3, autoreconfHook }: +{ fetchurl, lib, i3, autoreconfHook }: i3.overrideAttrs (oldAttrs : rec { diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 404e7b41f55..bddaab61578 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , libpulseaudio , libnotify diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index b9dbe6136b4..be7e88a2501 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , pkg-config diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index e7fd87aaf3b..d0055ef6365 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index db6ec29d9e9..9169cfc3817 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform +{ lib, fetchFromGitHub, rustPlatform , xorg, python3, pkg-config, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 712e9ab22c7..cdef71c965e 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: +{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: let rpath = lib.makeLibraryPath [ libXinerama libX11 ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 709a5b14736..21059c25afb 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: let cairocffi-xcffib = python37Packages.cairocffi.override { withXcffib = true; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 0a80ce70e03..319023eb2e5 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , sway-unwrapped , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 170c25dffe2..1613e9dea24 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , bash , binutils-unwrapped , coreutils diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index b40569a479b..9a9e5a9ce10 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }: +{ lib, callPackage, runCommandLocal, writeShellScriptBin, coreutils, bubblewrap }: args @ { name diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix index 396c971b2f0..9a36b44a270 100644 --- a/pkgs/build-support/emacs/trivial.nix +++ b/pkgs/build-support/emacs/trivial.nix @@ -1,6 +1,6 @@ # trivial builder for Emacs packages -{ lib, stdenv, texinfo, ... }@envargs: +{ lib, texinfo, ... }@envargs: with lib; diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix index 9fd813bfa57..e8b2403d8f3 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix index 869ba637429..0fbbc078efc 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -1,4 +1,4 @@ -pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +pkgargs@{ lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/pkgs/build-support/plugins.nix b/pkgs/build-support/plugins.nix index 1ed74851597..31b478c6c0d 100644 --- a/pkgs/build-support/plugins.nix +++ b/pkgs/build-support/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv }: +{ lib }: # helper functions for packaging programs with plugin systems { diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index 94cd33b9a26..d315c1027ab 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -1,5 +1,4 @@ -{ stdenv -, writeShellScript +{ writeShellScript , coreutils , git , nix diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index a6c0b1f4918..8c806b87d4b 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config , qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index e7d97b77707..c410826b2fb 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, fetchFromGitHub }: fetchFromGitHub rec { rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 546c7d905a7..d5c5d0e000a 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "5.2"; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index 2e4cfc8f05b..e226c351a33 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "fira-code-symbols-20160811"; diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 37f285b5552..2aef2fc4b05 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "fira-mono-3.206"; diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index e55ae0bcf11..8bdbc2d4c4f 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl } : +{ lib, fetchurl } : let major = "3"; diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 056cd621394..ed17dfc9054 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, fetchgit }: let version = "2017-03-30"; diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index a8df441d999..457cb0d03c9 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchzip}: +{lib, fetchzip}: let version = "3.5"; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index eecab47c087..6b1cd370241 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-mono"; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 826b8887365..d6b783ebe4c 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-sans"; diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index bbff974e107..2b5eeafd09b 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { name = "paratype-pt-serif"; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index bcf6cefb8d6..95e4ce2a52a 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let pname = "ttf-bitstream-vera"; version = "1.10"; diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix index 69579289442..bf52d07c52e 100644 --- a/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "2020-11-14"; in diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index b71ef7c99ec..20b5b673ccf 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, cabextract }: +{ lib, fetchzip, cabextract }: fetchzip { name = "vista-fonts-1"; diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 1936bd6627a..421054fa17f 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "20200729"; diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index dc942868250..77b67e48f92 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let version = "9"; diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index 60ff492330d..b91afb08f60 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , fetchurl , symlinkJoin -, lib }: let diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 26d9be6d904..832a534e5da 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , runCommand , nixos-artwork , glib diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 2338c834d1f..efcd20457b3 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, lib, stdenv +, lib , gobject-introspection , meson , ninja diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 550f3f31d0b..2f8163adc72 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , pkg-config , gnome3 diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index fc0ee5d38ff..be456071e41 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , meson , ninja , gettext diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 26d7593038b..2b84442620d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , gettext , meson diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix index 05d80997b76..d0f09bbfae2 100644 --- a/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: mkDerivation rec { pname = "lumina-calculator"; diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix index 8d975c749d6..679dfa65b5a 100644 --- a/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: mkDerivation rec { pname = "lumina-pdf"; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 4daaf15534c..d31f16e235a 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , fluxbox diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 316a72a09c7..ce97bc416e6 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , intltool diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index cee4261a77d..4d893cd2e74 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 40ac23ca7f1..bfe95e0be46 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , runCommand , mutter , elementary-default-settings diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 85f823221b7..e47f1dea3f6 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, file, which, intltool, gobject-introspection, +{ lib, fetchurl, file, which, intltool, gobject-introspection, findutils, xdg_utils, dconf, gtk3, python3Packages, wrapGAppsHook }: diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index aa14c878b12..304b9d9076d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -1,5 +1,5 @@ { mkXfceDerivation -, lib, stdenv +, lib , intltool , libxfce4ui , xfce4-panel diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 985b067a02f..c46b5a0fd1b 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkXfceDerivation , gtk3 , thunar diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index c536ed8c2c0..822cfb0e361 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python2Packages, picocom +{ lib, fetchurl, python2Packages, picocom , avrdude, arduino-core }: python2Packages.buildPythonApplication rec { diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix index e0d9dfc4288..1ebe3760ec8 100644 --- a/pkgs/development/beam-modules/build-hex.nix +++ b/pkgs/development/beam-modules/build-hex.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildRebar3, fetchHex }: +{ lib, buildRebar3, fetchHex }: { name, version, sha256 , builder ? buildRebar3 diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 4f312129b38..570155e4d1a 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, erlang }: +{ lib, pkgs, erlang }: let inherit (lib) makeExtensible; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 7ae2e0e2606..1b021cf9347 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv }: +{ pkgs, lib }: rec { diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index 0299c179775..b0a14534b08 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }: +{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }: haskellPackages.mkDerivation rec { diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index 2775666f14c..d2f2805ed7f 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -1,4 +1,4 @@ -{ stdenv, eggDerivation, fetchurl, chickenEggs }: +{ eggDerivation, fetchurl, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/pkgs/development/compilers/chicken/4/eggs.nix index 6e6f104f8a0..8c96caca262 100644 --- a/pkgs/development/compilers/chicken/4/eggs.nix +++ b/pkgs/development/compilers/chicken/4/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 69e8d9e62c3..62b634eb637 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, eggDerivation, fetchFromGitHub, chickenEggs }: +{ lib, eggDerivation, fetchFromGitHub, chickenEggs }: # Note: This mostly reimplements the default.nix already contained in # the tarball. Is there a nicer way than duplicating code? diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index 3c4ae74c1e6..1c1377350d2 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 71386e00ef1..b2f655d4f1c 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary , bytestring, cmark, containers, directory, filepath, free, HUnit , indents, json, mtl, optparse-applicative, parsec, process -, QuickCheck, quickcheck-io, split, lib, stdenv, tasty, tasty-golden +, QuickCheck, quickcheck-io, split, lib, tasty, tasty-golden , tasty-hunit, tasty-quickcheck, text }: mkDerivation { diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix index cd13eb4de4f..cf0ba2303e1 100644 --- a/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -2,7 +2,7 @@ , bytestring, Cabal, cmark, containers, directory, elm-format , fetchgit, filepath, free, HUnit, indents, json, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io -, split, lib, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, split, lib, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , text }: mkDerivation { diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index edb2ed6ed7a..c012d59d8ae 100644 --- a/pkgs/development/compilers/elm/packages/elm.nix +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -3,7 +3,7 @@ , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP , http-client, http-client-tls, http-types, language-glsl, mtl , network, parsec, process, raw-strings-qq, scientific, SHA -, snap-core, snap-server, lib, stdenv, template-haskell, time +, snap-core, snap-server, lib, template-haskell, time , unordered-containers, utf8-string, vector, zip-archive }: mkDerivation { diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/pkgs/development/compilers/elm/packages/elmi-to-json.nix index 6788fce6a99..3362ce5cc7a 100644 --- a/pkgs/development/compilers/elm/packages/elmi-to-json.nix +++ b/pkgs/development/compilers/elm/packages/elmi-to-json.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, binary, bytestring, containers , directory, fetchgit, filepath, ghc-prim, hpack -, optparse-applicative, lib, stdenv, text, unliftio +, optparse-applicative, lib, text, unliftio , unordered-containers }: mkDerivation { diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix index 80f3c08d9e3..d196e8d0fbf 100644 --- a/pkgs/development/compilers/elm/packages/indents.nix +++ b/pkgs/development/compilers/elm/packages/indents.nix @@ -1,4 +1,4 @@ -{ mkDerivation, base, concatenative, mtl, parsec, lib, stdenv }: +{ mkDerivation, base, concatenative, mtl, parsec, lib }: mkDerivation { pname = "indents"; version = "0.3.3"; diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix index 82c37bd8617..54a60b50372 100644 --- a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix +++ b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix @@ -1,7 +1,7 @@ { mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, deepseq, directory, dlist, fetchgit, ghc-prim , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck -, quickcheck-unicode, random, scientific, stdenv, test-framework +, quickcheck-unicode, random, scientific, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time , transformers, unordered-containers, vector }: diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index cabdbd9dcc0..688ca15177a 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, clang, +{ lib, git, clang, fetchFromGitHub, requireFile, openssl, xz, gnutar, automake, autoconf, libtool, clangStdenv } : diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 2edf93b7fc0..3b5465ac9c3 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, openjdk11, fetchFromGitHub, jetbrains }: +{ lib, openjdk11, fetchFromGitHub, jetbrains }: openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix index 34d8f98970e..454156c2d28 100644 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -1,4 +1,6 @@ -{lib, stdenv, fetchurl}: stdenv.mkDerivation { +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { name = "meta-build-env-0.1"; src = fetchurl { url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz"; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index d3de5cad2f6..10067644813 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, lib, stdenv, fetchFromGitHub, cmake, zlib, openexr, +{ clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr, openimageio, llvm, boost165, flex, bison, partio, pugixml, util-linux, python }: diff --git a/pkgs/development/compilers/pakcs/curry-base.nix b/pkgs/development/compilers/pakcs/curry-base.nix index 660a4f2de40..c461d2caa93 100644 --- a/pkgs/development/compilers/pakcs/curry-base.nix +++ b/pkgs/development/compilers/pakcs/curry-base.nix @@ -1,5 +1,5 @@ { mkDerivation, base, Cabal, containers, directory, extra, filepath -, mtl, parsec, pretty, lib, stdenv, time, transformers +, mtl, parsec, pretty, lib, time, transformers }: mkDerivation { pname = "curry-base"; diff --git a/pkgs/development/compilers/pakcs/curry-frontend.nix b/pkgs/development/compilers/pakcs/curry-frontend.nix index 8fd1645ee70..88e88487594 100644 --- a/pkgs/development/compilers/pakcs/curry-frontend.nix +++ b/pkgs/development/compilers/pakcs/curry-frontend.nix @@ -1,6 +1,6 @@ { mkDerivation, base, bytestring, Cabal, containers, curry-base , directory, extra, file-embed, filepath, mtl, network-uri, pretty -, process, set-extra, lib, stdenv, template-haskell, transformers +, process, set-extra, lib, template-haskell, transformers }: mkDerivation { pname = "curry-frontend"; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 79702c01bee..81ee04edf08 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, writeText, asttokens +{ lib, buildPythonPackage, fetchPypi, writeText, asttokens , pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytestrunner }: diff --git a/pkgs/development/idris-modules/tfrandom.nix b/pkgs/development/idris-modules/tfrandom.nix index 5c631950312..8249259075c 100644 --- a/pkgs/development/idris-modules/tfrandom.nix +++ b/pkgs/development/idris-modules/tfrandom.nix @@ -1,8 +1,8 @@ -{ stdenv +{ lib , build-idris-package , fetchFromGitHub -, lib }: + build-idris-package { name = "tf-random"; version = "2020-01-15"; diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index 72b9067b691..080cbe2778a 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -1,6 +1,6 @@ # Build a version of idris with a set of packages visible # packages: The packages visible to idris -{ stdenv, lib, idris, symlinkJoin, makeWrapper }: packages: +{ lib, idris, symlinkJoin, makeWrapper }: packages: let paths = lib.closePropagation packages; in diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 6bfef26b4dd..e39bf915cfc 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "hy"; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 3d36dde8e0f..004d2732f3a 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "joker"; diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index d6090152d15..895054fac46 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: +{ lib, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: { baseName ? "lfe" , version diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index 865d8fde9ea..da95b5a8964 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perl, buildEnv, makeWrapper +{ lib, perl, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 668adf2c44a..a9c71c6fcf7 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let version = "0.9.5.1.1"; in diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 2c4c74baecf..12429c05fe6 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let version = "0.9.6.4"; in diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index cb895d9c672..432f972b0ff 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -5,7 +5,7 @@ with builtins; with lib; let - mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; }; + mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs ; }; in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index c4b02071ec0..2cb9ab001c2 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mavenbuild, fetchMaven }: +{ lib, pkgs, mavenbuild, fetchMaven }: with pkgs.javaPackages; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index e0087e857a4..eac127b6dcc 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mavenbuild }: +{ lib, pkgs, mavenbuild }: with pkgs.javaPackages; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index 9019e3ba28e..d966a75bb9d 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs }: +{ lib, pkgs }: with lib; with pkgs.javaPackages; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 79bb783cc9f..21883acd195 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub }: +{ lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { version = "compat-2.6.1"; diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 7ec892bfe02..ce4deb5b519 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, mkDerivation, standard-library }: +{ fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { version = "0.1"; diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 2ebb3f66ed0..1383cff9e55 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub }: +{ lib, mkDerivation, fetchFromGitHub }: mkDerivation (rec { version = "1.5.0"; diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 1d8dc03bbde..c0b0287d897 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }: mkDerivation rec { pname = "standard-library"; diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index c9fc96b3251..9ae1cce684a 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, appstream, qtbase, qttools }: +{ mkDerivation, appstream, qtbase, qttools }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index fb65e49c500..0f6e9a35b6e 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.59.0"; diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix index 646f4652f77..4bc7a1cc732 100644 --- a/pkgs/development/libraries/boost/1.60.nix +++ b/pkgs/development/libraries/boost/1.60.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.60.0"; diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 922c09ba7fe..764f38d5b74 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.65.1"; diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index 0a99717a799..af61aa51944 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // { version = "1.66.0"; diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix index 4d98172c6d0..920dd9a300b 100644 --- a/pkgs/development/libraries/boost/1.68.nix +++ b/pkgs/development/libraries/boost/1.68.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.68.0"; diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix index 95c4aa854a4..7292356ecd1 100644 --- a/pkgs/development/libraries/boost/1.69.nix +++ b/pkgs/development/libraries/boost/1.69.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.69.0"; diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix index 45a8bdb9318..3b898cfc0ae 100644 --- a/pkgs/development/libraries/boost/1.70.nix +++ b/pkgs/development/libraries/boost/1.70.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.70.0"; diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix index 7b128e25bb6..bec741dd88a 100644 --- a/pkgs/development/libraries/boost/1.71.nix +++ b/pkgs/development/libraries/boost/1.71.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.71.0"; diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix index 680afe8bcb8..97dad9b6c8a 100644 --- a/pkgs/development/libraries/boost/1.72.nix +++ b/pkgs/development/libraries/boost/1.72.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.72.0"; diff --git a/pkgs/development/libraries/boost/1.73.nix b/pkgs/development/libraries/boost/1.73.nix index 99a5486f197..289bea197c3 100644 --- a/pkgs/development/libraries/boost/1.73.nix +++ b/pkgs/development/libraries/boost/1.73.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.73.0"; diff --git a/pkgs/development/libraries/boost/1.74.nix b/pkgs/development/libraries/boost/1.74.nix index 35b4013dcb3..a181ed94c26 100644 --- a/pkgs/development/libraries/boost/1.74.nix +++ b/pkgs/development/libraries/boost/1.74.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.74.0"; diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix index 9912032c777..ff1073bd026 100644 --- a/pkgs/development/libraries/boost/1.75.nix +++ b/pkgs/development/libraries/boost/1.75.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.75.0"; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 1a828cc451d..3469cda3fc7 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonApplication, fetchFromGitHub }: buildPythonApplication rec { pname = "cxxtest"; diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 629fdba5673..be341d588c1 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchpatch +{ callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia , ... diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 7e3941d3f37..2cc409fc037 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchpatch +{ callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox , ... diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index 1695d11cb25..5a107985177 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, antBuild, fetchgit, perl }: +{ lib, antBuild, fetchgit, perl }: let version = "4.11"; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index df8db3ac9f8..0bf654ee963 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, collectd }: +{ lib, collectd }: with lib; collectd.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix index 1cd04b0b277..c0321e327c5 100644 --- a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix +++ b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.70"; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix index 74bd6cce42c..7e60f8c7272 100644 --- a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix +++ b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.71"; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix index 8eeb94cdc29..4c695218184 100644 --- a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix +++ b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix ( rec { version = "0.9.72"; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 3b57d0c2f7a..953eee3b8bd 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: fetchzip { url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz"; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 7004a5e11c0..7434383e165 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , SDL , ffmpeg diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 7bf0cb2c5fb..e3abc6e5d62 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + , symlinkJoin }: diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index 4d7c682f022..f2e984c8c81 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + }: buildGoModule rec { diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix index 81e72036694..fd06b49604a 100644 --- a/pkgs/development/libraries/prototypejs/default.nix +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ... }: +{ lib, fetchurl, ... }: let version = "1.7.3.0"; in fetchurl { diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix index 57784c3a502..aa2522a5dad 100644 --- a/pkgs/development/libraries/psol/generic.nix +++ b/pkgs/development/libraries/psol/generic.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, stdenv }: +{ fetchzip, lib }: { version, sha256 }: { inherit version; } // fetchzip { inherit sha256; diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 6639e4c8d69..5e7ccf70204 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qtModule, qtbase }: +{ lib, qtModule, qtbase }: qtModule { name = "qtmacextras"; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 84d7f46a2b2..4587bf46162 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: mkDerivation { name = "qtstyleplugins-2017-03-11"; diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index c2beda45ab3..e3c8ea00f44 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, unzip, ... }: + +stdenv.mkDerivation rec { pname = "scriptaculous"; version = "1.9.0"; diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index 7fb6b1adb5a..e617ba58e8b 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "smarty-i18n"; version = "1.0"; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index 2070a3bab79..29f640dedfc 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "smarty3"; version = "3.1.36"; diff --git a/pkgs/development/libraries/stellarsolver/default.nix b/pkgs/development/libraries/stellarsolver/default.nix index 8badf60d942..f55c72bd209 100644 --- a/pkgs/development/libraries/stellarsolver/default.nix +++ b/pkgs/development/libraries/stellarsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, cfitsio, gsl, wcslib, withTester ? false }: mkDerivation rec { diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index 76b50a10907..f9ebed19752 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromBitbucket +{ lib, mkDerivation, fetchFromBitbucket , python3, vapoursynth , qmake, qtbase, qtwebsockets }: diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 8ec44d17016..85f39228584 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, lib, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix index 55b070a9f77..2770e74a698 100644 --- a/pkgs/development/misc/haskell/hasura/ci-info/default.nix +++ b/pkgs/development/misc/haskell/hasura/ci-info/default.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable -, hpack, lib, stdenv, template-haskell, text, th-lift-instances +, hpack, lib, template-haskell, text, th-lift-instances , unordered-containers }: mkDerivation { diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix index 3cf840c15e1..9e7d448e4c1 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -13,7 +13,7 @@ , optparse-applicative, pem, pg-client, postgresql-binary , postgresql-libpq, process, profunctors, psqueues, QuickCheck , regex-tdfa, safe, scientific, semver, shakespeare, split -, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text +, Spock-core, lib, stm, stm-containers, template-haskell, text , text-builder, text-conversions, th-lift-instances, these, time , transformers, transformers-base, unix, unordered-containers , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix index 82314a7485b..dbd3edf0064 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, attoparsec, base, bytestring, containers , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter -, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text +, protolude, regex-tdfa, scientific, lib, template-haskell, text , text-builder, th-lift-instances, unordered-containers, vector }: mkDerivation { diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix index aa780abd8e9..bccb3f6eda3 100644 --- a/pkgs/development/misc/haskell/hasura/pg-client/default.nix +++ b/pkgs/development/misc/haskell/hasura/pg-client/default.nix @@ -2,7 +2,7 @@ , criterion, fetchgit, file-embed, hashable, hashtables, hasql , hasql-pool, hasql-transaction, monad-control, mtl , postgresql-binary, postgresql-libpq, resource-pool, retry -, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift +, scientific, lib, template-haskell, text, text-builder, th-lift , th-lift-instances, time, transformers-base, uuid, vector }: mkDerivation { diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 74b5ca09d2a..fb518279d00 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 3fd7877d2bb..053ab412f88 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildOcamlJane, type_conv}: +{lib, buildOcamlJane, type_conv}: buildOcamlJane { name = "variantslib"; diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index d1ebe95be89..66055dca66e 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, +{ lib, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, rdkafka, zlib }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 34e14959e32..afe9e7d39b5 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: +{ lib, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: buildDunePackage rec { pname = "parany"; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index d3d6097b446..b284f7ef5eb 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving +{ lib, buildDunePackage, fetchFromGitHub, ppx_deriving , alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index b46386b1666..828df66b41d 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "wtf8"; diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index c0fc8f28108..2ef7b90842e 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildPerlPackage, lib, stdenv }: +{ fetchFromGitHub, buildPerlPackage, lib }: buildPerlPackage { pname = "MNI-Perllib"; diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 3c555ca37ab..5efac53f837 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang +{ lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang , DBDmysql, DBI, IOSocketSSL, TermReadKey }: diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index 29bcc9bab25..d6945083f63 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -1,4 +1,4 @@ -{buildPerlPackage, lib, stdenv, fetchurl, DBDmysql}: +{buildPerlPackage, lib, fetchurl, DBDmysql}: buildPerlPackage { pname = "maatkit"; diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 2b06fcdce7d..74884f36f03 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: buildPythonPackage rec { pname = "FormEncode"; diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix index be4bb9e31d3..486f8a4556f 100644 --- a/pkgs/development/python-modules/HTSeq/default.nix +++ b/pkgs/development/python-modules/HTSeq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: buildPythonPackage rec { version = "0.12.4"; pname = "HTSeq"; diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix index f142c245922..05587ef0740 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/IPy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "IPy"; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 247b7f0332f..5a4741a730a 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: +{ lib, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: let diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index ebedb3c6969..8c34e75139f 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , capstone}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index d7ad28c0133..e180f0cea33 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , imagemagick7Big diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 28515e6f602..6da500413f0 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix index cf6976fa6c1..de3ec6fa7f0 100644 --- a/pkgs/development/python-modules/aadict/default.nix +++ b/pkgs/development/python-modules/aadict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 5350443eeaa..0b9f1457178 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pillow }: +{ lib, buildPythonPackage, fetchPypi, pillow }: buildPythonPackage rec { pname = "aafigure"; diff --git a/pkgs/development/python-modules/acebinf/default.nix b/pkgs/development/python-modules/acebinf/default.nix index f8134aaf5b3..7889e007d83 100644 --- a/pkgs/development/python-modules/acebinf/default.nix +++ b/pkgs/development/python-modules/acebinf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyvcf diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 75408244e66..c979104914d 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse , openssl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index ca47018f56f..92917f6ea95 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, docutils, blockdiag, reportlab }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index f7e973c8f69..55dc21240ec 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, pyjwt, dateutil }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index f21d8f4195a..4f30eefbf90 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: +{ lib, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "aenum"; diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 099fb1701cb..0299a94ebb0 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: +{ lib, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: buildPythonPackage rec { pname = "agate-dbf"; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 566951ea71d..29bbfa81ed2 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: +{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 30821986539..2e7c9c2401c 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 4ba4bd59af2..1adc6f81524 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , isPy27, isPyPy, python, pycares, typing, trollius }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index 4bdd2b1327c..0d6796706cb 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , eventlet diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 1c5ce1e2fae..91d83e93cbd 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 94f503fe2cc..fe48ba0e1e1 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pkgs, async-timeout, hiredis, isPyPy, isPy27 }: diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index d73ae2b35df..fe3943c25b1 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , netifaces diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 0dd135e139f..926b5ed7efe 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ajpy"; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index b4cc69e555b..72eda332f95 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pygments }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index b563a80447f..10438d54081 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb +{ lib, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb , pyopenssl, nose, isPy3k, pythonOlder, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 142c6d1c416..5a4ef5e0bc6 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, dateutil }: diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index dd2d82578ea..82783dd16bb 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk }: diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 19dd17ee3f0..e69503777d4 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, click, requests, requests-hawk, pytz, tabulate, pythonOlder }: diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 21c6aaff2fb..1f4617ce9c0 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k +{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme , service-identity , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index a3b515ebeca..37c1efd9c1b 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , entrypoints , glibcLocales , ipython diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index ed266c0db78..44dc739f1ca 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: buildPythonPackage rec { pname = "amazon_kclpy"; diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 32bcbb4589a..0589caf1e6a 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , setuptools_scm diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index b614ae453d2..be40465496c 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: buildPythonPackage rec { pname = "amqp"; diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index c7b4dc865bb..430065b7d1f 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "amqplib"; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 804402a4ca6..538cb11db13 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , dateutil, mock, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 0bd06084380..d5f24492c90 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , h5py diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 9c1b3abf980..0663fddd6fb 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: buildPythonPackage rec { pname = "anonip"; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 3d96061362e..99a419a60fa 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ansicolor"; diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index 7d6dd2127e6..fab91690ab2 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "ansicolors"; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index 6a3571960d0..ba0c06f536a 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "ansiconv"; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 604c37b42ba..10e2369e12e 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index bc47de37128..6f2c55d45cb 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy37, pyperclip }: buildPythonPackage rec { version = "0.2.6"; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index de74480765a..8933d4e91bc 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , sqlite, isPyPy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 0e2beb6a31e..bbe120ec14f 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index cb349484f27..9faf16037d0 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "args"; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 076fec8c56b..2bb950beb28 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , aria2, poetry, pytest, pytestcov, pytest_xdist, responses , asciimatics, loguru, requests, setuptools, websocket_client }: diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 7dbe3b98fca..d87f1ede3cc 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache , python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov , pytestCheckHook diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index ed5e441df97..c7839f05147 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six -, fetchFromGitHub, responses, lib, stdenv +, fetchFromGitHub, responses, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 2735bbf2f70..a141fc746f7 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }: +{ lib, buildPythonPackage, fetchFromGitHub, pyparsing }: buildPythonPackage rec { pname = "asn1ate"; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 4ea53e17eb0..8c97ef6750f 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: buildPythonPackage rec { pname = "astral"; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index c9001da5c70..b32df24f5bb 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , six diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index d3684ea5720..9271adeb617 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , cryptography , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl , openssl, openssh, pytestCheckHook }: diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 7bcb36d548d..0fccc943c8a 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: +{ lib, buildPythonPackage, fetchPypi, pytest, cffi }: buildPythonPackage rec { pname = "atomiclong"; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index e958b0f16d6..5335c044cd2 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "atomicwrites"; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 147d2e77deb..b576504588a 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , cython , datamodeldict , matplotlib diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 6b8b8dccef8..4802ea867b7 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , configparser diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 5c7514f9da6..cb87b9027f0 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: +{ lib, buildPythonPackage, fetchPypi, coverage, nose, six }: buildPythonPackage rec { pname = "attrdict"; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 3e6faae9af0..4fa14a60ff8 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index c3d0402d48d..196e573717b 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python }: +{ lib, fetchPypi, buildPythonPackage, python }: buildPythonPackage rec { pname = "authres"; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index fef97a7a6f4..0bdee21b69c 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, future }: +{ lib, buildPythonPackage, fetchPypi, numpy, future }: buildPythonPackage rec { pname = "autograd"; diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 7cd66dc2c3f..fdd935303d0 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Autologging"; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index fa395f119ee..20f54870e1f 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index afeaef40661..c748c0cb8c1 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales +{ lib, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales , toml }: diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 3e9a0e492d3..e0294246fb2 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: buildPythonPackage rec { pname = "avro-python3"; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 35cab724a86..5a38e86eee3 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: buildPythonPackage rec { pname = "avro"; diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index b600bc75c7a..f6ad9bf086c 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "avro3k"; diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 00882cb0827..47ca9859b5e 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }: +{ lib, buildPythonPackage, fetchPypi, unidecode, regex, python }: buildPythonPackage rec { pname = "awesome-slugify"; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index da43f6e5690..cd695132d7a 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook , requests, arrow, logfury, tqdm }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 5ac04429215..ba015f597ce 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "babelfish"; diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index 0df03754127..b1516d1abdb 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , isPy3k , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 5fe922b9046..52163abe8bc 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "backports.shutil_which"; diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index 5216149ddc2..6086178c959 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, future }: +{ lib, buildPythonPackage, fetchPypi, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index b3e231bcd05..39973e433ee 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index 08f98de79f2..a9950eb704f 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, mock }: buildPythonPackage rec { pname = "backports.unittest_mock"; diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index 9770fb45981..c04b88a3f32 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 59542e61c56..f07c5e90d51 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub +{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub , wheel, pytestCheckHook, pytestrunner }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index d2575afb77d..03abf67f86a 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: +{lib, buildPythonPackage, fetchFromGitHub, bap, requests}: buildPythonPackage rec { pname = "bap"; diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index a36727429ca..1e1da32f6c9 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: +{ lib, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: buildPythonPackage rec { pname = "base58"; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index c97548bdee8..2fadda388ba 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , numpy diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index 0ed3486272d..17d28c12914 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "batinfo"; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index b470d21b1be..6ebe9919ec9 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest, nose, glibcLocales , numpy, scipy, matplotlib, h5py }: diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix index 185fcb86b0b..29c267aa45f 100644 --- a/pkgs/development/python-modules/bcdoc/default.nix +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, six }: +{ lib, buildPythonPackage, fetchPypi, docutils, six }: buildPythonPackage rec { pname = "bcdoc"; diff --git a/pkgs/development/python-modules/bcrypt/3_1.nix b/pkgs/development/python-modules/bcrypt/3_1.nix index c70161cf28b..df57eb3cd0c 100644 --- a/pkgs/development/python-modules/bcrypt/3_1.nix +++ b/pkgs/development/python-modules/bcrypt/3_1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , isPyPy, cffi, pytest, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index e74b0934b30..cfd17262a2b 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder +{ lib, buildPythonPackage, isPyPy, fetchPypi, pythonOlder , cffi, pycparser, mock, pytest, py, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index fa97c7c97a9..e4a6a5f5625 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, bottle, chardet, dateutil , google_api_python_client, lxml, oauth2client , ply, python_magic, pytest, requests }: diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index a74f6c6f8f2..ffdb2f6f8f2 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage }: buildPythonPackage rec { pname = "beanstalkc"; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 555669da243..b00c03a09c1 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: +{ lib, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: buildPythonPackage rec { pname = "beautifulsoup4"; diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix index f38d4263c24..454a972f177 100644 --- a/pkgs/development/python-modules/bedup/default.nix +++ b/pkgs/development/python-modules/bedup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , btrfs-progs diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 6ee8b6499b5..d47c5d716a7 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, click-log, pure-pcapy3 , pyserial-asyncio, voluptuous, zigpy , asynctest, pytestCheckHook, pytest-asyncio }: diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index 555a0a48758..599ad71b241 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 424b8ef4ef3..459d3c51d7e 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , betamax, requests_toolbelt }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix index 3d3cad4d95b..0ddc9845bfa 100644 --- a/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , betamax, pyyaml }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 5e1469bfc52..5906a531f22 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "betamax"; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 4f8aa3565da..2d4eabf215e 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: buildPythonPackage rec { pname = "billiard"; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index c2f059dd93d..499d442c822 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , zlib diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix index 559661bbb4f..b874f1af525 100644 --- a/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , requests_oauthlib, nose, sh }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index 50075fe70fc..bb1fa1d6c17 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: buildPythonPackage rec { pname = "bitbucket-cli"; diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 49992c561f7..5643ea29bc2 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: buildPythonPackage rec { pname = "bitmath"; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index d6eaf31056f..ed67f2be5c5 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bitstring"; diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 2949ecbf6f9..ef599d89be2 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libev, python }: +{ lib, buildPythonPackage, fetchPypi, libev, python }: buildPythonPackage rec { pname = "bjoern"; diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index 536ad1f14b6..80aed4e6fef 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 06dc3217dc8..38390e8377e 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: buildPythonPackage rec { pname = "bleak"; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 7adacecc647..f0167625cf6 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six +{ lib, buildPythonPackage, fetchPypi, fetchpatch, six , wcwidth, pytest, mock, glibcLocales }: diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index 5263a92ec3d..00b7fd9a63d 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index e33ad162631..5591113ab0a 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "blinker"; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index eeb62e8fed3..2b8aeb2edcd 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index 505f01af5fe..d4dcb54c5cd 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchpatch , fetchPypi diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 94abc39fd28..fd97fa20648 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock +{ lib, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock , pyudev, six, libselinux, multipath-tools, lsof, util-linux }: diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 3a9704d71bc..b823b8711a5 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: +{ lib, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }: buildPythonPackage rec { pname = "block-io"; diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 5adc854d026..f5d8b93c481 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , setuptools, funcparserlib, pillow, webcolors, reportlab, docutils }: diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix index d833d20934d..11930050ba3 100644 --- a/pkgs/development/python-modules/bluepy/default.nix +++ b/pkgs/development/python-modules/bluepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkg-config diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 13e264340da..f4842981c4a 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "boltons"; diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 48bc53bbeed..f80a8deb9ab 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , spglib diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 213d69dd989..eeaf34a44eb 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "bottle"; diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix index 92ac90ab6d4..e6f6a390f37 100644 --- a/pkgs/development/python-modules/box2d/default.nix +++ b/pkgs/development/python-modules/box2d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , swig2 diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 108d8ec0c66..8a37ed0bd97 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , curtsies diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 9877a03a087..82459398ca7 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index f70f71c1a69..339e649c53a 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , aflplusplus diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 209565fa21b..8ac1b977f39 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pybluez }: buildPythonPackage { diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index ebb14a77b56..3d206c829e8 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: +{ lib, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }: buildPythonPackage rec { pname = "btchip-python"; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 471ba54215d..3da6852c54d 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , persistent diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 8ea93fe005e..adaf1f610e3 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 5e3b0b4e89f..33845368480 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 3d27384efe1..c59d2196d20 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix index 5324a43e1b0..a57e957efe6 100644 --- a/pkgs/development/python-modules/bugz/default.nix +++ b/pkgs/development/python-modules/bugz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index fc122ecd233..365f3654298 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pep8, coverage, logilab_common, requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index 0751b284a78..a9fe66a37ea 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "zc.buildout"; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 05f082c747b..7e94bd55b28 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six}: +{ lib, buildPythonPackage, fetchPypi, six}: buildPythonPackage rec { pname = "bumps"; diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index ce77085e4f7..2758ff5b418 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "bunch"; diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index c736eb577d4..f6c926cf419 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 53b13ddb568..ba9b9022ac8 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 503b546116e..154c67bb379 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cachelib"; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 6fd3f637875..56efa9a3485 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "cachetools"; diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix index bb5629cf4e5..3e1a67f8282 100644 --- a/pkgs/development/python-modules/cairosvg/1_x.nix +++ b/pkgs/development/python-modules/cairosvg/1_x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig +{ lib, buildPythonPackage, fetchFromGitHub, cairocffi, nose, fontconfig , cssselect2, defusedxml, pillow, tinycss2 }: # CairoSVG 2.x dropped support for Python 2 so offer CairoSVG 1.x as an diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 9d1c54651c2..53f3ebc0c08 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch +{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch , cairocffi, cssselect2, defusedxml, pillow, tinycss2 , pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 96af6f4bf78..4a4f56f5abf 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , frozendict, simplejson, six, isPy27 }: diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index e0a31829b05..b651a654d5e 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , twisted, whisper, txamqp, cachetools, urllib3 }: diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix index c2262decd31..a772535ad82 100644 --- a/pkgs/development/python-modules/carrot/default.nix +++ b/pkgs/development/python-modules/carrot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, amqplib, anyjson }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 5d1a7696516..3f95d9e22af 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, nose, unittest2, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 32cf844cf00..e1cb9f211bc 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder +{ lib, buildPythonPackage, fetchPypi, python, pythonOlder , cython , eventlet , futures diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index 85b1147c13a..9d29a013743 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "casttube"; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index c4cd89cab68..a9c5bae71f4 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix index f081511265f..cc3d8914ad2 100644 --- a/pkgs/development/python-modules/cbor/default.nix +++ b/pkgs/development/python-modules/cbor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cbor"; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index 96e75405ee3..e231624e40f 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }: buildPythonPackage rec { pname = "CCColUtils"; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 9133389f0ce..f021ea16b62 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "cement"; diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 08b7527c54c..cdf6519d325 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index 049e3ffdb5d..a3cde807076 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyopenssl diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 2000a4e0a3b..8b3a6afa9b3 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, pep8, nose }: buildPythonPackage rec { version = "0.8"; diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix index 3400b33635a..9f9d48d9017 100644 --- a/pkgs/development/python-modules/chai/default.nix +++ b/pkgs/development/python-modules/chai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chai"; diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index 3858fc44f23..4619bff2b04 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "chainmap"; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index a2ffcb9a023..fccfec53512 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 3f341f5527a..1e267aa5126 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , aioredis , asgiref , buildPythonPackage diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index c2836ef4faa..0f5e708d091 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, asgiref, django, daphne }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index bbc41df0cd8..65381d40268 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , pytest, pytestrunner, hypothesis }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 8a2c7488206..95bb9660d4c 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }: +{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }: buildPythonPackage rec { pname = "check-manifest"; diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix index ce70a2f459d..d34534e3eb8 100644 --- a/pkgs/development/python-modules/cjson/default.nix +++ b/pkgs/development/python-modules/cjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: buildPythonPackage rec { pname = "python-cjson"; diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index dd72f5705e7..eaf89948e8f 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , buildPythonPackage , click , ecdsa , hidapi -, lib , fetchPypi , pytest , pyaes diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index f4168d689d4..978d08051f7 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docopt, requests, pygments }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index 4b7611c092e..e410a37fcb4 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , sphinx diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 61a15428632..19fdac37615 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, buildPythonPackage, fetchPypi, isPy3k, click, jinja2, shellingham, six }: diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix index 8d3c3ba3e24..c4574072b4c 100644 --- a/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, click }: diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix index dbe4e33ca84..b17dc1a0c11 100644 --- a/pkgs/development/python-modules/click-help-colors/default.nix +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , click, pytest }: diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 4aa63dd4537..3145d4775e3 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, click }: +{ lib, buildPythonPackage, fetchPypi, click }: buildPythonPackage rec { pname = "click-log"; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index c2b25341e17..31ae00a348d 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, click, pytest }: diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 23adb12da65..ee8773999ff 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }: +{ lib, buildPythonPackage, fetchPypi, click, prompt_toolkit }: buildPythonPackage rec { pname = "click-repl"; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index e211b955ac8..d829f43dc0d 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: buildPythonPackage rec { pname = "clickclick"; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index f9d953d8536..b44f4e0ec17 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, pytest, glibcLocales }: diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 133fc0de55c..66e2d5f52f3 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index c9c3f5c905c..1418db69a39 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dateutil diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix index 75f5ba0b449..18782fb50bb 100644 --- a/pkgs/development/python-modules/closure-linter/default.nix +++ b/pkgs/development/python-modules/closure-linter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index e5b4a63a564..f525b6e7f1d 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: buildPythonPackage rec { pname = "cloudpickle"; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index a0e744f9919..d247cecdfa6 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh +{ lib, buildPythonPackage, fetchPypi, pyyaml, openssh , nose, bc, hostname, coreutils, bash, gnused }: diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 4249ed7164b..71273ed1a22 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "cmdline"; diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index 5bb4ef79a20..28d78203b6d 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , cliapp diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index e95900d17b5..9cbf86ab1cf 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: +{ lib, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: buildPythonPackage rec { pname = "cocotb"; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 019faeaebc3..c996c23d9ae 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cogapp"; diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix index bc0b6af146a..b21ea193cbf 100644 --- a/pkgs/development/python-modules/coilmq/default.nix +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , stompclient, python-daemon, redis, pid, pytest, six, click, coverage , sqlalchemy }: diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index a5b29af1c31..a3fa33f327c 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index 6778c6acadb..1d472035b2f 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "colorama"; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 303d244fff3..6198e4e1b28 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , param diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix index 08da356e222..50a052ec1f9 100644 --- a/pkgs/development/python-modules/colorclass/default.nix +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "colorclass"; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 5caa0cad2f6..502f31aa9b8 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index 6a6ad9d4946..f7419666f53 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, d2to1 }: +{ lib, buildPythonPackage, fetchPypi, d2to1 }: buildPythonPackage rec { pname = "colour"; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index d0988689275..746c5f35f25 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchFromGitHub , six , mock, pytest diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index ba3700962bf..a41d077f22d 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: +{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: buildPythonPackage rec { pname = "configshell"; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index f3e8b1c943b..cd2ddf9da69 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { version = "1.5.0"; diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 189573699b9..e3a9c642f47 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "constantly"; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 3978b14484a..a3b92ee7255 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, six, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix index d8b74d4fedb..9937d4b4752 100644 --- a/pkgs/development/python-modules/contexter/default.nix +++ b/pkgs/development/python-modules/contexter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "contexter"; diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index f28923002f7..60eedd3ec17 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: +{ lib, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: buildPythonPackage rec { pname = "convertdate"; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index f9a4fe98208..c5ee4d8617d 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, buildPythonPackage, fetchPypi, isPyPy , pytest, pytestcov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix index 59d2214f758..a4e35dac346 100644 --- a/pkgs/development/python-modules/cookies/default.nix +++ b/pkgs/development/python-modules/cookies/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cookies"; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 8ac69a45739..8b957fee4f6 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, django, diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 73167dea8a7..65bdee5a8da 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, jinja2, diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 10c55920193..6c488a271e2 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix index 44461a8ca9f..ce3b08fbc9f 100644 --- a/pkgs/development/python-modules/cov-core/default.nix +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, coverage }: +{ lib, buildPythonPackage, fetchPypi, coverage }: buildPythonPackage rec { pname = "cov-core"; diff --git a/pkgs/development/python-modules/cppheaderparser/default.nix b/pkgs/development/python-modules/cppheaderparser/default.nix index b51499de449..7602132c24a 100644 --- a/pkgs/development/python-modules/cppheaderparser/default.nix +++ b/pkgs/development/python-modules/cppheaderparser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , ply -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 37e49210009..a37160a01ac 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , urllib3 diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index c93bf71687f..53caec66596 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, colorama }: +{ lib, fetchPypi, buildPythonPackage, colorama }: buildPythonPackage rec { pname = "crayons"; diff --git a/pkgs/development/python-modules/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix index 1e3c9cbbf4f..ebf86a3571c 100644 --- a/pkgs/development/python-modules/crc16/default.nix +++ b/pkgs/development/python-modules/crc16/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crc16"; diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 8dc03801285..1762d60dfde 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , nose }: let diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index 488b723d89f..082369baf73 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "crcmod"; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index ca5e1fe334a..0267aee7610 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: buildPythonPackage rec { pname = "credstash"; diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index dc97e96e4f5..dccfddaea1a 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , coverage, nose, pbkdf2 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index a6f6f3c956a..929640a7c1e 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssmin"; diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index fe13fa9582e..04b6dc36afa 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cssselect"; diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index ea3ac6236e9..a12fbf48c82 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mock }: +{ lib, buildPythonPackage, fetchPypi, mock }: buildPythonPackage rec { pname = "cssutils"; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 09685d392d6..23e6ef45b50 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock, setuptools , cudatoolkit, cudnn, nccl diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 4c4c7dbe231..62f1435df30 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: buildPythonPackage rec { pname = "curtsies"; diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix index e42f4021a6f..7698b5d6571 100644 --- a/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "curve25519-donna"; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index bafa75072f7..9270effcaa9 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 14a585617c6..1c3ee689299 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: buildPythonPackage rec { pname = "cx_Freeze"; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 89946964544..c81443e0990 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, odpic }: +{ lib, buildPythonPackage, fetchPypi, odpic }: buildPythonPackage rec { pname = "cx_Oracle"; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index d805ba5de1f..c2de6d82a5b 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cython diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 8a0adb3d6c9..a7115d1e940 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix index 30d4f1bd714..26f23b7156d 100644 --- a/pkgs/development/python-modules/daemonize/default.nix +++ b/pkgs/development/python-modules/daemonize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix index 6484d84253b..c46337981bd 100644 --- a/pkgs/development/python-modules/darcsver/default.nix +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, mock }: buildPythonPackage rec { pname = "darcsver"; diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 1db03b66ffb..86bc2da1565 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cloudpickle diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index eac503c2f85..a3cc7b6afda 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index be27399b71f..f4f5c03858a 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dask diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 4d3aa8e79a0..4836fe35d18 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index f2d8737b38e..1bec4c82872 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dask diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index c60f628d72e..4e64b8c9f0c 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xgboost diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 30001b781d2..483c565536d 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , click , requests , tabulate diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix index a88995937d8..c276e9d000b 100644 --- a/pkgs/development/python-modules/dataclasses/default.nix +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy36 }: +{ lib, buildPythonPackage, fetchPypi, isPy36 }: buildPythonPackage rec { pname = "dataclasses"; diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 68046235227..4124457586c 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index f3eab1d1d4e..551b1096222 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xmltodict diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index a6aca68ef29..dcad0c3698a 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; version = "2.8.1"; diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index c7f74730c16..d8bbc96fcc4 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , cython, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index b9c264a2015..18560734bd8 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: +{ lib, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: buildPythonPackage rec { pname = "dbf"; diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 9f78f3fdde1..1708a75fc10 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dbfread"; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index 76385ac8023..d7cf79f9d07 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 42ae779e0d2..848e5038af8 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { version = "2.0"; diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index a6669d0e30d..ee554a6e2bd 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonAtLeast diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 21dc9d3832c..f260727b87a 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: +{ lib, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: buildPythonPackage rec { pname = "deap"; diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index a271371e22f..4426fe65bf5 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "deluge-client"; diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix index fc70562938e..25e2692af3b 100644 --- a/pkgs/development/python-modules/demjson/default.nix +++ b/pkgs/development/python-modules/demjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, python, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "demjson"; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 0c2e2055ff9..979d2811fe6 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: let testPath = diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index a64ed0b9d99..589335f8258 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, +{ lib, fetchPypi, buildPythonPackage, wrapt, pytest, tox }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index f9b8f5dec7c..cc7b6870ad8 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "derpconf"; diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix index 5280ff2417a..b10526ff0fd 100644 --- a/pkgs/development/python-modules/descartes/default.nix +++ b/pkgs/development/python-modules/descartes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, matplotlib, shapely }: diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 01918445b34..43d5a955027 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pyopenssl , pkgs diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 9672cca46b0..03b1f4fa28e 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , inflect , jinja2 , jinja2_pluralize diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index ad653c6313c..d5f1445a677 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }: +{ buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }: buildPythonPackage rec { pname = "digi-xbee"; diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index 5e3ac1e1fcd..e522ac4b6c9 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }: +{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }: buildPythonPackage rec { pname = "discogs-client"; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 403834a3731..12e05b58c4c 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distlib"; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index e9b8e66d4c9..d798414c197 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "distorm3"; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 81bcccd8bd6..16d26e741aa 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "distro"; diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix index 882a3995799..c2fbcdfe46c 100644 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ b/pkgs/development/python-modules/distutils_extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index f8dd9dca202..0cabbef1d15 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix index 321bec8149d..b216c8e62a1 100644 --- a/pkgs/development/python-modules/dj-search-url/default.nix +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index fafd7ab9a63..143e76cf0d8 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib +{ lib, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib , django, python3-openid, mock, coverage }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 892cf179c37..96d5aa7fd9d 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, buildPythonPackage, fetchFromGitHub, six, diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index d0dacd659a1..2271be1d16f 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi, isPy27 , ldap , django diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 103bfb29578..6487e276232 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 39f65275fee..83dbbc5d197 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django +{ lib, buildPythonPackage, fetchPypi, django , redis, async-timeout, hiredis }: diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index ef18bfe77ec..d33a4be2817 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django, six }: diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index bf1835071f8..b6b736e9238 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django-discover-runner diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index d87e39b8e3f..1f7b2811405 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, django }: +{ lib, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-csp"; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix index 63d51d41fc9..8d07148ce18 100644 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 7288896c4fe..7e5105807cf 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django, persisting-theory, six }: diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index e4ca546bbc2..00c260946cc 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix index 08312606603..458723601dd 100644 --- a/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/pkgs/development/python-modules/django-gravatar2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "django-gravatar2"; diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index 54056547f48..ee5a47d3787 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django_hijack, django_nose }: buildPythonPackage rec { pname = "django-hijack-admin"; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index bd6f870de66..fd9c30a4bc7 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, +{ lib, buildPythonPackage, fetchFromGitHub, python, django, django_compat, django_nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index 59e9782f050..7bba272c155 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: +{ lib, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: buildPythonPackage rec { pname = "django-logentry-admin"; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 40063c89e43..11939b9b773 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor , django-allauth, mailmanclient, django, mock }: diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index c599e28d206..b4d90da0880 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest, django }: buildPythonPackage rec { pname = "django-maintenance-mode"; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 6e16af5bc8f..e7cb4814cb4 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , django, requests, oauthlib }: diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix index 4fed9bf470b..8790067e4af 100644 --- a/pkgs/development/python-modules/django-paintstore/default.nix +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib +{ lib, buildPythonPackage, fetchPypi, requests, requests_oauthlib , django, python3-openid }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index b3b71231b75..4b8d79a2917 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: +{ lib, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: buildPythonPackage rec { pname = "django-polymorphic"; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index f2bd574919a..141a46f5315 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , django , netaddr diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 2eb3b19f554..16b1e0bcc59 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow +{ lib, buildPythonPackage, fetchPypi, django-picklefield, arrow , blessed, django, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/pkgs/development/python-modules/django-ranged-response/default.nix index d517563590f..df5fc4b205b 100644 --- a/pkgs/development/python-modules/django-ranged-response/default.nix +++ b/pkgs/development/python-modules/django-ranged-response/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, django }: +{ lib, fetchurl, fetchPypi, buildPythonPackage, django }: buildPythonPackage rec { pname = "django-ranged-response"; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 173452ebe48..609388a311c 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, +{ lib, buildPythonPackage, fetchPypi, isPy3k, numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 869c3bf74ee..6efba78d4ca 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django }: diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index 39912f47420..4307fc69d45 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index e3e094ab706..3e849b48773 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "django-webpack-loader"; diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 8529df09bb7..853e12327d3 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, python, lib, stdenv, django }: +{ buildPythonPackage, fetchFromGitHub, python, lib, django }: buildPythonPackage rec { pname = "django-widget-tweaks"; diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index c9c9913d764..5da9ed0ca26 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: +{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index e0a297e53c0..2ef8639c17e 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix index 468327139e6..5de127a9722 100644 --- a/pkgs/development/python-modules/django_colorful/default.nix +++ b/pkgs/development/python-modules/django_colorful/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index f0080436489..edf5faa5af4 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, rcssmin, rjsmin, django_appconf }: buildPythonPackage rec { pname = "django_compressor"; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index a8872967df4..a452db3cf28 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index fa2618fa1a7..3f01a2b294a 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix index dba92efb2d9..816442d6e2a 100644 --- a/pkgs/development/python-modules/django_evolution/default.nix +++ b/pkgs/development/python-modules/django_evolution/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 60023660ea5..957944f01d3 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , django_environ, mock, django , pytest, pytestrunner, pytest-django }: diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 500fe2e2fbc..fdd4bd03b70 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix index 7f2f9efcfc5..2506f6aba44 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django_nose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 434dea7f0f2..56e4e845f08 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, +{ lib, fetchPypi, buildPythonPackage, mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 16574770ff9..3f038b4fd06 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 66475b35d2a..90ba6cf2924 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchFromGitHub diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index e715dde7c41..b51f0421fd9 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index e734a5f7ae8..88536b210d2 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index ce92fab3e96..66a57625b4a 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, django, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }: buildPythonPackage rec { version = "3.12.2"; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index e7a80d91d24..aaaf5708a59 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, openssl, buildPythonPackage +{ lib, fetchPypi, openssl, buildPythonPackage , pytest, dnspython, pynacl, authres, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 543f4994020..c022d62bfa8 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "docker-pycreds"; diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 74e363d18b9..45fe856f6f0 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { version = "1.1.0"; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix index b6267b87c1b..775767e6fec 100644 --- a/pkgs/development/python-modules/dockerpty/default.nix +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "dockerpty"; diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix index 2dc4bb38cf1..68df40a3cbf 100644 --- a/pkgs/development/python-modules/docopt/default.nix +++ b/pkgs/development/python-modules/docopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "docopt"; diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index 12d15799ecc..533dbed29b3 100644 --- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "doctest-ignore-unicode"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 5dba1b91bc1..92fae14f4ea 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix index f6eabc378b3..8ef37282250 100644 --- a/pkgs/development/python-modules/dogpile.core/default.nix +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "dogpile.core"; diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 2626f420676..2154f33bb8b 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 505bd7bb456..9db726a12a1 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 +{ lib, fetchPypi, buildPythonPackage, isPy27 , mock, pytestCheckHook, nose, hypothesis }: diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index 177b260e804..52f4f42661d 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "dpkt"; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index dd92d51d6c6..d69ece809bb 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, buildPythonPackage, fetchPypi, inflection, diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 22e66d0a4a4..ca0283b2cbd 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytestrunner, requests, urllib3, mock, setuptools }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix index 84631c21708..a5d4675f993 100644 --- a/pkgs/development/python-modules/dtopt/default.nix +++ b/pkgs/development/python-modules/dtopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index d8435afa3f9..f5e9fa6195a 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index b5fa28f2de6..7cddb324f3a 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock +{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock , pytest_xdist, covCore, glibcLocales }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index f23d19510ee..9323255cc27 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , isPy3k diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index 441d839d36f..322e6461e5d 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "easygui"; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index fc86edf5d4d..c98a8b572d4 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "EasyProcess"; diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index d5c69d4c7e9..11b13d8325a 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pythonAtLeast , fetchFromGitHub diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 2a17f84bb3b..3c892185687 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 183d7cc3ca5..47692075d3b 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "ed25519"; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 727c3003db5..4329db98c2b 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , cmake diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index c1171043356..ac2d5023cc9 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast , Keras, numpy, scipy, six, tensorflow }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index ae339368ff5..02c2c644449 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 67e277b57ac..a2f2ff038db 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 4929d1f51a4..9161525c2bc 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -2,7 +2,7 @@ , fetchPypi , urllib3, requests , nosexcover, mock -, lib, stdenv +, lib }: buildPythonPackage (rec { diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 472834c5c72..152561b69ce 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 12974a9422d..a4f2bece349 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , numpy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index 26d40d8d205..f68729a42b6 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , click, enum-compat, pyscard, pycountry, terminaltables , pytestCheckHook, pythonOlder }: diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix index ad266623c78..db827601d5d 100644 --- a/pkgs/development/python-modules/enum/default.nix +++ b/pkgs/development/python-modules/enum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix index 5e26853098f..91f54dc99cb 100644 --- a/pkgs/development/python-modules/enum34/default.nix +++ b/pkgs/development/python-modules/enum34/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix index d7459543163..3950afa578e 100644 --- a/pkgs/development/python-modules/epc/default.nix +++ b/pkgs/development/python-modules/epc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sexpdata diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 4d6e5940926..c0d77c29748 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , glibcLocales, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 5ba9490d945..e407ca35e89 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , lxml diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index 338992259a1..0c2fd0c2952 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , simplejson diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index b931db188e3..4d5c6173cd7 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , flask diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix index 1b2b44d65f7..4d4bff85842 100644 --- a/pkgs/development/python-modules/eventlib/default.nix +++ b/pkgs/development/python-modules/eventlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchdarcs diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index 70c7fad963a..8c6e4b6c7c2 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index e380ca613cf..706e4d8137f 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 0a22ab4b051..ec4bcca9f86 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , isPyPy , fetchPypi diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index e86a681a8e3..e26f616f8db 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 08faf5c2ba8..3dfd810f99c 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -1,11 +1,10 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder , python , isPyPy , six -, lib , filetype , deprecation , dataclasses diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 6dfefe09204..3fd30062b0d 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { version = "0.12"; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 89e7156fa52..db1810ca056 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, boltons, pytest }: +{ lib, buildPythonPackage, fetchPypi, boltons, pytest }: buildPythonPackage rec { pname = "face"; diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 1896bdfac59..6b2c6411aa1 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, lib, stdenv, flake8, pytest, glibcLocales +, face_recognition_models, lib, flake8, pytest, glibcLocales }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index d5838438b7d..6ec2634029b 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchPypi, setuptools }: +{ buildPythonPackage, lib, fetchPypi, setuptools }: buildPythonPackage rec { pname = "face_recognition_models"; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index be26ab98af6..9b207a81c3c 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six, pytest }: +{ lib, fetchPypi, buildPythonPackage, six, pytest }: buildPythonPackage rec { pname = "fake-useragent"; diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index 82af8d04e07..2e561a163ab 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 8d1aa02026c..eb6cbfa242e 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , coverage diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 57ad69c0be4..55b9d3b3023 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index eb86784ddc7..7671feb359f 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastentrypoints"; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index 55aad9d71ea..383a0e4fbd5 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi}: +{ lib, buildPythonPackage, python, fetchPypi}: buildPythonPackage rec { pname = "fastimport"; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index 82964070d03..9a3f8c53b1d 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: buildPythonPackage { pname = "fastpair"; diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index e033dc42d45..e154471d7a8 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage +{ lib, fetchFromGitHub, buildPythonPackage , openssl, pytest, cffi, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index 25cc2b8792f..9b43c05989f 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 7aedbbdd8f7..0821778d024 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastrlock"; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index bf3bd987564..f3bddec76bd 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: +{lib, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { inherit (pkgs.fasttext) pname version src; diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix index 4de0d18ca8b..413416c99a2 100644 --- a/pkgs/development/python-modules/fdint/default.nix +++ b/pkgs/development/python-modules/fdint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 509ffaed9d7..59ca95a0338 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 8508cc637f2..d5eb1306b39 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: +{ lib, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: buildPythonPackage rec { pname = "feedgenerator"; diff --git a/pkgs/development/python-modules/feedparser/5.nix b/pkgs/development/python-modules/feedparser/5.nix index a79048c5525..58cdad9884e 100644 --- a/pkgs/development/python-modules/feedparser/5.nix +++ b/pkgs/development/python-modules/feedparser/5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 7b48fe6f73e..38e9761952d 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index df132211d4f..0cc1eae5ac2 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index bfac6a0e6b2..5b6d6284ced 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 77ddec306fc..97073bb6b03 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "filelock"; diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 53059ce43d0..9740117b9b9 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 8e02dac5850..c4dfc04046b 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , bleach , mt-940 , pytest diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 6a2cc594360..54f22032c6a 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock , python-Levenshtein, pytest, termcolor, isPy27, enum34 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index a5bdf847eff..491fcd39805 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "first"; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 9e53ed28ff3..6f1d8181a58 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata }: diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 02b0641a34e..fe068211dfb 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index da6176e6781..602564d1626 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchPypi diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 7dbf507f220..cba8e9e8efd 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 9491ca8be77..1e133df2b2b 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask +{ lib, fetchPypi, buildPythonPackage, flask , brotli }: diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 731e8b106ab..25c054b231b 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , nose, flask, six, packaging }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix index 6986cd75be6..3a9daa577d4 100644 --- a/pkgs/development/python-modules/flask-elastic/default.nix +++ b/pkgs/development/python-modules/flask-elastic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , flask, elasticsearch }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index cf8a70b0533..580cd1f89f7 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 1673ca24e6e..08aa2efb8f2 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 38d42da1c8a..d22096f9149 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask, limits }: +{ lib, fetchPypi, buildPythonPackage, flask, limits }: buildPythonPackage rec { pname = "Flask-Limiter"; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 919e353eb8e..9d54849e92d 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast , flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index 550f6520e7d..18e48329288 100644 --- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index 92d2f90848c..f6b6fd81528 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , flask diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 16b8c9c7fc7..1bac82fb44f 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: +{ lib, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: buildPythonPackage rec { pname = "Flask-SQLAlchemy"; diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix index 79650e7c175..d238ba5acb7 100644 --- a/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flask }: +{ lib, buildPythonPackage, fetchPypi, flask }: buildPythonPackage rec { pname = "flask-swagger-ui"; diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix index 20624c31862..66c45b85522 100644 --- a/pkgs/development/python-modules/flask-swagger/default.nix +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , flask, pyyaml }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix index 15e7b2c1875..e30abdb7cb4 100644 --- a/pkgs/development/python-modules/flask-versioned/default.nix +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flask }: +{ lib, buildPythonPackage, fetchFromGitHub, flask }: buildPythonPackage rec { pname = "Flask-Versioned"; diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index eadc7842a01..00af0ce61e9 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }: +{ lib, fetchPypi, buildPythonPackage, flask, wtforms, nose }: buildPythonPackage rec { pname = "Flask-WTF"; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index d121b4e32c8..27f436c3c53 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index eef31359f50..d15950bba9a 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , flask diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 1a6591040a2..9fd36fab294 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix index 52ac5da27aa..fa19d9bdf7a 100644 --- a/pkgs/development/python-modules/flup/default.nix +++ b/pkgs/development/python-modules/flup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index ddec811e21c..64eafed6c19 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , aiohttp, zigpy , pytest, isPy27 }: diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 396bef6d009..e0d38a5a131 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 64713d96ade..1bb3b17e9df 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index d60c1e89900..072129e6ea5 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, tkinter, supercollider }: +{ lib, buildPythonPackage, fetchPypi, tkinter, supercollider }: buildPythonPackage rec { pname = "FoxDot"; diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix index 9dc88596f26..09ce8bbd11b 100644 --- a/pkgs/development/python-modules/freezegun/0.3.nix +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index f1b1d9738d7..4c5a87e8266 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 571fba1a8ac..b8312d1c8ec 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }: buildPythonPackage rec { pname = "fritzconnection"; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index dd0c9929826..e172f3815b7 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "frozendict"; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 63342c7045d..dbc36317228 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index 3f53b66d1ef..ba97b2e8f47 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index 773ed1dccd6..19e2dd146d2 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 1464baa57df..8a7335accda 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , isPyPy, isPy3k, unittest2 }: diff --git a/pkgs/development/python-modules/functools32/default.nix b/pkgs/development/python-modules/functools32/default.nix index cec9da42395..be907e963c1 100644 --- a/pkgs/development/python-modules/functools32/default.nix +++ b/pkgs/development/python-modules/functools32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 3db08cf22bb..515f0925caf 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index b7592885007..72089da11e1 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: +{ lib, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: buildPythonPackage rec { pname = "furl"; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index a130fab0d7e..14f2cb584ea 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, fuse }: buildPythonPackage rec { pname = "fuse-python"; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 858d3e13ea0..45b70863042 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index c2d16a55984..0bcf8efc359 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: +{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: buildPythonPackage rec { pname = "fuzzywuzzy"; diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index e4dbe43ef8d..38334d5cc6b 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, astunparse }: +{ lib, fetchPypi, buildPythonPackage, astunparse }: buildPythonPackage rec { pname = "gast"; diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 981cbbb7e8c..5c45e875e5d 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , tornado , futures diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index bedb7f3a375..1332777189b 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , jinja2 diff --git a/pkgs/development/python-modules/gdata/default.nix b/pkgs/development/python-modules/gdata/default.nix index bf9c01c250a..94430d0d941 100644 --- a/pkgs/development/python-modules/gdata/default.nix +++ b/pkgs/development/python-modules/gdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index aab5efea97d..6060dc3a5bb 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index 4eb209a8af7..6c416548184 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f43fdabf09e..3f217afd8bb 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner }: diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index 9a6e4508e30..c476960bbf8 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index 8f486cc29ef..a848eff41a6 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 56f9346668f..b629d48c61f 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sqlalchemy diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 98c1ee417e4..5167b986604 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix index ae4e07e2547..48df43e2217 100644 --- a/pkgs/development/python-modules/geopy/2.nix +++ b/pkgs/development/python-modules/geopy/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index 88d1089d5a3..4a25e0d7e14 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , versiontools diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 431a0c09a30..7ff62a378ca 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 0fcf6cdfaaa..3fe9e648ce3 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet , zope_interface }: diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index fafbef12bd3..c82da3c8a98 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index a9582648117..efbdc2f59f9 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , zope_testrunner, six, chardet}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index a48547f2909..8df2808328f 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , gevent diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 5922377ab3a..d41874cff3b 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll , python, util-linux, pygit2, gitMinimal, git-annex, cacert }: diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index adb9de4dbc0..2b17a46190b 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , GitPython diff --git a/pkgs/development/python-modules/globre/default.nix b/pkgs/development/python-modules/globre/default.nix index 21d2983ab01..5debd1d0ab6 100644 --- a/pkgs/development/python-modules/globre/default.nix +++ b/pkgs/development/python-modules/globre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pythonAtLeast , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 2acc87a17ac..89f0de47490 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , boltons diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 808b918681b..204415d7531 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , fetchpatch diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index 821e0ba0afa..1797f1d4264 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , validictory diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 71116c37041..6f3ae30e8cd 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index addbee81bd3..3c68a1713a0 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index c587c928e7e..83175b6c86a 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , docutils, installShellFiles , google_api_python_client, simplejson, oauth2client, setuptools, xdg }: diff --git a/pkgs/development/python-modules/google-apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix index 7cc7f485882..321837f56ae 100644 --- a/pkgs/development/python-modules/google-apputils/default.nix +++ b/pkgs/development/python-modules/google-apputils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 9120f93a3bd..22b02552cd7 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchpatch , fetchPypi diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 8f04fb7451d..aec3b51acb5 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 302ce8ceaed..83fe052a542 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 4ec12a8fa2f..8f67fed79d7 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 5eab2c730f7..a99588199bf 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 9632dc902d1..93cbc22b7cd 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 6d91bed83ae..1cf94d220e6 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 72709c62cec..44764a4edb1 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 1b7a570fed2..095e01fbbd7 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 84f98550b9a..4c8c79c7dda 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 9076c129804..451607a5357 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 0636da60e9a..fa4c8c6c52d 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index b3181f8fcde..1457c044fe5 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index f0c235ca0c9..30ef0af76a1 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , aiounittest diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 2b28f84a315..ac511f80647 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 6675767a244..94dd7c1ba8f 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 7186ecd6f35..c43c51d97f7 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 58d03f206fc..b8ffa935fc3 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 8dc665fe210..f8fc079aa3e 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 46a28b1ffd1..d3846ad4f42 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 4dcf7fd3d31..86fbc360d73 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 11baf3d73f3..8a265182fba 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 81fa97f152b..0a3285566f1 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 242198a2197..184044594d5 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 382476af0ca..759a8f25c1a 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc_google_iam_v1 diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 3359cfdd743..c57329eebcc 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index e30986af610..5911bfe6156 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 3f6792fa77b..2380e9183b7 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, google-auth, six }: +{ lib, buildPythonPackage, fetchPypi, google-auth, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index a7228a42999..3c84c21344a 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 1252c99bf48..486a71c7a97 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 32d402e1cf0..2b0ac55fa2e 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 43fed1fe27f..26e3320a5cc 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 57a51f96e65..12f63bd0e1c 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , google-api-core diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 20614f5b5d8..ac91ab85bd6 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 7e5b786b4fb..898971629ae 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpc diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index c971119833e..007d4eb2cea 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix index bf4212edc51..42da4541647 100644 --- a/pkgs/development/python-modules/gorilla/default.nix +++ b/pkgs/development/python-modules/gorilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi}: +{ lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "gorilla"; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 788473b5ab8..6ed9f48dd61 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , requests , protobuf , pycryptodome diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 0dd68918aed..31ac03347cb 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , pkg-config , libgphoto2 }: diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index ecd52ad848c..28f244bc354 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient +{ buildPythonPackage, lib, libffi, isPy3k, pyasn1, clint, ndg-httpsclient , protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub }: diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 2c4dfcd8139..1ad50642e2b 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cffi diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 22e6743582c..85b6efabaa8 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools +{ lib, buildPythonPackage, fetchFromGitHub, setuptools , numpy, scipy, gpy, emcee, nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gradient_sdk/default.nix b/pkgs/development/python-modules/gradient_sdk/default.nix index adaafd8eadb..3dffb38f2ff 100644 --- a/pkgs/development/python-modules/gradient_sdk/default.nix +++ b/pkgs/development/python-modules/gradient_sdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , hyperopt }: diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index 607737d99ae..ada005d14f8 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , boto3, requests, datadog, configparser, python }: diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 0bced13cd11..17ac9132916 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix index 06b66ccbc14..20522d28304 100644 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , tornado_5, pyyaml, funcparserlib , nixosTests }: diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index 7b2dd7e3fed..ae7ddb0c76b 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 5ce5df8cdea..50c95df7dc9 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index 019cd798d64..dafa692493e 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch # Python bits: diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index dd9527006da..7291cd4b65e 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpcio diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix index 1b631c0973e..656e147ac50 100644 --- a/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , grpcio diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index 0512a4906a2..8d19acdc70d 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 7cf2a8c8df1..0370f80b4a4 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 9ff8434cc9a..ea89f7214c6 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, stdenv + , pkg-config , python3 , pygobject3 diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 3af8e97ba71..bb31baa7888 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, fetchFromGitHub, makeWrapper , glibcLocales, gobject-introspection, gtk3, libsoup, libsecret , buildPythonPackage, python , pygobject3, freezegun, mock diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix index 23a2545525a..0f1d2ddf05c 100644 --- a/pkgs/development/python-modules/guestfs/default.nix +++ b/pkgs/development/python-modules/guestfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }: +{ lib, buildPythonPackage, fetchurl, libguestfs, qemu }: buildPythonPackage rec { pname = "guestfs"; diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index c1091fa980c..7d43ce95a7e 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , coverage , mock , pytest diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 983335f4395..3f3eceee378 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , coverage , mock , pytest diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index f70625b86fe..6f765bd98d6 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, sphinx, fetchPypi }: +{ lib, buildPythonPackage, sphinx, fetchPypi }: buildPythonPackage rec { pname = "guzzle_sphinx_theme"; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 6dad775732c..ba681658e9a 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , enum34, hpack, hyperframe, pytestCheckHook, hypothesis }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 653c4483ce8..84810fd2b53 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , ffmpeg_3, async-timeout }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix index b2b7b4b3d14..316c9a6edca 100644 --- a/pkgs/development/python-modules/handout/default.nix +++ b/pkgs/development/python-modules/handout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , imageio, imageio-ffmpeg }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index a0b7d50b560..7afb4eefa06 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index 003805f939c..c457da91886 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools +{ lib, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index 56e9811396e..5dd94e5de2e 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: +{ lib, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: buildPythonPackage rec { pname = "hcs_utils"; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 3b65e10bfce..f1b0d13e56e 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix index 4cd695925f2..61cbe39a256 100644 --- a/pkgs/development/python-modules/heapdict/default.nix +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "HeapDict"; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 4c7ff0c3878..8560364d4f4 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, mock }: buildPythonPackage rec { pname = "helper"; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index 3b938dfc237..9b89567d8ef 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index ce291818824..4e65f5b9172 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index afac7983584..a6ed6b935ad 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: buildPythonPackage rec { pname = "python-hglib"; diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix index 2ee6024cd47..b8b6d43b548 100644 --- a/pkgs/development/python-modules/hgsvn/default.nix +++ b/pkgs/development/python-modules/hgsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 418059c5165..d7fa9af5efa 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }: +{ lib, fetchPypi, buildPythonPackage, isPy27, sphinx }: buildPythonPackage rec { pname = "hieroglyph"; diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index e9d5677f8be..ef10d195671 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , redis diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index 3ff672a22db..00b56060964 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, mock }: +{ lib, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; version = "0.5.1"; diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix index 3393ad18691..096edbe5252 100644 --- a/pkgs/development/python-modules/hjson/default.nix +++ b/pkgs/development/python-modules/hjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonImportsCheckHook diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index 966ce7001fb..43e7a8f4ce3 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index 79a2e83508a..cfbf63a5869 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -3,7 +3,7 @@ , lxml , pillow , reportlab -, lib, stdenv +, lib }: buildPythonPackage rec { pname = "hocr-tools"; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index b5e0062d115..789dc57a571 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , convertdate diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index 9b6f724cd31..a5140a216cf 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix index fba71dc3f10..d38ceec7e13 100644 --- a/pkgs/development/python-modules/hsaudiotag/default.nix +++ b/pkgs/development/python-modules/hsaudiotag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index 52919e48983..66ea895960c 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix index 73540359ee1..06d0c14c7e4 100644 --- a/pkgs/development/python-modules/html2text/2018.nix +++ b/pkgs/development/python-modules/html2text/2018.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 0ceeda04582..d20f0a9abfd 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: +{ lib, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: buildPythonPackage rec { pname = "html5-parser"; diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index ef660fc0b92..e844c99693a 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi, nose , six diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 117c7f5e132..cbf6b95ccd3 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "httmock"; diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix index 145eea751b9..9169f1e4126 100644 --- a/pkgs/development/python-modules/http_signature/default.nix +++ b/pkgs/development/python-modules/http_signature/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index b7867e22f17..a7d4240db14 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index cbaf89c3ca6..2e711141fcb 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 09e94f6275d..b6f78e5cf8f 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index a74198f3832..6cdee9948b9 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { pname = "hyperframe"; diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index ba4aeef402e..d407ff95a01 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , cloudpickle, numpy, future, networkx , six, tqdm, scipy, pymongo }: diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index 4dea7526b7e..312c1bb45c7 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index c27d4135411..37d5ccd8786 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 4499d5d62f4..8e75a945d10 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index c186020fee1..011909d6b80 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , tatsu, arrow , pytestCheckHook, pytest-flakes }: diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index 47997dbdc26..35bafd67fa9 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ipaddress diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix index bdfd3767f8c..be4e2026bf1 100644 --- a/pkgs/development/python-modules/ifconfig-parser/default.nix +++ b/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "ifconfig-parser"; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index a82a20ca7c8..8ccc7eb4e0c 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ijson"; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 5c1953d6ac3..7464f3c8997 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: buildPythonPackage { pname = "image-match"; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 65c1cfd020a..8d2b7fd8da8 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -2,7 +2,7 @@ , fetchPypi , numpy , scikitimage -, lib, stdenv +, lib , opencv3 }: diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 71f7eae9c32..67920dc7b7d 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy27 , pathlib diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index cd48f54ee8f..42cf6b50764 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix index c091f53b8d4..27667f860ff 100644 --- a/pkgs/development/python-modules/imapclient/default.nix +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index fe21096d635..96ba16b1cd1 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: +{ lib, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: buildPythonPackage rec { pname = "imbalanced-learn"; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 4253ed30e41..f5418b89e80 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , pandas , pytestCheckHook , scikitlearn diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 9ca8531dbbc..343c7869a6c 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -9,7 +9,7 @@ , scipy , shapely , six -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/imgsize/default.nix b/pkgs/development/python-modules/imgsize/default.nix index d1a69c043d0..a8f50cd8f32 100644 --- a/pkgs/development/python-modules/imgsize/default.nix +++ b/pkgs/development/python-modules/imgsize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 3a6a3c9ef8d..54308d632b2 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 65ae47ed87b..3d09e6a4397 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index 33c2ae0001c..f402f913f38 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , opencv3 diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 2d0fd5a93ad..69fe83b8779 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index 32374453375..c8403cf6446 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , influxdb, graphite_api, memcached }: diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index 4baa891a779..b250dfc6c7f 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , html5lib , six diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index 9bd24a4d788..c94c12ab0a8 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index c515b7865b1..e4473c0bd1c 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index c434a3f52bc..e55fd8f39d5 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index b4e1dfaff18..62e021afdbb 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "interruptingcow"; version = "0.8"; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index 27a5fa3650e..dca73a93e8f 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , python, pytest, sortedcontainers }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index 427681fedb8..b29ee917928 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix index f2e479aff96..06211470daa 100644 --- a/pkgs/development/python-modules/ipaddress/default.nix +++ b/pkgs/development/python-modules/ipaddress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index b21907f75ff..7b8c877371c 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ipython diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index 057d82cbebc..9788fd8a544 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index 3deb0c6cb80..c97eafb6054 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 431c05bb388..3f2b854b6e7 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index acf6d3c9331..61ec91075b5 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage { pname = "iso3166"; diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index d2098a83c95..19a643d216a 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index e89786d4e18..d1669a1ed5b 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 417d1a20b3b..1b684547240 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchFromGitHub, buildPythonPackage, pytest, diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index 14cf18ae694..d6efe84edfd 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , jinja2 diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix index 4c625d94485..d00ccd06c8d 100644 --- a/pkgs/development/python-modules/jabberbot/default.nix +++ b/pkgs/development/python-modules/jabberbot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: buildPythonPackage rec { pname = "jabberbot"; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 6f120fa6ea2..b4590ed28d3 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ruamel_yaml diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index d4aa49c3ca3..90f7c310faa 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "jdatetime"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 6e833a77460..305b9f6c6b6 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix index 0a6d0c365a0..db196403822 100644 --- a/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }: +{ lib, buildPythonPackage, fetchPypi, jinja2, inflect }: buildPythonPackage rec { pname = "jinja2_pluralize"; diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix index 7887fe96f75..4268413fd3f 100644 --- a/pkgs/development/python-modules/jinja2_time/default.nix +++ b/pkgs/development/python-modules/jinja2_time/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , arrow diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 3b31700de0e..3f74ae8d810 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ply diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index c5c9cdf1505..6f9ceb96e3f 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , six diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix index 07ee609d653..6b7faf9a312 100644 --- a/pkgs/development/python-modules/jsonfield/default.nix +++ b/pkgs/development/python-modules/jsonfield/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: +{ lib, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: buildPythonPackage rec { pname = "jsonfield"; diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix index 81a6eb3fb27..d2b177c742a 100644 --- a/pkgs/development/python-modules/jsonpath_rw/default.nix +++ b/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index b901d811a23..3154f63f318 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 0b77db5df4e..00f0d748bbb 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index cc4bd1b2f68..db47a2240fb 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "jsonrpc-base"; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index d14d382f013..bf8960ad27d 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , aiohttp, jsonrpc-base, pep8 , pytestCheckHook , pytest-asyncio diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index feced944225..7b08572d231 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , six diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index eff6accaa02..7646c007818 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi, fetchpatch , nose, numpy , bottle, pyyaml, redis, six , zlib diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d9234d836b0..60ec37dbde9 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index f01605513cb..5d8060d1944 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast , docker , escapism , jinja2 diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix index 0f0c0d346e6..9dddd8ec568 100644 --- a/pkgs/development/python-modules/jupyter-telemetry/default.nix +++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix index 03d28bbf55d..818623c2513 100644 --- a/pkgs/development/python-modules/jupyter/default.nix +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , notebook diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index bfbd1cc89e0..3d9b5b9f831 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , notebook diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix index 24a02f7f696..5b789f5eda8 100644 --- a/pkgs/development/python-modules/kaa-base/default.nix +++ b/pkgs/development/python-modules/kaa-base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index 5164004e8ea..5a50d9e9c0a 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kaa-base diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index b147b30c2ce..d8f37f563d4 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: +{ lib, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { version = "2.0.2"; diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 866042b6942..1050ae88e43 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kaitaistruct"; diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 2a45404919c..471ee4416b6 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , Babel diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index dea22059f09..c5f00393839 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyyaml diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index d8743776578..31b65023371 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index 22ae853c043..5a70dcb4676 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , PyGithub diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix index 7a488edf895..b6daec6ca20 100644 --- a/pkgs/development/python-modules/keepalive/default.nix +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 437a0193c61..6b4568cd748 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest +{ lib, fetchFromGitHub, buildPythonPackage, pytest , ecdsa , mnemonic, protobuf, hidapi, trezor }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index b9189cf4e16..27ef7d8dbf4 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , keepkey diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 7274d3d17a6..e90dd1a806a 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, pytest_xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index 985339caed5..7a9ce3aab44 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kerberos diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index bc20ff4e374..5b53d201a0b 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six , pytest, backports_unittest-mock, keyring, setuptools_scm, toml }: diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 1a14b974114..0b6f41d2c19 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kitchen"; version = "1.2.6"; diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index dd45e967231..c08bdab4cf3 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , argcomplete diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix index 8ad94d955ae..a1b22a727ad 100644 --- a/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 17218078196..f2cb598a6c9 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index 7708bc0dbc0..630430b8270 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/pkgs/development/python-modules/lasagne/default.nix b/pkgs/development/python-modules/lasagne/default.nix index 5bddf5cbe6f..5db149708ff 100644 --- a/pkgs/development/python-modules/lasagne/default.nix +++ b/pkgs/development/python-modules/lasagne/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 63784b4005b..82a784cfe3c 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 1bc52b3a65c..60eba0577b0 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest , pytest_xdist , six }: diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index e1accc4d177..71af0d294a2 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pyasn1 }: +{ lib, fetchPypi, buildPythonPackage, pyasn1 }: buildPythonPackage rec { pname = "ldap3"; diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix index 6415b255c71..d42527ae97a 100644 --- a/pkgs/development/python-modules/le/default.nix +++ b/pkgs/development/python-modules/le/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 99c1f080a03..197e88e8e8b 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "leather"; diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix index 4fc935799c3..8a0ace12645 100644 --- a/pkgs/development/python-modules/ledger_agent/default.nix +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ledgerblue diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index f853dfbf01f..fe94753f1a6 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, hidapi +{ lib, fetchPypi, buildPythonPackage, hidapi , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex , websocket_client }: diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index debe88f2f6c..47be977755c 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, +{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, python-daemon, pymsgbox }: diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index eb1ce861dd2..33710c6682d 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 5a5116de547..6e5d8f771e8 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub +{ lib, buildPythonPackage, python, fetchFromGitHub , cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index fc45622a671..38ca9b26360 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl +{ lib, buildPythonPackage, fetchurl , libasyncns, pkg-config }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index cfc687e37c1..aa922db9c10 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , lxml, pycryptodome, colorama }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index b824dec172e..5ff8d25d54b 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , python diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix index a0ef924e56e..d775cc7b245 100644 --- a/pkgs/development/python-modules/libmr/default.nix +++ b/pkgs/development/python-modules/libmr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "libmr"; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 777eed4ddb3..ce8f2a73fa7 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , joblib diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 559289987e6..7ef22e3f6ee 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: +{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: buildPythonPackage rec { pname = "libsavitar"; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 40f1b2f8e9c..a4f98ffada8 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchFromGitHub -, stdenv + , lib , pythonOlder , requests diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index 72e62514a52..c3d8ec9526f 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index df9728eb334..e019951f6ff 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "libtmux"; diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index d54a176f686..2edc9211d92 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix index 1134d4f1c57..bfc6b711ab2 100644 --- a/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }: +{ lib, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index d29cf5a7a85..ee2d88b4c04 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }: +{ lib, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix index 3e85a3cfaa0..feb27181244 100644 --- a/pkgs/development/python-modules/lightblue/default.nix +++ b/pkgs/development/python-modules/lightblue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pkgs diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix index 782bd41413e..f6d21f95dbf 100644 --- a/pkgs/development/python-modules/lightning/default.nix +++ b/pkgs/development/python-modules/lightning/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index e1cd31867de..fc6982440d6 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, six }: +{ lib, fetchPypi, buildPythonPackage, six }: buildPythonPackage rec { pname = "limits"; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index c92e014e989..ff7ac9fb3f9 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix index 3945ec5001c..3c2238b0875 100644 --- a/pkgs/development/python-modules/linecache2/default.nix +++ b/pkgs/development/python-modules/linecache2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 61624a64d66..7df182d94fe 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix index 611b91bb930..3433c0e5717 100644 --- a/pkgs/development/python-modules/linode/default.nix +++ b/pkgs/development/python-modules/linode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index bbf1b966bf1..2951ab7a427 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix index d76eb736ac7..5f17a700617 100644 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 7ae9124bb82..184a215c407 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pkgs , isPyPy diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 20020b97ef2..f3e7a86a2aa 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 3a1beba29d4..bb27c29173b 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, lib, stdenv }: +{ buildPythonPackage, fetchPypi, isPy3k, lib }: buildPythonPackage rec { pname = "lmtpd"; diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index 8690b1e4c91..0960a824817 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , dnspython diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix index 45985a17d3e..e0be7d8f944 100644 --- a/pkgs/development/python-modules/locket/default.nix +++ b/pkgs/development/python-modules/locket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "locket"; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index b7ba746d79e..a1cb1b248ae 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: +{ lib, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: buildPythonPackage rec { pname = "logilab-common"; diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index 9a071b5cf5f..bbc65a51c3c 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, logilab_common, six }: +{ lib, buildPythonPackage, fetchPypi, logilab_common, six }: buildPythonPackage rec { pname = "logilab-constraint"; diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix index 15cea1d7baa..dac5862324a 100644 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ b/pkgs/development/python-modules/logilab_astng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , logilab_common diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index d49667d7cc8..0a49262647e 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index 67b48cecd62..9c719d234f8 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , lxml diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix index 0fca2f7b372..b570a62d9e3 100644 --- a/pkgs/development/python-modules/lsi/default.nix +++ b/pkgs/development/python-modules/lsi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix index a20db9dd503..4534e0a01ef 100644 --- a/pkgs/development/python-modules/lxc/default.nix +++ b/pkgs/development/python-modules/lxc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index 585c38ab33e..a5ea55c39cf 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index af07be47dcd..8e214540b12 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchpatch , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 149e4d6ed56..35331c14b08 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, mistune, docutils } : buildPythonPackage rec { pname = "m2r"; diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 14ae268c03a..dfd16c04a6f 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: buildPythonPackage rec { version = "0.4.1"; diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/pkgs/development/python-modules/mailcap-fix/default.nix index 08991edce4a..da735d9d048 100644 --- a/pkgs/development/python-modules/mailcap-fix/default.nix +++ b/pkgs/development/python-modules/mailcap-fix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy36 diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix index 0032caa7a0a..91563b7fe7e 100644 --- a/pkgs/development/python-modules/mailchimp/default.nix +++ b/pkgs/development/python-modules/mailchimp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , docopt diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 8ab80e33717..1d3b69f6bf2 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mailman, mock }: +{ lib, buildPythonPackage, fetchPypi, mailman, mock }: buildPythonPackage rec { pname = "mailman-hyperkitty"; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index 84c97eb16e2..e2043b0d6d4 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, withTwitter ? false}: +{ lib, python3Packages, withTwitter ? false}: python3Packages.buildPythonApplication rec { pname = "mailman-rss"; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 280ee95b830..edc19f66f71 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }: buildPythonPackage rec { pname = "mailmanclient"; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 59243783ecf..2f14ed863c3 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index 54d0ade40f3..28a6e9c0c5c 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index b7d91cc16f5..99f3afc31f6 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index a30f7062df0..93a4ccb959f 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig +{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig , isPy3k }: diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index e248bfe60cc..e95cbe3c4c1 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 2f929012df8..b1513d06e58 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "markdown2"; diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix index d039198b393..7762a970fb1 100644 --- a/pkgs/development/python-modules/markerlib/default.nix +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 6a6e06cd317..ae0878c7a97 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 34c99a1ebe1..b8439a0c23d 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 9cd1019a030..4a751a188c2 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage +{ lib, fetchPypi, fetchpatch, buildPythonPackage , dateparser, humanize, pendulum, ruamel_yaml, tzlocal }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 2886a436a00..03343aec16e 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }: buildPythonPackage rec { pname = "mccabe"; diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 5313cd8e89a..55a440e6808 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }: +{ lib, buildPythonPackage, fetchPypi, pytest, future, numpy }: buildPythonPackage rec { pname = "MDP"; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index e2d2269a43c..7eb119fa955 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , html5lib diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index ce7f2316800..9cf02e4c886 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, greenlet }: +{ lib, fetchPypi, buildPythonPackage, greenlet }: buildPythonPackage rec { pname = "meinheld"; diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index 8871bfdda46..a751dbeac3f 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index d602e3d94fd..4c6aa746448 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix index b75bd31361d..02f4bc3aa44 100644 --- a/pkgs/development/python-modules/memcached/default.nix +++ b/pkgs/development/python-modules/memcached/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , fetchPypi diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 28ff6b7c5e3..994863dbbc0 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python }: diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index bcbca347548..cdd19beb68d 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "mergedeep"; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 5b97f972dad..aaf13a76530 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , cookiecutter, networkx , pandas, tornado, tqdm , pytest }: diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix index 1c8557f15c4..d6b0c30c504 100644 --- a/pkgs/development/python-modules/metaphone/default.nix +++ b/pkgs/development/python-modules/metaphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, nose }: buildPythonPackage rec { pname = "metaphone"; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 86deecb5d4f..c157cd2a6be 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 9d31dd378ac..73f50d32a5f 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4 }: +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4 }: buildPythonPackage rec { pname = "micawber"; diff --git a/pkgs/development/python-modules/midiutil/default.nix b/pkgs/development/python-modules/midiutil/default.nix index 5ac8d917d75..d1cae8c7804 100644 --- a/pkgs/development/python-modules/midiutil/default.nix +++ b/pkgs/development/python-modules/midiutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "MIDIUtil"; diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index dc824d56547..998f0a58b2b 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , appdirs diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix index f154eabb744..faa836b71d7 100644 --- a/pkgs/development/python-modules/minimock/default.nix +++ b/pkgs/development/python-modules/minimock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , nose diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index 7178405ab74..fe7a9f69691 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "miniupnpc"; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 89cc8f99146..5ffde397337 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , alembic , click , cloudpickle diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index c3c7c55f292..40e3b6ce095 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: +{ lib, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: buildPythonPackage rec { pname = "mlrose"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 94af156d9af..35f55bb2793 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix index e40fc197a5b..64c270ca072 100644 --- a/pkgs/development/python-modules/mmpython/default.nix +++ b/pkgs/development/python-modules/mmpython/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index d7ca86b8ea3..69cdf7b56b0 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { version = "1.2.2"; diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix index a7862ef5c67..202589b7435 100644 --- a/pkgs/development/python-modules/modestmaps/default.nix +++ b/pkgs/development/python-modules/modestmaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/mongodict/default.nix b/pkgs/development/python-modules/mongodict/default.nix index 467093e84ce..c2fbd6a7ad1 100644 --- a/pkgs/development/python-modules/mongodict/default.nix +++ b/pkgs/development/python-modules/mongodict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pymongo diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index d39f67a7311..5a96682accd 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six, pathpy, zetup, pytest , decorator }: diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 8bc984a5287..4cd1fec3d8b 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix index 94d4791224d..380dbe594a5 100644 --- a/pkgs/development/python-modules/mox/default.nix +++ b/pkgs/development/python-modules/mox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 77a02ae8a73..1883c9c8c01 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix index 55afb1773fe..0caa347edac 100644 --- a/pkgs/development/python-modules/mozsvc/default.nix +++ b/pkgs/development/python-modules/mozsvc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyramid diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix index 212e6b5f13c..b535144fac9 100644 --- a/pkgs/development/python-modules/mpd/default.nix +++ b/pkgs/development/python-modules/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 7fdf64c0e4b..031f26c4997 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 86d55b34f04..3569f6239f0 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 64d0ce13a86..8921719a3ae 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six +{ buildPythonPackage, lib, glibcLocales, mock, nose, isPy3k, jinja2, six , fetchPypi }: diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 56bfa06a628..8b50e04d428 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index 16c4cc0f43a..e615b3e34e2 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchdarcs , eventlib diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi_key_dict/default.nix index f76cde9bec5..cb539e4dd90 100644 --- a/pkgs/development/python-modules/multi_key_dict/default.nix +++ b/pkgs/development/python-modules/multi_key_dict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 2ff2ce4cefb..f6ca7c1d690 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index cb88b666cfa..ffb4f877490 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 68aa29a6ede..c2a7eb19337 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index 02ec3815711..e5f5eff6b28 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 45725c0fabb..ee190008f59 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix index 1d6b5ce8df4..98f96d13212 100644 --- a/pkgs/development/python-modules/muttils/default.nix +++ b/pkgs/development/python-modules/muttils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index ac9373b574a..2eed1eefeec 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six , pytest, pytestcache, pytestcov, responses, mock }: diff --git a/pkgs/development/python-modules/mwlib-ext/default.nix b/pkgs/development/python-modules/mwlib-ext/default.nix index 0a81fd58d7e..b9b18eaf9e5 100644 --- a/pkgs/development/python-modules/mwlib-ext/default.nix +++ b/pkgs/development/python-modules/mwlib-ext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/mwlib-rl/default.nix b/pkgs/development/python-modules/mwlib-rl/default.nix index d27de2ed45c..fdb70726eb6 100644 --- a/pkgs/development/python-modules/mwlib-rl/default.nix +++ b/pkgs/development/python-modules/mwlib-rl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mwlib diff --git a/pkgs/development/python-modules/mwlib/default.nix b/pkgs/development/python-modules/mwlib/default.nix index e9defe3ee14..d9edb2ef3ba 100644 --- a/pkgs/development/python-modules/mwlib/default.nix +++ b/pkgs/development/python-modules/mwlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 0546688b867..56aa4661516 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index f444ba039c2..69178edb691 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonApplication, protobuf }: +{ lib, fetchPypi, buildPythonApplication, protobuf }: buildPythonApplication rec { pname = "mypy-protobuf"; diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index 21a3ee21dbd..5992a6815d8 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: +{ lib, fetchPypi, buildPythonPackage, typing, pythonOlder }: buildPythonPackage rec { pname = "mypy-extensions"; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 9d91543b7ff..b7a0f39990e 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, libmysqlclient }: +{ lib, buildPythonPackage, fetchPypi, libmysqlclient }: buildPythonPackage rec { pname = "mysqlclient"; diff --git a/pkgs/development/python-modules/namebench/default.nix b/pkgs/development/python-modules/namebench/default.nix index eefdcce7990..b7b542b8a7a 100644 --- a/pkgs/development/python-modules/namebench/default.nix +++ b/pkgs/development/python-modules/namebench/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , isPyPy diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 0c8e442affc..0d7b53f03cb 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index f6131cd5309..8712c582bed 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "nanoleaf"; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index 4cf33fb2074..765941457d4 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: +{ lib, buildPythonPackage, fetchFromGitHub, nanomsg }: buildPythonPackage { pname = "nanomsg-python"; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index d846511eb3f..c320415e075 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, +{ lib, buildPythonPackage, fetchPypi, pythonOlder, async_generator, traitlets, nbformat, nest-asyncio, jupyter_client, pytest, xmltodict, nbconvert, ipywidgets , doCheck ? true diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 28946bd1a6e..3826a746758 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: +{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: let pname = "nbxmpp"; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index f933587dcad..ba3b9e4b087 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paramiko diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 7768614a5d1..0082b8e8db2 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyopenssl diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 7f4aab9c371..3f7f78a374c 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 456124b19bd..60f7dbe6c23 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, pytest +{ lib, buildPythonPackage, fetchPypi, isPyPy, pytest , numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index e546ac6cd57..489b6bddf56 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index 07dc63c2181..f7638b29a4c 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix index b81398f918c..2d388dfa4c2 100644 --- a/pkgs/development/python-modules/neuronpy/default.nix +++ b/pkgs/development/python-modules/neuronpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 356754fdeac..b608ae58fc7 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: +{ lib, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: buildPythonPackage rec { pname = "Nevow"; diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index dc889440aa4..eb04e0c4d89 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix index 1747332ed5a..e2ca5c6f27d 100644 --- a/pkgs/development/python-modules/nine/default.nix +++ b/pkgs/development/python-modules/nine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index cb7871aed61..6229baef32a 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 4edd31d6a25..acebe5d758f 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 5ba62fb9210..535ff621de5 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "0.7.0"; diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index 98f336c4986..ebd0178602c 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "noise"; diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix index 185270176ac..b75dcc526c5 100644 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ b/pkgs/development/python-modules/nose-cover3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix index 4f90ee4be8b..f4959ec7be7 100644 --- a/pkgs/development/python-modules/nose-cprof/default.nix +++ b/pkgs/development/python-modules/nose-cprof/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix index 8e31867d85c..2805dc4545a 100644 --- a/pkgs/development/python-modules/nose-focus/default.nix +++ b/pkgs/development/python-modules/nose-focus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti +{ lib, buildPythonPackage, fetchFromGitHub, six, nose, nose-of-yeti , nose-pattern-exclude, which }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix index 2bd63f3295d..16fb264b39a 100644 --- a/pkgs/development/python-modules/nose-of-yeti/default.nix +++ b/pkgs/development/python-modules/nose-of-yeti/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: +{ lib, buildPythonPackage, fetchFromGitHub, six, nose, fudge, should-dsl }: buildPythonPackage rec { pname = "nose-of-yeti"; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix index 05a7102f1ae..a550dc5aee1 100644 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "nose-pattern-exclude"; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 2805b7c2ea1..456bbfd9aed 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index b815e223d82..29ea73619ff 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index b920bb40736..bef7058bc3f 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index c165e87ff2e..f80953bd2d7 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index 36747a50aae..f60ed65448d 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , coverage diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix index 970928e03f4..bde039836ff 100644 --- a/pkgs/development/python-modules/notmuch/2.nix +++ b/pkgs/development/python-modules/notmuch/2.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , notmuch , python diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 609d4c78d5d..90695b84c66 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildPythonPackage , notmuch , python diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix index 266482a8ff2..be8a370f3f3 100644 --- a/pkgs/development/python-modules/ntplib/default.nix +++ b/pkgs/development/python-modules/ntplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 0c71b065a32..8e2f630fdba 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 832e281a9a1..17537be82b4 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 4676fdef0cd..c8147d9d9a4 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +{ lib, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils , blockdiag, setuptools }: diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index 4057ba1de8a..38920dc5542 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , isPy3k diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix index 158cf036840..fd12a830472 100644 --- a/pkgs/development/python-modules/oath/default.nix +++ b/pkgs/development/python-modules/oath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix index 0e53eaec7c0..c74de8d6bd6 100644 --- a/pkgs/development/python-modules/oauth/default.nix +++ b/pkgs/development/python-modules/oauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index 70b2e94e37c..d9c0ae505f7 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , httplib2 diff --git a/pkgs/development/python-modules/oauthlib/3.1.nix b/pkgs/development/python-modules/oauthlib/3.1.nix index 40501733e4c..10757812037 100644 --- a/pkgs/development/python-modules/oauthlib/3.1.nix +++ b/pkgs/development/python-modules/oauthlib/3.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index df65547a256..5c4cbc78adb 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 1dec57cafb4..b5736851fbb 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , pyptlib diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 8bb119bcb4b..c79b11252be 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix index edec161a133..1ae555ffa15 100644 --- a/pkgs/development/python-modules/offtrac/default.nix +++ b/pkgs/development/python-modules/offtrac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 5ef7060b7f6..72e2be7c78b 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, ofxhome, ofxparse, beautifulsoup4, lxml, keyring }: diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix index d9a28da1806..72ca65ed171 100644 --- a/pkgs/development/python-modules/ofxhome/default.nix +++ b/pkgs/development/python-modules/ofxhome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { version = "0.3.3"; diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index 235875eec7c..d018a924d89 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index 8f280d1cfd4..a32b0b23294 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index 96c0a0b51be..d2c39e54ef4 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "olefile"; version = "0.46"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 99b9cccc7de..ad9da46243b 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 067db3a69fe..08770678432 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docopt, netifaces }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 374b7cb059d..71f699e0552 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyusb diff --git a/pkgs/development/python-modules/openbabel-bindings/default.nix b/pkgs/development/python-modules/openbabel-bindings/default.nix index 18a6a8dd032..6488b8fad2f 100644 --- a/pkgs/development/python-modules/openbabel-bindings/default.nix +++ b/pkgs/development/python-modules/openbabel-bindings/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openbabel, python, buildPythonPackage }: +{ lib, openbabel, python, buildPythonPackage }: buildPythonPackage rec { pname = "openbabel"; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index 7d373c13a8a..ce6ccee9793 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "openidc-client"; diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 843380ebf21..2ed723944dd 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub }: rec { version = "2.9.0"; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 6c22d3bae5d..8b1ff86fcab 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -11,12 +11,11 @@ , pygobject3 , pyudev , setproctitle -, stdenv , wrapGAppsHook }: let - common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; + common = import ./common.nix { inherit lib fetchFromGitHub; }; in buildPythonApplication (common // rec { pname = "openrazer_daemon"; diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix index 52fe63318a3..fb83d64c502 100644 --- a/pkgs/development/python-modules/openrazer/pylib.nix +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -3,12 +3,11 @@ , dbus-python , fetchFromGitHub , numpy -, stdenv , openrazer-daemon }: let - common = import ./common.nix { inherit stdenv lib fetchFromGitHub; }; + common = import ./common.nix { inherit lib fetchFromGitHub; }; in buildPythonPackage (common // rec { pname = "openrazer"; diff --git a/pkgs/development/python-modules/ordereddict/default.nix b/pkgs/development/python-modules/ordereddict/default.nix index e2931840a66..6ef00640585 100644 --- a/pkgs/development/python-modules/ordereddict/default.nix +++ b/pkgs/development/python-modules/ordereddict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index 1cd0f648bd3..7c37cc7aa5a 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: +{ lib, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: buildPythonPackage rec { pname = "orderedmultidict"; diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index aced6cf0853..db9c265ef3e 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "orderedset"; diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index dad78727f2d..ac7e401bf6c 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber +{ lib, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber , m2crypto, rpm, chardet }: diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index c624e262cf9..e1c22ddbfa3 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy +{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy , pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/packaging/2.nix b/pkgs/development/python-modules/packaging/2.nix index 5d841eb4fb1..a9b4e159469 100644 --- a/pkgs/development/python-modules/packaging/2.nix +++ b/pkgs/development/python-modules/packaging/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyparsing diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 973e516f5a9..689c2e4516d 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyparsing diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix index 5daa60f475d..c17f0ad60dd 100644 --- a/pkgs/development/python-modules/pagelabels/default.nix +++ b/pkgs/development/python-modules/pagelabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pdfrw }: +{ lib, buildPythonPackage, fetchPypi, pdfrw }: buildPythonPackage rec { pname = "pagelabels"; diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix index ebe2c8b5854..8390cceb2fc 100644 --- a/pkgs/development/python-modules/pagerduty/default.nix +++ b/pkgs/development/python-modules/pagerduty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index d61973aa3bf..dce72bb74bb 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "palettable"; diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 2e8e4500f24..6df8b5491c9 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index c4bf9c140df..ea0ba44e99d 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index d31bc2657c9..8ca57440b3f 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 4553b253819..86dbffd76b7 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , boto3, requests, gradient_statsd, terminaltables , click-completion , click-didyoumean, click-help-colors , colorama, requests_toolbelt, gradient_sdk, progressbar2 diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 16925bd1286..207a6a38bd5 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: +{ lib, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }: buildPythonPackage rec { pname = "parameterized"; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 65cc79745ca..99065aa1994 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: +{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index d338a351e54..decb15ff5e6 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi +{ lib, fetchPypi , buildPythonPackage, pythonOlder , pytest, pytestrunner , parse, six, enum34 diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index d72e607bc41..c5c0c1d7ae6 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi +{ lib, fetchPypi , buildPythonPackage, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 1f98940fff0..77196a7c0e9 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index d41953246db..557e632f2ed 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index a29deed503e..533a4dc3a30 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 950b232fa7e..672708b0fd9 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestrunner diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 57dbb7b9352..a526d383393 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 96ed85d7bce..2f0a9b9b62b 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi +{ lib, buildPythonPackage, isPy27, fetchPypi , paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient , psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }: diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 981dc067fe7..126155722f4 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix index 8d7e78c6c27..ed11b3a4b52 100644 --- a/pkgs/development/python-modules/patch/default.nix +++ b/pkgs/development/python-modules/patch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchzip }: diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix index 9512b0eb0b8..bd71ffad0f2 100644 --- a/pkgs/development/python-modules/path-and-address/default.nix +++ b/pkgs/development/python-modules/path-and-address/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 77807090602..fd6bd238d1e 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , dill diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index 57fff82a81d..86c2aeb88dc 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 1420597a1f3..2fa07d32ccb 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file, gzip, bzip2, xz}: diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 5d01df22b6d..8721ef3dd60 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix index 18a2b9b95a3..8f489ca24b9 100644 --- a/pkgs/development/python-modules/pbkdf2/default.nix +++ b/pkgs/development/python-modules/pbkdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pbkdf2"; diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 6a12eea1b00..bd6432db534 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder +{ lib, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder , buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index aea7ff0fcda..704e979c2ca 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchFromGitHub -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index adc43ef4c2e..4eddc028a25 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }: +{ lib, buildPythonPackage, fetchPypi, pillow, poppler_utils }: buildPythonPackage rec { pname = "pdf2image"; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index 10bc09e8ca9..431f7f09796 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 9a659eebe33..96ba6686905 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; diff --git a/pkgs/development/python-modules/pdfposter/default.nix b/pkgs/development/python-modules/pdfposter/default.nix index 0a21ed1e499..00cfea5cc9b 100644 --- a/pkgs/development/python-modules/pdfposter/default.nix +++ b/pkgs/development/python-modules/pdfposter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pypdf2 }: +{ lib, buildPythonPackage, fetchPypi, pypdf2 }: buildPythonPackage rec { pname = "pdftools.pdfposter"; diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix index 49abb3751c9..5cc619ef6a4 100644 --- a/pkgs/development/python-modules/pdfrw/default.nix +++ b/pkgs/development/python-modules/pdfrw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pdfrw"; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 97dee7e7570..a8c110fdba7 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: buildPythonPackage rec { pname = "pdfx"; diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index ed0c89b7802..a66c4077c3c 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , isPy27 diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 0b103b780c0..71bec7e42df 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index 296b55eec12..e9cba70e631 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, pytest, mock }: +{ lib, buildPythonPackage, fetchurl, pytest, mock }: buildPythonPackage rec { pname = "pep257"; version = "0.7.0"; diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix index 8ef3bfea0f5..cc0e546b957 100644 --- a/pkgs/development/python-modules/pep8/default.nix +++ b/pkgs/development/python-modules/pep8/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix index 6caf61b0cd0..310cc565b21 100644 --- a/pkgs/development/python-modules/peppercorn/default.nix +++ b/pkgs/development/python-modules/peppercorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index 86bae927d9f..6859b6264a8 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose }: diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 1d7de0088a8..e65f62c8ff7 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix index 326dde176ae..a31d80eed05 100644 --- a/pkgs/development/python-modules/pexif/default.nix +++ b/pkgs/development/python-modules/pexif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix index d84bb2014b8..e53817b3911 100644 --- a/pkgs/development/python-modules/pg8000/1_12.nix +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 8f63e00e799..9f9bb1702a9 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , scramp diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix index d795cc3678f..e952ced742c 100644 --- a/pkgs/development/python-modules/pgpdump/default.nix +++ b/pkgs/development/python-modules/pgpdump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 796a3819881..476921da632 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: +{ lib, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: buildPythonPackage rec { pname = "pgspecial"; diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index 5a00a4ccb09..86a5ec848ac 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : +{ lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : let pname = "phe"; diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 03e0c54caab..2259fcd7ba5 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: +{ lib, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: buildPythonPackage rec { pname = "phonopy"; diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index 9ed84e86371..94538dc6e74 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: buildPythonPackage rec { pname = "phx-class-registry"; diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index 2151e13b960..34798cc3ee5 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pathpy diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 95aca29da5d..f4ce57b3a20 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index c4fd24d070e..aacd9e314cb 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index a36fcdf18bb..051fdef8fe7 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pika }: diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ec8310bdb55..c1bfe5297d7 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index ff2a2ce4c5e..38efe0a49b0 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -18,7 +18,7 @@ , qpdf , setuptools-scm-git-archive , setuptools_scm -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 4a3c682c122..bc21d6bf465 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix index 9e23f69d19c..c022fdb988d 100644 --- a/pkgs/development/python-modules/pillowfight/default.nix +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index d2a5641acff..bfe4e2b9ea0 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , slicerator diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index aae90d2f8b4..312c87ae544 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: +{ lib, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: buildPythonPackage rec { pname = "pivy"; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index dbf487c5d3a..5216ab17879 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pkginfo"; diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix index 8e3e301793a..1944ac5197c 100644 --- a/pkgs/development/python-modules/pkuseg/default.nix +++ b/pkgs/development/python-modules/pkuseg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 9e2c66d9d1e..9261133bc92 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index 956ea1b720a..697717eeca6 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "1.0.0"; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index d8537d68158..aa247c8e426 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix index 3599d3dec55..e5a2d464bde 100644 --- a/pkgs/development/python-modules/pocket/default.nix +++ b/pkgs/development/python-modules/pocket/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index f7c4e1139a8..00353ac0cca 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "polib"; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 7595730eb31..8f260ad8ccb 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: buildPythonPackage rec { pname = "pomegranate"; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 7a734927ee1..03330c4cfec 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, fetchPypi }: +{ lib, python, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pony"; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 282239d9890..de0ba145828 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy27 , fetchPypi diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 4aaaea40677..e94a234dc1a 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch +{ buildPythonPackage, fetchPypi, lib, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch , substituteAll }: diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 10b30d05fa3..1408f7ca905 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm, tempora, pytest-black, pytestcov }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index 2fb6128dc1b..59f4b4b707f 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix index 9f2774b9a60..671010bb900 100644 --- a/pkgs/development/python-modules/potr/default.nix +++ b/pkgs/development/python-modules/potr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pycrypto }: +{ lib, fetchPypi, buildPythonPackage, pycrypto }: buildPythonPackage rec { pname = "python-potr"; diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix index d1998faf6b6..8f72553092e 100644 --- a/pkgs/development/python-modules/power/default.nix +++ b/pkgs/development/python-modules/power/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index e7013154f99..24591824e07 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index d600e46c6b4..b7963258f33 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 00542c6e90e..ad3a393a00d 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 00182eda037..3fc485c00ec 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 61b869e87fb..a4c048e9c9b 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , betamax , betamax-serializers , betamax-matchers diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 533c31d87ce..2b6eff885f9 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers, pytest diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index a2144f303be..44be123335f 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: +{ lib, buildPythonPackage, fetchPypi, six, unidecode, nose, yanc }: buildPythonPackage rec { pname = "preggy"; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index 5d75c95d770..767d5b867f0 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , murmurhash diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index 4fe726591e6..87e0e6613b1 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pretend"; diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix index 5b7457af9bf..0bd18f0721f 100644 --- a/pkgs/development/python-modules/prettytable/1.nix +++ b/pkgs/development/python-modules/prettytable/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 5a15cfd24eb..5463403dec7 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index 00905136716..a2a1d04ebe0 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "proboscis"; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 4b83205d723..abf175b5531 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index 3f8c1104381..9839ea9dd23 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tqdm }: +{ lib, fetchPypi, buildPythonPackage, tqdm }: buildPythonPackage rec { pname = "proglog"; diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index 2c5dbc1386e..fcc1a7a9229 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index a1fdddd95db..68967ecf653 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar"; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index cc3029ade64..b5c488c0838 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python , buildPythonPackage , fetchPypi diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix index f8980647482..d421efde8aa 100644 --- a/pkgs/development/python-modules/progressbar231/default.nix +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "progressbar231"; diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix index 0b53b83f5cc..a483a6001f0 100644 --- a/pkgs/development/python-modules/progressbar33/default.nix +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar33"; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 1cd732b19ae..cc9444098de 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 9ab4cbf72bd..acee0f09b84 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , lxml diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index ffa9bdacd2d..ae2ad58a1ac 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage { pname = "ptable"; diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index c19780a4411..2a4180a4cbe 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index fd7b92692fc..2758c3a582f 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi +{ lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi , pygments, importlib-metadata, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index abac4fb3baa..997bc31c865 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "publicsuffix"; diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index 2d9bc73baa3..30a02ec2f0d 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "publicsuffix2"; diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 0ee2a8470b5..db48fbf1e48 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix index 9679cc593df..636cbaff71c 100644 --- a/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pure-pcapy3"; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index 715b2ca6902..3615935b88e 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , python , fetchFromGitHub diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index 1093f125a96..1ef14af135f 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 006246e5836..3a93b36cb2b 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six , pytestCheckHook, flaky, mock, pytest-mock, requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index fe74fcece1c..1b8e1a3cc6f 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 77f7859c6d4..a24e1d5db13 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , debugger , fetchPypi diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix index 57614089e66..21dc2f4abc4 100644 --- a/pkgs/development/python-modules/pxml/default.nix +++ b/pkgs/development/python-modules/pxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pythonAtLeast , isPy27 , buildPythonPackage diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index fa057ae9925..18fff5ec97f 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , coverage diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 4d2b77bb1f2..aa12deabb37 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "py"; diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 1f7aeaf1e11..12297b9a6f7 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 71314a08eeb..bd0f179dc85 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 588d7a32d22..8eb1649fcc5 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv }: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { pname = "py4j"; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index f53cc45b9fe..c214b375ff3 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , cryptography , deprecated diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index af86ce3821e..b5ae4193f18 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , openssl diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index d424b214429..5bebb1d5bc7 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 075103e9e40..680a8f6f830 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , matplotlib diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index f0cf111a87a..cebb1cc3f0b 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: buildPythonPackage rec { pname = "PyAMF"; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 9c9c18a886e..332a4161fe7 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 2be2e8b9c11..4bb515e17aa 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 9b269f79c86..a0037d64683 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, }: +{ lib, buildPythonPackage, fetchPypi, }: buildPythonPackage rec { pname = "pyasn1"; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 187f94dbd77..9e4f872e6f2 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , aiohttp , aiozeroconf , asynctest diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index d88dc7009b7..e937b8759f6 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 63e180b11b2..e77c6dda840 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: +{ buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { version = "0.3.24"; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index e462d53fea8..aa65d7ccadf 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, lib, stdenv, fetchPypi, six, pytest }: +{ buildPythonPackage, isPy3k, lib, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 4b6f7f1682f..9e8174f9b7f 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.21.0"; diff --git a/pkgs/development/python-modules/pyblosxom/default.nix b/pkgs/development/python-modules/pyblosxom/default.nix index dee6aea559a..77e47eb9836 100644 --- a/pkgs/development/python-modules/pyblosxom/default.nix +++ b/pkgs/development/python-modules/pyblosxom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pygments diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index a02861c68cd..1cd7d91ef25 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pkgs diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index eacbd81055c..7517de59754 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix index 1353af406ca..af9f18aad2c 100644 --- a/pkgs/development/python-modules/pycallgraph/default.nix +++ b/pkgs/development/python-modules/pycallgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 6fc9d2af1cb..1f7ccde2576 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie +{ lib, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie , sqlite, buildPythonPackage, cython }: diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index ab9088cf1e5..7e8954e04d0 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , capnproto , cython diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix index 7885cf65b83..b3479695a89 100644 --- a/pkgs/development/python-modules/pycarddav/default.nix +++ b/pkgs/development/python-modules/pycarddav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 8404063ac1f..9b3ec94babc 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix index 2c2399fca92..f020361474a 100644 --- a/pkgs/development/python-modules/pychart/default.nix +++ b/pkgs/development/python-modules/pychart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "pychart"; diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix index 1702cde840c..ddd7dec820d 100644 --- a/pkgs/development/python-modules/pychef/default.nix +++ b/pkgs/development/python-modules/pychef/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index e8938954709..27a2a1d8084 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , setuptools_scm diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index ada4eeeb556..8e0a9e3b152 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: buildPythonPackage rec { pname = "pycm"; diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index a21c8f6f549..d42cfcadfee 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , gnupg diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 4b177012f4e..e8e0809c022 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }: buildPythonPackage rec { pname = "pycollada"; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 0b511e024dc..2a90bef7256 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, pyparsing, decorator, six, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index b402e909240..525a5610711 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index a246ce53a1e..5fe7cab1cdb 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "pycparser"; diff --git a/pkgs/development/python-modules/pycryptopp/default.nix b/pkgs/development/python-modules/pycryptopp/default.nix index 0f17d9e59a8..7079cde0d59 100644 --- a/pkgs/development/python-modules/pycryptopp/default.nix +++ b/pkgs/development/python-modules/pycryptopp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix index 763cfb9b845..44913e1de47 100644 --- a/pkgs/development/python-modules/pydenticon/default.nix +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 08c5f099d28..be3cddc7c14 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index d132fad7313..d949b16d105 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix index a93820bfaef..a6fb07c1520 100644 --- a/pkgs/development/python-modules/pydns/default.nix +++ b/pkgs/development/python-modules/pydns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix index 10ade4fa2ca..83820629552 100644 --- a/pkgs/development/python-modules/pyechonest/default.nix +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "pyechonest"; diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 712db3e8712..7e388b93971 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, stdenv, isPy27 }: +{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, isPy27 }: buildPythonPackage rec { pname = "pyee"; diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 4e7594fbab5..c7b277a6098 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib, buildPythonPackage, fetchPypi, numpy, cython }: buildPythonPackage rec { pname = "pyemd"; diff --git a/pkgs/development/python-modules/pyexcelerator/default.nix b/pkgs/development/python-modules/pyexcelerator/default.nix index 37388507394..b3a376616d3 100644 --- a/pkgs/development/python-modules/pyexcelerator/default.nix +++ b/pkgs/development/python-modules/pyexcelerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index befbd3c2de1..eb88bf78586 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "pyext"; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index a17388b34b5..d7c77e763e7 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit }: diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index ff66dc8f867..155254a6af3 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index a4fe9ec9dfe..e9671e03cb3 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.8.post1"; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 2ff88a78a4e..cf1b8878183 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 5d0d72eb495..b3aa456c4a9 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index 8648ad4f876..c8b52fce409 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 6855c9e4f02..ec4cff2de61 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchpatch diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index afca3dd7bc1..00965b4a149 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPy27 +{ lib, buildPythonPackage, fetchurl, isPy27 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index a1a6b0222b8..7e06b27a23f 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, castxml, fetchFromGitHub, buildPythonPackage, +{ lib, castxml, fetchFromGitHub, buildPythonPackage, llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix index 7aa16ac1e9a..b9b588d669a 100644 --- a/pkgs/development/python-modules/pygeoip/default.nix +++ b/pkgs/development/python-modules/pygeoip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 2e5d6271c66..152e9463b0e 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 31a6b043494..0a88e34005c 100644 --- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pygments diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index 416410ab3ce..29be02751bb 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPyPy +{ lib, buildPythonPackage, fetchurl, isPyPy , gpgme }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index f239647bafa..e9b66a95771 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz +{ lib, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz , pkg-config, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 20a96d1f8f2..92526b465b1 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: buildPythonPackage { pname = "pygreat"; diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix index 8f694a117fe..56d8b05af9a 100644 --- a/pkgs/development/python-modules/pygrok/default.nix +++ b/pkgs/development/python-modules/pygrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, regex, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, regex, pytest }: buildPythonPackage rec { pname = "pygrok"; diff --git a/pkgs/development/python-modules/pyhamcrest/1.nix b/pkgs/development/python-modules/pyhamcrest/1.nix index 5df52d9b658..4c2ec4df681 100644 --- a/pkgs/development/python-modules/pyhamcrest/1.nix +++ b/pkgs/development/python-modules/pyhamcrest/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest , six }: diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index a66e26b1319..fd6ba2f2df9 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest , six }: diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 502d648b400..65d3f60da04 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pyhomematic"; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 3512e33c81d..e152002cdd1 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 92c2f5bb671..e5714ec1800 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index a52a0bb4001..1d4f4cfa784 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index f37ddb2483e..3161548f8b5 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }: +{ lib, buildPythonPackage, fetchPypi, numpy, nose, openmp }: buildPythonPackage rec { pname = "pykdtree"; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 07a32a25a0c..13d7a4fd248 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, krb5 }: +{ lib, fetchPypi, buildPythonPackage, krb5 }: buildPythonPackage rec { pname = "pykerberos"; diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index bc10295e232..8b1eefdafed 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , urlgrabber diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 707554be559..26812ff9151 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six +{ lib, buildPythonPackage, fetchPypi, isPy3k, certifi, six , setuptools_scm }: diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 25989d0353e..2cabb78544e 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyparsing }: +{ lib, buildPythonPackage, fetchPypi, pyparsing }: buildPythonPackage rec { pname = "pylibconfig2"; version = "0.2.5"; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 454f08fd10e..64f8e62c286 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPyPy diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 8bb62c09134..9fb8401bdc4 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, libmemcached, zlib, cyrus_sasl }: +{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }: buildPythonPackage rec { version = "1.6.1"; diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 3b35ce3e716..8869924bddb 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 64ea5b4ff5b..6d12ddd4006 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pymaging diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 84fcdbef6a3..bae7a561323 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , enum34 , glibcLocales , matplotlib diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 96fb9d6f694..13e80a38e4b 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "PyMeeus"; diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix index b44ff9fef49..f66a6ef702b 100644 --- a/pkgs/development/python-modules/pymemoize/default.nix +++ b/pkgs/development/python-modules/pymemoize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , django diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 84139091ae4..72a17f27dca 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: +{ lib, python, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pymetar"; diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 2b10e2f164f..b3d91c595d8 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , aiohttp diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index d69c0011ac5..84ab3dcab1b 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tkinter }: +{ lib, fetchPypi, buildPythonPackage, tkinter }: buildPythonPackage rec { pname = "PyMsgBox"; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 8ce7d5a19c6..501f829dc14 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: +{ lib, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "pymupdf"; version = "1.18.0"; diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix index 6009b03e508..49b5a49193d 100644 --- a/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/pkgs/development/python-modules/pymysqlsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pymysql diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index 656825a36bb..a6df8cb036d 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl }: diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index be69bf3d802..37cf0a9ef10 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 6214f3db42b..7ca72293382 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake +{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake , pythonOlder, libnest2d, sip, clipper }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 0ecac704e1e..28e9922e172 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, psutil, docutils }: +{ lib, buildPythonPackage, fetchPypi, psutil, docutils }: buildPythonPackage rec { pname = "pynisher"; diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix index 294c2374f53..3f1cca75dc1 100644 --- a/pkgs/development/python-modules/pynzb/default.nix +++ b/pkgs/development/python-modules/pynzb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 2dec1d8705b..8f2686a7914 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: buildPythonPackage rec { pname = "pyodbc"; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 4171eaeeb57..cf881a58048 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , Mako diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 23de6b2323f..c6839bba989 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index ffe7bf01423..c54e220228a 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , pandoc, haskellPackages, texlive }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index d69b1078aee..1244f374b44 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index cd91cc347a4..26d27f4455a 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , glibcLocales diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix index 1f16a307a0c..8b630f743d1 100644 --- a/pkgs/development/python-modules/pypeg2/default.nix +++ b/pkgs/development/python-modules/pypeg2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index d8b9abcf97a..2f573b67838 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "Pyphen"; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index bc0e4535999..1fc4198ebeb 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow +{ lib, buildPythonPackage, fetchFromGitLab, nose, pillow , isPy3k, isPyPy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index 8747840fd7c..0c8c6c4328a 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix index 83190bc292a..348f9171502 100644 --- a/pkgs/development/python-modules/pypoppler/default.nix +++ b/pkgs/development/python-modules/pypoppler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index d270136558f..9c13a953570 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , psutil , pytest }: diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix index af2575d2143..9f9f99884b9 100644 --- a/pkgs/development/python-modules/pyptlib/default.nix +++ b/pkgs/development/python-modules/pyptlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index b806177b4d7..22ac89cf6a9 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose +{ lib, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose , django, jinja2, tornado, pyramid, pyramid_mako, Mako }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 98b30b24707..f43bfb9aaa6 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 2496d9d968f..2bb2eb1c6fc 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cssselect diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 5f1e5c7d75a..44ac5a9221a 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix index 88dc62886fc..5c4e7c104bf 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: +{ lib, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: buildPythonPackage rec { pname = "pyramid_beaker"; diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 2bb5a03bdb9..d3388fdff35 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , chameleon diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 80514cc91b4..55da77f4964 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index ab4025b7230..f2f156e98b6 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pyramid diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 0497ab79613..464d8d209bf 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 8c71563e2d7..2f8c5e1e075 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webtest diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index 9167918fc47..545883a25c1 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyramid diff --git a/pkgs/development/python-modules/pyreport/default.nix b/pkgs/development/python-modules/pyreport/default.nix index 09a1e7c6b41..6b9649699ba 100644 --- a/pkgs/development/python-modules/pyreport/default.nix +++ b/pkgs/development/python-modules/pyreport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index 6d49bd02594..b1d5f4efb09 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: +{ lib, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: let diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index f6be3c4c897..9885d4f5443 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytz diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index a84b22e0656..626560d89b6 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib , python , serpent , dill diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index e533f650169..bddf2413970 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , docutils, pygments, setuptools }: diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index f2378863720..e5c87a94b07 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, buildPythonPackage, fetchPypi}: +{lib, buildPythonPackage, fetchPypi}: buildPythonPackage rec { pname = "pyroute2"; diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index f8ac5d8e867..cb1da523868 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 211bc85f511..79f6666474e 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix index e3586e6dbf1..4a7dc788caa 100644 --- a/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/pkgs/development/python-modules/pyrss2gen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 7d2fdb5b426..2ffbb97223f 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchFromGitHub diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 6da19bc48ab..e4e7791fa79 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index a35f2ae77f0..1a7c783e829 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index 214412c4cee..8cff62b89c1 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: +{ lib, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: buildPythonPackage { version = "2017-07-13"; pname = "pysensors"; diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index ff3d624490b..54f3f80a3f8 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , pyserial }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix index 28daf6b385e..3333a30bd1a 100644 --- a/pkgs/development/python-modules/pysftp/default.nix +++ b/pkgs/development/python-modules/pysftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 661c70a0ab2..7f494e98ad2 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix index 8e31735db2e..ccacb412924 100644 --- a/pkgs/development/python-modules/pysigset/default.nix +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pysigset"; diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 6834a78f428..bea1438f679 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , samba, pkg-config , setuptools }: diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix index 02559510100..25f5fc6a20c 100644 --- a/pkgs/development/python-modules/pysmf/default.nix +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: buildPythonPackage rec { pname = "pysmf"; diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 953581aa302..7b96b97f0bb 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ply diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 7dce4d9b4d1..0b0e298d5d0 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index 79c163726b7..70fb74ab4dd 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 342755131a3..f8a7c09b407 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, py4j }: +{ buildPythonPackage, fetchPypi, lib, py4j }: buildPythonPackage rec { pname = "pyspark"; diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 7c5d8ca5abf..8445f6d7e89 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: buildPythonPackage rec { pname = "pysqueezebox"; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 4012a732466..1099bffc40f 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , chardet diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 4f73ada61af..cdbbfeabf88 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: buildPythonPackage rec { pname = "pyssim"; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 6ed036aecb1..c93655e10a8 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: +{ lib, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "pystache"; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 69186591949..e77dd605388 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, systemd }: +{ lib, python, systemd }: python.pkgs.buildPythonPackage rec { pname = "pystemd"; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 0ba23ffec5d..120867f389c 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, fetchPypi, buildPythonPackage, cython }: +{ lib, python, fetchPypi, buildPythonPackage, cython }: buildPythonPackage rec { pname = "PyStemmer"; diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix index db8437d8957..fb2e622eac9 100644 --- a/pkgs/development/python-modules/pytabix/default.nix +++ b/pkgs/development/python-modules/pytabix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 636210c93d5..a54c89f348d 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "PyTado"; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 65d3d9218d0..e930f1d5717 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: buildPythonPackage rec { pname = "pyte"; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 7384eb36070..fad9a70af0f 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: +{ lib, buildPythonPackage, fetchPypi, pytest, aiohttp }: buildPythonPackage rec { pname = "pytest-aiohttp"; diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 1a7f77bf9b6..68b67f061bb 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyannotate diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 309a33e8907..4ca6bdac6e9 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ansible diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index c621d9a4785..0f37d09a9e0 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: +{ lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; version = "0.14.0"; diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index 493a2307e7e..83757c2e166 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , execnet , glob2 , Mako diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix index 2fb02244d1d..39c26a3e0f3 100644 --- a/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: +{ lib, buildPythonPackage, fetchPypi, pytest, unzip }: buildPythonPackage rec { pname = "pytest-catchlog"; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 034c657b5b0..414cf1ecc9c 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: buildPythonPackage rec { pname = "pytest-celery"; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 41f316a18a6..a0ae504746d 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index aa921ddeb3d..003d7e14ab5 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, coverage }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index b1cdb1033a6..1dc218c0808 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , setuptools_scm, pytest, cmake }: diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index bc6e2441b0f..bdcab2788ae 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, py, pytest }: +{ lib, buildPythonPackage, fetchPypi, py, pytest }: buildPythonPackage rec { pname = "pytest-datafiles"; diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 9a3dbed55b1..7108a8f4c17 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { version = "0.5.1"; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 069aa2812eb..bfcda812529 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 061f62bfc17..32392f8f14c 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools-git, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index fd4ed097806..805c19751ed 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest , pyflakes }: diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 74e33a7731b..7b459b4a294 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 41263ce692b..c634aa00718 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchFromGitHub , pytest -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 0b1090f7b81..1b09d6863b9 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , pytest, pytest-metadata, setuptools_scm }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index e8b224dc1d4..f7766003be1 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, setuptools_scm }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 0cc3a993c23..30a2757ecf3 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix index eb5203c0246..827386786b7 100644 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/pkgs/development/python-modules/pytest-pep257/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }: +{ lib, buildPythonPackage, fetchPypi, pytest, pep257 }: buildPythonPackage rec { pname = "pytest-pep257"; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 5148fa4b760..4e08a8fabba 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.6"; diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix index 0d02a25ec3c..78b99714378 100644 --- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , py, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index 2def886c5cb..d84bb3c9acf 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 401307039e5..19d031b6a2b 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 537f32316a3..1bd91fe70f7 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: buildPythonPackage rec { pname = "pytest-rerunfailures"; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 41fcfc7b159..ca3c9a37c1a 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytest-shutil, pytest-fixture-config, psutil , requests, future, retry }: diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 3edafdfb473..9d088e44f8d 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, isPyPy, buildPythonPackage, fetchPypi +{ lib, isPyPy, buildPythonPackage, fetchPypi , pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index f7454ee644c..5006ac51150 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "pytest-subtesthack"; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index a910bf3245f..8ea981ba2e7 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix index 0c5ae06e861..fa794f94141 100644 --- a/pkgs/development/python-modules/pytest-xdist/1.nix +++ b/pkgs/development/python-modules/pytest-xdist/1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest +{ lib, fetchPypi, buildPythonPackage, execnet, pytest , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index e5019f842fe..30e43c17c91 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 +{ lib, fetchPypi, buildPythonPackage, execnet, pytest_6 , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 63e57a7f769..f30eec15a0a 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +{ lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index 1293cc94b0f..341d5ac2240 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 6f5c99a99b1..798084d1111 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy , atomicwrites , attrs , funcsigs diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix index 877e357d946..cf8643db06d 100644 --- a/pkgs/development/python-modules/pytestcache/default.nix +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, execnet }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 7fd901babd0..d6203276b82 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix index 7e94f743da4..e0cb03d611d 100644 --- a/pkgs/development/python-modules/python-doi/default.nix +++ b/pkgs/development/python-modules/python-doi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }: buildPythonPackage rec { pname = "python-doi"; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 19efcb89d3d..212e191568c 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "1.0.4"; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 44e35a186e2..293d9771280 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , buildPythonPackage , pkg-config diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index f4305473797..f9b01802c42 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix index 392c5c2126d..991ec3279de 100644 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchPypi +{ buildPythonPackage, lib, fetchPypi , requests , nose , responses diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 661ea4ba249..6c6806f043c 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "python-frontmatter"; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index c706ff7903c..1a2e28d57ab 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 36ca3a71906..fe686761107 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, gnupg }: +{ lib, buildPythonPackage, fetchPypi, gnupg }: buildPythonPackage rec { pname = "python-gnupg"; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 238b9b9e4af..c8f1179bc66 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: buildPythonPackage rec { pname = "python-hosts"; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 0de220094c0..15c6474cc38 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , future, six, ecdsa, rsa , pycrypto, pytestcov, pytestrunner, cryptography , pytestCheckHook diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 96ce13ab265..cb36bf50e18 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 3a0ab33363e..53dab817eb2 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytestCheckHook, mock, pytestcov, coverage , future, futures, ujson, isPy38 }: diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index f22652d0f73..b30542dacbd 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index 94d8abd1fab..379aaa5ab64 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, py4j }: +{ lib, buildPythonPackage, fetchPypi, py4j }: buildPythonPackage rec { pname = "python-ldap-test"; diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix index 60767e77e76..dda64a85fb2 100644 --- a/pkgs/development/python-modules/python-levenshtein/default.nix +++ b/pkgs/development/python-modules/python-levenshtein/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix index 6f83a7f61c7..cc38553a817 100644 --- a/pkgs/development/python-modules/python-ly/default.nix +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv }: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { pname = "python-ly"; diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix index a1fd0113423..61194ff8f9c 100644 --- a/pkgs/development/python-modules/python-lzf/default.nix +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { version = "0.2.4"; diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index fe68ed60e37..36c297358e8 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , python diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 8321795c2fb..78c89408ac2 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , appdirs diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix index a24f2a383a3..131c0f2f5ac 100644 --- a/pkgs/development/python-modules/python-mnist/default.nix +++ b/pkgs/development/python-modules/python-mnist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "python-mnist"; diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index ba3ecd3883a..4bb12ab7237 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "python-nomad"; diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index 7a40998eebd..6b657dba78d 100644 --- a/pkgs/development/python-modules/python-otr/default.nix +++ b/pkgs/development/python-modules/python-otr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index ba02ec84635..2e2b59eb29d 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, sh }: buildPythonPackage rec { pname = "python-packer"; diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix index 6e0c0ef5788..d776002b212 100644 --- a/pkgs/development/python-modules/python-pipedrive/default.nix +++ b/pkgs/development/python-modules/python-pipedrive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 2d81581c0cc..1af58300c2f 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index c4cf0dc7425..4ef3b9f8379 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 235d085fffd..7a53e73b2b8 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , redis diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 8ec7f6887ad..3162a032628 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , unzip }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 1860ff6d24d..fd488f4be9d 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python, text-unidecode }: +{ lib, fetchPypi, buildPythonPackage, python, text-unidecode }: buildPythonPackage rec { pname = "python-slugify"; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index ee9a6030144..e9c2ae146b0 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , bidict , buildPythonPackage , fetchFromGitHub diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 52dea24c45f..b681fcf85a9 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , certifi diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index 4b1e7e2c1eb..c368d97633f 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , fetchpatch diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix index 7f6f14c9888..94f56698a3e 100644 --- a/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, requests, hidapi }: +{ lib, fetchPypi, buildPythonPackage, requests, hidapi }: buildPythonPackage rec { pname = "python-u2flib-host"; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 69f741e7437..8d82ffb6b3b 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , udev }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix index fa82027777f..f80721078db 100644 --- a/pkgs/development/python-modules/python-unshare/default.nix +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index f96086393f2..8c3a5bf797d 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , oath diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index 503fbe101b9..7f6eee4906c 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix index b9d9b110f60..78378a738db 100644 --- a/pkgs/development/python-modules/python2-pythondialog/default.nix +++ b/pkgs/development/python-modules/python2-pythondialog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index ad8ea88d1d0..769067f53fb 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: +{ lib, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: buildPythonPackage rec { pname = "python3-openid"; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index df12d7aeaff..6a5c6a304f1 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver +{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver , six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/pkgs/development/python-modules/python_keyczar/default.nix index 5fff75ada91..66cf28a15dd 100644 --- a/pkgs/development/python-modules/python_keyczar/default.nix +++ b/pkgs/development/python-modules/python_keyczar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyasn1 diff --git a/pkgs/development/python-modules/python_mimeparse/default.nix b/pkgs/development/python-modules/python_mimeparse/default.nix index c3f85affe81..0f713bd2139 100644 --- a/pkgs/development/python-modules/python_mimeparse/default.nix +++ b/pkgs/development/python-modules/python_mimeparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index 2c5357297ea..8f649d4d4d2 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , pkg-config , systemd, libyaml, openzwave, cython, pyserial , six, pydispatcher, urwid }: diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix index ae293c44c0f..2aabaec2e14 100644 --- a/pkgs/development/python-modules/python_statsd/default.nix +++ b/pkgs/development/python-modules/python_statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index c385f11b2f0..6f8b6a2bbec 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix index 178e1855a06..54c84fe6ef5 100644 --- a/pkgs/development/python-modules/pythonirclib/default.nix +++ b/pkgs/development/python-modules/pythonirclib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , paver diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index 80535b28bf2..9261ab2a8f2 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }: +{ lib, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }: buildPythonPackage rec { pname = "pythonix"; diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 1ced6437530..3bf0ad078c5 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, nose }: +{ lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { pname = "pytimeparse"; diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index 64e6ed4c669..b13dfd07dad 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , python diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 83980c3d00b..3ce1e70e823 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index 8e168bf8181..01c4ea014ad 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix index 2b49b169c6d..3437c0fbe7a 100644 --- a/pkgs/development/python-modules/pytun/default.nix +++ b/pkgs/development/python-modules/pytun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index 739325d3333..342bb088170 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "pytzdata"; diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index 1eec6f3ea84..dfbae696b8e 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index f33aba8d625..cd0460dc7e1 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index f1c0d3be8cc..dd1c7b2da5b 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 95477196d8b..0be0d61ed0d 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPyPy , pkgs diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix index 7013cc7809d..2fd5a96fa93 100644 --- a/pkgs/development/python-modules/pyvoro/default.nix +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index 5e3c4d6cc5a..a2cd2a6eed5 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, watchman }: +{ lib, buildPythonPackage, fetchPypi, watchman }: buildPythonPackage rec { pname = "pywatchman"; diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index 5ed3e28b5b1..2f6bb8553a4 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "PyWebDAV"; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index b19e5f97e14..d46bd718a3a 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 03fce00629d..e0434e8e4dd 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }: +{ lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }: buildPythonPackage rec { pname = "PyZufall"; diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/pkgs/development/python-modules/qpid-python/default.nix index ef540538792..24c90d072a2 100644 --- a/pkgs/development/python-modules/qpid-python/default.nix +++ b/pkgs/development/python-modules/qpid-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 113d53ff29b..29f2ab49606 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index 82c3773f303..24719de779e 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , disabledIf , isPy3k diff --git a/pkgs/development/python-modules/qserve/default.nix b/pkgs/development/python-modules/qserve/default.nix index ff606d13236..0548b6fdf17 100644 --- a/pkgs/development/python-modules/qserve/default.nix +++ b/pkgs/development/python-modules/qserve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 11b4885e4c8..4945bead42d 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: +{ lib, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: buildPythonPackage rec { pname = "QtAwesome"; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 76db7090a04..17e1d9dbe83 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyside, pytest }: +{ lib, buildPythonPackage, fetchPypi, pyside, pytest }: buildPythonPackage rec { pname = "QtPy"; diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix index 25b3c113cec..6288d196bb4 100644 --- a/pkgs/development/python-modules/querystring-parser/default.nix +++ b/pkgs/development/python-modules/querystring-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, python, isPy27 +{ lib, buildPythonPackage, fetchPypi, python, isPy27 , six }: diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 7471ea18065..3814663c044 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 79975ada501..0de5d6de3bb 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , mock diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 5c561b6e654..5d3540e0195 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage }: buildPythonPackage { pname = "radicale_infcloud"; diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index c5ec1d3ab4e..e484c07f31c 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 2d3e2bdc0e0..c3ae88d1775 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, pytest, pytest-mock, pytest-server-fixtures, pytest-localserver , termcolor, click, markdown2, six, jsonref, pyyaml, xmltodict, attrs }: diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix index 9ed7701a3f4..6845a5707da 100644 --- a/pkgs/development/python-modules/random2/default.nix +++ b/pkgs/development/python-modules/random2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 22c34b82a5f..545782d853e 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 # unrar is non-free software , useUnrar ? false, unrar }: diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix index 4d3ff6d486b..fc51e1488d6 100644 --- a/pkgs/development/python-modules/ratelimiter/default.nix +++ b/pkgs/development/python-modules/ratelimiter/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv + lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index 974f7ac4d1c..0a96123db04 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, fetchpatch +{ lib, fetchPypi, buildPythonPackage, fetchpatch , libraw , pytest, mock }: diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 507102222fe..3de6f203803 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; version = "1.0.6"; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 211f5d63a7d..ea13c7083fe 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: buildPythonPackage rec { pname = "readchar"; diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix index 044c487eb03..95b45185a08 100644 --- a/pkgs/development/python-modules/readme/default.nix +++ b/pkgs/development/python-modules/readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 750efe357c2..8a4754e7a61 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: buildPythonPackage rec { pname = "rebulk"; diff --git a/pkgs/development/python-modules/recaptcha_client/default.nix b/pkgs/development/python-modules/recaptcha_client/default.nix index 08e7ff47aa1..dce24cfa7a8 100644 --- a/pkgs/development/python-modules/recaptcha_client/default.nix +++ b/pkgs/development/python-modules/recaptcha_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index c87a89b82a4..d9dd54e29f4 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, nose }: buildPythonPackage rec { pname = "reedsolo"; diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index dc40763f6fe..078e431f3ba 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose +{ lib, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose , preggy, numpy, yanc, nose-focus, mock, opencv }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index a8f0f81ee71..a742c422ee9 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , cython diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix index a9355cda41c..2c51238e19b 100644 --- a/pkgs/development/python-modules/repeated_test/default.nix +++ b/pkgs/development/python-modules/repeated_test/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix index ad8c3aef2ea..9d6c2c41921 100644 --- a/pkgs/development/python-modules/repocheck/default.nix +++ b/pkgs/development/python-modules/repocheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix index 7b8f0ecd809..e986f47e6e0 100644 --- a/pkgs/development/python-modules/repoze_lru/default.nix +++ b/pkgs/development/python-modules/repoze_lru/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 53761203113..5d5e27a2e11 100644 --- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index f64158f26a1..1b33bb6954b 100644 --- a/pkgs/development/python-modules/repoze_who/default.nix +++ b/pkgs/development/python-modules/repoze_who/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 2b3d57831c8..d39fcc5f2a6 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , mock, requests, six, urllib3 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index cd36a452819..225a8f149e4 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index a1c6f4fb0a1..73272990e0f 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: +{ lib, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: buildPythonPackage rec { pname = "requests-kerberos"; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index a49b0710220..e0dfb9a24a6 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , urllib3, idna, chardet, certifi , pytest }: diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 38b4ae9911d..551c7f5b93e 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pytest diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index b3590023373..947aa505f70 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix index 12ba4f9a1a5..c2f91c8fe1b 100644 --- a/pkgs/development/python-modules/retry_decorator/default.nix +++ b/pkgs/development/python-modules/retry_decorator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 65127d040f4..5e2451affb9 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix index c002f0baaa9..b9b7cdb76c4 100644 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, isPy3k }: +{ lib, buildPythonApplication, fetchPypi, isPy3k }: buildPythonApplication rec { pname = "rfc-bibtex"; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 561bda08d0c..93f2f2ce37d 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: buildPythonPackage rec { pname = "rfc3986"; diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix index 1ec8fc2153c..41beb1c8c17 100644 --- a/pkgs/development/python-modules/rfc3987/default.nix +++ b/pkgs/development/python-modules/rfc3987/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rfc3987"; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index d19f47281cd..3c0810072c0 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 7ca9d711739..d78c445a3e5 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; version = "1.1.0"; diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index 0ac5d9ab2a3..0724abec19a 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pythonOlder , fetchPypi diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index fe069be459c..4f5d44006c4 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: +{ lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: buildPythonPackage rec { pname = "RoboMachine"; diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix index 3cf064d2669..31b1f43a4e2 100644 --- a/pkgs/development/python-modules/robot-detection/default.nix +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "robot-detection"; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index c3eb309dfe0..8dfbb32fe08 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , robotframework diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 967138620e9..f23979f21fd 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 39e42596e2a..bc9e0873fe5 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: buildPythonPackage rec { version = "1.2.3"; diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 5fa87d17d11..6d079a99b4f 100644 --- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: +{ lib, buildPythonPackage, fetchPypi, robotframework-seleniumlibrary }: buildPythonPackage rec { version = "3.0.0"; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 60123d6b87d..fbb8cb034a5 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: +{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { version = "3.3.1"; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 7e3bcbcc55d..62fb43e0269 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , robotframework diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 5bc7bbceae7..9b90b25bfb7 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 953602ca1ad..cc57fa0d026 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "robotframework"; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index b0bd44f9c15..81226a23452 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework }: +{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { version = "1.3"; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 126153ec50e..5c46686adae 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , unittest2, lxml, robotframework }: diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index 5e3644468fe..c82eda6e35c 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 +{ lib, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/roman/default.nix b/pkgs/development/python-modules/roman/default.nix index 33f0f7f18d7..cde0ab0f271 100644 --- a/pkgs/development/python-modules/roman/default.nix +++ b/pkgs/development/python-modules/roman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 65edd602d8d..c4e451aade5 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: buildPythonPackage rec { pname = "rope"; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 8b193caa7b8..5a472ceb180 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , capstone diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 0129ef69e2c..1176fcb4eb0 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , repoze_lru diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix index fb84adb7d24..69a886f6e0d 100644 --- a/pkgs/development/python-modules/rpdb/default.nix +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index 731a5738e73..5f1cfc622c9 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils +{ lib, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils , koji, rpmfluff }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 0da9d2b7101..33f8547496d 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: +{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: buildPythonPackage rec { pname = "rply"; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 96050ba14b0..9957393770b 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , glibcLocales diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c9ca5977cb1..8ec05aae9d5 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: +{ lib, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix index 8400647aaad..1a9ad2171a0 100644 --- a/pkgs/development/python-modules/rsa/4_0.nix +++ b/pkgs/development/python-modules/rsa/4_0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index b688369beb5..7a990061e00 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , unittest2 diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index e53756b0181..e6289378c96 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: +{ lib, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: buildPythonPackage rec { pname = "rtslib"; diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix index 950f523f4a9..1f829bb4e0b 100644 --- a/pkgs/development/python-modules/ruamel_base/default.nix +++ b/pkgs/development/python-modules/ruamel_base/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix index 1e5820a37f7..98c36221dcd 100644 --- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix +++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index debf2aaf774..8304f5d7dad 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchhg , ruamel_base diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index edb793c19d5..51cec6f8602 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: buildPythonPackage rec { pname = "rubymarshal"; diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix index 1475b003231..ace9b8269c5 100644 --- a/pkgs/development/python-modules/runsnakerun/default.nix +++ b/pkgs/development/python-modules/runsnakerun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , squaremap diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 0154059c4f7..9bb2a513174 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: +{ lib, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: buildPythonPackage rec { pname = "s3fs"; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 9f97757edad..4ffea014001 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchFromGitHub , click , six diff --git a/pkgs/development/python-modules/safe/default.nix b/pkgs/development/python-modules/safe/default.nix index d167760c3e0..6a4515b90f8 100644 --- a/pkgs/development/python-modules/safe/default.nix +++ b/pkgs/development/python-modules/safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 5e6aa5927ec..0b8edf8bdd9 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd +{ lib, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd , python-daemon, six, jinja2, mock, click }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index a4a19f7ad12..9c26c9e2e2b 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , numpy , pkgs diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix index 42872e31891..1be4c485b80 100644 --- a/pkgs/development/python-modules/sandboxlib/default.nix +++ b/pkgs/development/python-modules/sandboxlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 8a7a62d8ce8..222b4c60c7f 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ lib, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: buildPythonPackage rec { pname = "sapi-python-client"; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 5aae6297268..3806ffb9d46 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 596ed993233..2eda0cd6ac9 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , mock diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 1502c7d10ab..483a891f933 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: +{ lib, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 8fa0186498f..f14c4d82f42 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 383cf1f70c6..8921e0061aa 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , fetchurl diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index f5cd96e71aa..abbe932c267 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paramiko diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index 900943a0e15..006c8ed0302 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: +{ lib, fetchPypi, buildPythonPackage, scrapy, bsddb3 }: buildPythonPackage rec { pname = "scrapy-deltafetch"; diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 4f6eecfe914..f9f896a563b 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index ab00377f4a0..5f6721f8162 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, scrapy, six }: +{ lib, fetchPypi, buildPythonPackage, scrapy, six }: buildPythonPackage rec { pname = "scrapy-splash"; diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index f71f8d0c263..5f238a7e05f 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: +{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: buildPythonApplication rec { pname = "screeninfo"; diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index ab234ce2243..5fe4b2b2ee6 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix index 0003d9c0131..a447283c63a 100644 --- a/pkgs/development/python-modules/sdnotify/default.nix +++ b/pkgs/development/python-modules/sdnotify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index cc9594d0452..f4a4955a739 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pyusb diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index 637b55eec8d..dbfe4510776 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: buildPythonPackage rec { pname = "seekpath"; diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index ff6b81d3105..bd3f77b5b08 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, psutil, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index ea3b403fdae..2209ccf43d2 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix index 83e4879e1fd..518b7637ad7 100644 --- a/pkgs/development/python-modules/semantic/default.nix +++ b/pkgs/development/python-modules/semantic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 71ec776db7c..c281a6d6b0d 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , pytestCheckHook diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index dd324260f83..c1ad64b3f5e 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, stdenv + , sentencepiece , pkg-config }: diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index ea9bbc1f0c3..b3a1c4ee2f4 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -17,7 +17,7 @@ , rq , sanic , sqlalchemy -, lib, stdenv +, lib , tornado , urllib3 , trytond diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 095b47db2bf..8f6d4eb94f5 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , lxml , pytest , text-unidecode diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index ba4cdca0c63..2ae9defc504 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils +{ lib, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils , blockdiag }: diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 36840813b40..50f6e0b63a6 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, lib , python , isPy27 , enum34 diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index fa212d6a4de..a409d48837e 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index a9c0e7fda89..9338166efef 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index 18fae7b1610..06e699e19a3 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix index ba42c21ad36..f1eb2903f03 100644 --- a/pkgs/development/python-modules/setuptools-lint/default.nix +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pylint }: +{ lib, buildPythonPackage, fetchPypi, pylint }: buildPythonPackage rec { pname = "setuptools-lint"; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 2d9a4b17d40..ee4a3b55164 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index d8558aaf83a..98795eadfd4 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index a766bb6c294..ba716c313fd 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pip, pytest }: +{ lib, buildPythonPackage, fetchPypi, pip, pytest }: buildPythonPackage rec { pname = "setuptools_scm"; diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix index f6358a831c9..41fe5043ea8 100644 --- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix +++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , darcsver diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index 1d29f77cf0f..bef492e5dbc 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix index 89f716d9be2..fd7d99fbb3f 100644 --- a/pkgs/development/python-modules/sexpdata/default.nix +++ b/pkgs/development/python-modules/sexpdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index 6884bed2748..1104c843c6e 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -1,8 +1,7 @@ -{ stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 -, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 1ce9a879ee1..cfbd6f92b04 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 77a4b98f54c..300368b31f1 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index 8fd15b71a01..e7efb1ef2dc 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "shippai"; diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index 35401afa6e3..f1c1efbc0ec 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix index 1499f1ce4bc..7510ba88d1d 100644 --- a/pkgs/development/python-modules/should-dsl/default.nix +++ b/pkgs/development/python-modules/should-dsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "should-dsl"; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 9959f26036c..b733c1c9516 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonAtLeast , fetchPypi diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 12614a3446b..2f47113408e 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , canonicaljson diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index 0c11a2b6c56..1d81ba5180c 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , repeated_test diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index 958f53be567..2d29797b28f 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib, fetchFromGitHub, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "simanneal"; diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index f8d579b6088..7228e6d9f3e 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage { pname = "simple-websocket-server"; diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix index 0786ebfae6e..2ad7fe9ba28 100644 --- a/pkgs/development/python-modules/simpleai/default.nix +++ b/pkgs/development/python-modules/simpleai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index ed86b48fc07..06fe8e236b3 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , nose diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix index 6395f4af223..e81a7d41b7a 100644 --- a/pkgs/development/python-modules/simpleparse/default.nix +++ b/pkgs/development/python-modules/simpleparse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 40a17926427..ad7cc021439 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -5,7 +5,7 @@ , jre , lib , pythonPackages -, stdenv + }: let diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 36ec8b18ca7..958fc613f6f 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }: buildPythonPackage rec { pname = "sklearn-deap"; diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 571398b783d..a690788095e 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , aiohttp diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index e6d5e59a80e..07be197f276 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }: +{ lib, fetchPypi, buildPythonPackage, dns, pyasn1 }: buildPythonPackage rec { pname = "sleekxmpp"; diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index b5521f415d7..83f3e412ddc 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 39669220003..191159a648e 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index a7520c62a62..0caec499a95 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy3k diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix index 5d738fea57e..ddca8509744 100644 --- a/pkgs/development/python-modules/slowaes/default.nix +++ b/pkgs/development/python-modules/slowaes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix index 0b36a7e9f6e..ceba9eae9e4 100644 --- a/pkgs/development/python-modules/smartdc/default.nix +++ b/pkgs/development/python-modules/smartdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index a497f3db413..d1e11e30d61 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchhg , isPyPy diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index 2c54f65d9c3..42602f15e9b 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, tornado }: +{ lib, fetchPypi, buildPythonPackage, tornado }: buildPythonPackage rec { pname = "snakeviz"; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 8446683cb1a..c5df9f7d991 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pytest +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest , construct }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 3364470da1b..84b2bb2e143 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, PyStemmer, fetchPypi }: +{ lib, buildPythonPackage, PyStemmer, fetchPypi }: buildPythonPackage rec { pname = "snowballstemmer"; diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix index ca9d8707ac6..abfee3718b5 100644 --- a/pkgs/development/python-modules/socksipy-branch/default.nix +++ b/pkgs/development/python-modules/socksipy-branch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index bd351b5e86f..ba1dd1c3011 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: +{ pkgs, lib, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: buildPythonPackage rec { pname = "SoMaJo"; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 095c0917e59..7b549933588 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy +{ lib, buildPythonPackage, fetchPypi, isPyPy , dnspython , geoip2 , ipython diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index e918a1aee3b..daeca60c1e1 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index ba927431f2c..fb30daf81fe 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index b97cbee2a5f..41c11172d9b 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix index efb0908dc5f..a9acfb2dbb3 100644 --- a/pkgs/development/python-modules/speaklater/default.nix +++ b/pkgs/development/python-modules/speaklater/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 08bbb34156b..88da35a0f97 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }: buildPythonPackage rec { pname = "spglib"; diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix index 77f283795db..d2c20e980e7 100644 --- a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix +++ b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 11e3c2a87e9..87da4131351 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index e2bfc5bdaa5..9c3c16657f2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 6822c0f153d..068c4d5d2e9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index a2603b876e5..956e3c033b9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 7398cbc433f..1f33c06b984 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 150840f19b4..8ca631a2b3c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index 609799f1864..cd67732605b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 6375bdab3c2..a9548305d3b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index adf02860d12..9d16ede62a2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 52ebe15c1b6..b898e9cb67d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a3054f34145..2b5beb4df07 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index ee652b42d8a..21ada23d47f 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix index 2d56b57df9b..a298025f8ba 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index db8997dfd21..e028b6eea80 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index e0a8d6b9c18..9533db6e4a7 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, +{ lib, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, jupyter_client, pyzmq }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index 34d59d0eb22..0fb98fa38e3 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, +{ lib, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 26013e71158..e7c94ec724b 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, +{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 4050adc29f5..33b408240fc 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , flask diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 4ef0adefe3e..84be4587e66 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , sqlalchemy diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 6a8c910cfce..15ac7dc3a55 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pytest , Wand diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/pkgs/development/python-modules/sqlite3dbm/default.nix index 1d0b3f15c3f..3057f89adf4 100644 --- a/pkgs/development/python-modules/sqlite3dbm/default.nix +++ b/pkgs/development/python-modules/sqlite3dbm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index ccbc6659fe3..f3c438342bc 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index c17a88435dd..bab9e2f99f2 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , isPy3k , fetchPypi diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 2afbb22d64e..c0d3a0a4aed 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, lib }: +{ buildPythonPackage, fetchPypi, six, lib }: buildPythonPackage rec { pname = "srp"; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index f130009d30d..68ca009d9dc 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: buildPythonPackage rec { pname = "srptools"; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 42320e50fa8..86b689d09d1 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index c399ee760fd..f325d40ba92 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , dnspython , mock, nose }: diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 8300c3ec2f6..904595865b8 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pkgs diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 82ea4b066a3..ac39cffa393 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 9d944e112fe..6bbeb23ed1f 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , requests, six , backports_unittest-mock, pytestCheckHook, pytestrunner }: diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix index 026ac8a30b7..407053785f0 100644 --- a/pkgs/development/python-modules/sslib/default.nix +++ b/pkgs/development/python-modules/sslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "sslib"; diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 447fed3263c..561a1d14ca4 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix index 17bafbad282..149be55da58 100644 --- a/pkgs/development/python-modules/stompclient/default.nix +++ b/pkgs/development/python-modules/stompclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix index 53701999b02..e76365a525a 100644 --- a/pkgs/development/python-modules/strict-rfc3339/default.nix +++ b/pkgs/development/python-modules/strict-rfc3339/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "strict-rfc3339"; diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix index 10afb511393..e02cc0384f9 100644 --- a/pkgs/development/python-modules/stringcase/default.nix +++ b/pkgs/development/python-modules/stringcase/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix index 2dac94ac15d..2b536fa0e62 100644 --- a/pkgs/development/python-modules/subdownloader/default.nix +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , mmpython diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index 4bf74fe00b4..af307919387 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix index 24425fef95f..1a96df26da1 100644 --- a/pkgs/development/python-modules/suds/default.nix +++ b/pkgs/development/python-modules/suds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index e647cd4a9d2..e1b3d8c705e 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , h5py , matplotlib , numpy diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index efff79f679f..ee21e9c4516 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , rednose diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index f9bec0451ff..436127fae9c 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , wrapio diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 585dbf64b3c..820d4121633 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; version = "4.0.2"; diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index fb0475ef3b9..38516ab73c3 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchgit , lxml diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 613de201b2d..9dbd29739fe 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }: +{ lib, buildPythonPackage, fetchPypi, jinja2, flake8 }: buildPythonPackage rec { pname = "swagger-ui-bundle"; diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index 321a48e72b6..e213e9e265e 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }: buildPythonPackage rec { pname = "SwSpotify"; diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 20c2a158a3b..5a14e7e7f40 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , isPy3k diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index 2035ce8b26b..86c330bd1d8 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: +{ lib, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: buildPythonPackage rec { pname = "systemd"; diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index 87a81e4fb17..5d9b5a034c2 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix index 682da22ced8..c2a2c4405e2 100644 --- a/pkgs/development/python-modules/tarman/default.nix +++ b/pkgs/development/python-modules/tarman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 5a135894713..9e1ae3302c1 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index cba34a95a7b..540c315c8ff 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, mypy, pyyaml, regex , dataclasses, typing , pytestrunner, pytest-mypy diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 7e704e0b2c6..2f06b665d33 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "tblib"; diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix index 95293d095fd..c297efc0efd 100644 --- a/pkgs/development/python-modules/telegram/default.nix +++ b/pkgs/development/python-modules/telegram/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index bca75224fa3..dd3b4641bea 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , numpy , absl-py , mock diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index df0f4d6208a..e440dab114f 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix index 28e49316ad7..51a0b071224 100644 --- a/pkgs/development/python-modules/terminaltables/default.nix +++ b/pkgs/development/python-modules/terminaltables/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index a5ab52e5cdd..c95bd0c78b6 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index c249ca212b6..45093a5f7cf 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , testtools diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 465384edcb0..8df35ac4b88 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , testtools diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix index 7a1696feb66..9c83e7e45c2 100644 --- a/pkgs/development/python-modules/threadpool/default.nix +++ b/pkgs/development/python-modules/threadpool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index c7279b867b1..7b16d666870 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix index abfad4ffaac..28b2e5a9f93 100644 --- a/pkgs/development/python-modules/thumborpexif/default.nix +++ b/pkgs/development/python-modules/thumborpexif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index 170360c133e..ce46fd56f24 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , modestmaps diff --git a/pkgs/development/python-modules/timelib/default.nix b/pkgs/development/python-modules/timelib/default.nix index 65b121ddfaf..e2f3cc1d3cc 100644 --- a/pkgs/development/python-modules/timelib/default.nix +++ b/pkgs/development/python-modules/timelib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix index b1160cafe30..c2d21fea153 100644 --- a/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/pkgs/development/python-modules/timeout-decorator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "timeout-decorator"; version = "0.5.0"; diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix index fc4316c98fe..e1ef7f9edf4 100644 --- a/pkgs/development/python-modules/tissue/default.nix +++ b/pkgs/development/python-modules/tissue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 302b113364d..7be95b97088 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cmake diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index a952c95d93e..37751890c7b 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , ecdsa diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix index a1e78c5db76..52b662be2b2 100644 --- a/pkgs/development/python-modules/tlslite/default.nix +++ b/pkgs/development/python-modules/tlslite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 875e70cee58..d7eece65002 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder , click , click-completion , factory_boy diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index ec435a0ac35..cf122613f63 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , fetchurl diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 2bed1887016..bed053f8282 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix index 0d0d87c73d1..bdc1b141eed 100644 --- a/pkgs/development/python-modules/toml/default.nix +++ b/pkgs/development/python-modules/toml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "toml"; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 43df3c4e21e..540835c7e31 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 928616eb4f8..79f6a19ffcb 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , ninja diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix index 5309ae47a02..040874286bd 100644 --- a/pkgs/development/python-modules/traceback2/default.nix +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index f4c01f003a9..c2adc9ec9c5 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index e3bc8b43fe4..d9986dd87fe 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index def2559a72d..6bb5987ba48 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , zope_interface diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 59420475440..efc33ad8a23 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchFromGitHub , pythonOlder , cookiecutter diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix index e270d5a0662..94d3cb85be4 100644 --- a/pkgs/development/python-modules/transip/default.nix +++ b/pkgs/development/python-modules/transip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix index 2f39b57b480..f7036128e08 100644 --- a/pkgs/development/python-modules/translationstring/default.nix +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index a128b150579..39901a17f00 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 477223e9618..447e2a5b986 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six +{ lib, fetchPypi, buildPythonPackage, service-identity, requests, six , mock, twisted, incremental, pep8, httpbin }: diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 537b4db7995..cef74c8636b 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , trezor diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix index 0c3efa404ec..db16ed7fafb 100644 --- a/pkgs/development/python-modules/trueskill/default.nix +++ b/pkgs/development/python-modules/trueskill/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix index 24eb1063707..f32045ce9cd 100644 --- a/pkgs/development/python-modules/ttystatus/default.nix +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , sphinx diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index f2cdbe8dc63..845aff673b7 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , requests-cache diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index fa155b86f40..6a720421c72 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index 9647dc8ae67..45e59860227 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7931a4ad0ec..ff4bb845c89 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pyjwt, pysocks, pytz, requests, six, nose, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index 72f30514dc6..644a97d2b2e 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-lang diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index ee5bf9bdbe1..d718a18822b 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-log diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 14b0bcd0673..bf9ec099ddb 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-lang diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix index 4b4a5c0fc2e..93178f46792 100644 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index 8cf99c39dc2..61f5d99a8f1 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twitter-common-options diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix index a5505330bc0..b3ae7f7f5d9 100644 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix index 23d647d9315..7114dc661f4 100644 --- a/pkgs/development/python-modules/twitter/default.nix +++ b/pkgs/development/python-modules/twitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 4d756fa89f3..814b6234ee3 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: buildPythonPackage rec { pname = "txaio"; diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix index f0e3904a881..cc66e041ae3 100644 --- a/pkgs/development/python-modules/txamqp/default.nix +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twisted diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix index 461ddeee34b..31afbd4fdf9 100644 --- a/pkgs/development/python-modules/txdbus/default.nix +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, six, twisted }: +{ lib, buildPythonPackage, fetchPypi, six, twisted }: buildPythonPackage rec { pname = "txdbus"; diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix index 402e5011ede..09af476e94d 100644 --- a/pkgs/development/python-modules/txgithub/default.nix +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pyopenssl diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index 06979e2b9b3..be32dc4a738 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , twisted diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 448e52af7af..7aced09b33d 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , pythonOlder -, lib, stdenv +, lib , setuptools_scm , pytest , typing-extensions diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix index faa1c8641c0..25445d8a7d2 100644 --- a/pkgs/development/python-modules/typogrify/default.nix +++ b/pkgs/development/python-modules/typogrify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index df0923833fd..a7cd91d6845 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytz }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index 370ed527d19..36d725d14f4 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, pyyaml }: buildPythonPackage rec { pname = "ua-parser"; diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix index f31b26a1960..36aa5a020c3 100644 --- a/pkgs/development/python-modules/ujson/2.nix +++ b/pkgs/development/python-modules/ujson/2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptools_scm diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 1c12a092a2f..9c759bd41b3 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix index 4411dbac11b..0e1b4c681e5 100644 --- a/pkgs/development/python-modules/umalqurra/default.nix +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index f852483cda6..26f8ba02756 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchurl }: +{ lib, buildPythonPackage, isPy3k, fetchurl }: buildPythonPackage rec { pname = "umemcache"; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 117188198ca..b43927c063e 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , nose, numpy, future }: diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 4f8d461c87e..31095fcd50e 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 80ac5151b53..a0574f948f0 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index 9393ff58bc2..ede2b0d3f09 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 34de3d71386..70724bb71b5 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, glibcLocales }: buildPythonPackage rec { pname = "Unidecode"; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index 66ab9ba3972..fc98695dd6f 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage +{ lib, buildPythonPackage , fetchPypi, urllib3 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index a7c1252f4b4..ae8cab53b0c 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index 52d2a42b4ba..96b27127cc6 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub }: diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 442876d7a97..61197c7219d 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchurl , pyperclip diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index f9171e8cbc9..432232c60f9 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests, isPy27 +{ lib, buildPythonPackage, fetchPypi, requests, isPy27 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix index 5164bf854ad..21fe31630de 100644 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 8f8c067d36a..640d2a6ed57 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index f5bca2ed0fe..ff262d6b0a3 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, cmake +{ lib, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index b06da7c6acc..2f4710eea46 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "uritools"; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 3a7158be73c..e78dc9b904d 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pycurl, six }: +{ lib, buildPythonPackage, fetchPypi, pycurl, six }: buildPythonPackage rec { pname = "urlgrabber"; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index e3c5311136c..ceb57e86afb 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: buildPythonPackage rec { pname = "urwid"; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 4c3a3e896f8..863989156c3 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , glibcLocales diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index b1f5b301dee..6dbb6ce184f 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pyusb }: +{ lib, fetchurl, buildPythonPackage, pyusb }: buildPythonPackage rec { pname = "usbtmc"; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 7f8470cfbdc..d01c601c82a 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }: +{ lib, buildPythonPackage, fetchFromGitHub, ua-parser }: buildPythonPackage rec { pname = "user-agents"; diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index 327cfcf3f0d..2b1fdb4963d 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "validate-email"; diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index e89b3d7bcd2..29ffb76591e 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 7d73a6e812d..236bb8d149b 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "vcversioner"; diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 9e4e92d21ae..846aa7a13df 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , pytest, pytestcov, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index bda65ab4907..1f7642bfe34 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 3a36d5de606..083aa630209 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage , fetchPypi, pythonOlder +{ lib, buildPythonPackage , fetchPypi, pythonOlder , pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 68d974aabec..82e291ae462 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index fa3329503a3..3685e78d4b4 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix index 45b34d95301..f74c8610b4c 100644 --- a/pkgs/development/python-modules/versiontools/default.nix +++ b/pkgs/development/python-modules/versiontools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix index f2c8cee451d..003fd6db621 100644 --- a/pkgs/development/python-modules/veryprettytable/default.nix +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , termcolor diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 548105a0177..4119b26259d 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 048fa435e0b..8fc895cfa44 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , case, pytest, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 9b225021cf2..4dfebc13075 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 658f41126fc..087a1a2ca51 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pbr diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index f8be722ef90..3962a1e02c3 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , colorama diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix index cb1b1677e1b..ef33a46cc34 100644 --- a/pkgs/development/python-modules/vncdo/default.nix +++ b/pkgs/development/python-modules/vncdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, fetchFromGitHub , buildPythonPackage, isPy27 , pillow , twisted diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 63be8cd4bd0..9882724fbb6 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { pname = "voluptuous"; diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index d4349d310be..975e4098112 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , requests diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 5d9531aa904..242fe47b33d 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage rec { pname = "python-vxi11"; diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index ae404e01cfb..0c80423e36a 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 09f4f66e0b5..4edd4c6ccff 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 29c30e7ba6a..86d405a33ef 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: +{ lib, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: buildPythonPackage rec { pname = "wakeonlan"; diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 80dcabdcb20..1b62c918f33 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 5a0c2ecaa5f..f9bc1916ad6 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytestCheckHook diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index 84b4cc8dcfb..1b40519d592 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook , cheroot , dbutils, mysqlclient, pymysql, mysql-connector, psycopg2 }: diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix index 048c5d91b1d..841fb5bd74b 100644 --- a/pkgs/development/python-modules/webapp2/default.nix +++ b/pkgs/development/python-modules/webapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , webob diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix index 040341ed376..dcb2bd3817d 100644 --- a/pkgs/development/python-modules/webhelpers/default.nix +++ b/pkgs/development/python-modules/webhelpers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , routes diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 78ca8f918a3..124b45a2eb3 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , nose diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 021344b2207..d3072e75041 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , numpy diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 98ee58d3f6c..d56e5415b91 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy27 diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index ad25df4868a..7b084c16267 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, mock, six }: +{ lib, buildPythonPackage, fetchPypi, mock, six }: buildPythonPackage rec { pname = "whisper"; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 2399c6ed73f..3c63c727c0d 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27 }: +{ lib, fetchPypi, buildPythonPackage, isPy27 }: buildPythonPackage rec { pname = "whitenoise"; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index f5bbccec2a5..d3ff703f694 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "Whoosh"; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index fbf4965117b..3dafd4df44b 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 647914bfbe5..259566c8fc2 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , fetchzip diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index b4dd108ae73..80f22efbda8 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , matplotlib , mock , numpy diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 51c0de77917..13ce4bc873d 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , pythonOlder , isPy27 diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index 757585bd145..bbbc1917f54 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 2b7a66df285..8abf78520dc 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, mock, git +{ lib, buildPythonPackage, fetchPypi, pytest, mock, git , cherrypy, gevent, tornado }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/pkgs/development/python-modules/wsgiproxy/default.nix index 12aa3c88d96..e2cc26ff143 100644 --- a/pkgs/development/python-modules/wsgiproxy/default.nix +++ b/pkgs/development/python-modules/wsgiproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , paste diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix index 81a2f98b86f..2a9856cdd08 100644 --- a/pkgs/development/python-modules/wsgiproxy2/default.nix +++ b/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 45c465ddcba..96440c438bc 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , markupsafe diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix index 21bb787402c..e9cfe317432 100644 --- a/pkgs/development/python-modules/x11_hash/default.nix +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/x256/default.nix b/pkgs/development/python-modules/x256/default.nix index 4ceb2dcae79..4430fa2e4b8 100644 --- a/pkgs/development/python-modules/x256/default.nix +++ b/pkgs/development/python-modules/x256/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 28901017b2b..44435dd6bd8 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonPackage , psutil diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 3583358a560..a39c3532f4b 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index f6bb5712c2e..086eaf1e348 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchdarcs , isPy3k diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 21b45b9c322..7dbbd89e781 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run, stdenv +{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index e3328c7e453..efdb40cd6f8 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pillow diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 88f7b9b94a1..280ce5a790a 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 031ac047936..d880fd83396 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , pytest diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index a5b67632d83..6f7726da68d 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index e06daf3c5b8..fdf042c2ac2 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address +{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address , pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs }: diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index 9023c4cc79e..a53567f7fa8 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: buildPythonPackage rec { pname = "xmodem"; diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index fd046adadd9..65e2b3711fa 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchurl, isPy3k }: +{ lib, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { pname = "xmpp.py"; version = "0.5.0rc1"; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 0852fd2e15c..f037cb40338 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , xorgserver diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index d2f6ae54a4c..08bcfcdacde 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 7145c504cd9..13545c0430d 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose, pyyaml, pathspec }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 6d4a3b41fbc..925276c0ad6 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, pythonOlder, fetchPypi, nose }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, nose }: buildPythonPackage rec { pname = "yanc"; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 36409ae4019..9c0e9d35399 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "yapf"; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 359a855a3e5..e60b0a11473 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 7a88b695f63..0aeb85e6ca2 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchPypi , buildPythonPackage , pythonOlder diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index be935b1995c..e7452b89a53 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, docutils, pygments +{ lib, buildPythonPackage, fetchPypi, docutils, pygments , gitMinimal, mercurial, subversion, patchutils, less }: diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 48c21434194..0ff3212f48c 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, stdenv, fetchFromGitHub, six, python-axolotl, pytest +{ buildPythonPackage, lib, fetchFromGitHub, six, python-axolotl, pytest , isPy3k, consonance, appdirs }: diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index f1af120d56e..8610306ea6f 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , python diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index 1d1d21a462e..89635a88f35 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , kazoo diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index 4e126074b18..23eae31057f 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zconfig diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix index a4e7a476bec..715da719bbb 100644 --- a/pkgs/development/python-modules/zbase32/default.nix +++ b/pkgs/development/python-modules/zbase32/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 3b75de3a24b..97289ec3630 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -2,7 +2,7 @@ , fetchPypi , mock , zope_testing -, lib, stdenv +, lib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 4e126074b18..23eae31057f 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zconfig diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index e1208875668..19d02a70496 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , cherrypy diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index f85674d6867..6dccf51100e 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }: +{ lib, buildPythonPackage, fetchPypi, openssl, bzip2 }: buildPythonPackage rec { pname = "zeroc-ice"; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 8a5aaf46b0e..bcec7a09251 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , setuptoolsDarcs diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index da36c1cba89..611660fc3eb 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , pytest, heapdict, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 4de49cbc46b..1a1c639a473 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , async-timeout , asynctest , buildPythonPackage diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index d48b9c4b950..aa7cc6c97eb 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchPypi , buildPythonPackage , python diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix index 899d7f3344b..a3583654e66 100644 --- a/pkgs/development/python-modules/zope_broken/default.nix +++ b/pkgs/development/python-modules/zope_broken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 6ea86b9b984..65556c9dc41 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope-deferredimport diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index e8d05b7767b..e3ede9f94af 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_i18nmessageid diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index 6b66cca18aa..15010d80a14 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_testrunner diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index cda7af8e7a0..7eb66f7a9c5 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_testing diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix index 0e8f3543136..cbd5cd6d653 100644 --- a/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/pkgs/development/python-modules/zope_dottedname/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index cc82da7ea9a..2ebf6e017b5 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index 09f08c7bba4..0586227c61c 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 7aae2a24d62..4792a09e26b 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_schema diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 49270488ecd..1155adc83e9 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , six diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 7a32045fc3e..7b5d7abf682 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_event diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 390624b50de..809d8252cb2 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 62b2cef9ea7..69fee2e338f 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_proxy diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index af108c058c7..67e8a191d97 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index c7e228c4e05..75683cb2eb8 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_location diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 79eadc880a2..6945dddceaa 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_i18nmessageid diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 3d7cbf90c25..2f37f15453d 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , isPyPy diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index c516106e48b..5ee42c84275 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchPypi , zope_interface diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index af7bb7692f6..1d8fa8d93e9 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage +{ lib, pkg-config, fetchPypi, buildPythonPackage , buildPackages , zstd, pytest }: diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 0859f08c2f7..03bf7275cc7 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs: +{ lib, callPackage, runCommand, makeWrapper, ruby }@defs: # Use for simple installation of Ruby tools shipped in a Gem. # Start with a Gemfile that includes `gem ` diff --git a/pkgs/development/ruby-modules/testing/driver.nix b/pkgs/development/ruby-modules/testing/driver.nix index 65e7c8d4416..23a9a1cec54 100644 --- a/pkgs/development/ruby-modules/testing/driver.nix +++ b/pkgs/development/ruby-modules/testing/driver.nix @@ -5,7 +5,7 @@ nix-build -E 'with import { }; callPackage ./test.nix {}' --show-trace Confusingly, the ideal result ends with something like: error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed */ -{ writeText, lib, callPackage, testFiles, stdenv, ruby }@defs: +{ writeText, lib, callPackage, testFiles, ruby }@defs: let testTools = rec { test = import ./testing.nix; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index f8cb7441116..9bfaab51554 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, crystal }: +{ lib, fetchFromGitHub, crystal }: crystal.buildCrystalPackage rec { pname = "ameba"; diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index 884b511b8af..03e01aadb71 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index ae54723dda3..338bc3e189c 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "bingrep"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 6277b1d4239..06c366529df 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, python3, fetchFromGitHub }: +{ pkgs, lib, python3, fetchFromGitHub }: let pname = "checkov"; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index cfb974c86dd..02665022099 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "egypt"; diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index b8f3aa0ac1f..4061090b182 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "evmdis-unstable"; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 6ea079e3ec1..94b440f58c8 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, +{ lib, mkDerivation, cmake, elfutils, diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index ff5014bd46a..0ef33270e92 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake +{ lib, fetchFromGitHub, rustPlatform, qt5, git, cmake , pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 261645c062d..870f084580b 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }: mkDerivation rec { pname = "snowman"; diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix index 17f39071462..b879a6ef237 100644 --- a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix +++ b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index b2432f7fefc..9ffcbb172d4 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake , pytestrunner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index 54e16cb6faa..a45e93ab151 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "async"; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 822480b1d3f..98a6bcd5bbc 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index e4a6b3c2869..2cfde85f224 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bazelisk"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index ac03288f148..80c949c1efb 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , git , go -, lib, stdenv +, lib }: buildBazelPackage rec { diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 436b681e005..441254ce263 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "bazel-buildtools"; diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index 25450ceb6d9..601f7ea9fea 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, fetchFromGitHub, rustPlatform }: +{ lib, git, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "fac-build"; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 74d96d4af00..7009aa4898f 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,6 +1,6 @@ { lib , python3 -, stdenv + , writeTextDir , substituteAll , fetchpatch diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 03eac2db5e3..53333c217ba 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages }: +{ lib, pythonPackages }: with lib; with pythonPackages; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 1de2ecbbc8b..63df4ccf7be 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, fetchurl, python3Packages, lib }: +{ fetchurl, python3Packages, lib }: python3Packages.buildPythonApplication rec { pname = "scons"; diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 868ea265f6f..8cab1667b21 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , crystal_0_34 , crystal_0_35 diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 182a7f98c4c..c3b477e3ea3 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv }: +{ fetchFromGitHub, rustPlatform, lib }: with rustPlatform; diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index ef08b2d5813..a12fb4424e8 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "compile-daemon-unstable"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index bd8608a9119..ed1171458b1 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, buildGoModule, +{ fetchFromGitHub, lib, buildGoModule, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 232efe32a1a..64ca730d7dc 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep +{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep , src, version, hasBootstrapScript, postPatch ? "" , ... }: let diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index b1ee5349a5c..6c9cffe41b2 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: let version = "1.2.4"; in buildGoModule rec { diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index ffdf588895a..c6d609e38cf 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { name = "drone.io-${version}"; diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index a7698ef4fb8..e39e42c40af 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/pkgs/development/tools/corgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "corgi-${rev}"; diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix index 4e00eb903eb..460d7cddb83 100644 --- a/pkgs/development/tools/cppclean/default.nix +++ b/pkgs/development/tools/cppclean/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: with python3Packages; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 243be958b07..28660732ea4 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchgit, lib, stdenv }: +{ buildGoModule, fetchgit, lib }: buildGoModule rec { pname = "cue"; diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 7a8243ece25..57fd984dc17 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ buildGoModule, fetchFromGitHub, lib }: let pname = "dapr"; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 9c01c1e9d2d..6634c2b6384 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dbmate"; diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index 119aa2eb8f8..075cd5053be 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: let pgdbconn = pythonPackages.buildPythonPackage { diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 2b8a6f7cca0..42c2a55fd3e 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-parallel-copy"; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index cec374ccb3a..34d5d12607f 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "timescaledb-tune"; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index c8e20d42063..8286435d9a3 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index 0f5df40d92c..67245a5ebbe 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "deis"; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 62fb32c8516..bd8f2484b33 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "delve"; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index ff7f370b0d4..ff7bad87afd 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dep"; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index daa68b1b931..5d98ecd5729 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage +{ lib, fetchFromGitHub, buildGoPackage , makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index 32f29f7e128..0789850a494 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/pkgs/development/tools/devd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { pname = "devd"; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 766f3f2b729..5905e05d071 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi # buildInputs diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 3d8cb16bb47..8a484a23349 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, nginx }: +{ lib, fetchFromGitHub, python3Packages, nginx }: python3Packages.buildPythonApplication rec { pname = "devpi-server"; diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix index d553df59446..ea8aeb83c8c 100644 --- a/pkgs/development/tools/documentation/antora/default.nix +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nodePackages }: +{ lib, nodePackages }: let linkNodeDeps = ({ pkg, deps, name ? "" }: diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 2e04d3dd365..d031145a997 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 +{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: python2Packages.buildPythonApplication rec { diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b1ea6a0634b..d82c288e5aa 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , meson , ninja diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index d2e555a4550..c8e6cafa27a 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "mdsh"; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index bee22856eb1..64d834f1bb2 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: with python3.pkgs; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index a458f0dbfce..75bfc1d4c14 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "easyjson"; diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index e60642c5fe6..adcedfe643c 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "eliot-tree"; diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index ef3298c5478..c50fd834e03 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { pname = "fac"; diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index 285e71707fd..d9633e88f34 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/pkgs/development/tools/fedpkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: +{ lib, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: let fedora_cert = buildPythonPackage rec { diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 4867b9c2cb9..e4f76ca9f6a 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "Flootty"; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index a0eb7370bee..168910da06f 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gauge"; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 7c7f73af1e0..7ecb7895d2f 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/pkgs/development/tools/gdm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gdm"; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index b65e7c6a5ee..05db94c7f1e 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ginkgo"; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 8f38b41f7ae..c88ffef4df1 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "gir"; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 4f13c3de40b..0f7677c7aa2 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform +{ lib, fetchFromGitHub, fetchpatch, rustPlatform , openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 }: diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index dfe66c789ca..ce340239ac4 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: +{ lib, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: buildPythonApplication rec { pname = "cligh"; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index f8abde7e00a..05e4ae81061 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glide"; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index f2c552252fb..78038440a96 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gllvm"; diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index c00478c9fb6..b2d1e09e74f 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/pkgs/development/tools/glock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "glock"; diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix index 57d0e93a9b0..5131436e024 100644 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-bindata-assetfs"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 5d257bbf998..3b73c527315 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "go-bindata"; diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix index f1e822e3633..110cdbfabc9 100644 --- a/pkgs/development/tools/go-junit-report/default.nix +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-junit-report-unstable"; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix index fdefd6b0178..ac6034dffa4 100644 --- a/pkgs/development/tools/go-langserver/default.nix +++ b/pkgs/development/tools/go-langserver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-langserver"; diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index 1786bfe5f0f..d07e3cd80d3 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-migrate"; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index d30d5c30f3a..fe4c2e8d4df 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-outline"; diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 0187552d844..1fa027ae72b 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-protobuf"; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index 25fc87f8985..b7653aa144e 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "go-repo-root"; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index 3f41007716e..a259b768561 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-symbols"; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index bcd1f56f525..b5a224cb5ae 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, +{ lib, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, fetchFromGitHub }: buildGoPackage rec { diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 63322b6d363..56b47bd8c60 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goa"; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 995bd3102cc..f610b19d79b 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gocode-gomod"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 9bed4073b2b..be9f70da934 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gocode-unstable"; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index dcec045e5eb..fb6ce653cc4 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goconvey"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 6d4f40ba6bc..99fe932013e 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "godef"; diff --git a/pkgs/development/tools/godot/headless.nix b/pkgs/development/tools/godot/headless.nix index 20d3b48f2fd..a8d640eba1a 100644 --- a/pkgs/development/tools/godot/headless.nix +++ b/pkgs/development/tools/godot/headless.nix @@ -1,4 +1,4 @@ -{ godot, lib, stdenv }: +{ godot, lib }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-headless"; sconsFlags = "target=release_debug platform=server tools=yes"; diff --git a/pkgs/development/tools/godot/server.nix b/pkgs/development/tools/godot/server.nix index 6ce347355e3..4254dc746b6 100644 --- a/pkgs/development/tools/godot/server.nix +++ b/pkgs/development/tools/godot/server.nix @@ -1,4 +1,4 @@ -{ godot, lib, stdenv }: +{ godot, lib }: godot.overrideAttrs (oldAttrs: rec { pname = "godot-server"; sconsFlags = "target=release platform=server tools=no"; diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index 0f772134a0e..0fd45598a83 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gojsontoyaml"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 1f75384f338..89b9f146495 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "lint"; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 650f1b89f30..254113f2106 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomodifytags"; diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index f8d6553f74d..0f2c9558174 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gomplate"; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index e4a72cb27a1..a5413c6a9c0 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gopkgs"; diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 7a7c98e2894..1617900acee 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index 30d7cd1ef33..43bb2d2aad7 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gore"; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 69d74496e61..1ebb6e71713 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gosec"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index ea40bd0e6fe..274f7a476c2 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gotags"; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index 87a93abee8e..faa2e60aca4 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotests"; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index ece194f0003..435edd61623 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "gotestsum"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 7ca3486a503..285d546d742 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix index edd9b577be4..b24afebb3aa 100644 --- a/pkgs/development/tools/govendor/default.nix +++ b/pkgs/development/tools/govendor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "govendor"; diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index cac76daa6fc..5e2d89cfd5d 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "govers"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 3deb73acb44..4aa7a314c87 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gox"; diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index 6d182b0b5f5..f486bc95bc1 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gron"; diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 02c4c96bd8e..b857b910f0a 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,5 +1,5 @@ { mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, lib, stdenv, template-haskell, text +, optparse-applicative, parsec, lib, template-haskell, text }: mkDerivation { pname = "dconf2nix"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index 512aec84eea..71b6355db58 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -7,7 +7,7 @@ , hls-tactics-plugin, hslogger, hspec, hspec-core , hspec-expectations, lens, lsp-test, mtl, optparse-applicative , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions -, shake, lib, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml +, shake, lib, stm, stylish-haskell, tasty, tasty-ant-xml , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun , temporary, text, transformers, unordered-containers, with-utf8 , yaml diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix index c5168934390..b757dc8c9e8 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, containers, fetchgit, ghc , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake -, lib, stdenv, text, transformers, unordered-containers +, lib, text, transformers, unordered-containers }: mkDerivation { pname = "hls-class-plugin"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix index b5774ddcbfd..2677b45a591 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix @@ -2,7 +2,7 @@ , extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api , parser-combinators, pretty-simple, QuickCheck, safe-exceptions -, shake, lib, stdenv, temporary, text, time, transformers +, shake, lib, temporary, text, time, transformers , unordered-containers }: mkDerivation { diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix index 1c7d31004b6..8207b5181ba 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc -, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, stdenv, text +, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, text , unordered-containers }: mkDerivation { diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index 4a90933d1e7..02e314cba3a 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -2,7 +2,7 @@ , containers, data-default, deepseq, Diff, directory, extra , fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide , hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens -, regex-tdfa, shake, lib, stdenv, temporary, text, transformers +, regex-tdfa, shake, lib, temporary, text, transformers , unordered-containers }: mkDerivation { diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix index 311a26633a5..cca8acb8819 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, containers, deepseq, directory, extra , fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types -, hls-plugin-api, retrie, safe-exceptions, shake, lib, stdenv, text +, hls-plugin-api, retrie, safe-exceptions, shake, lib, text , transformers, unordered-containers }: mkDerivation { diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index 4f476431d9b..369ce0e27b8 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -2,7 +2,7 @@ , directory, extra, fetchgit, filepath, fingertree, generic-lens , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide , haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover -, lens, mtl, QuickCheck, refinery, retrie, shake, lib, stdenv, syb, text +, lens, mtl, QuickCheck, refinery, retrie, shake, lib, syb, text , transformers }: mkDerivation { diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 42cf3322420..8c817e8eeef 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,7 +1,7 @@ { mkDerivation, async, base, bytestring, connection, containers , directory, hpack, hspec, hspec-discover, hspec-expectations , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl -, optparse-applicative, parser-combinators, retry, lib, stdenv, text +, optparse-applicative, parser-combinators, retry, lib, text , unix, unordered-containers, utf8-string, fetchzip, dotenv }: mkDerivation rec { diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 5c4fe48f60f..3e6ef4d4d34 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hcloud"; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index ca052c0f210..11e52f77cb8 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , crystal , shards diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix index 772e2802ff5..96d2807b9ab 100644 --- a/pkgs/development/tools/jd/default.nix +++ b/pkgs/development/tools/jd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "jd"; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index 5e4e3df6942..b48de54dd22 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jid"; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 7b7647da033..cf15a61477e 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libffi, openssl, python3Packages }: +{ lib, libffi, openssl, python3Packages }: let inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro; in diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix index e0bf896c149..15347432f70 100644 --- a/pkgs/development/tools/jl/default.nix +++ b/pkgs/development/tools/jl/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchFromGitHub, fetchpatch , aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra -, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib, stdenv +, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib , text, unordered-containers, vector }: mkDerivation rec { diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index f5a7092e60f..5abbf71e7f4 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jmespath"; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index d8d703feed3..f1f5b37c10d 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jp"; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index bbdd1bd016d..e96d8f38af4 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 6a8fe4caf01..6a94d40c206 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "k6"; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 6c9f62c6f72..9cd1c976162 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kcli"; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 3fff2aae1f4..47b23ae2342 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: with lib; diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix index 7449d6df38e..f2a4f390f82 100644 --- a/pkgs/development/tools/krew/default.nix +++ b/pkgs/development/tools/krew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "krew"; diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index f2186709e83..46955855332 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kubectx"; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 4fc8f325342..39cd59cbec6 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeprompt"; diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix index f0985277a25..706b91aad25 100644 --- a/pkgs/development/tools/kubicorn/default.nix +++ b/pkgs/development/tools/kubicorn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 1e8ebb0d087..a2707eb72e9 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lazygit"; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index e68542e584f..934881b6781 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "leaps"; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index 4265c2a7450..306c9143c5c 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { name = "manul-unstable-2016-09-30"; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 73ea64f1d62..140e4869e88 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "circleci-cli"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 60d3c5c4539..5c130a99c92 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , pkg-config , fetchurl , meson diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index 3614270574e..74450bdfe73 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docopts"; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index cd19e263f0a..e3ee51c58fd 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "elfinfo"; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index c01bb61f4f6..92338bb0323 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , gdb diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix index 992b76bd62d..32c32b536d9 100644 --- a/pkgs/development/tools/misc/itm-tools/default.nix +++ b/pkgs/development/tools/misc/itm-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config }: rustPlatform.buildRustPackage rec { pname = "itm-tools"; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 59bab3742a2..32a14404c60 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitLab }: +{ lib, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { pname = "loccount"; version = "1.2"; diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index a8a18b254b9..6d58a39f704 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python37Packages, fetchFromGitHub }: +{ lib, python37Packages, fetchFromGitHub }: with python37Packages; buildPythonApplication rec { pname = "nrfutil"; diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/development/tools/misc/perfect-hash/default.nix index 7447bf66022..71747f0d117 100644 --- a/pkgs/development/tools/misc/perfect-hash/default.nix +++ b/pkgs/development/tools/misc/perfect-hash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "perfect-hash"; version = "0.4.1"; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index 0ef7a2aa73a..8406ecf298f 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -2,7 +2,7 @@ , cargo , lib , rustPlatform -, stdenv + }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 49052c141a1..8a5cbbcfdfa 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "scc"; diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 6487c3fc2c0..1a5f3efe0e6 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake }: +{ lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; version = "0.2.1"; diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index 6afcfe871a4..d448251bf13 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub, clang-unwrapped }: +{ lib, python3, fetchFromGitHub, clang-unwrapped }: python3.pkgs.buildPythonApplication rec { pname = "whatstyle"; diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index efe4c960566..c42e364b88e 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { pname = "modd"; diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 99e4eb62156..40181f16288 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mustache-go"; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 82ed82a67bd..c9728f9cbbf 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchgit , autoreconfHook diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 9ab69d1d5d8..4547012e2f3 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: +{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: buildGoModule rec { pname = "out-of-tree"; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d4dd46cdcb5..16e5ac08203 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; version = "1.6.6"; diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index ec07e4b058e..79457643ce6 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "packet-cli"; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 31ccf19bb05..723e5d8bb2d 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "packet"; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 79c8f379188..ce733b8a213 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: +{ lib, rustPlatform, fetchFromGitHub, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index cda3ba5e8a8..ff4219ad09c 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : +{ lib, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : with rustPlatform; buildRustPackage rec { diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 6ca94041bb5..2d7294ec105 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: with python3.pkgs; diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index dd2345378d4..eab000e8d8e 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -1,5 +1,5 @@ # This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "pprof-unstable"; diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 3f54a4f9c0e..58458ea79aa 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -6,7 +6,7 @@ , http-conduit, http-types, lens-family-core, megaparsec, mtl , network-uri, open-browser, optparse-applicative, prettyprinter , process, QuickCheck, retry, rio, rio-orphans, safe, semver-range -, lib, stdenv, stm, stringsearch, tar, template-haskell, temporary, text +, lib, stm, stringsearch, tar, template-haskell, temporary, text , time, transformers, turtle, unliftio, unordered-containers , utf8-string, vector, versions, with-utf8, zlib }: diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 4edb60d11a1..4fe51d3e046 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "quicktemplate"; diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index 5674876daba..e2f053c1e81 100644 --- a/pkgs/development/tools/rdbtools/default.nix +++ b/pkgs/development/tools/rdbtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python }: +{ lib, python }: with python.pkgs; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index c37779a5293..385db11d7ff 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "remarshal"; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 747e80adf4f..22bf5fbe904 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "renderizer"; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index 17a334aba20..ca01f6ebfa2 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , git , gnupg1 , python3Packages diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 1013c4aa8b4..81a912171f3 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "richgo"; diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index a0c169d8466..45fb2b8f957 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; version = "0.7.2"; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index eef8a5e41fd..f379e58ba16 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin , runtimeShell , bash }: diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix index b79611ff5ec..8b40d9b686d 100644 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, runCommand }: +{ lib, fetchFromGitHub, rustPlatform, runCommand }: rustPlatform.buildRustPackage rec { pname = "cargo-binutils"; diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index e4c5d8ab48c..989885e99a7 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib +{ lib , rustPlatform, fetchFromGitHub , libusb1, pkg-config, rustfmt }: diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index dbd79f179aa..39b56c2d656 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib +{ lib , rustPlatform, fetchFromGitHub , libusb1, pkg-config, rustfmt }: diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 904ba6efb52..569c8f88da2 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index ae638cac8a9..358c58bef4d 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "cargo-readme"; diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 210449a7230..f20bdb9cc17 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix index 45ea6c430d1..54f21ab4627 100644 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-sync-readme"; diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index 6c73b245e04..c4c079c523b 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 2e800402c1d..8aa701779bc 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 97da8056290..6ec06fffe21 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index fa25604f9fc..2e1ca55dad3 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix index 5d851adc5ab..5c811aaf239 100644 --- a/pkgs/development/tools/summon/default.nix +++ b/pkgs/development/tools/summon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: +{ buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: with lib; diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix index c25f0491c67..a1c93f46dcb 100644 --- a/pkgs/development/tools/systemfd/default.nix +++ b/pkgs/development/tools/systemfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, darwin, buildPlatform +{ lib, fetchgit, darwin, buildPlatform , buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }: ((import ./Cargo.nix { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 7dc899c4fc4..7b80192a75e 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, sqlite }: +{ lib, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { pname = "textql"; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 9a2c1d72caa..dc2f8022117 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let version = "2.3.2"; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 65f91b3324f..f37b17057e5 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages +{ lib, python3Packages , git, breezy, subversion }: with python3Packages; diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix index cfadf694320..0b037a9068c 100644 --- a/pkgs/development/tools/vend/default.nix +++ b/pkgs/development/tools/vend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vend"; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 23dda32b723..505023f3fdd 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "vultr-cli"; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index b9ca0febf97..1f101882b5b 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "vultr"; diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index b7eaabe8693..b5e0701c136 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, makeDesktopItem }: +{ lib, fetchurl, pythonPackages, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "winpdb-1.4.8"; diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index a3702f2e3e6..85dbc4f731a 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.2.8"; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 3026289fec1..bef8eb906cf 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "ws"; diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index d707caaec5a..77f884b82b6 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 68ecaf6479e..303f325dec1 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yj"; diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index 60a3d330ab8..bf0a8c6d816 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "shopify-themekit"; diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 2b882ccc841..a6ffe6e84e3 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: +{ lib, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: perlPackages.buildPerlPackage { pname = "wml"; diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix index e8778d7bebc..092e0e4eac2 100644 --- a/pkgs/games/20kly/default.nix +++ b/pkgs/games/20kly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , python }: diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 9b46420d5ff..83189353645 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, buildGoPackage}: +{lib, fetchurl, buildGoPackage}: buildGoPackage rec { diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index f63f6362558..fb7c7fddf09 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,5 +1,5 @@ { mkDerivation -, lib, stdenv +, lib , pkg-config , zlib , qtbase diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index d47e0d5521d..a657913aad7 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf +{ lib, fetchFromGitHub, mkDerivation, cmake, protobuf , qtbase, qtmultimedia, qttools, qtwebsockets, wrapQtAppsHook }: diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index 3192976b0f6..dcb72d53b32 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, rustPlatform, pkg-config, openssl }: +{ lib, fetchgit, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "eidolon"; diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index f220a85e0eb..d6b15301872 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchurl , fetchFromGitHub , unzip diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index 10cce9f3bf8..eeb4086f924 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitLab, cmake, qtbase }: +{ mkDerivation, lib, fetchFromGitLab, cmake, qtbase }: mkDerivation rec { pname = "enyo-doom"; diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix index 8d9976689cc..7327b9e2287 100644 --- a/pkgs/games/factorio/mods.nix +++ b/pkgs/games/factorio/mods.nix @@ -2,7 +2,7 @@ # mods. It will eventually be replaced by a nixos-channel that will provide # derivations for most or all of the mods tracked through the official mod # manager site. -{ lib, stdenv, fetchurl +{ lib, fetchurl , factorio-utils , allRecommendedMods ? true , allOptionalMods ? false diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index fb09847908d..69d5282aedc 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -1,4 +1,4 @@ -{ buildEnv, lib, stdenv, callPackage, makeWrapper, makeDesktopItem }: +{ buildEnv, lib, callPackage, makeWrapper, makeDesktopItem }: let description = "Action-adventure game, starring a certain quixotic frog"; diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix index d1521dae3c4..6883acb6014 100644 --- a/pkgs/games/frozen-bubble/default.nix +++ b/pkgs/games/frozen-bubble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }: +{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib }: perlPackages.buildPerlModule { pname = "frozen-bubble"; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 7d63510aa99..74411d63d3e 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection , python3Packages, gnome3 }: diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 5ed4bf5a376..c3479f6758a 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib, buildPythonApplication, fetchFromGitHub , gtk3, gobject-introspection , wrapGAppsHook, python3Packages }: diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index 0705da6bfe9..4609f7d732c 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, buildGoPackage}: +{lib, fetchurl, buildGoPackage}: buildGoPackage rec { diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index f5c0e3faf77..0635ab8aed8 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimageTools, lib, fetchurl, makeDesktopItem }: +{ appimageTools, lib, fetchurl, makeDesktopItem }: let name = "lunar-client"; version = "2.4.0"; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 81fc1b98f36..5a1f42ee130 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: let jdk = jdk8; diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 306c5de3b43..41c903e1011 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -1,7 +1,7 @@ /* The reusable code, and package attributes, between OpenRA engine packages (engine.nix) and out-of-tree mod packages (mod.nix). */ -{ lib, stdenv, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper +{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper , lua, mono, dotnetPackages, python , libGL, freetype, openal, SDL2 , zenity diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 56f0d5a47f2..59555a8ac24 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase +{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite , wrapQtAppsHook , tinyxml2, target ? "client" }: diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 07451b8dc2a..ef535991c23 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, python3Packages, fetchFromGitLab, cacert, +{ lib, callPackage, python3Packages, fetchFromGitLab, cacert, rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip, jre, makeWrapper, tr-patcher, tes3cmd }: diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index dbe2db363ea..381a6e8742b 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: +{ mkDerivation, lib, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: mkDerivation rec { version = "1.0.13"; pname = "pro-office-calculator"; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index c765a1cbdf5..925532bbbf5 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, buildPythonApplication, python3Packages +{ lib, fetchzip, buildPythonApplication, python3Packages , desktop-file-utils, freecell-solver }: buildPythonApplication rec { diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index c87d1bea1c7..f5330485edd 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: +{ lib, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: mkDerivation rec { pname = "tbe"; diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix index 5a6bc34fea5..f99faa282fd 100644 --- a/pkgs/games/wyvern/default.nix +++ b/pkgs/games/wyvern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchgit , rustPlatform , unzip diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix index 8334444ec4c..911917e6d2f 100644 --- a/pkgs/misc/doge/default.nix +++ b/pkgs/misc/doge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv , python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "doge"; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index 77a2e03d161..db5c8e5d903 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders +{ lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders , GyroplotSupport ? false }: diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index d092a878683..e1a31d208e4 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: +{ mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: mkDerivation { pname = "citra"; diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 236eff8610c..c766df9e3c0 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }: mkDerivation rec { pname = "firebird-emu"; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index dbf658b8fce..b028701fe11 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , mkDerivation , cmake diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index 475e54076fc..9e1f986341f 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , rustPlatform -, lib, stdenv +, lib , wayland , xorg , vulkan-loader diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 24da1d86bbf..abfc4f832a3 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, wineUnstable }: +{ lib, callPackage, wineUnstable }: with callPackage ./util.nix {}; diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 43f077227db..17b7b563c15 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL +{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index c4de45421f2..2f3a95a3302 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, lndir, symlinkJoin, makeWrapper +{ lib, lndir, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts }: diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 1be14ecec9b..ce80b174d32 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index d7416731e63..43ea85508c6 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index bb547b3d34d..188da860530 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, vscode-utils +{ lib, vscode-utils , fetchurl, unzip , mono, writeScript, runtimeShell , jq, clang-tools diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index f561755fc4b..b894eb7fa4d 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: +{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 82924f369ae..746bb4608ab 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , vscode-utils , useLocalExtensions ? false}: # Note that useLocalExtensions requires that vscode-server is not running diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index d19027fa576..0136bf4e5b1 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,5 +1,5 @@ # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh -{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages +{ lib, vscode-utils, jq, rust-analyzer, nodePackages , setDefaultServerPath ? true }: diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 336cd059f57..86453b960cb 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , wakatime, vscode-utils }: let diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 9afd4b475de..b53c5985a21 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index 3e5399dbb35..609cd579f9f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix index 2f6c8319b1c..e3b3179d4a3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { prePatch = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index cb54212f217..0ba61ccb491 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: +{ lib, appleDerivation, IOKitSrcs, xnu, darwin-stubs }: # Someday it'll make sense to split these out into their own packages, but today is not that day. appleDerivation { diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 7f93a87837a..1bf6396d47f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, developer_cmds }: +{ lib, appleDerivation, developer_cmds }: appleDerivation { buildInputs = [ developer_cmds ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index a5508b5ec12..ad3f5dea975 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo +{ lib, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutil, hfs, darling, darwin-stubs }: diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 4f719ef8463..4855c532acb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc +{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc }: # this derivation sucks diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 614bdf570f3..6e659df4d62 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuild, ncurses, libutil }: +{ lib, appleDerivation, xcbuild, ncurses, libutil }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index f7503dbb953..5a3b1710216 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 8cff145661f..7d011d2d8cc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook }: +{ lib, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 5819101e10a..27a7f7b3e7c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, yacc, flex }: +{ lib, appleDerivation, yacc, flex }: appleDerivation { nativeBuildInputs = [ yacc flex ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index 5a5a603eae8..6f666019c3b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, makeWrapper }: +{ lib, appleDerivation, makeWrapper }: appleDerivation { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index db57537bacb..77de079e2f0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook, llvmPackages }: +{ lib, appleDerivation, xcbuildHook, llvmPackages }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index e46e826053f..1daa4929610 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook , Libc, xnu, libutil }: appleDerivation { diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix index 4a72ea337eb..01d44d22f5e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 407117f1dbd..258d9785e70 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: +{ lib, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index ceb4b18df17..d9a9beaccfc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, libdispatch, xnu }: +{ lib, appleDerivation, libdispatch, xnu }: appleDerivation { propagatedBuildInputs = [ libdispatch xnu ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index 24986e28852..5021d3cd7fe 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation }: +{ lib, appleDerivation }: appleDerivation { buildPhase = ":"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index f216a820dd4..dd3cf030952 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 771dd41b575..e2e13a168f0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook }: +{ lib, appleDerivation, xcbuildHook }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index d5dca4a3035..3f0c91db91c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix index e21f00beb5a..862305a069d 100644 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, runtimeShell }: +{ lib, writeScriptBin, runtimeShell }: let fake = name: lib.overrideDerivation (writeScriptBin name '' #!${runtimeShell} diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index cc485bb62c6..16ed52ea81e 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -2,7 +2,7 @@ , clang-unwrapped , binutils-unwrapped , runCommand -, stdenv + , wrapBintoolsWith , wrapCCWith , buildIosSdk, targetIosSdkPkgs diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix index 036ea0a0f48..f5db0b25f18 100644 --- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix +++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -1,4 +1,4 @@ -{ busybox, stdenv}: +{ busybox}: # Minimal shell for use as basic /bin/sh in sandbox builds busybox.override { diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index d1a93e4247e..e82e3f5901c 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , fetchpatch , pythonPackages diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 25f541d7a00..e23591168f6 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , dbus , dbus_cplusplus diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 9baa4eee621..15e53557126 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: let pname = "zd1211-firmware"; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index db4b70037c8..b60a10c73ed 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: +{ lib, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }: # Don't use this for anything important yet! diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 1924e326c1e..a91175aa59f 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, fetchpatch }: +{ lib, fetchurl, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { name = "iotop-0.6"; diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 6505d1d80ee..7285e27ff36 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, iproute, fetchFromGitHub }: +{ lib, iproute, fetchFromGitHub }: iproute.overrideAttrs (oa: rec { pname = "iproute_mptcp"; diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index ffd710e632e..bd0518650d6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -8,7 +8,7 @@ # # See also -{ lib, stdenv, version }: +{ lib, version }: with lib; with lib.kernel; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d1d9e94e2a6..193f6c3d160 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 2bc5321ea7f..99425f984f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9c04ee72238..6b2e8f08ecb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { version = "4.4.253"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index df298ade084..2c0c3457ef0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { version = "4.9.253"; diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 0eaa148a49c..2afabcad042 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 0469b731b89..1d098416c3d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index a272bd286f3..a64520ab893 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: +{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: buildLinux (args // rec { version = "4.14.165-172"; diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 35df8e99ddc..3c938fd8e6f 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: +{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let version = "5.10.9"; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix index f7bca36481b..cd661be1078 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp-95.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: +{ lib, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: let mptcpVersion = "0.95"; modDirVersion = "4.19.55"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 5f0f513ff45..b1874bf3820 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: +{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { version = "5.9.0-2020.11.20"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 98fafaadece..5210e3ed7a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: with lib; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index aa73e7b8a3e..b30afb59ca8 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: +{ lib, fetchFromGitHub, buildLinux, ... } @ args: let version = "5.10.9"; diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix index a9f99874367..577b7c25311 100644 --- a/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nettools, fetchFromGitHub }: +{ lib, nettools, fetchFromGitHub }: nettools.overrideAttrs(oa: rec { name = "net-tools-mptcp"; diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index c74810d24d5..f15a5b63779 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , go-md2man diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 32c99a8be13..4745ba818a9 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -7,7 +7,7 @@ }: let - common = import ../../../development/python-modules/openrazer/common.nix { inherit lib stdenv fetchFromGitHub; }; + common = import ../../../development/python-modules/openrazer/common.nix { inherit lib fetchFromGitHub; }; in stdenv.mkDerivation (common // { name = "openrazer-${common.version}-${kernel.version}"; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 1ef304c617f..839b3f1b78f 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 +{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 , gobject-introspection }: diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix index 2fb6c9441ed..87cc098d07d 100644 --- a/pkgs/os-specific/linux/s6-linux-init/default.nix +++ b/pkgs/os-specific/linux/s6-linux-init/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 209f596d273..132a0b49574 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index 026488a24de..a58b7efa7b3 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }: +{ lib, fetchFromGitLab, rustPlatform, pkg-config, dbus }: rustPlatform.buildRustPackage rec { pname = "sd-switch"; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index bcdb622866b..0da84ab1cef 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 +{ lib, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy , withGraphics ? false }: diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index ba1c063cc05..4d3446d5a5d 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "targetcli"; diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 4db4d64bc93..594cf6bfc42 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: +{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: mkDerivation { pname = "kernelshark"; version = "1.1.0"; diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index 5f4ffb50c07..cc9fb737465 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "0.3.0"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index ab1cece0f33..d2d59ba21a5 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ lib, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index d48bcad1794..3e6641b8d26 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "caddy"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 8ab171a2f43..c9d06d49771 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "cayley"; diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 8e1ef831269..f6f6a0fbd71 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: # TODO: Add a service for gcp-cups-connector and perhaps some other # kind of configuration for the same thing that gcp-connector-util diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 4c0ce8d511e..9dc723417d6 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "consul"; diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 0c6fe818775..4a499e7f878 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index adb1a7f329b..cdfc78d6222 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "coredns"; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 0e608051a9e..10d517179c2 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,4 +1,4 @@ -{ gcc6Stdenv, stdenv, gccStdenv, llvmPackages +{ gcc6Stdenv, gccStdenv, llvmPackages , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index c4881baeac0..7bd09569248 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotty"; diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 75d15d4f378..67b328d661a 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "headphones"; diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix index e6e35c35900..0d138e1f648 100644 --- a/pkgs/servers/holochain-go/default.nix +++ b/pkgs/servers/holochain-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "holochain-go${version}"; diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index 52f345d5477..1faa85cfc14 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { pname = "hyp-server"; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 8b950ec12c5..41c69bde285 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: buildGoModule rec { pname = "hydron"; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index eaf16e38804..e7d9b1a2847 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: + +stdenv.mkDerivation rec { pname = "icingaweb2"; version = "2.8.2"; @@ -16,10 +18,10 @@ cp -ra application bin etc library modules public $out cp -ra doc $out/share - wrapProgram $out/bin/icingacli --prefix PATH : "${makeBinPath [ php ]}" + wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}" ''; - meta = { + meta = with lib; { description = "Webinterface for Icinga 2"; longDescription = '' A lightweight and extensible web interface to keep an eye on your environment. diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix index 7c592fca33b..0a152a7e157 100644 --- a/pkgs/servers/icingaweb2/theme-april/default.nix +++ b/pkgs/servers/icingaweb2/theme-april/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-april"; version = "1.0.4"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Icingaweb2 theme for april fools"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-april"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix index 273bcf6945d..59b8df6b4d4 100644 --- a/pkgs/servers/icingaweb2/theme-lsd/default.nix +++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-lsd"; version = "1.0.3"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Psychadelic theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-lsd"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix index 3d28481cd84..ddd363701a7 100644 --- a/pkgs/servers/icingaweb2/theme-particles/default.nix +++ b/pkgs/servers/icingaweb2/theme-particles/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-particles"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "This theme adds a nice particle effect to the login screen of Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-particles"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix index 941138bb0a5..5650d1ccdba 100644 --- a/pkgs/servers/icingaweb2/theme-snow/default.nix +++ b/pkgs/servers/icingaweb2/theme-snow/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-snow"; version = "1.0.0"; @@ -20,7 +25,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Snow theme for Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-snow"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix index a21f6cc89a2..dda26caf6a1 100644 --- a/pkgs/servers/icingaweb2/theme-spring/default.nix +++ b/pkgs/servers/icingaweb2/theme-spring/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-spring"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Theme with some soft colors and nice background images loaded from unsplash.com"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-spring"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix index a43f7d7c09a..a2bb3f9e4a2 100644 --- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix +++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-unicorn"; version = "1.0.2"; @@ -35,7 +41,7 @@ cp unicorn.png "$out/public/img/unicorn.png" ''; - meta = { + meta = with lib; { description = "Unicorn theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-unicorn"; license = licenses.publicDomain; diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index b383135f2eb..ee759ac55ea 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "nullidentdmod"; version = "1.3"; diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index d0b192010c1..2530c72cbb9 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "robustirc-bridge"; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 4680c37c85e..b9bce56d9fa 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix index b52018b64f4..94a1832bd8d 100644 --- a/pkgs/servers/kapowbang/default.nix +++ b/pkgs/servers/kapowbang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kapowbang"; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index acfa1aa2c3f..a016c8e7f09 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule +{ lib, fetchFromGitHub, buildGoModule , pkg-config, ffmpeg, gnutls }: diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index f1ba497720a..674fdbabb4e 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "MailHog"; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 57ceee948b5..9a86cc31fdd 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 58ef52e9c26..00cf2c1e83c 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock +{ lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 , django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index ab8ad4440ab..9330de3a8f3 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock , django-mailman3, mailmanclient, readme_renderer }: diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 1c92a4a7676..800a69e9509 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "pflogsumm"; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index d0eaf40d06c..07b351bfb21 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, lib, runCommand, postfix }: +{ fetchurl, perlPackages, lib, runCommand, postfix }: let mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/${perlPackages.perl.libPrefix}") inputs); diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index c5980bc8889..ff96f0e7c82 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: +{ lib, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index df22aab1f95..6d12ac84d90 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchurl }: buildGoModule rec { pname = "matterbridge"; diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 36edd851f36..3abb728bec1 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "matterircd"; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index eea87392927..a17d8a55acc 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, olm }: +{ lib, buildGoModule, fetchFromGitHub, olm }: buildGoModule rec { pname = "mautrix-whatsapp"; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 55dd3d8afc5..7781124259b 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: let pname = "miniflux"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index d54232fd7f2..9477da8a3f8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index a696bc41351..d6a25b3675f 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib, stdenv }: +{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib }: mkDerivation { pname = "client-ip-echo"; version = "0.1.0.5"; diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index 7f4959e58eb..1eaaf01578f 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "alertmanager-bot"; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 63000664921..8501aa5e02c 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cadvisor"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 896664658cf..4cf5f6b8068 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul-alerts"; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 5d825dbe7f2..0034c253c77 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 43346e9353f..da60be64603 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: with lib; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 11183dcc2f2..1ca9e702e7a 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: let bName = "check_esxi_hardware"; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 19b98124e8e..bc3cf7539ec 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 648bb59b0d2..64105c9c58f 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "apcupsd-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 2548e196837..af58a6ebe94 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-s3-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 1a86a0e38d9..5cfdf615830 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "bind_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 5670233b054..3cb04304e26 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "bird-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 3140056a269..88ef3f02602 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "blackbox_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index f86c3a42773..b3b61567d48 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "collectd-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ab4b67402d3..c3cc7eff90a 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e0141718696..875db1777fb 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "dnsmasq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index c0d96b08bb6..ff7156360a9 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "dovecot_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index bc9058e36d9..cefa4579069 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "fritzbox-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 718c8f2fcb1..18055f9b06a 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitlab-ci-pipelines-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index e12c76e09f0..6a42297d502 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "haproxy_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index e7ecffee992..a551e55b216 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "keylight-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 1f9c38922eb..34a9511d0b5 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "lndmon"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index daad5dc81cd..2d995ba5293 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: buildGoModule { pname = "mailexporter"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 0fb7ee4fce3..0fa2bced125 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mesos_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 5044db4b1c1..37f9b0c4e06 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 78642821b94..93e9bca3283 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "minio-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index c23d44dca38..e6178dd52a3 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "modemmanager-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index ec181d2e110..ff32764fcde 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mysqld_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 259b4f752d3..ee5bafbc7c9 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "nginx_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index b15a54c6529..fad49d27575 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "nginxlog_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index e2b601f56c1..42ccb91017f 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "node_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 8e3daa931ee..021905ba9e0 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "openvpn_exporter-unstable"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index e3f8b2d44d4..a24edd2fbb0 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: with lib; diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index 5a3c232ac85..a147a3c2905 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "process-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index b333faf0bbd..a370bf1f248 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "prom2json"; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index f4a9070fd84..a4ba3cee620 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0d47211005f..aca2836e1a7 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "pushgateway"; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index d9c08f8718d..b7832395f62 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "rabbitmq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 945f403041c..34c058d5d6c 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "redis_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a71b03a2b41..ece22e496d1 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: buildGoPackage rec { pname = "snmp_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 2784dae63af..553613a9c7e 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "sql_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index a2b0f73904b..31bd583280c 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "statsd_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 50915bf65f8..39e475df197 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "surfboard_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 669cf8ffaea..b9971ab7228 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "unifi-exporter"; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 9955b4a8333..755dc151775 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; version = "0.17.2"; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 0343384a679..8297503b675 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "unifi-poller"; diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index f4dc2d33d1b..19147be3f5d 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, php }: +{ lib, fetchurl, python3Packages, php }: python3Packages.buildPythonApplication rec { name = "nextcloud-news-updater-${version}"; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 0029d9ad55e..572f4d94e72 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv, nixosTests }: +{ buildGoPackage, fetchFromGitHub, lib, nixosTests }: buildGoPackage rec { pname = "nginx-sso"; diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix index 2a33b9744a2..666a92004b4 100644 --- a/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/pkgs/servers/nosql/mongodb/v3_4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 511ea217328..bdf12a1f923 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages +{ lib, fetchgit, perl, openssl, perlPackages, gettext, python3Packages # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere. , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 3bfab658af6..fafeda88975 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "radicale"; diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index 918dad537a5..b0902feeead 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "Radicale"; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index e62ad975380..4a19932f23e 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "routinator"; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index d3ec7dc75ee..cfc35e8528f 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index ecc79acfbe7..2ae3d9f486f 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchgit, python3Packages, pkg-config, diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 04cd93c5306..8964796862c 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "serf"; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 7bd971e86e7..43ba82caf76 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "sickrage"; diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index bc56053515b..d673a201646 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "simplehttp2server"; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 587c5d4bda2..e6f35124a6f 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "skydns"; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 5e1e8544818..3e28f501049 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper +{ lib, fetchurl, makeWrapper , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index b0dc7a22757..75d341e601e 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, buildGoModule }: +{ fetchFromGitHub, lib, buildGoModule }: buildGoModule rec { pname = "dolt"; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index bb353dda928..9240b9c51a2 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv }: +{ fetchFromGitHub, rustPlatform, lib }: with rustPlatform; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index c18bf17a7c7..f2161d5d47e 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tegola"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index f89c8f96fcf..0b55b82d39e 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, stdenv, buildGoPackage, zip, fetchFromGitHub }: +{ lib, buildGoPackage, zip, fetchFromGitHub }: buildGoPackage rec { pname = "teleport"; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 4ef454d6b56..340bad6bdc8 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }: +{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 03ff9f32fa5..cc0fb0d7421 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , trezor-udev-rules diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index b99375dbb3d..5cf08ee6c3c 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "trickster"; diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 375726a4692..1accac5bf6f 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation { pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 987a6d8aaa6..7df8b717593 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "tt-rss-plugin-tumblr-gdpr"; version = "2.1"; diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 41f47ca4a4e..f6882611a25 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; version = "2.5.0"; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index acdfb95272a..b681727c08f 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "udpt"; diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index 818e92f0596..07342c3edbe 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "unpfs"; diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index 6b17476623b..04f1e14d5cc 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "morty"; diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 7100c70c0ed..b39d7a00ced 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "shiori"; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 316e3a52497..6bda15a93e0 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "webmetro"; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 7fe0e5a9f97..e3d2698e830 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config +{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config , epoxy, libxslt, libunwind, makeWrapper, egl-wayland , defaultFontPath ? "" }: diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index b8eb29d87b2..5241139cfa3 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , installShellFiles diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 550e93fb5aa..85465fd7d14 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: +{ pkgs, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: let package = (import ./node.nix { inherit pkgs system; }).package; in diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 938029e9af9..82a15edcb26 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "elvish"; diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix index c23e0b1ca92..368c88aa1bb 100644 --- a/pkgs/shells/fish/babelfish.nix +++ b/pkgs/shells/fish/babelfish.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "babelfish"; version = "1.0.1"; diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 3ea41d7f472..33e71358b4d 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit, lib }: +{ buildGoPackage, fetchgit, lib }: buildGoPackage rec { pname = "oh"; diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 8b2ac362959..c7c6e4e5a7d 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetPackage }: +{ lib, fetchFromGitHub, buildDotnetPackage }: buildDotnetPackage { baseName = "pash"; diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index c0c56570b46..7fb2d786193 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -32,7 +32,7 @@ }: haskellPackages.callPackage - ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }: + ({ mkDerivation, base, HUnit, parsec, process, QuickCheck }: mkDerivation rec { pname = "zsh-git-prompt"; version = "0.4z"; # While we await a real 0.5 release. diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix index 05d09d6f39c..9d13e1112cc 100644 --- a/pkgs/test/haskell-shellFor/default.nix +++ b/pkgs/test/haskell-shellFor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, haskellPackages, cabal-install }: +{ lib, haskellPackages, cabal-install }: (haskellPackages.shellFor { packages = p: [ p.database-id-class p.constraints ]; diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix index e9d32e4ccf6..aef5acc1de6 100644 --- a/pkgs/test/install-shell-files/default.nix +++ b/pkgs/test/install-shell-files/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: +{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }: let runTest = name: env: buildCommand: diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 00296bc54af..e6f4b5f6ff1 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages +{ lib, fetchurl, python3Packages , gobject-introspection, gsettings-desktop-schemas, gtk3 , wrapGAppsHook, xrandr }: diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 2d6965567b7..8744c493b71 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, xorg, buildGoPackage, fetchFromGitHub }: +{ lib, xorg, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-sct"; diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index 1ebd8ccc4e4..3071ef31781 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, fetchpatch }: +{ lib, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { version = "0.6.0"; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index f2864ca2eb5..cf9bbd9bb98 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, libxslt, +{ lib, python3Packages, fetchFromGitHub, libxslt, gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0c1accd36fb..0dffdf7bbf7 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText +{ lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265 diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index 0d3cd957324..8a42a011da9 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }: +{ lib, openssl, pkg-config, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "afterburn"; diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index 32c006d7a5f..070a9b6430c 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 4b26e3a7434..82b57739120 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-rotate-key"; diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index f71422f77a2..3e2cf150557 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "awslogs"; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index ca588db01a5..8a6bb559041 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "berglas"; diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index ff66e926d4b..422c6da82d2 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index 6404eb92a26..bbf8d7eaeb1 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -1,4 +1,4 @@ -{ python, lib, stdenv }: +{ python, lib }: with python.pkgs; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 2a1ceb531a5..55af1679d7a 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 2ca0f2c4d08..7fb128caa19 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "docker-credential-gcr"; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 3fe3856d9c5..8913bed39d5 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "exoscale-cli"; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index e7481e16948..dd35da451ad 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "iamy"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index aeff0d931f0..1c263a1969d 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, hwdata, pkg-config, lxc, buildGoPackage, fetchurl +{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix index bf807d14997..35cf7b11e64 100644 --- a/pkgs/tools/admin/s3bro/default.nix +++ b/pkgs/tools/admin/s3bro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s3bro"; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 0aeccb755a1..2a8f0d1f114 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "scaleway-cli"; diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix index 42288bafe01..a6f511fe115 100644 --- a/pkgs/tools/admin/sewer/default.nix +++ b/pkgs/tools/admin/sewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "sewer"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index fc064641943..5bfc00ac000 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, bash }: +{ lib, python3Packages, bash }: python3Packages.buildPythonApplication rec { pname = "simp_le-client"; diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix index 6c8520648ec..b6ca3135f56 100644 --- a/pkgs/tools/admin/ssh-import-id/default.nix +++ b/pkgs/tools/admin/ssh-import-id/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, lib, stdenv +, lib , fetchgit , requests , makeWrapper diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 6b0d0380901..8ed8b0b812b 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ssmsh"; diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index c410bd81e89..309bf4803fb 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "stripe-cli"; diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index a64cc5ebcad..793611699ec 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages }: +{ fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix index 545e6d7cf2c..441dcfe579f 100644 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ b/pkgs/tools/audio/beets/plugins/check.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: +{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: pythonPackages.buildPythonApplication rec { name = "beets-check"; diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index b339bc34ad2..5af52066caa 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }: +{ fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index eedfd2f3dbb..d5f78ada91c 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: +{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: pythonPackages.buildPythonApplication { version = "2015-11-17"; diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 801058e0496..af4000dfa44 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mpd-mpris"; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 30b0d90f562..4cd3921fb55 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , autoreconfHook , fetchFromGitHub , glib diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index c79204cffa2..48f553d960d 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: +{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: mkDerivation rec { version = "1.5.1"; diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index 3ce76fb61fa..4eafd7f52e1 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, opencv3 }: +{ lib, fetchFromGitHub, pythonPackages, opencv3 }: let opencv3_ = pythonPackages.toPythonModule (opencv3.override { diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index 06b6079bde2..d05257f1d08 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: +{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: python3Packages.buildPythonApplication rec { pname = "volctl"; diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 76a3d674ecb..9ed70491fb3 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: +{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; version = "0.6.4"; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index d70efa1d224..3b5d901daf0 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv, openssh, makeWrapper }: +{ buildGoPackage, fetchFromGitHub, lib, openssh, makeWrapper }: buildGoPackage rec { pname = "diskrsync"; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 2ef3b5f5420..2f2f01356b4 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python37, fetchFromGitHub }: +{ lib, python37, fetchFromGitHub }: let python = python37.override { self = python; diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index 736dfdb557d..2a7c4ff5176 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, makeWrapper +{ mkDerivation, lib, fetchurl, cmake, pkg-config, makeWrapper , httrack, qtbase, qtmultimedia }: mkDerivation rec { diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix index eb5e883bdac..c066cb76695 100644 --- a/pkgs/tools/backup/iceshelf/default.nix +++ b/pkgs/tools/backup/iceshelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, git, awscli, python3 }: +{ lib, fetchFromGitHub, git, awscli, python3 }: python3.pkgs.buildPythonApplication rec { pname = "iceshelf"; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 5a67bea41ea..a8f88e88b0e 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl +{ mkDerivation, lib, fetchurl , pkg-config, libtool, qmake , rsync, ssh }: diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index f55f163dafb..0d24e3df720 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, python2Packages, librsync, gnused }: +{lib, fetchurl, python2Packages, librsync, gnused }: python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 74b90236c4e..70394afb50e 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, sqlite, which }: +{ lib, fetchFromGitHub, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { pname = "s3ql"; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 99ddd62e6ae..8c37a7b72ac 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index 938c24f38ce..39c11cc0c91 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, eggDerivation, fetchegg }: +{ pkgs, lib, eggDerivation, fetchegg }: let eggs = import ./eggs.nix { inherit eggDerivation fetchegg; }; in with pkgs; eggDerivation rec { diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 0ed2bf1bf8b..8e54b58e201 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, lzop, postgresql, pv }: +{ lib, fetchurl, python3Packages, lzop, postgresql, pv }: python3Packages.buildPythonApplication rec { pname = "wal-e"; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 02e3c19f004..c167ad1fa01 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stdenv, stringcase +, pytestcov, pytestrunner, lib, stringcase }: buildPythonApplication rec { diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix index 477fa337da8..c175eb45aa0 100644 --- a/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3 , fetchFromGitHub }: diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 0abea9b1285..91d59a4de0f 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, pythonPackages +{ lib, fetchurl, pythonPackages , gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield , bzip2, xz, lzip # unzip is handled by p7zip diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 68199a0938e..f0efaaa3231 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 8f4e9941029..2f179a151d1 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonApplication , docopt, anytree diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 4c493ea2252..774568fdde1 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: +{ lib, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { pname = "convoy"; diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 1d1863ede96..e4a120264fd 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "gitfs"; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 318e39e8322..b8b330c129a 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , openssl diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 3a63ad9747f..80ae8ca2b3c 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, blivet }: +{ lib, fetchurl, buildPythonApplication, blivet }: buildPythonApplication rec { pname = "nixpart"; diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/tools/filesystems/sandboxfs/default.nix index 8777fa50a5d..32d186344dd 100644 --- a/pkgs/tools/filesystems/sandboxfs/default.nix +++ b/pkgs/tools/filesystems/sandboxfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform , fuse diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 7129de95013..1eac3e03ec9 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: buildGoPackage rec { pname = "tmsu"; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 2787b87964f..6a6409ad325 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3, makeWrapper }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 1fe254d7785..02bb022dfb4 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, gawk +{ lib, fetchFromGitHub, makeWrapper, gawk , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages }: diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 0ce24482164..95af281d7ea 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gifski"; diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 4ae68207aae..341d6dea90a 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perlPackages, fetchurl }: +{ lib, perlPackages, fetchurl }: perlPackages.buildPerlPackage { pname = "Graph-Easy"; diff --git a/pkgs/tools/graphics/ldgallery/compiler/default.nix b/pkgs/tools/graphics/ldgallery/compiler/default.nix index 000f227075e..9316e9d38e0 100644 --- a/pkgs/tools/graphics/ldgallery/compiler/default.nix +++ b/pkgs/tools/graphics/ldgallery/compiler/default.nix @@ -1,7 +1,7 @@ # generated with cabal2nix by ./generate.sh { mkDerivation, aeson, base, cmdargs, containers, data-ordlist , directory, fetchgit, filepath, Glob, hpack, parallel-io, process -, safe, lib, stdenv, text, time, yaml +, safe, lib, text, time, yaml }: mkDerivation { pname = "ldgallery-compiler"; diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix index 71d927913c3..0a1cc111b54 100644 --- a/pkgs/tools/graphics/pdfredacttools/default.nix +++ b/pkgs/tools/graphics/pdfredacttools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: +{ lib, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: python2Packages.buildPythonApplication rec { pname = "pdf-redact-tools"; diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/tools/graphics/puppeteer-cli/default.nix index c01ee232fa7..20dab27ddf0 100644 --- a/pkgs/tools/graphics/puppeteer-cli/default.nix +++ b/pkgs/tools/graphics/puppeteer-cli/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, makeWrapper, stdenv, chromium, mkYarnPackage +{ fetchFromGitHub, makeWrapper, chromium, mkYarnPackage }: mkYarnPackage rec { diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index ec32d6c7140..070e359fe1c 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: mkDerivation { pname = "rocket"; diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 3c96584029e..79ddd39ea79 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }: rustPlatform.buildRustPackage rec { pname = "shotgun"; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 653e585c6ed..6c5e8569e85 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "svgcleaner"; diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 99f7231c58a..73344ca2690 100644 --- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/pkgs/tools/inputmethods/evdevremapkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { pname = "evdevremapkeys"; diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index 01f312fa63d..66f264bc7a3 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "evscript"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 923fd7c7a74..6d3952c9c22 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchurl , fetchFromGitHub diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index ba006873c40..b133d576c6c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 155f10fae26..bfb06a98e8f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , mkDerivation , fetchFromGitHub , cmake diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 74426b2b04e..93078325a0d 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, makeWrapper, lndir +{ lib, runCommand, makeWrapper, lndir , dconf, hicolor-icon-theme, ibus, librsvg, plugins ? [] }: diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 3f1e981fd0e..3c51210edc7 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "3mux"; diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index f5149737639..c9466f54a62 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: with python3.pkgs; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 5c17b7f2d13..9c952cc7c30 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.8.1"; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 369f7dd219f..7f82aebabe4 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: let diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix index 25bac976843..f6991662114 100644 --- a/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/pkgs/tools/misc/asciinema-scenario/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchCrate }: diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index f8a17790ba1..ad48eae7a87 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "azure-vhd-utils"; diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index cc3476f598b..44d7e93355b 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "bashplotlib"; diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index ed42f31f26b..79094dc9540 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { pname = "bmap-tools"; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index cda58e80d87..a3f1608c3ad 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 53925b87591..cb5f582d2de 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication { pname = "broadlink-cli"; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 15a2a643d32..48d8b7c8930 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chezmoi"; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 6c13c3bbe6a..9c6909d445d 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev +{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev , pkg-config, qtbase, cmake, zlib, kmod }: mkDerivation rec { diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 20c8cc7af8f..c28272e8bfa 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "claws"; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 11bfdc508eb..552ea140d60 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "cloud-sql-proxy"; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 0ccfe424645..4808fe3ef56 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix index a855dac5f12..0ecde80c238 100644 --- a/pkgs/tools/misc/codebraid/default.nix +++ b/pkgs/tools/misc/codebraid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "codebraid"; diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index a4b499a6323..6527a01e43b 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }: +{ lib, fetchFromGitHub, python3Packages, help2man, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "crudini"; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 546daef5ecb..496639ec07a 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "dashing"; diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index 6c295eb00e8..0fb31685170 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "diskonaut"; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index df9755f863d..b8483068117 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv, docker }: +{ buildGoModule, fetchFromGitHub, lib, docker }: buildGoModule rec { pname = "docker-ls"; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index e4934853e82..a1b2ad662bc 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docui"; diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 313dc9935fa..9edc078d9f9 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "doitlive"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index c40753dcf99..7997f2119a2 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "du-dust"; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index 7ec763f16c6..eafc71030ac 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.0.0"; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 89be1da8cc9..7c7f91621b8 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, openssl }: +{ lib, fetchFromGitHub, python3, openssl }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 65da084f841..253e815008a 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: +{ lib, fetchFromGitHub, rustPlatform, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "eva"; diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 1076c44a1bb..7416961e84e 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fselect"; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 8e113ee871a..100e7023232 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "fsql"; diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix index 9cb05609772..7fbfadfac76 100644 --- a/pkgs/tools/misc/g933-utils/default.nix +++ b/pkgs/tools/misc/g933-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkg-config }: +{ lib, fetchFromGitHub, rustPlatform, udev, pkg-config }: rustPlatform.buildRustPackage rec { pname = "g933-utils"; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index d518ba88fb6..5c7953a766e 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: with builtins; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 6096dac9622..dd28ddfaff5 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gh-ost"; diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index e82cafdd64c..bbb1b8b9640 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: +{ lib, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: python3Packages.buildPythonApplication { pname = "gif-for-cli"; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index cf3a6aba19f..56f9452db7b 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-town"; diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix index 26b082e43b3..295bf010279 100644 --- a/pkgs/tools/misc/go.rice/default.nix +++ b/pkgs/tools/misc/go.rice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go.rice"; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 7bc7eab3456..033883ab1c8 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gosu"; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 3188dcdafbf..8fe35012090 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "grc"; diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix index a0e884e82d9..419cff20087 100644 --- a/pkgs/tools/misc/hacksaw/default.nix +++ b/pkgs/tools/misc/hacksaw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: +{ lib, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: rustPlatform.buildRustPackage rec { pname = "hacksaw"; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 13933c6c28a..9d50530df47 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, coreutils }: +{ lib, fetchFromGitHub, rustPlatform, coreutils }: rustPlatform.buildRustPackage rec { pname = "heatseeker"; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index e75d0105731..d825368cb97 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "hexyl"; diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index 13a88dcba30..9f7fa31d3f2 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "hyperledger-fabric"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index d75b878ae6d..e91b17856ed 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "i3cat"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index d58efd7a0d4..6e207ce6916 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "i3minator"; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 58afffcd706..78f40974ace 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage}: +{ lib, fetchFromGitHub, buildGoPackage}: buildGoPackage rec { pname = "ical2org"; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 00bf9403427..8c24848f4b5 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: with python3Packages; diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index 8d70b35584e..e4713890ac4 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "kt"; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index ea66a04a40d..ed186772ab7 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "lazydocker"; diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index f7a8c68ed06..3322196d6ed 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 377ba05eba6..8f41499ca06 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "lnch"; diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index 1b2fa9bda86..0cbf43a8790 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lokalise2-cli"; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index b7bd7678535..0c3e206a9f2 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { pname = "loop"; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 239c9651b86..c3c9fab8c1e 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , nixosTests , fetchFromGitHub , rustPlatform diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix index 19f43f2c8c5..5335624467d 100644 --- a/pkgs/tools/misc/me_cleaner/default.nix +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "me_cleaner"; diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index a0ac411f98e..131367cf9f2 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "microplane"; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 6c332198fa7..f2ef73cfd99 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, desktop-file-utils, file, python3Packages }: +{ lib, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { pname = "mimeo"; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index 5dcbcb065ec..564e1989aee 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmake"; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 0415955e092..7949a82edc4 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoPackage , fetchFromGitHub , openssl diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 3bd297628b2..e9f76dbf22d 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "nagstamon"; diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index 2d6f23de468..67c49c3ad0d 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, imagemagick }: +{ lib, fetchFromGitHub, python3, imagemagick }: with python3.pkgs; diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 9f28d99ba0f..23d4fd57f62 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "ntfy"; diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index b339f94deb1..916f15c94c6 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, dateutil }: +{ lib, fetchFromGitHub, buildPythonApplication, dateutil }: buildPythonApplication rec { pname = "pdd"; diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix index ceb8b4d68d9..f4572d0e5bc 100644 --- a/pkgs/tools/misc/pdf-parser/default.nix +++ b/pkgs/tools/misc/pdf-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchzip }: +{ lib, python3Packages, fetchzip }: python3Packages.buildPythonApplication { pname = "pdf-parser"; diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 5a59e3030e6..8afaa61e35b 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgcenter"; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 70429ef811a..54e7093747b 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgmetrics"; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index 27c486f4bea..12b11cf20d0 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "phraseapp-client"; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 874bbdbaf70..6eec45db011 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , file diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 2b46e25c67e..f69a5c7d380 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "powerline-go"; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 82e7659d152..be5fd6d499c 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix index 834a62803f6..dc07e3dd4f4 100644 --- a/pkgs/tools/misc/rargs/default.nix +++ b/pkgs/tools/misc/rargs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "rargs"; diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix index 63ceca8d934..a9f42d1139e 100644 --- a/pkgs/tools/misc/rename/default.nix +++ b/pkgs/tools/misc/rename/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perlPackages }: +{ lib, fetchFromGitHub, perlPackages }: perlPackages.buildPerlPackage { pname = "rename"; diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index 41e4207d6c9..18c5aea3dfd 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "shelldap"; version = "1.4.0"; diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index c24b12f9539..4bc5c28b559 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchFromGitHub, ncurses }: +{ lib, python3, fetchFromGitHub, ncurses }: python3.pkgs.buildPythonApplication rec { pname = "swaglyrics"; diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index e898ded8154..03d8e58f8b0 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: +{ lib, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "systrayhelper"; diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index 43a91eaca52..ba63ec290d4 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tagref"; version = "1.4.1"; diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 84bfdc55d7f..0e724059e99 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -1,4 +1,4 @@ -{ pkg-config, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: +{ pkg-config, lib, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "tensorman"; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index 0e07f3e53f3..3434ac110b3 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { pname = "tewisay-unstable"; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index bf87505ab13..d26c750a0c7 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication +{ lib, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six , pytest, pytest-mock }: diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 940ae130c84..57d320fd790 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python }: +{ lib, python }: with python.pkgs; diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index c4d8b20ffdd..812ad7900d0 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: +{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: pythonPackages.buildPythonApplication { diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 1da49a153b8..d199fd7fda3 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "trash-cli"; diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 07b4d834978..8a96248e718 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -1,15 +1,11 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub }: -let + +buildGoModule rec { pname = "trillian"; version = "1.3.11"; - -in -buildGoModule { - inherit pname version; vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; src = fetchFromGitHub { @@ -34,10 +30,10 @@ buildGoModule { "cmd/updatetree" ]; - meta = { + meta = with lib; { homepage = "https://github.com/google/trillian"; description = "A transparent, highly scalable and cryptographically verifiable data store."; - license = [ lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.adisbladis ]; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.adisbladis ]; }; } diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/tools/misc/tydra/default.nix index 6714ee489f5..00c8aa2a2c3 100644 --- a/pkgs/tools/misc/tydra/default.nix +++ b/pkgs/tools/misc/tydra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tydra"; diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index c8e1a0f7ca4..a2bc615ed86 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: +{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "unicode"; diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index ddc0fa42c69..79460f3a5b7 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index c1b1fce7abd..18adf99b9c9 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchPypi , markdown diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index dad352cc657..e131d8bd4e7 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "vivid"; diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index e6d36155732..18699e5911d 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "void"; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 75f46106209..e8bd12d567b 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +{ lib, python3Packages, fetchFromGitHub, glibcLocales }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index 8d4998a9ff9..b898aa2fc24 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { name = "xdxf2slob-unstable-2015-06-30"; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 378337f6232..16379820653 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 }: diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index b8dd369cd6a..acd4a9e1d46 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "xmonad-log"; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 64568ca46b0..9ee81cd1b15 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: +{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: python3Packages.buildPythonApplication rec { pname = "yle-dl"; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 54443083996..f58fb349c95 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi }: +{ lib, buildPythonApplication, fetchPypi }: buildPythonApplication rec { pname = "you-get"; diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index eeb4f5c1bd5..3991b99fcdc 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python27Packages +{ lib, fetchurl, python27Packages , libykneomgr, yubikey-personalization, libu2f-host }: python27Packages.buildPythonPackage rec { diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 6934791da8e..af6843e3820 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick +{ lib, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick , libyubikey, yubikey-personalization }: mkDerivation rec { diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix index 15add8ed191..81d81b6794e 100644 --- a/pkgs/tools/misc/zabbixctl/default.nix +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "zabbixctl"; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 13018d183ca..3995fc295d1 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: buildGoModule rec { pname = "assh"; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index f84176495aa..b6f7cb1869a 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "brook"; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 5188954b763..157720651f4 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, sqlite }: let +{ lib, rustPlatform, fetchFromGitHub, sqlite }: let manifest = { description = "Bukubrow extension host application"; diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 891eb19c835..f24c0e629cb 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3 }: +{ lib, python3 }: let python = python3.override { diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 590fcf1dbaf..543c86db307 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "clash"; diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index 9f0c9873e2a..cbf50091303 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: python3Packages.buildPythonApplication { pname = "connman-notify"; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 64e8e09467d..a7e5026d83a 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "corerad"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 92493ab109f..4a4578a7356 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, callPackage}: +{ lib, buildGoModule, fetchFromGitHub, callPackage}: buildGoModule rec { pname = "croc"; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index 84b5c1861cd..ab4c3292ea5 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { name = "curl-unix-socket-2015-04-10"; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index d980d570226..ad37245d57c 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: +{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index a77030bba93..e2c497dad40 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "datadog-process-agent"; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 3b52c2be252..51454ac1197 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, iproute, perl }: +{ lib, fetchurl, perlPackages, iproute, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 3526562e11c..8aedb403260 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dnscrypt-proxy2"; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index a04244642ba..718606fdfa6 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnsproxy"; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 3ed250ca4bc..1d7bf884edd 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchurl }: +{ buildGoPackage, lib, fetchurl }: buildGoPackage rec { name = "filegive-0.7.4"; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index d994d9d8cec..4e20cbe7441 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "getmail"; diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix index 78117a700bd..10c5c8ea64f 100644 --- a/pkgs/tools/networking/goklp/default.nix +++ b/pkgs/tools/networking/goklp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "goklp"; diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 564c45d2e14..14d0a16366b 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libpcap }: +{ lib, buildGoPackage, fetchFromGitHub, libpcap }: buildGoPackage rec { pname = "goreplay"; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 59a3bffdc6d..3732fbd879f 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, httpie }: +{ lib, fetchFromGitHub, python3Packages, httpie }: python3Packages.buildPythonApplication rec { pname = "http-prompt"; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 66513819ab8..c5e12317fd7 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: +{ lib, fetchFromGitHub, python3Packages, docutils, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "httpie"; diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index 22dc500fd4c..40851d370c7 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "httplab"; diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index a8b9630aab2..27c2a145a65 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, curl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "httpstat"; diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix index dd85a5dcb61..d1f5316c27b 100644 --- a/pkgs/tools/networking/ipgrep/default.nix +++ b/pkgs/tools/networking/ipgrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { version = "1.0.1"; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 2ddcd6c7d4b..ae431b329ea 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "kail"; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 3145f85186b..9d667d0ee1d 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio-client"; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 698046358e3..0de96169769 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, +{ lib, fetchFromGitHub, python2Packages, asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 2ebec34b219..5e4f0542d36 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper , aria , libnotify , pulseaudio diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index 55dedc09bea..d3f153e44ae 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "photon"; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 76b77da1764..dc9133229af 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index ec275c5e6a8..6155d411e13 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pixiecore"; diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index 68cb8fed57a..69e5d0427e5 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchurl, python2Packages }: let inherit (python2Packages) buildPythonApplication; diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index 7f45d53d41d..6a0bfcc6ee2 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index b2b08cea844..a17701644c8 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: +{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { pname = "pssh"; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index f856f591bf4..0d001e7aeef 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, python3, writeText, writeScript +{ lib, runtimeShell, fetchFromGitHub, python3, writeText, writeScript , coreutils, sqlite }: with python3.pkgs; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 06f51b0c506..15f6ff3dfa0 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: buildPythonApplication rec { pname = "s3cmd"; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 390b35b0297..4623b68ad4c 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "s3gof3r"; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 80874649072..95dc02cb5cd 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "s4cmd"; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index c7507925f5f..e6b1c823eb8 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "shadowfox"; diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 4474cba6aee..2844cc2dac0 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "subfinder"; diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 0ed7922874d..9d786d60b12 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { name = "tdns-cli"; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index bd280e75379..36269327e81 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "tendermint"; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index f4e790fea36..65ba8d17bcb 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: +{ lib, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: buildGoModule rec { pname = "termshark"; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 85fcea008de..3ef125382b6 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub +{ lib, rustPlatform, fetchFromGitHub , libsodium, openssl , pkg-config }: diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 69bc3fc409b..feb17b283de 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit +{ lib, buildGoPackage, fetchgit , pkg-config , glib, libxml2 }: diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 10bbc963a28..1cea3989ed2 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "urlwatch"; diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 7efe7018d31..8364cd5763d 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "waitron-unstable-${version}"; diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 3b1c3f14ac5..054b77f8c9b 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools +{ lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools , hcxdumptool, pyrit, which }: diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 100de62683d..35c5371113c 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchzip }: +{ lib, buildGoPackage, fetchzip }: buildGoPackage rec { pname = "wireguard-go"; diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix index 6476d4f43b1..48f842f60ce 100644 --- a/pkgs/tools/networking/wormhole-william/default.nix +++ b/pkgs/tools/networking/wormhole-william/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "wormhole-william"; diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix index 161b08a7d39..a851dcd4ead 100644 --- a/pkgs/tools/networking/wstunnel/default.nix +++ b/pkgs/tools/networking/wstunnel/default.nix @@ -1,6 +1,6 @@ { mkDerivation, async, base, base64-bytestring, binary, bytestring , classy-prelude, cmdargs, connection, hslogger, mtl, network -, network-conduit-tls, stdenv, streaming-commons, text +, network-conduit-tls, streaming-commons, text , unordered-containers, websockets , hspec, iproute , lib, fetchFromGitHub, fetchpatch diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 73db27f1a94..156841be334 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "wuzz"; diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index 7f946718588..75a89b859fe 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: let pname = "yrd"; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index b495a302618..853bf87346f 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }: +{ lib, fetchFromGitHub, openssl, pkg-config, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 4b0239a2fa2..146165d880d 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -1,7 +1,7 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv + }: let pname = "nar-serve"; diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 38e2b060c0c..b177b9a233a 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,5 +1,5 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers -, directory, HUnit, mtl, nix-derivation, process, relude, lib, stdenv +, directory, HUnit, mtl, nix-derivation, process, relude, lib , stm, text, time, unix, fetchFromGitHub }: mkDerivation { diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix index f820f36e49f..353aafa2a7e 100644 --- a/pkgs/tools/nix/nix-query-tree-viewer/default.nix +++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: +{ lib, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "nix-query-tree-viewer"; diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/tools/package-management/cargo-kcov/default.nix index 6b825919b60..8b2dbe3e489 100644 --- a/pkgs/tools/package-management/cargo-kcov/default.nix +++ b/pkgs/tools/package-management/cargo-kcov/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 920b23f36ab..60fbdd4941f 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx"; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index dd14976e633..ad4435c9e2d 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub +{ lib, buildGoPackage, fetchFromGitHub , gx }: diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 2390c33ca03..dd5c36019f2 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 66691d9f5c5..695cd2976d8 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: +{ lib, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: rustPlatform.buildRustPackage rec { pname = "nix-doc"; diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix index 47734f73fd6..91f9a39514b 100644 --- a/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "nix-simple-deploy"; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index b1a86f3137e..d3fcac6277f 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,9 +1,8 @@ -{ stdenv +{ lib , python3 , fetchFromGitHub , nixFlakes , git -, lib }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index 3cce599c052..b6ffe9abc02 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication { name = "python2nix-20140927"; diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index c8518ef0a9f..b06454e736c 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.2.0"; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 851eed43ade..e0499681848 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-iam-authenticator"; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 73d95f52b8c..08508dd157a 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, stdenv, libiconv }: +{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, libiconv }: buildGoPackage rec { pname = "aws-okta"; diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index 47848b25b43..e2318c853f1 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: let generic = { patches ? [] }: diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index f0c756f54f9..ff6522f1d35 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "certstrap"; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 835c5daa72c..e92fe7b951f 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, go-rice }: +{ lib, buildGoModule, fetchFromGitHub, go-rice }: buildGoModule rec { pname = "cfssl"; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 4966c6412ab..5c2e6b4de15 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }: +{ lib, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }: mkDerivation rec { pname = "chrome-token-signing"; diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/tools/security/cloudbrute/default.nix index 06f0dd413a5..84a59ec495f 100644 --- a/pkgs/tools/security/cloudbrute/default.nix +++ b/pkgs/tools/security/cloudbrute/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix index 7a936408433..e9e5685acf4 100644 --- a/pkgs/tools/security/creddump/default.nix +++ b/pkgs/tools/security/creddump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python2, python2Packages }: +{ lib, fetchFromGitLab, python2, python2Packages }: python2Packages.buildPythonApplication rec { pname = "creddump"; diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/tools/security/crlfuzz/default.nix index feddd893cec..88bd45bb5e1 100644 --- a/pkgs/tools/security/crlfuzz/default.nix +++ b/pkgs/tools/security/crlfuzz/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix index 2f197421e1f..e58f77457de 100644 --- a/pkgs/tools/security/crowbar/default.nix +++ b/pkgs/tools/security/crowbar/default.nix @@ -3,7 +3,7 @@ , nmap , openvpn , python3Packages -, lib, stdenv +, lib , tigervnc }: diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix index 855549bb0c8..e351eb7a79d 100644 --- a/pkgs/tools/security/deepsea/default.nix +++ b/pkgs/tools/security/deepsea/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 65b18c5c822..5eda4e75f94 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 1a82467201d..35f033cb983 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 084601a4122..46995e28441 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index e0dcdadb7b0..f8c5b4a9f12 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , rustPlatform , fetchFromGitHub , cryptsetup diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index 3d6472cbb44..797a2db211b 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "fierce"; diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 98045a107e5..46498e49cff 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index db0e88a805b..a94be8295ea 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitLab , fetchpatch , python3 diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix index f32ecdc94e6..f4b750d394a 100644 --- a/pkgs/tools/security/gospider/default.nix +++ b/pkgs/tools/security/gospider/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 49530213985..ac896c4d55b 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,7 +1,7 @@ { buildGoModule , docker , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 6ec4d7776e1..9c1c896d889 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hologram-2018-03-19"; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 7135baab375..bff9e03bc6f 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 6916d6b99bd..67abb57394c 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, keybase }: +{ lib, buildGoPackage, fetchFromGitHub, keybase }: buildGoPackage { pname = "kbfs"; diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 7a00f183f15..960667e72de 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, hping }: +{ lib, fetchFromGitHub, python2Packages, hping }: let rev = "bf14bbff"; in python2Packages.buildPythonApplication rec { diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index 20473d1003e..ce64b6847fe 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: let inherit (python3.pkgs) buildPythonApplication pytest mock pexpect; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index fa3db0c3623..ab6ec0b1681 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, libtool }: +{ lib, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { pname = "notary"; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 7e9d3d52e56..2df24e63d89 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index bdaf087004a..8c5083ee8af 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 7d038a1aeab..3612caa196c 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, python3Packages, gnupg, perl }: +{ fetchFromGitHub, lib, python3Packages, gnupg, perl }: let version = "3.0.0"; in python3Packages.buildPythonApplication { diff --git a/pkgs/tools/security/pyrit/default.nix b/pkgs/tools/security/pyrit/default.nix index ead55036425..dc1d0b97f87 100644 --- a/pkgs/tools/security/pyrit/default.nix +++ b/pkgs/tools/security/pyrit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: +{ lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: let version = "2019-12-13"; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 2b769ee0a15..8ba6937c448 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config +{ lib, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: mkDerivation rec { diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix index 2f0f4501fd2..503cfbd9e86 100644 --- a/pkgs/tools/security/safe/default.nix +++ b/pkgs/tools/security/safe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoPackage , fetchFromGitHub }: diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index ade299ec589..57a92ef4b99 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "saml2aws"; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 9eddc308a4f..ae6f000fe3f 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "sops"; diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/tools/security/subjs/default.nix index 5b9a237d49c..1b7986c0a77 100644 --- a/pkgs/tools/security/subjs/default.nix +++ b/pkgs/tools/security/subjs/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index bdaf8f129d0..53f99636b45 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix, then modified by hand for Darwin support. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, darwin }: +{ lib, buildGoPackage, fetchFromGitHub, darwin }: buildGoPackage rec { pname = "sudolikeaboss-unstable"; diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 1acb9e5609e..4a971243ad1 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/urlhunter/default.nix b/pkgs/tools/security/urlhunter/default.nix index 3364b622ad6..ebc628e563c 100644 --- a/pkgs/tools/security/urlhunter/default.nix +++ b/pkgs/tools/security/urlhunter/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, lib, stdenv +, lib }: buildGoModule rec { diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 3af00b9a22b..4d9893e103f 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: +{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: buildGoPackage rec { pname = "vault"; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 80cd0d971a3..6cc5ddbfb4c 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "volatility"; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index e95adf3e1e6..a7ce0fb4b6e 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , python3Packages , nix , ronn diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix index 5a94cff19e1..b4bef5fc5e3 100644 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index b04532d842f..88162780cb7 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, jdk }: +{ lib, fetchurl, perlPackages, jdk }: perlPackages.buildPerlPackage rec { pname = "awstats"; diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index 9c75fe78c99..47fdba50c5e 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildPythonApplication , fetchFromGitHub , atk diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 7604584e167..a285c720eaa 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "consul-template"; diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index 1706b32449e..9e8180b318a 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "envconsul"; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 53e69cd8cd6..0ade0443dc0 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv + , buildGoModule , fetchFromGitHub , installShellFiles diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index b49307f500f..3acace9eaae 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gotop"; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index f39c7dd793c..b653f240724 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: let inherit (pythonPackages) python; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 0ec7ef36623..3d85d13149c 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 99e0674016b..798e3b3e883 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, m4 }: +{ lib, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { name = "localtime-2017-11-07"; diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index 9e0f6fe147e..d01b08a1434 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "pcstat-unstable"; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index dcca1a86da7..152bb1150e5 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: let version = "3.13"; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 51c47ab1050..3943a8f4eef 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonPackage rec { pname = "s-tui"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 30467926f5d..20c23e15051 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, skawarePackages }: +{ lib, skawarePackages }: with skawarePackages; diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 7ac5d7cf210..62a7c9d8aea 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index 5a2ad41c744..638caa3c62b 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, stdenv, installShellFiles }: +{ rustPlatform, fetchFromGitHub, lib, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "tre-command"; diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix index 82ca3ff0f60..66441d73713 100644 --- a/pkgs/tools/text/angle-grinder/default.nix +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index 20d651df008..7816f79649c 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index bdb273de372..9c3e9fbd840 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "codesearch"; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ad92ffa9350..e1db7d3d39c 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "FanFicFare"; diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index 27dcf633fe7..0ab9a54c47b 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index dd3568ef0bb..5d89619001b 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { program = "grin"; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index 4e938787ff4..943b86d3b05 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gucci"; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 07082c4c56f..3ead56298cf 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "icdiff"; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 87f3f3daff3..8007724f4a5 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, xpdf, imagemagick, tesseract }: +{ lib, python3Packages, xpdf, imagemagick, tesseract }: python3Packages.buildPythonPackage rec { pname = "invoice2data"; diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix index 55febe11729..50ef560f6c3 100644 --- a/pkgs/tools/text/markdown-pp/default.nix +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, pythonPackages, lib, stdenv }: +{ fetchFromGitHub, pythonPackages, lib }: with pythonPackages; buildPythonApplication rec { diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/tools/text/pbgopy/default.nix index 5e1473f8a3c..d4ed4eb0f03 100644 --- a/pkgs/tools/text/pbgopy/default.nix +++ b/pkgs/tools/text/pbgopy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pbgopy"; diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 30e7e58345d..ca89b7dc2d8 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "the_platinum_searcher"; diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index ea72468dc69..143c43f660d 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, click, future, six }: +{ lib, fetchurl, buildPythonApplication, click, future, six }: buildPythonApplication rec { pname = "proselint"; diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix index f53a1d79080..97a30211621 100644 --- a/pkgs/tools/text/rpl/default.nix +++ b/pkgs/tools/text/rpl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "rpl"; diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 409bbc16a93..84196ae1119 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: + +stdenv.mkDerivation rec { pname = "schema2ldif"; version = "1.3"; diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 411c9cb9899..a0f3ad1c5e3 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi +{ lib, buildPythonApplication, fetchPypi , python-slugify, requests, urllib3, six, setuptools }: buildPythonApplication rec { diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index b1fd02ca75b..fa5418b4581 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, lib, stdenv, fetchFromGitHub }: +{ buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { version = "2.2.0"; diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 70f7e8f53ca..bc5ddcc9d75 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mmark"; diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 989f61f4592..7b20d230b9f 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, libreoffice }: +{ lib, fetchurl, pythonPackages, libreoffice }: pythonPackages.buildPythonApplication rec { diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 29fd21ed31f..2f6d169d0cb 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }: mkDerivation { pname = "tikzit"; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index ba28ef08c8f..88ec2f22b89 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "vnc2flv"; diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 3faf90ab4ac..061dd486e0d 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "awless"; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index fa8e96def24..796ea36eacf 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, glibcLocales }: +{ lib, python3, glibcLocales }: let localPython = python3.override { diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a7de9ae8b59..d06a2b4a17e 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, buildGoPackage, fetchFromGitHub +{ lib, pkg-config, buildGoPackage, fetchFromGitHub , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 371a867d4dd..88e83f42733 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python2Packages }: +{ lib, fetchgit, python2Packages }: let inherit (python2Packages) buildPythonApplication boto m2crypto; diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index 6f036795e72..fe31c64952a 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage { pname = "marathonctl-unstable"; diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index c971dfcb1bd..fb067de8212 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: +{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: buildPythonApplication rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0d24da0ca8..8b86a0631a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19276,7 +19276,7 @@ in kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit lib stdenv; + inherit lib; inherit (kernel) version; }; kernelPatches = kernel.kernelPatches ++ [ -- cgit 1.4.1 From 7fbb9e8d04bedeb74c415a74ee6f79c577e67a18 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 23 Dec 2020 13:16:44 +0900 Subject: beam-modules: add fetch-mix-deps --- pkgs/development/beam-modules/default.nix | 1 + pkgs/development/beam-modules/fetch-mix-deps.nix | 41 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/beam-modules/fetch-mix-deps.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 4f312129b38..2392f778bc0 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -33,6 +33,7 @@ let buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; + fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix new file mode 100644 index 00000000000..31f0821e81d --- /dev/null +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -0,0 +1,41 @@ +{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert }: + +{ name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: + +with stdenvNoCC.lib; + +stdenvNoCC.mkDerivation ({ + name = "mix-deps-${name}-${version}"; + + phases = [ "configurePhase" "downloadPhase" ]; + + nativeBuildInputs = [ elixir hex cacert ]; + + inherit src; + + MIX_ENV = mixEnv; + MIX_REBAR = "${rebar}/bin/rebar"; + MIX_REBAR3 = "${rebar3}/bin/rebar3"; + MIX_DEBUG = if debug then 1 else 0; + + configurePhase = '' + mkdir -p $out/deps + mkdir -p $out/.hex + export HEX_HOME="$out/.hex"; + export MIX_HOME="$TEMPDIR/.mix"; + export MIX_DEPS_PATH="$out/deps"; + ''; + + downloadPhase = '' + ln -s ${src}/mix.exs ./mix.exs + ln -s ${src}/mix.lock ./mix.lock + mix deps.get --only ${mixEnv} + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + inherit meta; +}) -- cgit 1.4.1 From 28b8e38666067bcfb8b4f62ed7c4531fb8c00563 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 31 Dec 2020 12:27:08 +0900 Subject: add git dependency --- pkgs/development/beam-modules/fetch-mix-deps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 31f0821e81d..efdaba4368c 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert }: +{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert, git }: { name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation ({ phases = [ "configurePhase" "downloadPhase" ]; - nativeBuildInputs = [ elixir hex cacert ]; + nativeBuildInputs = [ elixir hex cacert git ]; inherit src; -- cgit 1.4.1 From 10d464e887fbacf87ac7f82250ca35ca04e25368 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 3 Jan 2021 12:09:49 +0900 Subject: remove exporting of .hex --- pkgs/development/beam-modules/fetch-mix-deps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index efdaba4368c..513e5629183 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation ({ configurePhase = '' mkdir -p $out/deps mkdir -p $out/.hex - export HEX_HOME="$out/.hex"; + export HEX_HOME="$TEMPDIR/.hex"; export MIX_HOME="$TEMPDIR/.mix"; export MIX_DEPS_PATH="$out/deps"; ''; -- cgit 1.4.1 From 39c85b0bcfe1f807389225492d6efa72c58fa192 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 10 Jan 2021 17:46:10 +0900 Subject: use correct commands to set local rebar and rebar3 --- pkgs/development/beam-modules/fetch-mix-deps.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 513e5629183..5103e63dce5 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -14,16 +14,19 @@ stdenvNoCC.mkDerivation ({ inherit src; MIX_ENV = mixEnv; - MIX_REBAR = "${rebar}/bin/rebar"; - MIX_REBAR3 = "${rebar3}/bin/rebar3"; MIX_DEBUG = if debug then 1 else 0; + DEBUG = if debug then 1 else 0; # for rebar3 configurePhase = '' - mkdir -p $out/deps - mkdir -p $out/.hex export HEX_HOME="$TEMPDIR/.hex"; export MIX_HOME="$TEMPDIR/.mix"; - export MIX_DEPS_PATH="$out/deps"; + export MIX_DEPS_PATH="$out"; + + # Rebar + mix local.rebar rebar "${rebar}/bin/rebar" + mix local.rebar rebar3 "${rebar3}/bin/rebar3" + export REBAR_GLOBAL_CONFIG_DIR="$TMPDIR/rebar3" + export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" ''; downloadPhase = '' -- cgit 1.4.1 From f38079ff95813ff20ca8b8077e187baa54e90240 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 1 Feb 2021 09:58:51 +0900 Subject: use lib only where required use standard phases --- pkgs/development/beam-modules/fetch-mix-deps.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 5103e63dce5..020a82ad70b 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -1,14 +1,10 @@ -{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert, git }: +{ stdenvNoCC, lib, elixir, hex, rebar, rebar3, cacert, git }: { name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: -with stdenvNoCC.lib; - stdenvNoCC.mkDerivation ({ name = "mix-deps-${name}-${version}"; - phases = [ "configurePhase" "downloadPhase" ]; - nativeBuildInputs = [ elixir hex cacert git ]; inherit src; @@ -29,9 +25,9 @@ stdenvNoCC.mkDerivation ({ export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" ''; - downloadPhase = '' - ln -s ${src}/mix.exs ./mix.exs - ln -s ${src}/mix.lock ./mix.lock + dontBuild = true; + + installPhase = '' mix deps.get --only ${mixEnv} ''; @@ -39,6 +35,6 @@ stdenvNoCC.mkDerivation ({ outputHashMode = "recursive"; outputHash = sha256; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit meta; }) -- cgit 1.4.1 From f0b6a466e1ecc58694685fc453e78baf60ff5114 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 2 Apr 2021 09:53:14 +0900 Subject: beam-modules: format with nixpkgs-fmt --- pkgs/development/beam-modules/default.nix | 135 +++++++++++++++--------------- 1 file changed, 68 insertions(+), 67 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 02877a95411..3dcdc8c28d2 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -3,7 +3,7 @@ let inherit (lib) makeExtensible; - lib' = pkgs.callPackage ./lib.nix {}; + lib' = pkgs.callPackage ./lib.nix { }; # FIXME: add support for overrideScope callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args; @@ -14,70 +14,71 @@ let defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; in - rec { - inherit callPackage erlang; - beamPackages = self; - - rebar = callPackage ../tools/build-managers/rebar { }; - rebar3 = callPackage ../tools/build-managers/rebar3 { }; - - # rebar3 port compiler plugin is required by buildRebar3 - pc_1_6_0 = callPackage ./pc {}; - pc = pc_1_6_0; - - fetchHex = callPackage ./fetch-hex.nix { }; - - fetchRebar3Deps = callPackage ./fetch-rebar-deps.nix { }; - rebar3Relx = callPackage ./rebar3-release.nix { }; - - buildRebar3 = callPackage ./build-rebar3.nix {}; - buildHex = callPackage ./build-hex.nix {}; - buildErlangMk = callPackage ./build-erlang-mk.nix {}; - fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; - buildMix = callPackage ./build-mix.nix {}; - - # BEAM-based languages. - elixir = elixir_1_11; - - elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix { - inherit erlang; - debugInfo = true; - }; - - elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix { - inherit erlang; - debugInfo = true; - }; - - elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix { - inherit erlang; - debugInfo = true; - }; - - elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { - inherit erlang; - debugInfo = true; - }; - - elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix { - inherit erlang; - debugInfo = true; - }; - - # Remove old versions of elixir, when the supports fades out: - # https://hexdocs.pm/elixir/compatibility-and-deprecations.html - - lfe = lfe_1_3; - lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; - lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; - - # Non hex packages. Examples how to build Rebar/Mix packages with and - # without helper functions buildRebar3 and buildMix. - hex = callPackage ./hex {}; - webdriver = callPackage ./webdriver {}; - relxExe = callPackage ../tools/erlang/relx-exe {}; - - # An example of Erlang/C++ package. - cuter = callPackage ../tools/erlang/cuter {}; + rec { + inherit callPackage erlang; + beamPackages = self; + + rebar = callPackage ../tools/build-managers/rebar { }; + rebar3 = callPackage ../tools/build-managers/rebar3 { }; + + # rebar3 port compiler plugin is required by buildRebar3 + pc_1_6_0 = callPackage ./pc { }; + pc = pc_1_6_0; + + fetchHex = callPackage ./fetch-hex.nix { }; + + fetchRebar3Deps = callPackage ./fetch-rebar-deps.nix { }; + rebar3Relx = callPackage ./rebar3-release.nix { }; + + buildRebar3 = callPackage ./build-rebar3.nix { }; + buildHex = callPackage ./build-hex.nix { }; + buildErlangMk = callPackage ./build-erlang-mk.nix { }; + fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; + buildMix = callPackage ./build-mix.nix { }; + + # BEAM-based languages. + elixir = elixir_1_11; + + elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix { + inherit erlang; + debugInfo = true; }; -in makeExtensible packages + + elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix { + inherit erlang; + debugInfo = true; + }; + + elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix { + inherit erlang; + debugInfo = true; + }; + + elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { + inherit erlang; + debugInfo = true; + }; + + elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix { + inherit erlang; + debugInfo = true; + }; + + # Remove old versions of elixir, when the supports fades out: + # https://hexdocs.pm/elixir/compatibility-and-deprecations.html + + lfe = lfe_1_3; + lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; + lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; + + # Non hex packages. Examples how to build Rebar/Mix packages with and + # without helper functions buildRebar3 and buildMix. + hex = callPackage ./hex { }; + webdriver = callPackage ./webdriver { }; + relxExe = callPackage ../tools/erlang/relx-exe { }; + + # An example of Erlang/C++ package. + cuter = callPackage ../tools/erlang/cuter { }; + }; +in +makeExtensible packages -- cgit 1.4.1 From 1b1af195bb1e02a5d0548d27a11a5e12d377d62a Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 3 Apr 2021 09:30:31 +0900 Subject: beam-modules: remove unused pc versioning --- pkgs/development/beam-modules/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 3dcdc8c28d2..f78c66d3805 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -22,8 +22,7 @@ let rebar3 = callPackage ../tools/build-managers/rebar3 { }; # rebar3 port compiler plugin is required by buildRebar3 - pc_1_6_0 = callPackage ./pc { }; - pc = pc_1_6_0; + pc = callPackage ./pc { }; fetchHex = callPackage ./fetch-hex.nix { }; -- cgit 1.4.1 From 481832b32db4a9b1de5b5a04e9038520ff03fac3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 8 Apr 2021 20:54:48 +0900 Subject: beam-modules: buildMix -> mixRelease --- doc/languages-frameworks/beam.section.md | 217 ++++++++++++++++++++++- pkgs/development/beam-modules/build-mix.nix | 100 ----------- pkgs/development/beam-modules/default.nix | 2 +- pkgs/development/beam-modules/fetch-mix-deps.nix | 41 +++-- pkgs/development/beam-modules/mix-bootstrap | 108 ----------- pkgs/development/beam-modules/mix-release.nix | 106 +++++++++++ 6 files changed, 343 insertions(+), 231 deletions(-) delete mode 100644 pkgs/development/beam-modules/build-mix.nix delete mode 100755 pkgs/development/beam-modules/mix-bootstrap create mode 100644 pkgs/development/beam-modules/mix-release.nix (limited to 'pkgs/development/beam-modules') diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index ad3b94880b5..b5d39595c10 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -2,15 +2,15 @@ ## Introduction {#beam-introduction} -In this document and related Nix expressions, we use the term, *BEAM*, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction. +In this document and related Nix expressions, we use the term, _BEAM_, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction. ## Structure {#beam-structure} All BEAM-related expressions are available via the top-level `beam` attribute, which includes: - - `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlangR19`, etc), Elixir (`beam.interpreters.elixir`) and LFE (`beam.interpreters.lfe`). +- `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlangR19`, etc), Elixir (`beam.interpreters.elixir`) and LFE (Lisp Flavoured Erlang) (`beam.interpreters.lfe`). - - `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. `beam.packages.erlangR19`. +- `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. `beam.packages.erlangR19`. The default Erlang compiler, defined by `beam.interpreters.erlang`, is aliased as `erlang`. The default BEAM package set is defined by `beam.packages.erlang` and aliased at the top level as `beamPackages`. @@ -26,7 +26,9 @@ We provide a version of Rebar3, under `rebar3`. We also provide a helper to fetc ### Mix & Erlang.mk {#build-tools-other} -Both Mix and Erlang.mk work exactly as expected. There is a bootstrap process that needs to be run for both, however, which is supported by the `buildMix` and `buildErlangMk` derivations, respectively. +Erlang.mk works exactly as expected. There is a bootstrap process that needs to be run, which is supported by the `buildErlangMk` derivation. + +For Elixir applications use `mixRelease` to make a release. See examples for more details. ## How to Install BEAM Packages {#how-to-install-beam-packages} @@ -52,15 +54,150 @@ Erlang.mk functions similarly to Rebar3, except we use `buildErlangMk` instead o #### Mix Packages {#mix-packages} -Mix functions similarly to Rebar3, except we use `buildMix` instead of `buildRebar3`. +`mixRelease` is used to make a release in the mix sense. Dependencies will need to be fetched with `fetchMixDeps` and passed to it. + +#### mixRelease - Elixir Phoenix example + +Here is how your `default.nix` file would look. + +```nix +with import { }; + +let + packages = beam.packagesWith beam.interpreters.erlang; + src = builtins.fetchgit { + url = "ssh://git@github.com/your_id/your_repo"; + rev = "replace_with_your_commit"; + }; + + pname = "your_project"; + version = "0.0.1"; + mixEnv = "prod"; + + mixDeps = packages.fetchMixDeps { + pname = "mix-deps-${pname}"; + inherit src mixEnv version; + # nix will complain and tell you the right value to replace this with + sha256 = lib.fakeSha256; + # if you have build time environment variables add them here + MY_ENV_VAR="my_value"; + }; + + nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies; + + frontEndFiles = stdenvNoCC.mkDerivation { + pname = "frontend-${pname}"; + + nativeBuildInputs = [ nodejs ]; + + inherit version src; + + buildPhase = '' + cp -r ./assets $TEMPDIR + + mkdir -p $TEMPDIR/assets/node_modules/.cache + cp -r ${nodeDependencies}/lib/node_modules $TEMPDIR/assets + export PATH="${nodeDependencies}/bin:$PATH" + + cd $TEMPDIR/assets + webpack --config ./webpack.config.js + cd .. + ''; + + installPhase = '' + cp -r ./priv/static $out/ + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + # nix will complain and tell you the right value to replace this with + outputHash = lib.fakeSha256; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + }; + + +in packages.mixRelease { + inherit src pname version mixEnv mixDeps; + # if you have build time environment variables add them here + MY_ENV_VAR="my_value"; + preInstall = '' + mkdir -p ./priv/static + cp -r ${frontEndFiles} ./priv/static + ''; +} +``` + +Setup will require the following steps: + +- Move your secrets to runtime environment variables. For more information refer to the [runtime.exs docs](https://hexdocs.pm/mix/Mix.Tasks.Release.html#module-runtime-configuration). On a fresh Phoenix build that would mean that both `DATABASE_URL` and `SECRET_KEY` need to be moved to `runtime.exs`. +- `cd assets` and `nix-shell -p node2nix --run node2nix --development` will generate a Nix expression containing your frontend dependencies +- commit and push those changes +- you can now `nix-build .` +- To run the release, set the `RELEASE_TMP` environment variable to a directory that your program has write access to. It will be used to store the BEAM settings. -Alternatively, we can use `buildHex` as a shortcut: +#### Example of creating a service for an Elixir - Phoenix project + +In order to create a service with your release, you could add a `service.nix` +in your project with the following + +```nix +{config, pkgs, lib, ...}: + +let + release = pkgs.callPackage ./default.nix; + release_name = "app"; + working_directory = "/home/app"; +in +{ + systemd.services.${release_name} = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "postgresql.service" ]; + requires = [ "network-online.target" "postgresql.service" ]; + description = "my app"; + environment = { + # RELEASE_TMP is used to write the state of the + # VM configuration when the system is running + # it needs to be a writable directory + RELEASE_TMP = working_directory; + # can be generated in an elixir console with + # Base.encode32(:crypto.strong_rand_bytes(32)) + RELEASE_COOKIE = "my_cookie"; + MY_VAR = "my_var"; + }; + serviceConfig = { + Type = "exec"; + DynamicUser = true; + WorkingDirectory = working_directory; + # Implied by DynamicUser, but just to emphasize due to RELEASE_TMP + PrivateTmp = true; + ExecStart = '' + ${release}/bin/${release_name} start + ''; + ExecStop = '' + ${release}/bin/${release_name} stop + ''; + ExecReload = '' + ${release}/bin/${release_name} restart + ''; + Restart = "on-failure"; + RestartSec = 5; + StartLimitBurst = 3; + StartLimitInterval = 10; + }; + # disksup requires bash + path = [ pkgs.bash ]; + }; + + environment.systemPackages = [ release ]; +} +``` ## How to Develop {#how-to-develop} ### Creating a Shell {#creating-a-shell} -Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of erlang and other interpreter, and then user your normal build tools. As an example with elixir: +Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of Erlang and any other interpreters, and then use your normal build tools. As an example with Elixir: ```nix { pkgs ? import " {} }: @@ -79,6 +216,68 @@ mkShell { } ``` -#### Building in a Shell (for Mix Projects) {#building-in-a-shell} +#### Elixir - Phoenix project + +Here is an example `shell.nix`. + +```nix +with import { }; + +let + # define packages to install + basePackages = [ + git + # replace with beam.packages.erlang.elixir_1_11 if you need + beam.packages.erlang.elixir + nodejs-15_x + postgresql_13 + # only used for frontend dependencies + # you are free to use yarn2nix as well + nodePackages.node2nix + # formatting js file + nodePackages.prettier + ]; + + inputs = basePackages ++ lib.optionals stdenv.isLinux [ inotify-tools ] + ++ lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]); + + # define shell startup command + hooks = '' + # this allows mix to work on the local directory + mkdir -p .nix-mix .nix-hex + export MIX_HOME=$PWD/.nix-mix + export HEX_HOME=$PWD/.nix-mix + export PATH=$MIX_HOME/bin:$HEX_HOME/bin:$PATH + # TODO: not sure how to make hex available without installing it afterwards. + mix local.hex --if-missing + export LANG=en_US.UTF-8 + export ERL_AFLAGS="-kernel shell_history enabled" + + # postges related + # keep all your db data in a folder inside the project + export PGDATA="$PWD/db" + + # phoenix related env vars + export POOL_SIZE=15 + export DB_URL="postgresql://postgres:postgres@localhost:5432/db" + export PORT=4000 + export MIX_ENV=dev + # add your project env vars here, word readable in the nix store. + export ENV_VAR="your_env_var" + ''; + +in mkShell { + buildInputs = inputs; + shellHook = hooks; +} +``` + +Initializing the project will require the following steps: -Using a `shell.nix` as described (see ) should just work. +- create the db directory `initdb ./db` (inside your mix project folder) +- create the postgres user `createuser postgres -ds` +- create the db `createdb db` +- start the postgres instance `pg_ctl -l "$PGDATA/server.log" start` +- add the `/db` folder to your `.gitignore` +- you can start your phoenix server and get a shell with `iex -S mix phx.server` diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix deleted file mode 100644 index 45f5e367442..00000000000 --- a/pkgs/development/beam-modules/build-mix.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ stdenv, writeText, elixir, erlang, hex, lib }: - -{ name -, version -, src -, setupHook ? null -, buildInputs ? [] -, beamDeps ? [] -, postPatch ? "" -, compilePorts ? false -, installPhase ? null -, buildPhase ? null -, configurePhase ? null -, meta ? {} -, enableDebugInfo ? false -, ... }@attrs: - -with lib; - -let - - debugInfoFlag = lib.optionalString (enableDebugInfo || elixir.debugInfo) "--debug-info"; - - shell = drv: stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - buildInputs = [ drv ]; - }; - - bootstrapper = ./mix-bootstrap; - - pkg = self: stdenv.mkDerivation ( attrs // { - name = "${name}-${version}"; - inherit version; - - dontStrip = true; - - inherit src; - - setupHook = if setupHook == null - then writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib" - '' - else setupHook; - - inherit buildInputs; - propagatedBuildInputs = [ hex elixir ] ++ beamDeps; - - configurePhase = if configurePhase == null - then '' - runHook preConfigure - ${erlang}/bin/escript ${bootstrapper} - runHook postConfigure - '' - else configurePhase ; - - - buildPhase = if buildPhase == null - then '' - runHook preBuild - - export HEX_OFFLINE=1 - export HEX_HOME=`pwd` - export MIX_ENV=prod - export MIX_NO_DEPS=1 - - mix compile ${debugInfoFlag} --no-deps-check - - runHook postBuild - '' - else buildPhase; - - installPhase = if installPhase == null - then '' - runHook preInstall - - MIXENV=prod - - if [ -d "_build/shared" ]; then - MIXENV=shared - fi - - mkdir -p "$out/lib/erlang/lib/${name}-${version}" - for reldir in src ebin priv include; do - fd="_build/$MIXENV/lib/${name}/$reldir" - [ -d "$fd" ] || continue - cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd" - success=1 - done - - runHook postInstall - '' - else installPhase; - - passthru = { - packageName = name; - env = shell self; - inherit beamDeps; - }; -}); -in fix pkg diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f78c66d3805..6e6da4fab03 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -33,7 +33,7 @@ let buildHex = callPackage ./build-hex.nix { }; buildErlangMk = callPackage ./build-erlang-mk.nix { }; fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; - buildMix = callPackage ./build-mix.nix { }; + mixRelease = callPackage ./mix-release.nix { }; # BEAM-based languages. elixir = elixir_1_11; diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 020a82ad70b..73365bd1a93 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -1,34 +1,49 @@ { stdenvNoCC, lib, elixir, hex, rebar, rebar3, cacert, git }: -{ name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: - -stdenvNoCC.mkDerivation ({ - name = "mix-deps-${name}-${version}"; - +{ pname +, version +, sha256 +, src +, mixEnv ? "prod" +, debug ? false +, meta ? { } +, ... +}@attrs: + +stdenvNoCC.mkDerivation (attrs // { nativeBuildInputs = [ elixir hex cacert git ]; - inherit src; - MIX_ENV = mixEnv; MIX_DEBUG = if debug then 1 else 0; DEBUG = if debug then 1 else 0; # for rebar3 - - configurePhase = '' + # the api with `mix local.rebar rebar path` makes a copy of the binary + MIX_REBAR = "${rebar}/bin/rebar"; + MIX_REBAR3 = "${rebar3}/bin/rebar3"; + # there is a persistent download failure with absinthe 1.6.3 + # those defaults reduce the failure rate + HEX_HTTP_CONCURRENCY = 1; + HEX_HTTP_TIMEOUT = 120; + + configurePhase = attrs.configurePhase or '' + runHook preConfigure export HEX_HOME="$TEMPDIR/.hex"; export MIX_HOME="$TEMPDIR/.mix"; - export MIX_DEPS_PATH="$out"; + export MIX_DEPS_PATH="$TEMPDIR/deps"; # Rebar - mix local.rebar rebar "${rebar}/bin/rebar" - mix local.rebar rebar3 "${rebar3}/bin/rebar3" export REBAR_GLOBAL_CONFIG_DIR="$TMPDIR/rebar3" export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" + runHook postConfigure ''; dontBuild = true; - installPhase = '' + installPhase = attrs.installPhase or '' + runHook preInstall mix deps.get --only ${mixEnv} + find "$TEMPDIR/deps" -path '*/.git/*' -a ! -name HEAD -exec rm -rf {} + + cp -r --no-preserve=mode,ownership,timestamps $TEMPDIR/deps $out + runHook postInstall ''; outputHashAlgo = "sha256"; diff --git a/pkgs/development/beam-modules/mix-bootstrap b/pkgs/development/beam-modules/mix-bootstrap deleted file mode 100755 index 7e31def71fa..00000000000 --- a/pkgs/development/beam-modules/mix-bootstrap +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/env escript -%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -%%! -smp enable -%%% --------------------------------------------------------------------------- -%%% @doc -%%% The purpose of this command is to prepare a mix project so that mix -%%% understands that the dependencies are all already installed. If you want a -%%% hygienic build on nix then you must run this command before running mix. I -%%% suggest that you add a `Makefile` to your project and have the bootstrap -%%% command be a dependency of the build commands. See the nix documentation for -%%% more information. -%%% -%%% This command designed to have as few dependencies as possible so that it can -%%% be a dependency of root level packages like mix. To that end it does many -%%% things in a fairly simplistic way. That is by design. -%%% -%%% ### Assumptions -%%% -%%% This command makes the following assumptions: -%%% -%%% * It is run in a nix-shell or nix-build environment -%%% * that all dependencies have been added to the ERL_LIBS -%%% Environment Variable - --record(data, {version - , erl_libs - , root - , name}). --define(LOCAL_HEX_REGISTRY, "registry.ets"). - -main(Args) -> - {ok, RequiredData} = gather_required_data_from_the_environment(Args), - ok = bootstrap_libs(RequiredData). - -%% @doc -%% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? Because rebar doesn't -%% respect OTP conventions in some cases. --spec fixup_app_name(file:name()) -> string(). -fixup_app_name(Path) -> - BaseName = filename:basename(Path), - case string:split(BaseName, "-") of - [Name, _Version] -> Name; - Name -> Name - end. - - --spec gather_required_data_from_the_environment([string()]) -> {ok, #data{}}. -gather_required_data_from_the_environment(_) -> - {ok, #data{ version = guard_env("version") - , erl_libs = os:getenv("ERL_LIBS", []) - , root = code:root_dir() - , name = guard_env("name")}}. - --spec guard_env(string()) -> string(). -guard_env(Name) -> - case os:getenv(Name) of - false -> - stderr("Expected Environment variable ~s! Are you sure you are " - "running in a Nix environment? Either a nix-build, " - "nix-shell, etc?~n", [Name]), - erlang:halt(1); - Variable -> - Variable - end. - --spec bootstrap_libs(#data{}) -> ok. -bootstrap_libs(#data{erl_libs = ErlLibs}) -> - io:format("Bootstrapping dependent libraries~n"), - Target = "_build/prod/lib/", - Paths = string:tokens(ErlLibs, ":"), - CopiableFiles = - lists:foldl(fun(Path, Acc) -> - gather_directory_contents(Path) ++ Acc - end, [], Paths), - lists:foreach(fun (Path) -> - ok = link_app(Path, Target) - end, CopiableFiles). - --spec gather_directory_contents(string()) -> [{string(), string()}]. -gather_directory_contents(Path) -> - {ok, Names} = file:list_dir(Path), - lists:map(fun(AppName) -> - {filename:join(Path, AppName), fixup_app_name(AppName)} - end, Names). - -%% @doc -%% Makes a symlink from the directory pointed at by Path to a -%% directory of the same name in Target. So if we had a Path of -%% {`foo/bar/baz/bash`, `baz`} and a Target of `faz/foo/foos`, the symlink -%% would be `faz/foo/foos/baz`. --spec link_app({string(), string()}, string()) -> ok. -link_app({Path, TargetFile}, TargetDir) -> - Target = filename:join(TargetDir, TargetFile), - ok = make_symlink(Path, Target). - --spec make_symlink(string(), string()) -> ok. -make_symlink(Path, TargetFile) -> - file:delete(TargetFile), - ok = filelib:ensure_dir(TargetFile), - io:format("Making symlink from ~s to ~s~n", [Path, TargetFile]), - ok = file:make_symlink(Path, TargetFile). - -%% @doc -%% Write the result of the format string out to stderr. --spec stderr(string(), [term()]) -> ok. -stderr(FormatStr, Args) -> - io:put_chars(standard_error, io_lib:format(FormatStr, Args)). diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix new file mode 100644 index 00000000000..320fcaa9c9b --- /dev/null +++ b/pkgs/development/beam-modules/mix-release.nix @@ -0,0 +1,106 @@ +{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git }: + +{ pname +, version +, src +, nativeBuildInputs ? [ ] +, meta ? { } +, enableDebugInfo ? false +, mixEnv ? "prod" +, compileFlags ? [ ] +, mixDeps ? null +, ... +}@attrs: +let + overridable = builtins.removeAttrs attrs [ "compileFlags" ]; + +in +stdenv.mkDerivation (overridable // { + nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ]; + + MIX_ENV = mixEnv; + MIX_DEBUG = if enableDebugInfo then 1 else 0; + HEX_OFFLINE = 1; + DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation + # the api with `mix local.rebar rebar path` makes a copy of the binary + MIX_REBAR = "${rebar}/bin/rebar"; + MIX_REBAR3 = "${rebar3}/bin/rebar3"; + + postUnpack = '' + export HEX_HOME="$TEMPDIR/hex" + export MIX_HOME="$TEMPDIR/mix" + # compilation of the dependencies will require + # that the dependency path is writable + # thus a copy to the TEMPDIR is inevitable here + export MIX_DEPS_PATH="$TEMPDIR/deps" + + # Rebar + export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" + export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" + + ${lib.optionalString (mixDeps != null) '' + cp --no-preserve=mode -R "${mixDeps}" "$MIX_DEPS_PATH" + '' + } + + '' + (attrs.postUnpack or ""); + + configurePhase = attrs.configurePhase or '' + runHook preConfigure + + # this is needed for projects that have a specific compile step + # the dependency needs to be compiled in order for the task + # to be available + # Phoenix projects for example will need compile.phoenix + mix deps.compile --no-deps-check --skip-umbrella-children + + runHook postConfigure + ''; + + buildPhase = attrs.buildPhase or '' + runHook preBuild + + mix compile --no-deps-check ${lib.concatStringsSep " " compileFlags} + + runHook postBuild + ''; + + + installPhase = attrs.installPhase or '' + runHook preInstall + + mix release --no-deps-check --path "$out" + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls + rm "$out/bin/${pname}.bat" # windows file + fi + # contains secrets and should not be in the nix store + # TODO document how to handle RELEASE_COOKIE + # secrets should not be in the nix store. + # This is only used for connecting multiple nodes + if [ -e $out/releases/COOKIE ]; then # absent in special cases, i.e. elixir-ls + rm $out/releases/COOKIE + fi + # TODO remove the uneeded reference too erlang + # one possible way would be + # for f in $(${findutils}/bin/find $out -name start); do + # substituteInPlace $f \ + # --replace 'ROOTDIR=${erlang}/lib/erlang' 'ROOTDIR=""' + # done + # What is left to do is to check that erlang is not required on + # the host + + patchShebangs $out + runHook postFixup + ''; + # TODO figure out how to do a Fixed Output Derivation and add the output hash + # This doesn't play well at the moment with Phoenix projects + # for example that have frontend dependencies + + # disallowedReferences = [ erlang ]; +}) -- cgit 1.4.1 From aa41080e22e3bc8712e1587a453a19f90acc11bf Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Mon, 19 Apr 2021 19:22:29 +0900 Subject: beam-packages: init elixir_ls 0.7.0 (#118950) --- pkgs/development/beam-modules/default.nix | 2 + pkgs/development/beam-modules/elixir_ls.nix | 71 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- pkgs/top-level/beam-packages.nix | 2 +- 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/beam-modules/elixir_ls.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 6e6da4fab03..6bf9e45e622 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -63,6 +63,8 @@ let debugInfo = true; }; + elixir_ls = callPackage ./elixir_ls.nix { inherit elixir fetchMixDeps mixRelease; }; + # Remove old versions of elixir, when the supports fades out: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html diff --git a/pkgs/development/beam-modules/elixir_ls.nix b/pkgs/development/beam-modules/elixir_ls.nix new file mode 100644 index 00000000000..916a150c1f9 --- /dev/null +++ b/pkgs/development/beam-modules/elixir_ls.nix @@ -0,0 +1,71 @@ +{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }: +# Based on the work of Hauleth +# None of this would have happened without him + +mixRelease rec { + pname = "elixir-ls"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "elixir-lsp"; + repo = "elixir-ls"; + rev = "v{version}"; + sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s"; + fetchSubmodules = true; + }; + + mixDeps = fetchMixDeps { + pname = "mix-deps-${pname}"; + inherit src version; + sha256 = "0r9x223imq4j9pn9niskyaybvk7jmq8dxcyzk7kwfsi128qig1a1"; + }; + + # elixir_ls is an umbrella app + # override configurePhase to not skip umbrella children + configurePhase = '' + runHook preConfigure + mix deps.compile --no-deps-check + runHook postConfigure + ''; + + # elixir_ls require a special step for release + # compile and release need to be performed together because + # of the no-deps-check requirement + buildPhase = '' + runHook preBuild + mix do compile --no-deps-check, elixir_ls.release + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -Rv release $out/lib + # Prepare the wrapper script + substitute release/language_server.sh $out/bin/elixir-ls \ + --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" + chmod +x $out/bin/elixir-ls + # prepare the launcher + substituteInPlace $out/lib/launch.sh \ + --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ + "ERL_LIBS=$out/lib:\$ERL_LIBS" \ + --replace "exec elixir" "exec ${elixir}/bin/elixir" + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/elixir-lsp/elixir-ls"; + description = '' + A frontend-independent IDE "smartness" server for Elixir. + Implements the "Language Server Protocol" standard and provides debugger support via the "Debug Adapter Protocol" + ''; + longDescription = '' + The Elixir Language Server provides a server that runs in the background, providing IDEs, editors, and other tools with information about Elixir Mix projects. + It adheres to the Language Server Protocol, a standard for frontend-independent IDE support. + Debugger integration is accomplished through the similar VS Code Debug Protocol. + ''; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = teams.beam.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 984a5919cbb..d62d047c91d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11650,7 +11650,8 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 - elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 + elixir_ls; erlang_nox = beam_nox.interpreters.erlang; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index aae127fd04e..ac9d4ab524e 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -111,7 +111,7 @@ rec { # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR23.elixir`. inherit (packages.erlang) - elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; -- cgit 1.4.1 From 87b91877c6f33d55b0e2102efc6307ae022594ca Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Thu, 22 Apr 2021 04:35:50 -0400 Subject: hex: 0.20.5 -> 0.21.1 (#118941) --- pkgs/development/beam-modules/hex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 794b9e5cf22..640b499c3ad 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { pname = "hex"; - version = "0.20.5"; + version = "0.21.1"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "v${version}"; - sha256 = "1wz6n4qrmsb4kkww6lrdbs99xzwp4dyjjmr8m4drcwn3sd2k9ba6"; + sha256 = "3V7hp+gK+ixEX+v9vkzQ5y81LN+CSzOIlSkCJB2RFb8="; }; setupHook = writeText "setupHook.sh" '' -- cgit 1.4.1 From afb7177ecada3a2ae341ed906656a0b3f8e9db0e Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Fri, 23 Apr 2021 12:59:55 +0900 Subject: elixir_ls: fix_build (#120296) --- pkgs/development/beam-modules/elixir_ls.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/elixir_ls.nix b/pkgs/development/beam-modules/elixir_ls.nix index 916a150c1f9..b61db92584d 100644 --- a/pkgs/development/beam-modules/elixir_ls.nix +++ b/pkgs/development/beam-modules/elixir_ls.nix @@ -9,7 +9,7 @@ mixRelease rec { src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; - rev = "v{version}"; + rev = "v${version}"; sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s"; fetchSubmodules = true; }; -- cgit 1.4.1 From 2640d0492d34c8830d5e9c8d88f42862e290dc30 Mon Sep 17 00:00:00 2001 From: Chris Wögi <789@c-w.li> Date: Fri, 23 Apr 2021 07:14:33 +0200 Subject: beamPackages.hex: 0.21.1 -> 0.21.2 (#120178) --- pkgs/development/beam-modules/hex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 640b499c3ad..836740a7933 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { pname = "hex"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "v${version}"; - sha256 = "3V7hp+gK+ixEX+v9vkzQ5y81LN+CSzOIlSkCJB2RFb8="; + sha256 = "18vwrc5b7pyi3nifmx5hd5wbz8fy3h6sfvkmskjg5acmz66fys0g"; }; setupHook = writeText "setupHook.sh" '' -- cgit 1.4.1 From aaa16732ce3d3001e238eb4074cd68b8f300f77f Mon Sep 17 00:00:00 2001 From: David Date: Sat, 8 May 2021 13:18:00 +0200 Subject: rebar3: add rebar3WithPlugins --- doc/languages-frameworks/beam.section.md | 4 + pkgs/development/beam-modules/default.nix | 2 +- .../tools/build-managers/rebar3/default.nix | 159 +++++++++++++-------- .../build-managers/rebar3/global-plugins.patch | 14 ++ .../tools/build-managers/rebar3/skip-plugins.patch | 54 +++++++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 170 insertions(+), 65 deletions(-) create mode 100644 pkgs/development/tools/build-managers/rebar3/global-plugins.patch create mode 100644 pkgs/development/tools/build-managers/rebar3/skip-plugins.patch (limited to 'pkgs/development/beam-modules') diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index b5d39595c10..947968db15e 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -24,6 +24,10 @@ Many Erlang/OTP distributions available in `beam.interpreters` have versions wit We provide a version of Rebar3, under `rebar3`. We also provide a helper to fetch Rebar3 dependencies from a lockfile under `fetchRebar3Deps`. +We also provide a version on Rebar3 with plugins included, under `rebar3WithPlugins`. This package is a function which takes two arguments: `plugins`, a list of nix derivations to include as plugins (loaded only when specified in `rebar.config`), and `globalPlugins`, which should always be loaded by rebar3. Example: `rebar3WithPlugins { globalPlugins = [beamPackages.pc]; }`. + +When adding a new plugin it is important that the `packageName` attribute is the same as the atom used by rebar3 to refer to the plugin. + ### Mix & Erlang.mk {#build-tools-other} Erlang.mk works exactly as expected. There is a bootstrap process that needs to be run, which is supported by the `buildErlangMk` derivation. diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 6bf9e45e622..19b5c122d9e 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -18,8 +18,8 @@ let inherit callPackage erlang; beamPackages = self; + inherit (callPackage ../tools/build-managers/rebar3 { }) rebar3 rebar3WithPlugins; rebar = callPackage ../tools/build-managers/rebar { }; - rebar3 = callPackage ../tools/build-managers/rebar3 { }; # rebar3 port compiler plugin is required by buildRebar3 pc = callPackage ./pc { }; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index b9070a42764..b44a8c08ffa 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,71 +1,104 @@ { lib, stdenv, fetchFromGitHub, - fetchHex, erlang, - tree }: + fetchHex, erlang, makeWrapper }: let version = "3.15.1"; + owner = "erlang"; + deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; }; + rebar3 = stdenv.mkDerivation rec { + pname = "rebar3"; + inherit version erlang; - # Dependencies should match the ones in: - # https://github.com/erlang/rebar3/blob/${version}/rebar.lock - # `sha256` could also be taken from https://hex.pm - Checksum - deps = import ./rebar-deps.nix { inherit fetchHex; }; -in -stdenv.mkDerivation rec { - pname = "rebar3"; - inherit version erlang; - - # How to obtain `sha256`: - # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz - src = fetchFromGitHub { - owner = "erlang"; - repo = pname; - rev = version; - sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g"; - }; + # How to obtain `sha256`: + # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = version; + sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g"; + }; - bootstrapper = ./rebar3-nix-bootstrap; - - buildInputs = [ erlang tree ]; - - postPatch = '' - mkdir -p _checkouts - mkdir -p _build/default/lib/ - - ${toString (lib.mapAttrsToList (k: v: '' - cp -R --no-preserve=mode ${v} _checkouts/${k} - '') deps)} - - # Bootstrap script expects the dependencies in _build/default/lib - # TODO: Make it accept checkouts? - for i in _checkouts/* ; do - ln -s $(pwd)/$i $(pwd)/_build/default/lib/ - done - ''; - - buildPhase = '' - HOME=. escript bootstrap - ''; - - installPhase = '' - mkdir -p $out/bin - cp rebar3 $out/bin/rebar3 - ''; - - meta = { - homepage = "https://github.com/rebar/rebar3"; - description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; - - longDescription = '' - rebar is a self-contained Erlang script, so it's easy to distribute or - even embed directly in a project. Where possible, rebar uses standard - Erlang/OTP conventions for project structures, thus minimizing the amount - of build configuration work. rebar also provides dependency management, - enabling application writers to easily re-use common libraries from a - variety of locations (hex.pm, git, hg, and so on). - ''; + bootstrapper = ./rebar3-nix-bootstrap; + + buildInputs = [ erlang ]; + + postPatch = '' + mkdir -p _checkouts _build/default/lib/ + + ${toString (lib.mapAttrsToList (k: v: '' + cp -R --no-preserve=mode ${v} _checkouts/${k} + '') deps)} + + # Bootstrap script expects the dependencies in _build/default/lib + # TODO: Make it accept checkouts? + for i in _checkouts/* ; do + ln -s $(pwd)/$i $(pwd)/_build/default/lib/ + done + ''; + + buildPhase = '' + HOME=. escript bootstrap + ''; + + installPhase = '' + mkdir -p $out/bin + cp rebar3 $out/bin/rebar3 + ''; + + meta = { + homepage = "https://github.com/rebar/rebar3"; + description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; + + longDescription = '' + rebar is a self-contained Erlang script, so it's easy to distribute or + even embed directly in a project. Where possible, rebar uses standard + Erlang/OTP conventions for project structures, thus minimizing the amount + of build configuration work. rebar also provides dependency management, + enabling application writers to easily re-use common libraries from a + variety of locations (hex.pm, git, hg, and so on). + ''; + + platforms = lib.platforms.unix; + maintainers = lib.teams.beam.members; + license = lib.licenses.asl20; + }; - platforms = lib.platforms.unix; - maintainers = lib.teams.beam.members; - license = lib.licenses.asl20; }; -} + rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ] }: + let + pluginLibDirs = map (p: "${p}/lib/erlang/lib") (lib.unique (plugins ++ globalPlugins)); + globalPluginNames = lib.unique (map (p: p.packageName) globalPlugins); + rebar3Patched = (rebar3.overrideAttrs (old: { + + # skip-plugins.patch is necessary because otherwise rebar3 will always + # try to fetch plugins if they are not already present in _build. + # + # global-deps.patch makes it possible to use REBAR_GLOBAL_PLUGINS to + # instruct rebar3 to always load a certain plugin. It is necessary since + # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this. + patches = [ ./skip-plugins.patch ./global-plugins.patch ]; + })); + in stdenv.mkDerivation { + pname = "rebar3-with-plugins"; + inherit (rebar3) version bootstrapper; + nativeBuildInputs = [ erlang makeWrapper ]; + unpackPhase = "true"; + + # Here we extract the rebar3 escript (like `rebar3_prv_local_install.erl`) and + # add plugins to the code path. + + installPhase = '' + erl -noshell -eval ' + {ok, Escript} = escript:extract("${rebar3Patched}/bin/rebar3", []), + {archive, Archive} = lists:keyfind(archive, 1, Escript), + {ok, _} = zip:extract(Archive, [{cwd, "'$out/lib'"}]), + init:stop(0) + ' + mkdir -p $out/bin + makeWrapper ${erlang}/bin/erl $out/bin/rebar3 \ + --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames}" \ + --suffix-each ERL_LIBS ":" "$out/lib ${toString pluginLibDirs}" \ + --add-flags "+sbtu +A1 -noshell -boot start_clean -s rebar3 main -extra" + ''; + }; +in { inherit rebar3 rebar3WithPlugins; } diff --git a/pkgs/development/tools/build-managers/rebar3/global-plugins.patch b/pkgs/development/tools/build-managers/rebar3/global-plugins.patch new file mode 100644 index 00000000000..9a8bb48f988 --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/global-plugins.patch @@ -0,0 +1,14 @@ +diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl +index f2d22233..bee2cf18 100644 +--- a/src/rebar_plugins.erl ++++ b/src/rebar_plugins.erl +@@ -30,7 +30,8 @@ project_plugins_install(State) -> + top_level_install(State) -> + Profiles = rebar_state:current_profiles(State), + lists:foldl(fun(Profile, StateAcc) -> +- Plugins = rebar_state:get(State, {plugins, Profile}, []), ++ Plugins = rebar_state:get(State, {plugins, Profile}, []) ++ ++ [list_to_atom(P) || P <- string:lexemes(os:getenv("REBAR_GLOBAL_PLUGINS", ""), " ")], + handle_plugins(Profile, Plugins, StateAcc) + end, State, Profiles). + diff --git a/pkgs/development/tools/build-managers/rebar3/skip-plugins.patch b/pkgs/development/tools/build-managers/rebar3/skip-plugins.patch new file mode 100644 index 00000000000..3ee1656c9ed --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/skip-plugins.patch @@ -0,0 +1,54 @@ +diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl +index f2d22233..c61fa553 100644 +--- a/src/rebar_plugins.erl ++++ b/src/rebar_plugins.erl +@@ -106,31 +106,9 @@ handle_plugins(Profile, Plugins, State, Upgrade) -> + State3 = rebar_state:set(State2, deps_dir, DepsDir), + rebar_state:lock(State3, Locks). + +-handle_plugin(Profile, Plugin, State, Upgrade) -> ++handle_plugin(_Profile, Plugin, State, _Upgrade) -> + try +- {Apps, State2} = rebar_prv_install_deps:handle_deps_as_profile(Profile, State, [Plugin], Upgrade), +- {no_cycle, Sorted} = rebar_prv_install_deps:find_cycles(Apps), +- ToBuild = rebar_prv_install_deps:cull_compile(Sorted, []), +- +- %% Add already built plugin deps to the code path +- ToBuildPaths = [rebar_app_info:ebin_dir(A) || A <- ToBuild], +- PreBuiltPaths = [Ebin || A <- Apps, +- Ebin <- [rebar_app_info:ebin_dir(A)], +- not lists:member(Ebin, ToBuildPaths)], +- code:add_pathsa(PreBuiltPaths), +- +- %% Build plugin and its deps +- build_plugins(ToBuild, Apps, State2), +- +- %% Add newly built deps and plugin to code path +- State3 = rebar_state:update_all_plugin_deps(State2, Apps), +- NewCodePaths = [rebar_app_info:ebin_dir(A) || A <- ToBuild], +- +- %% Store plugin code paths so we can remove them when compiling project apps +- State4 = rebar_state:update_code_paths(State3, all_plugin_deps, PreBuiltPaths++NewCodePaths), +- rebar_paths:set_paths([plugins], State4), +- +- {plugin_providers(Plugin), State4} ++ {plugin_providers(Plugin), State} + catch + ?WITH_STACKTRACE(C,T,S) + ?DEBUG("~p ~p ~p", [C, T, S]), +@@ -138,15 +116,6 @@ handle_plugin(Profile, Plugin, State, Upgrade) -> + {[], State} + end. + +-build_plugins(MustBuildApps, AllApps, State) -> +- State1 = rebar_state:deps_to_build(State, MustBuildApps), +- State2 = rebar_state:all_deps(State1, AllApps), +- State3 = rebar_state:set(State2, deps_dir, ?DEFAULT_PLUGINS_DIR), +- {Args, Extra} = rebar_state:command_parsed_args(State), +- State4 = rebar_state:command_parsed_args(State3, {[{deps_only, true}|Args], Extra}), +- rebar_prv_compile:do(State4), +- ok. +- + plugin_providers({Plugin, _, _, _}) when is_atom(Plugin) -> + validate_plugin(Plugin); + plugin_providers({Plugin, _, _}) when is_atom(Plugin) -> diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67f7e4fffc8..e7cfe7eaf95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11855,7 +11855,7 @@ in erlang_nox = beam_nox.interpreters.erlang; inherit (beam.packages.erlang) - rebar rebar3 + rebar rebar3 rebar3WithPlugins fetchHex beamPackages relxExe; -- cgit 1.4.1 From dcc075ce21152964f8107e0ddf5140723e881e2b Mon Sep 17 00:00:00 2001 From: David Date: Sat, 8 May 2021 13:47:27 +0200 Subject: buildRebar3: use rebar3WithPlugins --- pkgs/development/beam-modules/build-rebar3.nix | 13 ++++--- .../tools/build-managers/rebar3/default.nix | 2 +- .../build-managers/rebar3/rebar3-nix-bootstrap | 41 +--------------------- 3 files changed, 8 insertions(+), 48 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 2e2f0a50b31..651c024db09 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, erlang, rebar3, openssl, libyaml, +{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, pc, lib }: { name, version @@ -19,7 +19,10 @@ with lib; let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; - ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []); + rebar3 = rebar3WithPlugins { + plugins = buildPlugins; + globalPlugins = (if compilePorts then [pc] else []); + }; shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.name}"; @@ -36,13 +39,9 @@ let inherit version; buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; - propagatedBuildInputs = unique (beamDeps ++ ownPlugins); + propagatedBuildInputs = unique beamDeps; dontStrip = true; - # The following are used by rebar3-nix-bootstrap - inherit compilePorts; - buildPlugins = ownPlugins; - inherit src; setupHook = writeText "setupHook.sh" '' diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index b44a8c08ffa..16b630f36b9 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -4,7 +4,7 @@ let version = "3.15.1"; owner = "erlang"; - deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; }; + deps = import ./rebar-deps.nix { inherit fetchHex; }; rebar3 = stdenv.mkDerivation rec { pname = "rebar3"; inherit version erlang; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap index f1deed1df35..8bfbb8fb685 100755 --- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap +++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap @@ -26,9 +26,7 @@ -record(data, {version , debug_info = false - , compile_ports , erl_libs - , plugins , root , name}). @@ -42,7 +40,6 @@ main(Args) -> -spec do_the_bootstrap(#data{}) -> ok. do_the_bootstrap(RequiredData) -> ok = bootstrap_configs(RequiredData), - ok = bootstrap_plugins(RequiredData), ok = bootstrap_libs(RequiredData). %% @doc @@ -68,22 +65,8 @@ parse_args(Args0) -> bootstrap_configs(RequiredData)-> io:format("Boostrapping app and rebar configurations~n"), ok = if_single_app_project_update_app_src_version(RequiredData), - ok = if_compile_ports_add_pc_plugin(RequiredData), ok = if_debug_info_add(RequiredData). --spec bootstrap_plugins(#data{}) -> ok. -bootstrap_plugins(#data{plugins = Plugins}) -> - io:format("Bootstrapping rebar3 plugins~n"), - Target = "_build/default/plugins/", - Paths = string:tokens(Plugins, " "), - CopiableFiles = - lists:foldl(fun(Path, Acc) -> - gather_dependency(Path) ++ Acc - end, [], Paths), - lists:foreach(fun (Path) -> - ok = link_app(Path, Target) - end, CopiableFiles). - -spec bootstrap_libs(#data{}) -> ok. bootstrap_libs(#data{erl_libs = ErlLibs}) -> io:format("Bootstrapping dependent libraries~n"), @@ -152,10 +135,9 @@ fixup_app_name(FileName) -> gather_required_data_from_the_environment(ArgData) -> {ok, ArgData#data{ version = guard_env("version") , erl_libs = get_env("ERL_LIBS", []) - , plugins = get_env("buildPlugins", []) , root = code:root_dir() , name = guard_env("name") - , compile_ports = nix2bool(get_env("compilePorts", ""))}}. + }}. -spec nix2bool(any()) -> boolean(). nix2bool("1") -> @@ -209,27 +191,6 @@ add_debug_info(Config) -> {erl_opts, [debug_info | ExistingOpts]}) end. - -%% @doc -%% If the compile ports flag is set, rewrite the rebar config to -%% include the 'pc' plugin. --spec if_compile_ports_add_pc_plugin(#data{}) -> ok. -if_compile_ports_add_pc_plugin(#data{compile_ports = true}) -> - ConfigTerms = add_pc_to_plugins(read_rebar_config()), - Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end, - ConfigTerms), - file:write_file("rebar.config", Text); -if_compile_ports_add_pc_plugin(_) -> - ok. - --spec add_pc_to_plugins([term()]) -> [term()]. -add_pc_to_plugins(Config) -> - PluginList = case lists:keysearch(plugins, 1, Config) of - {value, {plugins, ExistingPluginList}} -> ExistingPluginList; - _ -> [] - end, - lists:keystore(plugins, 1, Config, {plugins, [pc | PluginList]}). - -spec read_rebar_config() -> [term()]. read_rebar_config() -> case file:consult("rebar.config") of -- cgit 1.4.1 From 32c14664e8d00c5739b86aa3a534895c1c67d7ba Mon Sep 17 00:00:00 2001 From: David Date: Tue, 11 May 2021 23:33:58 +0200 Subject: erlang-ls: init at 0.15.0 --- pkgs/development/beam-modules/default.nix | 2 + .../development/beam-modules/erlang-ls/default.nix | 34 ++++++++ .../beam-modules/erlang-ls/rebar-deps.nix | 90 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 127 insertions(+) create mode 100644 pkgs/development/beam-modules/erlang-ls/default.nix create mode 100644 pkgs/development/beam-modules/erlang-ls/rebar-deps.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 19b5c122d9e..f63ecd95083 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -35,6 +35,8 @@ let fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; mixRelease = callPackage ./mix-release.nix { }; + erlang-ls = callPackage ./erlang-ls { }; + # BEAM-based languages. elixir = elixir_1_11; diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix new file mode 100644 index 00000000000..3f2ae6e7e2f --- /dev/null +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }: +let + version = "0.15.0"; + owner = "erlang-ls"; + repo = "erlang_ls"; + deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; }; +in stdenv.mkDerivation { + inherit version; + pname = "erlang-ls"; + buildInputs = [ (rebar3WithPlugins { }) ]; + src = fetchFromGitHub { + inherit owner repo; + sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; + rev = version; + }; + buildPhase = '' + mkdir _checkouts + ${toString (lib.mapAttrsToList (k: v: '' + cp -R ${v} _checkouts/${k} + '') deps)} + make + ''; + installPhase = '' + mkdir -p $out/bin + cp _build/default/bin/erlang_ls $out/bin/ + cp _build/dap/bin/els_dap $out/bin/ + ''; + meta = with lib; { + homepage = "https://github.com/erlang-ls/erlang_ls"; + description = "The Erlang Language Server"; + platforms = platforms.unix; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix new file mode 100644 index 00000000000..9de79e52be6 --- /dev/null +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -0,0 +1,90 @@ +# Generated by rebar3_nix +{ fetchHex, fetchFromGitHub }: +{ + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + zipper = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + quickrand = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + katana_code = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + bucs = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + yamerl = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + uuid = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + tdiff = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + redbug = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + rebar3_format = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + ranch = fetchHex { + pkg = "ranch"; + version = "1.7.1"; + sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; + }; + jsx = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + erlfmt = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + ephemeral = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + elvis_core = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + docsh = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb7290c3bec..84b5f41d31d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11880,6 +11880,7 @@ in erlang_nox = beam_nox.interpreters.erlang; inherit (beam.packages.erlang) + erlang-ls rebar rebar3 rebar3WithPlugins fetchHex beamPackages relxExe; -- cgit 1.4.1 From a2f3a63953b6fc0812cca363accbc5d4176f1f02 Mon Sep 17 00:00:00 2001 From: ydlr <58453832+ydlr@users.noreply.github.com> Date: Sun, 16 May 2021 23:05:40 +0000 Subject: restore buildMix and its bootstrapper (#122374) * restore mixBuild remove bootstrapper by going through ERL_LIBS mix will use ERL_LIBS to find compiled dependencies Co-authored-by: Zach --- doc/languages-frameworks/beam.section.md | 2 + pkgs/development/beam-modules/build-mix.nix | 85 +++++++++++++++++++++++++++++ pkgs/development/beam-modules/default.nix | 1 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/development/beam-modules/build-mix.nix (limited to 'pkgs/development/beam-modules') diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 947968db15e..2a4753a1199 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -34,6 +34,8 @@ Erlang.mk works exactly as expected. There is a bootstrap process that needs to For Elixir applications use `mixRelease` to make a release. See examples for more details. +There is also a `buildMix` helper, whose behavior is closer to that of `buildErlangMk` and `buildRebar3`. The primary difference is that mixRelease makes a release, while buildMix only builds the package, making it useful for libraries and other dependencies. + ## How to Install BEAM Packages {#how-to-install-beam-packages} BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. To install any of those builders into your profile, refer to them by their attribute path `beamPackages.rebar3`: diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix new file mode 100644 index 00000000000..7e19f19a093 --- /dev/null +++ b/pkgs/development/beam-modules/build-mix.nix @@ -0,0 +1,85 @@ +{ stdenv, writeText, elixir, erlang, hex, lib }: + +{ name +, version +, src +, buildInputs ? [ ] +, beamDeps ? [ ] +, propagatedBuildInputs ? [ ] +, postPatch ? "" +, compilePorts ? false +, meta ? { } +, enableDebugInfo ? false +, mixEnv ? "prod" +, ... +}@attrs: + +with lib; +let + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + pkg = self: stdenv.mkDerivation (attrs // { + name = "${name}-${version}"; + inherit version; + inherit src; + + MIX_ENV = mixEnv; + MIX_DEBUG = if enableDebugInfo then 1 else 0; + HEX_OFFLINE = 1; + + # stripping does not have any effect on beam files + dontStrip = true; + + # add to ERL_LIBS so other modules can find at runtime. + # http://erlang.org/doc/man/code.html#code-path + # Mix also searches the code path when compiling with the --no-deps-check + # flag, which is why there is no complicated booterstrapper like the one + # used by buildRebar3. + setupHook = attrs.setupHook or + writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib" + ''; + + buildInputs = buildInputs ++ [ elixir hex ]; + propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; + + buildPhase = attrs.buildPhase or '' + runHook preBuild + export HEX_HOME="$TEMPDIR/hex" + export MIX_HOME="$TEMPDIR/mix" + mix compile --no-deps-check + runHook postBuild + ''; + + installPhase = attrs.installPhase or '' + runHook preInstall + + # This uses the install path convention established by nixpkgs maintainers + # for all beam packages. Changing this will break compatibility with other + # builder functions like buildRebar3 and buildErlangMk. + mkdir -p "$out/lib/erlang/lib/${name}-${version}" + + # Some packages like db_connection will use _build/shared instead of + # honoring the $MIX_ENV variable. + for reldir in _build/{$MIX_ENV,shared}/lib/${name}/{src,ebin,priv,include} ; do + if test -d $reldir ; then + # Some builds produce symlinks (eg: phoenix priv dircetory). They must + # be followed with -H flag. + cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$reldir" + fi + done + + runHook postInstall + ''; + + passthru = { + packageName = name; + env = shell self; + inherit beamDeps; + }; + }); +in +fix pkg diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f63ecd95083..3375fd61260 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -32,6 +32,7 @@ let buildRebar3 = callPackage ./build-rebar3.nix { }; buildHex = callPackage ./build-hex.nix { }; buildErlangMk = callPackage ./build-erlang-mk.nix { }; + buildMix = callPackage ./build-mix.nix { }; fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; mixRelease = callPackage ./mix-release.nix { }; -- cgit 1.4.1 From 814d9bac114dfa89321954767db376d7f2ec053f Mon Sep 17 00:00:00 2001 From: David Date: Thu, 13 May 2021 12:59:12 +0200 Subject: erlang-ls: add erlang to buildInputs This enables patch-shebangs to find `escript` and patch the interpreter path correctly --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 3f2ae6e7e2f..ff68af8d521 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }: +{ fetchFromGitHub, fetchHex, stdenv, erlang, rebar3WithPlugins, lib }: let version = "0.15.0"; owner = "erlang-ls"; @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { inherit version; pname = "erlang-ls"; - buildInputs = [ (rebar3WithPlugins { }) ]; + buildInputs = [ erlang (rebar3WithPlugins { }) ]; src = fetchFromGitHub { inherit owner repo; sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; -- cgit 1.4.1 From f2dd3eac0e7b7d7b98c53895a162f28971e4e3bb Mon Sep 17 00:00:00 2001 From: David Date: Tue, 11 May 2021 18:08:11 +0200 Subject: rebar3-nix: init at 0.1.0 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/beam-modules/default.nix | 1 + pkgs/development/beam-modules/rebar3-nix/default.nix | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/development/beam-modules/rebar3-nix/default.nix (limited to 'pkgs/development/beam-modules') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c281a9dfc25..145e670254d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2511,6 +2511,12 @@ githubId = 1316469; name = "Naomi Morse"; }; + dlesl = { + email = "dlesl@dlesl.com"; + github = "dlesl"; + githubId = 28980797; + name = "David Leslie"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 3375fd61260..601505e1f48 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -23,6 +23,7 @@ let # rebar3 port compiler plugin is required by buildRebar3 pc = callPackage ./pc { }; + rebar3-nix = callPackage ./rebar3-nix { }; fetchHex = callPackage ./fetch-hex.nix { }; diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix new file mode 100644 index 00000000000..ff248700d78 --- /dev/null +++ b/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -0,0 +1,18 @@ +{ lib, buildRebar3, fetchFromGitHub }: +buildRebar3 rec { + name = "rebar3_nix"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "erlang-nix"; + repo = name; + rev = "v${version}"; + sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + }; + + meta = { + description = "nix integration for rebar3"; + license = lib.licenses.bsd3; + homepage = "https://github.com/erlang-nix/rebar3_nix"; + maintainers = with lib.maintainers; [ dlesl gleber ]; + }; +} -- cgit 1.4.1 From aef59d88560e7985bb04be8f48efcc4653d5eea8 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 10 May 2021 19:30:25 +0200 Subject: buildRebar3: use `rebar3 bare compile` --- pkgs/development/beam-modules/build-rebar3.nix | 23 +-- .../tools/build-managers/rebar3/default.nix | 4 +- .../build-managers/rebar3/rebar3-nix-bootstrap | 228 --------------------- 3 files changed, 6 insertions(+), 249 deletions(-) delete mode 100755 pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 651c024db09..dc882a13318 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,12 +1,10 @@ -{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, - pc, lib }: +{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, lib }: { name, version , src , setupHook ? null , buildInputs ? [], beamDeps ? [], buildPlugins ? [] , postPatch ? "" -, compilePorts ? false , installPhase ? null , buildPhase ? null , configurePhase ? null @@ -21,7 +19,6 @@ let rebar3 = rebar3WithPlugins { plugins = buildPlugins; - globalPlugins = (if compilePorts then [pc] else []); }; shell = drv: stdenv.mkDerivation { @@ -52,18 +49,9 @@ let rm -f rebar rebar3 '' + postPatch; - configurePhase = '' - runHook preConfigure - ${erlang}/bin/escript ${rebar3.bootstrapper} ${debugInfoFlag} - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - HOME=. rebar3 compile - ${if compilePorts then '' - HOME=. rebar3 pc compile - '' else ""} + HOME=. rebar3 bare compile -path "" runHook postBuild ''; @@ -71,10 +59,9 @@ let runHook preInstall mkdir -p "$out/lib/erlang/lib/${name}-${version}" for reldir in src ebin priv include; do - fd="_build/default/lib/${name}/$reldir" - [ -d "$fd" ] || continue - cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd" - success=1 + [ -d "$reldir" ] || continue + # $out/lib/erlang/lib is a convention used in nixpkgs for compiled BEAM packages + cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$reldir" done runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 95ffc0c957c..5867db0b573 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -19,8 +19,6 @@ let sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g"; }; - bootstrapper = ./rebar3-nix-bootstrap; - buildInputs = [ erlang ]; postPatch = '' @@ -106,7 +104,7 @@ let })); in stdenv.mkDerivation { pname = "rebar3-with-plugins"; - inherit (rebar3) version bootstrapper; + inherit (rebar3) version; nativeBuildInputs = [ erlang makeWrapper ]; unpackPhase = "true"; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap deleted file mode 100755 index 8bfbb8fb685..00000000000 --- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap +++ /dev/null @@ -1,228 +0,0 @@ -#!/usr/bin/env escript -%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -%%! -smp enable -%%% --------------------------------------------------------------------------- -%%% @doc -%%% The purpose of this command is to prepare a rebar3 project so that -%%% rebar3 understands that the dependencies are all already -%%% installed. If you want a hygienic build on nix then you must run -%%% this command before running rebar3. I suggest that you add a -%%% `Makefile` to your project and have the bootstrap command be a -%%% dependency of the build commands. See the nix documentation for -%%% more information. -%%% -%%% This command designed to have as few dependencies as possible so -%%% that it can be a dependency of root level packages like rebar3. To -%%% that end it does many things in a fairly simplistic way. That is -%%% by design. -%%% -%%% ### Assumptions -%%% -%%% This command makes the following assumptions: -%%% -%%% * It is run in a nix-shell or nix-build environment -%%% * that all dependencies have been added to the ERL_LIBS -%%% Environment Variable - --record(data, {version - , debug_info = false - , erl_libs - , root - , name}). - --define(HEX_REGISTRY_PATH, ".cache/rebar3/hex/default/registry"). - -main(Args) -> - {ok, ArgData} = parse_args(Args), - {ok, RequiredData} = gather_required_data_from_the_environment(ArgData), - do_the_bootstrap(RequiredData). - --spec do_the_bootstrap(#data{}) -> ok. -do_the_bootstrap(RequiredData) -> - ok = bootstrap_configs(RequiredData), - ok = bootstrap_libs(RequiredData). - -%% @doc -%% Argument parsing is super simple only because we want to keep the -%% dependencies minimal. For now there can be one entry on the -%% command line: "debug-info" --spec parse_args([string()]) -> #data{}. -parse_args(Args0) -> - PossibleArgs = sets:from_list(["debug-info"]), - Args1 = sets:from_list(Args0), - Result = sets:subtract(Args1, PossibleArgs), - case sets:to_list(Result) of - [] -> - {ok, #data{debug_info = sets:is_element("debug-info", Args1)}}; - UnknownArgs -> - io:format("Unexpected command line arguments passed in: ~p~n", - [UnknownArgs]), - erlang:halt(120) - end. - - --spec bootstrap_configs(#data{}) -> ok. -bootstrap_configs(RequiredData)-> - io:format("Boostrapping app and rebar configurations~n"), - ok = if_single_app_project_update_app_src_version(RequiredData), - ok = if_debug_info_add(RequiredData). - --spec bootstrap_libs(#data{}) -> ok. -bootstrap_libs(#data{erl_libs = ErlLibs}) -> - io:format("Bootstrapping dependent libraries~n"), - Target = "_build/default/lib/", - Paths = string:tokens(ErlLibs, ":"), - CopiableFiles = - lists:foldl(fun(Path, Acc) -> - gather_directory_contents(Path) ++ Acc - end, [], Paths), - lists:foreach(fun (Path) -> - ok = link_app(Path, Target) - end, CopiableFiles). - --spec gather_dependency(string()) -> [{string(), string()}]. -gather_dependency(Path) -> - FullLibrary = filename:join(Path, "lib/erlang/lib/"), - case filelib:is_dir(FullLibrary) of - true -> - gather_directory_contents(FullLibrary); - false -> - [raw_hex(Path)] - end. - --spec raw_hex(string()) -> {string(), string()}. -raw_hex(Path) -> - [_, Name] = re:split(Path, "-hex-source-"), - {Path, erlang:binary_to_list(Name)}. - --spec gather_directory_contents(string()) -> [{string(), string()}]. -gather_directory_contents(Path) -> - {ok, Names} = file:list_dir(Path), - lists:map(fun(AppName) -> - {filename:join(Path, AppName), fixup_app_name(AppName)} - end, Names). - -%% @doc -%% Makes a symlink from the directory pointed at by Path to a -%% directory of the same name in Target. So if we had a Path of -%% {`foo/bar/baz/bash`, `baz`} and a Target of `faz/foo/foos`, the symlink -%% would be `faz/foo/foos/baz`. --spec link_app({string(), string()}, string()) -> ok. -link_app({Path, TargetFile}, TargetDir) -> - Target = filename:join(TargetDir, TargetFile), - make_symlink(Path, Target). - --spec make_symlink(string(), string()) -> ok. -make_symlink(Path, TargetFile) -> - file:delete(TargetFile), - ok = filelib:ensure_dir(TargetFile), - io:format("Making symlink from ~s to ~s~n", [Path, TargetFile]), - ok = file:make_symlink(Path, TargetFile). - -%% @doc -%% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? Because rebar doesn't -%% respect OTP conventions in some cases. --spec fixup_app_name(string()) -> string(). -fixup_app_name(FileName) -> - case string:tokens(FileName, "-") of - [Name] -> Name; - [Name, _Version] -> Name; - [Name, _Version, _Tag] -> Name - end. - --spec gather_required_data_from_the_environment(#data{}) -> {ok, #data{}}. -gather_required_data_from_the_environment(ArgData) -> - {ok, ArgData#data{ version = guard_env("version") - , erl_libs = get_env("ERL_LIBS", []) - , root = code:root_dir() - , name = guard_env("name") - }}. - --spec nix2bool(any()) -> boolean(). -nix2bool("1") -> - true; -nix2bool("") -> - false. - -get_env(Name) -> - os:getenv(Name). -get_env(Name, Def) -> - case get_env(Name) of - false -> Def; - Val -> Val - end. - --spec guard_env(string()) -> string(). -guard_env(Name) -> - case get_env(Name) of - false -> - stderr("Expected Environment variable ~s! Are you sure you are " - "running in a Nix environment? Either a nix-build, " - "nix-shell, etc?~n", [Name]), - erlang:halt(1); - Variable -> - Variable - end. - -%% @doc -%% If debug info is set we need to add debug info to the list of compile options -%% --spec if_debug_info_add(#data{}) -> ok. -if_debug_info_add(#data{debug_info = true}) -> - ConfigTerms = add_debug_info(read_rebar_config()), - Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end, - ConfigTerms), - file:write_file("rebar.config", Text); -if_debug_info_add(_) -> - ok. - --spec add_debug_info([term()]) -> [term()]. -add_debug_info(Config) -> - ExistingOpts = case lists:keysearch(erl_opts, 1, Config) of - {value, {erl_opts, ExistingOptsList}} -> ExistingOptsList; - _ -> [] - end, - case lists:member(debug_info, ExistingOpts) of - true -> - Config; - false -> - lists:keystore(erl_opts, 1, Config, - {erl_opts, [debug_info | ExistingOpts]}) - end. - --spec read_rebar_config() -> [term()]. -read_rebar_config() -> - case file:consult("rebar.config") of - {ok, Terms} -> - Terms; - _ -> - stderr("Unable to read rebar config!", []), - erlang:halt(1) - end. - - --spec if_single_app_project_update_app_src_version(#data{}) -> ok. -if_single_app_project_update_app_src_version(#data{name = Name, - version = Version}) -> - SrcFile = filename:join("src", - lists:concat([Name, ".app.src"])), - - case filelib:is_file(SrcFile) of - true -> - update_app_src_with_version(SrcFile, Version); - false -> - ok - end. - --spec update_app_src_with_version(string(), string()) -> ok. -update_app_src_with_version(SrcFile, Version) -> - {ok, [{application, Name, Details}]} = file:consult(SrcFile), - NewDetails = lists:keyreplace(vsn, 1, Details, {vsn, Version}), - ok = file:write_file(SrcFile, io_lib:fwrite("~p.\n", [{application, Name, NewDetails}])). - -%% @doc -%% Write the result of the format string out to stderr. --spec stderr(string(), [term()]) -> ok. -stderr(FormatStr, Args) -> - io:put_chars(standard_error, io_lib:format(FormatStr, Args)). -- cgit 1.4.1 From ec749d81e554fa9275541c279fd6a89042d501e5 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 12 May 2021 18:21:21 +0200 Subject: pc: 0.6.0 => 1.12.0 --- pkgs/development/beam-modules/pc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index a6d7c1c44de..2896a325e0e 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/pkgs/development/beam-modules/pc/default.nix @@ -2,8 +2,8 @@ buildHex { name = "pc"; - version = "1.6.0"; - sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0"; + version = "1.12.0"; + sha256 = "1gdvixy4j560qjdiv5qjgnl5wl3rrn231dv1m4vdq4b9l4g4p27x"; meta = { description = "a rebar3 port compiler for native code"; -- cgit 1.4.1 From 72795f8c0bdd7ca578fa051f1ade79a47f620f77 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 17 May 2021 17:51:58 +0200 Subject: rebar3Relx: add beamDeps support --- pkgs/development/beam-modules/rebar3-release.nix | 41 ++++++++++++++++-------- 1 file changed, 28 insertions(+), 13 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 1b0e27891d8..e8e2aecc460 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -1,8 +1,10 @@ -{ stdenv, writeText, erlang, rebar3, openssl, +{ stdenv, erlang, rebar3WithPlugins, openssl, lib }: { name, version , src +, beamDeps ? [] +, buildPlugins ? [] , checkouts ? null , releaseType , buildInputs ? [] @@ -12,7 +14,6 @@ , buildPhase ? null , configurePhase ? null , meta ? {} -, enableDebugInfo ? false , ... }@attrs: with lib; @@ -27,28 +28,42 @@ let (_: v: v != null) { inherit setupHook configurePhase buildPhase installPhase; }; - pkg = self: stdenv.mkDerivation (attrs // { + # When using the `beamDeps` argument, it is important that we use + # `rebar3WithPlugins` here even when there are no plugins. The vanilla + # `rebar3` package is an escript archive with bundled dependencies which can + # interfere with those in the app we are trying to build. `rebar3WithPlugins` + # doesn't have this issue since it puts its own deps last on the code path. + rebar3 = rebar3WithPlugins { + plugins = buildPlugins; + }; + + pkg = + assert beamDeps != [] -> checkouts == null; + self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; inherit version; - buildInputs = buildInputs ++ [ erlang rebar3 openssl ]; - propagatedBuildInputs = [checkouts]; + buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; dontStrip = true; inherit src; - setupHook = writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" - ''; - configurePhase = '' runHook preConfigure - ${if checkouts != null then - "cp --no-preserve=all -R ${checkouts}/_checkouts ." - else - ""} + ${lib.optionalString (checkouts != null) + "cp --no-preserve=all -R ${checkouts}/_checkouts ."} + ${# Prevent rebar3 from trying to manage deps + lib.optionalString (beamDeps != [ ]) '' + erl -noshell -eval ' + {ok, Terms0} = file:consult("rebar.config"), + Terms = lists:keydelete(deps, 1, Terms0), + ok = file:write_file("rebar.config", [io_lib:format("~tp.~n", [T]) || T <- Terms]), + init:stop(0) + ' + rm -f rebar.lock + ''} runHook postConfigure ''; -- cgit 1.4.1 From 049ecc9716d9dd275956c0c02195881e383dfa16 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 17 May 2021 17:53:54 +0200 Subject: erlang-ls: use rebar3Relx --- .../development/beam-modules/erlang-ls/default.nix | 22 +-- .../beam-modules/erlang-ls/rebar-deps.nix | 216 ++++++++++++++------- 2 files changed, 155 insertions(+), 83 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index ff68af8d521..45ca3704be0 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,25 +1,23 @@ -{ fetchFromGitHub, fetchHex, stdenv, erlang, rebar3WithPlugins, lib }: +{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, lib }: let version = "0.15.0"; owner = "erlang-ls"; repo = "erlang_ls"; - deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; }; -in stdenv.mkDerivation { + deps = import ./rebar-deps.nix { + inherit fetchHex fetchFromGitHub; + builder = buildRebar3; + }; +in rebar3Relx { + name = "erlang-ls"; inherit version; - pname = "erlang-ls"; - buildInputs = [ erlang (rebar3WithPlugins { }) ]; src = fetchFromGitHub { inherit owner repo; sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; rev = version; }; - buildPhase = '' - mkdir _checkouts - ${toString (lib.mapAttrsToList (k: v: '' - cp -R ${v} _checkouts/${k} - '') deps)} - make - ''; + releaseType = "escript"; + beamDeps = builtins.attrValues deps; + buildPhase = "HOME=. make"; installPhase = '' mkdir -p $out/bin cp _build/default/bin/erlang_ls $out/bin/ diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 9de79e52be6..6fe8b1ac571 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -1,90 +1,164 @@ # Generated by rebar3_nix -{ fetchHex, fetchFromGitHub }: -{ - getopt = fetchHex { - pkg = "getopt"; +let fetchOnly = { src, ... }: src; +in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { + getopt = builder { + name = "getopt"; version = "1.0.1"; - sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; - }; - zipper = fetchHex { - pkg = "zipper"; + src = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + beamDeps = [ ]; + }; + zipper = builder { + name = "zipper"; version = "1.0.1"; - sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; - }; - quickrand = fetchHex { - pkg = "quickrand"; + src = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + beamDeps = [ ]; + }; + quickrand = builder { + name = "quickrand"; version = "2.0.1"; - sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; - }; - providers = fetchHex { - pkg = "providers"; + src = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + beamDeps = [ ]; + }; + providers = builder { + name = "providers"; version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; - }; - katana_code = fetchHex { - pkg = "katana_code"; + src = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + beamDeps = [ getopt ]; + }; + katana_code = builder { + name = "katana_code"; version = "0.2.1"; - sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; - }; - bucs = fetchHex { - pkg = "bucs"; + src = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + beamDeps = [ ]; + }; + bucs = builder { + name = "bucs"; version = "1.0.16"; - sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; - }; - yamerl = fetchHex { - pkg = "yamerl"; + src = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + beamDeps = [ ]; + }; + yamerl = builder { + name = "yamerl"; version = "0.8.1"; - sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; - }; - uuid = fetchHex { - pkg = "uuid_erl"; + src = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + beamDeps = [ ]; + }; + uuid = builder { + name = "uuid"; version = "2.0.1"; - sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; - }; - tdiff = fetchHex { - pkg = "tdiff"; + src = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + beamDeps = [ quickrand ]; + }; + tdiff = builder { + name = "tdiff"; version = "0.1.2"; - sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; - }; - redbug = fetchHex { - pkg = "redbug"; + src = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + beamDeps = [ ]; + }; + redbug = builder { + name = "redbug"; version = "2.0.6"; - sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; - }; - rebar3_format = fetchHex { - pkg = "rebar3_format"; + src = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + beamDeps = [ ]; + }; + rebar3_format = builder { + name = "rebar3_format"; version = "0.8.2"; - sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; - }; - ranch = fetchHex { - pkg = "ranch"; + src = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + beamDeps = [ katana_code ]; + }; + ranch = builder { + name = "ranch"; version = "1.7.1"; - sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; - }; - jsx = fetchHex { - pkg = "jsx"; + src = fetchHex { + pkg = "ranch"; + version = "1.7.1"; + sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; + }; + beamDeps = [ ]; + }; + jsx = builder { + name = "jsx"; version = "3.0.0"; - sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; - }; - erlfmt = fetchFromGitHub { - owner = "whatsapp"; - repo = "erlfmt"; - rev = "2e93fc4a646111357642b0179a2a63151868d890"; - sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; - }; - ephemeral = fetchHex { - pkg = "ephemeral"; + src = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + beamDeps = [ ]; + }; + ephemeral = builder { + name = "ephemeral"; version = "2.0.4"; - sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; - }; - elvis_core = fetchHex { - pkg = "elvis_core"; + src = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + beamDeps = [ bucs ]; + }; + elvis_core = builder { + name = "elvis_core"; version = "1.1.1"; - sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; - }; - docsh = fetchHex { - pkg = "docsh"; + src = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + beamDeps = [ katana_code zipper ]; + }; + docsh = builder { + name = "docsh"; version = "0.7.2"; - sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + src = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; + beamDeps = [ providers ]; }; } -- cgit 1.4.1 From aa86fdcf85ad282be0478711343c5a77fa4f5ce2 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 20 May 2021 20:31:03 +0900 Subject: elixir: default to 1.12; init 1.12 --- pkgs/development/beam-modules/default.nix | 12 ++++++++---- pkgs/development/interpreters/elixir/1.12.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.12.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 601505e1f48..8fe7de96b24 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -40,7 +40,12 @@ let erlang-ls = callPackage ./erlang-ls { }; # BEAM-based languages. - elixir = elixir_1_11; + elixir = elixir_1_12; + + elixir_1_12 = lib'.callElixir ../interpreters/elixir/1.12.nix { + inherit erlang; + debugInfo = true; + }; elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix { inherit erlang; @@ -62,6 +67,8 @@ let debugInfo = true; }; + # Remove old versions of elixir, when the supports fades out: + # https://hexdocs.pm/elixir/compatibility-and-deprecations.html elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix { inherit erlang; debugInfo = true; @@ -69,9 +76,6 @@ let elixir_ls = callPackage ./elixir_ls.nix { inherit elixir fetchMixDeps mixRelease; }; - # Remove old versions of elixir, when the supports fades out: - # https://hexdocs.pm/elixir/compatibility-and-deprecations.html - lfe = lfe_1_3; lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/interpreters/elixir/1.12.nix b/pkgs/development/interpreters/elixir/1.12.nix new file mode 100644 index 00000000000..f84f4255cca --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.12.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz +mkDerivation { + version = "1.12.0"; + sha256 = "sha256-Jnxi0vFYMnwEgTqkPncZbj+cR57hjvH77RCseJdUoFs="; + minimumOTPVersion = "22"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b077c9e4432..87842c816e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12040,7 +12040,7 @@ in inherit (beam.interpreters) erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 - elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 + elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; erlang_nox = beam_nox.interpreters.erlang; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 688d1607240..b6f4418e111 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -126,7 +126,7 @@ rec { # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR23.elixir`. inherit (packages.erlang) - elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; + elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; -- cgit 1.4.1 From 72a1b62b472025ed3bd716fce8a102cad81cbd04 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 19 May 2021 13:59:52 +0900 Subject: mixRelease: integrate mix2nix --- pkgs/development/beam-modules/mix-release.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 320fcaa9c9b..774af2e5ec9 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -8,15 +8,23 @@ , enableDebugInfo ? false , mixEnv ? "prod" , compileFlags ? [ ] -, mixDeps ? null + # mix fixed output derivation dependencies +, mixFodDeps ? null + # mix dependencies generated by mix2nix + # this assumes each dependency is built by buildMix or buildRebar3 + # each dependency needs to have a setup hook to add the lib path to $ERL_LIBS + # this is how mix will find dependencies +, mixNixDeps ? { } , ... }@attrs: let - overridable = builtins.removeAttrs attrs [ "compileFlags" ]; - + # remove non standard attributes that cannot be coerced to strings + overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ]; in +assert mixNixDeps != { } -> mixFodDeps == null; stdenv.mkDerivation (overridable // { nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ]; + buildInputs = builtins.attrValues mixNixDeps; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; @@ -29,17 +37,17 @@ stdenv.mkDerivation (overridable // { postUnpack = '' export HEX_HOME="$TEMPDIR/hex" export MIX_HOME="$TEMPDIR/mix" - # compilation of the dependencies will require - # that the dependency path is writable - # thus a copy to the TEMPDIR is inevitable here - export MIX_DEPS_PATH="$TEMPDIR/deps" # Rebar export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" - ${lib.optionalString (mixDeps != null) '' - cp --no-preserve=mode -R "${mixDeps}" "$MIX_DEPS_PATH" + ${lib.optionalString (mixFodDeps != null) '' + # compilation of the dependencies will require + # that the dependency path is writable + # thus a copy to the TEMPDIR is inevitable here + export MIX_DEPS_PATH="$TEMPDIR/deps" + cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" '' } -- cgit 1.4.1 From fdc024bcffc378567c541e4eb2d52d10b2345425 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 19 May 2021 14:00:12 +0900 Subject: elixir_ls: update to new mixRelease api --- pkgs/development/beam-modules/elixir_ls.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/elixir_ls.nix b/pkgs/development/beam-modules/elixir_ls.nix index b61db92584d..5afab0e1bab 100644 --- a/pkgs/development/beam-modules/elixir_ls.nix +++ b/pkgs/development/beam-modules/elixir_ls.nix @@ -14,7 +14,7 @@ mixRelease rec { fetchSubmodules = true; }; - mixDeps = fetchMixDeps { + mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; sha256 = "0r9x223imq4j9pn9niskyaybvk7jmq8dxcyzk7kwfsi128qig1a1"; -- cgit 1.4.1 From f55c3e2f21073be564fed477847ad5bd649c9fb9 Mon Sep 17 00:00:00 2001 From: Thomas Depierre Date: Mon, 17 May 2021 10:09:51 +0200 Subject: beam-packages: drop erlang R18 R19 R20 and cuter --- doc/languages-frameworks/beam.section.md | 4 +-- nixos/doc/manual/release-notes/rl-2105.xml | 8 +++++ pkgs/development/beam-modules/default.nix | 4 --- pkgs/development/interpreters/erlang/R18.nix | 34 ------------------ pkgs/development/interpreters/erlang/R19.nix | 19 ---------- pkgs/development/interpreters/erlang/R20.nix | 10 ------ pkgs/development/tools/erlang/cuter/default.nix | 46 ------------------------ pkgs/top-level/all-packages.nix | 6 ++-- pkgs/top-level/beam-packages.nix | 48 ++----------------------- 9 files changed, 14 insertions(+), 165 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R18.nix delete mode 100644 pkgs/development/interpreters/erlang/R19.nix delete mode 100644 pkgs/development/interpreters/erlang/R20.nix delete mode 100644 pkgs/development/tools/erlang/cuter/default.nix (limited to 'pkgs/development/beam-modules') diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 2d32dec7205..68e84d2f990 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -14,9 +14,9 @@ nixpkgs follows the [official elixir deprecation schedule](https://hexdocs.pm/el All BEAM-related expressions are available via the top-level `beam` attribute, which includes: -- `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlangR19`, etc), Elixir (`beam.interpreters.elixir`) and LFE (Lisp Flavoured Erlang) (`beam.interpreters.lfe`). +- `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlangR22`, etc), Elixir (`beam.interpreters.elixir`) and LFE (Lisp Flavoured Erlang) (`beam.interpreters.lfe`). -- `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. `beam.packages.erlangR19`. +- `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. `beam.packages.erlang22`. The default Erlang compiler, defined by `beam.interpreters.erlang`, is aliased as `erlang`. The default BEAM package set is defined by `beam.packages.erlang` and aliased at the top level as `beamPackages`. diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 9ce24700686..07b28147d69 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -1133,6 +1133,14 @@ environment.systemPackages = [ Nixpkgs now contains automatically packaged GNOME Shell extensions from the GNOME Extensions portal. You can find them, filed by their UUID, under gnome38Extensions attribute for GNOME 3.38 and under gnome40Extensions for GNOME 40. Finally, the gnomeExtensions attribute contains extensions for the latest GNOME Shell version in Nixpkgs, listed under a more human-friendly name. The unqualified attribute scope also contains manually packaged extensions. Note that the automatically packaged extensions are provided for convenience and are not checked or guaranteed to work. + + + Erlang/OTP versions older than R21 got dropped. We also dropped the cuter package, as it was purely an example of how to build a package. + We also dropped lfe_1_2 as it could not build with R21+. + Moving forward, we expect to only support 3 yearly releases of OTP. + + + diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 8fe7de96b24..203668c3cb8 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -77,7 +77,6 @@ let elixir_ls = callPackage ./elixir_ls.nix { inherit elixir fetchMixDeps mixRelease; }; lfe = lfe_1_3; - lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages. Examples how to build Rebar/Mix packages with and @@ -85,9 +84,6 @@ let hex = callPackage ./hex { }; webdriver = callPackage ./webdriver { }; relxExe = callPackage ../tools/erlang/relx-exe { }; - - # An example of Erlang/C++ package. - cuter = callPackage ../tools/erlang/cuter { }; }; in makeExtensible packages diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix deleted file mode 100644 index c99596ea026..00000000000 --- a/pkgs/development/interpreters/erlang/R18.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ mkDerivation, fetchpatch }: - -let - rmAndPwdPatch = fetchpatch { - url = "https://github.com/erlang/otp/commit/98b8650d22e94a5ff839170833f691294f6276d0.patch"; - sha256 = "0zjs7as83prgq4d5gaw2cmnajnsprdk8cjl5kklknx0pc2b3hfg5"; - }; - - envAndCpPatch = fetchpatch { - url = "https://github.com/erlang/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch"; - sha256 = "00fx5wc88ki3z71z5q4xzi9h3whhjw1zblpn09w995ygn07m9qhm"; - }; - - makeOrderingPatch = fetchpatch { - url = "https://github.com/erlang/otp/commit/2f1a37f1011ff9d129bc35a6efa0ab937a2aa0e9.patch"; - sha256 = "0xfa6hzxh9d7qllkyidcgh57xrrx11w65y7s1hyg52alm06l6b9n"; - }; - - makeParallelInstallPatch = fetchpatch { - url ="https://github.com/erlang/otp/commit/de8fe86f67591dd992bae33f7451523dab36e5bd.patch"; - sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c"; - }; - -in mkDerivation { - version = "18.3.4.11"; - sha256 = "190xbv77v5x2g8xkzdg9bpwa1ylkc18d03ag2a0frcwcv76x53k1"; - - patches = [ - rmAndPwdPatch - envAndCpPatch - makeOrderingPatch - makeParallelInstallPatch - ]; -} diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix deleted file mode 100644 index 65ac57413f6..00000000000 --- a/pkgs/development/interpreters/erlang/R19.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ mkDerivation, fetchpatch }: - -mkDerivation { - version = "19.3.6.13"; - sha256 = "1zbg54p7pdr8bjyrxvi7vs41vgamqa8lsynnm6ac6845q0xwpwid"; - - patches = [ - # macOS 10.13 crypto fix from OTP-20.1.2 - (fetchpatch { - name = "darwin-crypto.patch"; - url = "https://github.com/erlang/otp/commit/882c90f72ba4e298aa5a7796661c28053c540a96.patch"; - sha256 = "1gggzpm8ssamz6975z7px0g8qq5i4jqw81j846ikg49c5cxvi0hi"; - }) - ]; - - prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - ''; -} diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix deleted file mode 100644 index dfa363c0f25..00000000000 --- a/pkgs/development/interpreters/erlang/R20.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "20.3.8.26"; - sha256 = "062405s59hkdkmw2dryq0qc1k03jsncj7yqisgj35x9sqpzm4w7a"; - - prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - ''; -} diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix deleted file mode 100644 index 44ed61ac1d5..00000000000 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang -, z3, python }: - -stdenv.mkDerivation rec { - pname = "cuter"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "aggelgian"; - repo = "cuter"; - rev = "v${version}"; - sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv"; - }; - - setupHook = writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" - ''; - - nativeBuildInputs = [ autoreconfHook makeWrapper which ]; - buildInputs = [ python python.pkgs.setuptools z3.python erlang ]; - - buildFlags = [ "PWD=$(out)/lib/erlang/lib/cuter-${version}" "cuter_target" ]; - configurePhase = '' - autoconf - ./configure --prefix $out - ''; - - installPhase = '' - mkdir -p "$out/lib/erlang/lib/cuter-${version}" - mkdir -p "$out/bin" - cp -r * "$out/lib/erlang/lib/cuter-${version}" - cp cuter "$out/bin/cuter" - wrapProgram $out/bin/cuter \ - --prefix PATH : "${python}/bin" \ - --suffix PYTHONPATH : "${z3}/${python.sitePackages}" \ - --suffix ERL_LIBS : "$out/lib/erlang/lib" - ''; - - meta = { - description = "A concolic testing tool for the Erlang functional programming language"; - license = lib.licenses.gpl3; - homepage = "https://github.com/aggelgian/cuter"; - maintainers = with lib.maintainers; [ ericbmerritt ]; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04626fa7451..7247a76ec09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12038,7 +12038,7 @@ in beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; inherit (beam.interpreters) - erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 + erlang erlangR24 erlangR23 erlangR22 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; @@ -12051,8 +12051,6 @@ in fetchHex beamPackages relxExe; - inherit (beam.packages.erlangR19) cuter lfe_1_2; - inherit (beam.packages.erlangR21) lfe lfe_1_3; groovy = callPackage ../development/interpreters/groovy { }; @@ -19877,7 +19875,7 @@ in xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; yaws = callPackage ../servers/http/yaws { - erlang = erlangR18; + erlang = erlangR21; }; youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index b6f4418e111..e4ce5b6d3c8 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2, buildPackages, wxSupport ? true }: +{ callPackage, wxGTK30, buildPackages, wxSupport ? true }: rec { lib = callPackage ../development/beam-modules/lib.nix { }; @@ -72,47 +72,6 @@ rec { odbcSupport = true; }; - # R20 - erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { - wxGTK = wxGTK30; - autoconf = buildPackages.autoconf269; - inherit wxSupport; - }; - erlangR20_odbc = erlangR20.override { odbcSupport = true; }; - erlangR20_javac = erlangR20.override { javacSupport = true; }; - erlangR20_odbc_javac = erlangR20.override { - javacSupport = true; - odbcSupport = true; - }; - - # R19 - erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { - wxGTK = wxGTK30; - openssl = openssl_1_0_2; - autoconf = buildPackages.autoconf269; - inherit wxSupport; - }; - erlangR19_odbc = erlangR19.override { odbcSupport = true; }; - erlangR19_javac = erlangR19.override { javacSupport = true; }; - erlangR19_odbc_javac = erlangR19.override { - javacSupport = true; - odbcSupport = true; - }; - - # R18 - erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { - wxGTK = wxGTK30; - openssl = openssl_1_0_2; - autoconf = buildPackages.autoconf269; - inherit wxSupport; - }; - erlangR18_odbc = erlangR18.override { odbcSupport = true; }; - erlangR18_javac = erlangR18.override { javacSupport = true; }; - erlangR18_odbc_javac = erlangR18.override { - javacSupport = true; - odbcSupport = true; - }; - # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { @@ -128,7 +87,7 @@ rec { inherit (packages.erlang) elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; - inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; + inherit (packages.erlang) lfe lfe_1_3; }; # Helper function to generate package set with a specific Erlang version. @@ -145,8 +104,5 @@ rec { erlangR23 = packagesWith interpreters.erlangR23; erlangR22 = packagesWith interpreters.erlangR22; erlangR21 = packagesWith interpreters.erlangR21; - erlangR20 = packagesWith interpreters.erlangR20; - erlangR19 = packagesWith interpreters.erlangR19; - erlangR18 = packagesWith interpreters.erlangR18; }; } -- cgit 1.4.1 From 1c979e4116d132dba334091878ad0bb5cfa966a0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 13:26:32 +0900 Subject: elixir 1_8: set erlang to R23 --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 203668c3cb8..234f1d3a999 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -63,7 +63,7 @@ let }; elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { - inherit erlang; + erlang = pkgs.beam.interpreters.erlangR23; debugInfo = true; }; -- cgit 1.4.1 From 2402d70ef36cb7b09575c7e21bd8ee70ec76d259 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 29 May 2021 08:43:32 +0900 Subject: relxExe: remove relxExe is not intended to be used as a single standalone executable, but as a library by rebar3 --- pkgs/development/beam-modules/default.nix | 1 - pkgs/development/tools/erlang/relx-exe/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/tools/erlang/relx-exe/default.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 234f1d3a999..0c184e0ba73 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -83,7 +83,6 @@ let # without helper functions buildRebar3 and buildMix. hex = callPackage ./hex { }; webdriver = callPackage ./webdriver { }; - relxExe = callPackage ../tools/erlang/relx-exe { }; }; in makeExtensible packages diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix deleted file mode 100644 index 890b90e4888..00000000000 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ fetchHex, fetchRebar3Deps, rebar3Relx }: - -rebar3Relx rec { - name = "relx-exe"; - version = "4.3.0"; - releaseType = "escript"; - - src = fetchHex { - pkg = "relx"; - sha256 = "sha256-c44JSab8fQ3p5FSdwPc9m24FtTnhURuySFkHArMiBEA="; - inherit version; - }; - - checkouts = fetchRebar3Deps { - inherit name version; - src = "${src}/rebar.lock"; - sha256 = "sha256-BY/c4+vqdnn4FBPzLExEZIZ27f1g46XISb8mIpMU8aI="; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54998083704..5f060afa922 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12099,8 +12099,7 @@ in inherit (beam.packages.erlang) erlang-ls rebar rebar3 rebar3WithPlugins - fetchHex beamPackages - relxExe; + fetchHex beamPackages; inherit (beam.packages.erlangR21) lfe lfe_1_3; -- cgit 1.4.1 From 9b4ee111e66b406156755e7be65ac306d3ddade3 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 18:22:31 +0200 Subject: erlang-ls: 0.15.0 -> 0.16.0 --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- pkgs/development/beam-modules/erlang-ls/rebar-deps.nix | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 45ca3704be0..e6f3e7fb9e9 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, lib }: let - version = "0.15.0"; + version = "0.16.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -12,7 +12,7 @@ in rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; + sha256 = "0l09yhj3rsb9zj4cs6a1bcfmi6zbyb3xk1lv494xbyiv5d61vkwm"; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 6fe8b1ac571..12cbb182ceb 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -113,11 +113,11 @@ in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { }; ranch = builder { name = "ranch"; - version = "1.7.1"; + version = "2.0.0"; src = fetchHex { pkg = "ranch"; - version = "1.7.1"; - sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; + version = "2.0.0"; + sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; }; beamDeps = [ ]; }; @@ -131,6 +131,17 @@ in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { }; beamDeps = [ ]; }; + erlfmt = builder { + name = "erlfmt"; + version = "git"; + src = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + beamDeps = [ ]; + }; ephemeral = builder { name = "ephemeral"; version = "2.0.4"; -- cgit 1.4.1 From ba934e9fc1898c749a3577ca85607e67e0a6c692 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 May 2021 16:12:51 +0200 Subject: beam/fetchMixDeps: allow adding patches Needed to modify e.g. a few things in the `plausible` package to get it running properly. --- pkgs/development/beam-modules/fetch-mix-deps.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 73365bd1a93..0c6f4e35a90 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -7,6 +7,7 @@ , mixEnv ? "prod" , debug ? false , meta ? { } +, patches ? [] , ... }@attrs: @@ -36,6 +37,8 @@ stdenvNoCC.mkDerivation (attrs // { runHook postConfigure ''; + inherit patches; + dontBuild = true; installPhase = attrs.installPhase or '' -- cgit 1.4.1 From af0844c7a2992b7d653a879e1cb1f7257e5957c0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 3 Jun 2021 21:58:02 +0900 Subject: beam: nixpkgs-fmt --- pkgs/development/beam-modules/build-erlang-mk.nix | 76 ++++++----- pkgs/development/beam-modules/build-mix.nix | 4 +- pkgs/development/beam-modules/build-rebar3.nix | 22 ++-- .../interpreters/erlang/generic-builder.nix | 141 +++++++++++++-------- 4 files changed, 146 insertions(+), 97 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index a94524276b2..d1afa55387d 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -1,19 +1,21 @@ { stdenv, writeText, erlang, perl, which, gitMinimal, wget, lib }: -{ name, version +{ name +, version , src , setupHook ? null -, buildInputs ? [] -, beamDeps ? [] +, buildInputs ? [ ] +, beamDeps ? [ ] , postPatch ? "" , compilePorts ? false , installPhase ? null , buildPhase ? null , configurePhase ? null -, meta ? {} +, meta ? { } , enableDebugInfo ? false -, buildFlags ? [] -, ... }@attrs: +, buildFlags ? [ ] +, ... +}@attrs: with lib; @@ -21,11 +23,11 @@ let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info"; shell = drv: stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - buildInputs = [ drv ]; - }; + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; - pkg = self: stdenv.mkDerivation ( attrs // { + pkg = self: stdenv.mkDerivation (attrs // { app_name = name; name = "${name}-${version}"; inherit version; @@ -34,11 +36,13 @@ let inherit src; - setupHook = if setupHook == null - then writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib" - '' - else setupHook; + setupHook = + if setupHook == null + then + writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib" + '' + else setupHook; buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ]; propagatedBuildInputs = beamDeps; @@ -47,30 +51,33 @@ let ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"'' ++ buildFlags; - configurePhase = if configurePhase == null - then '' - runHook preConfigure + configurePhase = + if configurePhase == null + then '' + runHook preConfigure - # We shouldnt need to do this, but it seems at times there is a *.app in - # the repo/package. This ensures we start from a clean slate - make SKIP_DEPS=1 clean + # We shouldnt need to do this, but it seems at times there is a *.app in + # the repo/package. This ensures we start from a clean slate + make SKIP_DEPS=1 clean - runHook postConfigure - '' - else configurePhase; + runHook postConfigure + '' + else configurePhase; - buildPhase = if buildPhase == null - then '' + buildPhase = + if buildPhase == null + then '' runHook preBuild make $buildFlags "''${buildFlagsArray[@]}" runHook postBuild - '' - else buildPhase; + '' + else buildPhase; - installPhase = if installPhase == null - then '' + installPhase = + if installPhase == null + then '' runHook preInstall mkdir -p $out/lib/erlang/lib/${name} @@ -90,13 +97,14 @@ let fi runHook postInstall - '' - else installPhase; + '' + else installPhase; passthru = { packageName = name; env = shell self; inherit beamDeps; }; -}); -in fix pkg + }); +in +fix pkg diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 7e19f19a093..4da627a844b 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -35,9 +35,7 @@ let # add to ERL_LIBS so other modules can find at runtime. # http://erlang.org/doc/man/code.html#code-path - # Mix also searches the code path when compiling with the --no-deps-check - # flag, which is why there is no complicated booterstrapper like the one - # used by buildRebar3. + # Mix also searches the code path when compiling with the --no-deps-check flag setupHook = attrs.setupHook or writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib" diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index dc882a13318..b66dc535ce0 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,16 +1,20 @@ { stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, lib }: -{ name, version +{ name +, version , src , setupHook ? null -, buildInputs ? [], beamDeps ? [], buildPlugins ? [] +, buildInputs ? [ ] +, beamDeps ? [ ] +, buildPlugins ? [ ] , postPatch ? "" , installPhase ? null , buildPhase ? null , configurePhase ? null -, meta ? {} +, meta ? { } , enableDebugInfo ? false -, ... }@attrs: +, ... +}@attrs: with lib; @@ -22,9 +26,9 @@ let }; shell = drv: stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - buildInputs = [ drv ]; - }; + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; customPhases = filterAttrs (_: v: v != null) @@ -42,7 +46,7 @@ let inherit src; setupHook = writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; postPatch = '' @@ -77,4 +81,4 @@ let }; } // customPhases); in - fix pkg +fix pkg diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index aba4c318bea..1f2f3a25a5e 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,12 +1,32 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, autoconf +{ pkgs +, lib +, stdenv +, fetchFromGitHub +, makeWrapper +, gawk +, gnum4 +, gnused +, libxml2 +, libxslt +, ncurses +, openssl +, perl +, autoconf , openjdk11 ? null # javacSupport , unixODBC ? null # odbcSupport -, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null +, libGL ? null +, libGLU ? null +, wxGTK ? null +, wxmac ? null +, xorg ? null , parallelBuild ? false -, systemd, wxSupport ? true -# updateScript deps -, writeScript, common-updater-scripts, coreutils, git +, systemd +, wxSupport ? true + # updateScript deps +, writeScript +, common-updater-scripts +, coreutils +, git }: { baseName ? "erlang" , version @@ -18,25 +38,42 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk11 ] -, odbcSupport ? false, odbcPackages ? [ unixODBC ] +, javacSupport ? false +, javacPackages ? [ openjdk11 ] +, odbcSupport ? false +, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd , opensslPackage ? openssl , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] -, preUnpack ? "", postUnpack ? "" -, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" -, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" -, buildPhase ? "", preBuild ? "", postBuild ? "" -, installPhase ? "", preInstall ? "", postInstall ? "" +, preUnpack ? "" +, postUnpack ? "" +, patches ? [ ] +, patchPhase ? "" +, prePatch ? "" +, postPatch ? "" +, configureFlags ? [ ] +, configurePhase ? "" +, preConfigure ? "" +, postConfigure ? "" +, buildPhase ? "" +, preBuild ? "" +, postBuild ? "" +, installPhase ? "" +, preInstall ? "" +, postInstall ? "" , installTargets ? [ "install" "install-docs" ] -, checkPhase ? "", preCheck ? "", postCheck ? "" -, fixupPhase ? "", preFixup ? "", postFixup ? "" -, meta ? {} +, checkPhase ? "" +, preCheck ? "" +, postCheck ? "" +, fixupPhase ? "" +, preFixup ? "" +, postFixup ? "" +, meta ? { } }: assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else libGL != null && libGLU != null && wxGTK != null && xorg != null); +then wxmac != null +else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk11 != null; @@ -45,7 +82,8 @@ let inherit (lib) optional optionals optionalAttrs optionalString; wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; -in stdenv.mkDerivation ({ +in +stdenv.mkDerivation ({ name = "${baseName}-${version}" + optionalString javacSupport "-javac" + optionalString odbcSupport "-odbc"; @@ -109,19 +147,20 @@ in stdenv.mkDerivation ({ passthru = { updateScript = let major = builtins.head (builtins.splitVersion version); - in writeScript "update.sh" '' - #!${stdenv.shell} - set -ox errexit - PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]} - latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) - if [ "$latest" != "${version}" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix" - update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file" - else - echo "${baseName}R${major} is already up-to-date" - fi - ''; + in + writeScript "update.sh" '' + #!${stdenv.shell} + set -ox errexit + PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]} + latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) + if [ "$latest" != "${version}" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix" + update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file" + else + echo "${baseName}R${major} is already up-to-date" + fi + ''; }; meta = with lib; ({ @@ -143,24 +182,24 @@ in stdenv.mkDerivation ({ license = licenses.asl20; } // meta); } -// optionalAttrs (preUnpack != "") { inherit preUnpack; } -// optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (patches != []) { inherit patches; } -// optionalAttrs (prePatch != "") { inherit prePatch; } -// optionalAttrs (patchPhase != "") { inherit patchPhase; } +// optionalAttrs (preUnpack != "") { inherit preUnpack; } +// optionalAttrs (postUnpack != "") { inherit postUnpack; } +// optionalAttrs (patches != [ ]) { inherit patches; } +// optionalAttrs (prePatch != "") { inherit prePatch; } +// optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } -// optionalAttrs (preConfigure != "") { inherit preConfigure; } -// optionalAttrs (postConfigure != "") { inherit postConfigure; } -// optionalAttrs (buildPhase != "") { inherit buildPhase; } -// optionalAttrs (preBuild != "") { inherit preBuild; } -// optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (checkPhase != "") { inherit checkPhase; } -// optionalAttrs (preCheck != "") { inherit preCheck; } -// optionalAttrs (postCheck != "") { inherit postCheck; } -// optionalAttrs (installPhase != "") { inherit installPhase; } -// optionalAttrs (installTargets != []) { inherit installTargets; } -// optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (fixupPhase != "") { inherit fixupPhase; } -// optionalAttrs (preFixup != "") { inherit preFixup; } -// optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (preConfigure != "") { inherit preConfigure; } +// optionalAttrs (postConfigure != "") { inherit postConfigure; } +// optionalAttrs (buildPhase != "") { inherit buildPhase; } +// optionalAttrs (preBuild != "") { inherit preBuild; } +// optionalAttrs (postBuild != "") { inherit postBuild; } +// optionalAttrs (checkPhase != "") { inherit checkPhase; } +// optionalAttrs (preCheck != "") { inherit preCheck; } +// optionalAttrs (postCheck != "") { inherit postCheck; } +// optionalAttrs (installPhase != "") { inherit installPhase; } +// optionalAttrs (installTargets != [ ]) { inherit installTargets; } +// optionalAttrs (preInstall != "") { inherit preInstall; } +// optionalAttrs (fixupPhase != "") { inherit fixupPhase; } +// optionalAttrs (preFixup != "") { inherit preFixup; } +// optionalAttrs (postFixup != "") { inherit postFixup; } ) -- cgit 1.4.1 From 8588b80af49d52033575c774cc57f23ccc43e372 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 19 May 2021 19:29:28 +0200 Subject: rebar3Relx: add executable to bin dir and remove unnecessary dependency --- pkgs/development/beam-modules/rebar3-release.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index e8e2aecc460..a3835f5ce5e 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -82,9 +82,20 @@ let else "rel"} mkdir -p "$out/$dir" cp -R --preserve=mode "_build/${profile}/$dir" "$out" + ${lib.optionalString (releaseType == "release") + "mkdir -p $out/bin && ln -s -t $out/bin $out/rel/*/bin/*"} runHook postInstall ''; + postInstall = '' + for dir in $out/rel/*/erts-*; do + echo "ERTS found in $dir - removing references to erlang to reduce closure size" + for f in $dir/bin/{erl,start}; do + substituteInPlace "$f" --replace "${erlang}/lib/erlang" "''${dir/\/erts-*/}" + done + done + ''; + meta = { inherit (erlang.meta) platforms; } // meta; -- cgit 1.4.1 From 4b0ea06ff373f0ef27c2f43216c49ff50083c64c Mon Sep 17 00:00:00 2001 From: David Date: Sat, 5 Jun 2021 22:55:35 +0200 Subject: rebar3Relx: only link executables in $out/bin --- pkgs/development/beam-modules/rebar3-release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index a3835f5ce5e..d2c9da6414f 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -80,10 +80,10 @@ let dir=${if releaseType == "escript" then "bin" else "rel"} - mkdir -p "$out/$dir" + mkdir -p "$out/$dir" "$out/bin" cp -R --preserve=mode "_build/${profile}/$dir" "$out" ${lib.optionalString (releaseType == "release") - "mkdir -p $out/bin && ln -s -t $out/bin $out/rel/*/bin/*"} + "find $out/rel/*/bin -type f -executable -exec ln -s -t $out/bin {} \\;"} runHook postInstall ''; -- cgit 1.4.1 From 5e56caf52f876b07b2d04ae36516e54e52f4ba8c Mon Sep 17 00:00:00 2001 From: David Date: Sun, 6 Jun 2021 10:59:17 +0200 Subject: rebar3Relx: strip native binaries --- pkgs/development/beam-modules/rebar3-release.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index d2c9da6414f..80082945e4c 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -46,7 +46,8 @@ let buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; - dontStrip = true; + # ensure we strip any native binaries (eg. NIFs, ports) + stripDebugList = lib.optional (releaseType == "release") "rel"; inherit src; -- cgit 1.4.1 From 3bc80f19388a8b29b65c91fd4550f51cbc9a3a96 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 08:42:28 +0900 Subject: buildMix: switch buildInputs to nativeBuildInputs --- pkgs/development/beam-modules/build-mix.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 4da627a844b..31d266d3578 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -23,8 +23,7 @@ let pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; - inherit version; - inherit src; + inherit version src buildInputs; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; @@ -41,7 +40,7 @@ let addToSearchPath ERL_LIBS "$1/lib/erlang/lib" ''; - buildInputs = buildInputs ++ [ elixir hex ]; + nativeBuildInputs = [ elixir hex ]; propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; buildPhase = attrs.buildPhase or '' -- cgit 1.4.1 From 357cc8e05d1f05c84e778cdd316dce8987396b5f Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 08:43:29 +0900 Subject: mix-release: remove rebar dep --- pkgs/development/beam-modules/mix-release.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 774af2e5ec9..3ee460fd5f4 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git }: +{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git }: { pname , version @@ -31,7 +31,6 @@ stdenv.mkDerivation (overridable // { HEX_OFFLINE = 1; DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation # the api with `mix local.rebar rebar path` makes a copy of the binary - MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; postUnpack = '' -- cgit 1.4.1 From 8989d2eae8aee06ee35b2cbdba74a5e7c366d683 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 17:36:51 +0900 Subject: mix-release: remove erlang ref in erts dir --- pkgs/development/beam-modules/mix-release.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 3ee460fd5f4..91ebacc1f05 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -93,21 +93,21 @@ stdenv.mkDerivation (overridable // { if [ -e $out/releases/COOKIE ]; then # absent in special cases, i.e. elixir-ls rm $out/releases/COOKIE fi - # TODO remove the uneeded reference too erlang - # one possible way would be - # for f in $(${findutils}/bin/find $out -name start); do - # substituteInPlace $f \ - # --replace 'ROOTDIR=${erlang}/lib/erlang' 'ROOTDIR=""' - # done - # What is left to do is to check that erlang is not required on - # the host + # removing unused erlang reference from resulting derivation to reduce + # closure size + if [ -e $out/erts-* ]; then + echo "ERTS found in $dir - removing references to erlang to reduce closure size" + for file in $out/erts-*/bin/{erl,start}; do + substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" + done + fi patchShebangs $out runHook postFixup ''; - # TODO figure out how to do a Fixed Output Derivation and add the output hash - # This doesn't play well at the moment with Phoenix projects - # for example that have frontend dependencies + # TODO investigate why the resulting closure still has + # a reference to erlang. + # uncommenting the following will fail the build # disallowedReferences = [ erlang ]; }) -- cgit 1.4.1 From 2a87cb7a8b4436bcd85fe0fe9532664386879a67 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 19:56:33 +0900 Subject: build-mix buildRebar3: strip out derivation for NIFs --- pkgs/development/beam-modules/build-mix.nix | 7 ++++--- pkgs/development/beam-modules/build-rebar3.nix | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 31d266d3578..783ae34dcd3 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -29,9 +29,6 @@ let MIX_DEBUG = if enableDebugInfo then 1 else 0; HEX_OFFLINE = 1; - # stripping does not have any effect on beam files - dontStrip = true; - # add to ERL_LIBS so other modules can find at runtime. # http://erlang.org/doc/man/code.html#code-path # Mix also searches the code path when compiling with the --no-deps-check flag @@ -72,6 +69,10 @@ let runHook postInstall ''; + # stripping does not have any effect on beam files + # it is however needed for dependencies with NIFs like bcrypt for example + dontStrip = false; + passthru = { packageName = name; env = shell self; diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index b66dc535ce0..0dfd68f0993 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -42,9 +42,13 @@ let buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; propagatedBuildInputs = unique beamDeps; - dontStrip = true; inherit src; + # stripping does not have any effect on beam files + # it is however needed for dependencies with NIFs + # false is the default but we keep this for readability + dontStrip = false; + setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; -- cgit 1.4.1 From 5e9f18c572fa24750a278b80f6ad9ad101f48069 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 19:58:21 +0900 Subject: mix-release: remove erlang ref in resulting derivation --- pkgs/development/beam-modules/mix-release.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 91ebacc1f05..9f63244f17e 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git }: +{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: { pname , version @@ -23,7 +23,8 @@ let in assert mixNixDeps != { } -> mixFodDeps == null; stdenv.mkDerivation (overridable // { - nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ]; + # rg is used as a better grep to search for erlang references in the final release + nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ]; buildInputs = builtins.attrValues mixNixDeps; MIX_ENV = mixEnv; @@ -96,8 +97,8 @@ stdenv.mkDerivation (overridable // { # removing unused erlang reference from resulting derivation to reduce # closure size if [ -e $out/erts-* ]; then - echo "ERTS found in $dir - removing references to erlang to reduce closure size" - for file in $out/erts-*/bin/{erl,start}; do + echo "ERTS found in $out - removing references to erlang to reduce closure size" + for file in $(rg "${erlang}/lib/erlang" "$out" --text --files-with-matches); do substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" done fi -- cgit 1.4.1 From e13301fd5c916ef89d302085c5fdf364a4e5e069 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 6 Jun 2021 21:03:44 +0900 Subject: mix-release: do not override fixup to strip binary --- pkgs/development/beam-modules/mix-release.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 9f63244f17e..ecb15628c32 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -82,8 +82,7 @@ stdenv.mkDerivation (overridable // { runHook postInstall ''; - fixupPhase = '' - runHook preFixup + postFixup = '' if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls rm "$out/bin/${pname}.bat" # windows file fi @@ -102,9 +101,6 @@ stdenv.mkDerivation (overridable // { substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" done fi - - patchShebangs $out - runHook postFixup ''; # TODO investigate why the resulting closure still has -- cgit 1.4.1 From 2e3e591211c1afe4d1b2abc93d537c93f250ce1a Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 7 Jun 2021 09:22:07 +0900 Subject: mix-release: add comments --- pkgs/development/beam-modules/mix-release.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index ecb15628c32..e096bdee0cf 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -82,6 +82,9 @@ stdenv.mkDerivation (overridable // { runHook postInstall ''; + # Stripping of the binary is intentional + # even though it does not affect beam files + # it is necessary for NIFs binaries postFixup = '' if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls rm "$out/bin/${pname}.bat" # windows file @@ -97,6 +100,8 @@ stdenv.mkDerivation (overridable // { # closure size if [ -e $out/erts-* ]; then echo "ERTS found in $out - removing references to erlang to reduce closure size" + # there is a link in $out/erts-*/bin/start always + # sometimes there are links in dependencies like bcrypt compiled binaries for file in $(rg "${erlang}/lib/erlang" "$out" --text --files-with-matches); do substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" done -- cgit 1.4.1 From eae65a197dc28c9eac6b6afad065d7853339ea6e Mon Sep 17 00:00:00 2001 From: Milan Pässler Date: Mon, 7 Jun 2021 14:21:15 +0200 Subject: beam/buildMix: pass on custom nativeBuildInputs 3bc80f19388a8b29b65c91fd4550f51cbc9a3a96 changed buildInputs to nativeBuildInputs, but broke specifying custom nativeBuildInputs. --- pkgs/development/beam-modules/build-mix.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 783ae34dcd3..728d249c97d 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -4,6 +4,7 @@ , version , src , buildInputs ? [ ] +, nativeBuildInputs ? [ ] , beamDeps ? [ ] , propagatedBuildInputs ? [ ] , postPatch ? "" @@ -23,7 +24,7 @@ let pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; - inherit version src buildInputs; + inherit version src; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; @@ -37,7 +38,8 @@ let addToSearchPath ERL_LIBS "$1/lib/erlang/lib" ''; - nativeBuildInputs = [ elixir hex ]; + buildInputs = buildInputs ++ [ ]; + nativeBuildInputs = nativeBuildInputs ++ [ elixir hex ]; propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; buildPhase = attrs.buildPhase or '' -- cgit 1.4.1 From ae2f75ef8949f5174325e655adefa1b86e80befb Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 18:49:58 +0200 Subject: rebar3WithPlugins: add ability to ignore dependencies --- pkgs/development/beam-modules/rebar3-release.nix | 12 +----- .../tools/build-managers/rebar3/default.nix | 4 +- .../build-managers/rebar3/rebar_ignore_deps.erl | 43 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 80082945e4c..98d10cb87c4 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -51,20 +51,12 @@ let inherit src; + REBAR_IGNORE_DEPS = beamDeps != [ ]; + configurePhase = '' runHook preConfigure ${lib.optionalString (checkouts != null) "cp --no-preserve=all -R ${checkouts}/_checkouts ."} - ${# Prevent rebar3 from trying to manage deps - lib.optionalString (beamDeps != [ ]) '' - erl -noshell -eval ' - {ok, Terms0} = file:consult("rebar.config"), - Terms = lists:keydelete(deps, 1, Terms0), - ok = file:write_file("rebar.config", [io_lib:format("~tp.~n", [T]) || T <- Terms]), - init:stop(0) - ' - rm -f rebar.lock - ''} runHook postConfigure ''; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index d551b98b5b8..ba4641552fe 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -118,9 +118,11 @@ let {ok, _} = zip:extract(Archive, [{cwd, "'$out/lib'"}]), init:stop(0) ' + cp ${./rebar_ignore_deps.erl} rebar_ignore_deps.erl + erlc -o $out/lib/rebar/ebin rebar_ignore_deps.erl mkdir -p $out/bin makeWrapper ${erlang}/bin/erl $out/bin/rebar3 \ - --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames}" \ + --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames} rebar_ignore_deps" \ --suffix-each ERL_LIBS ":" "$out/lib ${toString pluginLibDirs}" \ --add-flags "+sbtu +A1 -noshell -boot start_clean -s rebar3 main -extra" ''; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl b/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl new file mode 100644 index 00000000000..3e0ae67c453 --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl @@ -0,0 +1,43 @@ +%% This module, when loaded as a plugin, overrides the default `install_deps` +%% provider and erases the dependencies from the rebar3 state, when +%% REBAR_IGNORE_DEPS is true. + +-module(rebar_ignore_deps). + +-export([init/1, do/1, format_error/1]). + +init(State0) -> + case os:getenv("REBAR_IGNORE_DEPS", "") of + "" -> + {ok, State0}; + _ -> + do_init(State0) + end. + +do_init(State0) -> + State1 = rebar_state:allow_provider_overrides(State0, true), + Provider = providers:create( + [ + {name, install_deps}, %% override the default install_deps provider + {module, ?MODULE}, + {bare, false}, + {deps, [app_discovery]}, + {example, undefined}, + {opts, []}, + {short_desc, ""}, + {desc, ""} + ]), + State2 = rebar_state:add_provider(State1, Provider), + {ok, rebar_state:allow_provider_overrides(State2, false)}. + +do(State0) -> + io:format("Ignoring deps...~n"), + Profiles = rebar_state:current_profiles(State0), + State = lists:foldl(fun(P, Acc0) -> + Acc = rebar_state:set(Acc0, {deps, P}, []), + rebar_state:set(Acc, {parsed_deps, P}, []) + end, State0, Profiles), + {ok, State}. + +format_error(Reason) -> + io_lib:format("~p", [Reason]). -- cgit 1.4.1 From c34a62ebefc402d6bf0aa299fd50993557fa8383 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 19:22:37 +0200 Subject: rebar3-proper: init at 0.12.1 --- pkgs/development/beam-modules/default.nix | 2 +- pkgs/development/beam-modules/rebar3-proper/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/beam-modules/rebar3-proper/default.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 0c184e0ba73..6c33298ff92 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -21,8 +21,8 @@ let inherit (callPackage ../tools/build-managers/rebar3 { }) rebar3 rebar3WithPlugins; rebar = callPackage ../tools/build-managers/rebar { }; - # rebar3 port compiler plugin is required by buildRebar3 pc = callPackage ./pc { }; + rebar3-proper = callPackage ./rebar3-proper { }; rebar3-nix = callPackage ./rebar3-nix { }; fetchHex = callPackage ./fetch-hex.nix { }; diff --git a/pkgs/development/beam-modules/rebar3-proper/default.nix b/pkgs/development/beam-modules/rebar3-proper/default.nix new file mode 100644 index 00000000000..2955beeeb5b --- /dev/null +++ b/pkgs/development/beam-modules/rebar3-proper/default.nix @@ -0,0 +1,13 @@ +{ lib, buildHex }: + +buildHex { + name = "rebar3_proper"; + version = "0.12.1"; + sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6"; + + meta = { + description = "rebar3 proper plugin"; + license = lib.licenses.bsd3; + homepage = "https://github.com/ferd/rebar3_proper"; + }; +} -- cgit 1.4.1 From e5d8f1adc94224da8c32a9dd6da0373b9d718b6b Mon Sep 17 00:00:00 2001 From: David Date: Mon, 31 May 2021 19:25:05 +0200 Subject: erlang-ls: add checkPhase --- .../development/beam-modules/erlang-ls/default.nix | 16 +- .../beam-modules/erlang-ls/rebar-deps.nix | 358 ++++++++++++--------- 2 files changed, 216 insertions(+), 158 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index e6f3e7fb9e9..b2a69a69278 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, lib }: +{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: let version = "0.16.0"; owner = "erlang-ls"; @@ -6,6 +6,11 @@ let deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; builder = buildRebar3; + overrides = (self: super: { + proper = super.proper.overrideAttrs (_: { + configurePhase = "true"; + }); + }); }; in rebar3Relx { name = "erlang-ls"; @@ -17,7 +22,16 @@ in rebar3Relx { }; releaseType = "escript"; beamDeps = builtins.attrValues deps; + buildPlugins = [ rebar3-proper ]; buildPhase = "HOME=. make"; + # based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml + # these tests are excessively long and we should probably skip them + checkPhase = '' + HOME=. epmd -daemon + HOME=. rebar3 ct + HOME=. rebar3 proper --constraint_tries 100 + ''; + doCheck = true; installPhase = '' mkdir -p $out/bin cp _build/default/bin/erlang_ls $out/bin/ diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 12cbb182ceb..5d55ce0c523 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -1,175 +1,219 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { - getopt = builder { - name = "getopt"; - version = "1.0.1"; - src = fetchHex { - pkg = "getopt"; +in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + getopt = builder { + name = "getopt"; version = "1.0.1"; - sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; - }; - beamDeps = [ ]; - }; - zipper = builder { - name = "zipper"; - version = "1.0.1"; - src = fetchHex { - pkg = "zipper"; + src = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + beamDeps = [ ]; + }; + zipper = builder { + name = "zipper"; version = "1.0.1"; - sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; - }; - beamDeps = [ ]; - }; - quickrand = builder { - name = "quickrand"; - version = "2.0.1"; - src = fetchHex { - pkg = "quickrand"; + src = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + beamDeps = [ ]; + }; + quickrand = builder { + name = "quickrand"; version = "2.0.1"; - sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; - }; - beamDeps = [ ]; - }; - providers = builder { - name = "providers"; - version = "1.8.1"; - src = fetchHex { - pkg = "providers"; + src = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + beamDeps = [ ]; + }; + providers = builder { + name = "providers"; version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; - }; - beamDeps = [ getopt ]; - }; - katana_code = builder { - name = "katana_code"; - version = "0.2.1"; - src = fetchHex { - pkg = "katana_code"; + src = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + beamDeps = [ getopt ]; + }; + katana_code = builder { + name = "katana_code"; version = "0.2.1"; - sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; - }; - beamDeps = [ ]; - }; - bucs = builder { - name = "bucs"; - version = "1.0.16"; - src = fetchHex { - pkg = "bucs"; + src = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + beamDeps = [ ]; + }; + bucs = builder { + name = "bucs"; version = "1.0.16"; - sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; - }; - beamDeps = [ ]; - }; - yamerl = builder { - name = "yamerl"; - version = "0.8.1"; - src = fetchHex { - pkg = "yamerl"; + src = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + beamDeps = [ ]; + }; + yamerl = builder { + name = "yamerl"; version = "0.8.1"; - sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; - }; - beamDeps = [ ]; - }; - uuid = builder { - name = "uuid"; - version = "2.0.1"; - src = fetchHex { - pkg = "uuid_erl"; + src = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + beamDeps = [ ]; + }; + uuid = builder { + name = "uuid"; version = "2.0.1"; - sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; - }; - beamDeps = [ quickrand ]; - }; - tdiff = builder { - name = "tdiff"; - version = "0.1.2"; - src = fetchHex { - pkg = "tdiff"; + src = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + beamDeps = [ quickrand ]; + }; + tdiff = builder { + name = "tdiff"; version = "0.1.2"; - sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; - }; - beamDeps = [ ]; - }; - redbug = builder { - name = "redbug"; - version = "2.0.6"; - src = fetchHex { - pkg = "redbug"; + src = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + beamDeps = [ ]; + }; + redbug = builder { + name = "redbug"; version = "2.0.6"; - sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; - }; - beamDeps = [ ]; - }; - rebar3_format = builder { - name = "rebar3_format"; - version = "0.8.2"; - src = fetchHex { - pkg = "rebar3_format"; + src = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + beamDeps = [ ]; + }; + rebar3_format = builder { + name = "rebar3_format"; version = "0.8.2"; - sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; - }; - beamDeps = [ katana_code ]; - }; - ranch = builder { - name = "ranch"; - version = "2.0.0"; - src = fetchHex { - pkg = "ranch"; + src = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + beamDeps = [ katana_code ]; + }; + ranch = builder { + name = "ranch"; version = "2.0.0"; - sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; - }; - beamDeps = [ ]; - }; - jsx = builder { - name = "jsx"; - version = "3.0.0"; - src = fetchHex { - pkg = "jsx"; + src = fetchHex { + pkg = "ranch"; + version = "2.0.0"; + sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; + }; + beamDeps = [ ]; + }; + jsx = builder { + name = "jsx"; version = "3.0.0"; - sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; - }; - beamDeps = [ ]; - }; - erlfmt = builder { - name = "erlfmt"; - version = "git"; - src = fetchFromGitHub { - owner = "whatsapp"; - repo = "erlfmt"; - rev = "2e93fc4a646111357642b0179a2a63151868d890"; - sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; - }; - beamDeps = [ ]; - }; - ephemeral = builder { - name = "ephemeral"; - version = "2.0.4"; - src = fetchHex { - pkg = "ephemeral"; + src = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + beamDeps = [ ]; + }; + erlfmt = builder { + name = "erlfmt"; + version = "git"; + src = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + beamDeps = [ ]; + }; + ephemeral = builder { + name = "ephemeral"; version = "2.0.4"; - sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; - }; - beamDeps = [ bucs ]; - }; - elvis_core = builder { - name = "elvis_core"; - version = "1.1.1"; - src = fetchHex { - pkg = "elvis_core"; + src = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + beamDeps = [ bucs ]; + }; + elvis_core = builder { + name = "elvis_core"; version = "1.1.1"; - sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; - }; - beamDeps = [ katana_code zipper ]; - }; - docsh = builder { - name = "docsh"; - version = "0.7.2"; - src = fetchHex { - pkg = "docsh"; + src = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + beamDeps = [ katana_code zipper ]; + }; + docsh = builder { + name = "docsh"; version = "0.7.2"; - sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; - }; - beamDeps = [ providers ]; - }; -} + src = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; + beamDeps = [ providers ]; + }; + proper_contrib = builder { + name = "proper_contrib"; + version = "0.2.0"; + src = fetchHex { + pkg = "proper_contrib"; + version = "0.2.0"; + sha256 = "sha256-jFRRL1zr9JKaG1eqMDfcKk2xe93uOrXUenB14icVCBU="; + }; + beamDeps = [ proper ]; + }; + proper = builder { + name = "proper"; + version = "1.3.0"; + src = fetchHex { + pkg = "proper"; + version = "1.3.0"; + sha256 = "sha256-SqGS/M3dA/2+UP72IL6dTS+SY1tU9V+4OuwYWZRAPLw="; + }; + beamDeps = [ ]; + }; + meck = builder { + name = "meck"; + version = "0.9.0"; + src = fetchHex { + pkg = "meck"; + version = "0.9.0"; + sha256 = "sha256-+BPpDdC4myUWoCAaNV6EsavHi1dRqgy/ZpqdhagQrGM="; + }; + beamDeps = [ ]; + }; + coveralls = builder { + name = "coveralls"; + version = "2.2.0"; + src = fetchHex { + pkg = "coveralls"; + version = "2.2.0"; + sha256 = "sha256-zVTbCqjGS1OSgBicVhns7hOkaiiw8ct3RUTdzBZiBKM="; + }; + beamDeps = [ jsx ]; + }; + }; +in self -- cgit 1.4.1 From dca55d9a451fba34c87e8adea7a3782d667149fa Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 9 Jun 2021 12:16:24 +0900 Subject: mix-release: add rebar dependency --- pkgs/development/beam-modules/mix-release.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index e096bdee0cf..80e8721302e 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: +{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: { pname , version @@ -32,6 +32,8 @@ stdenv.mkDerivation (overridable // { HEX_OFFLINE = 1; DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation # the api with `mix local.rebar rebar path` makes a copy of the binary + # some older dependencies still use rebar + MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; postUnpack = '' -- cgit 1.4.1 From 020af1c6f66b8a0922966118fd7ed7f89e458083 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 15 Jun 2021 07:09:25 +0200 Subject: erlang-ls: 0.16.0 -> 0.17.0 --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index b2a69a69278..4e9461dc743 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: let - version = "0.16.0"; + version = "0.17.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -17,7 +17,7 @@ in rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "0l09yhj3rsb9zj4cs6a1bcfmi6zbyb3xk1lv494xbyiv5d61vkwm"; + sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw"; rev = version; }; releaseType = "escript"; -- cgit 1.4.1 From 567224081c58b54467af8acd32544504678ddcbe Mon Sep 17 00:00:00 2001 From: David Date: Sat, 3 Jul 2021 15:37:10 +0200 Subject: rebar3-nix: 0.1.0 -> 0.1.1 --- pkgs/development/beam-modules/rebar3-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix index ff248700d78..50bd2965835 100644 --- a/pkgs/development/beam-modules/rebar3-nix/default.nix +++ b/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -1,12 +1,12 @@ { lib, buildRebar3, fetchFromGitHub }: buildRebar3 rec { name = "rebar3_nix"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "erlang-nix"; repo = name; rev = "v${version}"; - sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + sha256 = "10ijc06qvv5hqv0qy3w7mbv9pshdb8bvy0f3phr1vd5hksbk731y"; }; meta = { -- cgit 1.4.1 From 2d1781f595672a49cb1c873906a68c40862e650b Mon Sep 17 00:00:00 2001 From: David Date: Sun, 4 Jul 2021 17:51:25 +0200 Subject: rebar3Relx: allow `passthru` to be overridden --- pkgs/development/beam-modules/rebar3-release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 98d10cb87c4..16344f2f194 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -93,10 +93,10 @@ let inherit (erlang.meta) platforms; } // meta; - passthru = { + passthru = ({ packageName = name; env = shell self; - }; + } // (if attrs ? passthru then attrs.passthru else {})); } // customPhases); in fix pkg -- cgit 1.4.1 From ed8502370fc251168eaab03e0a4522e28f364f80 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 4 Jul 2021 17:52:19 +0200 Subject: erlfmt: init at 1.0.0 --- pkgs/development/beam-modules/default.nix | 1 + pkgs/development/beam-modules/erlfmt/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/beam-modules/erlfmt/default.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 6c33298ff92..6cfa2721bfc 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -38,6 +38,7 @@ let mixRelease = callPackage ./mix-release.nix { }; erlang-ls = callPackage ./erlang-ls { }; + erlfmt = callPackage ./erlfmt { }; # BEAM-based languages. elixir = elixir_1_12; diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix new file mode 100644 index 00000000000..c903906802e --- /dev/null +++ b/pkgs/development/beam-modules/erlfmt/default.nix @@ -0,0 +1,20 @@ +{ fetchFromGitHub, rebar3Relx, lib }: + +rebar3Relx rec { + name = "erlfmt"; + version = "1.0.0"; + releaseType = "escript"; + src = fetchFromGitHub { + owner = "WhatsApp"; + repo = "erlfmt"; + sha256 = "19apbs9xr4j8qjb3sv9ilknqjw4a7bvp8jvwrjiwvwnxzzm2kjm6"; + rev = "v${version}"; + }; + meta = with lib; { + homepage = "https://github.com/WhatsApp/erlfmt"; + description = "An automated code formatter for Erlang"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with lib.maintainers; [ dlesl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18f860ffc51..1985fe852ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12317,7 +12317,7 @@ in erlang_nox = beam_nox.interpreters.erlang; inherit (beam.packages.erlang) - erlang-ls + erlang-ls erlfmt rebar rebar3 rebar3WithPlugins fetchHex beamPackages; -- cgit 1.4.1 From 2021b5f0701322361165881c2173f2433c164e52 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 7 Jul 2021 13:17:12 +0900 Subject: rebar3-release: nixpkgs-fmt --- pkgs/development/beam-modules/rebar3-release.nix | 146 ++++++++++++----------- 1 file changed, 76 insertions(+), 70 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 16344f2f194..ba947ae7ec5 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -1,28 +1,34 @@ -{ stdenv, erlang, rebar3WithPlugins, openssl, - lib }: - -{ name, version +{ stdenv +, erlang +, rebar3WithPlugins +, openssl +, lib +}: + +{ name +, version , src -, beamDeps ? [] -, buildPlugins ? [] +, beamDeps ? [ ] +, buildPlugins ? [ ] , checkouts ? null , releaseType -, buildInputs ? [] +, buildInputs ? [ ] , setupHook ? null , profile ? "default" , installPhase ? null , buildPhase ? null , configurePhase ? null -, meta ? {} -, ... }@attrs: +, meta ? { } +, ... +}@attrs: with lib; let shell = drv: stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - buildInputs = [ drv ]; - }; + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; customPhases = filterAttrs (_: v: v != null) @@ -38,65 +44,65 @@ let }; pkg = - assert beamDeps != [] -> checkouts == null; + assert beamDeps != [ ] -> checkouts == null; self: stdenv.mkDerivation (attrs // { - name = "${name}-${version}"; - inherit version; - - buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; - - # ensure we strip any native binaries (eg. NIFs, ports) - stripDebugList = lib.optional (releaseType == "release") "rel"; - - inherit src; - - REBAR_IGNORE_DEPS = beamDeps != [ ]; - - configurePhase = '' - runHook preConfigure - ${lib.optionalString (checkouts != null) - "cp --no-preserve=all -R ${checkouts}/_checkouts ."} - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript" - then "escriptize" - else "release"} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - dir=${if releaseType == "escript" - then "bin" - else "rel"} - mkdir -p "$out/$dir" "$out/bin" - cp -R --preserve=mode "_build/${profile}/$dir" "$out" - ${lib.optionalString (releaseType == "release") - "find $out/rel/*/bin -type f -executable -exec ln -s -t $out/bin {} \\;"} - runHook postInstall - ''; - - postInstall = '' - for dir in $out/rel/*/erts-*; do - echo "ERTS found in $dir - removing references to erlang to reduce closure size" - for f in $dir/bin/{erl,start}; do - substituteInPlace "$f" --replace "${erlang}/lib/erlang" "''${dir/\/erts-*/}" + name = "${name}-${version}"; + inherit version; + + buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; + + # ensure we strip any native binaries (eg. NIFs, ports) + stripDebugList = lib.optional (releaseType == "release") "rel"; + + inherit src; + + REBAR_IGNORE_DEPS = beamDeps != [ ]; + + configurePhase = '' + runHook preConfigure + ${lib.optionalString (checkouts != null) + "cp --no-preserve=all -R ${checkouts}/_checkouts ."} + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + HOME=. DEBUG=1 rebar3 as ${profile} ${if releaseType == "escript" + then "escriptize" + else "release"} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + dir=${if releaseType == "escript" + then "bin" + else "rel"} + mkdir -p "$out/$dir" "$out/bin" + cp -R --preserve=mode "_build/${profile}/$dir" "$out" + ${lib.optionalString (releaseType == "release") + "find $out/rel/*/bin -type f -executable -exec ln -s -t $out/bin {} \\;"} + runHook postInstall + ''; + + postInstall = '' + for dir in $out/rel/*/erts-*; do + echo "ERTS found in $dir - removing references to erlang to reduce closure size" + for f in $dir/bin/{erl,start}; do + substituteInPlace "$f" --replace "${erlang}/lib/erlang" "''${dir/\/erts-*/}" + done done - done - ''; - - meta = { - inherit (erlang.meta) platforms; - } // meta; - - passthru = ({ - packageName = name; - env = shell self; - } // (if attrs ? passthru then attrs.passthru else {})); - } // customPhases); + ''; + + meta = { + inherit (erlang.meta) platforms; + } // meta; + + passthru = ({ + packageName = name; + env = shell self; + } // (if attrs ? passthru then attrs.passthru else { })); + } // customPhases); in - fix pkg +fix pkg -- cgit 1.4.1 From 2e832bb6ef0e590a207adc1d0af6d3a6a1c725ca Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 8 Jul 2021 08:35:37 +0900 Subject: rebar3-release: add pname --- pkgs/development/beam-modules/rebar3-release.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index ba947ae7ec5..4b473b13aca 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -5,7 +5,8 @@ , lib }: -{ name +{ name ? null +, pname ? name , version , src , beamDeps ? [ ] @@ -47,8 +48,8 @@ let assert beamDeps != [ ] -> checkouts == null; self: stdenv.mkDerivation (attrs // { - name = "${name}-${version}"; - inherit version; + name = "${pname}-${version}"; + inherit version pname; buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps; -- cgit 1.4.1 From b97a23cdd5270794300ea295a88e874e69e7099e Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 8 Jul 2021 20:13:42 +0900 Subject: rebar3-release: remove name attribute --- pkgs/development/beam-modules/erlang-ls/default.nix | 5 +++-- pkgs/development/beam-modules/erlfmt/default.nix | 2 +- pkgs/development/beam-modules/rebar3-release.nix | 7 +++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 4e9461dc743..7635e46237b 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -12,8 +12,9 @@ let }); }); }; -in rebar3Relx { - name = "erlang-ls"; +in +rebar3Relx { + pname = "erlang-ls"; inherit version; src = fetchFromGitHub { inherit owner repo; diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix index c903906802e..da577f2264c 100644 --- a/pkgs/development/beam-modules/erlfmt/default.nix +++ b/pkgs/development/beam-modules/erlfmt/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, rebar3Relx, lib }: rebar3Relx rec { - name = "erlfmt"; + pname = "erlfmt"; version = "1.0.0"; releaseType = "escript"; src = fetchFromGitHub { diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 4b473b13aca..59771c34029 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -5,8 +5,7 @@ , lib }: -{ name ? null -, pname ? name +{ pname , version , src , beamDeps ? [ ] @@ -27,7 +26,7 @@ with lib; let shell = drv: stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; + name = "interactive-shell-${drv.pname}"; buildInputs = [ drv ]; }; @@ -101,7 +100,7 @@ let } // meta; passthru = ({ - packageName = name; + packageName = pname; env = shell self; } // (if attrs ? passthru then attrs.passthru else { })); } // customPhases); -- cgit 1.4.1 From 53072cc0666112eebe9bc5d18dd46abb12f0dcbe Mon Sep 17 00:00:00 2001 From: David Date: Sun, 4 Jul 2021 19:41:33 +0200 Subject: elvis: init at 1.0.1 --- pkgs/development/beam-modules/default.nix | 1 + .../beam-modules/elvis-erlang/default.nix | 46 ++++++ .../beam-modules/elvis-erlang/rebar-deps.nix | 168 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/beam-modules/elvis-erlang/default.nix create mode 100644 pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 6cfa2721bfc..b6be8c3e7fb 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -39,6 +39,7 @@ let erlang-ls = callPackage ./erlang-ls { }; erlfmt = callPackage ./erlfmt { }; + elvis-erlang = callPackage ./elvis-erlang { }; # BEAM-based languages. elixir = elixir_1_12; diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix new file mode 100644 index 00000000000..81888bdde21 --- /dev/null +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -0,0 +1,46 @@ +{ fetchFromGitHub, fetchgit, fetchHex, rebar3WithPlugins, rebar3-nix, rebar3Relx +, buildRebar3, writeScript, lib }: + +let + owner = "inaka"; + repo = "elvis"; +in rebar3Relx rec { + releaseType = "escript"; + # The package name "elvis" is already taken + pname = "elvis-erlang"; + version = "1.0.1"; + src = fetchFromGitHub { + inherit owner repo; + sha256 = "139mgd4cwc0vazxfnssyym61jd9g45wn1nc53mjfzx5dkrrn4dc5"; + rev = version; + }; + beamDeps = builtins.attrValues (import ./rebar-deps.nix { + inherit fetchHex fetchgit fetchFromGitHub; + builder = buildRebar3; + }); + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p bash common-updater-scripts git nix-prefetch-git gnutar gzip "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" + + set -euo pipefail + + latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sort -V | tail -1) + if [ "$latest" != "${version}" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + nix_path="$nixpkgs/pkgs/development/beam-modules/elvis-erlang" + update-source-version elvis-erlang "$latest" --version-key=version --print-changes --file="$nix_path/default.nix" + tmpdir=$(mktemp -d) + cp -R $(nix-build $nixpkgs --no-out-link -A elvis-erlang.src)/* "$tmpdir" + (cd "$tmpdir" && HOME=. rebar3 nix lock -o "$nix_path/rebar-deps.nix") + else + echo "${repo} is already up-to-date" + fi + ''; + meta = with lib; { + homepage = "https://github.com/inaka/elvis"; + description = "Erlang Style Reviewer"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with lib.maintainers; [ dlesl ]; + }; +} diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix new file mode 100644 index 00000000000..93c3db16eb9 --- /dev/null +++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix @@ -0,0 +1,168 @@ +# Generated by rebar3_nix +let fetchOnly = { src, ... }: src; +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + unicode_util_compat = builder { + name = "unicode_util_compat"; + version = "0.7.0"; + src = fetchHex { + pkg = "unicode_util_compat"; + version = "0.7.0"; + sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE="; + }; + beamDeps = [ ]; + }; + ssl_verify_fun = builder { + name = "ssl_verify_fun"; + version = "1.1.6"; + src = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; + }; + beamDeps = [ ]; + }; + parse_trans = builder { + name = "parse_trans"; + version = "3.4.0"; + src = fetchHex { + pkg = "parse_trans"; + version = "3.4.0"; + sha256 = "sha256-+Z42iDC+pEVSIk434ElDpUh08IuFkEhd6NE4MrY6LcM="; + }; + beamDeps = [ ]; + }; + mimerl = builder { + name = "mimerl"; + version = "1.2.0"; + src = fetchHex { + pkg = "mimerl"; + version = "1.2.0"; + sha256 = "sha256-8nhYVlCqWBmGJkY46/aY+LsZ3yl/Zq2RsYkQ38bhkyM="; + }; + beamDeps = [ ]; + }; + metrics = builder { + name = "metrics"; + version = "1.0.1"; + src = fetchHex { + pkg = "metrics"; + version = "1.0.1"; + sha256 = "sha256-abCa3dxPdKQHFq5U0UD5O+sPuJeNhjbq3tDDG28JnxY="; + }; + beamDeps = [ ]; + }; + idna = builder { + name = "idna"; + version = "6.1.1"; + src = fetchHex { + pkg = "idna"; + version = "6.1.1"; + sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo="; + }; + beamDeps = [ unicode_util_compat ]; + }; + certifi = builder { + name = "certifi"; + version = "2.6.1"; + src = fetchHex { + pkg = "certifi"; + version = "2.6.1"; + sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; + }; + beamDeps = [ ]; + }; + zipper = builder { + name = "zipper"; + version = "1.0.1"; + src = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + beamDeps = [ ]; + }; + lager = builder { + name = "lager"; + version = "3.9.1"; + src = fetchHex { + pkg = "lager"; + version = "3.9.1"; + sha256 = "sha256-P1m6daBKmeXxi/kcifRtzlNvg8bLQV/ibm51pivvN9w="; + }; + beamDeps = [ goldrush ]; + }; + katana_code = builder { + name = "katana_code"; + version = "1.1.2"; + src = fetchHex { + pkg = "katana_code"; + version = "1.1.2"; + sha256 = "sha256-5+YWKkToJqA/aLUDt9kpgbiUv4NMHvDmR3g/fWaIAhw="; + }; + beamDeps = [ ]; + }; + jsx = builder { + name = "jsx"; + version = "2.10.0"; + src = fetchHex { + pkg = "jsx"; + version = "2.10.0"; + sha256 = "sha256-moPjcEgHKYAWlo21Bvn60PAn3jdUbrg4s64QZMOgrWI="; + }; + beamDeps = [ ]; + }; + hackney = builder { + name = "hackney"; + version = "1.17.1"; + src = fetchHex { + pkg = "hackney"; + version = "1.17.1"; + sha256 = "sha256-0sup48gQOtAyBiPp8cM+jTeKFeqr4u6K5EGJjz01oYw="; + }; + beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; + }; + goldrush = builder { + name = "goldrush"; + version = "0.1.9"; + src = fetchHex { + pkg = "goldrush"; + version = "0.1.9"; + sha256 = "sha256-mctBKM/8syJ1geXU2APVQT+mQ/TrllI/d9nmk32ZTOs="; + }; + beamDeps = [ ]; + }; + getopt = builder { + name = "getopt"; + version = "1.0.2"; + src = fetchHex { + pkg = "getopt"; + version = "1.0.2"; + sha256 = "sha256-oAKa6kMi+4KmH2h2ptnGbcmHi2y2H6oT3zGHOE/U6iY="; + }; + beamDeps = [ ]; + }; + elvis_core = builder { + name = "elvis_core"; + version = "1.1.2"; + src = fetchHex { + pkg = "elvis_core"; + version = "1.1.2"; + sha256 = "sha256-xO5Cp6fC/FZ/Pqa1FQFkzWgpDxEA6bGaTPiG2Kocpzw="; + }; + beamDeps = [ katana_code zipper ]; + }; + egithub = builder { + name = "egithub"; + version = "0.7.0"; + src = fetchHex { + pkg = "egithub"; + version = "0.7.0"; + sha256 = "sha256-4AnOEe/YAI0PntWdnEiOPpq+MCoPLNbWY+TMJnVvzEw="; + }; + beamDeps = [ goldrush hackney jsx lager ]; + }; + }; +in self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 786dd4e0dc2..b1113a5e02c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12343,7 +12343,7 @@ in erlang_nox = beam_nox.interpreters.erlang; inherit (beam.packages.erlang) - erlang-ls erlfmt + erlang-ls erlfmt elvis-erlang rebar rebar3 rebar3WithPlugins fetchHex beamPackages; -- cgit 1.4.1