From 6bcfecbfa2aa131a4645b0e18d716f2c2ccac1cb Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 22 Sep 2020 20:35:39 +0900 Subject: tests.haskell-shellFor: get compiling again --- pkgs/test/haskell-shellFor/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix index 1b3de999d22..05d09d6f39c 100644 --- a/pkgs/test/haskell-shellFor/default.nix +++ b/pkgs/test/haskell-shellFor/default.nix @@ -1,7 +1,7 @@ -{ stdenv, haskellPackages, cabal-install }: +{ lib, stdenv, haskellPackages, cabal-install }: -haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints-extras ]; +(haskellPackages.shellFor { + packages = p: [ p.database-id-class p.constraints ]; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' @@ -9,16 +9,25 @@ haskellPackages.shellFor { mkdir -p "$sourceRoot" cd "$sourceRoot" tar -xf ${haskellPackages.database-id-class.src} - tar -xf ${haskellPackages.constraints-extras.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints-extras*"} cabal.project + tar -xf ${haskellPackages.constraints.src} + cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints-extras --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out ''; -} +}).overrideAttrs (oldAttrs: { + meta = + let + oldMeta = oldAttrs.meta or {}; + oldMaintainers = oldMeta.maintainers or []; + additionalMaintainers = with lib.maintainers; [ cdepillabout ]; + allMaintainers = oldMaintainers ++ additionalMaintainers; + in + oldMeta // { maintainers = allMaintainers; }; +}) -- cgit 1.4.1 From 074f6d9d848dc2672b71b82683de67f4dab9c30b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 10 Apr 2020 19:47:44 -0400 Subject: tests.texlive: init --- pkgs/test/default.nix | 2 ++ pkgs/test/texlive/default.nix | 66 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/test/texlive/default.nix (limited to 'pkgs/test') diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index c248eebaec3..85142090dd4 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -39,5 +39,7 @@ with pkgs; patch-shebangs = callPackage ./patch-shebangs {}; + texlive = callPackage ./texlive {}; + writers = callPackage ../build-support/writers/test.nix {}; } diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix new file mode 100644 index 00000000000..30d0026c848 --- /dev/null +++ b/pkgs/test/texlive/default.nix @@ -0,0 +1,66 @@ +{ runCommandNoCC, fetchurl, file, texlive }: + +{ + chktex = runCommandNoCC "texlive-test-chktex" { + nativeBuildInputs = [ + (with texlive; combine { inherit scheme-infraonly chktex; }) + ]; + input = builtins.toFile "chktex-sample.tex" '' + \documentclass{article} + \begin{document} + \LaTeX is great + \end{document} + ''; + } '' + chktex -v -nall -w1 "$input" 2>&1 | tee "$out" + grep "One warning printed" "$out" + ''; + + # https://github.com/NixOS/nixpkgs/issues/75605 + dvipng = runCommandNoCC "texlive-test-dvipng" { + nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + input = fetchurl { + name = "test_dvipng.tex"; + url = "http://git.savannah.nongnu.org/cgit/dvipng.git/plain/test_dvipng.tex?id=b872753590a18605260078f56cbd6f28d39dc035"; + sha256 = "1pjpf1jvwj2pv5crzdgcrzvbmn7kfmgxa39pcvskl4pa0c9hl88n"; + }; + } '' + cp "$input" ./document.tex + + latex document.tex + dvipng -T tight -strict -picky document.dvi + for f in document*.png; do + file "$f" | tee output + grep PNG output + done + + mkdir "$out" + mv document*.png "$out"/ + ''; + + # https://github.com/NixOS/nixpkgs/issues/75070 + dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { + nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + input = builtins.toFile "dvisvgm-sample.tex" '' + \documentclass{article} + \begin{document} + mwe + \end{document} + ''; + } '' + cp "$input" ./document.tex + + latex document.tex + dvisvgm document.dvi -n -o document_dvi.svg + cat document_dvi.svg + file document_dvi.svg | grep SVG + + pdflatex document.tex + dvisvgm -P document.pdf -n -o document_pdf.svg + cat document_pdf.svg + file document_pdf.svg | grep SVG + + mkdir "$out" + mv document*.svg "$out"/ + ''; +} -- cgit 1.4.1 From 03c9f6a647b45bf8d9b03094c43ba0467269fba4 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 7 May 2020 18:09:04 -0700 Subject: installShellFiles: Add test suite --- pkgs/build-support/install-shell-files/default.nix | 12 +- pkgs/test/default.nix | 2 + pkgs/test/install-shell-files/default.nix | 125 +++++++++++++++++++++ 3 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 pkgs/test/install-shell-files/default.nix (limited to 'pkgs/test') diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix index e1f2e24dd87..d50661ddc65 100644 --- a/pkgs/build-support/install-shell-files/default.nix +++ b/pkgs/build-support/install-shell-files/default.nix @@ -1,4 +1,12 @@ -{ makeSetupHook }: +{ makeSetupHook, tests }: # See the header comment in ../setup-hooks/install-shell-files.sh for example usage. -makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh +let + setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh; +in + +setupHook.overrideAttrs (oldAttrs: { + passthru = (oldAttrs.passthru or {}) // { + tests = tests.install-shell-files; + }; +}) diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index c248eebaec3..8322751089f 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -27,6 +27,8 @@ with pkgs; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + install-shell-files = callPackage ./install-shell-files {}; + kernel-config = callPackage ./kernel.nix {}; ld-library-path = callPackage ./ld-library-path {}; diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix new file mode 100644 index 00000000000..e3729c7d250 --- /dev/null +++ b/pkgs/test/install-shell-files/default.nix @@ -0,0 +1,125 @@ +{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: + +let + runTest = name: env: buildCommand: + runCommandLocal "install-shell-files--${name}" ({ + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = stdenv.lib.platforms.all; + } // env) buildCommand; +in + +recurseIntoAttrs { + # installManPage + + install-manpage = runTest "install-manpage" {} '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.2.gz + echo baz > doc/baz.3 + + installManPage doc/* + + cmp doc/foo.1 $out/share/man/man1/foo.1 + cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz + cmp doc/baz.3 $out/share/man/man3/baz.3 + ''; + install-manpage-outputs = runTest "install-manpage-outputs" { + outputs = [ "out" "man" "devman" ]; + } '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.3 + + installManPage doc/* + + # assert they didn't go into $out + [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] + + # foo.1 alone went into man + cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 + [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] + + # bar.3 alone went into devman + cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 + [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] + + touch $out + ''; + + # installShellCompletion + + install-completion = runTest "install-completion" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + echo qux > qux.zsh + echo quux > quux + + installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux + + cmp foo $out/share/bash-completion/completions/foo + cmp bar $out/share/bash-completion/completions/bar + cmp baz $out/share/zsh/site-functions/_baz + cmp qux.zsh $out/share/zsh/site-functions/_qux + cmp quux $out/share/fish/vendor_completions.d/quux + ''; + install-completion-output = runTest "install-completion-output" { + outputs = [ "out" "bin" ]; + } '' + echo foo > foo + + installShellCompletion --bash foo + + # assert it didn't go into $out + [[ ! -f $out/share/bash-completion/completions/foo ]] + + cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo + + touch $out + ''; + install-completion-name = runTest "install-completion-name" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + + installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz + + cmp foo $out/share/bash-completion/completions/foobar.bash + cmp bar $out/share/zsh/site-functions/_foobar + cmp baz $out/share/fish/vendor_completions.d/baz + ''; + install-completion-inference = runTest "install-completion-inference" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + + installShellCompletion foo.bash bar.zsh baz.fish + + cmp foo.bash $out/share/bash-completion/completions/foo.bash + cmp bar.zsh $out/share/zsh/site-functions/_bar + cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish + ''; + install-completion-cmd = runTest "install-completion-cmd" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + echo qux > qux.fish + + installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish + + cmp foo.bash $out/share/bash-completion/completions/foobar.bash + cmp bar.zsh $out/share/zsh/site-functions/_foobar + cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish + cmp qux.fish $out/share/fish/vendor_completions.d/qux + ''; + install-completion-fifo = runTest "install-completion-fifo" {} '' + installShellCompletion \ + --bash --name foo.bash <(echo foo) \ + --zsh --name _foo <(echo bar) \ + --fish --name foo.fish <(echo baz) + + [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } + [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } + [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } + ''; +} -- cgit 1.4.1 From 116ac11652659c0f896fda4a2477152b92e5326a Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:43:33 -0700 Subject: add test --- pkgs/test/default.nix | 2 ++ pkgs/test/rust-sysroot/default.nix | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/test/rust-sysroot/default.nix (limited to 'pkgs/test') diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 85142090dd4..c0a810fa01a 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -35,6 +35,8 @@ with pkgs; cross = callPackage ./cross {}; + rustCustomSysroot = callPackage ./rust-sysroot {}; + nixos-functions = callPackage ./nixos-functions {}; patch-shebangs = callPackage ./patch-shebangs {}; diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix new file mode 100644 index 00000000000..c6e9ecb89d9 --- /dev/null +++ b/pkgs/test/rust-sysroot/default.nix @@ -0,0 +1,41 @@ +{ rustPlatform, fetchFromGitHub, writeText }: + +rustPlatform.buildRustPackage rec { + name = "blog_os-sysroot-test"; + + src = fetchFromGitHub { + owner = "phil-opp"; + repo = "blog_os"; + rev = "4e38e7ddf8dd021c3cd7e4609dfa01afb827797b"; + sha256 = "0k9ipm9ddm1bad7bs7368wzzp6xwrhyfzfpckdax54l4ffqwljcg"; + }; + + cargoSha256 = "1cbcplgz28yxshyrp2krp1jphbrcqdw6wxx3rry91p7hiqyibd30"; + + # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. + # The justification in the book for using rust-lld suggests that gcc can still be used for testing: + # > Instead of using the platform's default linker (which might not support Linux targets), + # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. + # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 + target = writeText "x86_64-blog_os.json" '' + { + "llvm-target": "x86_64-unknown-none", + "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", + "arch": "x86_64", + "target-endian": "little", + "target-pointer-width": "64", + "target-c-int-width": "32", + "os": "none", + "executables": true, + "linker-flavor": "gcc", + "panic-strategy": "abort", + "disable-redzone": true, + "features": "-mmx,-sse,+soft-float" + } + ''; + + RUSTFLAGS = "-C link-arg=-nostartfiles"; + + # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ + doCheck = false; +} -- cgit 1.4.1 From 0ac33bf3f89c843803bce45ebe5b5a8865b67948 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:58:09 -0700 Subject: add `meta` to rust-sysroot test --- pkgs/test/rust-sysroot/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/test') diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index c6e9ecb89d9..10b37278af9 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, writeText }: +{ lib, rustPlatform, fetchFromGitHub, writeText }: rustPlatform.buildRustPackage rec { name = "blog_os-sysroot-test"; @@ -38,4 +38,9 @@ rustPlatform.buildRustPackage rec { # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ doCheck = false; + + meta = with lib; { + description = "Test for using custom sysroots with buildRustPackage."; + maintainers = with maintainers; [ aaronjanse ]; + }; } -- cgit 1.4.1 From 7ebcb6ee483cea2152622b980a0b20fe7a4568cb Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:58:27 -0700 Subject: remove trailing period --- pkgs/test/rust-sysroot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/test') diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index 10b37278af9..dd10807e3aa 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - description = "Test for using custom sysroots with buildRustPackage."; + description = "Test for using custom sysroots with buildRustPackage"; maintainers = with maintainers; [ aaronjanse ]; }; } -- cgit 1.4.1 From 29cdd8ae609d107889469610176aa53676382eb1 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 14:38:36 -0700 Subject: fix whitespace --- pkgs/test/rust-sysroot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/test') diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index dd10807e3aa..cd07ef53c32 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-C link-arg=-nostartfiles"; # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ - doCheck = false; + doCheck = false; meta = with lib; { description = "Test for using custom sysroots with buildRustPackage"; -- cgit 1.4.1 From c778945806b44d46ec16bc4302e7e7163e6bab97 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 25 Oct 2020 09:38:02 +0100 Subject: Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075. --- doc/stdenv/stdenv.xml | 7 +- .../graphics/graphicsmagick/default.nix | 6 +- pkgs/applications/misc/klayout/default.nix | 2 +- pkgs/applications/science/logic/z3/default.nix | 3 +- .../git-and-tools/git/default.nix | 4 +- pkgs/build-support/install-shell-files/default.nix | 12 +- .../setup-hooks/install-shell-files.sh | 125 +-- pkgs/data/misc/tzdata/default.nix | 6 +- pkgs/development/compilers/dmd/binary.nix | 3 +- pkgs/development/compilers/gcc/builder.sh | 7 +- pkgs/development/compilers/ldc/binary.nix | 3 +- .../compilers/llvm/10/clang/default.nix | 6 +- .../compilers/llvm/10/libc++/default.nix | 5 +- .../compilers/llvm/11/clang/default.nix | 6 +- .../development/compilers/llvm/5/clang/default.nix | 6 +- .../compilers/llvm/5/libc++/default.nix | 6 +- .../development/compilers/llvm/6/clang/default.nix | 6 +- .../compilers/llvm/6/libc++/default.nix | 6 +- .../development/compilers/llvm/7/clang/default.nix | 6 +- .../compilers/llvm/7/libc++/default.nix | 7 +- .../development/compilers/llvm/8/clang/default.nix | 6 +- .../compilers/llvm/8/libc++/default.nix | 5 +- .../development/compilers/llvm/9/clang/default.nix | 6 +- .../compilers/llvm/9/libc++/default.nix | 5 +- .../compilers/purescript/psc-package/default.nix | 10 +- pkgs/development/compilers/rust/1_46.nix | 45 + pkgs/development/compilers/rust/1_47.nix | 45 - pkgs/development/compilers/rust/binary.nix | 12 +- .../interpreters/ruby/rubygems/default.nix | 4 +- pkgs/development/libraries/atk/default.nix | 5 +- pkgs/development/libraries/boost/generic.nix | 4 +- pkgs/development/libraries/cyrus-sasl/default.nix | 3 +- pkgs/development/libraries/enchant/2.x.nix | 4 +- pkgs/development/libraries/expat/default.nix | 12 +- pkgs/development/libraries/freetype/default.nix | 4 +- .../gamin/abstract-socket-namespace.patch | 73 -- pkgs/development/libraries/gamin/default.nix | 10 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 +- pkgs/development/libraries/glfw/3.x.nix | 5 +- pkgs/development/libraries/harfbuzz/default.nix | 4 +- pkgs/development/libraries/icu/base.nix | 2 +- pkgs/development/libraries/jbig2dec/default.nix | 6 +- pkgs/development/libraries/json-glib/default.nix | 4 +- pkgs/development/libraries/leveldb/default.nix | 2 +- pkgs/development/libraries/libLAS/default.nix | 4 +- pkgs/development/libraries/libcbor/default.nix | 10 +- pkgs/development/libraries/libevent/default.nix | 5 +- pkgs/development/libraries/libinput/default.nix | 17 +- pkgs/development/libraries/libraw/default.nix | 22 +- ...CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch | 211 ++++ pkgs/development/libraries/libvpx/default.nix | 22 +- pkgs/development/libraries/libwebp/default.nix | 15 +- pkgs/development/libraries/mesa/default.nix | 7 +- ...ache-include-dri-driver-path-in-cache-key.patch | 29 +- .../mesa/link-radv-with-ld_args_build_id.patch | 25 + .../libraries/mesa/missing-includes.patch | 12 + pkgs/development/libraries/nss/3.44.nix | 6 +- pkgs/development/libraries/nss/default.nix | 5 +- pkgs/development/libraries/odpic/default.nix | 2 +- pkgs/development/libraries/openssl/default.nix | 4 +- pkgs/development/libraries/p11-kit/default.nix | 7 - pkgs/development/libraries/tiledb/default.nix | 4 +- pkgs/development/libraries/zeromq/4.x.nix | 10 +- pkgs/development/python-modules/arrow/default.nix | 4 +- .../development/python-modules/pycairo/default.nix | 24 +- .../tools/build-managers/cmake/default.nix | 19 +- .../boost-Do-not-add-system-paths-on-nix.patch | 40 - .../tools/build-managers/meson/default.nix | 5 - pkgs/development/tools/misc/ycmd/default.nix | 5 +- ...ug-702364-Fix-missing-echogs-dependencies.patch | 835 ++++++++++++++ pkgs/misc/ghostscript/default.nix | 24 +- pkgs/misc/sndio/default.nix | 4 +- pkgs/os-specific/linux/apparmor/default.nix | 13 +- pkgs/os-specific/linux/iproute/default.nix | 8 +- pkgs/os-specific/linux/libcap/default.nix | 5 +- pkgs/os-specific/linux/systemd/default.nix | 106 +- pkgs/servers/sql/mariadb/default.nix | 5 +- pkgs/servers/x11/xorg/default.nix | 36 +- pkgs/servers/x11/xorg/overrides.nix | 7 + pkgs/servers/x11/xorg/tarballs.list | 12 +- pkgs/shells/bash/bash-completion/default.nix | 4 +- pkgs/stdenv/darwin/default.nix | 5 +- pkgs/test/default.nix | 2 - pkgs/test/install-shell-files/default.nix | 125 --- pkgs/tools/compression/brotli/default.nix | 13 +- .../avoid-false-positive-in-date-debug-test.patch | 52 + .../coreutils/coreutils-8.31-android-cross.patch | 51 + .../misc/coreutils/coreutils-8.31-musl-cross.patch | 1153 ++++++++++++++++++++ pkgs/tools/misc/coreutils/default.nix | 13 +- pkgs/tools/networking/curl/default.nix | 4 +- pkgs/tools/networking/unbound/default.nix | 4 +- pkgs/tools/security/sudolikeaboss/default.nix | 5 +- pkgs/top-level/all-packages.nix | 37 +- pkgs/top-level/python-packages.nix | 2 +- 94 files changed, 2732 insertions(+), 819 deletions(-) create mode 100644 pkgs/development/compilers/rust/1_46.nix delete mode 100644 pkgs/development/compilers/rust/1_47.nix delete mode 100644 pkgs/development/libraries/gamin/abstract-socket-namespace.patch create mode 100644 pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch create mode 100644 pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch delete mode 100644 pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch create mode 100644 pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch delete mode 100644 pkgs/test/install-shell-files/default.nix create mode 100644 pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch create mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch create mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch (limited to 'pkgs/test') diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 46ee97927ea..4c069b57edd 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -2070,7 +2070,7 @@ nativeBuildInputs = [ breakpointHook ]; The installManPage function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with .gz suffix). This function will place them into the correct directory. - The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. A root name may be provided for all paths using the flag --cmd NAME; this synthesizes the appropriate name depending on the shell (e.g. --cmd foo will synthesize the name foo.bash for bash and _foo for zsh). The path may also be a fifo or named fd (such as produced by <(cmd)), in which case the shell and name must be provided. + The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -2081,11 +2081,6 @@ postInstall = '' installShellCompletion --zsh --name _foobar share/completions.zsh # implicit behavior installShellCompletion share/completions/foobar.{bash,fish,zsh} - # using named fd - installShellCompletion --cmd foobar \ - --bash <($out/bin/foobar --bash-completion) \ - --fish <($out/bin/foobar --fish-completion) \ - --zsh <($out/bin/foobar --zsh-completion) ''; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index b8b21e71c93..b7a1a8c4a6f 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 zlib libtool libwebp - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - nativeBuildInputs = [ xz ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ xz ]; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0a8d7ce547f..5f6c679f3ba 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch , python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper +, which, perl, makeWrapper, fixDarwinDylibNames }: mkDerivation rec { diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index dd71cf2cb1a..88aafcdae22 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; }; - nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ python ] + buildInputs = [ python fixDarwinDylibNames ] ++ optional javaBindings jdk ++ optionals ocamlBindings [ ocaml findlib zarith ] ; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index c54a9160f6d..7e40366142a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -22,7 +22,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.29.1"; + version = "2.28.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1cxd2h0k6bhv25avnk40h0pahgc7vgs37dc6kmln3pfhjyb6019h"; + sha256 = "17a311vzimqn1glc9d7x82rhb1mb81m5rr4g8xji8idaafid39fz"; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix index d50661ddc65..e1f2e24dd87 100644 --- a/pkgs/build-support/install-shell-files/default.nix +++ b/pkgs/build-support/install-shell-files/default.nix @@ -1,12 +1,4 @@ -{ makeSetupHook, tests }: +{ makeSetupHook }: # See the header comment in ../setup-hooks/install-shell-files.sh for example usage. -let - setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh; -in - -setupHook.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or {}) // { - tests = tests.install-shell-files; - }; -}) +makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/setup-hooks/install-shell-files.sh index 194b408b105..e0ea1f7f30a 100644 --- a/pkgs/build-support/setup-hooks/install-shell-files.sh +++ b/pkgs/build-support/setup-hooks/install-shell-files.sh @@ -1,4 +1,4 @@ -# shellcheck shell=bash +#!/bin/bash # Setup hook for the `installShellFiles` package. # # Example usage in a derivation: @@ -19,8 +19,8 @@ # installManPage [...] # # Each argument is checked for its man section suffix and installed into the appropriate -# share/man/man/ directory. The function returns an error if any paths don't have the man -# section suffix (with optional .gz compression). +# share/man/ directory. The function returns an error if any paths don't have the man section +# suffix (with optional .gz compression). installManPage() { local path for path in "$@"; do @@ -49,7 +49,7 @@ installManPage() { done } -# installShellCompletion [--cmd ] ([--bash|--fish|--zsh] [--name ] )... +# installShellCompletion [--bash|--fish|--zsh] ([--name ] )... # # Each path is installed into the appropriate directory for shell completions for the given shell. # If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell. @@ -61,20 +61,9 @@ installManPage() { # If the shell completion needs to be renamed before installing the optional `--name ` flag # may be given. Any name provided with this flag only applies to the next path. # -# If all shell completions need to be renamed before installing the optional `--cmd ` flag -# may be given. This will synthesize a name for each file, unless overridden with an explicit -# `--name` flag. For example, `--cmd foobar` will synthesize the name `_foobar` for zsh and -# `foobar.bash` for bash. -# # For zsh completions, if the `--name` flag is not given, the path will be automatically renamed # such that `foobar.zsh` becomes `_foobar`. # -# A path may be a named fd, such as produced by the bash construct `<(cmd)`. When using a named fd, -# the shell type flag must be provided, and either the `--name` or `--cmd` flag must be provided. -# This might look something like: -# -# installShellCompletion --zsh --name _foobar <($out/bin/foobar --zsh-completion) -# # This command accepts multiple shell flags in conjunction with multiple paths if you wish to # install them all in one command: # @@ -87,16 +76,9 @@ installManPage() { # installShellCompletion --fish --name foobar.fish share/completions.fish # installShellCompletion --zsh --name _foobar share/completions.zsh # -# Or to use shell newline escaping to split a single invocation across multiple lines: -# -# installShellCompletion --cmd foobar \ -# --bash <($out/bin/foobar --bash-completion) \ -# --fish <($out/bin/foobar --fish-completion) \ -# --zsh <($out/bin/foobar --zsh-completion) -# # If any argument is `--` the remaining arguments will be treated as paths. installShellCompletion() { - local shell='' name='' cmdname='' retval=0 parseArgs=1 arg + local shell='' name='' retval=0 parseArgs=1 arg while { arg=$1; shift; }; do # Parse arguments if (( parseArgs )); then @@ -115,17 +97,6 @@ installShellCompletion() { # treat `--name=foo` the same as `--name foo` name=${arg#--name=} continue;; - --cmd) - cmdname=$1 - shift || { - echo 'installShellCompletion: error: --cmd flag expected an argument' >&2 - return 1 - } - continue;; - --cmd=*) - # treat `--cmd=foo` the same as `--cmd foo` - cmdname=${arg#--cmd=} - continue;; --?*) echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2 retval=2 @@ -139,67 +110,39 @@ installShellCompletion() { if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "installShellCompletion: installing $arg${name:+ as $name}" fi - # if we get here, this is a path or named pipe - # Identify shell and output name + # if we get here, this is a path + # Identify shell + local basename + basename=$(stripHash "$arg") local curShell=$shell - local outName='' - if [[ -z "$arg" ]]; then - echo "installShellCompletion: error: empty path is not allowed" >&2 - return 1 - elif [[ -p "$arg" ]]; then - # this is a named fd or fifo - if [[ -z "$curShell" ]]; then - echo "installShellCompletion: error: named pipe requires one of --bash, --fish, or --zsh" >&2 - return 1 - elif [[ -z "$name" && -z "$cmdname" ]]; then - echo "installShellCompletion: error: named pipe requires one of --cmd or --name" >&2 - return 1 - fi - else - # this is a path - local argbase - argbase=$(stripHash "$arg") - if [[ -z "$curShell" ]]; then - # auto-detect the shell - case "$argbase" in - ?*.bash) curShell=bash;; - ?*.fish) curShell=fish;; - ?*.zsh) curShell=zsh;; - *) - if [[ "$argbase" = _* && "$argbase" != *.* ]]; then - # probably zsh - echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 - curShell=zsh - else - echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 - retval=2 - continue - fi;; - esac - fi - outName=$argbase - fi - # Identify output path - if [[ -n "$name" ]]; then - outName=$name - elif [[ -n "$cmdname" ]]; then - case "$curShell" in - bash|fish) outName=$cmdname.$curShell;; - zsh) outName=_$cmdname;; + if [[ -z "$curShell" ]]; then + # auto-detect the shell + case "$basename" in + ?*.bash) curShell=bash;; + ?*.fish) curShell=fish;; + ?*.zsh) curShell=zsh;; *) - # Our list of shells is out of sync with the flags we accept or extensions we detect. - echo 'installShellCompletion: internal error' >&2 - return 1;; + if [[ "$basename" = _* && "$basename" != *.* ]]; then + # probably zsh + echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 + curShell=zsh + else + echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 + retval=2 + continue + fi;; esac fi - local sharePath + # Identify output path + local outName sharePath + outName=${name:-$basename} case "$curShell" in bash) sharePath=bash-completion/completions;; fish) sharePath=fish/vendor_completions.d;; zsh) sharePath=zsh/site-functions # only apply automatic renaming if we didn't have a manual rename - if [[ -z "$name" && -z "$cmdname" ]]; then + if test -z "$name"; then # convert a name like `foo.zsh` into `_foo` outName=${outName%.zsh} outName=_${outName#_} @@ -210,16 +153,8 @@ installShellCompletion() { return 1;; esac # Install file - local outDir="${!outputBin:?}/share/$sharePath" - local outPath="$outDir/$outName" - if [[ -p "$arg" ]]; then - # install handles named pipes on NixOS but not on macOS - mkdir -p "$outDir" \ - && cat "$arg" > "$outPath" - else - install -Dm644 -T "$arg" "$outPath" - fi || return - # Clear the per-path flags + install -Dm644 -T "$arg" "${!outputBin:?}/share/$sharePath/$outName" || return + # Clear the name, it only applies to one path name= done if [[ -n "$name" ]]; then diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index dc80580ff5e..367ee06390c 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2020c"; + version = "2019c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; + sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; + sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"; }) ]; diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index 2ff2b35060b..cd3a15889b2 100644 --- a/pkgs/development/compilers/dmd/binary.nix +++ b/pkgs/development/compilers/dmd/binary.nix @@ -17,8 +17,7 @@ in mkDerivation { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ autoPatchelfHook ] - ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc; installPhase = '' diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index e1c4768413f..2204744a4b5 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -287,12 +287,7 @@ postInstall() { done # Two identical man pages are shipped (moving and compressing is done later) - for i in "$out"/share/man/man1/*g++.1; do - if test -e "$i"; then - man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` - ln -sf "$man_prefix"gcc.1 "$i" - fi - done + ln -sf gcc.1 "$out"/share/man/man1/g++.1 } genericBuild diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index cbdb56efb17..56d40be8619 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -17,8 +17,7 @@ in mkDerivation { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ autoPatchelfHook ] - ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index fef7720d726..a3d6e7e402a 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 lld ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 95711903932..651f1887553 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -21,10 +21,9 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; - buildInputs = [ libcxxabi ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 2de5f65b4a1..4f5e20cfe77 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 lld ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index b5e7b54fa5b..cd7d952243c 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 9bebedbc044..f8185fc3ff4 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -25,11 +25,9 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; - buildInputs = [ libcxxabi ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index ec3effebfd7..8f6479fe2f4 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - buildInputs = [ libxml2 llvm ]; + buildInputs = [ libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 727a3226087..a922bcfaf0e 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -25,11 +25,9 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; - buildInputs = [ libcxxabi ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 969938681fe..905ec862ad7 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - buildInputs = [ libxml2 llvm lld ]; + buildInputs = [ libxml2 llvm lld ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 76baadf1c6e..83c05cf0e63 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -24,12 +24,9 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; - nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ libcxxabi ] ; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 5c1dca5e33b..2d7fc806890 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - buildInputs = [ libxml2 llvm lld ]; + buildInputs = [ libxml2 llvm lld ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 01e0d8e008c..9c0c7951c79 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -25,10 +25,9 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; - buildInputs = [ libcxxabi ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index cfaee05944c..81117e904d8 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - buildInputs = [ libxml2 llvm lld ]; + buildInputs = [ libxml2 llvm lld ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index c9f0e6254ab..cec6de61ca9 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -21,10 +21,9 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; - buildInputs = [ libcxxabi ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 88f7adce5a1..0bebd5d2f50 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -44,10 +44,12 @@ stdenv.mkDerivation rec { '' + '' chmod u-w $PSC_PACKAGE - installShellCompletion --cmd psc-package \ - --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \ - --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \ - --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE) + $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash + $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish + $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package + installShellCompletion \ + psc-package.{bash,fish} \ + --zsh _psc-package ''; meta = with lib; { diff --git a/pkgs/development/compilers/rust/1_46.nix b/pkgs/development/compilers/rust/1_46.nix new file mode 100644 index 00000000000..c999b346ee6 --- /dev/null +++ b/pkgs/development/compilers/rust/1_46.nix @@ -0,0 +1,45 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob//.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security +, llvmPackages +, pkgsBuildTarget, pkgsBuildBuild +, makeRustPlatform +} @ args: + +import ./default.nix { + rustcVersion = "1.46.0"; + rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.45.2"; + + # fetch hashes by running `print-hashes.sh 1.45.2` + bootstrapHashes = { + i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936"; + x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643"; + arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60"; + armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531"; + aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30"; + x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_46; + + rustcPatches = [ + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/1_47.nix b/pkgs/development/compilers/rust/1_47.nix deleted file mode 100644 index e5cbae193bf..00000000000 --- a/pkgs/development/compilers/rust/1_47.nix +++ /dev/null @@ -1,45 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# Check the version number in the src/llvm-project git submodule in: -# https://github.com/rust-lang/rust/blob//.gitmodules -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages -, pkgsBuildTarget, pkgsBuildBuild -, makeRustPlatform -} @ args: - -import ./default.nix { - rustcVersion = "1.47.0"; - rustcSha256 = "sha256-MYXfBkxHR/LIubuMRGjt1Y/0rW0HiAyHmsGxc7do2B0="; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.46.0"; - - # fetch hashes by running `print-hashes.sh 1.45.2` - bootstrapHashes = { - i686-unknown-linux-gnu = "6ebd7e04dc18a36d08b9731cdb42d5caf8460e1eb41b75f3a8596c39f5e71206"; - x86_64-unknown-linux-gnu = "e3b98bc3440fe92817881933f9564389eccb396f5f431f33d48b979fa2fbdcf5"; - arm-unknown-linux-gnueabihf = "bb8af68565321f54608e918597083eb016ed0f9f4f3cc23f7cc5f467b934ce7f"; - armv7-unknown-linux-gnueabihf = "7c0640879d7f2c38db60352e3c0f09e3fc6fa3bac6ca8f22cbccb1eb5e950121"; - aarch64-unknown-linux-gnu = "f0c6d630f3dedb3db69d69ed9f833aa6b472363096f5164f1068c7001ca42aeb"; - x86_64-apple-darwin = "82d61582a3772932432a99789c3b3bd4abe6baca339e355048ca9efb9ea5b4db"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_47; - - rustcPatches = [ - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index b84e390e0b0..9ae7e51e5fe 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, bash, curl, darwin, zlib +{ stdenv, makeWrapper, bash, curl, darwin , version , src , platform @@ -42,23 +42,17 @@ rec { ./install.sh --prefix=$out \ --components=${installComponents} - ${optionalString (stdenv.isLinux && bootstrapping) ('' + ${optionalString (stdenv.isLinux && bootstrapping) '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" - '' + optionalString (stdenv.lib.versionAtLeast version "1.46") - # rustc bootstrap needs libz starting from 1.46 - '' - ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1 - ln -s ${zlib}/lib/libz.so $out/lib/libz.so - '' + '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/cargo" - '')} + ''} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 8263a987d63..0bbcadba3f5 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rubygems"; - version = "3.1.3"; + version = "3.1.2"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "181wjclxnq5lrwnr53famy9pg8911hi9w2v0vy7dqgjqnc4iy1hp"; + sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd"; }; patches = [ diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index aa132515b3e..b54ba531301 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; propagatedBuildInputs = [ # Required by atk.pc diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index a195a2c7bb9..8295be238fc 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -146,11 +146,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ which ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu + ++ optional stdenv.isDarwin fixDarwinDylibNames ++ optional enablePython python ++ optional enableNumpy python.pkgs.numpy; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index cd3fa3bb7fd..1ffb5359992 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "devdoc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ]; buildInputs = [ openssl db gettext kerberos ] ++ lib.optional enableLdap openldap diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index cbc3f217326..b7b86de92c0 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.12"; + version = "2.2.11"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb"; + sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 29d2c2b3acb..a356d7be1a9 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -let - version = "2.2.10"; -in stdenv.mkDerivation rec { - name = "expat-${version}"; +stdenv.mkDerivation rec { + name = "expat-2.2.8"; src = fetchurl { - url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz"; - sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI="; + url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz"; + sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b87e64c2afb..24757af09e3 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "freetype"; - version = "2.10.4"; + version = "2.10.2"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"; + sha256 = "12rd181yzz6952cyjqaa4253f5szam93cmhw18p33rnj4l8dchqm"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch deleted file mode 100644 index ff161055972..00000000000 --- a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001 -From: Christian Kampka -Date: Tue, 1 Sep 2020 13:54:35 +0200 -Subject: [PATCH] Pin abstract namespace sockets to host_os - -Running programs with AC_RUN_IFELSE fails when cross-compiling. -Since abstract namespace sockets are linux feature, we can easily -assume it is available for linux and not for darwin. ---- - configure.in | 47 ++++++----------------------------------------- - 1 file changed, 6 insertions(+), 41 deletions(-) - -diff --git a/configure.in b/configure.in -index eb129db..0ed82ba 100644 ---- a/configure.in -+++ b/configure.in -@@ -387,47 +387,12 @@ fi - - #### Abstract sockets - --AC_MSG_CHECKING(abstract socket namespace) --AC_LANG_PUSH(C) --AC_RUN_IFELSE([AC_LANG_PROGRAM( --[[ --#include --#include --#include --#include --#include --#include --#include --]], --[[ -- int listen_fd; -- struct sockaddr_un addr; -- -- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -- -- if (listen_fd < 0) -- { -- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- memset (&addr, '\0', sizeof (addr)); -- addr.sun_family = AF_UNIX; -- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); -- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -- -- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -- { -- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -- strerror (errno)); -- exit (1); -- } -- else -- exit (0); --]])], -- [have_abstract_sockets=yes], -- [have_abstract_sockets=no]) --AC_LANG_POP(C) -+AC_MSG_CHECKING([whether target os has abstract socket namespace]) -+if test x$target_os = xlinux-gnu ; then -+ have_abstract_sockets=yes -+else -+ have_abstract_sockets=no -+fi - AC_MSG_RESULT($have_abstract_sockets) - - if test x$enable_abstract_sockets = xyes; then --- -2.25.4 - diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 89096c88745..38451571d8b 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }: -let - cross = stdenv.hostPlatform != stdenv.buildPlatform; -in stdenv.mkDerivation (rec { +stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { @@ -10,7 +8,7 @@ in stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib ]; @@ -29,7 +27,7 @@ in stdenv.mkDerivation (rec { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ; + }); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 9b2fd0b778b..1f4bc5c12ad 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -61,7 +61,9 @@ stdenv.mkDerivation rec { gobject-introspection makeWrapper glib - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ stdenv.lib.optional stdenv.isDarwin [ + fixDarwinDylibNames + ]; propagatedBuildInputs = [ glib diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index fbc1cb818ca..1b9fcb9586b 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -18,11 +18,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libGL ]; - nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ]; buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 6c5703f521d..8110f13d14c 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.7.2"; + version = "2.7.1"; inherit (stdenv.lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm"; + sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs"; }; postPatch = '' diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index d8e9bd16ab8..81f75ad526a 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -57,7 +57,7 @@ let # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 4004c9f387e..a6eb5642395 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.19"; + version = "0.18"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; - sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz"; + sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy"; }; postPatch = '' diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index f89d4bc4534..4ae4a71091e 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 14d426701ba..33eca603c26 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; buildPhase = '' make all diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 27db14e7166..95569c0a813 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index ae5154eac03..9b6a54d92f9 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcbor"; - version = "0.8.0"; + version = "unstable-2019-07-25"; src = fetchFromGitHub { owner = "PJK"; repo = pname; - rev = "v${version}"; - sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7"; + rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6"; + sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1"; }; nativeBuildInputs = [ cmake ]; @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + NIX_CFLAGS_COMPILE = "-fno-lto"; meta = with stdenv.lib; { description = "CBOR protocol implementation for C and others"; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index cbde3206717..e23c7d55c5e 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -23,13 +23,10 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional sslSupport "openssl" ; - nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ; - buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; doCheck = false; # needs the net diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 3a651087510..576a2fec921 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja +{ stdenv, fetchurl, pkgconfig, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -27,14 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.16.2"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = pname; - repo = pname; - rev = version; - sha256 = "0qii6yh3dlhgv9z970cpzbz19ii8zjvq4k7pg75sy2gmia7smwd1"; + version = "1.16.1"; + + src = fetchurl { + url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; + sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk="; }; outputs = [ "bin" "out" "dev" ]; @@ -83,7 +80,7 @@ stdenv.mkDerivation rec { meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; + homepage = "http://www.freedesktop.org/wiki/Software/libinput"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index f59f63c38ac..b190d36acb5 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,29 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }: +{ stdenv, fetchurl, lcms2, pkgconfig }: stdenv.mkDerivation rec { pname = "libraw"; - version = "0.20.2"; + version = "0.20.0"; - src = fetchFromGitHub { - owner = "LibRaw"; - repo = "LibRaw"; - rev = version; - sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; + src = fetchurl { + url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; + sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"; }; outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch b/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch new file mode 100644 index 00000000000..552c4e08d5f --- /dev/null +++ b/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch @@ -0,0 +1,211 @@ +Backports of + +From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001 +From: kyslov +Date: Fri, 4 Jan 2019 17:04:09 -0800 +Subject: [PATCH] Fix OOB memory access on fuzzed data + +From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Tue, 24 Jul 2018 21:36:50 -0700 +Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal + +From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Tue, 11 Dec 2018 18:06:20 -0800 +Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf + +From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Tue, 9 Apr 2019 18:37:44 -0700 +Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10 + +From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 +From: Jerome Jiang +Date: Wed, 23 May 2018 15:43:00 -0700 +Subject: [PATCH] VP8: Fix use-after-free in postproc. + +to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433 + +--- libvpx-1.7.0.orig/test/decode_api_test.cc ++++ libvpx-1.7.0/test/decode_api_test.cc +@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) { + EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); + } + +-TEST(DecodeAPI, Vp9PeekSI) { ++void TestPeekInfo(const uint8_t *const data, uint32_t data_sz, ++ uint32_t peek_size) { + const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo; ++ // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get ++ // to decoder_peek_si_internal on frames of size < 8. ++ if (data_sz >= 8) { ++ vpx_codec_ctx_t dec; ++ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); ++ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM ++ : VPX_CODEC_CORRUPT_FRAME, ++ vpx_codec_decode(&dec, data, data_sz, NULL, 0)); ++ vpx_codec_iter_t iter = NULL; ++ EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); ++ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); ++ } ++ ++ // Verify behavior of vpx_codec_peek_stream_info. ++ vpx_codec_stream_info_t si; ++ si.sz = sizeof(si); ++ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, ++ vpx_codec_peek_stream_info(codec, data, data_sz, &si)); ++} ++ ++TEST(DecodeAPI, Vp9PeekStreamInfo) { + // The first 9 bytes are valid and the rest of the bytes are made up. Until + // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it + // should return VPX_CODEC_CORRUPT_FRAME. +@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) { + }; + + for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) { +- // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get +- // to decoder_peek_si_internal on frames of size < 8. +- if (data_sz >= 8) { +- vpx_codec_ctx_t dec; +- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); +- EXPECT_EQ( +- (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME, +- vpx_codec_decode(&dec, data, data_sz, NULL, 0)); +- vpx_codec_iter_t iter = NULL; +- EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); +- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); +- } +- +- // Verify behavior of vpx_codec_peek_stream_info. +- vpx_codec_stream_info_t si; +- si.sz = sizeof(si); +- EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, +- vpx_codec_peek_stream_info(codec, data, data_sz, &si)); ++ TestPeekInfo(data, data_sz, 10); ++ } ++} ++ ++TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) { ++ // This profile 1 header requires 10.25 bytes, ensure ++ // vpx_codec_peek_stream_info doesn't over read. ++ const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53, ++ 0xe9, 0x30, 0x68, 0x53, 0x04 }; ++ ++ for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) { ++ TestPeekInfo(profile1_data, data_sz, 11); + } + } + #endif // CONFIG_VP9_DECODER +--- libvpx-1.7.0.orig/third_party/libwebm/mkvparser/mkvparser.cc ++++ libvpx-1.7.0/third_party/libwebm/mkvparser/mkvparser.cc +@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment + + const long long stop = pos + s.size; + +- Colour* colour = NULL; +- Projection* projection = NULL; ++ std::unique_ptr colour_ptr; ++ std::unique_ptr projection_ptr; + + while (pos < stop) { + long long id, size; +@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment + if (rate <= 0) + return E_FILE_FORMAT_INVALID; + } else if (id == libwebm::kMkvColour) { +- if (!Colour::Parse(pReader, pos, size, &colour)) ++ Colour* colour = NULL; ++ if (!Colour::Parse(pReader, pos, size, &colour)) { + return E_FILE_FORMAT_INVALID; ++ } else { ++ colour_ptr.reset(colour); ++ } + } else if (id == libwebm::kMkvProjection) { +- if (!Projection::Parse(pReader, pos, size, &projection)) ++ Projection* projection = NULL; ++ if (!Projection::Parse(pReader, pos, size, &projection)) { + return E_FILE_FORMAT_INVALID; ++ } else { ++ projection_ptr.reset(projection); ++ } + } + + pos += size; // consume payload +@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment + pTrack->m_display_unit = display_unit; + pTrack->m_stereo_mode = stereo_mode; + pTrack->m_rate = rate; +- pTrack->m_colour = colour; +- pTrack->m_projection = projection; ++ pTrack->m_colour = colour_ptr.release(); ++ pTrack->m_projection = projection_ptr.release(); + + pResult = pTrack; + return 0; // success +--- libvpx-1.7.0.orig/vp8/common/postproc.c ++++ libvpx-1.7.0/vp8/common/postproc.c +@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BU + double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; + int ppl = (int)(level + .5); + +- const MODE_INFO *mode_info_context = cm->show_frame_mi; ++ const MODE_INFO *mode_info_context = cm->mi; + int mbr, mbc; + + /* The pixel thresholds are adjusted according to if or not the macroblock +--- libvpx-1.7.0.orig/vp8/decoder/dboolhuff.h ++++ libvpx-1.7.0/vp8/decoder/dboolhuff.h +@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODE + } + + { +- register int shift = vp8_norm[range]; ++ const unsigned char shift = vp8_norm[(unsigned char)range]; + range <<= shift; + value <<= shift; + count -= shift; +--- libvpx-1.7.0.orig/vp9/vp9_dx_iface.c ++++ libvpx-1.7.0/vp9/vp9_dx_iface.c +@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_i + const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si, + int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) { + int intra_only_flag = 0; +- uint8_t clear_buffer[10]; ++ uint8_t clear_buffer[11]; + + if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM; + +@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_i + if (profile > PROFILE_0) { + if (!parse_bitdepth_colorspace_sampling(profile, &rb)) + return VPX_CODEC_UNSUP_BITSTREAM; ++ // The colorspace info may cause vp9_read_frame_size() to need 11 ++ // bytes. ++ if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM; + } + rb.bit_offset += REF_FRAMES; // refresh_frame_flags + vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h); +--- libvpx-1.7.0.orig/vpx_dsp/bitreader.h ++++ libvpx-1.7.0/vpx_dsp/bitreader.h +@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r + } + + { +- register int shift = vpx_norm[range]; ++ const unsigned char shift = vpx_norm[(unsigned char)range]; + range <<= shift; + value <<= shift; + count -= shift; +--- libvpx-1.7.0.orig/vpx_dsp/bitreader_buffer.c ++++ libvpx-1.7.0/vpx_dsp/bitreader_buffer.c +@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_ + rb->bit_offset = off + 1; + return bit; + } else { +- rb->error_handler(rb->error_handler_data); ++ if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data); + return 0; + } + } diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 83e60466c14..007df403ff7 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -56,16 +56,20 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.9.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "webmproject"; - repo = pname; + repo = "libvpx"; rev = "v${version}"; - sha256 = "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry"; + sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6"; }; - postPatch = "patchShebangs ."; + patches = [ + ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch + ]; + + postPatch = ''patchShebangs .''; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -131,12 +135,6 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" - "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 @@ -161,10 +159,6 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optionals unitTestsSupport [ coreutils curl ]; - NIX_LDFLAGS = [ - "-lpthread" # fixes linker errors - ]; - enableParallelBuilding = true; postInstall = ''moveToOutput bin "$bin" ''; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 6d24ba7f2ed..d2a98c4a847 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool +{ stdenv, fetchurl , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format @@ -27,17 +27,13 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.1.0"; + version = "1.0.3"; - src = fetchFromGitHub { - owner = "webmproject"; - repo = pname; - rev = version; - sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm"; + src = fetchurl { + url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; + sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; }; - prePatch = "patchShebangs ."; - configureFlags = [ (mkFlag threadingSupport "threading") (mkFlag openglSupport "gl") @@ -54,7 +50,6 @@ stdenv.mkDerivation rec { (mkFlag libwebpdecoderSupport "libwebpdecoder") ]; - nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] ++ optionals openglSupport [ freeglut libGL libGLU ] ++ optional pngSupport libpng diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aa180b94d74..aeeb0514fab 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] -, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] +, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light , enableGalliumNine ? stdenv.isLinux @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.2.1"; + version = "20.1.9"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i"; + sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj"; }; prePatch = "patchShebangs ."; @@ -58,6 +58,7 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch + ./link-radv-with-ld_args_build_id.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Fix `-Werror=int-conversion` pthread warnings on musl. diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index fa78f4ae730..acf3d827c56 100644 --- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 980164fd92f5c2302624cd046d30ff21e6e4ba8a Mon Sep 17 00:00:00 2001 +From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index 2d39d13b6ad..daf06480a60 100644 +index 1a2dd8ebd12..2ac741af5a6 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -368,6 +368,12 @@ option( +@@ -348,6 +348,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -26,13 +26,13 @@ index 2d39d13b6ad..daf06480a60 100644 + description : 'Mesa cache key.' +) option( - 'prefer-iris', + 'I-love-half-baked-turnips', type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index a92d621927a..3bd65c6890c 100644 +index d1f14736725..2ed328f292e 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -401,8 +401,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -43,7 +43,7 @@ index a92d621927a..3bd65c6890c 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -423,6 +425,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -52,23 +52,22 @@ index a92d621927a..3bd65c6890c 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index 0893f64793b..d46ce85a85f 100644 +index 9da29cc7390..5f549bb1d99 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -179,7 +179,12 @@ _libmesa_util = static_library( - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], +@@ -170,7 +170,12 @@ _libmesa_util = static_library( + include_directories : inc_common, dependencies : deps_for_libmesa_util, link_with: libmesa_format, -- c_args : [c_msvc_compat_args], +- c_args : [c_msvc_compat_args, c_vis_args], + c_args : [ -+ c_msvc_compat_args, ++ c_msvc_compat_args, c_vis_args, + '-DDISK_CACHE_KEY="@0@"'.format( + get_option('disk-cache-key') + ), + ], - gnu_symbol_visibility : 'hidden', build_by_default : false ) + -- -2.28.0 - +2.25.1 diff --git a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch new file mode 100644 index 00000000000..0a660332392 --- /dev/null +++ b/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch @@ -0,0 +1,25 @@ +From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 26 Jul 2020 17:29:49 -0300 +Subject: [PATCH] link radv with ld_args_build_id + +This is needed for radv_device_get_cache_uuid to work correctly. +--- + src/amd/vulkan/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build +index eec026e8f60..a07a0821938 100644 +--- a/src/amd/vulkan/meson.build ++++ b/src/amd/vulkan/meson.build +@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library( + ], + c_args : [c_vis_args, no_override_init_args, radv_flags], + cpp_args : [cpp_vis_args, radv_flags], +- link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], ++ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], + link_depends : [libvulkan_radeon_link_depends,], + install : true, + ) +-- +2.28.0 diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index 72488893c6b..9685a1619a5 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,6 +9,18 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" +--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 ++++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 +@@ -23,7 +23,9 @@ + */ + + #if defined(__linux__) ++#include + #include ++#include + #include + #include + #else --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ diff --git a/pkgs/development/libraries/nss/3.44.nix b/pkgs/development/libraries/nss/3.44.nix index 1c89dd79331..ad58bfccaee 100644 --- a/pkgs/development/libraries/nss/3.44.nix +++ b/pkgs/development/libraries/nss/3.44.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ perl ]; - buildInputs = [ zlib sqlite ]; + buildInputs = [ zlib sqlite ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 395617aa7bc..e9ca475802d 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -20,9 +20,10 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; + ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; - buildInputs = [ zlib sqlite ]; + buildInputs = [ zlib sqlite ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 7f27f7d1c17..6c3744493d2 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ oracle-instantclient ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c4a9a4a0180..1fc38dd8aaa 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -160,8 +160,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1h"; - sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; + version = "1.1.1g"; + sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 31a7e7e9086..46f520e41e4 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -36,13 +36,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Tests run in fakeroot for non-root users - preCheck = '' - if [ "$(id -u)" != "0" ]; then - export FAKED_MODE=1 - fi - ''; - doCheck = !stdenv.isDarwin; installFlags = [ diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 89318dd4e75..2726ed7f237 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cmake python doxygen - ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ]; checkInputs = [ gtest @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { openssl boost libpqxx - ]; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; # emulate the process of pulling catch down postPatch = '' diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index d5819ff7ee9..8302ebbd1e8 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium -, enableDrafts ? false }: +{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.3"; + version = "4.3.2"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd"; + sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9"; }; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; - buildInputs = [ libsodium ]; + nativeBuildInputs = [ cmake asciidoc ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 7dbe3b98fca..bc3de37526a 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.17.0"; + version = "0.15.8"; src = fetchPypi { inherit pname version; - sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; + sha256 = "edc31dc051db12c95da9bac0271cd1027b8e36912daf6d4580af53b23e62721a"; }; propagatedBuildInputs = [ python-dateutil ] diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 24e0f9792d7..d61279e38d5 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,13 +1,4 @@ -{ lib -, fetchFromGitHub -, meson -, ninja -, buildPythonPackage -, pytestCheckHook -, pkg-config -, cairo -, isPy3k -}: +{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: buildPythonPackage rec { pname = "pycairo"; @@ -25,25 +16,22 @@ buildPythonPackage rec { nativeBuildInputs = [ meson ninja - pkg-config + pkgconfig ]; buildInputs = [ cairo + xlibsWrapper ]; - checkInputs = [ - pytestCheckHook - ]; + checkInputs = [ pytest ]; - mesonFlags = [ - "-Dpython=${if isPy3k then "python3" else "python"}" - ]; + mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ]; meta = with lib; { description = "Python 2/3 bindings for cairo"; homepage = "https://pycairo.readthedocs.io/"; - license = with licenses; [ lgpl21Only mpl11 ]; + license = with licenses; [ lgpl2 mpl11 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 010f1d9c6c2..559a4c191b6 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -5,7 +5,6 @@ , ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) -, useOpenSSL ? !isBootstrap, openssl , useNcurses ? false, ncurses , useQt4 ? false, qt4 , withQt5 ? false, qtbase @@ -45,17 +44,15 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ setupHook pkgconfig ]; - - buildInputs = [] + buildInputs = + [ setupHook pkgconfig ] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] - ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses ++ lib.optional useQt4 qt4 ++ lib.optional withQt5 qtbase; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = lib.optional stdenv.isDarwin ps; preConfigure = '' @@ -94,15 +91,13 @@ stdenv.mkDerivation rec { "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - - "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" + ] # Avoid depending on frameworks. - "-DBUILD_CursesDialog=${if useNcurses then "ON" else "OFF"}" - ]; + ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; # make install attempts to use the just-built cmake preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' - sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile + sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile ''; dontUseCmakeConfigure = true; diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch deleted file mode 100644 index 5b9020b3d54..00000000000 --- a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 536108b10271f2f42d41c7d9ddb4ce2ea1851f4f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= -Date: Sat, 17 Oct 2020 19:27:08 +0200 -Subject: [PATCH] boost: Do not add system paths on nix - ---- - mesonbuild/dependencies/boost.py | 17 +---------------- - 1 file changed, 1 insertion(+), 16 deletions(-) - -diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py -index 907c0c275..ecaf11b18 100644 ---- a/mesonbuild/dependencies/boost.py -+++ b/mesonbuild/dependencies/boost.py -@@ -643,22 +643,7 @@ class BoostDependency(ExternalDependency): - roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()] - else: - tmp = [] # type: T.List[Path] -- -- # Homebrew -- brew_boost = Path('/usr/local/Cellar/boost') -- if brew_boost.is_dir(): -- tmp += [x for x in brew_boost.iterdir()] -- -- # Add some default system paths -- tmp += [Path('/opt/local')] -- tmp += [Path('/usr/local/opt/boost')] -- tmp += [Path('/usr/local')] -- tmp += [Path('/usr')] -- -- # Cleanup paths -- tmp = [x for x in tmp if x.is_dir()] -- tmp = [x.resolve() for x in tmp] -- roots += tmp -+ # Do not add any non-explicit paths on nix - - return roots - --- -2.25.4 - diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 1b9c3ef6477..8421fb7d70a 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -52,11 +52,6 @@ python3.pkgs.buildPythonApplication rec { # cut-in-half-by-\0 store path references. # Let’s just clear the whole rpath and hope for the best. ./clear-old-rpath.patch - - # Patch out default boost search paths to avoid impure builds on - # unsandboxed non-NixOS builds, see: - # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 - ./boost-Do-not-add-system-paths-on-nix.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 4bbff3ca33f..02298d93b8a 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -18,10 +18,9 @@ stdenv.mkDerivation { sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; }; - nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ]; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch new file mode 100644 index 00000000000..dd31260302c --- /dev/null +++ b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch @@ -0,0 +1,835 @@ +--- a/contrib/contrib.mak 2020-03-19 09:21:42.000000000 +0100 ++++ b/contrib/contrib.mak 2020-05-14 13:41:03.202258445 +0200 +@@ -22,6 +22,10 @@ + CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) + CONTRIBSRC=$(CONTRIBDIR)$(D) + ++# Almost all device drivers depend on the following: ++CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h) ++CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH) ++ + ###### --------------------------- Catalog -------------------------- ###### + + # The following drivers are user-contributed, and maintained (if at all) by +@@ -185,19 +189,19 @@ + $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c + + $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcmono $(bjc_) + + $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcgray $(bjc_) + + $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccmyk $(bjc_) + + $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccolor $(bjc_) + + +@@ -208,25 +212,25 @@ + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 670 + $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch) + # Printer: HP 850 + $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 890 + $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 1600 + $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) + + $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ +@@ -244,7 +248,8 @@ + + # Author: Matthew Gelhaus (mgelhaus@proaxis.com) + # Printer: HP 880c +-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev ++$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \ ++ $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) + + +@@ -255,7 +260,7 @@ + # Author: Rene Harsch (rene@harsch.net) + # Printer: HP 970Cxi + $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) + + $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ +@@ -268,7 +273,7 @@ + ### NOTE: Same as chp2200 (some PJL and CRD changes). + + $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) + + +@@ -277,7 +282,7 @@ + ### NOTE: Depends on the presence of the cdj850 section. + + $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) + + +@@ -288,11 +293,11 @@ + GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) + + $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)gdi $(GDIMONO) + + $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)samsunggdi $(GDIMONO) + + $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ +@@ -306,17 +311,17 @@ + + hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) + $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1250 $(hl1250_) + + $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1240 $(hl1250_) + + # Author: Marek Michalkiewicz + # Printer: Brother HL-1250 (may work with some other models too) + $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c + + +@@ -327,37 +332,37 @@ + # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) + # Printer: DEC LN03 + $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ln03 $(ln03_) + + # Author: Nick Brown (nick.brown@coe.int) + # Printer: DEClaser 2100 + $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)dl2100 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA50 + $(DD)la50.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la50 $(ln03_) + + # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu) + # Printer: DEC LA70 + $(DD)la70.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la70 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA75 + $(DD)la75.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75 $(ln03_) + + # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de) + # Printer: DEC LA75plus + $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75plus $(ln03_) + + $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ +@@ -380,233 +385,233 @@ + $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c + + $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc1900 $(escv_) + + $(DD)alc2000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc2000 $(escv_) + + $(DD)alc4000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4000 $(escv_) + + $(DD)alc4100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4100 $(escv_) + + $(DD)alc8500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8500 $(escv_) + + $(DD)alc8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8600 $(escv_) + + $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc9100 $(escv_) + + $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp3000c $(escv_) + + $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8000c $(escv_) + + $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8200c $(escv_) + + $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300c $(escv_) + + $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8500c $(escv_) + + $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8800c $(escv_) + + $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9000c $(escv_) + + $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200c $(escv_) + + $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9500c $(escv_) + + $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9800c $(escv_) + + $(DD)lps6500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps6500 $(escv_) + + $(DD)epl2050.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050 $(escv_) + + $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050p $(escv_) + + $(DD)epl2120.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2120 $(escv_) + + $(DD)epl2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2500 $(escv_) + + $(DD)epl2750.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2750 $(escv_) + + $(DD)epl5800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5800 $(escv_) + + $(DD)epl5900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5900 $(escv_) + + $(DD)epl6100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6100 $(escv_) + + $(DD)epl6200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6200 $(escv_) + + $(DD)lp1800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1800 $(escv_) + + $(DD)lp1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1900 $(escv_) + + $(DD)lp2200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2200 $(escv_) + + $(DD)lp2400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2400 $(escv_) + + $(DD)lp2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2500 $(escv_) + + $(DD)lp7500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7500 $(escv_) + + $(DD)lp7700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7700 $(escv_) + + $(DD)lp7900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7900 $(escv_) + + $(DD)lp8100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8100 $(escv_) + + $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300f $(escv_) + + $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8400f $(escv_) + + $(DD)lp8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600 $(escv_) + + $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600f $(escv_) + + $(DD)lp8700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8700 $(escv_) + + $(DD)lp8900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8900 $(escv_) + + $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9000b $(escv_) + + $(DD)lp9100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9100 $(escv_) + + $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200b $(escv_) + + $(DD)lp9300.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9300 $(escv_) + + $(DD)lp9400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9400 $(escv_) + + $(DD)lp9600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600 $(escv_) + + $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600s $(escv_) + + $(DD)lps4500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps4500 $(escv_) + + $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplcolor $(escv_) + + $(DD)eplmono.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplmono $(escv_) + + # ------ The Lexmark 5700 and 7000 devices ------ # + + lex7000_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex7000 $(lex7000_) + + lex5700_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex5700 $(lex5700_) + + lex3200_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex3200 $(lex3200_) + + lex2050_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex2050 $(lex2050_) + + $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ +@@ -623,7 +628,7 @@ + $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c + + $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lxm3200 $(lxm3200_) + + +@@ -649,13 +654,13 @@ + $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c + + $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips4 $(lipsr_) + + lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ) + + $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)lips4v $(lipsv_) + $(ADDMOD) $(DD)lips4v -include $(GLD)vector + +@@ -668,11 +673,11 @@ + ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### + + $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips2p $(lipsr_) + + $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjc880j $(lipsr_) + + +@@ -681,15 +686,15 @@ + md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) + + $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md2k $(md2k_) + + $(DD)md5k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md5k $(md2k_) + + $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c + + +@@ -697,7 +702,7 @@ + + oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) + $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oki4w $(oki4w_) + + # Author: Ivan Schreter (ivan@shadow.sk) +@@ -720,11 +725,11 @@ + $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c + + $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)opvp $(opvp_) + + $(DD)oprp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oprp $(opvp_) + + +@@ -901,78 +906,78 @@ + + # The generic pcl3 device with selectable subdevices + $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pcl3 $(pcl3_) + + # Fixed devices for specific printers + $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjplus $(pcl3_) + $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjportable $(pcl3_) + $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj310 $(pcl3_) + $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj320 $(pcl3_) + $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj340 $(pcl3_) + $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj400 $(pcl3_) + $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500 $(pcl3_) + $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500c $(pcl3_) + $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj510 $(pcl3_) + $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj520 $(pcl3_) + $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj540 $(pcl3_) + $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj550c $(pcl3_) + $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj560c $(pcl3_) + $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj600 $(pcl3_) + $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj660c $(pcl3_) + $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj670c $(pcl3_) + $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj680c $(pcl3_) + $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj690c $(pcl3_) + $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj850c $(pcl3_) + $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj855c $(pcl3_) + $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj870c $(pcl3_) + $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj890c $(pcl3_) + $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj1120c $(pcl3_) + + #------------------------------------------------------------------------------ +@@ -1009,7 +1014,7 @@ + + xes_=$(DEVOBJ)gdevxes.$(OBJ) + $(DD)xes.dev : $(xes_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)xes $(xes_) + + # Author: Peter Flass (flass@lbdrscs.bitnet) +@@ -1029,16 +1034,16 @@ + + pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr201 $(pr201_) + +-$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr150 $(pr201_) + +-$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000 $(pr201_) + +-$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000_4 $(pr201_) + + $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ +@@ -1049,7 +1054,7 @@ + + jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)jj100 $(jj100_) + + $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ +@@ -1061,11 +1066,11 @@ + bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)bj10v.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10v $(bj10v_) + + $(DD)bj10vh.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10vh $(bj10v_) + + # Uncomment the following line if you are using MS-DOS on PC9801 series. +@@ -1080,7 +1085,7 @@ + dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)dmprt $(dmprt_) + $(ADDMOD) $(DD)dmprt -ps dmp_init + +@@ -1110,19 +1115,19 @@ + $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c + + $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj700v2c $(mj700v2c_) + + $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj500c $(mj700v2c_) + + $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj6000c $(mj700v2c_) + + $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj8000c $(mj700v2c_) + + ### ----------------- The Fujitsu FMPR printer device ----------------- ### +@@ -1130,7 +1135,7 @@ + fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmpr $(fmpr_) + + $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ +@@ -1142,7 +1147,7 @@ + fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmlbp $(fmlbp_) + + $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ +@@ -1159,7 +1164,7 @@ + ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ml600 $(ml6_) + + $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ +@@ -1172,11 +1177,11 @@ + lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) + + $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp310 $(lbp3x0_) + + $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp320 $(lbp3x0_) + + $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) +@@ -1191,7 +1196,7 @@ + $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c + + $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)npdl $(npdl_) + + ### ------- EPSON ESC/Page printer device ----------------- ### +@@ -1203,11 +1208,11 @@ + $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c + + $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)escpage $(escpage_) + + $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2000 $(escpage_) + + ### --- The RICOH RPDL language printer device ------ ### +@@ -1218,7 +1223,7 @@ + $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c + + $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)rpdl $(rpdl_) + + ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### +@@ -1240,15 +1245,15 @@ + alps_=$(DEVOBJ)gdevalps.$(OBJ) + + $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Mono $(alps_) + + $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Eco $(alps_) + + $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md1xMono $(alps_) + + $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 5a7762640f7..d3d06d98cb1 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf +{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs, lcms2, fetchpatch , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null @@ -9,6 +9,10 @@ assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let + version = "9.${ver_min}"; + ver_min = "52"; + sha512 = "1ksm3v4nw8acc4j817n44l1c65ijk0mr3mp4kryy17jz41bmzzql5d8vr40h59n9dmf8b2wmnbq45bj3an1zrpfagavlf0i9s436jjc"; + fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -33,27 +37,31 @@ let in stdenv.mkDerivation rec { pname = "ghostscript"; - version = "9.53.3"; + inherit version; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz"; - sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz"; + inherit sha512; }; patches = [ (fetchpatch { - url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch"; - sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w"; + name = "CVE-2020-15900.patch"; + url = "https://github.com/ArtifexSoftware/ghostpdl/commit/5d499272b95a6b890a1397e11d20937de000d31b.patch"; + sha256 = "1nnnrn8q33x7nc8227ygc60f3mj4bjzrhj40sxp6dah58rb5x5jz"; }) ./urw-font-files.patch ./doc-no-ref.diff + # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, + # Remove on update to version > 9.52 + ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch ]; outputs = [ "out" "man" "doc" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ zlib expat openssl libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec @@ -107,6 +115,8 @@ stdenv.mkDerivation rec { install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs ''; + passthru = { inherit version; }; + meta = { homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 34e60b8a4bb..46c505ed439 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "sndio"; version = "1.7.0"; enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 64fa92be865..0e10add5561 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "5"; + apparmor-patchver = "4"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,10 +27,19 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3"; + sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; + }; + + # See This and the + # accompanying application in prePatchCommon should be removed in 2.13.5 + gnumake43Patch = fetchpatch { + url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"; + name = "2-23-fix-build-with-make-4.3.patch"; + sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9"; }; prePatchCommon = '' + patch -p1 < ${gnumake43Patch} chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index b3de7ceedaa..a9fcf455ee4 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.9.0"; + version = "5.8.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2"; + sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # TODO: Drop temporary version fix for 5.9 once 5.10 is out: + # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out: substituteInPlace include/version.h \ - --replace "5.8.0" "${version}" + --replace "v5.7.0-77-gb687d1067169" "5.8.0" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 7931e35a844..174f1be99db 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libcap"; - version = "2.44"; + version = "2.27"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; + sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; }; outputs = [ "out" "dev" "lib" "man" "doc" "pam" ]; @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; - homepage = "https://sites.google.com/site/fullycapable"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index da99280f63b..cef9d96ae6e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,61 +1,27 @@ -{ stdenv, lib, fetchFromGitHub -, buildPackages -, ninja, meson, m4, pkgconfig, coreutils, gperf, getent -, patchelf, perl, glibcLocales, glib, substituteAll -, gettext, python3Packages - -# Mandatory dependencies -, libcap -, utillinux -, kbd -, kmod - -# Optional dependencies -, pam, cryptsetup, lvm2, audit, acl -, lz4, libgcrypt, libgpgerror, libidn2 -, curl, gnutar, gnupg, zlib -, xz, libuuid, libffi -, libapparmor, intltool -, bzip2, pcre2, e2fsprogs +{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap +, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi +, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor +, audit, lz4, bzip2, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders -, gnu-efi -, iptables +, iptables, gnu-efi, bashInteractive +, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 +, ninja, meson, python3Packages, glibcLocales +, patchelf +, substituteAll +, getent +, cryptsetup, lvm2 +, buildPackages +, perl , withSelinux ? false, libselinux , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools -, bashInteractive - -, withResolved ? true -, withLogind ? true -, withHostnamed ? true -, withLocaled ? true -, withNetworkd ? true -, withTimedated ? true -, withTimesyncd ? true -, withHwdb ? true -, withEfi ? stdenv.hostPlatform.isEfi -, withImportd ? true -, withCryptsetup ? true - -# name argument -, pname ? "systemd" - - -, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 }: -assert withResolved -> (libgcrypt != null && libgpgerror != null); -assert withImportd -> - ( curl.dev != null && zlib != null && xz != null && libgcrypt != null - && gnutar != null && gnupg != null); - -assert withCryptsetup -> - ( cryptsetup != null ); - let version = "246.6"; in stdenv.mkDerivation { - inherit version pname; + inherit version; + pname = "systemd"; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. @@ -105,17 +71,13 @@ in stdenv.mkDerivation { outputs = [ "out" "man" "dev" ]; nativeBuildInputs = - [ pkgconfig gperf + [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 ninja meson coreutils # meson calls date, stat etc. glibcLocales patchelf getent m4 perl # to patch the libsystemd.so and remove dependencies on aarch64 - intltool - gettext - - libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ])) ]; buildInputs = @@ -124,10 +86,9 @@ in stdenv.mkDerivation { pcre2 ] ++ stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ - [ libffi audit lz4 bzip2 libapparmor iptables ] ++ - stdenv.lib.optional withEfi gnu-efi ++ - stdenv.lib.optional withSelinux libselinux ++ - stdenv.lib.optional withCryptsetup cryptsetup.dev; + [ libffi audit lz4 bzip2 libapparmor + iptables gnu-efi + ] ++ stdenv.lib.optional withSelinux libselinux; #dontAddPrefix = true; @@ -145,23 +106,19 @@ in stdenv.mkDerivation { "-Ddebug-shell=${bashInteractive}/bin/bash" # while we do not run tests we should also not build them. Removes about 600 targets "-Dtests=false" - "-Dimportd=${stdenv.lib.boolToString withImportd}" + "-Dimportd=true" "-Dlz4=true" "-Dhomed=false" - "-Dlogind=${stdenv.lib.boolToString withLogind}" - "-Dlocaled=${stdenv.lib.boolToString withLocaled}" - "-Dhostnamed=${stdenv.lib.boolToString withHostnamed}" - "-Dnetworkd=${stdenv.lib.boolToString withNetworkd}" - "-Dcryptsetup=${stdenv.lib.boolToString withCryptsetup}" + "-Dhostnamed=true" + "-Dnetworkd=true" "-Dportabled=false" - "-Dhwdb=${stdenv.lib.boolToString withHwdb}" "-Dremote=false" "-Dsysusers=false" - "-Dtimedated=${stdenv.lib.boolToString withTimedated}" - "-Dtimesyncd=${stdenv.lib.boolToString withTimesyncd}" + "-Dtimedated=true" + "-Dtimesyncd=true" "-Dfirstboot=false" "-Dlocaled=true" - "-Dresolve=${stdenv.lib.boolToString withResolved}" + "-Dresolve=true" "-Dsplit-usr=false" "-Dlibcurl=true" "-Dlibidn=false" @@ -184,6 +141,11 @@ in stdenv.mkDerivation { "-Dsystem-gid-max=999" # "-Dtime-epoch=1" + (if !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + "-Defi-libdir=${toString gnu-efi}/lib" + "-Defi-includedir=${toString gnu-efi}/include/efi" + "-Defi-ldsdir=${toString gnu-efi}/lib" + "-Dsysvinit-path=" "-Dsysvrcnd-path=" @@ -199,12 +161,6 @@ in stdenv.mkDerivation { # Upstream defaulted to disable manpages since they optimize for the much # more frequent development builds "-Dman=true" - - "-Dgnu-efi=${stdenv.lib.boolToString (withEfi && gnu-efi != null)}" - ] ++ stdenv.lib.optionals (withEfi && gnu-efi != null) [ - "-Defi-libdir=${toString gnu-efi}/lib" - "-Defi-includedir=${toString gnu-efi}/include/efi" - "-Defi-ldsdir=${toString gnu-efi}/lib" ]; preConfigure = '' @@ -328,6 +284,6 @@ in stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ andir eelco flokli kloenk ]; + maintainers = with maintainers; [ andir eelco flokli ]; }; } diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3b86d8a7394..0b91e2d4fd2 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -34,13 +34,12 @@ common = rec { # attributes common to both builds name = "mariadb-${version}.tar.gz"; }; - nativeBuildInputs = [ cmake pkgconfig ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ ncurses openssl zlib pcre libiconv curl ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] - ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ] + ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ] ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 96f40649c0f..efc2cb2acbd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.6.12"; + name = "libX11-1.6.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2"; - sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"; + url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2"; + sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.12"; + name = "libXvMC-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; - sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; + url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2"; + sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; { }) {}; libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation { - name = "libxcb-1.14"; + name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; - sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; + url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2"; + sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python ]; @@ -1431,11 +1431,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { - name = "xcb-proto-1.14.1"; + name = "xcb-proto-1.13"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; - sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; + url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2"; + sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python ]; @@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-0.30.0"; + name = "xf86-input-libinput-0.28.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"; - sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2"; + sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { - name = "xorgproto-2020.1"; + name = "xorgproto-2019.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2"; - sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al"; + url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2"; + sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e6047458cf2..80ea5553ad6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -82,6 +82,13 @@ self: super: libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; + patches = [ + # Fixes an issue that happens when cross-compiling for us. + (fetchpatch { + url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac"; + sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza"; + }) + ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index cd294604884..ecc477980b8 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,5 +1,7 @@ https://invisible-mirror.net/archives/luit/luit-20190106.tgz https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 +https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 @@ -81,7 +83,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 @@ -175,11 +177,10 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 -mirror://xorg/individual/lib/libxcb-1.14.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2 @@ -205,13 +206,12 @@ mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 -mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 -mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz -mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2 +mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 5fda5704812..eeb175a5e78 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.11"; + version = "2.10"; src = fetchFromGitHub { owner = "scop"; repo = "bash-completion"; rev = version; - sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv"; + sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 58da8b71b65..a040e6ab242 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -190,7 +190,10 @@ in rec { stage1 = prevStage: let persistent = self: super: with prevStage; { - cmake = super.cmakeMinimal; + cmake = super.cmake.override { + isBootstrap = true; + useSharedLibraries = false; + }; python3 = super.python3Minimal; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index d9befb9350a..85142090dd4 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -27,8 +27,6 @@ with pkgs; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; - install-shell-files = callPackage ./install-shell-files {}; - kernel-config = callPackage ./kernel.nix {}; ld-library-path = callPackage ./ld-library-path {}; diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix deleted file mode 100644 index e3729c7d250..00000000000 --- a/pkgs/test/install-shell-files/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: - -let - runTest = name: env: buildCommand: - runCommandLocal "install-shell-files--${name}" ({ - nativeBuildInputs = [ installShellFiles ]; - meta.platforms = stdenv.lib.platforms.all; - } // env) buildCommand; -in - -recurseIntoAttrs { - # installManPage - - install-manpage = runTest "install-manpage" {} '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.2.gz - echo baz > doc/baz.3 - - installManPage doc/* - - cmp doc/foo.1 $out/share/man/man1/foo.1 - cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz - cmp doc/baz.3 $out/share/man/man3/baz.3 - ''; - install-manpage-outputs = runTest "install-manpage-outputs" { - outputs = [ "out" "man" "devman" ]; - } '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.3 - - installManPage doc/* - - # assert they didn't go into $out - [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] - - # foo.1 alone went into man - cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 - [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] - - # bar.3 alone went into devman - cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 - [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] - - touch $out - ''; - - # installShellCompletion - - install-completion = runTest "install-completion" {} '' - echo foo > foo - echo bar > bar - echo baz > baz - echo qux > qux.zsh - echo quux > quux - - installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux - - cmp foo $out/share/bash-completion/completions/foo - cmp bar $out/share/bash-completion/completions/bar - cmp baz $out/share/zsh/site-functions/_baz - cmp qux.zsh $out/share/zsh/site-functions/_qux - cmp quux $out/share/fish/vendor_completions.d/quux - ''; - install-completion-output = runTest "install-completion-output" { - outputs = [ "out" "bin" ]; - } '' - echo foo > foo - - installShellCompletion --bash foo - - # assert it didn't go into $out - [[ ! -f $out/share/bash-completion/completions/foo ]] - - cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo - - touch $out - ''; - install-completion-name = runTest "install-completion-name" {} '' - echo foo > foo - echo bar > bar - echo baz > baz - - installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz - - cmp foo $out/share/bash-completion/completions/foobar.bash - cmp bar $out/share/zsh/site-functions/_foobar - cmp baz $out/share/fish/vendor_completions.d/baz - ''; - install-completion-inference = runTest "install-completion-inference" {} '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - - installShellCompletion foo.bash bar.zsh baz.fish - - cmp foo.bash $out/share/bash-completion/completions/foo.bash - cmp bar.zsh $out/share/zsh/site-functions/_bar - cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish - ''; - install-completion-cmd = runTest "install-completion-cmd" {} '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - echo qux > qux.fish - - installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish - - cmp foo.bash $out/share/bash-completion/completions/foobar.bash - cmp bar.zsh $out/share/zsh/site-functions/_foobar - cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish - cmp qux.fish $out/share/fish/vendor_completions.d/qux - ''; - install-completion-fifo = runTest "install-completion-fifo" {} '' - installShellCompletion \ - --bash --name foo.bash <(echo foo) \ - --zsh --name _foo <(echo bar) \ - --fish --name foo.fish <(echo baz) - - [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } - [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } - [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } - ''; -} diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index fd4872cf844..bf20e0119ec 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "brotli"; - version = "1.0.9"; + version = "1.0.7"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; + sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; }; nativeBuildInputs = [ cmake ]; @@ -32,14 +32,7 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) - prePatch = '' - rm BUILD - - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; + prePatch = "rm BUILD"; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. diff --git a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch new file mode 100644 index 00000000000..ae1a02d4d20 --- /dev/null +++ b/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch @@ -0,0 +1,52 @@ +From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001 +From: Assaf Gordon +Date: Mon, 13 May 2019 16:37:40 -0600 +Subject: [PATCH] tests: avoid false-positive in date-debug test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When debugging an invalid date due to DST switching, the intermediate +'normalized time' should not be checked - its value can differ between +systems (e.g. glibc vs musl). + +Reported by Niklas Hambüchen in +https://lists.gnu.org/r/coreutils/2019-05/msg00031.html +Analyzed by Rich Felker in +https://lists.gnu.org/r/coreutils/2019-05/msg00039.html + +* tests/misc/date-debug.sh: Replace the exact normalized time +with 'XX:XX:XX' so different values would not trigger test failure. +--- + tests/misc/date-debug.sh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh +index aa47f1abb..2ce6f4ce8 100755 +--- a/tests/misc/date-debug.sh ++++ b/tests/misc/date-debug.sh +@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string + date: using specified time as starting value: '02:30:00' + date: error: invalid date/time value: + date: user provided time: '(Y-M-D) 2006-04-02 02:30:00' +-date: normalized time: '(Y-M-D) 2006-04-02 03:30:00' ++date: normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX' + date: -- + date: possible reasons: + date: non-existing due to daylight-saving time; +@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00' + EOF + + # date should return 1 (error) for invalid date +-returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1 ++returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1 ++ ++# The output line of "normalized time" can differ between systems ++# (e.g. glibc vs musl) and should not be checked. ++# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html ++sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \ ++ out2-t > out2 || framework_failure_ ++ + compare exp2 out2 || fail=1 + + ## diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch new file mode 100644 index 00000000000..97d95d1c5b1 --- /dev/null +++ b/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch @@ -0,0 +1,51 @@ +From 3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 11 Mar 2019 16:40:29 -0700 +Subject: [PATCH 1/1] strtod: fix clash with strtold + +Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817). +* lib/strtod.c (compute_minus_zero, minus_zero): +Simplify by remving the macro / external variable, +and having just a function. User changed. This avoids +the need for an external variable that might clash. +--- + ChangeLog | 9 +++++++++ + lib/strtod.c | 11 +++++------ + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/lib/strtod.c b/lib/strtod.c +index b9eaa51..69b1564 100644 +--- a/lib/strtod.c ++++ b/lib/strtod.c +@@ -294,16 +294,15 @@ parse_number (const char *nptr, + ICC 10.0 has a bug when optimizing the expression -zero. + The expression -MIN * MIN does not work when cross-compiling + to PowerPC on Mac OS X 10.5. */ +-#if defined __hpux || defined __sgi || defined __ICC + static DOUBLE +-compute_minus_zero (void) ++minus_zero (void) + { ++#if defined __hpux || defined __sgi || defined __ICC + return -MIN * MIN; +-} +-# define minus_zero compute_minus_zero () + #else +-DOUBLE minus_zero = -0.0; ++ return -0.0; + #endif ++} + + /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the + character after the last one used in the number is put in *ENDPTR. */ +@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr) + /* Special case -0.0, since at least ICC miscompiles negation. We + can't use copysign(), as that drags in -lm on some platforms. */ + if (!num && negative) +- return minus_zero; ++ return minus_zero (); + return negative ? -num : num; + } +-- +1.9.1 + diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch new file mode 100644 index 00000000000..02b0b85db31 --- /dev/null +++ b/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch @@ -0,0 +1,1153 @@ +From 453ff940449bbbde9ec00f0bbf82a359c5598fc7 Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sat, 23 Mar 2019 23:00:52 +0100 +Subject: [PATCH 1/1] Support cross-compilation to musl libc. + +Reported by Necktwi Ozfguah . + +* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Add cross-compilation guesses for +musl libc. +* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Likewise. +* m4/chown.m4 (gl_FUNC_CHOWN): Likewise. +* m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise. +* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise. +* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise. +* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise. +* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise. +* m4/getcwd-abort-bug.m4 (gl_FUNC_GETCWD_ABORT_BUG): Likewise. +* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise. +* m4/getgroups.m4 (AC_FUNC_GETGROUPS, gl_FUNC_GETGROUPS): Likewise. +* m4/getline.m4 (gl_FUNC_GETLINE): Likewise. +* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY_CLOBBER): Likewise. +* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise. // removed +* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise. // removed +* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise. // removed +* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise. // removed +* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise. +* m4/log.m4 (gl_FUNC_LOG): Likewise. // removed +* m4/logf.m4 (gl_FUNC_LOGF): Likewise. // removed +* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise. // removed +* m4/log10.m4 (gl_FUNC_LOG10): Likewise. // removed +* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise. // removed +* m4/log10l.m4 (gl_FUNC_LOG10L): Likewise. // removed +* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise. // removed +* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise. // removed +* m4/log1pl.m4 (gl_FUNC_LOG1PL): Likewise. // removed +* m4/log2.m4 (gl_FUNC_LOG2): Likewise. // removed +* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise. // removed +* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise. +* m4/mkdir.m4 (gl_FUNC_MKDIR): Likewise. +* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise. +* m4/modf.m4 (gl_FUNC_MODF): Likewise. // removed +* m4/modff.m4 (gl_FUNC_MODFF): Likewise. // removed +* m4/modfl.m4 (gl_FUNC_MODFL): Likewise. // removed +* m4/perror.m4 (gl_FUNC_PERROR): Likewise. +* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE, +gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A, +gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99, +gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N, +gl_VSNPRINTF_ZEROSIZE_C99): Likewise. +* m4/ptsname.m4 (gl_FUNC_PTSNAME): Likewise. // removed +* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise. +* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise. +* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise. // removed +* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise. // removed +* m4/remainderl.m4 (gl_FUNC_REMAINDERL): Likewise. // removed +* m4/rintl.m4 (gl_FUNC_RINTL): Likewise. // removed +* m4/round.m4 (gl_FUNC_ROUND): Likewise. // removed +* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. // removed +* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. // removed +* m4/setenv.m4 (gl_FUNC_SETENV): Likewise. +* m4/signbit.m4 (gl_SIGNBIT): Likewise. +* m4/sleep.m4 (gl_FUNC_SLEEP): Likewise. +* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise. +* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise. +* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise. +* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise. +* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. // removed +* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. // removed +* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. // removed +* m4/tzset.m4 (gl_FUNC_TZSET_CLOBBER): Likewise. +* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise. +* m4/usleep.m4 (gl_FUNC_USLEEP): Likewise. +* m4/utimes.m4 (gl_FUNC_UTIMES): Likewise. +* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise. +--- + m4/calloc.m4 | 4 ++- + m4/canonicalize.m4 | 4 ++- + m4/chown.m4 | 22 +++++++------ + m4/d-ino.m4 | 16 +++++----- + m4/fdopendir.m4 | 12 ++++--- + m4/fnmatch.m4 | 18 ++++++++--- + m4/fpurge.m4 | 24 +++++++++----- + m4/getcwd-abort-bug.m4 | 11 +++++-- + m4/getcwd.m4 | 4 ++- + m4/getdelim.m4 | 40 ++++++++++++++---------- + m4/getgroups.m4 | 6 +++- + m4/getline.m4 | 38 +++++++++++++--------- + m4/gettimeofday.m4 | 4 ++- + m4/link-follow.m4 | 4 ++- + m4/malloc.m4 | 4 +-- + m4/mkdir.m4 | 4 ++- + m4/mkstemp.m4 | 4 ++- + m4/perror.m4 | 12 ++++--- + m4/printf.m4 | 22 ++++++++++++- + m4/putenv.m4 | 4 ++- + m4/realloc.m4 | 4 +-- + m4/setenv.m4 | 4 ++- + m4/signbit.m4 | 6 +++- + m4/sleep.m4 | 4 ++- + m4/stpncpy.m4 | 14 +++++++-- + m4/strerror.m4 | 6 +++- + m4/strtod.m4 | 10 +++--- + m4/strtold.m4 | 9 ++++-- + m4/tzset.m4 | 4 ++- + m4/ungetc.m4 | 18 ++++++----- + m4/usleep.m4 | 4 ++- + m4/utimes.m4 | 10 +++--- + m4/wcwidth.m4 | 12 ++++--- + 76 files changed, 461 insertions(+), 157 deletions(-) + +diff --git a/m4/calloc.m4 b/m4/calloc.m4 +index 012a5bf..d76535d 100644 +--- a/m4/calloc.m4 ++++ b/m4/calloc.m4 +@@ -1,4 +1,4 @@ +-# calloc.m4 serial 18 ++# calloc.m4 serial 19 + + # Copyright (C) 2004-2019 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -40,6 +40,8 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # Guess yes on native Windows. + mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # If we don't know, assume the worst. +diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 +index 5b6e25d..b61747b 100644 +--- a/m4/canonicalize.m4 ++++ b/m4/canonicalize.m4 +@@ -1,4 +1,4 @@ +-# canonicalize.m4 serial 29 ++# canonicalize.m4 serial 30 + + dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc. + +@@ -113,6 +113,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_realpath_works="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_realpath_works="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/chown.m4 b/m4/chown.m4 +index ecfc0c0..b798325 100644 +--- a/m4/chown.m4 ++++ b/m4/chown.m4 +@@ -1,4 +1,4 @@ +-# serial 30 ++# serial 32 + # Determine whether we need the chown wrapper. + + dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software +@@ -109,10 +109,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN], + [gl_cv_func_chown_slash_works=yes], + [gl_cv_func_chown_slash_works=no], + [case "$host_os" in +- # Guess yes on glibc systems. +- *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;; +- # If we don't know, assume the worst. +- *) gl_cv_func_chown_slash_works="guessing no" ;; ++ # Guess yes on glibc systems. ++ *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_chown_slash_works="guessing yes" ;; ++ # If we don't know, assume the worst. ++ *) gl_cv_func_chown_slash_works="guessing no" ;; + esac + ]) + rm -f conftest.link conftest.file]) +@@ -145,10 +147,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN], + [gl_cv_func_chown_ctime_works=yes], + [gl_cv_func_chown_ctime_works=no], + [case "$host_os" in +- # Guess yes on glibc systems. +- *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;; +- # If we don't know, assume the worst. +- *) gl_cv_func_chown_ctime_works="guessing no" ;; ++ # Guess yes on glibc systems. ++ *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_chown_ctime_works="guessing yes" ;; ++ # If we don't know, assume the worst. ++ *) gl_cv_func_chown_ctime_works="guessing no" ;; + esac + ]) + rm -f conftest.file]) +diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 +index f1420cc..87dcacc 100644 +--- a/m4/d-ino.m4 ++++ b/m4/d-ino.m4 +@@ -1,4 +1,4 @@ +-# serial 18 ++# serial 19 + + dnl From Jim Meyering. + dnl +@@ -40,12 +40,14 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], + [gl_cv_struct_dirent_d_ino=yes], + [gl_cv_struct_dirent_d_ino=no], + [case "$host_os" in +- # Guess yes on glibc systems with Linux kernel. +- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; +- # Guess no on native Windows. +- mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; +- # If we don't know, assume the worst. +- *) gl_cv_struct_dirent_d_ino="guessing no" ;; ++ # Guess yes on glibc systems with Linux kernel. ++ linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; ++ # Guess yes on musl systems with Linux kernel. ++ linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;; ++ # Guess no on native Windows. ++ mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; ++ # If we don't know, assume the worst. ++ *) gl_cv_struct_dirent_d_ino="guessing no" ;; + esac + ])]) + case "$gl_cv_struct_dirent_d_ino" in +diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 +index 0490551..b2b3b03 100644 +--- a/m4/fdopendir.m4 ++++ b/m4/fdopendir.m4 +@@ -1,4 +1,4 @@ +-# serial 10 ++# serial 11 + # See if we need to provide fdopendir. + + dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +@@ -45,10 +45,12 @@ DIR *fdopendir (int); + [gl_cv_func_fdopendir_works=yes], + [gl_cv_func_fdopendir_works=no], + [case "$host_os" in +- # Guess yes on glibc systems. +- *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;; +- # If we don't know, assume the worst. +- *) gl_cv_func_fdopendir_works="guessing no" ;; ++ # Guess yes on glibc systems. ++ *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_fdopendir_works="guessing yes" ;; ++ # If we don't know, assume the worst. ++ *) gl_cv_func_fdopendir_works="guessing no" ;; + esac + ])]) + case "$gl_cv_func_fdopendir_works" in +diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 +index c264ca7..75ba55b 100644 +--- a/m4/fnmatch.m4 ++++ b/m4/fnmatch.m4 +@@ -1,4 +1,4 @@ +-# Check for fnmatch - serial 13. -*- coding: utf-8 -*- ++# Check for fnmatch - serial 14. -*- coding: utf-8 -*- + + # Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], + m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX]) + + AC_REQUIRE([gl_FNMATCH_H]) ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + gl_fnmatch_required_lowercase=` + echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]' + ` +@@ -117,12 +118,19 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], + ]])], + [eval "$gl_fnmatch_cache_var=yes"], + [eval "$gl_fnmatch_cache_var=no"], +- [eval "$gl_fnmatch_cache_var=\"guessing no\""]) ++ [case "$host_os" in ++ # Guess yes on musl systems. ++ *-musl*) eval "$gl_fnmatch_cache_var=\"guessing yes\"" ;; ++ # Guess no otherwise, even on glibc systems. ++ *) eval "$gl_fnmatch_cache_var=\"guessing no\"" ;; ++ esac ++ ]) + ]) + eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\"" +- if test "$gl_fnmatch_result" != yes; then +- REPLACE_FNMATCH=1 +- fi ++ case "$gl_fnmatch_result" in ++ *yes) ;; ++ *) REPLACE_FNMATCH=1 ;; ++ esac + fi + if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then + gl_REPLACE_FNMATCH_H +diff --git a/m4/fpurge.m4 b/m4/fpurge.m4 +index cb21f56..6c5b3e9 100644 +--- a/m4/fpurge.m4 ++++ b/m4/fpurge.m4 +@@ -1,4 +1,4 @@ +-# fpurge.m4 serial 8 ++# fpurge.m4 serial 9 + dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,12 +7,13 @@ dnl with or without modifications, as long as this notice is preserved. + AC_DEFUN([gl_FUNC_FPURGE], + [ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CHECK_FUNCS_ONCE([fpurge]) + AC_CHECK_FUNCS_ONCE([__fpurge]) + AC_CHECK_DECLS([fpurge], , , [[#include ]]) + if test "x$ac_cv_func_fpurge" = xyes; then + HAVE_FPURGE=1 +- # Detect BSD bug. Only cygwin 1.7 is known to be immune. ++ # Detect BSD bug. Only cygwin 1.7 and musl are known to be immune. + AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( +@@ -48,11 +49,20 @@ AC_DEFUN([gl_FUNC_FPURGE], + return 13; + return 0; + ])], +- [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no], +- [gl_cv_func_fpurge_works='guessing no'])]) +- if test "x$gl_cv_func_fpurge_works" != xyes; then +- REPLACE_FPURGE=1 +- fi ++ [gl_cv_func_fpurge_works=yes], ++ [gl_cv_func_fpurge_works=no], ++ [case "$host_os" in ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_fpurge_works="guessing yes" ;; ++ # Guess no otherwise. ++ *) gl_cv_func_fpurge_works="guessing no" ;; ++ esac ++ ]) ++ ]) ++ case "$gl_cv_func_fpurge_works" in ++ *yes) ;; ++ *) REPLACE_FPURGE=1 ;; ++ esac + else + HAVE_FPURGE=0 + fi +diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 +index f0f24a5..7227f08 100644 +--- a/m4/getcwd-abort-bug.m4 ++++ b/m4/getcwd-abort-bug.m4 +@@ -1,4 +1,4 @@ +-# serial 9 ++# serial 11 + # Determine whether getcwd aborts when the length of the working directory + # name is unusually large. Any length between 4k and 16k trigger the bug + # when using glibc-2.4.90-9 or older. +@@ -13,6 +13,7 @@ + # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG], + [ ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CHECK_DECLS_ONCE([getcwd]) + AC_CHECK_HEADERS_ONCE([unistd.h]) + AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ]) +@@ -142,7 +143,13 @@ main () + else + gl_cv_func_getcwd_abort_bug=no + fi], +- [gl_cv_func_getcwd_abort_bug=yes]) ++ [case "$host_os" in ++ # Guess no on musl systems. ++ *-musl*) gl_cv_func_getcwd_abort_bug="guessing no" ;; ++ # Guess yes otherwise, even on glibc systems. ++ *) gl_cv_func_getcwd_abort_bug="guessing yes" ++ esac ++ ]) + ]) + AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2]) + ]) +diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 +index 4929b51..625171a 100644 +--- a/m4/getcwd.m4 ++++ b/m4/getcwd.m4 +@@ -6,7 +6,7 @@ + # with or without modifications, as long as this notice is preserved. + + # Written by Paul Eggert. +-# serial 16 ++# serial 17 + + AC_DEFUN([gl_FUNC_GETCWD_NULL], + [ +@@ -50,6 +50,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], + [[case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_getcwd_null="guessing yes";; + # Guess yes on Cygwin. + cygwin*) gl_cv_func_getcwd_null="guessing yes";; + # If we don't know, assume the worst. +diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 +index bf17c57..e77c379 100644 +--- a/m4/getdelim.m4 ++++ b/m4/getdelim.m4 +@@ -1,4 +1,4 @@ +-# getdelim.m4 serial 12 ++# getdelim.m4 serial 13 + + dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc. + dnl +@@ -11,6 +11,7 @@ AC_PREREQ([2.59]) + AC_DEFUN([gl_FUNC_GETDELIM], + [ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + dnl Persuade glibc to declare getdelim(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM], + if test $ac_cv_func_getdelim = yes; then + HAVE_GETDELIM=1 + dnl Found it in some library. Verify that it works. +- AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim], +- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ AC_CACHE_CHECK([for working getdelim function], ++ [gl_cv_func_working_getdelim], ++ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + # include + # include + # include +@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM], + fclose (in); + return 0; + } +- ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works. +- , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work. +- , dnl We're cross compiling. Assume it works on glibc2 systems. +- [AC_EGREP_CPP([Lucky GNU user], +- [ ++ ]])], ++ [gl_cv_func_working_getdelim=yes], ++ [gl_cv_func_working_getdelim=no], ++ [dnl We're cross compiling. ++ dnl Guess it works on glibc2 systems and musl systems. ++ AC_EGREP_CPP([Lucky GNU user], ++ [ + #include + #ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif + #endif +- ], +- [gl_cv_func_working_getdelim="guessing yes"], +- [gl_cv_func_working_getdelim="guessing no"])] +- )]) ++ ], ++ [gl_cv_func_working_getdelim="guessing yes"], ++ [case "$host_os" in ++ *-musl*) gl_cv_func_working_getdelim="guessing yes" ;; ++ *) gl_cv_func_working_getdelim="guessing no" ;; ++ esac ++ ]) ++ ]) ++ ]) + case "$gl_cv_func_working_getdelim" in +- *no) +- REPLACE_GETDELIM=1 +- ;; ++ *yes) ;; ++ *) REPLACE_GETDELIM=1 ;; + esac + else + HAVE_GETDELIM=0 +diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 +index 2ce986e..c93447b 100644 +--- a/m4/getgroups.m4 ++++ b/m4/getgroups.m4 +@@ -1,4 +1,4 @@ +-# serial 21 ++# serial 22 + + dnl From Jim Meyering. + dnl A wrapper around AC_FUNC_GETGROUPS. +@@ -42,6 +42,8 @@ AC_DEFUN([AC_FUNC_GETGROUPS], + [case "$host_os" in # (( + # Guess yes on glibc systems. + *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) ac_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) ac_cv_func_getgroups_works="guessing no" ;; + esac +@@ -95,6 +97,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_getgroups_works="guessing no" ;; + esac +diff --git a/m4/getline.m4 b/m4/getline.m4 +index 5b2ead2..32f771c 100644 +--- a/m4/getline.m4 ++++ b/m4/getline.m4 +@@ -1,4 +1,4 @@ +-# getline.m4 serial 28 ++# getline.m4 serial 29 + + dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation, + dnl Inc. +@@ -16,6 +16,7 @@ dnl to do with the function we need. + AC_DEFUN([gl_FUNC_GETLINE], + [ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + dnl Persuade glibc to declare getline(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE], + gl_getline_needs_run_time_check=yes], + [am_cv_func_working_getline=no]) + if test $gl_getline_needs_run_time_check = yes; then +- AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline], +- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ AC_CACHE_CHECK([for working getline function], ++ [am_cv_func_working_getline], ++ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + # include + # include + # include +@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE], + fclose (in); + return 0; + } +- ]])], [am_cv_func_working_getline=yes] dnl The library version works. +- , [am_cv_func_working_getline=no] dnl The library version does NOT work. +- , dnl We're cross compiling. Assume it works on glibc2 systems. +- [AC_EGREP_CPP([Lucky GNU user], +- [ ++ ]])], ++ [am_cv_func_working_getline=yes], ++ [am_cv_func_working_getline=no], ++ [dnl We're cross compiling. ++ dnl Guess it works on glibc2 systems and musl systems. ++ AC_EGREP_CPP([Lucky GNU user], ++ [ + #include + #ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif + #endif +- ], +- [am_cv_func_working_getline="guessing yes"], +- [am_cv_func_working_getline="guessing no"])] +- )]) ++ ], ++ [am_cv_func_working_getline="guessing yes"], ++ [case "$host_os" in ++ *-musl*) am_cv_func_working_getline="guessing yes" ;; ++ *) am_cv_func_working_getline="guessing no" ;; ++ esac ++ ]) ++ ]) ++ ]) + fi + + if test $ac_cv_have_decl_getline = no; then +@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE], + fi + + case "$am_cv_func_working_getline" in +- *no) ++ *yes) ;; ++ *) + dnl Set REPLACE_GETLINE always: Even if we have not found the broken + dnl getline function among $LIBS, it may exist in libinet and the + dnl executable may be linked with -linet. +diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 +index d29b4bf..5e2ef6f 100644 +--- a/m4/gettimeofday.m4 ++++ b/m4/gettimeofday.m4 +@@ -1,4 +1,4 @@ +-# serial 25 ++# serial 26 + + # Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], + case "$host_os" in + # Guess all is fine on glibc systems. + *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; ++ # Guess all is fine on musl systems. ++ *-musl*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 +index cbd2dca..8ac7301 100644 +--- a/m4/link-follow.m4 ++++ b/m4/link-follow.m4 +@@ -1,4 +1,4 @@ +-# serial 20 ++# serial 21 + dnl Run a program to determine whether link(2) follows symlinks. + dnl Set LINK_FOLLOWS_SYMLINKS accordingly. + +@@ -88,6 +88,8 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], + case "$host_os" in + # On glibc/Linux we know the result. + linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;; ++ # On musl/Linux we know the result. ++ linux*-musl*) gl_cv_func_link_follows_symlink="guessing no" ;; + # Otherwise, we don't know. + *) gl_cv_func_link_follows_symlink=unknown ;; + esac +diff --git a/m4/malloc.m4 b/m4/malloc.m4 +index b9b8d4b..c469c45 100644 +--- a/m4/malloc.m4 ++++ b/m4/malloc.m4 +@@ -1,4 +1,4 @@ +-# malloc.m4 serial 17 ++# malloc.m4 serial 19 + dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ac_cv_func_malloc_0_nonnull=no], + [case "$host_os" in + # Guess yes on platforms where we know the result. +- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ ++ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ + | hpux* | solaris* | cygwin* | mingw*) + ac_cv_func_malloc_0_nonnull="guessing yes" ;; + # If we don't know, assume the worst. +diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 +index 4cd9590..366a3cd 100644 +--- a/m4/mkdir.m4 ++++ b/m4/mkdir.m4 +@@ -1,4 +1,4 @@ +-# serial 14 ++# serial 15 + + # Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -62,6 +62,8 @@ AC_DEFUN([gl_FUNC_MKDIR], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 +index ae24c3b..1b15c2e 100644 +--- a/m4/mkstemp.m4 ++++ b/m4/mkstemp.m4 +@@ -1,4 +1,4 @@ +-#serial 25 ++#serial 26 + + # Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -59,6 +59,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_working_mkstemp="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_working_mkstemp="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/perror.m4 b/m4/perror.m4 +index 335be72..08e2db1 100644 +--- a/m4/perror.m4 ++++ b/m4/perror.m4 +@@ -1,4 +1,4 @@ +-# perror.m4 serial 7 ++# perror.m4 serial 8 + dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -48,10 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR], + rm -rf conftest.txt1 conftest.txt2], + [gl_cv_func_perror_works=no], + [case "$host_os" in +- # Guess yes on native Windows. +- mingw*) gl_cv_func_perror_works="guessing yes" ;; +- # Otherwise guess no. +- *) gl_cv_func_perror_works="guessing no" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_perror_works="guessing yes" ;; ++ # Guess yes on native Windows. ++ mingw*) gl_cv_func_perror_works="guessing yes" ;; ++ # Otherwise guess no. ++ *) gl_cv_func_perror_works="guessing no" ;; + esac + ]) + ]) +diff --git a/m4/printf.m4 b/m4/printf.m4 +index cbf6ae4..6d2280e 100644 +--- a/m4/printf.m4 ++++ b/m4/printf.m4 +@@ -1,4 +1,4 @@ +-# printf.m4 serial 60 ++# printf.m4 serial 61 + dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -62,6 +62,8 @@ int main () + changequote(,)dnl + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; +@@ -240,6 +242,8 @@ int main () + changequote(,)dnl + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on FreeBSD >= 6. + freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; +@@ -457,6 +461,8 @@ int main () + changequote(,)dnl + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # Guess yes on FreeBSD >= 6. + freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; +@@ -575,6 +581,8 @@ int main () + [gl_cv_func_printf_directive_a="guessing yes"], + [gl_cv_func_printf_directive_a="guessing no"]) + ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_printf_directive_a="guessing yes";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_directive_a="guessing no";; + # Guess no on native Windows. +@@ -625,6 +633,8 @@ int main () + changequote(,)dnl + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_printf_directive_f="guessing yes";; + # Guess yes on FreeBSD >= 6. + freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; +@@ -960,6 +970,8 @@ changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess no on Android. +@@ -1206,6 +1218,8 @@ changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; +@@ -1308,6 +1322,8 @@ int main () + changequote(,)dnl + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; +@@ -1400,6 +1416,8 @@ changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; +@@ -1554,6 +1572,8 @@ changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; +diff --git a/m4/putenv.m4 b/m4/putenv.m4 +index f8960f6..342ba26 100644 +--- a/m4/putenv.m4 ++++ b/m4/putenv.m4 +@@ -1,4 +1,4 @@ +-# putenv.m4 serial 22 ++# putenv.m4 serial 23 + dnl Copyright (C) 2002-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -36,6 +36,8 @@ AC_DEFUN([gl_FUNC_PUTENV], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_svid_putenv="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_svid_putenv="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/realloc.m4 b/m4/realloc.m4 +index f9f15ad..93066e8 100644 +--- a/m4/realloc.m4 ++++ b/m4/realloc.m4 +@@ -1,4 +1,4 @@ +-# realloc.m4 serial 15 ++# realloc.m4 serial 17 + dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], + [ac_cv_func_realloc_0_nonnull=no], + [case "$host_os" in + # Guess yes on platforms where we know the result. +- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ ++ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ + | hpux* | solaris* | cygwin* | mingw*) + ac_cv_func_realloc_0_nonnull="guessing yes" ;; + # If we don't know, assume the worst. +diff --git a/m4/setenv.m4 b/m4/setenv.m4 +index 6101274..a8f83d6 100644 +--- a/m4/setenv.m4 ++++ b/m4/setenv.m4 +@@ -1,4 +1,4 @@ +-# setenv.m4 serial 27 ++# setenv.m4 serial 28 + dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -37,6 +37,8 @@ AC_DEFUN([gl_FUNC_SETENV], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_setenv_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_setenv_works="guessing no" ;; + esac +diff --git a/m4/signbit.m4 b/m4/signbit.m4 +index bf5bce5..f7f2f3d 100644 +--- a/m4/signbit.m4 ++++ b/m4/signbit.m4 +@@ -1,4 +1,4 @@ +-# signbit.m4 serial 16 ++# signbit.m4 serial 17 + dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_signbit="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_signbit="guessing yes" ;; + # If we don't know, assume the worst. +@@ -62,6 +64,8 @@ AC_DEFUN([gl_SIGNBIT], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_signbit_gcc="guessing yes" ;; + # Guess yes on mingw, no on MSVC. + mingw*) if test -n "$GCC"; then + gl_cv_func_signbit_gcc="guessing yes" +diff --git a/m4/sleep.m4 b/m4/sleep.m4 +index 5f71cc7..7bab467 100644 +--- a/m4/sleep.m4 ++++ b/m4/sleep.m4 +@@ -1,4 +1,4 @@ +-# sleep.m4 serial 9 ++# sleep.m4 serial 10 + dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -48,6 +48,8 @@ handle_alarm (int sig) + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_sleep_works="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_sleep_works="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 +index 83425dd..f8e1a7c 100644 +--- a/m4/stpncpy.m4 ++++ b/m4/stpncpy.m4 +@@ -1,4 +1,4 @@ +-# stpncpy.m4 serial 16 ++# stpncpy.m4 serial 17 + dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_FUNC_STPNCPY], + [ ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles ++ + dnl Persuade glibc to declare stpncpy(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + +@@ -69,12 +71,18 @@ int main () + ]])], + [gl_cv_func_stpncpy=yes], + [gl_cv_func_stpncpy=no], +- [AC_EGREP_CPP([Thanks for using GNU], [ ++ [dnl Guess yes on glibc systems and musl systems. ++ AC_EGREP_CPP([Thanks for using GNU], [ + #include + #ifdef __GNU_LIBRARY__ + Thanks for using GNU + #endif +-], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"]) ++], [gl_cv_func_stpncpy="guessing yes"], ++ [case "$host_os" in ++ *-musl*) gl_cv_func_stpncpy="guessing yes" ;; ++ *) gl_cv_func_stpncpy="guessing no" ;; ++ esac ++ ]) + ]) + ]) + case "$gl_cv_func_stpncpy" in +diff --git a/m4/strerror.m4 b/m4/strerror.m4 +index b452f7f..2c90f31 100644 +--- a/m4/strerror.m4 ++++ b/m4/strerror.m4 +@@ -1,4 +1,4 @@ +-# strerror.m4 serial 19 ++# strerror.m4 serial 20 + dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_working_strerror="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_working_strerror="guessing no" ;; + esac +@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + # If we don't know, assume the worst. +diff --git a/m4/strtod.m4 b/m4/strtod.m4 +index 9912217..d68ab75 100644 +--- a/m4/strtod.m4 ++++ b/m4/strtod.m4 +@@ -1,4 +1,4 @@ +-# strtod.m4 serial 24 ++# strtod.m4 serial 25 + dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -115,9 +115,11 @@ numeric_equal (double x, double y) + ], + [gl_cv_func_strtod_works="guessing yes"], + [case "$host_os" in +- # Guess yes on native Windows. +- mingw*) gl_cv_func_strtod_works="guessing yes" ;; +- *) gl_cv_func_strtod_works="guessing no" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_strtod_works="guessing yes" ;; ++ # Guess yes on native Windows. ++ mingw*) gl_cv_func_strtod_works="guessing yes" ;; ++ *) gl_cv_func_strtod_works="guessing no" ;; + esac + ]) + ]) +diff --git a/m4/strtold.m4 b/m4/strtold.m4 +index 16b4eda..17125fe 100644 +--- a/m4/strtold.m4 ++++ b/m4/strtold.m4 +@@ -1,4 +1,4 @@ +-# strtold.m4 serial 2 ++# strtold.m4 serial 4 + dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -98,7 +98,12 @@ numeric_equal (long double x, long double y) + #endif + ], + [gl_cv_func_strtold_works="guessing yes"], +- [gl_cv_func_strtod_works="guessing no"]) ++ [case "$host_os" in ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_strtold_works="guessing yes" ;; ++ *) gl_cv_func_strtold_works="guessing no" ;; ++ esac ++ ]) + ]) + ]) + case "$gl_cv_func_strtold_works" in +diff --git a/m4/tzset.m4 b/m4/tzset.m4 +index 1278801..afdfa8e 100644 +--- a/m4/tzset.m4 ++++ b/m4/tzset.m4 +@@ -1,4 +1,4 @@ +-# serial 11 ++# serial 12 + + # Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation +@@ -70,6 +70,8 @@ main () + [case "$host_os" in + # Guess all is fine on glibc systems. + *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;; ++ # Guess all is fine on musl systems. ++ *-musl*) gl_cv_func_tzset_clobber="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_tzset_clobber="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/ungetc.m4 b/m4/ungetc.m4 +index ab8757b..08baf33 100644 +--- a/m4/ungetc.m4 ++++ b/m4/ungetc.m4 +@@ -1,4 +1,4 @@ +-# ungetc.m4 serial 6 ++# ungetc.m4 serial 7 + dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -41,12 +41,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], + remove ("conftest.tmp");])], + [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no], + [case "$host_os" in +- # Guess yes on glibc and bionic systems. +- *-gnu* | gnu* | *-android*) gl_cv_func_ungetc_works="guessing yes" ;; +- # Guess yes on native Windows. +- mingw*) gl_cv_func_ungetc_works="guessing yes" ;; +- # If we don't know, assume the worst. +- *) gl_cv_func_ungetc_works="guessing no" ;; ++ # Guess yes on glibc systems. ++ *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_ungetc_works="guessing yes" ;; ++ # Guess yes on bionic systems. ++ *-android*) gl_cv_func_ungetc_works="guessing yes" ;; ++ # Guess yes on native Windows. ++ mingw*) gl_cv_func_ungetc_works="guessing yes" ;; ++ # If we don't know, assume the worst. ++ *) gl_cv_func_ungetc_works="guessing no" ;; + esac + ]) + ]) +diff --git a/m4/usleep.m4 b/m4/usleep.m4 +index 59605a8..4a6bff0 100644 +--- a/m4/usleep.m4 ++++ b/m4/usleep.m4 +@@ -1,4 +1,4 @@ +-# usleep.m4 serial 5 ++# usleep.m4 serial 6 + dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -31,6 +31,8 @@ AC_DEFUN([gl_FUNC_USLEEP], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_usleep_works="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_usleep_works="guessing no" ;; + # If we don't know, assume the worst. +diff --git a/m4/utimes.m4 b/m4/utimes.m4 +index 7209b6d..5806d8f 100644 +--- a/m4/utimes.m4 ++++ b/m4/utimes.m4 +@@ -1,5 +1,5 @@ + # Detect some bugs in glibc's implementation of utimes. +-# serial 5 ++# serial 6 + + dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +@@ -143,9 +143,11 @@ main () + [gl_cv_func_working_utimes=yes], + [gl_cv_func_working_utimes=no], + [case "$host_os" in +- # Guess no on native Windows. +- mingw*) gl_cv_func_working_utimes="guessing no" ;; +- *) gl_cv_func_working_utimes="guessing no" ;; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_working_utimes="guessing yes" ;; ++ # Guess no on native Windows. ++ mingw*) gl_cv_func_working_utimes="guessing no" ;; ++ *) gl_cv_func_working_utimes="guessing no" ;; + esac + ]) + ]) +diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 +index baa2002..3952fd2 100644 +--- a/m4/wcwidth.m4 ++++ b/m4/wcwidth.m4 +@@ -1,4 +1,4 @@ +-# wcwidth.m4 serial 27 ++# wcwidth.m4 serial 28 + dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -98,9 +98,13 @@ int main () + [ + changequote(,)dnl + case "$host_os" in +- # Guess yes on glibc and AIX 7 systems. +- *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; +- *) gl_cv_func_wcwidth_works="guessing no";; ++ # Guess yes on glibc systems. ++ *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";; ++ # Guess yes on musl systems. ++ *-musl*) gl_cv_func_wcwidth_works="guessing yes";; ++ # Guess yes on AIX 7 systems. ++ aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; ++ *) gl_cv_func_wcwidth_works="guessing no";; + esac + changequote([,])dnl + ]) +-- +1.9.1 + + diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c4ce510c642..50d3a2437d7 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -22,14 +22,21 @@ with lib; stdenv.mkDerivation (rec { pname = "coreutils"; - version = "8.32"; + version = "8.31"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; }; - patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; + patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch + # Fix failing test with musl. See https://lists.gnu.org/r/coreutils/2019-05/msg00031.html + # To be removed in coreutils-8.32. + ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch + # Fix compilation in musl-cross environments. To be removed in coreutils-8.32. + ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch + # Fix compilation in android-cross environments. To be removed in coreutils-8.32. + ++ [ ./coreutils-8.31-android-cross.patch ]; postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c466a48434f..8e151bc2ead 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.73.0"; + version = "7.72.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE="; + sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index d2fa0deca00..9b33d53e54f 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.12.0"; + version = "1.11.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv"; + sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 639926578c7..97db4a28c45 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. -{ stdenv, buildGoPackage, fetchFromGitHub, darwin }: +{ stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }: buildGoPackage rec { pname = "sudolikeaboss-unstable"; @@ -17,8 +17,9 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = with darwin.apple_sdk.frameworks; [ + propagatedBuildInputs = with darwin.apple_sdk.frameworks; [ Cocoa + fixDarwinDylibNames ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d0c522e689..38774895209 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8346,7 +8346,9 @@ in zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { - cmake = buildPackages.cmakeMinimal; + cmake = buildPackages.cmake.override { + libarchive = buildPackages.libarchive.override { zstd = null; }; + }; }; zsync = callPackage ../tools/compression/zsync { }; @@ -9674,15 +9676,15 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; }; - rust_1_47 = callPackage ../development/compilers/rust/1_47.nix { + rust_1_46 = callPackage ../development/compilers/rust/1_46.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11; + llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; }; - rust = rust_1_47; + rust = rust_1_46; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_47 = rust_1_47.packages.stable; - rustPackages = rustPackages_1_47; + rustPackages_1_46 = rust_1_46.packages.stable; + rustPackages = rustPackages_1_46; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -10858,10 +10860,6 @@ in cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; - cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake { - isBootstrap = true; - }; - cmakeCurses = cmake.override { useNcurses = true; }; cmakeWithGui = cmakeCurses.override { withQt5 = true; }; @@ -18292,7 +18290,7 @@ in # udev is the same package as systemd which depends on cryptsetup # which depends on lvm2 again. But we only need the libudev part # which does not depend on cryptsetup. - udev = systemdMinimal; + udev = udev.override { cryptsetup = null; }; }; lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { enableDmeventd = true; @@ -18643,23 +18641,8 @@ in bzip2 = null; }; }; - systemdMinimal = systemd.override { - pname = "systemd-minimal"; - withResolved = false; - withLogind = false; - withHostnamed = false; - withLocaled = false; - withTimedated = false; - withHwdb = false; - withEfi = false; - withImportd = false; - withCryptsetup = false; - cryptsetup = null; - lvm2 = null; - }; - - udev = systemd; # TODO: change to systemdMinimal + udev = systemd; # TODO: move to aliases.nix systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0961e3c264d..945f55adc70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4828,7 +4828,7 @@ in { pybullet = callPackage ../development/python-modules/pybullet { }; - pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; }; + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; pycallgraph = callPackage ../development/python-modules/pycallgraph { }; -- cgit 1.4.1 From 89023c38fcef79ad135bf6070563be611c4c8d39 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 25 Oct 2020 22:17:24 +0100 Subject: Recover the complicated situation after my bad merge I made a mistake merge. Reverting it in c778945806b undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range: 4effe769e2b - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from 4effe769e2) - merging the last unaffected staging-next commit (803ca85c209) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state --- doc/stdenv/stdenv.xml | 7 +- .../git-and-tools/git/default.nix | 4 +- pkgs/build-support/install-shell-files/default.nix | 12 +- .../setup-hooks/install-shell-files.sh | 125 ++- pkgs/data/misc/tzdata/default.nix | 6 +- pkgs/development/compilers/gcc/builder.sh | 7 +- .../compilers/purescript/psc-package/default.nix | 10 +- pkgs/development/compilers/rust/1_46.nix | 45 - pkgs/development/compilers/rust/1_47.nix | 45 + pkgs/development/compilers/rust/binary.nix | 12 +- .../interpreters/ruby/rubygems/default.nix | 4 +- pkgs/development/libraries/enchant/2.x.nix | 4 +- pkgs/development/libraries/expat/default.nix | 12 +- pkgs/development/libraries/freetype/default.nix | 4 +- .../gamin/abstract-socket-namespace.patch | 73 ++ pkgs/development/libraries/gamin/default.nix | 10 +- pkgs/development/libraries/harfbuzz/default.nix | 4 +- pkgs/development/libraries/libinput/default.nix | 17 +- ...CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch | 211 ---- pkgs/development/libraries/libvpx/default.nix | 22 +- pkgs/development/libraries/libwebp/default.nix | 15 +- pkgs/development/libraries/mesa/default.nix | 7 +- ...ache-include-dri-driver-path-in-cache-key.patch | 29 +- .../mesa/link-radv-with-ld_args_build_id.patch | 25 - .../libraries/mesa/missing-includes.patch | 12 - pkgs/development/libraries/openssl/default.nix | 4 +- pkgs/development/libraries/p11-kit/default.nix | 7 + pkgs/development/libraries/zeromq/4.x.nix | 10 +- pkgs/development/python-modules/arrow/default.nix | 4 +- .../development/python-modules/pycairo/default.nix | 24 +- .../tools/build-managers/cmake/default.nix | 19 +- .../boost-Do-not-add-system-paths-on-nix.patch | 40 + .../tools/build-managers/meson/default.nix | 5 + pkgs/os-specific/linux/apparmor/default.nix | 13 +- pkgs/os-specific/linux/iproute/default.nix | 8 +- pkgs/os-specific/linux/libcap/default.nix | 5 +- pkgs/os-specific/linux/systemd/default.nix | 106 +- pkgs/servers/x11/xorg/default.nix | 36 +- pkgs/servers/x11/xorg/overrides.nix | 7 - pkgs/servers/x11/xorg/tarballs.list | 12 +- pkgs/shells/bash/bash-completion/default.nix | 4 +- pkgs/stdenv/darwin/default.nix | 5 +- pkgs/test/default.nix | 2 + pkgs/test/install-shell-files/default.nix | 125 +++ pkgs/tools/compression/brotli/default.nix | 13 +- .../avoid-false-positive-in-date-debug-test.patch | 52 - .../coreutils/coreutils-8.31-android-cross.patch | 51 - .../misc/coreutils/coreutils-8.31-musl-cross.patch | 1153 -------------------- pkgs/tools/misc/coreutils/default.nix | 13 +- pkgs/tools/networking/curl/default.nix | 4 +- pkgs/tools/networking/unbound/default.nix | 4 +- pkgs/top-level/all-packages.nix | 37 +- pkgs/top-level/python-packages.nix | 2 +- 53 files changed, 702 insertions(+), 1785 deletions(-) delete mode 100644 pkgs/development/compilers/rust/1_46.nix create mode 100644 pkgs/development/compilers/rust/1_47.nix create mode 100644 pkgs/development/libraries/gamin/abstract-socket-namespace.patch delete mode 100644 pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch delete mode 100644 pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch create mode 100644 pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch create mode 100644 pkgs/test/install-shell-files/default.nix delete mode 100644 pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch delete mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch delete mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch (limited to 'pkgs/test') diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 4c069b57edd..46ee97927ea 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -2070,7 +2070,7 @@ nativeBuildInputs = [ breakpointHook ]; The installManPage function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with .gz suffix). This function will place them into the correct directory. - The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. + The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. A root name may be provided for all paths using the flag --cmd NAME; this synthesizes the appropriate name depending on the shell (e.g. --cmd foo will synthesize the name foo.bash for bash and _foo for zsh). The path may also be a fifo or named fd (such as produced by <(cmd)), in which case the shell and name must be provided. nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -2081,6 +2081,11 @@ postInstall = '' installShellCompletion --zsh --name _foobar share/completions.zsh # implicit behavior installShellCompletion share/completions/foobar.{bash,fish,zsh} + # using named fd + installShellCompletion --cmd foobar \ + --bash <($out/bin/foobar --bash-completion) \ + --fish <($out/bin/foobar --fish-completion) \ + --zsh <($out/bin/foobar --zsh-completion) ''; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7e40366142a..49dc7866dbd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -22,7 +22,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.28.0"; + version = "2.29.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "17a311vzimqn1glc9d7x82rhb1mb81m5rr4g8xji8idaafid39fz"; + sha256 = "KEMtmVJXxGJv4PsgkfWI327tmOlXFBnnLIO8Izcua4k="; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix index e1f2e24dd87..d50661ddc65 100644 --- a/pkgs/build-support/install-shell-files/default.nix +++ b/pkgs/build-support/install-shell-files/default.nix @@ -1,4 +1,12 @@ -{ makeSetupHook }: +{ makeSetupHook, tests }: # See the header comment in ../setup-hooks/install-shell-files.sh for example usage. -makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh +let + setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh; +in + +setupHook.overrideAttrs (oldAttrs: { + passthru = (oldAttrs.passthru or {}) // { + tests = tests.install-shell-files; + }; +}) diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/setup-hooks/install-shell-files.sh index e0ea1f7f30a..194b408b105 100644 --- a/pkgs/build-support/setup-hooks/install-shell-files.sh +++ b/pkgs/build-support/setup-hooks/install-shell-files.sh @@ -1,4 +1,4 @@ -#!/bin/bash +# shellcheck shell=bash # Setup hook for the `installShellFiles` package. # # Example usage in a derivation: @@ -19,8 +19,8 @@ # installManPage [...] # # Each argument is checked for its man section suffix and installed into the appropriate -# share/man/ directory. The function returns an error if any paths don't have the man section -# suffix (with optional .gz compression). +# share/man/man/ directory. The function returns an error if any paths don't have the man +# section suffix (with optional .gz compression). installManPage() { local path for path in "$@"; do @@ -49,7 +49,7 @@ installManPage() { done } -# installShellCompletion [--bash|--fish|--zsh] ([--name ] )... +# installShellCompletion [--cmd ] ([--bash|--fish|--zsh] [--name ] )... # # Each path is installed into the appropriate directory for shell completions for the given shell. # If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell. @@ -61,9 +61,20 @@ installManPage() { # If the shell completion needs to be renamed before installing the optional `--name ` flag # may be given. Any name provided with this flag only applies to the next path. # +# If all shell completions need to be renamed before installing the optional `--cmd ` flag +# may be given. This will synthesize a name for each file, unless overridden with an explicit +# `--name` flag. For example, `--cmd foobar` will synthesize the name `_foobar` for zsh and +# `foobar.bash` for bash. +# # For zsh completions, if the `--name` flag is not given, the path will be automatically renamed # such that `foobar.zsh` becomes `_foobar`. # +# A path may be a named fd, such as produced by the bash construct `<(cmd)`. When using a named fd, +# the shell type flag must be provided, and either the `--name` or `--cmd` flag must be provided. +# This might look something like: +# +# installShellCompletion --zsh --name _foobar <($out/bin/foobar --zsh-completion) +# # This command accepts multiple shell flags in conjunction with multiple paths if you wish to # install them all in one command: # @@ -76,9 +87,16 @@ installManPage() { # installShellCompletion --fish --name foobar.fish share/completions.fish # installShellCompletion --zsh --name _foobar share/completions.zsh # +# Or to use shell newline escaping to split a single invocation across multiple lines: +# +# installShellCompletion --cmd foobar \ +# --bash <($out/bin/foobar --bash-completion) \ +# --fish <($out/bin/foobar --fish-completion) \ +# --zsh <($out/bin/foobar --zsh-completion) +# # If any argument is `--` the remaining arguments will be treated as paths. installShellCompletion() { - local shell='' name='' retval=0 parseArgs=1 arg + local shell='' name='' cmdname='' retval=0 parseArgs=1 arg while { arg=$1; shift; }; do # Parse arguments if (( parseArgs )); then @@ -97,6 +115,17 @@ installShellCompletion() { # treat `--name=foo` the same as `--name foo` name=${arg#--name=} continue;; + --cmd) + cmdname=$1 + shift || { + echo 'installShellCompletion: error: --cmd flag expected an argument' >&2 + return 1 + } + continue;; + --cmd=*) + # treat `--cmd=foo` the same as `--cmd foo` + cmdname=${arg#--cmd=} + continue;; --?*) echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2 retval=2 @@ -110,39 +139,67 @@ installShellCompletion() { if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "installShellCompletion: installing $arg${name:+ as $name}" fi - # if we get here, this is a path - # Identify shell - local basename - basename=$(stripHash "$arg") + # if we get here, this is a path or named pipe + # Identify shell and output name local curShell=$shell - if [[ -z "$curShell" ]]; then - # auto-detect the shell - case "$basename" in - ?*.bash) curShell=bash;; - ?*.fish) curShell=fish;; - ?*.zsh) curShell=zsh;; + local outName='' + if [[ -z "$arg" ]]; then + echo "installShellCompletion: error: empty path is not allowed" >&2 + return 1 + elif [[ -p "$arg" ]]; then + # this is a named fd or fifo + if [[ -z "$curShell" ]]; then + echo "installShellCompletion: error: named pipe requires one of --bash, --fish, or --zsh" >&2 + return 1 + elif [[ -z "$name" && -z "$cmdname" ]]; then + echo "installShellCompletion: error: named pipe requires one of --cmd or --name" >&2 + return 1 + fi + else + # this is a path + local argbase + argbase=$(stripHash "$arg") + if [[ -z "$curShell" ]]; then + # auto-detect the shell + case "$argbase" in + ?*.bash) curShell=bash;; + ?*.fish) curShell=fish;; + ?*.zsh) curShell=zsh;; + *) + if [[ "$argbase" = _* && "$argbase" != *.* ]]; then + # probably zsh + echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 + curShell=zsh + else + echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 + retval=2 + continue + fi;; + esac + fi + outName=$argbase + fi + # Identify output path + if [[ -n "$name" ]]; then + outName=$name + elif [[ -n "$cmdname" ]]; then + case "$curShell" in + bash|fish) outName=$cmdname.$curShell;; + zsh) outName=_$cmdname;; *) - if [[ "$basename" = _* && "$basename" != *.* ]]; then - # probably zsh - echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 - curShell=zsh - else - echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 - retval=2 - continue - fi;; + # Our list of shells is out of sync with the flags we accept or extensions we detect. + echo 'installShellCompletion: internal error' >&2 + return 1;; esac fi - # Identify output path - local outName sharePath - outName=${name:-$basename} + local sharePath case "$curShell" in bash) sharePath=bash-completion/completions;; fish) sharePath=fish/vendor_completions.d;; zsh) sharePath=zsh/site-functions # only apply automatic renaming if we didn't have a manual rename - if test -z "$name"; then + if [[ -z "$name" && -z "$cmdname" ]]; then # convert a name like `foo.zsh` into `_foo` outName=${outName%.zsh} outName=_${outName#_} @@ -153,8 +210,16 @@ installShellCompletion() { return 1;; esac # Install file - install -Dm644 -T "$arg" "${!outputBin:?}/share/$sharePath/$outName" || return - # Clear the name, it only applies to one path + local outDir="${!outputBin:?}/share/$sharePath" + local outPath="$outDir/$outName" + if [[ -p "$arg" ]]; then + # install handles named pipes on NixOS but not on macOS + mkdir -p "$outDir" \ + && cat "$arg" > "$outPath" + else + install -Dm644 -T "$arg" "$outPath" + fi || return + # Clear the per-path flags name= done if [[ -n "$name" ]]; then diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 367ee06390c..dc80580ff5e 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2019c"; + version = "2020c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr"; + sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"; + sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; }) ]; diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 2204744a4b5..e1c4768413f 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -287,7 +287,12 @@ postInstall() { done # Two identical man pages are shipped (moving and compressing is done later) - ln -sf gcc.1 "$out"/share/man/man1/g++.1 + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done } genericBuild diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 0bebd5d2f50..88f7adce5a1 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -44,12 +44,10 @@ stdenv.mkDerivation rec { '' + '' chmod u-w $PSC_PACKAGE - $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash - $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish - $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package - installShellCompletion \ - psc-package.{bash,fish} \ - --zsh _psc-package + installShellCompletion --cmd psc-package \ + --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \ + --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \ + --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE) ''; meta = with lib; { diff --git a/pkgs/development/compilers/rust/1_46.nix b/pkgs/development/compilers/rust/1_46.nix deleted file mode 100644 index c999b346ee6..00000000000 --- a/pkgs/development/compilers/rust/1_46.nix +++ /dev/null @@ -1,45 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# Check the version number in the src/llvm-project git submodule in: -# https://github.com/rust-lang/rust/blob//.gitmodules -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages -, pkgsBuildTarget, pkgsBuildBuild -, makeRustPlatform -} @ args: - -import ./default.nix { - rustcVersion = "1.46.0"; - rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.45.2"; - - # fetch hashes by running `print-hashes.sh 1.45.2` - bootstrapHashes = { - i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936"; - x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643"; - arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60"; - armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531"; - aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30"; - x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_46; - - rustcPatches = [ - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/1_47.nix b/pkgs/development/compilers/rust/1_47.nix new file mode 100644 index 00000000000..e5cbae193bf --- /dev/null +++ b/pkgs/development/compilers/rust/1_47.nix @@ -0,0 +1,45 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob//.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security +, llvmPackages +, pkgsBuildTarget, pkgsBuildBuild +, makeRustPlatform +} @ args: + +import ./default.nix { + rustcVersion = "1.47.0"; + rustcSha256 = "sha256-MYXfBkxHR/LIubuMRGjt1Y/0rW0HiAyHmsGxc7do2B0="; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.46.0"; + + # fetch hashes by running `print-hashes.sh 1.45.2` + bootstrapHashes = { + i686-unknown-linux-gnu = "6ebd7e04dc18a36d08b9731cdb42d5caf8460e1eb41b75f3a8596c39f5e71206"; + x86_64-unknown-linux-gnu = "e3b98bc3440fe92817881933f9564389eccb396f5f431f33d48b979fa2fbdcf5"; + arm-unknown-linux-gnueabihf = "bb8af68565321f54608e918597083eb016ed0f9f4f3cc23f7cc5f467b934ce7f"; + armv7-unknown-linux-gnueabihf = "7c0640879d7f2c38db60352e3c0f09e3fc6fa3bac6ca8f22cbccb1eb5e950121"; + aarch64-unknown-linux-gnu = "f0c6d630f3dedb3db69d69ed9f833aa6b472363096f5164f1068c7001ca42aeb"; + x86_64-apple-darwin = "82d61582a3772932432a99789c3b3bd4abe6baca339e355048ca9efb9ea5b4db"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_47; + + rustcPatches = [ + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 9ae7e51e5fe..b84e390e0b0 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, bash, curl, darwin +{ stdenv, makeWrapper, bash, curl, darwin, zlib , version , src , platform @@ -42,17 +42,23 @@ rec { ./install.sh --prefix=$out \ --components=${installComponents} - ${optionalString (stdenv.isLinux && bootstrapping) '' + ${optionalString (stdenv.isLinux && bootstrapping) ('' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" + '' + optionalString (stdenv.lib.versionAtLeast version "1.46") + # rustc bootstrap needs libz starting from 1.46 + '' + ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1 + ln -s ${zlib}/lib/libz.so $out/lib/libz.so + '' + '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/cargo" - ''} + '')} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 0bbcadba3f5..8263a987d63 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rubygems"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd"; + sha256 = "181wjclxnq5lrwnr53famy9pg8911hi9w2v0vy7dqgjqnc4iy1hp"; }; patches = [ diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index b7b86de92c0..cbc3f217326 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.11"; + version = "2.2.12"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo="; + sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index a356d7be1a9..29d2c2b3acb 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { - name = "expat-2.2.8"; +let + version = "2.2.10"; +in stdenv.mkDerivation rec { + name = "expat-${version}"; src = fetchurl { - url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz"; - sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1"; + url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz"; + sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 24757af09e3..b87e64c2afb 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "freetype"; - version = "2.10.2"; + version = "2.10.4"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "12rd181yzz6952cyjqaa4253f5szam93cmhw18p33rnj4l8dchqm"; + sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch new file mode 100644 index 00000000000..ff161055972 --- /dev/null +++ b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch @@ -0,0 +1,73 @@ +From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Tue, 1 Sep 2020 13:54:35 +0200 +Subject: [PATCH] Pin abstract namespace sockets to host_os + +Running programs with AC_RUN_IFELSE fails when cross-compiling. +Since abstract namespace sockets are linux feature, we can easily +assume it is available for linux and not for darwin. +--- + configure.in | 47 ++++++----------------------------------------- + 1 file changed, 6 insertions(+), 41 deletions(-) + +diff --git a/configure.in b/configure.in +index eb129db..0ed82ba 100644 +--- a/configure.in ++++ b/configure.in +@@ -387,47 +387,12 @@ fi + + #### Abstract sockets + +-AC_MSG_CHECKING(abstract socket namespace) +-AC_LANG_PUSH(C) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +-[[ +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-]], +-[[ +- int listen_fd; +- struct sockaddr_un addr; +- +- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); +- +- if (listen_fd < 0) +- { +- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- memset (&addr, '\0', sizeof (addr)); +- addr.sun_family = AF_UNIX; +- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); +- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ +- +- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) +- { +- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", +- strerror (errno)); +- exit (1); +- } +- else +- exit (0); +-]])], +- [have_abstract_sockets=yes], +- [have_abstract_sockets=no]) +-AC_LANG_POP(C) ++AC_MSG_CHECKING([whether target os has abstract socket namespace]) ++if test x$target_os = xlinux-gnu ; then ++ have_abstract_sockets=yes ++else ++ have_abstract_sockets=no ++fi + AC_MSG_RESULT($have_abstract_sockets) + + if test x$enable_abstract_sockets = xyes; then +-- +2.25.4 + diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 38451571d8b..89096c88745 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: -stdenv.mkDerivation (rec { +let + cross = stdenv.hostPlatform != stdenv.buildPlatform; +in stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { @@ -8,7 +10,7 @@ stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ glib ]; @@ -27,7 +29,7 @@ stdenv.mkDerivation (rec { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }); + }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 8110f13d14c..6c5703f521d 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.7.1"; + version = "2.7.2"; inherit (stdenv.lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs"; + sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm"; }; postPatch = '' diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 576a2fec921..3a651087510 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -27,11 +27,14 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.16.1"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk="; + version = "1.16.2"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = pname; + repo = pname; + rev = version; + sha256 = "0qii6yh3dlhgv9z970cpzbz19ii8zjvq4k7pg75sy2gmia7smwd1"; }; outputs = [ "bin" "out" "dev" ]; @@ -80,7 +83,7 @@ stdenv.mkDerivation rec { meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "http://www.freedesktop.org/wiki/Software/libinput"; + homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch b/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch deleted file mode 100644 index 552c4e08d5f..00000000000 --- a/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch +++ /dev/null @@ -1,211 +0,0 @@ -Backports of - -From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001 -From: kyslov -Date: Fri, 4 Jan 2019 17:04:09 -0800 -Subject: [PATCH] Fix OOB memory access on fuzzed data - -From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Tue, 24 Jul 2018 21:36:50 -0700 -Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal - -From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Tue, 11 Dec 2018 18:06:20 -0800 -Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf - -From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Tue, 9 Apr 2019 18:37:44 -0700 -Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10 - -From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 -From: Jerome Jiang -Date: Wed, 23 May 2018 15:43:00 -0700 -Subject: [PATCH] VP8: Fix use-after-free in postproc. - -to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433 - ---- libvpx-1.7.0.orig/test/decode_api_test.cc -+++ libvpx-1.7.0/test/decode_api_test.cc -@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) { - EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); - } - --TEST(DecodeAPI, Vp9PeekSI) { -+void TestPeekInfo(const uint8_t *const data, uint32_t data_sz, -+ uint32_t peek_size) { - const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo; -+ // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get -+ // to decoder_peek_si_internal on frames of size < 8. -+ if (data_sz >= 8) { -+ vpx_codec_ctx_t dec; -+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); -+ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM -+ : VPX_CODEC_CORRUPT_FRAME, -+ vpx_codec_decode(&dec, data, data_sz, NULL, 0)); -+ vpx_codec_iter_t iter = NULL; -+ EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); -+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); -+ } -+ -+ // Verify behavior of vpx_codec_peek_stream_info. -+ vpx_codec_stream_info_t si; -+ si.sz = sizeof(si); -+ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, -+ vpx_codec_peek_stream_info(codec, data, data_sz, &si)); -+} -+ -+TEST(DecodeAPI, Vp9PeekStreamInfo) { - // The first 9 bytes are valid and the rest of the bytes are made up. Until - // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it - // should return VPX_CODEC_CORRUPT_FRAME. -@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) { - }; - - for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) { -- // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get -- // to decoder_peek_si_internal on frames of size < 8. -- if (data_sz >= 8) { -- vpx_codec_ctx_t dec; -- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); -- EXPECT_EQ( -- (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME, -- vpx_codec_decode(&dec, data, data_sz, NULL, 0)); -- vpx_codec_iter_t iter = NULL; -- EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); -- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); -- } -- -- // Verify behavior of vpx_codec_peek_stream_info. -- vpx_codec_stream_info_t si; -- si.sz = sizeof(si); -- EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, -- vpx_codec_peek_stream_info(codec, data, data_sz, &si)); -+ TestPeekInfo(data, data_sz, 10); -+ } -+} -+ -+TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) { -+ // This profile 1 header requires 10.25 bytes, ensure -+ // vpx_codec_peek_stream_info doesn't over read. -+ const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53, -+ 0xe9, 0x30, 0x68, 0x53, 0x04 }; -+ -+ for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) { -+ TestPeekInfo(profile1_data, data_sz, 11); - } - } - #endif // CONFIG_VP9_DECODER ---- libvpx-1.7.0.orig/third_party/libwebm/mkvparser/mkvparser.cc -+++ libvpx-1.7.0/third_party/libwebm/mkvparser/mkvparser.cc -@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment - - const long long stop = pos + s.size; - -- Colour* colour = NULL; -- Projection* projection = NULL; -+ std::unique_ptr colour_ptr; -+ std::unique_ptr projection_ptr; - - while (pos < stop) { - long long id, size; -@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment - if (rate <= 0) - return E_FILE_FORMAT_INVALID; - } else if (id == libwebm::kMkvColour) { -- if (!Colour::Parse(pReader, pos, size, &colour)) -+ Colour* colour = NULL; -+ if (!Colour::Parse(pReader, pos, size, &colour)) { - return E_FILE_FORMAT_INVALID; -+ } else { -+ colour_ptr.reset(colour); -+ } - } else if (id == libwebm::kMkvProjection) { -- if (!Projection::Parse(pReader, pos, size, &projection)) -+ Projection* projection = NULL; -+ if (!Projection::Parse(pReader, pos, size, &projection)) { - return E_FILE_FORMAT_INVALID; -+ } else { -+ projection_ptr.reset(projection); -+ } - } - - pos += size; // consume payload -@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment - pTrack->m_display_unit = display_unit; - pTrack->m_stereo_mode = stereo_mode; - pTrack->m_rate = rate; -- pTrack->m_colour = colour; -- pTrack->m_projection = projection; -+ pTrack->m_colour = colour_ptr.release(); -+ pTrack->m_projection = projection_ptr.release(); - - pResult = pTrack; - return 0; // success ---- libvpx-1.7.0.orig/vp8/common/postproc.c -+++ libvpx-1.7.0/vp8/common/postproc.c -@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BU - double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; - int ppl = (int)(level + .5); - -- const MODE_INFO *mode_info_context = cm->show_frame_mi; -+ const MODE_INFO *mode_info_context = cm->mi; - int mbr, mbc; - - /* The pixel thresholds are adjusted according to if or not the macroblock ---- libvpx-1.7.0.orig/vp8/decoder/dboolhuff.h -+++ libvpx-1.7.0/vp8/decoder/dboolhuff.h -@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODE - } - - { -- register int shift = vp8_norm[range]; -+ const unsigned char shift = vp8_norm[(unsigned char)range]; - range <<= shift; - value <<= shift; - count -= shift; ---- libvpx-1.7.0.orig/vp9/vp9_dx_iface.c -+++ libvpx-1.7.0/vp9/vp9_dx_iface.c -@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_i - const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si, - int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) { - int intra_only_flag = 0; -- uint8_t clear_buffer[10]; -+ uint8_t clear_buffer[11]; - - if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM; - -@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_i - if (profile > PROFILE_0) { - if (!parse_bitdepth_colorspace_sampling(profile, &rb)) - return VPX_CODEC_UNSUP_BITSTREAM; -+ // The colorspace info may cause vp9_read_frame_size() to need 11 -+ // bytes. -+ if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM; - } - rb.bit_offset += REF_FRAMES; // refresh_frame_flags - vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h); ---- libvpx-1.7.0.orig/vpx_dsp/bitreader.h -+++ libvpx-1.7.0/vpx_dsp/bitreader.h -@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r - } - - { -- register int shift = vpx_norm[range]; -+ const unsigned char shift = vpx_norm[(unsigned char)range]; - range <<= shift; - value <<= shift; - count -= shift; ---- libvpx-1.7.0.orig/vpx_dsp/bitreader_buffer.c -+++ libvpx-1.7.0/vpx_dsp/bitreader_buffer.c -@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_ - rb->bit_offset = off + 1; - return bit; - } else { -- rb->error_handler(rb->error_handler_data); -+ if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data); - return 0; - } - } diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 007df403ff7..83e60466c14 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -56,20 +56,16 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "webmproject"; - repo = "libvpx"; + repo = pname; rev = "v${version}"; - sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6"; + sha256 = "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry"; }; - patches = [ - ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch - ]; - - postPatch = ''patchShebangs .''; + postPatch = "patchShebangs ."; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -135,6 +131,12 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + #"--extra-cflags=" + #"--extra-cxxflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 @@ -159,6 +161,10 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optionals unitTestsSupport [ coreutils curl ]; + NIX_LDFLAGS = [ + "-lpthread" # fixes linker errors + ]; + enableParallelBuilding = true; postInstall = ''moveToOutput bin "$bin" ''; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index d2a98c4a847..6d24ba7f2ed 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format @@ -27,13 +27,17 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.0.3"; + version = "1.1.0"; - src = fetchurl { - url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; - sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; + src = fetchFromGitHub { + owner = "webmproject"; + repo = pname; + rev = version; + sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm"; }; + prePatch = "patchShebangs ."; + configureFlags = [ (mkFlag threadingSupport "threading") (mkFlag openglSupport "gl") @@ -50,6 +54,7 @@ stdenv.mkDerivation rec { (mkFlag libwebpdecoderSupport "libwebpdecoder") ]; + nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] ++ optionals openglSupport [ freeglut libGL libGLU ] ++ optional pngSupport libpng diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aeeb0514fab..aa180b94d74 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] -, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light , enableGalliumNine ? stdenv.isLinux @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.9"; + version = "20.2.1"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj"; + sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i"; }; prePatch = "patchShebangs ."; @@ -58,7 +58,6 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ./link-radv-with-ld_args_build_id.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Fix `-Werror=int-conversion` pthread warnings on musl. diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index acf3d827c56..fa78f4ae730 100644 --- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001 +From 980164fd92f5c2302624cd046d30ff21e6e4ba8a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index 1a2dd8ebd12..2ac741af5a6 100644 +index 2d39d13b6ad..daf06480a60 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -348,6 +348,12 @@ option( +@@ -368,6 +368,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -26,13 +26,13 @@ index 1a2dd8ebd12..2ac741af5a6 100644 + description : 'Mesa cache key.' +) option( - 'I-love-half-baked-turnips', + 'prefer-iris', type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index d1f14736725..2ed328f292e 100644 +index a92d621927a..3bd65c6890c 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -401,8 +401,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -43,7 +43,7 @@ index d1f14736725..2ed328f292e 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -423,6 +425,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -52,22 +52,23 @@ index d1f14736725..2ed328f292e 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index 9da29cc7390..5f549bb1d99 100644 +index 0893f64793b..d46ce85a85f 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -170,7 +170,12 @@ _libmesa_util = static_library( - include_directories : inc_common, +@@ -179,7 +179,12 @@ _libmesa_util = static_library( + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : deps_for_libmesa_util, link_with: libmesa_format, -- c_args : [c_msvc_compat_args, c_vis_args], +- c_args : [c_msvc_compat_args], + c_args : [ -+ c_msvc_compat_args, c_vis_args, ++ c_msvc_compat_args, + '-DDISK_CACHE_KEY="@0@"'.format( + get_option('disk-cache-key') + ), + ], + gnu_symbol_visibility : 'hidden', build_by_default : false ) - -- -2.25.1 +2.28.0 + diff --git a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch deleted file mode 100644 index 0a660332392..00000000000 --- a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 26 Jul 2020 17:29:49 -0300 -Subject: [PATCH] link radv with ld_args_build_id - -This is needed for radv_device_get_cache_uuid to work correctly. ---- - src/amd/vulkan/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build -index eec026e8f60..a07a0821938 100644 ---- a/src/amd/vulkan/meson.build -+++ b/src/amd/vulkan/meson.build -@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library( - ], - c_args : [c_vis_args, no_override_init_args, radv_flags], - cpp_args : [cpp_vis_args, radv_flags], -- link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], -+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], - link_depends : [libvulkan_radeon_link_depends,], - install : true, - ) --- -2.28.0 diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index 9685a1619a5..72488893c6b 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,18 +9,6 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 -+++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 -@@ -23,7 +23,9 @@ - */ - - #if defined(__linux__) -+#include - #include -+#include - #include - #include - #else --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 1fc38dd8aaa..c4a9a4a0180 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -160,8 +160,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1g"; - sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; + version = "1.1.1h"; + sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 46f520e41e4..31a7e7e9086 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Tests run in fakeroot for non-root users + preCheck = '' + if [ "$(id -u)" != "0" ]; then + export FAKED_MODE=1 + fi + ''; + doCheck = !stdenv.isDarwin; installFlags = [ diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 8302ebbd1e8..d5819ff7ee9 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: +{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium +, enableDrafts ? false }: stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9"; + sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd"; }; - nativeBuildInputs = [ cmake asciidoc ]; + nativeBuildInputs = [ cmake asciidoc pkg-config ]; + buildInputs = [ libsodium ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index bc3de37526a..7dbe3b98fca 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.15.8"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "edc31dc051db12c95da9bac0271cd1027b8e36912daf6d4580af53b23e62721a"; + sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; }; propagatedBuildInputs = [ python-dateutil ] diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index d61279e38d5..24e0f9792d7 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,13 @@ -{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: +{ lib +, fetchFromGitHub +, meson +, ninja +, buildPythonPackage +, pytestCheckHook +, pkg-config +, cairo +, isPy3k +}: buildPythonPackage rec { pname = "pycairo"; @@ -16,22 +25,25 @@ buildPythonPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ cairo - xlibsWrapper ]; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ]; + mesonFlags = [ + "-Dpython=${if isPy3k then "python3" else "python"}" + ]; meta = with lib; { description = "Python 2/3 bindings for cairo"; homepage = "https://pycairo.readthedocs.io/"; - license = with licenses; [ lgpl2 mpl11 ]; + license = with licenses; [ lgpl21Only mpl11 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 559a4c191b6..010f1d9c6c2 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -5,6 +5,7 @@ , ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) +, useOpenSSL ? !isBootstrap, openssl , useNcurses ? false, ncurses , useQt4 ? false, qt4 , withQt5 ? false, qtbase @@ -44,15 +45,17 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - buildInputs = - [ setupHook pkgconfig ] + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ setupHook pkgconfig ]; + + buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] + ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses ++ lib.optional useQt4 qt4 ++ lib.optional withQt5 qtbase; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin ps; preConfigure = '' @@ -91,13 +94,15 @@ stdenv.mkDerivation rec { "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - ] + + "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" # Avoid depending on frameworks. - ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + "-DBUILD_CursesDialog=${if useNcurses then "ON" else "OFF"}" + ]; # make install attempts to use the just-built cmake preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' - sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile + sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile ''; dontUseCmakeConfigure = true; diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch new file mode 100644 index 00000000000..5b9020b3d54 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch @@ -0,0 +1,40 @@ +From 536108b10271f2f42d41c7d9ddb4ce2ea1851f4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Sat, 17 Oct 2020 19:27:08 +0200 +Subject: [PATCH] boost: Do not add system paths on nix + +--- + mesonbuild/dependencies/boost.py | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py +index 907c0c275..ecaf11b18 100644 +--- a/mesonbuild/dependencies/boost.py ++++ b/mesonbuild/dependencies/boost.py +@@ -643,22 +643,7 @@ class BoostDependency(ExternalDependency): + roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()] + else: + tmp = [] # type: T.List[Path] +- +- # Homebrew +- brew_boost = Path('/usr/local/Cellar/boost') +- if brew_boost.is_dir(): +- tmp += [x for x in brew_boost.iterdir()] +- +- # Add some default system paths +- tmp += [Path('/opt/local')] +- tmp += [Path('/usr/local/opt/boost')] +- tmp += [Path('/usr/local')] +- tmp += [Path('/usr')] +- +- # Cleanup paths +- tmp = [x for x in tmp if x.is_dir()] +- tmp = [x.resolve() for x in tmp] +- roots += tmp ++ # Do not add any non-explicit paths on nix + + return roots + +-- +2.25.4 + diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 8421fb7d70a..1b9c3ef6477 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -52,6 +52,11 @@ python3.pkgs.buildPythonApplication rec { # cut-in-half-by-\0 store path references. # Let’s just clear the whole rpath and hope for the best. ./clear-old-rpath.patch + + # Patch out default boost search paths to avoid impure builds on + # unsandboxed non-NixOS builds, see: + # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 + ./boost-Do-not-add-system-paths-on-nix.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 0e10add5561..64fa92be865 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "4"; + apparmor-patchver = "5"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,19 +27,10 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; - }; - - # See This and the - # accompanying application in prePatchCommon should be removed in 2.13.5 - gnumake43Patch = fetchpatch { - url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"; - name = "2-23-fix-build-with-make-4.3.patch"; - sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9"; + sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3"; }; prePatchCommon = '' - patch -p1 < ${gnumake43Patch} chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index a9fcf455ee4..b3de7ceedaa 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg"; + sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out: + # TODO: Drop temporary version fix for 5.9 once 5.10 is out: substituteInPlace include/version.h \ - --replace "v5.7.0-77-gb687d1067169" "5.8.0" + --replace "5.8.0" "${version}" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 174f1be99db..7931e35a844 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libcap"; - version = "2.27"; + version = "2.44"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; + sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; }; outputs = [ "out" "dev" "lib" "man" "doc" "pam" ]; @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; + homepage = "https://sites.google.com/site/fullycapable"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cef9d96ae6e..da99280f63b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,27 +1,61 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap -, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi -, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor -, audit, lz4, bzip2, pcre2 -, linuxHeaders ? stdenv.cc.libc.linuxHeaders -, iptables, gnu-efi, bashInteractive -, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 -, ninja, meson, python3Packages, glibcLocales -, patchelf -, substituteAll -, getent -, cryptsetup, lvm2 +{ stdenv, lib, fetchFromGitHub , buildPackages -, perl +, ninja, meson, m4, pkgconfig, coreutils, gperf, getent +, patchelf, perl, glibcLocales, glib, substituteAll +, gettext, python3Packages + +# Mandatory dependencies +, libcap +, utillinux +, kbd +, kmod + +# Optional dependencies +, pam, cryptsetup, lvm2, audit, acl +, lz4, libgcrypt, libgpgerror, libidn2 +, curl, gnutar, gnupg, zlib +, xz, libuuid, libffi +, libapparmor, intltool +, bzip2, pcre2, e2fsprogs +, linuxHeaders ? stdenv.cc.libc.linuxHeaders +, gnu-efi +, iptables , withSelinux ? false, libselinux , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools +, bashInteractive + +, withResolved ? true +, withLogind ? true +, withHostnamed ? true +, withLocaled ? true +, withNetworkd ? true +, withTimedated ? true +, withTimesyncd ? true +, withHwdb ? true +, withEfi ? stdenv.hostPlatform.isEfi +, withImportd ? true +, withCryptsetup ? true + +# name argument +, pname ? "systemd" + + +, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 }: +assert withResolved -> (libgcrypt != null && libgpgerror != null); +assert withImportd -> + ( curl.dev != null && zlib != null && xz != null && libgcrypt != null + && gnutar != null && gnupg != null); + +assert withCryptsetup -> + ( cryptsetup != null ); + let version = "246.6"; in stdenv.mkDerivation { - inherit version; - pname = "systemd"; + inherit version pname; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. @@ -71,13 +105,17 @@ in stdenv.mkDerivation { outputs = [ "out" "man" "dev" ]; nativeBuildInputs = - [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 + [ pkgconfig gperf ninja meson coreutils # meson calls date, stat etc. glibcLocales patchelf getent m4 perl # to patch the libsystemd.so and remove dependencies on aarch64 + intltool + gettext + + libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ])) ]; buildInputs = @@ -86,9 +124,10 @@ in stdenv.mkDerivation { pcre2 ] ++ stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ - [ libffi audit lz4 bzip2 libapparmor - iptables gnu-efi - ] ++ stdenv.lib.optional withSelinux libselinux; + [ libffi audit lz4 bzip2 libapparmor iptables ] ++ + stdenv.lib.optional withEfi gnu-efi ++ + stdenv.lib.optional withSelinux libselinux ++ + stdenv.lib.optional withCryptsetup cryptsetup.dev; #dontAddPrefix = true; @@ -106,19 +145,23 @@ in stdenv.mkDerivation { "-Ddebug-shell=${bashInteractive}/bin/bash" # while we do not run tests we should also not build them. Removes about 600 targets "-Dtests=false" - "-Dimportd=true" + "-Dimportd=${stdenv.lib.boolToString withImportd}" "-Dlz4=true" "-Dhomed=false" - "-Dhostnamed=true" - "-Dnetworkd=true" + "-Dlogind=${stdenv.lib.boolToString withLogind}" + "-Dlocaled=${stdenv.lib.boolToString withLocaled}" + "-Dhostnamed=${stdenv.lib.boolToString withHostnamed}" + "-Dnetworkd=${stdenv.lib.boolToString withNetworkd}" + "-Dcryptsetup=${stdenv.lib.boolToString withCryptsetup}" "-Dportabled=false" + "-Dhwdb=${stdenv.lib.boolToString withHwdb}" "-Dremote=false" "-Dsysusers=false" - "-Dtimedated=true" - "-Dtimesyncd=true" + "-Dtimedated=${stdenv.lib.boolToString withTimedated}" + "-Dtimesyncd=${stdenv.lib.boolToString withTimesyncd}" "-Dfirstboot=false" "-Dlocaled=true" - "-Dresolve=true" + "-Dresolve=${stdenv.lib.boolToString withResolved}" "-Dsplit-usr=false" "-Dlibcurl=true" "-Dlibidn=false" @@ -141,11 +184,6 @@ in stdenv.mkDerivation { "-Dsystem-gid-max=999" # "-Dtime-epoch=1" - (if !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") - "-Defi-libdir=${toString gnu-efi}/lib" - "-Defi-includedir=${toString gnu-efi}/include/efi" - "-Defi-ldsdir=${toString gnu-efi}/lib" - "-Dsysvinit-path=" "-Dsysvrcnd-path=" @@ -161,6 +199,12 @@ in stdenv.mkDerivation { # Upstream defaulted to disable manpages since they optimize for the much # more frequent development builds "-Dman=true" + + "-Dgnu-efi=${stdenv.lib.boolToString (withEfi && gnu-efi != null)}" + ] ++ stdenv.lib.optionals (withEfi && gnu-efi != null) [ + "-Defi-libdir=${toString gnu-efi}/lib" + "-Defi-includedir=${toString gnu-efi}/include/efi" + "-Defi-ldsdir=${toString gnu-efi}/lib" ]; preConfigure = '' @@ -284,6 +328,6 @@ in stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ andir eelco flokli ]; + maintainers = with maintainers; [ andir eelco flokli kloenk ]; }; } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index efc2cb2acbd..96f40649c0f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.6.8"; + name = "libX11-1.6.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2"; - sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj"; + url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2"; + sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.11"; + name = "libXvMC-1.0.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2"; - sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"; + url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; + sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; { }) {}; libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation { - name = "libxcb-1.13.1"; + name = "libxcb-1.14"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2"; - sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; + url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; + sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python ]; @@ -1431,11 +1431,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { - name = "xcb-proto-1.13"; + name = "xcb-proto-1.14.1"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2"; - sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; + url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; + sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python ]; @@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-0.28.2"; + name = "xf86-input-libinput-0.30.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2"; - sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"; + sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { - name = "xorgproto-2019.1"; + name = "xorgproto-2020.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2"; - sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"; + url = "mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2"; + sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 80ea5553ad6..e6047458cf2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -82,13 +82,6 @@ self: super: libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; - patches = [ - # Fixes an issue that happens when cross-compiling for us. - (fetchpatch { - url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac"; - sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza"; - }) - ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ecc477980b8..cd294604884 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,7 +1,5 @@ https://invisible-mirror.net/archives/luit/luit-20190106.tgz https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 -https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 @@ -83,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 @@ -177,10 +175,11 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 +mirror://xorg/individual/lib/libxcb-1.14.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2 @@ -206,12 +205,13 @@ mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 -mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 -mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2 +mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz +mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index eeb175a5e78..5fda5704812 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "scop"; repo = "bash-completion"; rev = version; - sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq"; + sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index a040e6ab242..58da8b71b65 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -190,10 +190,7 @@ in rec { stage1 = prevStage: let persistent = self: super: with prevStage; { - cmake = super.cmake.override { - isBootstrap = true; - useSharedLibraries = false; - }; + cmake = super.cmakeMinimal; python3 = super.python3Minimal; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 85142090dd4..d9befb9350a 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -27,6 +27,8 @@ with pkgs; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + install-shell-files = callPackage ./install-shell-files {}; + kernel-config = callPackage ./kernel.nix {}; ld-library-path = callPackage ./ld-library-path {}; diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix new file mode 100644 index 00000000000..e3729c7d250 --- /dev/null +++ b/pkgs/test/install-shell-files/default.nix @@ -0,0 +1,125 @@ +{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: + +let + runTest = name: env: buildCommand: + runCommandLocal "install-shell-files--${name}" ({ + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = stdenv.lib.platforms.all; + } // env) buildCommand; +in + +recurseIntoAttrs { + # installManPage + + install-manpage = runTest "install-manpage" {} '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.2.gz + echo baz > doc/baz.3 + + installManPage doc/* + + cmp doc/foo.1 $out/share/man/man1/foo.1 + cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz + cmp doc/baz.3 $out/share/man/man3/baz.3 + ''; + install-manpage-outputs = runTest "install-manpage-outputs" { + outputs = [ "out" "man" "devman" ]; + } '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.3 + + installManPage doc/* + + # assert they didn't go into $out + [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] + + # foo.1 alone went into man + cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 + [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] + + # bar.3 alone went into devman + cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 + [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] + + touch $out + ''; + + # installShellCompletion + + install-completion = runTest "install-completion" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + echo qux > qux.zsh + echo quux > quux + + installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux + + cmp foo $out/share/bash-completion/completions/foo + cmp bar $out/share/bash-completion/completions/bar + cmp baz $out/share/zsh/site-functions/_baz + cmp qux.zsh $out/share/zsh/site-functions/_qux + cmp quux $out/share/fish/vendor_completions.d/quux + ''; + install-completion-output = runTest "install-completion-output" { + outputs = [ "out" "bin" ]; + } '' + echo foo > foo + + installShellCompletion --bash foo + + # assert it didn't go into $out + [[ ! -f $out/share/bash-completion/completions/foo ]] + + cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo + + touch $out + ''; + install-completion-name = runTest "install-completion-name" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + + installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz + + cmp foo $out/share/bash-completion/completions/foobar.bash + cmp bar $out/share/zsh/site-functions/_foobar + cmp baz $out/share/fish/vendor_completions.d/baz + ''; + install-completion-inference = runTest "install-completion-inference" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + + installShellCompletion foo.bash bar.zsh baz.fish + + cmp foo.bash $out/share/bash-completion/completions/foo.bash + cmp bar.zsh $out/share/zsh/site-functions/_bar + cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish + ''; + install-completion-cmd = runTest "install-completion-cmd" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + echo qux > qux.fish + + installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish + + cmp foo.bash $out/share/bash-completion/completions/foobar.bash + cmp bar.zsh $out/share/zsh/site-functions/_foobar + cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish + cmp qux.fish $out/share/fish/vendor_completions.d/qux + ''; + install-completion-fifo = runTest "install-completion-fifo" {} '' + installShellCompletion \ + --bash --name foo.bash <(echo foo) \ + --zsh --name _foo <(echo bar) \ + --fish --name foo.fish <(echo baz) + + [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } + [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } + [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } + ''; +} diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index bf20e0119ec..fd4872cf844 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "brotli"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; + sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; nativeBuildInputs = [ cmake ]; @@ -32,7 +32,14 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) - prePatch = "rm BUILD"; + prePatch = '' + rm BUILD + + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. diff --git a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch deleted file mode 100644 index ae1a02d4d20..00000000000 --- a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001 -From: Assaf Gordon -Date: Mon, 13 May 2019 16:37:40 -0600 -Subject: [PATCH] tests: avoid false-positive in date-debug test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When debugging an invalid date due to DST switching, the intermediate -'normalized time' should not be checked - its value can differ between -systems (e.g. glibc vs musl). - -Reported by Niklas Hambüchen in -https://lists.gnu.org/r/coreutils/2019-05/msg00031.html -Analyzed by Rich Felker in -https://lists.gnu.org/r/coreutils/2019-05/msg00039.html - -* tests/misc/date-debug.sh: Replace the exact normalized time -with 'XX:XX:XX' so different values would not trigger test failure. ---- - tests/misc/date-debug.sh | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh -index aa47f1abb..2ce6f4ce8 100755 ---- a/tests/misc/date-debug.sh -+++ b/tests/misc/date-debug.sh -@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string - date: using specified time as starting value: '02:30:00' - date: error: invalid date/time value: - date: user provided time: '(Y-M-D) 2006-04-02 02:30:00' --date: normalized time: '(Y-M-D) 2006-04-02 03:30:00' -+date: normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX' - date: -- - date: possible reasons: - date: non-existing due to daylight-saving time; -@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00' - EOF - - # date should return 1 (error) for invalid date --returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1 -+returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1 -+ -+# The output line of "normalized time" can differ between systems -+# (e.g. glibc vs musl) and should not be checked. -+# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html -+sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \ -+ out2-t > out2 || framework_failure_ -+ - compare exp2 out2 || fail=1 - - ## diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch deleted file mode 100644 index 97d95d1c5b1..00000000000 --- a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 11 Mar 2019 16:40:29 -0700 -Subject: [PATCH 1/1] strtod: fix clash with strtold - -Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817). -* lib/strtod.c (compute_minus_zero, minus_zero): -Simplify by remving the macro / external variable, -and having just a function. User changed. This avoids -the need for an external variable that might clash. ---- - ChangeLog | 9 +++++++++ - lib/strtod.c | 11 +++++------ - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/lib/strtod.c b/lib/strtod.c -index b9eaa51..69b1564 100644 ---- a/lib/strtod.c -+++ b/lib/strtod.c -@@ -294,16 +294,15 @@ parse_number (const char *nptr, - ICC 10.0 has a bug when optimizing the expression -zero. - The expression -MIN * MIN does not work when cross-compiling - to PowerPC on Mac OS X 10.5. */ --#if defined __hpux || defined __sgi || defined __ICC - static DOUBLE --compute_minus_zero (void) -+minus_zero (void) - { -+#if defined __hpux || defined __sgi || defined __ICC - return -MIN * MIN; --} --# define minus_zero compute_minus_zero () - #else --DOUBLE minus_zero = -0.0; -+ return -0.0; - #endif -+} - - /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the - character after the last one used in the number is put in *ENDPTR. */ -@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr) - /* Special case -0.0, since at least ICC miscompiles negation. We - can't use copysign(), as that drags in -lm on some platforms. */ - if (!num && negative) -- return minus_zero; -+ return minus_zero (); - return negative ? -num : num; - } --- -1.9.1 - diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch deleted file mode 100644 index 02b0b85db31..00000000000 --- a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch +++ /dev/null @@ -1,1153 +0,0 @@ -From 453ff940449bbbde9ec00f0bbf82a359c5598fc7 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sat, 23 Mar 2019 23:00:52 +0100 -Subject: [PATCH 1/1] Support cross-compilation to musl libc. - -Reported by Necktwi Ozfguah . - -* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Add cross-compilation guesses for -musl libc. -* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Likewise. -* m4/chown.m4 (gl_FUNC_CHOWN): Likewise. -* m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise. -* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise. -* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise. -* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise. -* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise. -* m4/getcwd-abort-bug.m4 (gl_FUNC_GETCWD_ABORT_BUG): Likewise. -* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise. -* m4/getgroups.m4 (AC_FUNC_GETGROUPS, gl_FUNC_GETGROUPS): Likewise. -* m4/getline.m4 (gl_FUNC_GETLINE): Likewise. -* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY_CLOBBER): Likewise. -* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise. // removed -* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise. // removed -* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise. // removed -* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise. // removed -* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise. -* m4/log.m4 (gl_FUNC_LOG): Likewise. // removed -* m4/logf.m4 (gl_FUNC_LOGF): Likewise. // removed -* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise. // removed -* m4/log10.m4 (gl_FUNC_LOG10): Likewise. // removed -* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise. // removed -* m4/log10l.m4 (gl_FUNC_LOG10L): Likewise. // removed -* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise. // removed -* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise. // removed -* m4/log1pl.m4 (gl_FUNC_LOG1PL): Likewise. // removed -* m4/log2.m4 (gl_FUNC_LOG2): Likewise. // removed -* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise. // removed -* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise. -* m4/mkdir.m4 (gl_FUNC_MKDIR): Likewise. -* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise. -* m4/modf.m4 (gl_FUNC_MODF): Likewise. // removed -* m4/modff.m4 (gl_FUNC_MODFF): Likewise. // removed -* m4/modfl.m4 (gl_FUNC_MODFL): Likewise. // removed -* m4/perror.m4 (gl_FUNC_PERROR): Likewise. -* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE, -gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A, -gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99, -gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N, -gl_VSNPRINTF_ZEROSIZE_C99): Likewise. -* m4/ptsname.m4 (gl_FUNC_PTSNAME): Likewise. // removed -* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise. -* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise. -* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise. // removed -* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise. // removed -* m4/remainderl.m4 (gl_FUNC_REMAINDERL): Likewise. // removed -* m4/rintl.m4 (gl_FUNC_RINTL): Likewise. // removed -* m4/round.m4 (gl_FUNC_ROUND): Likewise. // removed -* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. // removed -* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. // removed -* m4/setenv.m4 (gl_FUNC_SETENV): Likewise. -* m4/signbit.m4 (gl_SIGNBIT): Likewise. -* m4/sleep.m4 (gl_FUNC_SLEEP): Likewise. -* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise. -* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise. -* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise. -* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise. -* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. // removed -* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. // removed -* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. // removed -* m4/tzset.m4 (gl_FUNC_TZSET_CLOBBER): Likewise. -* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise. -* m4/usleep.m4 (gl_FUNC_USLEEP): Likewise. -* m4/utimes.m4 (gl_FUNC_UTIMES): Likewise. -* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise. ---- - m4/calloc.m4 | 4 ++- - m4/canonicalize.m4 | 4 ++- - m4/chown.m4 | 22 +++++++------ - m4/d-ino.m4 | 16 +++++----- - m4/fdopendir.m4 | 12 ++++--- - m4/fnmatch.m4 | 18 ++++++++--- - m4/fpurge.m4 | 24 +++++++++----- - m4/getcwd-abort-bug.m4 | 11 +++++-- - m4/getcwd.m4 | 4 ++- - m4/getdelim.m4 | 40 ++++++++++++++---------- - m4/getgroups.m4 | 6 +++- - m4/getline.m4 | 38 +++++++++++++--------- - m4/gettimeofday.m4 | 4 ++- - m4/link-follow.m4 | 4 ++- - m4/malloc.m4 | 4 +-- - m4/mkdir.m4 | 4 ++- - m4/mkstemp.m4 | 4 ++- - m4/perror.m4 | 12 ++++--- - m4/printf.m4 | 22 ++++++++++++- - m4/putenv.m4 | 4 ++- - m4/realloc.m4 | 4 +-- - m4/setenv.m4 | 4 ++- - m4/signbit.m4 | 6 +++- - m4/sleep.m4 | 4 ++- - m4/stpncpy.m4 | 14 +++++++-- - m4/strerror.m4 | 6 +++- - m4/strtod.m4 | 10 +++--- - m4/strtold.m4 | 9 ++++-- - m4/tzset.m4 | 4 ++- - m4/ungetc.m4 | 18 ++++++----- - m4/usleep.m4 | 4 ++- - m4/utimes.m4 | 10 +++--- - m4/wcwidth.m4 | 12 ++++--- - 76 files changed, 461 insertions(+), 157 deletions(-) - -diff --git a/m4/calloc.m4 b/m4/calloc.m4 -index 012a5bf..d76535d 100644 ---- a/m4/calloc.m4 -+++ b/m4/calloc.m4 -@@ -1,4 +1,4 @@ --# calloc.m4 serial 18 -+# calloc.m4 serial 19 - - # Copyright (C) 2004-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -40,6 +40,8 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 -index 5b6e25d..b61747b 100644 ---- a/m4/canonicalize.m4 -+++ b/m4/canonicalize.m4 -@@ -1,4 +1,4 @@ --# canonicalize.m4 serial 29 -+# canonicalize.m4 serial 30 - - dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc. - -@@ -113,6 +113,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_realpath_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_realpath_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/chown.m4 b/m4/chown.m4 -index ecfc0c0..b798325 100644 ---- a/m4/chown.m4 -+++ b/m4/chown.m4 -@@ -1,4 +1,4 @@ --# serial 30 -+# serial 32 - # Determine whether we need the chown wrapper. - - dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software -@@ -109,10 +109,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN], - [gl_cv_func_chown_slash_works=yes], - [gl_cv_func_chown_slash_works=no], - [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_chown_slash_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_chown_slash_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_chown_slash_works="guessing no" ;; - esac - ]) - rm -f conftest.link conftest.file]) -@@ -145,10 +147,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN], - [gl_cv_func_chown_ctime_works=yes], - [gl_cv_func_chown_ctime_works=no], - [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_chown_ctime_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_chown_ctime_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_chown_ctime_works="guessing no" ;; - esac - ]) - rm -f conftest.file]) -diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 -index f1420cc..87dcacc 100644 ---- a/m4/d-ino.m4 -+++ b/m4/d-ino.m4 -@@ -1,4 +1,4 @@ --# serial 18 -+# serial 19 - - dnl From Jim Meyering. - dnl -@@ -40,12 +40,14 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], - [gl_cv_struct_dirent_d_ino=yes], - [gl_cv_struct_dirent_d_ino=no], - [case "$host_os" in -- # Guess yes on glibc systems with Linux kernel. -- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -- # Guess no on native Windows. -- mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; -- # If we don't know, assume the worst. -- *) gl_cv_struct_dirent_d_ino="guessing no" ;; -+ # Guess yes on glibc systems with Linux kernel. -+ linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -+ # Guess yes on musl systems with Linux kernel. -+ linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -+ # Guess no on native Windows. -+ mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_struct_dirent_d_ino="guessing no" ;; - esac - ])]) - case "$gl_cv_struct_dirent_d_ino" in -diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 -index 0490551..b2b3b03 100644 ---- a/m4/fdopendir.m4 -+++ b/m4/fdopendir.m4 -@@ -1,4 +1,4 @@ --# serial 10 -+# serial 11 - # See if we need to provide fdopendir. - - dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. -@@ -45,10 +45,12 @@ DIR *fdopendir (int); - [gl_cv_func_fdopendir_works=yes], - [gl_cv_func_fdopendir_works=no], - [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_fdopendir_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_fdopendir_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_fdopendir_works="guessing no" ;; - esac - ])]) - case "$gl_cv_func_fdopendir_works" in -diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 -index c264ca7..75ba55b 100644 ---- a/m4/fnmatch.m4 -+++ b/m4/fnmatch.m4 -@@ -1,4 +1,4 @@ --# Check for fnmatch - serial 13. -*- coding: utf-8 -*- -+# Check for fnmatch - serial 14. -*- coding: utf-8 -*- - - # Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], - m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX]) - - AC_REQUIRE([gl_FNMATCH_H]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - gl_fnmatch_required_lowercase=` - echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]' - ` -@@ -117,12 +118,19 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], - ]])], - [eval "$gl_fnmatch_cache_var=yes"], - [eval "$gl_fnmatch_cache_var=no"], -- [eval "$gl_fnmatch_cache_var=\"guessing no\""]) -+ [case "$host_os" in -+ # Guess yes on musl systems. -+ *-musl*) eval "$gl_fnmatch_cache_var=\"guessing yes\"" ;; -+ # Guess no otherwise, even on glibc systems. -+ *) eval "$gl_fnmatch_cache_var=\"guessing no\"" ;; -+ esac -+ ]) - ]) - eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\"" -- if test "$gl_fnmatch_result" != yes; then -- REPLACE_FNMATCH=1 -- fi -+ case "$gl_fnmatch_result" in -+ *yes) ;; -+ *) REPLACE_FNMATCH=1 ;; -+ esac - fi - if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then - gl_REPLACE_FNMATCH_H -diff --git a/m4/fpurge.m4 b/m4/fpurge.m4 -index cb21f56..6c5b3e9 100644 ---- a/m4/fpurge.m4 -+++ b/m4/fpurge.m4 -@@ -1,4 +1,4 @@ --# fpurge.m4 serial 8 -+# fpurge.m4 serial 9 - dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,12 +7,13 @@ dnl with or without modifications, as long as this notice is preserved. - AC_DEFUN([gl_FUNC_FPURGE], - [ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_FUNCS_ONCE([fpurge]) - AC_CHECK_FUNCS_ONCE([__fpurge]) - AC_CHECK_DECLS([fpurge], , , [[#include ]]) - if test "x$ac_cv_func_fpurge" = xyes; then - HAVE_FPURGE=1 -- # Detect BSD bug. Only cygwin 1.7 is known to be immune. -+ # Detect BSD bug. Only cygwin 1.7 and musl are known to be immune. - AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( -@@ -48,11 +49,20 @@ AC_DEFUN([gl_FUNC_FPURGE], - return 13; - return 0; - ])], -- [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no], -- [gl_cv_func_fpurge_works='guessing no'])]) -- if test "x$gl_cv_func_fpurge_works" != xyes; then -- REPLACE_FPURGE=1 -- fi -+ [gl_cv_func_fpurge_works=yes], -+ [gl_cv_func_fpurge_works=no], -+ [case "$host_os" in -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_fpurge_works="guessing yes" ;; -+ # Guess no otherwise. -+ *) gl_cv_func_fpurge_works="guessing no" ;; -+ esac -+ ]) -+ ]) -+ case "$gl_cv_func_fpurge_works" in -+ *yes) ;; -+ *) REPLACE_FPURGE=1 ;; -+ esac - else - HAVE_FPURGE=0 - fi -diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 -index f0f24a5..7227f08 100644 ---- a/m4/getcwd-abort-bug.m4 -+++ b/m4/getcwd-abort-bug.m4 -@@ -1,4 +1,4 @@ --# serial 9 -+# serial 11 - # Determine whether getcwd aborts when the length of the working directory - # name is unusually large. Any length between 4k and 16k trigger the bug - # when using glibc-2.4.90-9 or older. -@@ -13,6 +13,7 @@ - # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) - AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG], - [ -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_DECLS_ONCE([getcwd]) - AC_CHECK_HEADERS_ONCE([unistd.h]) - AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ]) -@@ -142,7 +143,13 @@ main () - else - gl_cv_func_getcwd_abort_bug=no - fi], -- [gl_cv_func_getcwd_abort_bug=yes]) -+ [case "$host_os" in -+ # Guess no on musl systems. -+ *-musl*) gl_cv_func_getcwd_abort_bug="guessing no" ;; -+ # Guess yes otherwise, even on glibc systems. -+ *) gl_cv_func_getcwd_abort_bug="guessing yes" -+ esac -+ ]) - ]) - AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2]) - ]) -diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 -index 4929b51..625171a 100644 ---- a/m4/getcwd.m4 -+++ b/m4/getcwd.m4 -@@ -6,7 +6,7 @@ - # with or without modifications, as long as this notice is preserved. - - # Written by Paul Eggert. --# serial 16 -+# serial 17 - - AC_DEFUN([gl_FUNC_GETCWD_NULL], - [ -@@ -50,6 +50,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], - [[case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. - cygwin*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. -diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 -index bf17c57..e77c379 100644 ---- a/m4/getdelim.m4 -+++ b/m4/getdelim.m4 -@@ -1,4 +1,4 @@ --# getdelim.m4 serial 12 -+# getdelim.m4 serial 13 - - dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc. - dnl -@@ -11,6 +11,7 @@ AC_PREREQ([2.59]) - AC_DEFUN([gl_FUNC_GETDELIM], - [ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Persuade glibc to declare getdelim(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM], - if test $ac_cv_func_getdelim = yes; then - HAVE_GETDELIM=1 - dnl Found it in some library. Verify that it works. -- AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim], -- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_CACHE_CHECK([for working getdelim function], -+ [gl_cv_func_working_getdelim], -+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - # include - # include - # include -@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM], - fclose (in); - return 0; - } -- ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works. -- , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work. -- , dnl We're cross compiling. Assume it works on glibc2 systems. -- [AC_EGREP_CPP([Lucky GNU user], -- [ -+ ]])], -+ [gl_cv_func_working_getdelim=yes], -+ [gl_cv_func_working_getdelim=no], -+ [dnl We're cross compiling. -+ dnl Guess it works on glibc2 systems and musl systems. -+ AC_EGREP_CPP([Lucky GNU user], -+ [ - #include - #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) && !defined __UCLIBC__ - Lucky GNU user - #endif - #endif -- ], -- [gl_cv_func_working_getdelim="guessing yes"], -- [gl_cv_func_working_getdelim="guessing no"])] -- )]) -+ ], -+ [gl_cv_func_working_getdelim="guessing yes"], -+ [case "$host_os" in -+ *-musl*) gl_cv_func_working_getdelim="guessing yes" ;; -+ *) gl_cv_func_working_getdelim="guessing no" ;; -+ esac -+ ]) -+ ]) -+ ]) - case "$gl_cv_func_working_getdelim" in -- *no) -- REPLACE_GETDELIM=1 -- ;; -+ *yes) ;; -+ *) REPLACE_GETDELIM=1 ;; - esac - else - HAVE_GETDELIM=0 -diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 -index 2ce986e..c93447b 100644 ---- a/m4/getgroups.m4 -+++ b/m4/getgroups.m4 -@@ -1,4 +1,4 @@ --# serial 21 -+# serial 22 - - dnl From Jim Meyering. - dnl A wrapper around AC_FUNC_GETGROUPS. -@@ -42,6 +42,8 @@ AC_DEFUN([AC_FUNC_GETGROUPS], - [case "$host_os" in # (( - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) ac_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_getgroups_works="guessing no" ;; - esac -@@ -95,6 +97,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_getgroups_works="guessing no" ;; - esac -diff --git a/m4/getline.m4 b/m4/getline.m4 -index 5b2ead2..32f771c 100644 ---- a/m4/getline.m4 -+++ b/m4/getline.m4 -@@ -1,4 +1,4 @@ --# getline.m4 serial 28 -+# getline.m4 serial 29 - - dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation, - dnl Inc. -@@ -16,6 +16,7 @@ dnl to do with the function we need. - AC_DEFUN([gl_FUNC_GETLINE], - [ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Persuade glibc to declare getline(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE], - gl_getline_needs_run_time_check=yes], - [am_cv_func_working_getline=no]) - if test $gl_getline_needs_run_time_check = yes; then -- AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline], -- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_CACHE_CHECK([for working getline function], -+ [am_cv_func_working_getline], -+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - # include - # include - # include -@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE], - fclose (in); - return 0; - } -- ]])], [am_cv_func_working_getline=yes] dnl The library version works. -- , [am_cv_func_working_getline=no] dnl The library version does NOT work. -- , dnl We're cross compiling. Assume it works on glibc2 systems. -- [AC_EGREP_CPP([Lucky GNU user], -- [ -+ ]])], -+ [am_cv_func_working_getline=yes], -+ [am_cv_func_working_getline=no], -+ [dnl We're cross compiling. -+ dnl Guess it works on glibc2 systems and musl systems. -+ AC_EGREP_CPP([Lucky GNU user], -+ [ - #include - #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) && !defined __UCLIBC__ - Lucky GNU user - #endif - #endif -- ], -- [am_cv_func_working_getline="guessing yes"], -- [am_cv_func_working_getline="guessing no"])] -- )]) -+ ], -+ [am_cv_func_working_getline="guessing yes"], -+ [case "$host_os" in -+ *-musl*) am_cv_func_working_getline="guessing yes" ;; -+ *) am_cv_func_working_getline="guessing no" ;; -+ esac -+ ]) -+ ]) -+ ]) - fi - - if test $ac_cv_have_decl_getline = no; then -@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE], - fi - - case "$am_cv_func_working_getline" in -- *no) -+ *yes) ;; -+ *) - dnl Set REPLACE_GETLINE always: Even if we have not found the broken - dnl getline function among $LIBS, it may exist in libinet and the - dnl executable may be linked with -linet. -diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 -index d29b4bf..5e2ef6f 100644 ---- a/m4/gettimeofday.m4 -+++ b/m4/gettimeofday.m4 -@@ -1,4 +1,4 @@ --# serial 25 -+# serial 26 - - # Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], - case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; -+ # Guess all is fine on musl systems. -+ *-musl*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 -index cbd2dca..8ac7301 100644 ---- a/m4/link-follow.m4 -+++ b/m4/link-follow.m4 -@@ -1,4 +1,4 @@ --# serial 20 -+# serial 21 - dnl Run a program to determine whether link(2) follows symlinks. - dnl Set LINK_FOLLOWS_SYMLINKS accordingly. - -@@ -88,6 +88,8 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], - case "$host_os" in - # On glibc/Linux we know the result. - linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;; -+ # On musl/Linux we know the result. -+ linux*-musl*) gl_cv_func_link_follows_symlink="guessing no" ;; - # Otherwise, we don't know. - *) gl_cv_func_link_follows_symlink=unknown ;; - esac -diff --git a/m4/malloc.m4 b/m4/malloc.m4 -index b9b8d4b..c469c45 100644 ---- a/m4/malloc.m4 -+++ b/m4/malloc.m4 -@@ -1,4 +1,4 @@ --# malloc.m4 serial 17 -+# malloc.m4 serial 19 - dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ac_cv_func_malloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ -+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) - ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 -index 4cd9590..366a3cd 100644 ---- a/m4/mkdir.m4 -+++ b/m4/mkdir.m4 -@@ -1,4 +1,4 @@ --# serial 14 -+# serial 15 - - # Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -62,6 +62,8 @@ AC_DEFUN([gl_FUNC_MKDIR], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 -index ae24c3b..1b15c2e 100644 ---- a/m4/mkstemp.m4 -+++ b/m4/mkstemp.m4 -@@ -1,4 +1,4 @@ --#serial 25 -+#serial 26 - - # Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -59,6 +59,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_working_mkstemp="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_working_mkstemp="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/perror.m4 b/m4/perror.m4 -index 335be72..08e2db1 100644 ---- a/m4/perror.m4 -+++ b/m4/perror.m4 -@@ -1,4 +1,4 @@ --# perror.m4 serial 7 -+# perror.m4 serial 8 - dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -48,10 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR], - rm -rf conftest.txt1 conftest.txt2], - [gl_cv_func_perror_works=no], - [case "$host_os" in -- # Guess yes on native Windows. -- mingw*) gl_cv_func_perror_works="guessing yes" ;; -- # Otherwise guess no. -- *) gl_cv_func_perror_works="guessing no" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_perror_works="guessing yes" ;; -+ # Guess yes on native Windows. -+ mingw*) gl_cv_func_perror_works="guessing yes" ;; -+ # Otherwise guess no. -+ *) gl_cv_func_perror_works="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/printf.m4 b/m4/printf.m4 -index cbf6ae4..6d2280e 100644 ---- a/m4/printf.m4 -+++ b/m4/printf.m4 -@@ -1,4 +1,4 @@ --# printf.m4 serial 60 -+# printf.m4 serial 61 - dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -62,6 +62,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; -@@ -240,6 +242,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_infinite="guessing yes";; - # Guess yes on FreeBSD >= 6. - freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; -@@ -457,6 +461,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";; - # Guess yes on FreeBSD >= 6. - freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; -@@ -575,6 +581,8 @@ int main () - [gl_cv_func_printf_directive_a="guessing yes"], - [gl_cv_func_printf_directive_a="guessing no"]) - ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_directive_a="guessing yes";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_directive_a="guessing no";; - # Guess no on native Windows. -@@ -625,6 +633,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_directive_f="guessing yes";; - # Guess yes on FreeBSD >= 6. - freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; -@@ -960,6 +970,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess no on Android. -@@ -1206,6 +1218,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; -@@ -1308,6 +1322,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; -@@ -1400,6 +1416,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; -@@ -1554,6 +1572,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; -diff --git a/m4/putenv.m4 b/m4/putenv.m4 -index f8960f6..342ba26 100644 ---- a/m4/putenv.m4 -+++ b/m4/putenv.m4 -@@ -1,4 +1,4 @@ --# putenv.m4 serial 22 -+# putenv.m4 serial 23 - dnl Copyright (C) 2002-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -36,6 +36,8 @@ AC_DEFUN([gl_FUNC_PUTENV], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_svid_putenv="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_svid_putenv="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/realloc.m4 b/m4/realloc.m4 -index f9f15ad..93066e8 100644 ---- a/m4/realloc.m4 -+++ b/m4/realloc.m4 -@@ -1,4 +1,4 @@ --# realloc.m4 serial 15 -+# realloc.m4 serial 17 - dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ac_cv_func_realloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ -+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) - ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/setenv.m4 b/m4/setenv.m4 -index 6101274..a8f83d6 100644 ---- a/m4/setenv.m4 -+++ b/m4/setenv.m4 -@@ -1,4 +1,4 @@ --# setenv.m4 serial 27 -+# setenv.m4 serial 28 - dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -37,6 +37,8 @@ AC_DEFUN([gl_FUNC_SETENV], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_setenv_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_setenv_works="guessing no" ;; - esac -diff --git a/m4/signbit.m4 b/m4/signbit.m4 -index bf5bce5..f7f2f3d 100644 ---- a/m4/signbit.m4 -+++ b/m4/signbit.m4 -@@ -1,4 +1,4 @@ --# signbit.m4 serial 16 -+# signbit.m4 serial 17 - dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_signbit="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_signbit="guessing yes" ;; - # If we don't know, assume the worst. -@@ -62,6 +64,8 @@ AC_DEFUN([gl_SIGNBIT], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_signbit_gcc="guessing yes" ;; - # Guess yes on mingw, no on MSVC. - mingw*) if test -n "$GCC"; then - gl_cv_func_signbit_gcc="guessing yes" -diff --git a/m4/sleep.m4 b/m4/sleep.m4 -index 5f71cc7..7bab467 100644 ---- a/m4/sleep.m4 -+++ b/m4/sleep.m4 -@@ -1,4 +1,4 @@ --# sleep.m4 serial 9 -+# sleep.m4 serial 10 - dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -48,6 +48,8 @@ handle_alarm (int sig) - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_sleep_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_sleep_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 -index 83425dd..f8e1a7c 100644 ---- a/m4/stpncpy.m4 -+++ b/m4/stpncpy.m4 -@@ -1,4 +1,4 @@ --# stpncpy.m4 serial 16 -+# stpncpy.m4 serial 17 - dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_STPNCPY], - [ -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles -+ - dnl Persuade glibc to declare stpncpy(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - -@@ -69,12 +71,18 @@ int main () - ]])], - [gl_cv_func_stpncpy=yes], - [gl_cv_func_stpncpy=no], -- [AC_EGREP_CPP([Thanks for using GNU], [ -+ [dnl Guess yes on glibc systems and musl systems. -+ AC_EGREP_CPP([Thanks for using GNU], [ - #include - #ifdef __GNU_LIBRARY__ - Thanks for using GNU - #endif --], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"]) -+], [gl_cv_func_stpncpy="guessing yes"], -+ [case "$host_os" in -+ *-musl*) gl_cv_func_stpncpy="guessing yes" ;; -+ *) gl_cv_func_stpncpy="guessing no" ;; -+ esac -+ ]) - ]) - ]) - case "$gl_cv_func_stpncpy" in -diff --git a/m4/strerror.m4 b/m4/strerror.m4 -index b452f7f..2c90f31 100644 ---- a/m4/strerror.m4 -+++ b/m4/strerror.m4 -@@ -1,4 +1,4 @@ --# strerror.m4 serial 19 -+# strerror.m4 serial 20 - dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_working_strerror="guessing no" ;; - esac -@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/strtod.m4 b/m4/strtod.m4 -index 9912217..d68ab75 100644 ---- a/m4/strtod.m4 -+++ b/m4/strtod.m4 -@@ -1,4 +1,4 @@ --# strtod.m4 serial 24 -+# strtod.m4 serial 25 - dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -115,9 +115,11 @@ numeric_equal (double x, double y) - ], - [gl_cv_func_strtod_works="guessing yes"], - [case "$host_os" in -- # Guess yes on native Windows. -- mingw*) gl_cv_func_strtod_works="guessing yes" ;; -- *) gl_cv_func_strtod_works="guessing no" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_strtod_works="guessing yes" ;; -+ # Guess yes on native Windows. -+ mingw*) gl_cv_func_strtod_works="guessing yes" ;; -+ *) gl_cv_func_strtod_works="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/strtold.m4 b/m4/strtold.m4 -index 16b4eda..17125fe 100644 ---- a/m4/strtold.m4 -+++ b/m4/strtold.m4 -@@ -1,4 +1,4 @@ --# strtold.m4 serial 2 -+# strtold.m4 serial 4 - dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -98,7 +98,12 @@ numeric_equal (long double x, long double y) - #endif - ], - [gl_cv_func_strtold_works="guessing yes"], -- [gl_cv_func_strtod_works="guessing no"]) -+ [case "$host_os" in -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_strtold_works="guessing yes" ;; -+ *) gl_cv_func_strtold_works="guessing no" ;; -+ esac -+ ]) - ]) - ]) - case "$gl_cv_func_strtold_works" in -diff --git a/m4/tzset.m4 b/m4/tzset.m4 -index 1278801..afdfa8e 100644 ---- a/m4/tzset.m4 -+++ b/m4/tzset.m4 -@@ -1,4 +1,4 @@ --# serial 11 -+# serial 12 - - # Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -70,6 +70,8 @@ main () - [case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;; -+ # Guess all is fine on musl systems. -+ *-musl*) gl_cv_func_tzset_clobber="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_tzset_clobber="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/ungetc.m4 b/m4/ungetc.m4 -index ab8757b..08baf33 100644 ---- a/m4/ungetc.m4 -+++ b/m4/ungetc.m4 -@@ -1,4 +1,4 @@ --# ungetc.m4 serial 6 -+# ungetc.m4 serial 7 - dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -41,12 +41,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], - remove ("conftest.tmp");])], - [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no], - [case "$host_os" in -- # Guess yes on glibc and bionic systems. -- *-gnu* | gnu* | *-android*) gl_cv_func_ungetc_works="guessing yes" ;; -- # Guess yes on native Windows. -- mingw*) gl_cv_func_ungetc_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_ungetc_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # Guess yes on bionic systems. -+ *-android*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # Guess yes on native Windows. -+ mingw*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_ungetc_works="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/usleep.m4 b/m4/usleep.m4 -index 59605a8..4a6bff0 100644 ---- a/m4/usleep.m4 -+++ b/m4/usleep.m4 -@@ -1,4 +1,4 @@ --# usleep.m4 serial 5 -+# usleep.m4 serial 6 - dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -31,6 +31,8 @@ AC_DEFUN([gl_FUNC_USLEEP], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_usleep_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_usleep_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/utimes.m4 b/m4/utimes.m4 -index 7209b6d..5806d8f 100644 ---- a/m4/utimes.m4 -+++ b/m4/utimes.m4 -@@ -1,5 +1,5 @@ - # Detect some bugs in glibc's implementation of utimes. --# serial 5 -+# serial 6 - - dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation -@@ -143,9 +143,11 @@ main () - [gl_cv_func_working_utimes=yes], - [gl_cv_func_working_utimes=no], - [case "$host_os" in -- # Guess no on native Windows. -- mingw*) gl_cv_func_working_utimes="guessing no" ;; -- *) gl_cv_func_working_utimes="guessing no" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_working_utimes="guessing yes" ;; -+ # Guess no on native Windows. -+ mingw*) gl_cv_func_working_utimes="guessing no" ;; -+ *) gl_cv_func_working_utimes="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 -index baa2002..3952fd2 100644 ---- a/m4/wcwidth.m4 -+++ b/m4/wcwidth.m4 -@@ -1,4 +1,4 @@ --# wcwidth.m4 serial 27 -+# wcwidth.m4 serial 28 - dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -98,9 +98,13 @@ int main () - [ - changequote(,)dnl - case "$host_os" in -- # Guess yes on glibc and AIX 7 systems. -- *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; -- *) gl_cv_func_wcwidth_works="guessing no";; -+ # Guess yes on glibc systems. -+ *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_wcwidth_works="guessing yes";; -+ # Guess yes on AIX 7 systems. -+ aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; -+ *) gl_cv_func_wcwidth_works="guessing no";; - esac - changequote([,])dnl - ]) --- -1.9.1 - - diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index e7162673a78..e3e2e167e33 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -22,21 +22,16 @@ with lib; stdenv.mkDerivation (rec { pname = "coreutils"; - version = "8.31"; + version = "8.32"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; + sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; }; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch - # included on coreutils master; TODO: apply unconditionally, I guess - ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch - ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch - # Fix compilation in musl-cross environments. To be removed in coreutils-8.32. - ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch - # Fix compilation in android-cross environments. To be removed in coreutils-8.32. - ++ [ ./coreutils-8.31-android-cross.patch ]; + # included on coreutils master; TODO: apply unconditionally, I guess + ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch; postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 8e151bc2ead..c466a48434f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.72.0"; + version = "7.73.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd"; + sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 9b33d53e54f..d2fa0deca00 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz"; + sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e53a98e0aa9..12b0bc0a578 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8346,9 +8346,7 @@ in zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { - cmake = buildPackages.cmake.override { - libarchive = buildPackages.libarchive.override { zstd = null; }; - }; + cmake = buildPackages.cmakeMinimal; }; zsync = callPackage ../tools/compression/zsync { }; @@ -9676,15 +9674,15 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; }; - rust_1_46 = callPackage ../development/compilers/rust/1_46.nix { + rust_1_47 = callPackage ../development/compilers/rust/1_47.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; + llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11; }; - rust = rust_1_46; + rust = rust_1_47; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_46 = rust_1_46.packages.stable; - rustPackages = rustPackages_1_46; + rustPackages_1_47 = rust_1_47.packages.stable; + rustPackages = rustPackages_1_47; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -10860,6 +10858,10 @@ in cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake { + isBootstrap = true; + }; + cmakeCurses = cmake.override { useNcurses = true; }; cmakeWithGui = cmakeCurses.override { withQt5 = true; }; @@ -18290,7 +18292,7 @@ in # udev is the same package as systemd which depends on cryptsetup # which depends on lvm2 again. But we only need the libudev part # which does not depend on cryptsetup. - udev = udev.override { cryptsetup = null; }; + udev = systemdMinimal; }; lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { enableDmeventd = true; @@ -18641,8 +18643,23 @@ in bzip2 = null; }; }; + systemdMinimal = systemd.override { + pname = "systemd-minimal"; + withResolved = false; + withLogind = false; + withHostnamed = false; + withLocaled = false; + withTimedated = false; + withHwdb = false; + withEfi = false; + withImportd = false; + withCryptsetup = false; + cryptsetup = null; + lvm2 = null; + }; + - udev = systemd; # TODO: move to aliases.nix + udev = systemd; # TODO: change to systemdMinimal systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 945f55adc70..0961e3c264d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4828,7 +4828,7 @@ in { pybullet = callPackage ../development/python-modules/pybullet { }; - pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; }; pycallgraph = callPackage ../development/python-modules/pycallgraph { }; -- cgit 1.4.1 From 7673eda11d59309e1b9051252e44caffc98c8052 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 7 Nov 2020 17:50:17 +0800 Subject: haskell: Add documentationTarball to lib --- pkgs/development/haskell-modules/lib.nix | 25 ++++++++++++++++++++++ pkgs/test/default.nix | 1 + pkgs/test/haskell-documentationTarball/default.nix | 17 +++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/test/haskell-documentationTarball/default.nix (limited to 'pkgs/test') diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 4d0954a5d7a..6bcc563164e 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -235,6 +235,31 @@ rec { fixupPhase = ":"; }); + /* Create a documentation tarball suitable for uploading to Hackage instead + of building the package. + */ + documentationTarball = pkg: + pkgs.lib.overrideDerivation pkg (drv: { + name = "${drv.name}-docs"; + # Like sdistTarball, disable the "doc" output here. + outputs = [ "out" ]; + buildPhase = '' + runHook preHaddock + ./Setup haddock --for-hackage + runHook postHaddock + ''; + haddockPhase = ":"; + checkPhase = ":"; + installPhase = '' + runHook preInstall + mkdir -p "$out" + tar --format=ustar \ + -czf "$out/${drv.name}-docs.tar.gz" \ + -C dist/doc/html "${drv.name}-docs" + runHook postInstall + ''; + }); + /* Use the gold linker. It is a linker for ELF that is designed "to run as fast as possible on modern systems" */ diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index d9befb9350a..7ee7d21fd56 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -23,6 +23,7 @@ with pkgs; stdenv-inputs = callPackage ./stdenv-inputs { }; haskell-shellFor = callPackage ./haskell-shellFor { }; + haskell-documentationTarball = callPackage ./haskell-documentationTarball { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; diff --git a/pkgs/test/haskell-documentationTarball/default.nix b/pkgs/test/haskell-documentationTarball/default.nix new file mode 100644 index 00000000000..aec3dc41f26 --- /dev/null +++ b/pkgs/test/haskell-documentationTarball/default.nix @@ -0,0 +1,17 @@ +{ pkgs, haskellPackages }: + +let + drv = haskellPackages.vector; + docs = pkgs.haskell.lib.documentationTarball drv; + +in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' + tar xvzf "${docs}/${drv.name}-docs.tar.gz" + + # Check for Haddock html + find "${drv.name}-docs" | grep -q "Data-Vector.html" + + # Check for source html + find "${drv.name}-docs" | grep -q "src/Data.Vector.html" + + touch "$out" +'' -- cgit 1.4.1 From b7650aaa77634e42d62ed6fc1a9081b10139618b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 28 Nov 2020 19:32:43 +0000 Subject: rust: Clean up target configs and test some more See the new docs for details. The difference is vis-a-vis older versions of this PR, not master. --- doc/languages-frameworks/rust.section.md | 14 +++---- pkgs/development/compilers/rust/default.nix | 6 +-- pkgs/test/rust-sysroot/default.nix | 60 ++++++++++++++++++----------- 3 files changed, 47 insertions(+), 33 deletions(-) (limited to 'pkgs/test') diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 28e488fe8a6..0230993d3f0 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -71,14 +71,14 @@ By default, it takes the `stdenv.hostPlatform.config` and replaces components where they are known to differ. But there are ways to customize the argument: - To choose a different target by name, define - `stdenv.hostPlatform.rustc.arch.config` as that name (a string), and that + `stdenv.hostPlatform.rustc.config` as that name (a string), and that name will be used instead. For example: ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { - rustc.arch.config = "thumbv7em-none-eabi"; + rustc.config = "thumbv7em-none-eabi"; }; } ``` @@ -88,18 +88,18 @@ where they are known to differ. But there are ways to customize the argument: ``` - To pass a completely custom target, define - `stdenv.hostPlatform.rustc.arch.config` with its name, and - `stdenv.hostPlatform.rustc.arch.custom` with the value. The value will be + `stdenv.hostPlatform.rustc.config` with its name, and + `stdenv.hostPlatform.rustc.platform` with the value. The value will be serialized to JSON in a file called - `${stdenv.hostPlatform.rustc.arch.config}.json`, and the path of that file + `${stdenv.hostPlatform.rustc.config}.json`, and the path of that file will be used instead. For example: ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { - rustc.arch.config = "thumb-crazy"; - rustc.arch.custom = { foo = ""; bar = ""; }; + rustc.config = "thumb-crazy"; + rustc.platform = { foo = ""; bar = ""; }; }; } will result in: diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 95febd8945d..25876cc6380 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -27,7 +27,7 @@ # Returns the name of the rust target, even if it is custom. Adjustments are # because rust has slightly different naming conventions than we do. toRustTarget = platform: with platform.parsed; let - cpu_ = platform.rustc.arch or { + cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; @@ -38,8 +38,8 @@ # Returns the name of the rust target if it is standard, or the json file # containing the custom target spec. toRustTargetSpec = platform: - if (platform.rustc.arch or {}) ? custom - then builtins.toFile (platform.rustc.config + ".json") (builtins.toJSON platform.rustc.arch.custom) + if (platform.rustc or {}) ? platform + then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) else toRustTarget platform; # This just contains tools for now. But it would conceivably contain diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index cd07ef53c32..3a786ad6f00 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -1,6 +1,7 @@ -{ lib, rustPlatform, fetchFromGitHub, writeText }: +{ lib, rust, rustPlatform, fetchFromGitHub }: -rustPlatform.buildRustPackage rec { +let + mkBlogOsTest = target: rustPlatform.buildRustPackage rec { name = "blog_os-sysroot-test"; src = fetchFromGitHub { @@ -12,27 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cbcplgz28yxshyrp2krp1jphbrcqdw6wxx3rry91p7hiqyibd30"; - # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. - # The justification in the book for using rust-lld suggests that gcc can still be used for testing: - # > Instead of using the platform's default linker (which might not support Linux targets), - # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. - # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 - target = writeText "x86_64-blog_os.json" '' - { - "llvm-target": "x86_64-unknown-none", - "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", - "arch": "x86_64", - "target-endian": "little", - "target-pointer-width": "64", - "target-c-int-width": "32", - "os": "none", - "executables": true, - "linker-flavor": "gcc", - "panic-strategy": "abort", - "disable-redzone": true, - "features": "-mmx,-sse,+soft-float" - } - ''; + inherit target; RUSTFLAGS = "-C link-arg=-nostartfiles"; @@ -42,5 +23,38 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Test for using custom sysroots with buildRustPackage"; maintainers = with maintainers; [ aaronjanse ]; + platforms = lib.platforms.x86_64; }; + }; + + # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. + # The justification in the book for using rust-lld suggests that gcc can still be used for testing: + # > Instead of using the platform's default linker (which might not support Linux targets), + # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. + # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 + targetContents = { + "llvm-target" = "x86_64-unknown-none"; + "data-layout" = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"; + "arch" = "x86_64"; + "target-endian" = "little"; + "target-pointer-width" = "64"; + "target-c-int-width" = "32"; + "os" = "none"; + "executables" = true; + "linker-flavor" = "gcc"; + "panic-strategy" = "abort"; + "disable-redzone" = true; + "features" = "-mmx,-sse,+soft-float"; + }; + +in { + blogOS-targetByFile = mkBlogOsTest (builtins.toFile "x86_64-blog_os.json" (builtins.toJSON targetContents)); + blogOS-targetByNix = let + plat = lib.systems.elaborate { config = "x86_64-none"; } // { + rustc = { + config = "x86_64-blog_os"; + platform = targetContents; + }; + }; + in mkBlogOsTest (rust.toRustTargetSpec plat); } -- cgit 1.4.1 From ccfd26ef14ea213320f0b49db3fb347785b38f06 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 14 Dec 2020 07:59:40 +0100 Subject: bintools-wrapper: skip dynamic linker for static binaries Currently we set dynamic-linker unconditionally. This breaks however some static binaries i.e. rust binaries linked against musl. There is no reason we should set an elf interpreter for static binaries hence this is skipped if `-static` or `-static-pie` is either passed to our cc or ld wrapper. --- pkgs/build-support/bintools-wrapper/add-flags.sh | 5 +++++ pkgs/build-support/bintools-wrapper/default.nix | 8 +------- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 13 ++++++++++++- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 6 ++++++ pkgs/test/cc-wrapper/default.nix | 20 ++++++++++++++++---- 5 files changed, 40 insertions(+), 12 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index e99beb38158..83d47027104 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -3,6 +3,7 @@ var_templates_list=( NIX_IGNORE_LD_THROUGH_GCC NIX_LDFLAGS NIX_LDFLAGS_BEFORE + NIX_DYNAMIC_LINKER NIX_LDFLAGS_AFTER NIX_LDFLAGS_HARDEN NIX_HARDENING_ENABLE @@ -25,6 +26,10 @@ if [ -e @out@/nix-support/libc-ldflags ]; then NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/libc-ldflags)" fi +if [ -z "$NIX_DYNAMIC_LINKER_@suffixSalt@" ] && [ -e @out@/nix-support/dynamic-linker ]; then + NIX_DYNAMIC_LINKER_@suffixSalt@="$(< @out@/nix-support/dynamic-linker)" +fi + if [ -e @out@/nix-support/libc-ldflags-before ]; then NIX_LDFLAGS_BEFORE_@suffixSalt@="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE_@suffixSalt@" fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 6da0e58436d..21c66521fb2 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -243,13 +243,7 @@ stdenv.mkDerivation { if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi - '' - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to ld - # (the *last* value counts, so ours should come first). - + '' - echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before - '') + '' + '') + '' fi '') diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 81b5a90edd5..abecf6a8e5d 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -20,6 +20,7 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi +setDynamicLinker=1 # Optionally filter out paths not refering to the store. expandResponseParams "$@" @@ -47,6 +48,11 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" # Our ld is not built with sysroot support (Can we fix that?) : else + if [[ "$p" = -static || "$p" = -static-pie ]]; then + # Using a dynamic linker for static binaries can lead to crashes. + # This was observed for rust binaries. + setDynamicLinker=0 + fi rest+=("$p") fi n+=1 @@ -63,6 +69,11 @@ extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then extraAfter+=($NIX_LDFLAGS_@suffixSalt@) extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) + # By adding dynamic linker to extraBefore we allow the users set their + # own dynamic linker as NIX_LD_FLAGS will override earlier set flags + if [ "$setDynamicLinker" = 1 ]; then + extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi fi extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) @@ -134,7 +145,7 @@ then done fi -if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then +if [[ "$link32" = "0" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=( diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 7e734f57773..1c60beb9bf5 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -28,6 +28,7 @@ cc1=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 cInclude=1 +setDynamicLinker=1 expandResponseParams "$@" declare -i n=0 @@ -58,6 +59,8 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 + elif [[ "$p" = -static || "$p" = -static-pie ]]; then + setDynamicLinker=0 elif [[ "$p" != -?* ]]; then # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 @@ -152,6 +155,9 @@ if [ "$dontLink" != 1 ]; then for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do extraBefore+=("-Wl,$i") done + if [ "$setDynamicLinker" = 1 ]; then + extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi for i in $NIX_LDFLAGS_@suffixSalt@; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index c0c89d63fff..141a5320ef5 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,11 +1,13 @@ -{ stdenv }: +{ stdenv, glibc }: with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersWorking = - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") - || (stdenv.cc.isGNU && stdenv.isLinux); + sanitizersWorking = !stdenv.hostPlatform.isMusl && ( + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") + || (stdenv.cc.isGNU && stdenv.isLinux) + ); + staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -28,6 +30,16 @@ in stdenv.mkDerivation { ./core-foundation-check ''} + printf "checking whether compiler builds valid static C binaries... " >&2 + $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ./cc-static + # our glibc does not have pie enabled yet. + ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + printf "checking whether compiler builds valid static pie C binaries... " >&2 + $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ./cc-static-pie + ''} + printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h -- cgit 1.4.1 From b39dd890acdef42e944a9cb9184fe63331dfbb3c Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 14 Dec 2020 20:53:00 +0100 Subject: tests.cc-wrapper: disable static compilation macOS macOS does not support this --- pkgs/test/cc-wrapper/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 141a5320ef5..fae3448c44c 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -30,14 +30,17 @@ in stdenv.mkDerivation { ./core-foundation-check ''} - printf "checking whether compiler builds valid static C binaries... " >&2 - $CC ${staticLibc} -static -o cc-static ${./cc-main.c} - ./cc-static - # our glibc does not have pie enabled yet. - ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' - printf "checking whether compiler builds valid static pie C binaries... " >&2 - $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} - ./cc-static-pie + + ${optionalString (!stdenv.isDarwin) '' + printf "checking whether compiler builds valid static C binaries... " >&2 + $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ./cc-static + # our glibc does not have pie enabled yet. + ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + printf "checking whether compiler builds valid static pie C binaries... " >&2 + $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ./cc-static-pie + ''} ''} printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 -- cgit 1.4.1 From 5d2a20c93aeb45dd6de3cbc522692499ff161c34 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 29 Nov 2020 16:23:00 +0000 Subject: buildRustCrateTests: Move to tests.buildRustCrate I think it is preferable to separate the tests from the "real" packages. --- pkgs/test/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/test') diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8746f065b1b..f45e981cff0 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -39,6 +39,7 @@ with pkgs; cross = callPackage ./cross {}; rustCustomSysroot = callPackage ./rust-sysroot {}; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; nixos-functions = callPackage ./nixos-functions {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3937ae566e6..5c464236602 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10071,7 +10071,6 @@ in buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }); cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-web = callPackage ../development/tools/cargo-web { -- cgit 1.4.1 From 363175cd99a14fd13f6019e8049271d2d65b7151 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 21 Dec 2020 22:20:42 +0100 Subject: Revert "bintools-wrapper: skip dynamic linker for static binaries" This reverts commit ccfd26ef14ea213320f0b49db3fb347785b38f06. These toolchain changes are too problematic, so reverting for now; see https://github.com/NixOS/nixpkgs/pull/107086#issuecomment-749196366 --- pkgs/build-support/bintools-wrapper/add-flags.sh | 5 ----- pkgs/build-support/bintools-wrapper/default.nix | 8 +++++++- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 13 +------------ pkgs/build-support/cc-wrapper/cc-wrapper.sh | 6 ------ pkgs/test/cc-wrapper/default.nix | 23 ++++------------------- 5 files changed, 12 insertions(+), 43 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index 83d47027104..e99beb38158 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -3,7 +3,6 @@ var_templates_list=( NIX_IGNORE_LD_THROUGH_GCC NIX_LDFLAGS NIX_LDFLAGS_BEFORE - NIX_DYNAMIC_LINKER NIX_LDFLAGS_AFTER NIX_LDFLAGS_HARDEN NIX_HARDENING_ENABLE @@ -26,10 +25,6 @@ if [ -e @out@/nix-support/libc-ldflags ]; then NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/libc-ldflags)" fi -if [ -z "$NIX_DYNAMIC_LINKER_@suffixSalt@" ] && [ -e @out@/nix-support/dynamic-linker ]; then - NIX_DYNAMIC_LINKER_@suffixSalt@="$(< @out@/nix-support/dynamic-linker)" -fi - if [ -e @out@/nix-support/libc-ldflags-before ]; then NIX_LDFLAGS_BEFORE_@suffixSalt@="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE_@suffixSalt@" fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 21c66521fb2..6da0e58436d 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -243,7 +243,13 @@ stdenv.mkDerivation { if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi - '') + '' + '' + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to ld + # (the *last* value counts, so ours should come first). + + '' + echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before + '') + '' fi '') diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index abecf6a8e5d..81b5a90edd5 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -20,7 +20,6 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi -setDynamicLinker=1 # Optionally filter out paths not refering to the store. expandResponseParams "$@" @@ -48,11 +47,6 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" # Our ld is not built with sysroot support (Can we fix that?) : else - if [[ "$p" = -static || "$p" = -static-pie ]]; then - # Using a dynamic linker for static binaries can lead to crashes. - # This was observed for rust binaries. - setDynamicLinker=0 - fi rest+=("$p") fi n+=1 @@ -69,11 +63,6 @@ extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then extraAfter+=($NIX_LDFLAGS_@suffixSalt@) extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) - # By adding dynamic linker to extraBefore we allow the users set their - # own dynamic linker as NIX_LD_FLAGS will override earlier set flags - if [ "$setDynamicLinker" = 1 ]; then - extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@") - fi fi extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) @@ -145,7 +134,7 @@ then done fi -if [[ "$link32" = "0" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then +if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=( diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 1c60beb9bf5..7e734f57773 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -28,7 +28,6 @@ cc1=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 cInclude=1 -setDynamicLinker=1 expandResponseParams "$@" declare -i n=0 @@ -59,8 +58,6 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 - elif [[ "$p" = -static || "$p" = -static-pie ]]; then - setDynamicLinker=0 elif [[ "$p" != -?* ]]; then # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 @@ -155,9 +152,6 @@ if [ "$dontLink" != 1 ]; then for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do extraBefore+=("-Wl,$i") done - if [ "$setDynamicLinker" = 1 ]; then - extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") - fi for i in $NIX_LDFLAGS_@suffixSalt@; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index fae3448c44c..c0c89d63fff 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,13 +1,11 @@ -{ stdenv, glibc }: +{ stdenv }: with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersWorking = !stdenv.hostPlatform.isMusl && ( - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") - || (stdenv.cc.isGNU && stdenv.isLinux) - ); - staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; + sanitizersWorking = + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") + || (stdenv.cc.isGNU && stdenv.isLinux); in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -30,19 +28,6 @@ in stdenv.mkDerivation { ./core-foundation-check ''} - - ${optionalString (!stdenv.isDarwin) '' - printf "checking whether compiler builds valid static C binaries... " >&2 - $CC ${staticLibc} -static -o cc-static ${./cc-main.c} - ./cc-static - # our glibc does not have pie enabled yet. - ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' - printf "checking whether compiler builds valid static pie C binaries... " >&2 - $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} - ./cc-static-pie - ''} - ''} - printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h -- cgit 1.4.1 From 61bbbcd1af1c3b5a365423f2ecc722a627ff353f Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Fri, 25 Dec 2020 21:52:42 +0100 Subject: bintools-wrapper: skip dynamic linker for static binaries --- pkgs/build-support/bintools-wrapper/add-flags.sh | 5 +++++ pkgs/build-support/bintools-wrapper/default.nix | 21 ++++++++------------- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 13 ++++++++++++- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 6 ++++++ pkgs/development/compilers/gcc/builder.sh | 5 ++++- pkgs/test/cc-wrapper/default.nix | 23 +++++++++++++++++++---- 6 files changed, 54 insertions(+), 19 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index e99beb38158..3b94daba65d 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -3,6 +3,7 @@ var_templates_list=( NIX_IGNORE_LD_THROUGH_GCC NIX_LDFLAGS NIX_LDFLAGS_BEFORE + NIX_DYNAMIC_LINKER NIX_LDFLAGS_AFTER NIX_LDFLAGS_HARDEN NIX_HARDENING_ENABLE @@ -25,6 +26,10 @@ if [ -e @out@/nix-support/libc-ldflags ]; then NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/libc-ldflags)" fi +if [ -z "$NIX_DYNAMIC_LINKER_@suffixSalt@" ] && [ -e @out@/nix-support/ld-set-dynamic-linker ]; then + NIX_DYNAMIC_LINKER_@suffixSalt@="$(< @out@/nix-support/dynamic-linker)" +fi + if [ -e @out@/nix-support/libc-ldflags-before ]; then NIX_LDFLAGS_BEFORE_@suffixSalt@="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE_@suffixSalt@" fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 6da0e58436d..bd3ebdf800e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -237,19 +237,14 @@ stdenv.mkDerivation { if [ -n "''${dynamicLinker-}" ]; then echo $dynamicLinker > $out/nix-support/dynamic-linker - '' + (if targetPlatform.isDarwin then '' - printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' - if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then - echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - '' - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to ld - # (the *last* value counts, so ours should come first). - + '' - echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before - '') + '' + ${if targetPlatform.isDarwin then '' + printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + '' else '' + if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then + echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + touch $out/nix-support/ld-set-dynamic-linker + ''} fi '') diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 81b5a90edd5..9d02f99851a 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -20,6 +20,7 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi +setDynamicLinker=1 # Optionally filter out paths not refering to the store. expandResponseParams "$@" @@ -47,6 +48,11 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" # Our ld is not built with sysroot support (Can we fix that?) : else + if [[ "$p" = -static || "$p" = -static-pie ]]; then + # Using a dynamic linker for static binaries can lead to crashes. + # This was observed for rust binaries. + setDynamicLinker=0 + fi rest+=("$p") fi n+=1 @@ -63,6 +69,11 @@ extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then extraAfter+=($NIX_LDFLAGS_@suffixSalt@) extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) + # By adding dynamic linker to extraBefore we allow the users set their + # own dynamic linker as NIX_LD_FLAGS will override earlier set flags + if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi fi extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) @@ -134,7 +145,7 @@ then done fi -if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then +if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=( diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 7e734f57773..1450218aff2 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -28,6 +28,7 @@ cc1=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 cInclude=1 +setDynamicLinker=1 expandResponseParams "$@" declare -i n=0 @@ -58,6 +59,8 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 + elif [[ "$p" = -static || "$p" = -static-pie ]]; then + setDynamicLinker=0 elif [[ "$p" != -?* ]]; then # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 @@ -152,6 +155,9 @@ if [ "$dontLink" != 1 ]; then for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do extraBefore+=("-Wl,$i") done + if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi for i in $NIX_LDFLAGS_@suffixSalt@; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index e1c4768413f..7d104b96624 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -37,6 +37,9 @@ if test "$noSysDirs" = "1"; then # Figure out what extra flags when linking to pass to the gcc # compilers being generated to make sure that they use our libc. extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true)) + if [ -e ${!curBintools}/nix-support/ld-set-dynamic-linker ]; then + extraLDFlags=-dynamic-linker=$(< ${!curBintools}/nix-support/dynamic-linker) + fi # The path to the Libc binaries such as `crti.o'. libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib" @@ -252,7 +255,7 @@ postInstall() { if [[ targetConfig == *"linux"* ]]; then # For some reason, when building for linux on darwin, the libs retain - # RPATH to $out. + # RPATH to $out. for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do PREV_RPATH=`patchelf --print-rpath "$i"` NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index c0c89d63fff..fae3448c44c 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,11 +1,13 @@ -{ stdenv }: +{ stdenv, glibc }: with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersWorking = - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") - || (stdenv.cc.isGNU && stdenv.isLinux); + sanitizersWorking = !stdenv.hostPlatform.isMusl && ( + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") + || (stdenv.cc.isGNU && stdenv.isLinux) + ); + staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -28,6 +30,19 @@ in stdenv.mkDerivation { ./core-foundation-check ''} + + ${optionalString (!stdenv.isDarwin) '' + printf "checking whether compiler builds valid static C binaries... " >&2 + $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ./cc-static + # our glibc does not have pie enabled yet. + ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + printf "checking whether compiler builds valid static pie C binaries... " >&2 + $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ./cc-static-pie + ''} + ''} + printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h -- cgit 1.4.1 From 90f73381120f7ae9e0d5f0f6dc16cb141c658494 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 24 Jan 2021 01:40:18 +0100 Subject: treewide: stdenv.lib -> lib --- .github/CONTRIBUTING.md | 2 +- nixos/tests/usbguard.nix | 2 +- pkgs/applications/graphics/hdr-plus/default.nix | 4 ++-- pkgs/applications/misc/rescuetime/default.nix | 4 ++-- pkgs/applications/radio/klog/default.nix | 4 ++-- .../science/biology/migrate/default.nix | 4 ++-- pkgs/build-support/alternatives/blas/default.nix | 2 +- pkgs/build-support/alternatives/lapack/default.nix | 2 +- pkgs/build-support/appimage/default.nix | 5 ++-- pkgs/build-support/docker/default.nix | 2 +- pkgs/build-support/docker/nix-prefetch-docker.nix | 8 +++---- pkgs/build-support/dotnetenv/build-solution.nix | 4 ++-- pkgs/build-support/dotnetenv/default.nix | 4 ++-- pkgs/build-support/fetchmavenartifact/default.nix | 17 +++++++------- pkgs/build-support/icon-conv-tools/default.nix | 8 +++---- pkgs/build-support/libredirect/default.nix | 4 ++-- pkgs/build-support/ocaml/default.nix | 4 ++-- pkgs/build-support/ocaml/dune.nix | 4 ++-- pkgs/build-support/ocaml/oasis.nix | 4 ++-- pkgs/build-support/pkg-config-wrapper/default.nix | 5 ++-- pkgs/build-support/plugins.nix | 4 ++-- pkgs/build-support/release/debian-build.nix | 7 +++--- pkgs/build-support/release/default.nix | 8 +++---- pkgs/build-support/release/nix-build.nix | 12 +++++----- .../build-support/rust/default-crate-overrides.nix | 6 ++--- pkgs/build-support/rust/default.nix | 27 +++++++++++----------- pkgs/build-support/rust/fetchCargoTarball.nix | 4 ++-- pkgs/build-support/singularity-tools/default.nix | 3 ++- .../skaware/build-skaware-package.nix | 7 +++--- pkgs/build-support/skaware/clean-packaging.nix | 4 ++-- .../substitute-files/substitute-all-files.nix | 6 ++--- pkgs/build-support/templaterpm/default.nix | 2 +- pkgs/build-support/vm/default.nix | 5 ++-- pkgs/build-support/writers/test.nix | 2 +- pkgs/common-updater/scripts.nix | 4 ++-- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- pkgs/os-specific/linux/statifier/default.nix | 4 ++-- pkgs/servers/fiche/default.nix | 4 ++-- pkgs/servers/foundationdb/vsmake.nix | 2 +- pkgs/servers/http/envoy/default.nix | 5 ++-- pkgs/test/cc-wrapper/default.nix | 20 ++++++++-------- pkgs/test/cc-wrapper/multilib.nix | 4 ++-- pkgs/test/install-shell-files/default.nix | 4 ++-- pkgs/test/ld-library-path/default.nix | 4 ++-- pkgs/test/patch-shebangs/default.nix | 4 ++-- pkgs/test/stdenv-inputs/default.nix | 8 +++---- pkgs/tools/graphics/metapixel/default.nix | 4 ++-- pkgs/tools/networking/lxi-tools/default.nix | 4 ++-- pkgs/tools/text/source-highlight/default.nix | 2 +- 49 files changed, 134 insertions(+), 133 deletions(-) (limited to 'pkgs/test') diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 31060040c1a..bc43f80a060 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -37,7 +37,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Not start with the package name. * Not have a period at the end. * `meta.license` must be set and fit the upstream license. - * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`. + * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. * `meta.maintainers` must be set. See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). diff --git a/nixos/tests/usbguard.nix b/nixos/tests/usbguard.nix index a5d78f316fb..cba905db44f 100644 --- a/nixos/tests/usbguard.nix +++ b/nixos/tests/usbguard.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "usbguard"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ tnias ]; }; diff --git a/pkgs/applications/graphics/hdr-plus/default.nix b/pkgs/applications/graphics/hdr-plus/default.nix index 107694b2fcd..15042e6877f 100644 --- a/pkgs/applications/graphics/hdr-plus/default.nix +++ b/pkgs/applications/graphics/hdr-plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, halide , libpng, libjpeg, libtiff, libraw }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Burst photography pipeline based on Google's HDR+"; homepage = "https://www.timothybrooks.com/tech/hdr-plus/"; license = licenses.mit; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index ddb99c35d05..476a441ae05 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -38,10 +38,10 @@ in mkDerivation rec { passthru.updateScript = writeScript "${pname}-updater" '' #!${stdenv.shell} set -eu -o pipefail - PATH=${stdenv.lib.makeBinPath [curl pup common-updater-scripts]}:$PATH + PATH=${lib.makeBinPath [curl pup common-updater-scripts]}:$PATH latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')" - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run # We need to clear it before each run update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix index cb8ac9fe5dd..080011e167e 100644 --- a/pkgs/applications/radio/klog/default.nix +++ b/pkgs/applications/radio/klog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "klog"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "KLog.pro" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplatform free hamradio logger"; longDescription = '' KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management, diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index ba55898e4f9..41a2e89f02c 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -1,4 +1,4 @@ -{ gccStdenv, fetchurl, zlib, mpi }: +{ lib, gccStdenv, fetchurl, zlib, mpi }: gccStdenv.mkDerivation rec { version = "3.7.2"; @@ -14,7 +14,7 @@ gccStdenv.mkDerivation rec { buildFlags = [ "thread" "mpis" ]; preInstall = "mkdir -p $out/man/man1"; - meta = with gccStdenv.lib; { + meta = with lib; { description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 5ebbc737e11..cf880677fdd 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -132,7 +132,7 @@ Description: BLAS C implementation Cflags: -I$dev/include Libs: -L$out/lib -lcblas EOF -'' + stdenv.lib.optionalString (blasImplementation == "mkl") '' +'' + lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 98b458b778a..7e74eb96b74 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -98,7 +98,7 @@ Description: LAPACK C implementation Cflags: -I$dev/include Libs: -L$out/lib -llapacke EOF -'' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' +'' + lib.optionalString (lapackImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index e6014e35aef..170c25dffe2 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , bash , binutils-unwrapped , coreutils @@ -15,7 +16,7 @@ rec { src = ./appimage-exec.sh; isExecutable = true; dir = "bin"; - path = with pkgs; stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ bash binutils-unwrapped coreutils diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 916d3cd003e..0c9d4f110ad 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -94,7 +94,7 @@ rec { inherit imageDigest; imageName = finalImageName; imageTag = finalImageTag; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; outputHashMode = "flat"; outputHashAlgo = "sha256"; outputHash = sha256; diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index 6341eb0154b..61e917461ed 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -1,6 +1,4 @@ -{ stdenv, makeWrapper, nix, skopeo, jq }: - -with stdenv.lib; +{ lib, stdenv, makeWrapper, nix, skopeo, jq }: stdenv.mkDerivation { name = "nix-prefetch-docker"; @@ -12,13 +10,13 @@ stdenv.mkDerivation { installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${makeBinPath [ nix skopeo jq ]} \ + --prefix PATH : ${lib.makeBinPath [ nix skopeo jq ]} \ --set HOME /homeless-shelter ''; preferLocalBuild = true; - meta = { + meta = with lib; { description = "Script used to obtain source hashes for dockerTools.pullImage"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 57af1fe9bd4..b3372b94217 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -1,4 +1,4 @@ -{stdenv, dotnetfx}: +{ lib, stdenv, dotnetfx }: { name , src , baseDir ? "." @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; preBuild = '' - ${stdenv.lib.optionalString modifyPublicMain '' + ${lib.optionalString modifyPublicMain '' sed -i -e "s|static void Main|public static void Main|" ${mainClassFile} ''} ${preBuild} diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix index c7145504eb7..3015db42b07 100644 --- a/pkgs/build-support/dotnetenv/default.nix +++ b/pkgs/build-support/dotnetenv/default.nix @@ -1,9 +1,9 @@ -{stdenv, dotnetfx}: +{ lib, stdenv, dotnetfx }: let dotnetenv = { buildSolution = import ./build-solution.nix { - inherit stdenv; + inherit lib stdenv; dotnetfx = dotnetfx.pkg; }; diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index 42162638e72..4274b4b52bf 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -1,6 +1,6 @@ # Adaptation of the MIT-licensed work on `sbt2nix` done by Charles O'Farrell -{ fetchurl, stdenv }: +{ lib, fetchurl, stdenv }: let defaultRepos = [ "https://repo1.maven.org/maven2" @@ -36,21 +36,20 @@ assert (url == "") || (urls == []); # if repos is empty, then url or urls must be specified. assert (repos != []) || (url != "") || (urls != []); - let name_ = - with stdenv.lib; concatStrings [ - (replaceChars ["."] ["_"] groupId) "_" - (replaceChars ["."] ["_"] artifactId) "-" + lib.concatStrings [ + (lib.replaceChars ["."] ["_"] groupId) "_" + (lib.replaceChars ["."] ["_"] artifactId) "-" version ]; mkJarUrl = repoUrl: - with stdenv.lib; concatStringsSep "/" [ - (removeSuffix "/" repoUrl) - (replaceChars ["."] ["/"] groupId) + lib.concatStringsSep "/" [ + (lib.removeSuffix "/" repoUrl) + (lib.replaceChars ["."] ["/"] groupId) artifactId version - "${artifactId}-${version}${optionalString (!isNull classifier) "-${classifier}"}.jar" + "${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar" ]; urls_ = if url != "" then [url] diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix index 0ea18d8768a..79d3838e688 100644 --- a/pkgs/build-support/icon-conv-tools/default.nix +++ b/pkgs/build-support/icon-conv-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, icoutils }: +{ lib, stdenv, icoutils }: stdenv.mkDerivation { name = "icon-conv-tools-0.0.0"; @@ -23,9 +23,9 @@ stdenv.mkDerivation { dontPatchELF = true; dontStrip = true; - meta = { + meta = with lib; { description = "Tools for icon conversion specific to nix package manager"; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with maintainers; [ jraygauthier ]; + platforms = platforms.linux; }; } diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 6e54e2a696c..70da5bf5b5f 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation { ) ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with lib; { + platforms = platforms.unix; description = "An LD_PRELOAD library to intercept and rewrite the paths in glibc calls"; longDescription = '' libredirect is an LD_PRELOAD library to intercept and rewrite the paths in diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 3957b955a2c..88ed3dfc2c2 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: +{ lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: { name, version, buildInputs ? [], createFindlibDestdir ? true, @@ -14,7 +14,7 @@ let }; in assert minimumSupportedOcamlVersion != null -> - stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml.version; + lib.versionOlder minimumSupportedOcamlVersion ocaml.version; stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index fce0096c83d..f9f59b21510 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,11 +1,11 @@ -{ stdenv, ocaml, findlib, dune, dune_2 }: +{ lib, stdenv, ocaml, findlib, dune, dune_2 }: { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune; in if args ? minimumOCamlVersion && - ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion + ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index c1d1d699765..ee231a6e258 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }: +{ lib, stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }: { pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; }, minimumOCamlVersion ? null, @@ -8,7 +8,7 @@ }@args: if args ? minimumOCamlVersion && - ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion + ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index e01df107dd1..b61936c50a8 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -2,6 +2,7 @@ # PKG_CONFIG_PATH_FOR_BUILD work properly. { stdenvNoCC +, lib , buildPackages , pkg-config , baseBinName ? "pkg-config" @@ -19,7 +20,7 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); # See description in cc-wrapper. @@ -119,7 +120,7 @@ stdenv.mkDerivation { let pkg-config_ = if pkg-config != null then pkg-config else {}; in (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) // { description = - stdenv.lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_ + lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_ + " (wrapper script)"; priority = 10; }; diff --git a/pkgs/build-support/plugins.nix b/pkgs/build-support/plugins.nix index bf8a982a88f..1ed74851597 100644 --- a/pkgs/build-support/plugins.nix +++ b/pkgs/build-support/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: # helper functions for packaging programs with plugin systems { @@ -13,7 +13,7 @@ diffPlugins = expectedPlugins: foundPluginsFilePath: '' # sort both lists first plugins_expected=$(mktemp) - (${stdenv.lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \ + (${lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \ | sort -u > "$plugins_expected" plugins_found=$(mktemp) sort -u "${foundPluginsFilePath}" > "$plugins_found" diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index dfa896a86a6..9ac335d288a 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -2,6 +2,7 @@ # that contains a Debian-like (i.e. dpkg-based) OS. { name ? "debian-build" +, lib , diskImage , src, stdenv, vmTools, checkinstall , fsTranslation ? false @@ -11,8 +12,6 @@ debRequires ? [] , ... } @ args: -with stdenv.lib; - vmTools.runInLinuxImage (stdenv.mkDerivation ( { @@ -59,8 +58,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( export PAGER=cat ${checkinstall}/sbin/checkinstall --nodoc -y -D \ --fstrans=${if fsTranslation then "yes" else "no"} \ - --requires="${concatStringsSep "," debRequires}" \ - --provides="${concatStringsSep "," debProvides}" \ + --requires="${lib.concatStringsSep "," debRequires}" \ + --provides="${lib.concatStringsSep "," debProvides}" \ ${if (src ? version) then "--pkgversion=$(echo ${src.version} | tr _ -)" else "--pkgversion=0.0.0"} \ ''${debMaintainer:+--maintainer="'$debMaintainer'"} \ diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 6aaa0338f0c..0276fa1be61 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ lib, pkgs }: with pkgs; @@ -23,7 +23,7 @@ rec { } // args); nixBuild = args: import ./nix-build.nix ( - { inherit stdenv; + { inherit lib stdenv; } // args); coverageAnalysis = args: nixBuild ( @@ -46,7 +46,7 @@ rec { } // args); debBuild = args: import ./debian-build.nix ( - { inherit stdenv vmTools checkinstall; + { inherit lib stdenv vmTools checkinstall; } // args); aggregate = @@ -94,7 +94,7 @@ rec { phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = stdenv.lib.optionalString isNixOS '' + patchPhase = lib.optionalString isNixOS '' touch .update-on-nixos-rebuild ''; diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index feda54de46f..97df52eaced 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -12,7 +12,7 @@ , doCoverityAnalysis ? false , lcovFilter ? [] , lcovExtraTraceFiles ? [] -, src, stdenv +, src, lib, stdenv , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" , failureHook ? null , prePhases ? [] @@ -69,7 +69,7 @@ stdenv.mkDerivation ( fi ''; - failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) + + failureHook = (lib.optionalString (failureHook != null) failureHook) + '' if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then @@ -136,10 +136,10 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ - (stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++ - (stdenv.lib.optional doClangAnalysis args.clang-analyzer) ++ - (stdenv.lib.optional doCoverityAnalysis args.cov-build) ++ - (stdenv.lib.optional doCoverityAnalysis args.xz); + (lib.optional doCoverageAnalysis args.makeGCOVReport) ++ + (lib.optional doClangAnalysis args.clang-analyzer) ++ + (lib.optional doCoverityAnalysis args.cov-build) ++ + (lib.optional doCoverityAnalysis args.xz); lcovFilter = ["/nix/store/*"] ++ lcovFilter; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 4ff8640c2ff..3d2dc3733c2 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,4 +1,4 @@ -{ stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2, +{ lib, stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2, openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3, libsodium, postgresql, gmp, foundationdb, capnproto, nettle, clang, llvmPackages, ... }: @@ -17,7 +17,7 @@ in cargo = attrs: { buildInputs = [ openssl zlib curl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; }; libz-sys = attrs: { @@ -149,7 +149,7 @@ in }; serde_derive = attrs: { - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; }; thrussh-libsodium = attrs: { diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 9e8e32035d0..dc86a7dc581 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , buildPackages , cacert , cargo @@ -83,13 +84,13 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; - targetIsJSON = stdenv.lib.hasSuffix ".json" target; + targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 # the "${}" is needed to transform the path into a /nix/store path before baseNameOf shortTarget = if targetIsJSON then - (stdenv.lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) + (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) else target; sysroot = (callPackage ./sysroot {}) { @@ -116,7 +117,7 @@ in # See https://os.phil-opp.com/testing/ for more information. assert useSysroot -> !(args.doCheck or true); -stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optionalAttrs useSysroot { +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs useSysroot { RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); } // { inherit cargoDeps; @@ -124,7 +125,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional patchRegistryDeps = ./patch-registry-deps; nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ]; - buildInputs = buildInputs ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; + buildInputs = buildInputs ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; patches = cargoPatches ++ patches; @@ -147,11 +148,11 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional cat >> .cargo/config <<'EOF' [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${ccForBuild}" - ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${shortTarget}"] "linker" = "${ccForHost}" ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 - stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' + lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ] ''} ''} @@ -163,7 +164,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional # After unpacking and applying patches, check that the Cargo.lock matches our # src package. Note that we do this after the patchPhase, because the # patchPhase may create the Cargo.lock if upstream has not shipped one. - postPatch = (args.postPatch or "") + stdenv.lib.optionalString validateCargoDeps '' + postPatch = (args.postPatch or "") + lib.optionalString validateCargoDeps '' cargoDepsLockfile=$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock @@ -206,7 +207,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional ''; buildPhase = with builtins; args.buildPhase or '' - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} + ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preBuild ( @@ -217,14 +218,14 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ cargo build -j $NIX_BUILD_CORES \ - ${stdenv.lib.optionalString (buildType == "release") "--release"} \ + ${lib.optionalString (buildType == "release") "--release"} \ --target ${target} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) runHook postBuild - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} + ${lib.optionalString (buildAndTestSubdir != null) "popd"} # This needs to be done after postBuild: packages like `cargo` do a pushd/popd in # the pre/postBuild-hooks that need to be taken into account before gathering @@ -238,15 +239,15 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optional ''; checkPhase = args.checkPhase or (let - argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; + argstr = "${lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} + ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck - ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} + ${lib.optionalString (buildAndTestSubdir != null) "popd"} ''); doCheck = args.doCheck or true; diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix index 0726e5cfa5a..c30e88d99b8 100644 --- a/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/pkgs/build-support/rust/fetchCargoTarball.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, python3 }: +{ lib, stdenv, cacert, git, cargo, python3 }: let cargo-vendor-normalise = stdenv.mkDerivation { name = "cargo-vendor-normalise"; src = ./cargo-vendor-normalise.py; @@ -80,7 +80,7 @@ in stdenv.mkDerivation ({ inherit (hash_) outputHashAlgo outputHash; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } // (builtins.removeAttrs args [ "name" "sha256" "cargoUpdateHook" ])) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 4a54498d117..318f5b430fe 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -1,4 +1,5 @@ { runCommand +, lib , stdenv , storeDir ? builtins.storeDir , writeScript @@ -64,7 +65,7 @@ rec { mkdir proc sys dev # Run root script - ${stdenv.lib.optionalString (runAsRoot != null) '' + ${lib.optionalString (runAsRoot != null) '' mkdir -p ./${storeDir} mount --rbind ${storeDir} ./${storeDir} unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile} diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index e6e2e35789b..7a5db942b2c 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,6 +1,5 @@ -{ stdenv, cleanPackaging, fetchurl }: -let lib = stdenv.lib; -in { +{ lib, stdenv, cleanPackaging, fetchurl }: +{ # : string pname # : string @@ -98,7 +97,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://skarnet.org/software/${pname}/"; inherit description platforms; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ pmahoney Profpatsch ] ++ maintainers; }; diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix index 762fe25c0ac..421d00ad24a 100644 --- a/pkgs/build-support/skaware/clean-packaging.nix +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -3,10 +3,10 @@ # files were either discarded or moved to outputs. # This ensures nothing is forgotten and new files # are correctly handled on update. -{ stdenv, file, writeScript }: +{ lib, stdenv, file, writeScript }: let - globWith = stdenv.lib.concatMapStringsSep "\n"; + globWith = lib.concatMapStringsSep "\n"; rmNoise = noiseGlobs: globWith (f: ''rm -rf ${f}'') noiseGlobs; mvDoc = docGlobs: globWith diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index 66feb695c41..682e976dcfe 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -1,10 +1,10 @@ -{ stdenv }: +{ lib, stdenv }: args: stdenv.mkDerivation ({ name = if args ? name then args.name else baseNameOf (toString args.src); - builder = with stdenv.lib; builtins.toFile "builder.sh" '' + builder = builtins.toFile "builder.sh" '' source $stdenv/setup set -o pipefail @@ -13,7 +13,7 @@ stdenv.mkDerivation ({ args= pushd "$src" - echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do + echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do mkdir -p "$out/$(dirname "$line")" substituteAll "$line" "$out/$line" done diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index 0f7acc13277..ffe5b0b4581 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Create templates of nix expressions from RPM .spec files"; maintainers = with maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; unix; + platforms = platforms.unix; hydraPlatforms = []; }; } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 215782368f6..759245aed1a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,4 +1,5 @@ -{ pkgs +{ lib +, pkgs , kernel ? pkgs.linux , img ? pkgs.stdenv.hostPlatform.linux-kernel.target , storeDir ? builtins.storeDir @@ -572,7 +573,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${stdenv.lib.makeBinPath [ dpkg dpkg glibc lzma ]} + PATH=$PATH:${lib.makeBinPath [ dpkg dpkg glibc lzma ]} # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 0febad2929a..7b7a698376a 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -196,7 +196,7 @@ let in runCommand "test-writers" { passthru = { inherit writeTest bin simple; }; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } '' ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)} ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)} diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 739f44387b3..351db619884 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: +{ lib, stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: stdenv.mkDerivation { name = "common-updater-scripts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp ${./scripts}/* $out/bin for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} done ''; } diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index e9186fbf5b7..eea8d5650be 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -35,7 +35,7 @@ let buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) # https://github.com/gradle/gradle/issues/4426 - ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"} + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} gradle --no-daemon desktop:release ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) # https://github.com/gradle/gradle/issues/4426 - ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"} + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} # point to offline repo sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle gradle --offline --no-daemon desktop:release diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 376ae47ffbe..5afb399fc16 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,4 +1,4 @@ -{ multiStdenv, fetchurl }: +{ lib, multiStdenv, fetchurl }: let version = "1.7.4"; in multiStdenv.mkDerivation { @@ -16,7 +16,7 @@ multiStdenv.mkDerivation { sed -e s@/bin/bash@"${multiStdenv.shell}"@g -i src/*.sh ''; - meta = with multiStdenv.lib; { + meta = with lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix index 10ce1c30a0c..2875f274dc0 100644 --- a/pkgs/servers/fiche/default.nix +++ b/pkgs/servers/fiche/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fiche"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line pastebin for sharing terminal output"; longDescription = '' Fiche is a command line pastebin server for sharing terminal output. diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 262ea39ca5b..aac9ab07c0f 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -139,7 +139,7 @@ let outputs = [ "out" "lib" "dev" "pythonsrc" ]; - meta = with gcc6Stdenv.lib; { + meta = with lib; { description = "Open source, distributed, transactional key-value store"; homepage = "https://www.foundationdb.org"; license = licenses.asl20; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 0da0cb23d76..c297ea38245 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -1,4 +1,5 @@ -{ buildBazelPackage +{ lib +, buildBazelPackage , fetchFromGitHub , stdenv , cmake @@ -109,7 +110,7 @@ buildBazelPackage rec { "--cxxopt=-Wno-uninitialized" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://envoyproxy.io"; description = "Cloud-native edge and service proxy"; license = licenses.asl20; diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index fae3448c44c..d82ba296e2f 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,13 +1,13 @@ -{ stdenv, glibc }: -with stdenv.lib; +{ lib, stdenv, glibc }: + let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug sanitizersWorking = !stdenv.hostPlatform.isMusl && ( - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") + (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "5.0.0") || (stdenv.cc.isGNU && stdenv.isLinux) ); - staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; + staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation { $CXX -o cxx-check ${./cxx-main.cc} ./cxx-check - ${optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' + ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' printf "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} @@ -31,12 +31,12 @@ in stdenv.mkDerivation { ''} - ${optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.isDarwin) '' printf "checking whether compiler builds valid static C binaries... " >&2 $CC ${staticLibc} -static -o cc-static ${./cc-main.c} ./cc-static # our glibc does not have pie enabled yet. - ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + ${lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' printf "checking whether compiler builds valid static pie C binaries... " >&2 $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ./cc-static-pie @@ -52,7 +52,7 @@ in stdenv.mkDerivation { printf "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib $CC -shared \ - ${optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ + ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} @@ -68,7 +68,7 @@ in stdenv.mkDerivation { $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} ./nostdinc-main++ - ${optionalString sanitizersWorking '' + ${lib.optionalString sanitizersWorking '' printf "checking whether sanitizers are fully functional... ">&2 $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ./sanitizers @@ -77,5 +77,5 @@ in stdenv.mkDerivation { touch $out ''; - meta.platforms = platforms.all; + meta.platforms = lib.platforms.all; } diff --git a/pkgs/test/cc-wrapper/multilib.nix b/pkgs/test/cc-wrapper/multilib.nix index 5ea50b5eb26..828ad67f6c8 100644 --- a/pkgs/test/cc-wrapper/multilib.nix +++ b/pkgs/test/cc-wrapper/multilib.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: stdenv.mkDerivation { name = "cc-multilib-test"; @@ -33,5 +33,5 @@ stdenv.mkDerivation { touch $out ''; - meta.platforms = stdenv.lib.platforms.x86_64; + meta.platforms = lib.platforms.x86_64; } diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix index e3729c7d250..e9d32e4ccf6 100644 --- a/pkgs/test/install-shell-files/default.nix +++ b/pkgs/test/install-shell-files/default.nix @@ -1,10 +1,10 @@ -{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: +{ lib, stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: let runTest = name: env: buildCommand: runCommandLocal "install-shell-files--${name}" ({ nativeBuildInputs = [ installShellFiles ]; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } // env) buildCommand; in diff --git a/pkgs/test/ld-library-path/default.nix b/pkgs/test/ld-library-path/default.nix index bda3f0be84a..74c52cef253 100644 --- a/pkgs/test/ld-library-path/default.nix +++ b/pkgs/test/ld-library-path/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: # This tests that libraries listed in LD_LIBRARY_PATH take precedence over those listed in RPATH. @@ -84,5 +84,5 @@ in stdenv.mkDerivation { touch $out ''; - meta.platforms = stdenv.lib.platforms.linux; + meta.platforms = lib.platforms.linux; } diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix index 3e68d96004f..5e1d859c138 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/patch-shebangs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand }: +{ lib, stdenv, runCommand }: let bad-shebang = stdenv.mkDerivation { @@ -13,7 +13,7 @@ let }; in runCommand "patch-shebangs-test" { passthru = { inherit bad-shebang; }; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } '' printf "checking whether patchShebangs works properly... ">&2 if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix index 4db10e75086..6a2e441d019 100644 --- a/pkgs/test/stdenv-inputs/default.nix +++ b/pkgs/test/stdenv-inputs/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ lib, stdenv }: let foo = stdenv.mkDerivation { @@ -12,7 +12,7 @@ let chmod +x $out/bin/foo cp ${./foo.c} $out/include/foo.h $CC -shared \ - ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ + ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ -o $out/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} ''; @@ -30,7 +30,7 @@ let chmod +x $out/bin/bar cp ${./bar.c} $dev/include/bar.h $CC -shared \ - ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ + ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ -o $dev/lib/libbar${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./bar.c} ''; @@ -64,5 +64,5 @@ stdenv.mkDerivation { touch $out ''; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; } diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/tools/graphics/metapixel/default.nix index a97be7f809c..8c9fef0cd48 100644 --- a/pkgs/tools/graphics/metapixel/default.nix +++ b/pkgs/tools/graphics/metapixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }: stdenv.mkDerivation rec { pname = "metapixel"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp metapixel-sizesort $out/bin/metapixel-sizesort ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/schani/metapixel"; description = "Tool for generating photomosaics"; license = licenses.gpl2Only; diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index 3f3e62fb807..92ef7f688a5 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config , liblxi, readline, lua }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ liblxi readline lua ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for communicating with LXI compatible instruments"; longDescription = '' lxi-tools is a collection of open source software tools diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 3d3a0f8c50a..2e60d2a31c0 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # source-highlight uses it's own binary to generate documentation. # During cross-compilation, that binary was built for the target # platform architecture, so it can't run on the build host. - patchPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace Makefile.in --replace "src doc tests" "src tests" ''; -- 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/test') 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 93a7e96c87ebb206dd18fb81376be573acb74828 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 9 Feb 2021 12:50:20 +0900 Subject: tests.patch-shebangs: add case for ignoring store paths --- pkgs/test/patch-shebangs/default.nix | 76 ++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 16 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix index 5e1d859c138..5c49787eee3 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/patch-shebangs/default.nix @@ -1,26 +1,70 @@ { lib, stdenv, runCommand }: let - bad-shebang = stdenv.mkDerivation { - name = "bad-shebang"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - echo "#!/bin/sh" > $out/bin/test - echo "echo -n hello" >> $out/bin/test - chmod +x $out/bin/test - ''; + tests = { + bad-shebang = stdenv.mkDerivation { + name = "bad-shebang"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/bin/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep -v '^#!/bin/sh' $out/bin/test > /dev/null"; + }; + }; + + ignores-nix-store = stdenv.mkDerivation { + name = "ignores-nix-store"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!$NIX_STORE/path/to/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep \"^#!$NIX_STORE/path/to/sh\" $out/bin/test > /dev/null"; + }; + }; }; in runCommand "patch-shebangs-test" { - passthru = { inherit bad-shebang; }; + passthru = { inherit (tests) bad-shebang ignores-nix-store; }; meta.platforms = lib.platforms.all; } '' - printf "checking whether patchShebangs works properly... ">&2 - if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then - echo "yes" >&2 - touch $out - else - echo "no" >&2 + validate() { + local name=$1 + local testout=$2 + local assertion=$3 + + echo -n "... $name: " >&2 + + local rc=0 + (out=$testout eval "$assertion") || rc=1 + + if [ "$rc" -eq 0 ]; then + echo "yes" >&2 + else + echo "no" >&2 + fi + + return "$rc" + } + + echo "checking whether patchShebangs works properly... ">&2 + + fail= + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: '' + validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1 + '') tests)} + + if [ "$fail" ]; then + echo "failed" exit 1 + else + echo "succeeded" + touch $out fi '' -- cgit 1.4.1 From 23f815f12c6cd3850f0df3723372e7fe9aea804b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 9 Mar 2021 13:04:03 -0500 Subject: tests.cuda.cuda-sample_*: Init at supported CUDA toolkit versions Since CUDA is unfree, we won't actually use this when testing Nixpkgs officially. But I want to include this as they are useful for users of Nixpkgs trying to set up / debug a CUDA environment. --- pkgs/test/cuda/cuda-samples/default.nix | 52 +++++++++++++++++++++++++++++++++ pkgs/test/cuda/cuda-samples/generic.nix | 51 ++++++++++++++++++++++++++++++++ pkgs/test/cuda/default.nix | 16 ++++++++++ pkgs/test/default.nix | 2 ++ 4 files changed, 121 insertions(+) create mode 100644 pkgs/test/cuda/cuda-samples/default.nix create mode 100644 pkgs/test/cuda/cuda-samples/generic.nix create mode 100644 pkgs/test/cuda/default.nix (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix new file mode 100644 index 00000000000..46d4d531690 --- /dev/null +++ b/pkgs/test/cuda/cuda-samples/default.nix @@ -0,0 +1,52 @@ +{ callPackage +, cudatoolkit_9_2 +, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +}: + +rec { + cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_9_2; + sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6"; + }; + + cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2; + + ## + + cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_0; + sha256 = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw"; + }; + + cuda-samples_cudatoolkit_10_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_1; + sha256 = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd"; + }; + + cuda-samples_cudatoolkit_10_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_2; + sha256 = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94"; + }; + + cuda-samples_cudatoolkit_10 = cuda-samples_cudatoolkit_10_2; + + ## + + cuda-samples_cudatoolkit_11_0 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_0; + sha256 = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705"; + }; + + cuda-samples_cudatoolkit_11_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_1; + sha256 = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh"; + }; + + cuda-samples_cudatoolkit_11_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_2; + sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1"; + }; + + cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2; +} diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix new file mode 100644 index 00000000000..a104f88ad4b --- /dev/null +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub +, pkg-config, addOpenGLRunpath +, sha256, cudatoolkit +}: + +let + pname = "cuda-samples"; + version = lib.versions.majorMinor cudatoolkit.version; +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "v${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ pkg-config addOpenGLRunpath ]; + + buildInputs = [ cudatoolkit ]; + + enableParallelBuilding = true; + + preConfigure = '' + export CUDA_PATH=${cudatoolkit} + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/* + + runHook postInstall + ''; + + postFixup = '' + for exe in $out/bin/*; do + addOpenGLRunpath $exe + done + ''; + + meta = { + description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; + # CUDA itself is proprietary, but these sample apps are not. + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + }; +} diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix new file mode 100644 index 00000000000..a3b0f8a66d1 --- /dev/null +++ b/pkgs/test/cuda/default.nix @@ -0,0 +1,16 @@ +{ callPackage }: + +rec { + cuda-samplesPackages = callPackage ./cuda-samples { }; + inherit (cuda-samplesPackages) + cuda-samples_cudatoolkit_9 + cuda-samples_cudatoolkit_9_2 + cuda-samples_cudatoolkit_10 + cuda-samples_cudatoolkit_10_0 + cuda-samples_cudatoolkit_10_1 + cuda-samples_cudatoolkit_10_2 + cuda-samples_cudatoolkit_11 + cuda-samples_cudatoolkit_11_0 + cuda-samples_cudatoolkit_11_1 + cuda-samples_cudatoolkit_11_2; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index f45e981cff0..fa93ceb0721 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -47,5 +47,7 @@ with pkgs; texlive = callPackage ./texlive {}; + cuda = callPackage ./cuda { }; + writers = callPackage ../build-support/writers/test.nix {}; } -- cgit 1.4.1 From c1ced05ec4330c4241cfd2e32c071470feeb9e8f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 12 Mar 2021 15:06:09 -0500 Subject: tests.cude.cuda-library-samples.{cublas,cusolver}: init at master Well, strictly speaking, master + https://github.com/NVIDIA/CUDALibrarySamples/pull/29 --- pkgs/test/cuda/cuda-library-samples/default.nix | 35 +++++++++++++++++ pkgs/test/cuda/cuda-library-samples/generic.nix | 51 +++++++++++++++++++++++++ pkgs/test/cuda/default.nix | 10 +++++ 3 files changed, 96 insertions(+) create mode 100644 pkgs/test/cuda/cuda-library-samples/default.nix create mode 100644 pkgs/test/cuda/cuda-library-samples/generic.nix (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix new file mode 100644 index 00000000000..501828c9a1f --- /dev/null +++ b/pkgs/test/cuda/cuda-library-samples/default.nix @@ -0,0 +1,35 @@ +{ callPackage +, cudatoolkit_10_1, cudatoolkit_10_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +}: + +rec { + + cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_1; + }; + + cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_2; + }; + + cuda-library-samples_cudatoolkit_10 = + cuda-library-samples_cudatoolkit_10_2; + + ## + + cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_0; + }; + + cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_1; + }; + + cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_2; + }; + + cuda-library-samples_cudatoolkit_11 = + cuda-library-samples_cudatoolkit_11_2; +} diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix new file mode 100644 index 00000000000..75d4541d986 --- /dev/null +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, addOpenGLRunpath +, cudatoolkit +}: + +let + rev = "5aab680905d853bce0dbad4c488e4f7e9f7b2302"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "CUDALibrarySamples"; + inherit rev; + sha256 = "0gwgbkq05ygrfgg5hk07lmap7n7ampxv0ha1axrv8qb748ph81xs"; + }; + commonAttrs = { + version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ cudatoolkit ]; + enableParallelBuilding = true; + postFixup = '' + for exe in $out/bin/*; do + addOpenGLRunpath $exe + done + ''; + meta = { + description = "examples of using libraries using CUDA"; + longDescription = '' + CUDA Library Samples contains examples demonstrating the use of + features in the math and image processing libraries cuBLAS, cuTENSOR, + cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + }; + }; +in + +{ + cublas = stdenv.mkDerivation (commonAttrs // { + pname = "cuda-library-samples-cublas"; + + src = "${src}/cuBLASLt"; + }); + + cusolver = stdenv.mkDerivation (commonAttrs // { + pname = "cuda-library-samples-cusolver"; + + src = "${src}/cuSOLVER"; + + sourceRoot = "cuSOLVER/gesv"; + }); +} diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index a3b0f8a66d1..9e7eaf8036a 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -13,4 +13,14 @@ rec { cuda-samples_cudatoolkit_11_0 cuda-samples_cudatoolkit_11_1 cuda-samples_cudatoolkit_11_2; + + cuda-library-samplesPackages = callPackage ./cuda-library-samples { }; + inherit (cuda-library-samplesPackages) + cuda-library-samples_cudatoolkit_10 + cuda-library-samples_cudatoolkit_10_1 + cuda-library-samples_cudatoolkit_10_2 + cuda-library-samples_cudatoolkit_11 + cuda-library-samples_cudatoolkit_11_0 + cuda-library-samples_cudatoolkit_11_1 + cuda-library-samples_cudatoolkit_11_2; } -- cgit 1.4.1 From a680b02816260761e6ed609bdfc6fecb250e5784 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 12 Mar 2021 15:06:09 -0500 Subject: tests.cude.cuda-library-samples.cutensor: init at same version as others --- pkgs/test/cuda/cuda-library-samples/default.nix | 7 +++++++ pkgs/test/cuda/cuda-library-samples/generic.nix | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix index 501828c9a1f..91095fbd3ac 100644 --- a/pkgs/test/cuda/cuda-library-samples/default.nix +++ b/pkgs/test/cuda/cuda-library-samples/default.nix @@ -1,16 +1,20 @@ { callPackage , cudatoolkit_10_1, cudatoolkit_10_2 , cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2 +, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2 }: rec { cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_10_1; + cutensor_cudatoolkit = cutensor_cudatoolkit_10_1; }; cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_10_2; + cutensor_cudatoolkit = cutensor_cudatoolkit_10_2; }; cuda-library-samples_cudatoolkit_10 = @@ -20,14 +24,17 @@ rec { cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_11_0; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_0; }; cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_11_1; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_1; }; cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_11_2; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_2; }; cuda-library-samples_cudatoolkit_11 = diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index 75d4541d986..999e2abd041 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , cmake, addOpenGLRunpath , cudatoolkit +, cutensor_cudatoolkit }: let @@ -48,4 +49,22 @@ in sourceRoot = "cuSOLVER/gesv"; }); + + cutensor = stdenv.mkDerivation (commonAttrs // { + pname = "cuda-library-samples-cutensor"; + + src = "${src}/cuTENSOR"; + + cmakeFlags = [ + "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin" + ]; + + # CUTENSOR_ROOT is double escaped + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CUTENSOR_ROOT}/include" "${cutensor_cudatoolkit.dev}/include" + ''; + + CUTENSOR_ROOT = cutensor_cudatoolkit; + }); } -- cgit 1.4.1 From 66447439a012a3fa8a576367e2ec9bf7f1db75df Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 17 Mar 2021 18:44:46 -0400 Subject: maintainers-list: obsidian-systems-maintenance Fix mispelling. That word always breaks me... --- maintainers/maintainer-list.nix | 2 +- pkgs/development/libraries/science/math/cutensor/generic.nix | 2 +- pkgs/test/cuda/cuda-library-samples/generic.nix | 2 +- pkgs/test/cuda/cuda-samples/generic.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/test') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 03a16d860b8..0f87b3d8641 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6987,7 +6987,7 @@ githubId = 3359345; name = "obadz"; }; - obsidian-systems-maintainence = { + obsidian-systems-maintenance = { name = "Obsidian Systems Maintenance"; email = "maintainer@obsidian.systems"; github = "obsidian-systems-maintenance"; diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix index 31b7dbdb8de..0b2bd31b2c3 100644 --- a/pkgs/development/libraries/science/math/cutensor/generic.nix +++ b/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation { homepage = "https://developer.nvidia.com/cutensor"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ obsidian-systems-maintainence ]; + maintainers = with maintainers; [ obsidian-systems-maintenance ]; }; } diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index 999e2abd041..f1ce243bfa6 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -30,7 +30,7 @@ let cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG. ''; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; }; }; in diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index a104f88ad4b..2e3dcc8891f 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; # CUDA itself is proprietary, but these sample apps are not. license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; }; } -- cgit 1.4.1 From 6829f9e141095512add567a6f0c54c914c6ed7e2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 18 Mar 2021 20:55:00 -0400 Subject: texlive.bin.dvipng: refactor gs hardcoding, add a test for it --- pkgs/test/texlive/default.nix | 45 ++++++++++++++++++++++++++++-- pkgs/tools/typesetting/tex/texlive/bin.nix | 7 ++--- 2 files changed, 45 insertions(+), 7 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 30d0026c848..7a6affd6cbe 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -1,4 +1,4 @@ -{ runCommandNoCC, fetchurl, file, texlive }: +{ runCommandNoCC, fetchurl, file, texlive, writeShellScript }: { chktex = runCommandNoCC "texlive-test-chktex" { @@ -17,7 +17,7 @@ ''; # https://github.com/NixOS/nixpkgs/issues/75605 - dvipng = runCommandNoCC "texlive-test-dvipng" { + dvipng.basic = runCommandNoCC "texlive-test-dvipng-basic" { nativeBuildInputs = [ file texlive.combined.scheme-medium ]; input = fetchurl { name = "test_dvipng.tex"; @@ -38,6 +38,47 @@ mv document*.png "$out"/ ''; + # test dvipng's limited capability to render postscript specials via GS + dvipng.ghostscript = runCommandNoCC "texlive-test-ghostscript" { + nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; + input = builtins.toFile "postscript-sample.tex" '' + \documentclass{minimal} + \begin{document} + Ni + \special{ps: + newpath + 0 0 moveto + 7 7 rlineto + 0 7 moveto + 7 -7 rlineto + stroke + showpage + } + \end{document} + ''; + gs_trap = writeShellScript "gs_trap.sh" '' + exit 1 + ''; + } '' + cp "$gs_trap" ./gs + export PATH=$PWD:$PATH + # check that the trap works + gs && exit 1 + + cp "$input" ./document.tex + + latex document.tex + dvipng -T 1in,1in -strict -picky document.dvi + for f in document*.png; do + file "$f" | tee output + grep PNG output + done + + mkdir "$out" + mv document*.png "$out"/ + ''; + + # https://github.com/NixOS/nixpkgs/issues/75070 dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { nativeBuildInputs = [ file texlive.combined.scheme-medium ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index d2858a90885..fb9b748b5d0 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -281,12 +281,9 @@ dvipng = stdenv.mkDerivation { configureFlags = common.configureFlags ++ [ "--with-system-kpathsea" "--with-gs=yes" "--disable-debug" ]; - enableParallelBuilding = true; + GS="${ghostscript}/bin/gs"; - # I didn't manage to hardcode gs location by configureFlags - postInstall = '' - wrapProgram "$out/bin/dvipng" --prefix PATH : '${ghostscript}/bin' - ''; + enableParallelBuilding = true; }; -- cgit 1.4.1 From f75286e0638047455f012fa2b3e87c3bf16e7446 Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Sun, 18 Apr 2021 11:55:10 +0200 Subject: cudatoolkit-{9,9_0,9_1,9_2}: remove Remove old CUDA toolkits (and corresponding CuDNN versions). - Not supported by upstream anymore. - We do not use them in nixpkgs. - We do not test or actively maintain them. - Anything but ancient GPUs is supported by newer toolkits. Fixes #107131. --- nixos/doc/manual/release-notes/rl-2105.xml | 5 ++ pkgs/development/compilers/cudatoolkit/default.nix | 63 ---------------------- .../libraries/science/math/cudnn/default.nix | 25 +-------- pkgs/test/cuda/cuda-samples/default.nix | 8 --- pkgs/test/cuda/default.nix | 2 - pkgs/top-level/aliases.nix | 8 +++ pkgs/top-level/all-packages.nix | 8 --- 7 files changed, 14 insertions(+), 105 deletions(-) (limited to 'pkgs/test') diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index de64aa64bda..e0552c25a85 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -675,6 +675,11 @@ environment.systemPackages = [ Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements. + + + All CUDA toolkit versions prior to CUDA 10 have been removed. + + diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 5685f178876..da6857f6ab9 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,8 +1,6 @@ { lib , callPackage , fetchurl -, gcc48 -, gcc6 , gcc7 , gcc9 }: @@ -10,67 +8,6 @@ let common = callPackage ./common.nix; in rec { - cudatoolkit_9_0 = common { - version = "9.0.176.1"; - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; - sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/1/cuda_9.0.176.1_linux-run"; - sha256 = "1vbqg97pq9z9c8nqvckiwmq3ljm88m7gaizikzxbvz01izh67gx4"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/2/cuda_9.0.176.2_linux-run"; - sha256 = "1sz5dijbx9yf7drfipdxav5a5g6sxy4w6vi9xav0lb6m2xnmyd7c"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/3/cuda_9.0.176.3_linux-run"; - sha256 = "1jm83bxpscpjhzs5q3qijdgjm0r8qrdlgkj7y08fq8c0v8q2r7j2"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/4/cuda_9.0.176.4_linux-run"; - sha256 = "0pymg3mymsa2n48y0njz3spzlkm15lvjzw8fms1q83zslz4x0lwk"; - }) - ]; - gcc = gcc6; - }; - - cudatoolkit_9_1 = common { - version = "9.1.85.3"; - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; - sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux"; - sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux"; - sha256 = "16g0w09h3bqmas4hy1m0y6j5ffyharslw52fn25gql57bfihg7ym"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux"; - sha256 = "12mcv6f8z33z8y41ja8bv5p5iqhv2vx91mv3b5z6fcj7iqv98422"; - }) - ]; - gcc = gcc6; - }; - - cudatoolkit_9_2 = common { - version = "9.2.148.1"; - url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux"; - sha256 = "04c6v9b50l4awsf9w9zj5vnxvmc0hk0ypcfjksbh4vnzrz14wigm"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_linux"; - sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw"; - }) - ]; - gcc = gcc7; - }; - - cudatoolkit_9 = cudatoolkit_9_2; - cudatoolkit_10_0 = common { version = "10.0.130"; url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index b8aac46d919..d4c7fcac978 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: +{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -6,29 +6,6 @@ let }; in rec { - cudnn_cudatoolkit_9_0 = generic rec { - version = "7.3.0"; - cudatoolkit = cudatoolkit_9_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.0.29.tgz"; - sha256 = "16z4vgbcmbayk4hppz0xshgs3g07blkp4j25cxcjqyrczx1r0gs0"; - }; - - cudnn_cudatoolkit_9_1 = generic rec { - version = "7.1.3"; - cudatoolkit = cudatoolkit_9_1; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.1.tgz"; - sha256 = "0a0237gpr0p63s92njai0xvxmkbailzgfsvh7n9fnz0njhvnsqfx"; - }; - - cudnn_cudatoolkit_9_2 = generic rec { - version = "7.2.1"; - cudatoolkit = cudatoolkit_9_2; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.2.1.38.tgz"; - sha256 = "1sf215wm6zgr17gs6sxfhw61b7a0qmcxiwhgy1b4nqdyxpqgay1y"; - }; - - cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2; - cudnn_cudatoolkit_10_0 = generic rec { version = "7.4.2"; cudatoolkit = cudatoolkit_10_0; diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix index 46d4d531690..1a361c57214 100644 --- a/pkgs/test/cuda/cuda-samples/default.nix +++ b/pkgs/test/cuda/cuda-samples/default.nix @@ -1,17 +1,9 @@ { callPackage -, cudatoolkit_9_2 , cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 , cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: rec { - cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix { - cudatoolkit = cudatoolkit_9_2; - sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6"; - }; - - cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2; - ## cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix { diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index 9e7eaf8036a..aac52e6a4f5 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -3,8 +3,6 @@ rec { cuda-samplesPackages = callPackage ./cuda-samples { }; inherit (cuda-samplesPackages) - cuda-samples_cudatoolkit_9 - cuda-samples_cudatoolkit_9_2 cuda-samples_cudatoolkit_10 cuda-samples_cudatoolkit_10_0 cuda-samples_cudatoolkit_10_1 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 78e7c308e7e..a251f76fecd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -130,10 +130,18 @@ mapAliases ({ cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 + cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 + cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 + cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 + cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 + cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 + cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad178f83a18..3f90ed6b658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3642,10 +3642,6 @@ in cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {}); inherit (cudaPackages) - cudatoolkit_9 - cudatoolkit_9_0 - cudatoolkit_9_1 - cudatoolkit_9_2 cudatoolkit_10 cudatoolkit_10_0 cudatoolkit_10_1 @@ -3659,10 +3655,6 @@ in cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; inherit (cudnnPackages) - cudnn_cudatoolkit_9 - cudnn_cudatoolkit_9_0 - cudnn_cudatoolkit_9_1 - cudnn_cudatoolkit_9_2 cudnn_cudatoolkit_10 cudnn_cudatoolkit_10_0 cudnn_cudatoolkit_10_1 -- cgit 1.4.1 From b3abdc9534a675da2aa7631d505a5f71ef30ecfa Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 21 Apr 2021 12:55:05 +0200 Subject: tests.vim: init (moved from vim-utils.nix) (#119467) * tests.vim: init (moved from vim-utils.nix) Moved tests from pkgs/misc/vim-plugins/vim-utils.nix to pkgs/test/vim. Also reduced the amount of generated config: - Make it possible to have an empty config when configured adequately - removed default vim config when using native packages, it could be source of bugs see linked issues (syntax on overrides vim highlights) Things to watch out for: - if you set configure.beforePlugins yourself, you will need to add set nocompatible too not to lose it - filetype indent plugin on | syn on is not enabled anymore by default for the vim-plug installer: I dont think we should override vim defualts, at least not here since it is shared with neovim. Also sometimes it's enabled before plugins (pathogen etc,) which is not consistent. you can run the tests via $ nix-build -A tests.vim --- pkgs/applications/editors/neovim/wrapper.nix | 1 - pkgs/misc/vim-plugins/vim-utils.nix | 159 ++++++++------------------- pkgs/test/default.nix | 2 + pkgs/test/vim/default.nix | 72 ++++++++++++ 4 files changed, 122 insertions(+), 112 deletions(-) create mode 100644 pkgs/test/vim/default.nix (limited to 'pkgs/test') diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 41ff62a619f..8b42191bde6 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,5 +1,4 @@ { stdenv, symlinkJoin, lib, makeWrapper -, vimUtils , writeText , bundlerEnv, ruby , nodejs diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index fd66c48ecb2..c55e8aa0a01 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin +# tests available at pkgs/test/vim +{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell }: @@ -183,13 +184,49 @@ let rtpPath = "share/vim-plugins"; + nativeImpl = packages: lib.optionalString (packages != null) + (let + link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); + packageLinks = (packageName: {start ? [], opt ? []}: + let + # `nativeImpl` expects packages to be derivations, not strings (as + # opposed to older implementations that have to maintain backwards + # compatibility). Therefore we don't need to deal with "knownPlugins" + # and can simply pass `null`. + depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); + startWithDeps = findDependenciesRecursively start; + in + [ "mkdir -p $out/pack/${packageName}/start" ] + # To avoid confusion, even dependencies of optional plugins are added + # to `start` (except if they are explicitly listed as optional plugins). + ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) + ++ ["mkdir -p $out/pack/${packageName}/opt"] + ++ (builtins.map (link packageName "opt") opt) + ); + packDir = (packages: + stdenv.mkDerivation { + name = "vim-pack-dir"; + src = ./.; + installPhase = lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList packageLinks packages)); + preferLocalBuild = true; + } + ); + in + '' + set packpath^=${packDir packages} + set runtimepath^=${packDir packages} + ''); + vimrcContent = { packages ? null, vam ? null, pathogen ? null, plug ? null, - beforePlugins ? "", - customRC ? "" + beforePlugins ? '' + " configuration generated by NIX + set nocompatible + '', + customRC ? null }: let @@ -301,56 +338,16 @@ let call vam#Scripts(l, {}) ''); - nativeImpl = lib.optionalString (packages != null) - (let - link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); - packageLinks = (packageName: {start ? [], opt ? []}: - let - # `nativeImpl` expects packages to be derivations, not strings (as - # opposed to older implementations that have to maintain backwards - # compatibility). Therefore we don't need to deal with "knownPlugins" - # and can simply pass `null`. - depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); - startWithDeps = findDependenciesRecursively start; - in - ["mkdir -p $out/pack/${packageName}/start"] - # To avoid confusion, even dependencies of optional plugins are added - # to `start` (except if they are explicitly listed as optional plugins). - ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) - ++ ["mkdir -p $out/pack/${packageName}/opt"] - ++ (builtins.map (link packageName "opt") opt) - ); - packDir = (packages: - stdenv.mkDerivation { - name = "vim-pack-dir"; - src = ./.; - installPhase = lib.concatStringsSep - "\n" - (lib.flatten (lib.mapAttrsToList packageLinks packages)); - preferLocalBuild = true; - } - ); - in - '' - set packpath^=${packDir packages} - set runtimepath^=${packDir packages} - - filetype indent plugin on | syn on - ''); - - in '' - " configuration generated by NIX - set nocompatible - - ${beforePlugins} + entries = [ + beforePlugins + vamImpl pathogenImpl plugImpl + (nativeImpl packages) + customRC + ]; - ${vamImpl} - ${pathogenImpl} - ${plugImpl} - ${nativeImpl} + in + lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries); - ${customRC} - ''; vimrcFile = settings: writeText "vimrc" (vimrcContent settings); in @@ -448,8 +445,6 @@ rec { ''; }; - vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; - inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix; # used to figure out which python dependencies etc. neovim needs @@ -475,62 +470,4 @@ rec { nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs; in nativePlugins ++ nonNativePlugins; - - - # test cases: - test_vim_with_vim_nix_using_vam = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-vam"; - vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }]; - }; - - test_vim_with_vim_nix_using_pathogen = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-pathogen"; - vimrcConfig.pathogen.pluginNames = [ "vim-nix" ]; - }; - - test_vim_with_vim_nix_using_plug = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-plug"; - vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ]; - }; - - test_vim_with_vim_nix = vim_configurable.customize { - name = "vim-with-vim-addon-nix"; - vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - }; - - # only neovim makes use of `requiredPlugins`, test this here - test_nvim_with_vim_nix_using_pathogen = neovim.override { - configure.pathogen.pluginNames = [ "vim-nix" ]; - }; - - # regression test for https://github.com/NixOS/nixpkgs/issues/53112 - # The user may have specified their own plugins which may not be formatted - # exactly as the generated ones. In particular, they may not have the `pname` - # attribute. - test_vim_with_custom_plugin = vim_configurable.customize { - name = "vim_with_custom_plugin"; - vimrcConfig.vam.knownPlugins = - vimPlugins // ({ - vim-trailing-whitespace = buildVimPluginFrom2Nix { - name = "vim-trailing-whitespace"; - src = fetchFromGitHub { - owner = "bronson"; - repo = "vim-trailing-whitespace"; - rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; - sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; - }; - # make sure string dependencies are handled - dependencies = [ "vim-nix" ]; - }; - }); - vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; - }; - - # system remote plugin manifest should be generated, deoplete should be usable - # without the user having to do `UpdateRemotePlugins`. To test, launch neovim - # and do `:call deoplete#enable()`. It will print an error if the remote - # plugin is not registered. - test_nvim_with_remote_plugin = neovim.override { - configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; - }; } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index fa93ceb0721..b24fc539c93 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -41,6 +41,8 @@ with pkgs; rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; + vim = callPackage ./vim {}; + nixos-functions = callPackage ./nixos-functions {}; patch-shebangs = callPackage ./patch-shebangs {}; diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix new file mode 100644 index 00000000000..4ca004a60c3 --- /dev/null +++ b/pkgs/test/vim/default.nix @@ -0,0 +1,72 @@ +{ vimUtils, vim_configurable, neovim, vimPlugins +, lib, fetchFromGitHub, +}: +let + inherit (vimUtils) buildVimPluginFrom2Nix; + + packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; +in +{ + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; + + vim_with_vim2nix = vim_configurable.customize { + name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; + }; + + # test cases: + test_vim_with_vim_nix_using_vam = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-vam"; + vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }]; + }; + + test_vim_with_vim_nix_using_pathogen = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-pathogen"; + vimrcConfig.pathogen.pluginNames = [ "vim-nix" ]; + }; + + test_vim_with_vim_nix_using_plug = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-plug"; + vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ]; + }; + + test_vim_with_vim_nix = vim_configurable.customize { + name = "vim-with-vim-addon-nix"; + vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; + }; + + # only neovim makes use of `requiredPlugins`, test this here + test_nvim_with_vim_nix_using_pathogen = neovim.override { + configure.pathogen.pluginNames = [ "vim-nix" ]; + }; + + # regression test for https://github.com/NixOS/nixpkgs/issues/53112 + # The user may have specified their own plugins which may not be formatted + # exactly as the generated ones. In particular, they may not have the `pname` + # attribute. + test_vim_with_custom_plugin = vim_configurable.customize { + name = "vim_with_custom_plugin"; + vimrcConfig.vam.knownPlugins = + vimPlugins // ({ + vim-trailing-whitespace = buildVimPluginFrom2Nix { + name = "vim-trailing-whitespace"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-trailing-whitespace"; + rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; + sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; + }; + # make sure string dependencies are handled + dependencies = [ "vim-nix" ]; + }; + }); + vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; + }; + + # system remote plugin manifest should be generated, deoplete should be usable + # without the user having to do `UpdateRemotePlugins`. To test, launch neovim + # and do `:call deoplete#enable()`. It will print an error if the remote + # plugin is not registered. + test_nvim_with_remote_plugin = neovim.override { + configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + }; +} -- cgit 1.4.1 From 10b771c61a02fc9db2047e880388ac9dcefe8f8c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 1 May 2021 13:24:25 +0200 Subject: tests.haskell*: move into tests.haskell set This will make it easier to add all haskell related tests to the haskell hydra jobset without updating a list of tests in two places. --- pkgs/test/default.nix | 3 +- pkgs/test/haskell-documentationTarball/default.nix | 17 ----------- pkgs/test/haskell-shellFor/default.nix | 33 ---------------------- pkgs/test/haskell/default.nix | 6 ++++ pkgs/test/haskell/documentationTarball/default.nix | 17 +++++++++++ pkgs/test/haskell/shellFor/default.nix | 33 ++++++++++++++++++++++ 6 files changed, 57 insertions(+), 52 deletions(-) delete mode 100644 pkgs/test/haskell-documentationTarball/default.nix delete mode 100644 pkgs/test/haskell-shellFor/default.nix create mode 100644 pkgs/test/haskell/default.nix create mode 100644 pkgs/test/haskell/documentationTarball/default.nix create mode 100644 pkgs/test/haskell/shellFor/default.nix (limited to 'pkgs/test') diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b24fc539c93..89656dde292 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -22,8 +22,7 @@ with pkgs; cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; }; stdenv-inputs = callPackage ./stdenv-inputs { }; - haskell-shellFor = callPackage ./haskell-shellFor { }; - haskell-documentationTarball = callPackage ./haskell-documentationTarball { }; + haskell = callPackage ./haskell { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; diff --git a/pkgs/test/haskell-documentationTarball/default.nix b/pkgs/test/haskell-documentationTarball/default.nix deleted file mode 100644 index aec3dc41f26..00000000000 --- a/pkgs/test/haskell-documentationTarball/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, haskellPackages }: - -let - drv = haskellPackages.vector; - docs = pkgs.haskell.lib.documentationTarball drv; - -in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' - tar xvzf "${docs}/${drv.name}-docs.tar.gz" - - # Check for Haddock html - find "${drv.name}-docs" | grep -q "Data-Vector.html" - - # Check for source html - find "${drv.name}-docs" | grep -q "src/Data.Vector.html" - - touch "$out" -'' diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix deleted file mode 100644 index 9d13e1112cc..00000000000 --- a/pkgs/test/haskell-shellFor/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, haskellPackages, cabal-install }: - -(haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints ]; - nativeBuildInputs = [ cabal-install ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - unpackPhase = '' - sourceRoot=$(pwd)/scratch - mkdir -p "$sourceRoot" - cd "$sourceRoot" - tar -xf ${haskellPackages.database-id-class.src} - tar -xf ${haskellPackages.constraints.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project - ''; - buildPhase = '' - export HOME=$(mktemp -d) - mkdir -p $HOME/.cabal - touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" - ''; - installPhase = '' - touch $out - ''; -}).overrideAttrs (oldAttrs: { - meta = - let - oldMeta = oldAttrs.meta or {}; - oldMaintainers = oldMeta.maintainers or []; - additionalMaintainers = with lib.maintainers; [ cdepillabout ]; - allMaintainers = oldMaintainers ++ additionalMaintainers; - in - oldMeta // { maintainers = allMaintainers; }; -}) diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix new file mode 100644 index 00000000000..8171f929311 --- /dev/null +++ b/pkgs/test/haskell/default.nix @@ -0,0 +1,6 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + shellFor = callPackage ./shellFor { }; + documentationTarball = callPackage ./documentationTarball { }; +} diff --git a/pkgs/test/haskell/documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix new file mode 100644 index 00000000000..aec3dc41f26 --- /dev/null +++ b/pkgs/test/haskell/documentationTarball/default.nix @@ -0,0 +1,17 @@ +{ pkgs, haskellPackages }: + +let + drv = haskellPackages.vector; + docs = pkgs.haskell.lib.documentationTarball drv; + +in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' + tar xvzf "${docs}/${drv.name}-docs.tar.gz" + + # Check for Haddock html + find "${drv.name}-docs" | grep -q "Data-Vector.html" + + # Check for source html + find "${drv.name}-docs" | grep -q "src/Data.Vector.html" + + touch "$out" +'' diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix new file mode 100644 index 00000000000..9d13e1112cc --- /dev/null +++ b/pkgs/test/haskell/shellFor/default.nix @@ -0,0 +1,33 @@ +{ lib, haskellPackages, cabal-install }: + +(haskellPackages.shellFor { + packages = p: [ p.database-id-class p.constraints ]; + nativeBuildInputs = [ cabal-install ]; + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + unpackPhase = '' + sourceRoot=$(pwd)/scratch + mkdir -p "$sourceRoot" + cd "$sourceRoot" + tar -xf ${haskellPackages.database-id-class.src} + tar -xf ${haskellPackages.constraints.src} + cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project + ''; + buildPhase = '' + export HOME=$(mktemp -d) + mkdir -p $HOME/.cabal + touch $HOME/.cabal/config + cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" + ''; + installPhase = '' + touch $out + ''; +}).overrideAttrs (oldAttrs: { + meta = + let + oldMeta = oldAttrs.meta or {}; + oldMaintainers = oldMeta.maintainers or []; + additionalMaintainers = with lib.maintainers; [ cdepillabout ]; + allMaintainers = oldMaintainers ++ additionalMaintainers; + in + oldMeta // { maintainers = allMaintainers; }; +}) -- cgit 1.4.1 From 9a0dc0fa3e19a360d28c8b102611feafad52afbd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 1 May 2021 13:25:13 +0200 Subject: tests.haskell.shellFor: replace database-id-class with linear Contrary to database-id-class, linear is part of stackage and actively maintained, so the test is less likely to fail due to version constraint issues as it is currently. --- pkgs/test/haskell/shellFor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 9d13e1112cc..eeab231df40 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -1,22 +1,22 @@ { lib, haskellPackages, cabal-install }: (haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints ]; + packages = p: [ p.constraints p.linear ]; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' sourceRoot=$(pwd)/scratch mkdir -p "$sourceRoot" cd "$sourceRoot" - tar -xf ${haskellPackages.database-id-class.src} tar -xf ${haskellPackages.constraints.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project + tar -xf ${haskellPackages.linear.src} + cp ${builtins.toFile "cabal.project" "packages: constraints* linear*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out -- cgit 1.4.1 From 1bfa5e12913a04404d777a31fed5d4c5743865e6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 1 May 2021 13:36:24 +0200 Subject: tests.haskell.shellFor: use writeText instead of toFile --- pkgs/test/haskell/shellFor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index eeab231df40..37ad2e90d89 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -1,4 +1,4 @@ -{ lib, haskellPackages, cabal-install }: +{ lib, writeText, haskellPackages, cabal-install }: (haskellPackages.shellFor { packages = p: [ p.constraints p.linear ]; @@ -10,7 +10,7 @@ cd "$sourceRoot" tar -xf ${haskellPackages.constraints.src} tar -xf ${haskellPackages.linear.src} - cp ${builtins.toFile "cabal.project" "packages: constraints* linear*"} cabal.project + cp ${writeText "cabal.project" "packages: constraints* linear*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) -- cgit 1.4.1 From d725ac794286e3464d80f5bce69da98ff4b2ebbf Mon Sep 17 00:00:00 2001 From: Isaac Shapira Date: Fri, 23 Apr 2021 13:55:38 -0600 Subject: Add haskell.lib.setBuiltTarget, and support non library compiling of a single target --- .../haskell-modules/generic-builder.nix | 7 +++++- pkgs/development/haskell-modules/lib.nix | 10 +++++++++ pkgs/test/haskell/default.nix | 1 + pkgs/test/haskell/setBuildTarget/Bar.hs | 4 ++++ pkgs/test/haskell/setBuildTarget/Foo.hs | 4 ++++ pkgs/test/haskell/setBuildTarget/Setup.hs | 2 ++ pkgs/test/haskell/setBuildTarget/default.nix | 26 ++++++++++++++++++++++ .../setBuildTarget/haskell-setBuildTarget.cabal | 16 +++++++++++++ 8 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 pkgs/test/haskell/setBuildTarget/Bar.hs create mode 100644 pkgs/test/haskell/setBuildTarget/Foo.hs create mode 100644 pkgs/test/haskell/setBuildTarget/Setup.hs create mode 100644 pkgs/test/haskell/setBuildTarget/default.nix create mode 100644 pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal (limited to 'pkgs/test') diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index faf80da0c7d..2f9127e30f3 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -464,7 +464,12 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - ${if !isLibrary then "${setupCommand} install" else '' + ${if !isLibrary && buildTarget == "" then "${setupCommand} install" + # ^^ if the project is not a library, and no build target is specified, we can just use "install". + else if !isLibrary then "${setupCommand} copy ${buildTarget}" + # ^^ if the project is not a library, and we have a build target, then use "copy" to install + # just the target specified; "install" will error here, since not all targets have been built. + else '' ${setupCommand} copy local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 1537cd6466c..682953c3ce9 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -196,6 +196,16 @@ rec { appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); + /* Set a specific build target instead of compiling all targets in the package. + * For example, imagine we have a .cabal file with a library, and 2 executables "dev" and "server". + * We can build only "server" and not wait on the compilation of "dev" by useing setBuildTarget as follows: + * + * setBuildTarget (callCabal2nix "thePackageName" thePackageSrc {}) "server" + * + */ + setBuildTargets = drv: xs: overrideCabal drv (drv: { buildTarget = lib.concatStringsSep " " xs; }); + setBuildTarget = drv: x: setBuildTargets drv [x]; + doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix index 8171f929311..eb389f4051f 100644 --- a/pkgs/test/haskell/default.nix +++ b/pkgs/test/haskell/default.nix @@ -3,4 +3,5 @@ lib.recurseIntoAttrs { shellFor = callPackage ./shellFor { }; documentationTarball = callPackage ./documentationTarball { }; + setBuildTarget = callPackage ./setBuildTarget { }; } diff --git a/pkgs/test/haskell/setBuildTarget/Bar.hs b/pkgs/test/haskell/setBuildTarget/Bar.hs new file mode 100644 index 00000000000..010014082c7 --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/Bar.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = putStrLn "Hello, Bar!" diff --git a/pkgs/test/haskell/setBuildTarget/Foo.hs b/pkgs/test/haskell/setBuildTarget/Foo.hs new file mode 100644 index 00000000000..fec7bb11fe6 --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/Foo.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = putStrLn "Hello, Foo!" diff --git a/pkgs/test/haskell/setBuildTarget/Setup.hs b/pkgs/test/haskell/setBuildTarget/Setup.hs new file mode 100644 index 00000000000..9a994af677b --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix new file mode 100644 index 00000000000..161cecd9ec3 --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -0,0 +1,26 @@ +{ pkgs, haskellPackages }: with pkgs.haskell.lib; + + +let + drv = haskellPackages.callCabal2nix "haskell-setBuildTarget" ./. {}; + test = target: excluded: + + let only = setBuildTarget drv target; + in '' + if [[ ! -f "${only}/bin/${target}" ]]; then + echo "${target} was not built" + exit 1 + fi + + if [[ -f "${only}/bin/${excluded}" ]]; then + echo "${excluded} was built, when it should not have been" + exit 1 + fi + ''; + +in pkgs.runCommand "test haskell.lib.setBuildTarget" {} '' + ${test "foo" "bar"} + ${test "bar" "foo"} + touch "$out" +'' + diff --git a/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal new file mode 100644 index 00000000000..7395e139451 --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal @@ -0,0 +1,16 @@ +cabal-version: >=1.10 +name: haskell-setBuildTarget +version: 0.1.0.0 +author: Isaac Shapira +maintainer: fresheyeball@protonmail.com +build-type: Simple + +executable foo + main-is: Foo.hs + build-depends: base + default-language: Haskell2010 + +executable bar + main-is: Bar.hs + build-depends: base + default-language: Haskell2010 -- cgit 1.4.1 From 88d9f2419e58b1570e0fed5d9a871f72b9423855 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 30 Apr 2021 12:12:07 +0900 Subject: tests.haskell-setBuildTarget: inline haskell package def to avoid IFD --- pkgs/test/haskell/setBuildTarget/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index 161cecd9ec3..b1335e2a74c 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -1,11 +1,23 @@ -{ pkgs, haskellPackages }: with pkgs.haskell.lib; - +{ pkgs, haskellPackages }: let - drv = haskellPackages.callCabal2nix "haskell-setBuildTarget" ./. {}; - test = target: excluded: + # This can be regenerated by running `cabal2nix .` in the current directory. + pkgDef = + { mkDerivation, base, lib }: + mkDerivation { + pname = "haskell-setBuildTarget"; + version = "0.1.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + license = lib.licenses.bsd3; + }; + + drv = haskellPackages.callPackage pkgDef {}; - let only = setBuildTarget drv target; + test = target: excluded: + let only = pkgs.haskell.lib.setBuildTarget drv target; in '' if [[ ! -f "${only}/bin/${target}" ]]; then echo "${target} was not built" -- cgit 1.4.1 From f674f06ac52f735190877704c74935e2e87d3d1e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 2 May 2021 19:35:47 -0400 Subject: tests.texlive.dvipng: apply recurseIntoAttrs --- pkgs/test/texlive/default.nix | 113 +++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 56 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 7a6affd6cbe..d8420d99136 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -1,4 +1,4 @@ -{ runCommandNoCC, fetchurl, file, texlive, writeShellScript }: +{ lib, runCommandNoCC, fetchurl, file, texlive, writeShellScript }: { chktex = runCommandNoCC "texlive-test-chktex" { @@ -16,68 +16,69 @@ grep "One warning printed" "$out" ''; - # https://github.com/NixOS/nixpkgs/issues/75605 - dvipng.basic = runCommandNoCC "texlive-test-dvipng-basic" { - nativeBuildInputs = [ file texlive.combined.scheme-medium ]; - input = fetchurl { - name = "test_dvipng.tex"; - url = "http://git.savannah.nongnu.org/cgit/dvipng.git/plain/test_dvipng.tex?id=b872753590a18605260078f56cbd6f28d39dc035"; - sha256 = "1pjpf1jvwj2pv5crzdgcrzvbmn7kfmgxa39pcvskl4pa0c9hl88n"; - }; - } '' - cp "$input" ./document.tex - - latex document.tex - dvipng -T tight -strict -picky document.dvi - for f in document*.png; do - file "$f" | tee output - grep PNG output - done + dvipng = lib.recurseIntoAttrs { + # https://github.com/NixOS/nixpkgs/issues/75605 + basic = runCommandNoCC "texlive-test-dvipng-basic" { + nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + input = fetchurl { + name = "test_dvipng.tex"; + url = "http://git.savannah.nongnu.org/cgit/dvipng.git/plain/test_dvipng.tex?id=b872753590a18605260078f56cbd6f28d39dc035"; + sha256 = "1pjpf1jvwj2pv5crzdgcrzvbmn7kfmgxa39pcvskl4pa0c9hl88n"; + }; + } '' + cp "$input" ./document.tex - mkdir "$out" - mv document*.png "$out"/ - ''; + latex document.tex + dvipng -T tight -strict -picky document.dvi + for f in document*.png; do + file "$f" | tee output + grep PNG output + done - # test dvipng's limited capability to render postscript specials via GS - dvipng.ghostscript = runCommandNoCC "texlive-test-ghostscript" { - nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; - input = builtins.toFile "postscript-sample.tex" '' - \documentclass{minimal} - \begin{document} - Ni - \special{ps: - newpath - 0 0 moveto - 7 7 rlineto - 0 7 moveto - 7 -7 rlineto - stroke - showpage - } - \end{document} - ''; - gs_trap = writeShellScript "gs_trap.sh" '' - exit 1 + mkdir "$out" + mv document*.png "$out"/ ''; - } '' - cp "$gs_trap" ./gs - export PATH=$PWD:$PATH - # check that the trap works - gs && exit 1 - cp "$input" ./document.tex + # test dvipng's limited capability to render postscript specials via GS + ghostscript = runCommandNoCC "texlive-test-ghostscript" { + nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; + input = builtins.toFile "postscript-sample.tex" '' + \documentclass{minimal} + \begin{document} + Ni + \special{ps: + newpath + 0 0 moveto + 7 7 rlineto + 0 7 moveto + 7 -7 rlineto + stroke + showpage + } + \end{document} + ''; + gs_trap = writeShellScript "gs_trap.sh" '' + exit 1 + ''; + } '' + cp "$gs_trap" ./gs + export PATH=$PWD:$PATH + # check that the trap works + gs && exit 1 - latex document.tex - dvipng -T 1in,1in -strict -picky document.dvi - for f in document*.png; do - file "$f" | tee output - grep PNG output - done + cp "$input" ./document.tex - mkdir "$out" - mv document*.png "$out"/ - ''; + latex document.tex + dvipng -T 1in,1in -strict -picky document.dvi + for f in document*.png; do + file "$f" | tee output + grep PNG output + done + mkdir "$out" + mv document*.png "$out"/ + ''; + }; # https://github.com/NixOS/nixpkgs/issues/75070 dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { -- cgit 1.4.1 From 85f96822a05180cbfd5195e7034615b427f78f01 Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Fri, 7 May 2021 13:00:49 +0200 Subject: treewide: fix cargoSha256/cargoHash Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in which cargo vendor erroneously changed permissions of vendored crates. This was fixed in Rust 1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are potentially broken. This change updates cargoSha256/cargoHash tree-wide. Fixes #121994. --- pkgs/applications/audio/mmtc/default.nix | 2 +- pkgs/applications/audio/muso/default.nix | 2 +- pkgs/applications/audio/netease-music-tui/default.nix | 2 +- pkgs/applications/audio/spotify-tui/default.nix | 2 +- pkgs/applications/audio/spotifyd/default.nix | 2 +- pkgs/applications/blockchains/ethabi.nix | 2 +- pkgs/applications/editors/amp/default.nix | 2 +- pkgs/applications/editors/hexdino/default.nix | 2 +- pkgs/applications/editors/kibi/default.nix | 2 +- pkgs/applications/editors/neovim/gnvim/default.nix | 2 +- pkgs/applications/editors/ox/default.nix | 2 +- pkgs/applications/gis/whitebox-tools/default.nix | 2 +- pkgs/applications/graphics/emulsion/default.nix | 2 +- pkgs/applications/graphics/rx/default.nix | 2 +- pkgs/applications/misc/break-time/default.nix | 2 +- pkgs/applications/misc/clipcat/default.nix | 2 +- pkgs/applications/misc/effitask/default.nix | 2 +- pkgs/applications/misc/elfx86exts/default.nix | 2 +- pkgs/applications/misc/fitnesstrax/default.nix | 2 +- pkgs/applications/misc/flavours/default.nix | 2 +- pkgs/applications/misc/imag/default.nix | 2 +- pkgs/applications/misc/kondo/default.nix | 2 +- pkgs/applications/misc/lscolors/default.nix | 2 +- pkgs/applications/misc/pastel/default.nix | 2 +- pkgs/applications/misc/pipr/default.nix | 2 +- pkgs/applications/misc/pueue/default.nix | 2 +- pkgs/applications/misc/reddsaver/default.nix | 2 +- pkgs/applications/misc/rsclock/default.nix | 2 +- pkgs/applications/misc/surface-control/default.nix | 2 +- pkgs/applications/misc/taizen/default.nix | 2 +- pkgs/applications/misc/taskwarrior-tui/default.nix | 2 +- pkgs/applications/misc/terminal-typeracer/default.nix | 2 +- pkgs/applications/misc/tickrs/default.nix | 2 +- pkgs/applications/misc/todiff/default.nix | 2 +- pkgs/applications/misc/zktree/default.nix | 2 +- pkgs/applications/networking/browsers/asuka/default.nix | 2 +- pkgs/applications/networking/browsers/castor/default.nix | 2 +- pkgs/applications/networking/cluster/click/default.nix | 2 +- pkgs/applications/networking/cluster/habitat/default.nix | 2 +- pkgs/applications/networking/cluster/kubernix/default.nix | 2 +- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 2 +- pkgs/applications/networking/feedreaders/newsboat/default.nix | 2 +- pkgs/applications/networking/irc/tiny/default.nix | 2 +- pkgs/applications/networking/ncgopher/default.nix | 2 +- pkgs/applications/networking/p2p/synapse-bt/default.nix | 2 +- pkgs/applications/networking/wg-bond/default.nix | 2 +- pkgs/applications/office/espanso/default.nix | 2 +- pkgs/applications/radio/noaa-apt/default.nix | 2 +- pkgs/applications/science/machine-learning/finalfrontier/default.nix | 2 +- .../applications/science/machine-learning/finalfusion-utils/default.nix | 2 +- pkgs/applications/terminal-emulators/alacritty/default.nix | 2 +- pkgs/applications/version-management/git-and-tools/delta/default.nix | 2 +- .../version-management/git-and-tools/git-absorb/default.nix | 2 +- .../version-management/git-and-tools/git-codeowners/default.nix | 2 +- pkgs/applications/version-management/git-and-tools/git-dit/default.nix | 2 +- pkgs/applications/version-management/git-and-tools/git-gone/default.nix | 2 +- .../version-management/git-and-tools/git-ignore/default.nix | 2 +- .../version-management/git-and-tools/git-subset/default.nix | 2 +- pkgs/applications/version-management/git-and-tools/git-trim/default.nix | 2 +- .../version-management/git-and-tools/git-vanity-hash/default.nix | 2 +- .../version-management/git-and-tools/git-workspace/default.nix | 2 +- .../version-management/git-and-tools/rs-git-fsmonitor/default.nix | 2 +- pkgs/applications/version-management/git-backup/default.nix | 2 +- pkgs/applications/version-management/gitoxide/default.nix | 2 +- pkgs/applications/version-management/sit/default.nix | 2 +- pkgs/applications/video/alass/default.nix | 2 +- pkgs/applications/video/sub-batch/default.nix | 2 +- pkgs/applications/virtualization/cntr/default.nix | 2 +- pkgs/applications/virtualization/crosvm/default.nix | 2 +- pkgs/applications/virtualization/railcar/default.nix | 2 +- pkgs/applications/window-managers/i3/auto-layout.nix | 2 +- pkgs/applications/window-managers/i3/i3-ratiosplit.nix | 2 +- pkgs/applications/window-managers/i3/status-rust.nix | 2 +- pkgs/applications/window-managers/i3/wmfocus.nix | 2 +- pkgs/applications/window-managers/sway/wsr.nix | 2 +- pkgs/development/compilers/zz/default.nix | 2 +- pkgs/development/interpreters/wasmer/default.nix | 2 +- pkgs/development/interpreters/wasmtime/default.nix | 2 +- pkgs/development/misc/loc/default.nix | 2 +- pkgs/development/python-modules/johnnycanencrypt/default.nix | 2 -- pkgs/development/tools/analysis/bingrep/default.nix | 2 +- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 2 +- pkgs/development/tools/analysis/dotenv-linter/default.nix | 2 +- pkgs/development/tools/analysis/panopticon/default.nix | 2 +- pkgs/development/tools/analysis/svlint/default.nix | 2 +- pkgs/development/tools/async/default.nix | 2 +- pkgs/development/tools/build-managers/fac/default.nix | 2 +- pkgs/development/tools/cargo-flamegraph/default.nix | 2 +- pkgs/development/tools/cargo-web/default.nix | 2 +- pkgs/development/tools/chit/default.nix | 2 +- pkgs/development/tools/clog-cli/default.nix | 2 +- pkgs/development/tools/convco/default.nix | 2 +- pkgs/development/tools/diesel-cli/default.nix | 2 +- pkgs/development/tools/documentation/mdsh/default.nix | 2 +- pkgs/development/tools/dot-http/default.nix | 2 +- pkgs/development/tools/gir/default.nix | 2 +- pkgs/development/tools/git-series/default.nix | 2 +- pkgs/development/tools/kubie/default.nix | 2 +- pkgs/development/tools/misc/hydra-cli/default.nix | 2 +- pkgs/development/tools/misc/itm-tools/default.nix | 2 +- pkgs/development/tools/misc/mdctags/default.nix | 2 +- pkgs/development/tools/misc/ptags/default.nix | 2 +- pkgs/development/tools/misc/rtss/default.nix | 2 +- pkgs/development/tools/misc/sccache/default.nix | 2 +- pkgs/development/tools/misc/svls/default.nix | 2 +- pkgs/development/tools/misc/texlab/default.nix | 2 +- pkgs/development/tools/misc/tokei/default.nix | 2 +- pkgs/development/tools/misc/unused/default.nix | 2 +- pkgs/development/tools/misc/wishbone-tool/default.nix | 2 +- pkgs/development/tools/pactorio/default.nix | 2 +- pkgs/development/tools/parinfer-rust/default.nix | 2 +- pkgs/development/tools/parsing/tree-sitter/default.nix | 2 +- pkgs/development/tools/pax-rs/default.nix | 2 +- pkgs/development/tools/pqrs/default.nix | 2 +- pkgs/development/tools/py-spy/default.nix | 2 +- pkgs/development/tools/rebazel/default.nix | 2 +- pkgs/development/tools/rnix-lsp/default.nix | 2 +- pkgs/development/tools/rq/default.nix | 2 +- pkgs/development/tools/rust/bindgen/default.nix | 2 +- pkgs/development/tools/rust/cargo-asm/default.nix | 2 +- pkgs/development/tools/rust/cargo-binutils/default.nix | 2 +- pkgs/development/tools/rust/cargo-bloat/default.nix | 2 +- pkgs/development/tools/rust/cargo-c/default.nix | 2 +- pkgs/development/tools/rust/cargo-cache/default.nix | 2 +- pkgs/development/tools/rust/cargo-criterion/default.nix | 2 +- pkgs/development/tools/rust/cargo-cross/default.nix | 2 +- pkgs/development/tools/rust/cargo-embed/default.nix | 2 +- pkgs/development/tools/rust/cargo-expand/default.nix | 2 +- pkgs/development/tools/rust/cargo-feature/default.nix | 2 +- pkgs/development/tools/rust/cargo-flash/default.nix | 2 +- pkgs/development/tools/rust/cargo-fund/default.nix | 2 +- pkgs/development/tools/rust/cargo-fuzz/default.nix | 2 +- pkgs/development/tools/rust/cargo-geiger/default.nix | 2 +- pkgs/development/tools/rust/cargo-generate/default.nix | 2 +- pkgs/development/tools/rust/cargo-inspect/default.nix | 2 +- pkgs/development/tools/rust/cargo-insta/default.nix | 2 +- pkgs/development/tools/rust/cargo-play/default.nix | 2 +- pkgs/development/tools/rust/cargo-readme/default.nix | 2 +- pkgs/development/tools/rust/cargo-sweep/default.nix | 2 +- pkgs/development/tools/rust/cargo-sync-readme/default.nix | 2 +- pkgs/development/tools/rust/cargo-udeps/default.nix | 2 +- pkgs/development/tools/rust/cargo-valgrind/default.nix | 2 +- pkgs/development/tools/rust/cargo-whatfeatures/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/crate2nix/default.nix | 2 +- pkgs/development/tools/rust/probe-run/default.nix | 2 +- pkgs/development/tools/rust/racerd/default.nix | 2 +- pkgs/development/tools/so/default.nix | 2 +- pkgs/development/tools/the-way/default.nix | 2 +- pkgs/development/tools/trunk/default.nix | 2 +- pkgs/development/tools/wasm-bindgen-cli/default.nix | 2 +- pkgs/development/tools/wasm-pack/default.nix | 2 +- pkgs/games/eidolon/default.nix | 2 +- pkgs/games/freenukum/default.nix | 2 +- pkgs/games/ja2-stracciatella/default.nix | 2 +- pkgs/games/portmod/default.nix | 2 +- pkgs/games/system-syzygy/default.nix | 2 +- pkgs/misc/emulators/ruffle/default.nix | 2 +- pkgs/misc/uq/default.nix | 2 +- pkgs/misc/vim-plugins/overrides.nix | 2 +- pkgs/misc/vscode-extensions/vscode-lldb/default.nix | 2 +- pkgs/os-specific/linux/catfs/default.nix | 2 +- pkgs/os-specific/linux/dlm/default.nix | 2 +- pkgs/os-specific/linux/firmware/firmware-manager/default.nix | 2 +- pkgs/os-specific/linux/firmware/system76-firmware/default.nix | 2 +- pkgs/os-specific/linux/greetd/default.nix | 2 +- pkgs/os-specific/linux/swapview/default.nix | 2 +- pkgs/os-specific/linux/tuigreet/default.nix | 2 +- pkgs/os-specific/linux/wlgreet/default.nix | 2 +- pkgs/servers/dns/doh-proxy-rust/default.nix | 2 +- pkgs/servers/fishnet/default.nix | 2 +- pkgs/servers/martin/default.nix | 2 +- pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix | 2 +- pkgs/servers/microserver/default.nix | 2 +- pkgs/servers/monitoring/prometheus/unbound-exporter.nix | 2 +- pkgs/servers/nosql/influxdb2/default.nix | 2 +- pkgs/servers/routinator/default.nix | 2 +- pkgs/servers/search/meilisearch/default.nix | 2 +- pkgs/servers/sozu/default.nix | 2 +- pkgs/servers/tarssh/default.nix | 2 +- pkgs/servers/udpt/default.nix | 2 +- pkgs/servers/unpfs/default.nix | 2 +- pkgs/servers/webmetro/default.nix | 2 +- pkgs/shells/ion/default.nix | 2 +- pkgs/test/rust-sysroot/default.nix | 2 +- pkgs/tools/X11/xidlehook/default.nix | 2 +- pkgs/tools/admin/intecture/agent.nix | 2 +- pkgs/tools/admin/intecture/auth.nix | 2 +- pkgs/tools/admin/intecture/cli.nix | 2 +- pkgs/tools/admin/procs/default.nix | 2 +- pkgs/tools/backup/monolith/default.nix | 2 +- pkgs/tools/backup/rdedup/default.nix | 2 +- pkgs/tools/filesystems/sandboxfs/default.nix | 2 +- pkgs/tools/filesystems/supertag/default.nix | 2 +- pkgs/tools/graphics/gifski/default.nix | 2 +- pkgs/tools/graphics/oxipng/default.nix | 2 +- pkgs/tools/graphics/resvg/default.nix | 2 +- pkgs/tools/graphics/shotgun/default.nix | 2 +- pkgs/tools/graphics/svgbob/default.nix | 2 +- pkgs/tools/graphics/svgcleaner/default.nix | 2 +- pkgs/tools/graphics/viu/default.nix | 2 +- pkgs/tools/inputmethods/evscript/default.nix | 2 +- pkgs/tools/misc/as-tree/default.nix | 2 +- pkgs/tools/misc/asciinema-scenario/default.nix | 2 +- pkgs/tools/misc/bat/default.nix | 2 +- pkgs/tools/misc/blflash/default.nix | 2 +- pkgs/tools/misc/cicero-tui/default.nix | 2 +- pkgs/tools/misc/code-minimap/default.nix | 2 +- pkgs/tools/misc/czkawka/default.nix | 2 +- pkgs/tools/misc/dijo/default.nix | 2 +- pkgs/tools/misc/diskonaut/default.nix | 2 +- pkgs/tools/misc/diskus/default.nix | 2 +- pkgs/tools/misc/dust/default.nix | 2 +- pkgs/tools/misc/eva/default.nix | 2 +- pkgs/tools/misc/fd/default.nix | 2 +- pkgs/tools/misc/fend/default.nix | 2 +- pkgs/tools/misc/fontfor/default.nix | 2 +- pkgs/tools/misc/g933-utils/default.nix | 2 +- pkgs/tools/misc/grex/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/hyperfine/default.nix | 2 +- pkgs/tools/misc/i3nator/default.nix | 2 +- pkgs/tools/misc/intermodal/default.nix | 2 +- pkgs/tools/misc/journaldriver/default.nix | 2 +- pkgs/tools/misc/kak-lsp/default.nix | 2 +- pkgs/tools/misc/licensor/default.nix | 2 +- pkgs/tools/misc/loop/default.nix | 2 +- pkgs/tools/misc/lsd/default.nix | 2 +- pkgs/tools/misc/mcfly/default.nix | 2 +- pkgs/tools/misc/onefetch/default.nix | 2 +- pkgs/tools/misc/page/default.nix | 2 +- pkgs/tools/misc/pazi/default.nix | 2 +- pkgs/tools/misc/peep/default.nix | 2 +- pkgs/tools/misc/powerline-rs/default.nix | 2 +- pkgs/tools/misc/psw/default.nix | 2 +- pkgs/tools/misc/rargs/default.nix | 2 +- pkgs/tools/misc/shadowenv/default.nix | 2 +- pkgs/tools/misc/shell-hist/default.nix | 2 +- pkgs/tools/misc/silicon/default.nix | 2 +- pkgs/tools/misc/skim/default.nix | 2 +- pkgs/tools/misc/tab-rs/default.nix | 2 +- pkgs/tools/misc/tagref/default.nix | 2 +- pkgs/tools/misc/tealdeer/default.nix | 2 +- pkgs/tools/misc/tensorman/default.nix | 2 +- pkgs/tools/misc/termplay/default.nix | 2 +- pkgs/tools/misc/topgrade/default.nix | 2 +- pkgs/tools/misc/tydra/default.nix | 2 +- pkgs/tools/misc/uwuify/default.nix | 2 +- pkgs/tools/misc/vivid/default.nix | 2 +- pkgs/tools/misc/void/default.nix | 2 +- pkgs/tools/misc/wagyu/default.nix | 2 +- pkgs/tools/misc/xprite-editor/default.nix | 2 +- pkgs/tools/misc/xxv/default.nix | 2 +- pkgs/tools/networking/bandwhich/default.nix | 2 +- pkgs/tools/networking/boringtun/default.nix | 2 +- pkgs/tools/networking/bukubrow/default.nix | 2 +- pkgs/tools/networking/dogdns/default.nix | 2 +- pkgs/tools/networking/drill/default.nix | 2 +- pkgs/tools/networking/findomain/default.nix | 2 +- pkgs/tools/networking/gnirehtet/default.nix | 2 +- pkgs/tools/networking/gping/default.nix | 2 +- pkgs/tools/networking/httplz/default.nix | 2 +- pkgs/tools/networking/mozwire/default.nix | 2 +- pkgs/tools/networking/rshijack/default.nix | 2 +- pkgs/tools/networking/sniffglue/default.nix | 2 +- pkgs/tools/networking/tdns-cli/default.nix | 2 +- pkgs/tools/networking/tox-node/default.nix | 2 +- pkgs/tools/networking/tunnelto/default.nix | 2 +- pkgs/tools/networking/xh/default.nix | 2 +- pkgs/tools/nix/cached-nix-shell/default.nix | 2 +- pkgs/tools/nix/nix-query-tree-viewer/default.nix | 2 +- pkgs/tools/nix/nixdoc/default.nix | 2 +- pkgs/tools/nix/nixpkgs-fmt/default.nix | 2 +- pkgs/tools/nix/rnix-hashes/default.nix | 2 +- pkgs/tools/package-management/cargo-about/default.nix | 2 +- pkgs/tools/package-management/cargo-deps/default.nix | 2 +- pkgs/tools/package-management/cargo-edit/default.nix | 2 +- pkgs/tools/package-management/cargo-graph/default.nix | 2 +- pkgs/tools/package-management/cargo-kcov/default.nix | 2 +- pkgs/tools/package-management/cargo-license/default.nix | 2 +- pkgs/tools/package-management/cargo-release/default.nix | 2 +- pkgs/tools/package-management/cargo-update/default.nix | 2 +- pkgs/tools/package-management/emplace/default.nix | 2 +- pkgs/tools/package-management/nix-doc/default.nix | 2 +- pkgs/tools/package-management/nix-index/default.nix | 2 +- pkgs/tools/package-management/nix-simple-deploy/default.nix | 2 +- pkgs/tools/package-management/nix-template/default.nix | 2 +- pkgs/tools/security/b3sum/default.nix | 2 +- pkgs/tools/security/bitwarden_rs/default.nix | 2 +- pkgs/tools/security/fido2luks/default.nix | 2 +- pkgs/tools/security/genpass/default.nix | 2 +- pkgs/tools/security/jwt-cli/default.nix | 2 +- pkgs/tools/security/ripasso/cursive.nix | 2 +- pkgs/tools/security/rustscan/default.nix | 2 +- pkgs/tools/security/sequoia/default.nix | 2 +- pkgs/tools/security/sn0int/default.nix | 2 +- pkgs/tools/system/bottom/default.nix | 2 +- pkgs/tools/system/kmon/default.nix | 2 +- pkgs/tools/system/mq-cli/default.nix | 2 +- pkgs/tools/system/tre-command/default.nix | 2 +- pkgs/tools/system/zenith/default.nix | 2 +- pkgs/tools/text/angle-grinder/default.nix | 2 +- pkgs/tools/text/chars/default.nix | 2 +- pkgs/tools/text/choose/default.nix | 2 +- pkgs/tools/text/coloursum/default.nix | 2 +- pkgs/tools/text/diffr/default.nix | 2 +- pkgs/tools/text/each/default.nix | 2 +- pkgs/tools/text/fst/default.nix | 2 +- pkgs/tools/text/mdbook/default.nix | 2 +- pkgs/tools/text/mdcat/default.nix | 2 +- pkgs/tools/text/ripgrep-all/default.nix | 2 +- pkgs/tools/text/ripgrep/default.nix | 2 +- pkgs/tools/text/ruplacer/default.nix | 2 +- pkgs/tools/text/sd/default.nix | 2 +- pkgs/tools/text/uwc/default.nix | 2 +- pkgs/tools/text/xsv/default.nix | 2 +- pkgs/tools/typesetting/tectonic/default.nix | 2 +- pkgs/tools/typesetting/tex/tex-match/default.nix | 2 +- pkgs/tools/video/rav1e/default.nix | 2 +- 322 files changed, 321 insertions(+), 323 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index 4bd922c8fb6..fc5a2e9b035 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz"; }; - cargoSha256 = "06xqh0mqbik00qyg8mn1ddbn15v3pdwvh1agghg22xgx53kmnxb3"; + cargoSha256 = "0lkx0zj9xc0rlrq91l4wydzp430hxlrqyq7ii8wq2fcan8ln22lv"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 436afac7df2..acc10e077eb 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cp share/* $out/share/muso/ ''; - cargoSha256 = "06jgk54r3f8gq6iylv5rgsawss3hc5kmvk02y4gl8iwfnw4xrvmg"; + cargoSha256 = "1hgdzyz005244f2mh97js9ga0a6s2hcd6iydz07f1hmhsh1j2bwy"; meta = with lib; { description = "An automatic music sorter (based on ID3 tags)"; diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index a8f90ef34ef..61353f45fec 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib openssl ]; - cargoSha256 = "0f06wc7h2zjipifvxsskxvihjf6mykrjrm7yk0zf98ra079bc9g9"; + cargoSha256 = "1pca0sz4rz8qls6k2vhf70ixhnvgk81c4hbx81q3pv106g5k205f"; meta = with lib; { homepage = "https://github.com/betta-cyber/netease-music-tui"; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 78972effc4d..86873802bfa 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "082y5m2vglzx9kdc2088zynz0njcnljnb0y170igmlsxq9wkrgg2"; }; - cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f"; + cargoSha256 = "1khn6fx13qlfpqwnw7ysgan5h4nrg2qnzn2p74vn7jic3mqc3sax"; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 3c4370d1614..8a077918d4f 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -18,7 +18,7 @@ rustPackages.rustPlatform.buildRustPackage rec { sha256 = "1a578h13iv8gqmskzlncfr42jlg5gp0zfcizv4wbd48y9hl8fh2l"; }; - cargoSha256 = "1sm5yfgjx5xfnqqh1v8ycwzxw4kl6dq5gcvsdnc4h1cj3pdhbpcc"; + cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z"; cargoBuildFlags = [ "--no-default-features" diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index 8cf3295ccab..c2a66bc9780 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4"; }; - cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm"; + cargoSha256 = "0ad0kab3v50ic98dxfxmaai8z7kiah39w9b29q4d38q23zd8kz7k"; meta = with lib; { description = "Ethereum function call encoding (ABI) utility"; diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 5f8c56592f6..7f4081a399e 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0l1vpcfq6jrq2dkrmsa4ghwdpp7c54f46gz3n7nk0i41b12hnigw"; }; - cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; + cargoSha256 = "19r3xvysragmf02zk2l5s2hjg92gxdygsh52y7za81x443lvjyvq"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index f92a4557ac7..82119ae91d1 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "11mz07735gxqfamjcjjmxya6swlvr1p77sgd377zjcmd6z54gwyf"; }; - cargoSha256 = "06ghcd4j751mdkzwb88nqwk8la4zdb137y0iqrkpykkfx0as43x3"; + cargoSha256 = "1hpndmpk1zlfvb4r95m13yvnsbjkwgw4pb9ala2d5yzfp38225nm"; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix index 337a46c0ec6..2020729d81c 100644 --- a/pkgs/applications/editors/kibi/default.nix +++ b/pkgs/applications/editors/kibi/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; version = "0.2.2"; - cargoSha256 = "sha256-8iEUOLFwHBLS0HQL/oLnv6lcV3V9Hm4jMqXkqPvIF9E="; + cargoSha256 = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw="; src = fetchFromGitHub { owner = "ilai-deutel"; diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index 8e86683f9bf..c82829bc109 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1cc3yk04v9icdjr5cn58mqc3ba1wqmlzhf9ly7biy9m8yk30w9y0"; }; - cargoSha256 = "1fyn8nsabzrfl9ykf2gk2p8if0yjp6k0ybrmp0pw67pbwaxpb9ym"; + cargoSha256 = "0z6hhahxdc6d7nzqvc8jlxn1frsc39va8z5pmwfmmq5z61ahk90z"; buildInputs = [ gtk webkitgtk ]; diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix index aa3f22a2626..0888bc7cea3 100644 --- a/pkgs/applications/editors/ox/default.nix +++ b/pkgs/applications/editors/ox/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0"; }; - cargoSha256 = "0v0a1dl9rq5qyy9xwnb59w62qr9db3y3zlmnp60wafvj70zi9zxs"; + cargoSha256 = "0m5vglm58myf50vbb7m6gd3srk3n93afg70lz63i2kciqkkwsnjl"; meta = with lib; { description = "An independent Rust text editor that runs in your terminal"; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 1e7390f8c83..fdfbcdbfccf 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk"; + cargoSha256 = "0rdg9k44si37iyqlcl1rw7ilajcvqy93gbfpd7n4cr1hg9ypm0m3"; meta = with lib; { description = "An advanced geospatial data analysis platform"; diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 465e78e434c..c09a1c31c61 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xv3q59HobunrFyc+CPLztpsQd20Eu4+JI+iYhlGI0bc="; }; - cargoSha256 = "sha256-37xtdFbtbfGUqaSpzlxDQfe1+0ESHz/rgO1iTPBEBLc="; + cargoSha256 = "sha256-+jJMi3uBpvKYegURFyAV3TfP8eX4xRxgL4WGew7WMws="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 78cc664accc..55349e8a08d 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1pln65pqy39ijrld11d06klwzfhhzmrgdaxijpx9q7w9z66zmqb8"; }; - cargoSha256 = "143a5x61s7ywk0ljqd10jkfvs6lrhlibkm2a9lw41wq13mgzb78j"; + cargoSha256 = "1mb9wx5h729pc9y1b0d0yiapyk0mlbvdmvwq993fcpkziwjvnl44"; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index 3458ac3f250..8d9a872a102 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { sha256 = "18p9gfp0inbnjsc7af38fghyklr7qnl2kkr25isfy9d5m8cpxqc6"; }; - cargoSha256 = "0brmgrxhspcpcarm4lvnl95dw2n96r20w736giv18xcg7d5jmgca"; + cargoSha256 = "01y1p40vz30h2jkh37zipqvmfybgpq6wdcdglkab85jivmd1lslx"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index 95f50998f3f..b28b33d56c9 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rxl3ksjinw07q3p2vjqg80k3c6wx2q7pzpf2344zyfb4gkqzx1c"; }; - cargoSha256 = "1ffgvhkdj8wkhlgi0cj0njdm9ycxq2qda4b5qn8bmaygzr2zkwpd"; + cargoSha256 = "1n4il3l59m2a6ca54vfaivzg25abf8s4w5kpd5q51p13624iz0kb"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index b80ec80746f..a01d55ae20e 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { # workaround for missing Cargo.lock file https://github.com/sanpii/effitask/issues/48 cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0dvmp23kny6rlv6c0mfyy3cmz1bi5wcm1mxps4z67lym5kxfd362"; + cargoSha256 = "1a80kf95kr94l6jzxdj4i09x1342x358fqjy6119qjg3q3bj0y3p"; buildInputs = [ openssl gtk3 ]; diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix index 690b88d8417..91598db76d0 100644 --- a/pkgs/applications/misc/elfx86exts/default.nix +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1j9ca2lyxjsrf0rsfv83xi53vj6jz5nb76xibh367brcsc26mvd6"; }; - cargoSha256 = "1dfhx40jr5llqa554wifd920mqdbm8s5fns98m6vcqdjxzan4nr2"; + cargoSha256 = "0n3b9vdk5n32jmd7ks50d55z4dfahjincd2s1d8m9z17ip2qw2c4"; meta = with lib; { description = "Decode x86 binaries and print out which instruction set extensions they use."; diff --git a/pkgs/applications/misc/fitnesstrax/default.nix b/pkgs/applications/misc/fitnesstrax/default.nix index e90e364aaee..ea1dd18d18c 100644 --- a/pkgs/applications/misc/fitnesstrax/default.nix +++ b/pkgs/applications/misc/fitnesstrax/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { gtk3 ]; - cargoSha256 = "1xgyyxd2kz21xan0pk7rbxiym90s7m2qrzg2ddilcszva60bxdd9"; + cargoSha256 = "0dlnlb3hqyh98y916wvdb4rd20az73brs8hqna2lgr7kv1pd77j7"; postInstall = '' mkdir -p $out/share/glib-2.0/schemas diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index b116fbbbd7c..28fe1303f49 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rDy859jg+F8XC4sJogIgdn1FoT8cf7S+KORt+7kboAc="; }; - cargoSha256 = "sha256-cAXiAPhHdxdd8pFQ0Gq7eHO2p/Dam53gDbE583UYY/k="; + cargoSha256 = "sha256-I8ZH35L2CVLy6ypmdOPd8VEG/sQeGaHyT1HWNdwyZVo="; meta = with lib; { description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index 5c1e87612e1..b637cd077d7 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x"; + cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; checkPhase = '' export HOME=$TMPDIR diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index dcbeb408759..64cae5b64e5 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0kl2zn6ir3w75ny25ksgxl93vlyb13gzx2795zyimqqnsrdpbbrf"; }; - cargoSha256 = "1ax81a2828z3yla1psg5xi8ild65m6zcsvx48ncz902mpzqlj92b"; + cargoSha256 = "0sddsm0jys1bsj2bsr39lcyx8k2hzw17nlsv6aql0v82x8qbsiv4"; meta = with lib; { description = "Save disk space by cleaning unneeded files from software projects"; diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 76e4792ab1c..85ed493da5a 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { ./cargo.lock.patch ]; - cargoSha256 = "02k23idwy0sb4lnjrwnyah3qp22zj161ilbc13p75k0hdijfaxl5"; + cargoSha256 = "0kfm1pq22dhiw138bf7jvf7amlkal90n1hc9fq44wr4chr9b2fmx"; meta = with lib; { description = "Rust library and tool to colorize paths using LS_COLORS"; diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 39a4c6a6a03..e842046dd0b 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "00xxrssa3gbr5w2jsqlf632jlzc0lc2rpybnbv618ndy5lxidnw0"; }; - cargoSha256 = "1ji64h0f8f2sq12cx33kymypzar9swhaj903gclf3jdwgna77326"; + cargoSha256 = "0kkhj58q1lgsyj7hpy3sxg1jva9q51m0i7j60zfzhnjnirwcd0h8"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index 6ca315b1092..96627f5cccb 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1pbj198nqi27kavz9bm31a3h7h70by6l00046x09yf9n8qjpp01w"; }; - cargoSha256 = "1dcrafpf252dpjvimaibb93082nymb26wwbvr34zd6j7z285vach"; + cargoSha256 = "05ryaxi479fxzdcl51r1xlqbiasfzxcxgvl4wnxync8qi8q2yqk0"; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index cc1ae14350e..8cf8d8286ae 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wcOF34GzlB6YKISkjDgYgsaN1NmWBMIntfT23A6byx8="; }; - cargoSha256 = "sha256-7SJjtHNSabE/VqdiSwKZ/yNzk6GSMNsQLaSx/MjN5NA="; + cargoSha256 = "sha256-aW1VliL7QQm9gMeM6N+SroHlgqI3F7MX0EzcuEzcJnQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 279d3e4b15d..47412c78f4e 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0ffci3as50f55n1v36hji4n0b3lkch5ylc75awjz65jz2gd2y2j4"; }; - cargoSha256 = "1cx3sqr7zb1vlfdvbcxp0yva9xh654qczpy8s09c8cviy8hac5sr"; + cargoSha256 = "1xf26ldgfinzpakcp65w52fdl3arsm053vfnq7gk2fwnq55cjwl0"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index bc36b2f379e..97a5445638e 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; + cargoSha256 = "1vgizkdzi9mnan4rcswyv450y6a4b9l74d0siv1ix0nnlznnqyg1"; meta = with lib; { description = "A simple terminal clock written in Rust"; diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index 7904af3e7e1..d78904f5988 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SLJ4mwBafLGL5pneMTHLc4S4Tgds2xLqByWFH95TK1k="; }; - cargoSha256 = "sha256-a+4oOkO90TObfYnq9NZsWy5RmYFYN1BKvUKxpvjiJc8="; + cargoSha256 = "sha256-NH33AMuwf4bOF9zZJlONVMYgrrYSBq5VQClYW/rbzsM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index c480c7a8e2f..7974622be7d 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; + cargoSha256 = "1yqy5v02a4qshgb7k8rnn408k3n6qx3jc8zziwvv7im61n9sjynf"; meta = with lib; { homepage = "https://crates.io/crates/taizen"; diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 9c1e778bdf3..5c32d8622e3 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "0xblxsp7jgqbb3kr5k7yy6ziz18a8wlkrhls0vz9ak2n0ngddg3r"; + cargoSha256 = "1c9vw1n6h7irwim1zf3mr0g520jnlvfqdy7y9v9g9xpkvbjr7ich"; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 7a19b2923da..48ae142c1ae 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "RjGHY6KN6thxbg9W5FRwaAmUeD+5/WCeMCvzFHqZ+J4="; }; - cargoSha256 = "VSwku0rtQECirCHx2CXe72gCA+p3DdPC4YYwEYu8WfM="; + cargoSha256 = "sha256-A7O/e8PAcW36i8pT71SkWoWDIiMuEhSS9SmASNzNCjk="; buildInputs = [ openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 8866e2a07c2..e6476cb4221 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OOsBo+NCfn++2XyfQVoeEPcbSv645Ng7g9s4W7X2xg4="; }; - cargoSha256 = "sha256-PW8f4PZGctHd8YBBRvmueR8UgtyDQZpqf2lTU1t68iM="; + cargoSha256 = "sha256-HAkJKqoz4vrY4mGFSz6sylV6DdrjWvPfwb4BiLWEyKY="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 069a63fb66b..752ab35461e 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; - cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2"; + cargoSha256 = "0vrn1vc3rwabv6l2r1qb7mkcxbp75q79bfl3rxhyi51ra3ij507r"; checkPhase = "cargo test --features=integration_tests"; diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/applications/misc/zktree/default.nix index fe7b42dcc94..86e12712340 100644 --- a/pkgs/applications/misc/zktree/default.nix +++ b/pkgs/applications/misc/zktree/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9"; }; - cargoSha256 = "1d35jrxvhf7m04s1kh0yrfhy9j9i6qzwbw2mwapgsrcsr5vhxasn"; + cargoSha256 = "18v7agm39acnblc703278cn8py5971hm8p5kxmznpw119fjp36s5"; meta = with lib; { description = "A small tool to display Znodes in Zookeeper in tree structure."; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 6702fdaf7a9..b0ef9d890d5 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k"; }; - cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw"; + cargoSha256 = "0b8wf12bjsy334g04sv3knw8f177xsmh7lrkyvx9gnn0fax0lmnr"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 259a8780901..ae8b7c723ec 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rwg1w7srjwa23mkypl8zk6674nhph4xsc6nc01f6g5k959szylr"; }; - cargoSha256 = "0yn2kfiaz6d8wc8rdqli2pwffp5vb1v3zi7520ysrd5b6fc2csf2"; + cargoSha256 = "0dm3walwi3vzpk69l7nz6yl6w49676x8pjnigpn67q4bn7lpaqb1"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index 1b76406f334..2d76e0a26cb 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3"; }; - cargoSha256 = "1f9yn4pvp58laylngdrfdkwygisnzkhkm7pndf6l33k3aqxhz5mm"; + cargoSha256 = "16r5rwdbqyb5xrjc55i30xb20crpyjc75zn10xxjkicmvrpwydp6"; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index d9827039500..88123e212a7 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rwi0lkmhlq4i8fba3s9nd9ajhz2dqxzkgfp5i8y0rvbfmhmfd6b"; }; - cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy"; + cargoSha256 = "1c058sjgd79ps8ahvxp25qyc3a6b2csb41vamrphv9ygai60mng6"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium libarchive openssl zeromq ]; diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/applications/networking/cluster/kubernix/default.nix index 88cacfea4f1..8dcfbfc36b5 100644 --- a/pkgs/applications/networking/cluster/kubernix/default.nix +++ b/pkgs/applications/networking/cluster/kubernix/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp"; }; - cargoSha256 = "17agwqx7nhzi124yq1s6zpqb227drrhp9c11r3jbicc08dz88bwg"; + cargoSha256 = "133h6mkz9aylhligy16pfjzsl94xxj0rk2zjm08dhg0inj84z3yv"; doCheck = false; meta = with lib; { diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index 51f62529e9c..afddb6be875 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -12,7 +12,7 @@ buildRustPackage rec { sha256 = "1fba0w2979dmc2wyggqx4fj52rrl1s2vpjk6mkj1811a848l1hdi"; }; - cargoSha256 = "04ryin24z3pfxjxy4smngy66xs7k85g6gdzsl77cij8ifb29im99"; + cargoSha256 = "06qbagq4gvm5vk846lxskli02z9lqxsvis6ndq29bj0b9yyvdkay"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 38bc05b1f86..22fadca3cb3 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144"; }; - cargoSha256 = "11dn1ixc7i29cv8kpqfkmikdqzr2v79vlyfxcvjwhgd0r34w4xhn"; + cargoSha256 = "03g14npkisz159gibhfxj7l36vzm7cvg355hndzpxzvhf5r5yjqg"; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 676309a2bae..08e8d6a00bc 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { sha256 = "07a50shv6k4fwl2gmv4j0maxaqqkjpwwmqkxkqs0gvx38lc5f7m7"; }; - cargoSha256 = "009jqizj4qg1bqslna35myxcark40hwlqsz58fbps9nsgp1i0hq2"; + cargoSha256 = "0npkcprcqy2pn7k64jzwg41vk9id6yzw211xw203h80cc5444igr"; cargoPatches = [ # Fix Cargo.lock version. Remove with the next release. diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix index 69f214cc571..d96caf372ef 100644 --- a/pkgs/applications/networking/ncgopher/default.nix +++ b/pkgs/applications/networking/ncgopher/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Yny5zZe5x7/pWda839HcFkHFuL/jl1Q7ykTZzKy871I="; }; - cargoSha256 = "sha256-IsRaDhnRamMSbtXG1r1j0jZYjFiSjRdwOaUVyqy4ZJw="; + cargoSha256 = "sha256-C4V1WsAUFtr+N64zyBk1V0E8gTM/U54q03J6Nj8ReLk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 761d18e5fe3..c7104d9011d 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a"; }; - cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz"; + cargoSha256 = "0sy0vlpkj967g9lyyh7ska8cpw5xh0g04kj071a32idrqc3dcjb1"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/applications/networking/wg-bond/default.nix index bef44d42862..0c8c629208a 100644 --- a/pkgs/applications/networking/wg-bond/default.nix +++ b/pkgs/applications/networking/wg-bond/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y"; }; - cargoSha256 = "1v2az0v6l8mqryvq3898hm7bpvqdd2c4kpv6ck7932jfjyna512k"; + cargoSha256 = "1nlzhkhk1y0jhj6n3wn4dm783ldsxn7dk0d2xjx6ylczf9z3gp12"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index d20e19c6859..5cbfa5b1b2a 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1q47r43midkq9574gl8gdv3ylvrnbhdc39rrw4y4yk6jbdf5wwkm"; }; - cargoSha256 = "0mxksifjagx25qkyg6ym0zlhal8014j8iim54cd44ndbkkiqlyxc"; + cargoSha256 = "0ba5skn5s6qh0blf6bvivzvqc2l8v488l9n3x98pmf6nygrikfdb"; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix index 01dc7b5c30d..390bd128ef7 100644 --- a/pkgs/applications/radio/noaa-apt/default.nix +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { pango ]; - cargoSha256 = "0w4rbbz8lsh31xkgibzndiic47690nfcjrn1411dskf7ali6djy8"; + cargoSha256 = "167q9w45lh05l27cdssg8sfz3qfskfaxayzjy6q1cj50jrn0gq13"; preBuild = '' # Used by macro pointing to resource location at compile time. diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index f2468572101..0dd9a19c95c 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1lvwv238p8hrl4sc5pmnvaargl2dd25p44gxl3kibq5ng03afd0n"; }; - cargoSha256 = "1ibn22v24brdlrar6j7fryiwimbbw7byak265hrw7a5agf1799x0"; + cargoSha256 = "0lhcazcih48gc23q484h344bzz7p3lh189ljhswdyph2i11caarp"; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index d976431e554..6655b415d2a 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0gxcjrhfa86kz5qmdf5h278ydc3nc0nfj61brnykb723mg45jj41"; }; - cargoSha256 = "03p786hh54zql61vhmsqcdgvz23v2rm12cgwf7clfmk6a6yj6ibx"; + cargoSha256 = "0dj3xpinzzdfgy06wkp336sp1nyqk7nnvd3hwhyysripmz9apdgg"; # Enables build against a generic BLAS. cargoBuildFlags = [ diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 20d24a904e7..77d18a006b7 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VXV6w4OnhJBmvMKl7CynbhI9LclTKaSr+5DhHXMwSsc="; }; - cargoSha256 = "sha256-PWnNTMNZKxsfS1OAXe4G3zjfg5gK1SMTc0JJrW90iSM="; + cargoSha256 = "sha256-AYpT6ij0mtRxs4llywDNfZEqxYG6o2yFE9bmhH7fB8s="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 20c7f41bc54..c6a92413949 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02gm3fxqq91gn1hffy9kc6dkc0y7p09sl6f8njfpsaficij4bs7a"; }; - cargoSha256 = "1crz7410xfixx2vb1c060fnygwkkp2k2lgh7y1mjjxjzhpybniw5"; + cargoSha256 = "1w1w98vhjd561mkiwv89zb8k0nf1p5fc67jb5dddwg9nj6mqjrhp"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 2d6d7401e28..5115f37891a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9"; + cargoSha256 = "0dax6wkbyk5p8p0mm406vfgmqfmfxzyzqps6yk8fachi61x12ja6"; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index 2517e20ce9d..862461827eb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq"; }; - cargoSha256 = "0r0hyp15knbbs4l9rcn395pzrx2vbibmwvs4pmga363irmi8mcy5"; + cargoSha256 = "00wi64v2zn8rp8fjwbdwyvl3pva5sn9xclaawp2m222dqnlszb2d"; meta = with lib; { homepage = "https://github.com/softprops/git-codeowners"; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index fb3f555cb13..f1aeda1a5c7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -26,7 +26,7 @@ buildRustPackage rec { sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; - cargoSha256 = "1wjbwd3scx71l2fpxgvgwaw05lkpw13rm6d2i1x5crhs7py96ky6"; + cargoSha256 = "1vbcwl4aii0x4l8w9jhm70vi4s95jr138ly65jpkkv26rl6zjiph"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index c7453aff85b..47d6cc023b8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8"; }; - cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9"; + cargoSha256 = "0mbc1742szpxnqqah6q0yhkn4fyyxqzg830bd1vzr07v273wr06r"; nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index b01976f7632..5ff6d6b1f84 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "sha256-bKIBPqGKiS3ey8vH2F4EoleV1H2PTOp+71d/YW3jkT0="; }; - cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU="; + cargoSha256 = "sha256-7jPNVBf5DYtE8nsh7LIywMCjU7ODZ3qFsmBie2mZ3h8="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix index 204ded65fd3..53db1c01eef 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02z2r0kcd0nnn1zjslp6xxam5ddbhrmzn67qzxhlamsw0p9vvkbb"; }; - cargoSha256 = "1ydrrq35h1h5s59mx8kwwf3bp7lsmla3jl53ccdlsq29x0rj2jhs"; + cargoSha256 = "0lc9m9prmhr4ipjh95cfczvlmpp9scryksvqd49h4acyr904n7ry"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index d470b63a0b7..a20c750ade1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1rb9dhj7b7mjrhsvm9vw5gzjfxj10idnzv488jkfdz7sfhd3fcvz"; }; - cargoSha256 = "1q62gqqhf78ljcvzp7yrnr0vk65rif2f7axzjq0b87prbcsr7ij4"; + cargoSha256 = "1gy77c1cnm2qpgf0fr03alvxi3936x36c032865a6ch8bzns7k5v"; nativeBuildInputs = [ pkg-config ]; 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 85a84103118..a77bdd49330 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 @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1wf342zawbphlzvji0yba0qg4f6v67h81nhxqcsir132jv397ma7"; }; - cargoSha256 = "0mbdis1kxmgj3wlgznr9bqf5yv0jwlj2f63gr5c99ja0ijccp99h"; + cargoSha256 = "1frdw9bs7y6ch5rrbsgvhrs0wxw4hbwm2n3crslp12w55m7k39fc"; postInstall = '' mkdir -p $out/share/doc/git-vanity-hash diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 9b2853551c2..b41eb591c8f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA="; }; - cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; + cargoSha256 = "sha256-X0jRwDUVzS1s2tG6N2RDaFqwUUAT+mPMEft11VkJy5A="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix b/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix index 6968508f8c9..e885b7c0607 100644 --- a/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc"; }; - cargoSha256 = "0kfj09xq1g866507k3gcbm30pyi1xzfr7gca6dab7sjlvf83h9xs"; + cargoSha256 = "0hx5nhxci6p0gjjn1f3vpfykq0f7hdvhlv8898vrv0lh5r9hybsn"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index d73e77d6d94..8c45fdef3f7 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj"; }; - cargoSha256 = "09nfvzvgpdl5glzjays4lm50iwvjzbz364y6agya1a94qqwkaj7f"; + cargoSha256 = "0lb53sk7rikmj365gvcvn1hq70d6dmhp0aj2dyipb2qasypqz5l3"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 51fc538261d..2692b549724 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "qt1IN/5+yw5lrQ00YsvXUcUXCxd97EtNf5JvxJVa7uc="; }; - cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; + cargoSha256 = "sha256-LH8IkleBG9sdaYBAFZt2fgeDf0s24Uv57gbGyM6OEMo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 83370f5c6f0..edb2825d49c 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; - cargoSha256 = "092yfpr2svp1qy7xis1q0sdkbsjmmswmdwb0rklrc0yhydcsghp9"; + cargoSha256 = "1ghr01jcq12ddna5qadvjy6zbgqgma5nf0qv06ayxnra37d2l92l"; meta = with lib; { description = "Serverless Information Tracker"; diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/applications/video/alass/default.nix index c57a224ee0a..73b017ffeff 100644 --- a/pkgs/applications/video/alass/default.nix +++ b/pkgs/applications/video/alass/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU="; }; - cargoSha256 = "sha256-6CVa/ypz37bm/3R0Gi65ovu4SIwWcgVde3Z2W1R16mk="; + cargoSha256 = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 9cda6eb0a2b..37daa870c6e 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-5fDnSmnnVB1RGrNrnmp40OGFF+OAhppnhOjVgnYxXr0="; }; - cargoSha256 = "sha256-cj1htJcUPCeYbP0t15UcMv4WQAG7tUROb97v4rUeMvU="; + cargoSha256 = "sha256-+ufa4Cgue8o9CTB3JDcQ38SlUq8PcRDyj+qNSAFpTas="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 9b57be87e44..fa81913d72f 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA="; }; - cargoSha256 = "sha256-o8o/ixjYdnezQZEp78brjmR2lvQbiwCJr4Y97tHiYbk="; + cargoSha256 = "sha256-3e5wDne6Idu+kDinHPcAKHfH/d4DrGg90GkiMbyF280="; meta = with lib; { description = "A container debugging tool based on FUSE"; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 848b93a5381..697741e21f1 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -53,7 +53,7 @@ in ./default-seccomp-policy-dir.diff ]; - cargoSha256 = "0lhivwvdihslwp81i3sa5q88p5hr83bzkvklrcgf6x73arwk8kdz"; + cargoSha256 = "0aax0slg59afbyn3ygswwap2anv11k6sr9hfpysb4f8rvymvx7hd"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 1a238bb475d..3c7dc0a7d24 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { # Submitted upstream https://github.com/oracle/railcar/pull/44 cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "10qxkxpdprl2rcgy52s3q5gyg3i75qmx68rpl7cx1bgjzppfn9c3"; + cargoSha256 = "1zsch6gpbw96j5wa68ksbk4x6nbsl7dbvdhdprljpcyrwwkhz47x"; buildInputs = [ libseccomp ]; diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix index d24715aa980..754163547e7 100644 --- a/pkgs/applications/window-managers/i3/auto-layout.nix +++ b/pkgs/applications/window-managers/i3/auto-layout.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0ps08lga6qkgc8cgf5cx2lgwlqcnd2yazphh9xd2fznnzrllfxxz"; }; - cargoSha256 = "1ch5mh515rlqmr65x96xcvrx6iaigqgjxc7sbwbznzkc5kmvwhc0"; + cargoSha256 = "1i01kqvsykanzs7pi94gab9k2dqg1ki40mmjrwa22n0ypkbnvsmx"; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix index 35751da8172..fbd584f2baa 100644 --- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix +++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3"; }; - cargoSha256 = "0d5qd1wid5l1pl3ckrlfgdb980myi5gxcir39caywb9pkbnfndz6"; + cargoSha256 = "134sgc9d0j57swknl9sgil6212rws2hhp92s3cg1yzz5ygx21c76"; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 88d035bce66..b04d427aeed 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c"; }; - cargoSha256 = "098dzwqwbhcyswm73m880z0w03i7xrq56x79vfyvacw4k27q2zm9"; + cargoSha256 = "1kwd76i4lbpxdvan5nzl7dhslh45cipnsdgvssdqd9k34hap05p5"; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 9169cfc3817..7033e573049 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "09xffklpz62h6yiksxdlv3a9s1z0wr3ax9syl399avwdmq3c0y49"; }; - cargoSha256 = "0rczas6sgcppacz48xx7sarkvc4s2sgcdz6c661d7vcry1y46xms"; + cargoSha256 = "0fmz3q3yadymbqnkdhjd2z2g4zgf3z81ccixwywndd9zb7p47zdr"; nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; diff --git a/pkgs/applications/window-managers/sway/wsr.nix b/pkgs/applications/window-managers/sway/wsr.nix index 15bf977f8fd..64d9fd7d7db 100644 --- a/pkgs/applications/window-managers/sway/wsr.nix +++ b/pkgs/applications/window-managers/sway/wsr.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0bmpbhyvgnbi5baj6v0wdxpdh9cnlzvcc44vh3vihmzsp6i5q05a"; }; - cargoSha256 = "15wa03279lflr16a6kw7zcn3nvalnjydk9g6nj7xqxmc7zkpf0rm"; + cargoSha256 = "1pmkyw60ggn5filb47nyf97g1arrw7nfa4yjndnx35zw12mkj61d"; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index 81c6e546e95..a0bf9a9ad8f 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "0i3c459d4699z4dwvdw1495krdv3c2qpygrsw0cz3j0zd2n5gqj6"; + cargoSha256 = "03xdmm4993hqdb3cihjjv4n4mdk8lnlccva08fh6m1d56p807rni"; postPatch = '' # remove search path entry which would reference /build diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index eb17fda0830..d19600f39b8 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "08r2b4s005w8r207jwq2fd43y3prgd8pg1m72aww1r7yrbxdr0v2"; + cargoSha256 = "140bzxhsyfif99x5a1m1d45ppb6jzvy9m4xil7z1wg2pnq9k7zz8"; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 9afca8f1f71..675a7cdd6bc 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "1r1fm28zaxfbzd17jzaz8ql6ss6y6djgdhpfpkvpbw9l8l06x4lc"; + cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index fb518279d00..ce262d946a8 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - cargoSha256 = "1fgv1kxiif48q9mm60ygn88r5nkxfyiacmvbgwp0jxiacv8r7779"; + cargoSha256 = "1qfqhqimp56g34bir30zgl273yssrbmwf1h8h8yvdpzkybpd92gx"; meta = with lib; { homepage = "https://github.com/cgag/loc"; diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index d2d4719dab4..a8ce23d371f 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -37,8 +37,6 @@ buildPythonPackage rec { patches = [ ./Cargo.lock.patch ]; - cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r"; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index 338bc3e189c..d354b71fc9f 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w="; }; - cargoSha256 = "sha256-3eGYU5O7HSpawIL/8OVmROCzXfdnoMAnIujjrIp00xg="; + cargoSha256 = "sha256-XcXllex7UEufV5URhH7aqln1tNxwaiAETO3fUKmHf7s="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index a0f251bfe91..66f2db28068 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "0pn9xgryfb7f0plx50v9i7hsv1wib87pi0fl43cv6hgqyrdb52ny"; + cargoSha256 = "1hpi9aifn3g19yqkb58lphyw8cbsqllhg5dzbqx15hcfvrb7ip4k"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index b05f9b94440..f477da365d7 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto="; }; - cargoSha256 = "sha256-zdvIC+VUASjhrlyRts+JJeh5xdcdpX6Ixle6HhbMJJU="; + cargoSha256 = "sha256-FDkxJuZPzDrgLJgefkRUPS+0Ys3DaBOD3XAuS/Z6TtI="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index f7f933392ab..500ca632fcf 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { dontWrapQtApps = true; - cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0"; + cargoSha256 = "0vhcb3kw1zgchx3nrk8lyrz8p5071y99vsysxvi71klv7dcvn0am"; doCheck = false; postInstall = '' diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index a562a1baeee..dc38728a44a 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-p002oWwTQxesWLgLq8oKKzuZKXUdO4C1TZ7lR/Mh1PA="; }; - cargoSha256 = "sha256-M0hng1JcR5Q829bVOaTASl0Eq6fFm8mUFsS5zx1JX94="; + cargoSha256 = "sha256-1WEPJpU/hLn+qjU+ETkmbfZIJTORe3OUdyl605JnYmU="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index a45e93ab151..ffff8af8b66 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx"; }; - cargoSha256 = "1zgds5rjjikvaj0rxc7slyvkjn067s0v8vdnxn3vsv819q5yd707"; + cargoSha256 = "0y2q46i838gha58p95vcv5r5i14il1kv86k35s30ncfibijgp0lc"; meta = with lib; { description = "A tool to parallelize shell commands"; diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index 601f7ea9fea..0d62642e032 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { # workaround for missing Cargo.lock file cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0hjfq61y1ikdcajr2k514k7fad2zxbwq7yb5nk1wx38f1524709q"; + cargoSha256 = "033wif3wwm3912ppw0gshsyjxipilg9hhvkijw29zmjfm6074b21"; # fac includes a unit test called ls_files_works which assumes it's # running in a git repo. Nix's sandbox runs cargo build outside git, diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 3bdbb086d1d..65a49551035 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-IpmvFUWNaFQ1ls7u625vvj1TnRYXR+X1mAGdBcwRFLk="; }; - cargoSha256 = "sha256-2YHkEQZqjKEvg4h9kIVhqmgq+SMF1c3r8UbSQivZh7w="; + cargoSha256 = "sha256-ccy5ZFS2Gp4Dwo8gsS6vzHHO1siicOp7uZTsCh6SKsM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index c85ef52564a..2c35e951cda 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; - cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm"; + cargoSha256 = "0q7yxvvngfvn4s889qzp1qnsw2c6qy2ryv9vz9cxhmqidx4dg4va"; nativeBuildInputs = [ openssl perl pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index ac8f15a4158..dd37efb506d 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz"; }; - cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; + cargoSha256 = "1y6k24p4m67v5773rzid2r0jwxp9piggrp0462z446hbcam2r4gd"; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [] diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index c3b477e3ea3..395cd7979d6 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - cargoSha256 = "1s7g9mcjyp0pjjxma1mb290fi7fk54qy2khh1zksxhr4d3mciv08"; + cargoSha256 = "0xcgzlcmlk5ycw4kklprm8lzs72j2zp8xm3dcpy606z4r9qn0c6a"; meta = { description = "Generate changelogs from local git metadata"; diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index c152197358c..44445f86752 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw="; }; - cargoSha256 = "sha256-hAUg2mh4VyyjkBRBs5YWi14yeGlMXxt+cdoz5xOS+1A="; + cargoSha256 = "sha256-RuClZ+ChP7d40e9nr1Lg8R0F7rbFbBse79V9Y1AQn3o="; nativeBuildInputs = [ openssl perl pkg-config ]; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 8a976f44bf7..a2c1af2607d 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "1vkwp861vm20agj0lkhnnxgg4vwg4d5clvvyzxrmm4y4yw46cdl2"; + cargoSha256 = "060r90dvdi0s5v3kjagsrrdb4arzzbkin8v5563rdpv0sq1pi3bm"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 68be931aa44..e9bf3734513 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy"; }; - cargoSha256 = "10iqypz8hfyzy1xd78r39z2waa728d97kfnf1bbx8fr4a4pzan7y"; + cargoSha256 = "0x5fd47rjmzzmwgj14gbj0rbxwbphd7f63mis4ivwlwc9ikjxdxb"; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix index b156847870d..d5a507d4ebb 100644 --- a/pkgs/development/tools/dot-http/default.nix +++ b/pkgs/development/tools/dot-http/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml"; }; - cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w"; + cargoSha256 = "013jyp2bgmssj1c18lm8jkb6q6jlhdrqzmyri6k5lgmfmb9dvkii"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index c88ffef4df1..22b3d4f67e3 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr"; }; - cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1"; + cargoSha256 = "0sadd0snyqd82y5bwbgfxhbw1jrszwwlz29gq7zb4kbr4j8z3f5n"; meta = with lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 0f7677c7aa2..752cefad3c2 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - cargoSha256 = "0ijgx8fksg2najb336dhddxlqfzc338f9ylydkpw6b39k72mm00d"; + cargoSha256 = "0870f4rd98fbmyl8524ivfg3xf4qpzb1x68q1idnl47mmf68pyx8"; cargoPatches = [ (fetchpatch { diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index c00304c1ec5..0d8f82e48be 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZD63Xtnw7qzTrzFxzzZ37N177/PnRaMEzBbhz7h/zCY="; }; - cargoSha256 = "sha256-c6veaasuwRtaO8TwHS0tNxjbBfekQOa52I9INcE1Jn0="; + cargoSha256 = "sha256-WSjIN7YVX61V5nEei2iZfasIcBLjXxlZP6ZUj9nDnpo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 9160a336681..1332885bbdb 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03"; }; - cargoSha256 = "1fjzcgayyha270bdxl5p6c337nq8zj4h81rk4ih9czyz3yaxga3f"; + cargoSha256 = "16446ppkvc6l8087x5m5kyy5gk4f7inyj7rzrfysriw4fvqxjsf3"; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix index 32c32b536d9..0abdd017901 100644 --- a/pkgs/development/tools/misc/itm-tools/default.nix +++ b/pkgs/development/tools/misc/itm-tools/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0rl2ph5igwjl7rwpwcf6afnxly5av7cd6va6wn82lxm606giyq75"; + cargoSha256 = "1hqv530x8k4rf9zzyl5p5z58bymk1p4qwrcxs21gr0zm2hqjlxy4"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix index ac617021601..7d8992b4e20 100644 --- a/pkgs/development/tools/misc/mdctags/default.nix +++ b/pkgs/development/tools/misc/mdctags/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb"; }; - cargoSha256 = "01ap2w755vbr01nfqc5185mr2w9y32g0d4ahc3lw2x3m8qv0bh6x"; + cargoSha256 = "1kdbrcpvxiq91m5vq33vzjhsp4j3flzrpbj5hmxf0k3al1a7qk1g"; meta = { description = "tags for markdown file"; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index 8406ecf298f..c17bfd67358 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1xr1szh4dfrcmi6s6dj791k1ix2zbv75rqkqbyb1lmh5548kywkg"; }; - cargoSha256 = "1rsnb4kzfb577xw7jk0939n42sv94vvspvbz783bmpy9vl53i38k"; + cargoSha256 = "1pz5hvn1iq26i8c2cmqavhnri8h0sn40khrxvcdkj9q47nsj5wcx"; # Sanity check. checkPhase = '' diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/development/tools/misc/rtss/default.nix index 505e6d23ef7..36ef4c349e9 100644 --- a/pkgs/development/tools/misc/rtss/default.nix +++ b/pkgs/development/tools/misc/rtss/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1936w161mkbcwicrxn51b42pgir5yjiw85s74lbfq70nddw18nyn"; }; - cargoSha256 = "0nll5gg7fjh6sz3cscarknb0gaivmzkcxhwdb2li47r74rcbrj36"; + cargoSha256 = "1b1xiaaxbw6y80pkzd594dikm372l1mmymf1wn2acmlz979nmas8"; meta = with lib; { description = "Annotate output with relative durations between lines"; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 4379efd5071..cbdee69ce2c 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb"; }; - cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; + cargoSha256 = "1f42cqaqnjwi9k4ihqil6z2dqh5dnf76x54gk7mndzkrfg3rl573"; cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ]; diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index 6af24ed5d10..13b52914799 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+/4D0pRZs1Gy6DJnsDZA8wWi1FKhr7gRS0oq1TyWpuE="; }; - cargoSha256 = "sha256-o6/L/4QcIei4X1pHYjV72hcEmTMp+pvJkwbb+niqWP8="; + cargoSha256 = "sha256-xkRlUXlkXQwvzIuhExf+tSSBi+8BZv58btvln05UI+k="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 480c7cfd556..b1e69c7c143 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m"; }; - cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky"; + cargoSha256 = "0mikz7lyf0csn4v1wzmcdaid3g8zm9a4mmr5f7l2s7rrlqz3jibn"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 557ff4fa967..e87f0706756 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; + cargoSha256 = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 1a5f3efe0e6..58e4ba0bc98 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; - cargoSha256 = "1c0gj2wp0nydv0binxj3ikm5sm6y5z3pklp5b06dgvq02licz57a"; + cargoSha256 = "0y7vsba4r4v2lwf02i2dxwicnhknajbbzsdlnn5srvg6nvl3kspi"; meta = with lib; { description = "A tool to identify potentially unused code"; diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index d900d14e33c..0465fb74aa1 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { cargoDepsHook = '' ln -s wishbone-tool source ''; - cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs"; + cargoSha256 = "1b12wpmzv7wxidc4hd8hmp8iwqhqlycxh8bdv3rf701sqsazkc5x"; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index d29e1244378..ecc5ea8dc88 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "07h9hywz0pc29411myhxjq6pks4p6q6czbqjv7fxf3xkb1mg9grq"; }; - cargoSha256 = "1m7bvi6i52xqvssjx5fr2dz25ny7hkmb8w8p23pczpdmpd2y0r7r"; + cargoSha256 = "1rac2s36j88vm231aji8d0ndfbaa2gzxwsrxrvsi0zp9cqisc6rh"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 2cd8ff4fdb6..59253a4f7da 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd"; }; - cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl"; + cargoSha256 = "1lam4gwzcj6w0pyxf61l2cpbvvf5gmj2gwi8dangnhd60qhlnvrx"; nativeBuildInputs = [ llvmPackages.clang ]; buildInputs = [ llvmPackages.libclang ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 293b8bb095a..29edf0f9f27 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -30,7 +30,7 @@ let # 3) run the ./result script that is output by that (it updates ./grammars) version = "0.19.3"; sha256 = "0zd1p9x32bwdc5cdqr0x8i9fpcykk1zczb8zdjawrrr92465d26y"; - cargoSha256 = "0mlrbl85x1x2ynwrps94mxn95rjj1r7gb3vdivfaxqv1xvp25m41"; + cargoSha256 = "1n63lxp8rknb5xqp02csj649cxs7d891a520djl3lb4k1finhsjj"; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index ff4219ad09c..248a137c49f 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -36,5 +36,5 @@ buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; - cargoSha256 = "0wx5x7ll21bb6v34csk63kkvxdk3as720hdkaj0izdkpy0xf1knr"; + cargoSha256 = "0d6g52hjflnw2zvlx10pz78527vh7mw5n43yi8q6dwr3pkbds1fs"; } diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/development/tools/pqrs/default.nix index fb91709bde0..24efea2036a 100644 --- a/pkgs/development/tools/pqrs/default.nix +++ b/pkgs/development/tools/pqrs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1vx952ki1rhwfmr3faxs363m9fh61b37b0bkbs57ggn9r44sk1z2"; }; - cargoSha256 = "1c482y83gzpvazdsxsx5n509mkqmyz640s18y4yg928mmqbsz9c4"; + cargoSha256 = "0mjwazsnryhlfyzcik8052q0imz5f104x86k6b5rncbbbjaj17q1"; meta = with lib; { description = "CLI tool to inspect Parquet files"; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 89480f53a37..94c706c0210 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { checkInputs = [ python3 ]; - cargoSha256 = "sha256-GFH8RzyAMtdfoHPcCV3pKf24fKU65vhMLQfLtkhD0Ns="; + cargoSha256 = "sha256-hmqrVGNu3zb109TQfhLI3wvGVnlc4CfbkrIKMfRSn7M="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix index 73a58ee100b..5dee0a1b9e8 100644 --- a/pkgs/development/tools/rebazel/default.nix +++ b/pkgs/development/tools/rebazel/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME="; }; - cargoSha256 = "sha256-2FmtbvtNfNoocj3Ly553KBLfOgBAa/eAxOrfZ3NGzzw="; + cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; meta = with lib; { description = "tool for expediting bazel build workflows"; diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index e938526ecbf..98670e9e184 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn"; }; - cargoSha256 = "0xmaa7rds7hlagfxj65pv9vgflcv4nwbwbw4g7cyj88cbb1kbxxj"; + cargoSha256 = "1akapxrh38g44531r25dgik8y5qyy9y6zb031hg8v61px2ajs39s"; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 3922bcb3260..88a7c346a80 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp"; }; - cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; + cargoSha256 = "0071q08f75qrxdkbx1b9phqpbj15r79jbh391y32acifi7hr35hj"; buildInputs = [ llvmPackages.libclang v8 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 9568d8efefc..7c5eca3cdf6 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0d8+Rkb4h1DoFUQ7u2/kPR/fUUz0YvI+hNT4iXL3mxY="; }; - cargoSha256 = "sha256-cUDOi3QwjEJaBXGSQZQ76gZ702QLNok8fr6U2q+tVao="; + cargoSha256 = "sha256-nI0Jr5vNldvo6K9GhnUXi1Lcruy6zKCDEimFTmHVwGQ="; #for substituteAll libclang = llvmPackages.libclang.lib; diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index f453955a5c7..cd657967e9a 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb"; }; - cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j"; + cargoSha256 = "1c22aal3i7zbyxr2c41fimfx13fwp9anmhh641951yd7cqb8xij2"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix index 8b40d9b686d..029eafd02f6 100644 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cp ${./Cargo.lock} $out/Cargo.lock ''; - cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw="; + cargoSha256 = "sha256-6du86HxkDQAeIXScXBKuv0j4YZiG4O6IwVIXZnJgTO8="; meta = with lib; { description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 51d19f5ad6f..c0baf9f3964 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2"; }; - cargoSha256 = "1323lcl8fa21pgx3jhwl4w9f8qz3jjxb5qdvib9jdzqxnnw320xs"; + cargoSha256 = "0f7hmwrs99qdvhn4lvs8cqva68w2y04fy3ca1xlhk7ncdmclcc4g"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 8d12da30a6f..a78c7ee0d32 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1rmhg9xhljgd5yq3xs0fzw1b0bgz7jfpf5mr2gviwqahl5vxvfiq"; + cargoSha256 = "0pxakfiidxfczh3harnjhb1zv340r812jxzwam8z2kyw3mkyhh8z"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 71d4646c1a1..37af0240f48 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qRwyNSAYuAnU17o/5zqKuvixQw7xfA6wNVzN6QRbZlY="; }; - cargoSha256 = "sha256-OpqVP097GYiARq7gbsMGFFGkFaQz3qeux12aMJj7W3Y="; + cargoSha256 = "sha256-qAq5B/BivQr8yuHtyFGTRigAa5dG2rboc0aD44/38FQ="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix index 664f3688eaf..38723bbf3c1 100644 --- a/pkgs/development/tools/rust/cargo-criterion/default.nix +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NiuK+PexfF2wmA8drqqkv/RQlVwYLT3q2QWvV0ghJwg="; }; - cargoSha256 = "sha256-A6Kkm/4MSAEJfehA6zSQJU+JwVIhKPcfMZCO9S6Zyx4="; + cargoSha256 = "sha256-5Z9Oz8jjyM3+cHAZ++thRDdNlb0Kj54Mg7JjF9JrLdw="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix index f7ce0283f6f..276d6e50eee 100644 --- a/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256:1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; }; - cargoSha256 = "sha256-3xSuTBcWRGn5HH7LnvwioeRWjehaPW1HCPjN5SUUVfo="; + cargoSha256 = "sha256-zk6cbN4iSHnyoeWupufVf2yQK6aq3S99uk9lqpjCw4c="; cargoPatches = [ (fetchpatch { diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 989885e99a7..bfd346337ea 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35"; }; - cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8"; + cargoSha256 = "1nqrij4j8787x7zqgdcscf8i436s19gwk08nyixhmf9sprcfb0ck"; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 934976f7386..1730dc7769e 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6FjFG4RYvmsV/W7OMxj1ZWvruwUeP9Nvsdiv8toZmTk="; }; - cargoSha256 = "sha256-1+A+n5VQS8zJULiR8IWLGo+RnFuVjg6ist8G3eCsXJM="; + cargoSha256 = "sha256-C9lpA2n7EI7Ga3Nnj80dkvbZmqjuxf0wjoQUEr0N8FE="; meta = with lib; { description = diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index 94b5000b9b6..2614f24e638 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n"; }; - cargoSha256 = "0nvl5smibl81b826xcsrjx8p89lcfpj7wqdsvywnj7jd3p5ag03n"; + cargoSha256 = "1jh1h6v4mxx03b4diw9325ga0k3js0czs504lx07hvbx8yai1wkq"; meta = with lib; { description = "Allows conveniently modify features of crate"; diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 39b56c2d656..0263313678d 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0"; }; - cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90"; + cargoSha256 = "1bg9fcysn48qlbm63pjmvvhwpmyb0lgqq4i4vpnygc7ckh15k3f2"; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 70a2e6feca6..43655fd6a89 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1jim5bgq3fc33391qpa1q1csbzqf4hk1qyfzwxpcs5pb4ixb6vgk"; }; - cargoSha256 = "181gcmaw2w5a6ah8a2ahsnc1zkadpmx1azkwh2a6x8myhzw2dxsj"; + cargoSha256 = "1c2zryxn1bbg3ksp8azk9xmwfgwr6663hlmdv9c358hzqdfp9hli"; # The tests need a GitHub API token. doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index ced5d7cd583..2004f9bff06 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8="; }; - cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg="; + cargoSha256 = "sha256-GtvflTfwNMPxMsDQoiTYGgrlSfOIhY3X8qJzwS+LJ4Y="; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 3b2702c66f6..bd71a14b4a0 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1z920p8i3gkjadyd6bqjk4i5yr5ds3m3sbcnf7plcqr69dsjr4b8"; }; - cargoSha256 = "1zh6fjfynkn4kgk1chigzd0sh4x1bagizyn7x6qyxgzc57a49bp7"; + cargoSha256 = "1wf9758gyaxgyajjzy5phirg922n9wv0qmy67zjmxj56ayf0l9lm"; checkPhase = '' ${cargo-insta}/bin/cargo-insta test diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index e4eb2965fd6..040109da3ad 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY="; }; - cargoSha256 = "sha256-W6+RGzCYJF9f44QaFDOI414/vCfKIuIOXoH+GYY0GwY="; + cargoSha256 = "sha256-/0pxEQFhovPRI4Knv5xq6+PHRuGN6+tF8CdK5X30LKI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 9339660388b..1644929074b 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw"; + cargoSha256 = "069i8ydrp1pssnjq7d6mydwr7xh2cmcpzpf8bzd6nfjr6xx1pipr"; meta = with lib; { description = "See what Rust is doing behind the curtains"; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index e621fa9b972..d1de9c82e35 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0qjzbcaznnmb0p0r23s82jjbfs5mhhkacg26lf8fq4vvlkr1hsqf"; + cargoSha256 = "0sxlgy225x8bn48r9jidaw6r00hclvrj2p4prcx802094dhcwknk"; patches = [ ./ignore-rustfmt-test.patch ]; diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/development/tools/rust/cargo-play/default.nix index 5e12c1cae1d..f5faed06faf 100644 --- a/pkgs/development/tools/rust/cargo-play/default.nix +++ b/pkgs/development/tools/rust/cargo-play/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "01r00akfmvpzp924yqqybd9s0pwiwxy8vklsg4m9ypzljc3nlv02"; }; - cargoSha256 = "0fvsdyivq5991ka6avh12aqdkjx0myk61kmzlr19p2vlfpg70q07"; + cargoSha256 = "1xkscd9ci9vlkmbsaxvavrna1xpi16xcf9ri879lw8bdh7sa3nx8"; # some tests require internet access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index 358c58bef4d..fb45763b50b 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw="; }; - cargoSha256 = "sha256-QVRl6xCvztWi5zAs3PXYR4saTqO5nTBPIjdlMiMXFTM="; + cargoSha256 = "sha256-Isd05qOuVBNfXOI5qsaDOhjF7QIKAG5xrZsBFK2PpQQ="; patches = [ (fetchpatch { diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index f20bdb9cc17..537275c68f6 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0zwdrh4z5x79qs8cwmwh3phzy4brw0ggv2qyf6pylv99vha5acyf"; }; - cargoSha256 = "1sxjc64g8h77a3dvzb99f1f72zrak1nh4jgfjfkw4yc4dhkpyrmz"; + cargoSha256 = "023gbq8izpbaxq1pdzs8428k24myd2b8gi9g4kl2hx79yciiscnz"; meta = with lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix index 54f21ab4627..07c51c3163c 100644 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc"; }; - cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83"; + cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah"; meta = with lib; { description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation"; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 9fadea3f31c..7e9679e9cc0 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1gAkc8x9rl80xkFWR2iKYOjkHplWUPWQZDbE8U5gkOM="; }; - cargoSha256 = "sha256-APUQYqC0MYNeeuehkQvxQsjOnXBgvEMNBqfoUy2KH0U="; + cargoSha256 = "sha256-M1UkfzNcBv00Ctl5zRNn6CMizunGC3EM8zsA6PgOaLw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index 3cfea727435..e1f26dc02b2 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PltYUU2O/D1PrU+K8JN4+aUVLzHCeNyIsXMU6HLodXE="; }; - cargoSha256 = "sha256-zR826fFSCSsJxGKSc7ugrLwMDvsjRBjs4eotKTfhGqI="; + cargoSha256 = "sha256-XiQGkZ6pfyGkNPjpcPoY66qBl7ABTcRHCBjgmXSRrL0="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index 34440ce9305..7041f0ebd6c 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0vki37pxngg15za9c1z61dc6sqk0j59s0qhcf9hplnym4ib5kqx1"; }; - cargoSha256 = "sha256-nNV7UXjKZNFmTqW4H0qsNuBW9XOP2V9nfotewtI9mYE"; + cargoSha256 = "sha256-ZEkSj/JzXXTHjaxBVS5RDk/ECvOPPjzH4eS3CmlQA9I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index c4c079c523b..a59a124317b 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ="; }; - cargoSha256 = "sha256-IzEurJcPoM/JMQlSL7N84wzZddNpynrsjQEOUNms2YQ="; + cargoSha256 = "sha256-EoXgsWg1Rh7C+fIqvefkLdck4Yj3kox2ZAU3kn6nH8Q="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 8aa701779bc..e8d62c9252f 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "01whdjryz6zjsk4149h72w5xdjnkpcn5daf0xnsb59b0q38hjgg9"; }; - cargoSha256 = "1gcixzxca1yi4rvy55s986my6j0vx7n6fm1g5r4v4w0zgzlz4d89"; + cargoSha256 = "036a50shzl6wdjk5wypkacx1kjwbyb4x1aqhbzgjgpxxxrf0lj16"; meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index b5a3486da71..e68eea50ff3 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/crate2nix"; - cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik="; + cargoSha256 = "sha256-shWhzCaH8ZttUcq82tA7T1hwNl6F1XJy7ansA5lt+Mw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index c4dc0c34107..59bca1f60d9 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "QEUsigoSqVczrsSSDnOhTXm94JTXHgxeNY0tGsOaRyg="; }; - cargoSha256 = "Fr5XWIUHXyfesouHi0Uryf/ZgB/rDDJ4G1BYGHw0QeQ="; + cargoSha256 = "sha256-Fr5XWIUHXyfesouHi0Uryf/ZgB/rDDJ4G1BYGHw0QeQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 33d6721610e..6ffa49aa6b9 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoSha256 = "1z0dh2j9ik66i6nww3z7z2gw7nhc0b061zxbjzamk1jybpc845lq"; + cargoSha256 = "08zn65c5ivhn2qs02aiixyqwhywrw8kfvs0kgzxdzsipic47n2qq"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index cd52f319bb9..e7324ff7c5b 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WAUPB4hhvroE1/8nQcgLVWgGyXcFh7qxdFg6UtQzM9A="; }; - cargoSha256 = "sha256-wt6ClN9fpEAETk3kYeQRieTXnZQe4JEnQiA8CG4ZLog="; + cargoSha256 = "sha256-aaIzGvf+PvH8nz2BSJapi1P5gSVfXT92X62FqJ1Z2L0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 6d7fbef2f19..65c889aee83 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "sha256-jTZso61Lyt6jprBxBAhvchgOsgM9y1qBleTxUx1jCnE="; + cargoSha256 = "sha256-sULjd+weixTQYFIQlluPwY4MFlZ1+vMMoMn4GP79oQs="; checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; dontUseCargoParallelTests = true; diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index d31c030edac..44921d27d22 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s="; + cargoSha256 = "sha256-0ehz0ETNA2gOvTJUu8uq5H+bv4VXOJMq6AA8kn65m/Q="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index e566d4cb1c9..a52f7b6550c 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-2UBCcA4eBrSHrJjJdDprsysiOObg2GrC7QtveAydbhk="; + cargoSha256 = "sha256-GUdoOms4FrNmPkELFX1PXcU/ww7CSN8JGHoCvnm73PQ="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 9c6d3ed8cb8..59051895512 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ./update-deps.patch ]; - cargoSha256 = "0br7r8wz3knzgl3gjpq6z8w33my0yiaq711s1wih9jizhia02y5r"; + cargoSha256 = "130gqvzpyr055xkqcy1r0y7l5k2dcv7n9zgr4ja7dm7iayzbwwi1"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index 7112c6bf49c..a224ba112e0 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "1i8qfphynwi42pkhhgllxq42dnw9f0dd6f829z94a3g91czyqvsw"; + cargoSha256 = "01mnfn6j4sj9iqw5anpx8lqm9jmk7wdrx3h2hcvqcmkyrk1nggx0"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix index 36639140702..ff1e8872233 100644 --- a/pkgs/games/freenukum/default.nix +++ b/pkgs/games/freenukum/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yqfzh0c8fqk92q9kmidy15dc5li0ak1gbn3v7p3xw5fkrzf99gy"; }; - cargoSha256 = "1mi98ccp4026gdc5x9jc6518zb7z4dplxl8vir78ivgdpifzz4pw"; + cargoSha256 = "1nss5zbdvxkr1mfb6vi6yjxcih99w836kvfr4r3n5dvzlkvga2vf"; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 4f186c3c60a..3ad5ba20c53 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -11,7 +11,7 @@ let pname = "libstracciatella"; inherit version; src = "${src}/rust"; - cargoSha256 = "0blb971cv9k6c460mwq3zq8vih687bdnb39b9gph1hr90pxjviba"; + cargoHash = "sha256-asUt+wUpwwDvSyuNZds6yMC4Ef4D8woMYWamzcJJiy4="; preBuild = '' mkdir -p $out/include/stracciatella diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 108d81815fa..464939084c2 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -16,7 +16,7 @@ let inherit src version; pname = "portmod-rust"; - cargoSha256 = "14p1aywwbkf2pk85sir5g9ni08zam2hid0kaz111718b006nrxh7"; + cargoHash = "sha256-7Ce+EIbZuOur7iGOUXNWiXReuZO54LQJu+sJPw1CJGg="; nativeBuildInputs = [ python3Packages.python ]; diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix index 4343a27fb49..f01f93572ba 100644 --- a/pkgs/games/system-syzygy/default.nix +++ b/pkgs/games/system-syzygy/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ SDL2 ]; - cargoSha256 = "001cwdq8zxji56yahwfsydi7s0j7c5zsip60lxk3qmn078wcipdp"; + cargoSha256 = "1jp9wnavq92w52ksj2q9fi3y58wq7ybfkx2kfbx2i2xv8d7y88ax"; postInstall = '' mkdir -p $out/share/syzygy/ diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index affbf0af15a..33709fe5014 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; - cargoSha256 = "0pnp5kmij4dwwvmgdv81mqcawcjcgg5gd6cpyf0xalyfjgj8i732"; + cargoSha256 = "1ad7xf9h3v5h8jv5y304vxy32k52b0x2wkc3yqqf23sxky2sj843"; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index 5c0fb954910..e0c62ca92ca 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; }; - cargoSha256 = "1fv13rbghfw7114h7sda04gpqrjrsgnnki0p9kdd6r6sk5cbhn9x"; + cargoSha256 = "1p6008vxm2pi9v31qhsq7zysanal6rcvcl8553373bkqlfd7w5c4"; meta = with lib; { description = "A simple, user-friendly alternative to sort | uniq"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index f021dce2a8f..7421371edfd 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -720,7 +720,7 @@ self: super: { vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; + cargoSha256 = "1cvnjsw5dd02wrm1q5xi8b033rsn44f7fkmw5j7lhskv5j286zrh"; }; in super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index c4d22828103..3ebb30fac65 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -24,7 +24,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-HPVbqYsst/iFrHn5wvmWtqeVHOHR7JT8lu+/xZq1lK0="; + cargoSha256 = "sha256-vcL/nSGhyE0INQVWxEIpYwXmnOl1soBn+mymZr1FaSM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix index 0ca585fab47..dbb525e0e29 100644 --- a/pkgs/os-specific/linux/catfs/default.nix +++ b/pkgs/os-specific/linux/catfs/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0zca0c4n2p9s5kn8c9f9lyxdf3df88a63nmhprpgflj86bh8wgf5"; }; - cargoSha256 = "0v6lxwj4vcph32np68awpncafvf1dwcik9a2asa0lkb7kmfdjsjk"; + cargoSha256 = "1agcwq409s40kyij487wjrp8mj7942r9l2nqwks4xqlfb0bvaimf"; cargoPatches = [ # update cargo lock diff --git a/pkgs/os-specific/linux/dlm/default.nix b/pkgs/os-specific/linux/dlm/default.nix index 9e81ea38348..3b6f4773a29 100644 --- a/pkgs/os-specific/linux/dlm/default.nix +++ b/pkgs/os-specific/linux/dlm/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p"; }; - cargoSha256 = "OFMCsUmrRYlobiUAqm1huuzDxdf1BWmU2RqZ9Y6Yjew="; + cargoSha256 = "01a8k60qnx2pgxb2adgw30c2hjb60w6230khm5hyqgmp7z4rm8k8"; meta = with lib; { description = "A stupid simple graphical login manager"; diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index 80730fdbefb..ee36ab57442 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installPhase = "make prefix='$(out)' install"; - cargoSha256 = "sha256-TISYaSOu8c+74ie4QHLqflXfLWwcLHEOch/hAx3iu60="; + cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U="; doCheck = false; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 9d47d50b43f..ca750d89cc5 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-sKC0jfpy7mxGwO+mKU3W5e9HsJx+HQNzqq78YViNJcs="; + cargoSha256 = "sha256-gGw3zpxLxQZ3rglpDERO0fSxBOez1Q10Fljis6nyB/4="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/pkgs/os-specific/linux/greetd/default.nix b/pkgs/os-specific/linux/greetd/default.nix index fc5dd04b43c..6f305c5d6eb 100644 --- a/pkgs/os-specific/linux/greetd/default.nix +++ b/pkgs/os-specific/linux/greetd/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "b+S3fuJ8gjnSQzLHl3Bs9iO/Un2ynggAplz01GjJvFI="; }; - cargoSha256 = "w6d8rIc03Qa2/TpztpyVijjd3y0Vo38+JDhsOkSFG5E="; + cargoHash = "sha256-YSC7osyBPwx+lo7P1ftI72mRWeQlDc2srRPzTFqVTxM="; nativeBuildInputs = [ scdoc diff --git a/pkgs/os-specific/linux/swapview/default.nix b/pkgs/os-specific/linux/swapview/default.nix index c88c8757db3..8eb45550105 100644 --- a/pkgs/os-specific/linux/swapview/default.nix +++ b/pkgs/os-specific/linux/swapview/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0339biydk997j5r72vzp7djwkscsz89xr3936nshv23fmxjh2rzj"; }; - cargoSha256 = "0z99pqd41y8cci3yvwsnm5zbq7pzli62z8qqqghmz1hcq5pb5q7g"; + cargoSha256 = "03yi6bsjjnl8hznxr1nrnxx5lrqb574625j2lkxqbl9vrg9mswdz"; meta = with lib; { description = "A simple program to view processes' swap usage on Linux"; diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/os-specific/linux/tuigreet/default.nix index b6db7cfbb7f..a904eb8b9b4 100644 --- a/pkgs/os-specific/linux/tuigreet/default.nix +++ b/pkgs/os-specific/linux/tuigreet/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1fk8ppxr3a8vdp7g18pp3sgr8b8s11j30mcqpdap4ai14v19idh8"; }; - cargoSha256 = "0qpambizjy6z44spnjnh2kd8nay5953mf1ga2iff2mjlv97zpq22"; + cargoSha256 = "1ds5rcxg7qn799zp0jdn9ifkdzh9h5ibsqh688dvrqyzrsfz6x7m"; meta = with lib; { description = "Graphical console greter for greetd"; diff --git a/pkgs/os-specific/linux/wlgreet/default.nix b/pkgs/os-specific/linux/wlgreet/default.nix index e48443b1b1e..2bbf01b01c5 100644 --- a/pkgs/os-specific/linux/wlgreet/default.nix +++ b/pkgs/os-specific/linux/wlgreet/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc"; }; - cargoSha256 = "01bfv2kzg2r9z75b8pq61n2ydc8l5zh69jdyjpj931l642f6kd5a"; + cargoSha256 = "08m8r8wy7yg5lhmyfx4n0vaf99xv97vzrs774apyxxx2wkhbyjhg"; meta = with lib; { description = "Raw wayland greeter for greetd, to be run under sway or similar"; diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 76f1397611a..ddde393c5f6 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0jksdrji06ykk5cj6i8ydcjhagjwb2xz5bjs6qsw044p8a2hsq53"; }; - cargoSha256 = "1wilm7bzr8h9yjwzw97ihavaylkv6nrk8f0vmm7kia69vqdrz9in"; + cargoSha256 = "0i7rga5w4jh7zia4v2zkbmbc683p69z5z05ksl40jcmzvp29p3fj"; cargoPatches = [ ./cargo-lock.patch ]; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index b23a7d1c920..be503567c56 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dmc58wzv758b82pjpfzcfi0hr14hqcr61cd9v5xlgk5w78cisjq"; }; - cargoSha256 = "08v969b0kvsg4dq3xsb159pr52a0vqr34g48j8nvq13979yq6d8p"; + cargoSha256 = "1s37b0w1aav6gz399zncfp0zqh5sfy0zmabhl7n8p5cwlmlvnlsj"; preBuild = '' rmdir ./assets diff --git a/pkgs/servers/martin/default.nix b/pkgs/servers/martin/default.nix index e2ba917e5ab..78eaeb7ce8b 100644 --- a/pkgs/servers/martin/default.nix +++ b/pkgs/servers/martin/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1i9zhmjkgid4s90n52wqmrl3lwswcaxd6d47ssycgjl1nv0jla4k"; }; - cargoSha256 = "08rr783qvpm1q7s60k7mh3k5npf0lg5s1x74lnxcxdgrlgpn5gcf"; + cargoSha256 = "1jgl8s6h4pqhn189swrhn896kw1rkmqpf7dq52ry2rdci80g02nq"; buildInputs = with stdenv; lib.optional isDarwin Security; diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix index f770da75fd0..c81058b47b0 100644 --- a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix +++ b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "15jvkpbq6pgdc91wnni8fj435yqlwqgx3bb0vqjgsdyxs5lzalfh"; }; - cargoSha256 = "1zdf091s0wyribsqp8l6arkablchqxmdyg2xdc57hh06p4fjiw48"; + cargoSha256 = "173nylp9xj88cm42yggj41iqvgb25s3awhf1dqssy8f1zyw2cf3d"; meta = with lib; { description = "A tool to compress some state in a Synapse instance's database"; diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index 30557460077..4f3b167c2ca 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1bbbdajh74wh2fbidasim2mzmzqjrgi02v8b0g7vbhpdnlim6ixz"; }; - cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7"; + cargoSha256 = "1wh5riw1fr87wbzbzjnwi5zsc5nflwnp6qcpa8a2js54ncd01n16"; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index 6b26379bf26..df53d30de71 100644 --- a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "xCelL6WGaTRhDJkkUdpdwj1zcKKAU2dyUv3mHeI4oAw="; }; - cargoSha256 = "P3nAtYOuwNSLMP7q1L5zKTsZ6rJA/qL1mhVHzP3szi4="; + cargoSha256 = "sha256-P3nAtYOuwNSLMP7q1L5zKTsZ6rJA/qL1mhVHzP3szi4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 0f6cb5a438b..d4f65abba03 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -55,7 +55,7 @@ let sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3"; }; sourceRoot = "source/libflux"; - cargoSha256 = "0y5xjkqpaxp9qq1qj39zw3mnvkbbb9g4fa5cli77nhfwz288xx6h"; + cargoSha256 = "15xrg7h2jkm0p2nvzza8r6v71w5f3vjilzdahqcd23n2pg5bxgg5"; nativeBuildInputs = [ llvmPackages.libclang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; pkgcfg = '' diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 4d326c0bd62..c874a9309af 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ="; + cargoSha256 = "sha256-NtugqvaickcEowxGwotGuh6jb2NTK95csJxtjezy90s="; meta = with lib; { description = "An RPKI Validator written in Rust"; diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 6ee90aba299..4ad1d78eb50 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "00i5vsbcyrbsvhr5n1b3pxa87v0kfw6pg931i2kzyf4wh021k6sw"; }; - cargoSha256 = "0axjygk8a7cykpa5skk4a6mkm8rndkr76l10h3z3gjdc88b17qcz"; + cargoSha256 = "1icxpragn69c95i5gyx0b07gw4h82r8fsv0nvns0v8dxqisz877k"; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ]; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 057bce2e4b0..07f85c889c2 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/XyBzhZCsX9sGk+iTFlDnblWfDCZdI4b9yfo4Z+Wp1U="; }; - cargoSha256 = "sha256-F5EjBWHBNaQipxCi9Kiz5UTPMU0DuRf15NIVVvhiRxY="; + cargoSha256 = "sha256-xnps3/i6BpzdwUAQmb8aoOPc39L2P52y/ZDAeLoEIU8="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index ac7f2678260..446e187e467 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk="; }; - cargoSha256 = "sha256-7X9klYVZ2yE8BPuLhzWkuT7VFpmdOZGSD0D1x3kBNEs="; + cargoSha256 = "sha256-w1MNsMSGONsAAjyvAHjio2K88j1sqyP1Aqmw3EMya+c="; meta = with lib; { description = "A simple SSH tarpit inspired by endlessh"; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index 3eb51b68b8c..b9d18f63eef 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1g6l0y5x9pdra3i1npkm474glysicm4hf2m01700ack2rp43vldr"; }; - cargoSha256 = "1cmd80ndjxdmyfjpm1f04rwf64501nyi6wdsj7lxidgd1v92wy2c"; + cargoSha256 = "0raym4zrapn3w0a98y9amyp2qh7swd73cjslsfgfzlr9w8vsb6zs"; postInstall = '' install -D udpt.toml $out/share/udpt/udpt.toml diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index 07342c3edbe..f1d1e52b6c6 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/example/unpfs"; - cargoSha256 = "13mk86d8ql2196039qb7z0rx4svwffw1mzpiyxp35gg5fhcphriq"; + cargoSha256 = "1vdk99qz23lkh5z03qjjs3d6p2vdmxrmd2km9im94gzgcyb2fvjs"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 6bda15a93e0..2cae2887e9f 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; }; - cargoSha256 = "0xifc3jwj0c6ynx0gzm5zlnfcq023fjpjmdg9x0vs1fh3b42pdsy"; + cargoSha256 = "1n4498byy2m2f928hamfn959abrrn693wcc323ifqqrvnbkckdz8"; meta = with lib; { description = "Simple relay server for broadcasting a WebM stream"; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 77691e99b25..7ffc6804f5b 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0r5c87cs8jlc9kpb6bi2aypldw1lngf6gzjirf13gi7iy4q08ik7"; }; - cargoSha256 = "1ph3r3vspy700mb8pica8478v9arqz07k2nzpbrdkdkqgfcwlgcg"; + cargoSha256 = "134lpsh8h944l3l8ak51dm1xh5vhi0p5h2kxalyh80vykjan5amq"; meta = with lib; { description = "Modern system shell with simple (and powerful) syntax"; diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index 3a786ad6f00..a5a1596504f 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -11,7 +11,7 @@ let sha256 = "0k9ipm9ddm1bad7bs7368wzzp6xwrhyfzfpckdax54l4ffqwljcg"; }; - cargoSha256 = "1cbcplgz28yxshyrp2krp1jphbrcqdw6wxx3rry91p7hiqyibd30"; + cargoSha256 = "1x8iwgy1irgfkv2yjkxm6479nwbrk82b0c80jm7y4kw0s32r01lg"; inherit target; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 82aee8f818b..b7cb9c9d8ba 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) [ "--no-default-features" "--features" "pulse" ]; - cargoSha256 = "1r2xir0x04056kq7j13cpk8984kjrgxbixlacp6vz79yq9c8pv7k"; + cargoSha256 = "1y7m61j07gvqfqz97mda39nc602sv7a826c06m8l22i7z380xfms"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config patchelf python3 ]; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index c9133b2bef6..33145e0e548 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - cargoSha256 = "1is1cbbwxf00dc64h76h57s0wxsai0zm5vfrrss7598cim6a4yxb"; + cargoSha256 = "0j7yv00ipaa60hpakfj60xrblcyzjwi0lp2hpzz41vq3p9bkigvm"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 67d65f2a821..5fe81b78c9a 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - cargoSha256 = "17k4a3jd7n2fkalx7vvgah62pj77n536jvm17d60sj0yz2fxx799"; + cargoSha256 = "15f7lb0xxaxvhvj8g3kjmqy5jzy4pyzwk3zfdvykphpg18qgg6qj"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index 7aa1ec0ae44..9b543b40498 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -14,7 +14,7 @@ buildRustPackage rec { sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - cargoSha256 = "11r551baz3hrkyf9nv68mdf09nqyvbcfjh2rgy8babmi7jljpzav"; + cargoSha256 = "09phc0gxz1amrk1bbl5ajg0jmgxcqm4xzbvq3nj58qps991kvgf1"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 1f86affa8c3..c8d11474d5b 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jqcI0ne6fZkgr4bWJ0ysVNvB7q9ErYbsmZoXI38XUng="; }; - cargoSha256 = "sha256-0s5MeWX+rXTyftwg6sReNMRgBzhUMIdHu5buKwg1Yi4="; + cargoSha256 = "sha256-JTjkMXwLLh/kjqAFmi2c59F8POAqn5t/kTJfJkR2BL4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 01722fa9070..ebaf5dbc9ff 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-n89rfZwR8B6SKeLtzmbeHRyw2G9NIQ1BY6JvJuZmC/w="; }; - cargoSha256 = "sha256-RqtJLfBF9hfPh049uyc9K+uNBh+P3VMznuA2UtOwK3M="; + cargoSha256 = "sha256-+UGGsBU12PzkrZ8Po8fJBs1pygdOvoHp0tKmipjVMQ4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index a0727286c40..482d1aec8da 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; }; - cargoSha256 = "0akwb7ak4h1i1zk4wcn27zyqjz6mrchs47014xbzw22rj8h8dx92"; + cargoSha256 = "1k0pl9i7zf1ki5ch2zxc1fqsf94bxjlvjrkh0500cycwqcdys296"; cargoPatches = [ ./v3.1.1-fix-Cargo.lock.patch diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/tools/filesystems/sandboxfs/default.nix index 32d186344dd..7d6d6119878 100644 --- a/pkgs/tools/filesystems/sandboxfs/default.nix +++ b/pkgs/tools/filesystems/sandboxfs/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "Ia6rq6FN4abnvLXjlQh4Q+8ra5JThKnC86UXC7s9//U="; }; - cargoSha256 = "sha256-k303TjWG+n+/ZMmko84KJtYb7swuQ1ZJOc4Vq6aOhX0="; + cargoSha256 = "sha256-fAPMAVvcI3pm3zTLATO7SUdZpG469fjlBZshFhgv6gY="; # Issue to add Cargo.lock upstream: https://github.com/bazelbuild/sandboxfs/pull/115 cargoPatches = [ ./Cargo.lock.patch ]; diff --git a/pkgs/tools/filesystems/supertag/default.nix b/pkgs/tools/filesystems/supertag/default.nix index 2e333b5b054..a9a16582c11 100644 --- a/pkgs/tools/filesystems/supertag/default.nix +++ b/pkgs/tools/filesystems/supertag/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; }; - cargoSha256 = "1mzmp1jcxgn2swp52r9y7k09fk0z67i1qafzkkzlfxxd10vfr70v"; + cargoSha256 = "093vrpp4in8854hb0h1lxrp8v6i9vfja0l69dnnp7z15qkpbir4f"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 7449eedb3a7..da24627d7c4 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Cm/w0bwDMu5REsQpkwMBgnROxpI+nMQwC16dY/VdOFU="; }; - cargoSha256 = "sha256-fy8apB1UbpBAnp8mFnL7rNj/GSSUkNz/trqsVrAfFfI="; + cargoSha256 = "sha256-oj6ZuhdKSj6OFSICG977qEY9QWP40FEXwiHXpirsILI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 6f91ee26007..edffad57963 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-lvVgoAZMIqmbS6yMul9Hf9PtneEVy+jDs3kU1jSBL2w="; }; - cargoSha256 = "sha256-v0A8/b/OPAtnaNlMX7QNXTGGH6kg67WBo/2ChOPDZdQ="; + cargoSha256 = "sha256-sxvOFxSZCANBa/448SpjoLqk/HjqtaFrOhjrQro446Q="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index e0968dd6271..a770d208b49 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-fd97w6yd9ZX2k8Vq+Vh6jouufGdFE02ZV8mb+BtA3tk="; }; - cargoSha256 = "sha256-LlEYfjUINQW/YrhNp/Z+fdLQPcvrTjNFtDAk1gyAuj0="; + cargoSha256 = "sha256-uP+YAJYZtMCUnLZWcwnoAw8E5cJeFxXx0qd2Li4byQM="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 79ddd39ea79..d875b4d313d 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fpc09yvxjcvjkai7afyig4gyc7inaqxxrwzs17mh8wdgzawb6dl"; }; - cargoSha256 = "0sbhij8qh9n05nzhp47dm46hbc59awar515f9nhd3wvahwz53zam"; + cargoSha256 = "06zplpy480965lhgav984m6wkfijv7cqa49kpramp8b6ws62pikl"; meta = with lib; { description = "Minimal X screenshot utility"; diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index a8850609944..b9784a85b2d 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { --replace '#![deny(warnings)]' "" ''; - cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d"; + cargoSha256 = "1jyycr95gjginx6bzmay9b5dbpnbwdqbv13w1qy58znicsmh3v8a"; # Test tries to build outdated examples doCheck = false; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 6c5e8569e85..4224bde7234 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f"; }; - cargoSha256 = "1xhwlsq9b6cnafbapm5jf48zqdx5k2vxlr701lh5f8nqvd7nxi6g"; + cargoSha256 = "172kdnd11xb2qkklqdkdcwi3g55k0d67p8g8qj7iq34bsnfb5bnr"; meta = with lib; { description = "A tool for tidying and optimizing SVGs"; diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 39aa8fe06e0..8a02e0fefed 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { # tests need an interactive terminal doCheck = false; - cargoSha256 = "0bdjfcyx2cwz68gcx0393h4ysccarfp02pvvp0a5xgkq11bad0r0"; + cargoSha256 = "0s6i42n4jivzj4ad62r7nc6ailydy686ivszcd6cj5f4dinsbgq3"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index 456a57a1351..b8e91a74197 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1xm8297k0d8d0aq7fxgmibr4qva4d02cb6gnnlzq77jcmnknxv14"; }; - cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; + cargoSha256 = "1z0xxbjnhhzn1fnc3zhvy727l88qyyfqdayj5yvf3nh23m7sr87l"; meta = with lib; { homepage = "https://github.com/myfreeweb/${pname}"; diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/tools/misc/as-tree/default.nix index 7cc97fd79e4..4b2ce65d3db 100644 --- a/pkgs/tools/misc/as-tree/default.nix +++ b/pkgs/tools/misc/as-tree/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5"; }; - cargoSha256 = "0yhd9svdxg7akv61msn7rf3rfblb7kxnyn955dfdwyxbxq48qwpr"; + cargoSha256 = "1m334shcja7kg134b7lnq1ksy67j5b5vblkzamrw06f6r1hkn1rc"; # the upstream 0.12.0 release didn't update the Cargo.lock file properly # they have updated their release script, so this patch can be removed # when the next version is released. diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix index f6991662114..a818c6114d8 100644 --- a/pkgs/tools/misc/asciinema-scenario/default.nix +++ b/pkgs/tools/misc/asciinema-scenario/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ubiVpKFU81Ot9V9oMexWSiUXHepoJ6nXtrWVAFhgcYw="; }; - cargoSha256 = "109ij5h31bhn44l0wywgpnnlfjgyairxr5l19s6bz47sbka0xyxk"; + cargoSha256 = "1yf63w2findgqipvgmlkw3pqfkai7mvqp86jg40lvr0mpnvly2ny"; meta = with lib; { description = "Create asciinema videos from a text file"; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index d72b0fdef1f..845f0e6f471 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8"; }; - cargoSha256 = "12z7y303fmga91daf2w356qiqdqa7b8dz6nrrpnjdf0slyz0w3x4"; + cargoSha256 = "1jrjj999sgiypyv3gs038g4xqq39fzzpsc54j680w6inhd9g9css"; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/blflash/default.nix b/pkgs/tools/misc/blflash/default.nix index bf09fc8d0a7..874203118c5 100644 --- a/pkgs/tools/misc/blflash/default.nix +++ b/pkgs/tools/misc/blflash/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg="; }; - cargoSha256 = "sha256-tt9jfcoEw/HQ0/qU4lhbqKtIw/lthDTcyf/3HYQNPEY="; + cargoSha256 = "sha256-hgymSNivcNT9aXws20sBrk76ToDnCQh/dqfUHBzK1Ls="; meta = with lib; { description = "An bl602 serial flasher written in Rust"; diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/tools/misc/cicero-tui/default.nix index dfc79e208ac..69c53c94058 100644 --- a/pkgs/tools/misc/cicero-tui/default.nix +++ b/pkgs/tools/misc/cicero-tui/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-kzU+i5DLmZULdJPURz10URE5sMUG6eQg0pCoEiyfgco="; + cargoSha256 = "sha256-hYcupIFY+kXXn7mrKAP5axCHONQ/3IR6HKa6rZT7dY0="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 6a253a493fc..1e6e5b99a01 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow="; }; - cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw="; + cargoSha256 = "sha256-xp1ei41HdbSxq8hoQB4JFtYZLb4bIKSlwEwwxUcjojE="; meta = with lib; { description = "A high performance code minimap render"; diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 29748f781be..0c8690b0e75 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1g5a9ns5lkiyk6hjsh08hgs41538dzj0a4lgn2c5cbad5psl0xa6"; }; - cargoSha256 = "11ym2d7crp12w91111s3rv0gklkg2bzlq9g24cws4h7ipi0zfx5h"; + cargoSha256 = "03y7grvnp1y6h8phdb0z1y3mwwbamvcbgmr2h707qvszga4yz9rq"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 73705705993..9a6bd799921 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { rev = "v${version}"; sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE="; }; - cargoSha256 = "sha256-3V94bOixYMznkCQu90+E/68Sfl9GvHp9LNxwWwk4xZQ="; + cargoSha256 = "sha256-o3+KcE7ozu6eUgwsOSr9DOoIo+/BZ3bJZe+WYQLXHpY="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index 0fb31685170..058a0d1ad6f 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54"; }; - cargoSha256 = "0y86ikf235lp5j85fgzawgp4vx66rmzqd6p5n8iy3mqwn3c1ggb8"; + cargoSha256 = "10jrcy8m9ll4136ghq3fhmnphd9g3rw863x708vm17n44kgdxyab"; meta = with lib; { description = "Terminal disk space navigator"; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index ff5ade2e67a..a645525da27 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8"; + cargoSha256 = "1irgj8kna4mwrp91s3ccbfwv2kdkjl89865y88s8v6zd9wzj3c8q"; meta = with lib; { description = "A minimal, fast alternative to 'du -sh'"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 781ee30deba..b16f990cbef 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-DVcjczH7i+R2xs9pEaek4zHYHO90G7fVF7yFUPCWLmU="; + cargoSha256 = "sha256-M/CGsjhErZe4sFs6D5ZW+TWOHVkFtXgidME/GYiM6qA="; doCheck = false; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 253e815008a..b16c046d203 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "eva"; version = "0.2.7"; - cargoSha256 = "1lycjw5i169xx73qw8gknbakrxikdbr65fmqx7xq2mafc0hb1zyn"; + cargoSha256 = "08wm34rd03m5kd2zar23yhvi66kalzdqkgd6cqa1nq0ra4agnan7"; src = fetchFromGitHub { owner = "NerdyPepper"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index ec5dda52a18..9b0c44c3bf5 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "00vlifbri021z8nf7xvbaay8mqvnq58h19va9bqr5lhsqj1f82wq"; }; - cargoSha256 = "0jyqnl6rski1vv2ah21xmwai3rfb542mv14laws4kc2wh63k68i4"; + cargoSha256 = "0n6xqd30b8aiqrvqrmy7q56nh62nx2j1a3yq2dlpc19i2mfw2qd8"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 6028140234e..683556fec6c 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-zKjYUkkm15YRF0YFJKi2A6twvmHuEyxdWcNs37r2dJg="; }; - cargoSha256 = "sha256-e95DRhD22zvizUJOM2It45Bx05iK3KtaMgFPkMbR7iI="; + cargoSha256 = "sha256-rCJn1dDSwKMmwF7m7n+Lf/7+sLd964r8EU7/VdeD9rI="; doInstallCheck = true; diff --git a/pkgs/tools/misc/fontfor/default.nix b/pkgs/tools/misc/fontfor/default.nix index c77809ece1e..73d1085450e 100644 --- a/pkgs/tools/misc/fontfor/default.nix +++ b/pkgs/tools/misc/fontfor/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "194c4knjfb3pnpvw3zl1srwx3q1jp6z78vzln0q2mk5nf0a35yy0"; + cargoSha256 = "1drfrq32lvmi1xlshynzh66gb1cah43pqcyxv3qxp487br9w1iyj"; meta = with lib; { description = "Find fonts which can show a specified character and preview them in browser"; diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix index 7fbfadfac76..6116f15f729 100644 --- a/pkgs/tools/misc/g933-utils/default.nix +++ b/pkgs/tools/misc/g933-utils/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "06napzpk3nayzixb4l4fzdiwpgmcrsbc5j9m4qip1yn6dfkin3p0"; }; - cargoSha256 = "16xgk4rc36d6lylh2dzv63ryq9s7fli3h2qva1m1p6f0gpasnk7w"; + cargoSha256 = "00gzfbxr5qzb9w7xkqd9jgfagb4c7p657m21b467pygzvaabbb8d"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index bef1e59e65d..4d391b09943 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "grex"; version = "1.2.0"; - cargoSha256 = "sha256-EZnuGoysTZMpk2pndOzfXyRnN696RpKze27utQWNFTY="; + cargoSha256 = "sha256-aEwMJ9f08SJhrL8kLaTp54yP1hYGb3Ob5KNzZ5r752s="; src = fetchFromGitHub { owner = "pemistahl"; diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix index 419cff20087..6eecee46a38 100644 --- a/pkgs/tools/misc/hacksaw/default.nix +++ b/pkgs/tools/misc/hacksaw/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1l6i91xb81p1li1j2jm0r2rx8dbzl2yh468cl3dw0lqpqy4i65hx"; }; - cargoSha256 = "01draql3x71h7xl2xcc69dv7vpi3smnajhrvaihs5vij81pyfrzk"; + cargoSha256 = "1rykc06lq3bkblsrj68rbil63yqdnvxkxlppq1w74wf0d6cwjc08"; meta = with lib; { description = "Lightweight selection tool for usage in screenshot scripts etc"; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 9d50530df47..fd89775afd6 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1x7mdyf1m17s55f6yjdr1j510kb7a8f3zkd7lb2kzdc7nd3vgaxg"; }; - cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9"; + cargoSha256 = "0qs2s1bi93sdmmmfmkcnf55fm2blj9f095k95m210fyv5fpizdfm"; # https://github.com/rschmitt/heatseeker/issues/42 # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index d825368cb97..3f11490fcc4 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0aj2sysl0spf5zlcd5kfzlw97w7dzf9x93pv0d1v9blnbd1rz7lm"; }; - cargoSha256 = "1am9vs7l2wzgwqakrsl27x1y7jpn9xaqa4kr48wwqzka401h6j4m"; + cargoSha256 = "08hn0csw12xaag95gb5rj4q7k2zyy9j9bf4iw3b0r3ndh66qqra2"; meta = with lib; { changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 39999677b11..747c1e56a81 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dla2jzwcxkdx3n4fqkkh6wirqs2f31lvqsw2pjf1jbnnif54mzh"; }; - cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw"; + cargoSha256 = "13dd5x0mr1pqcba48w9v5jjpddapd7gk34d4bysbjqsriwpbrdgp"; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/i3nator/default.nix b/pkgs/tools/misc/i3nator/default.nix index a6d78d3c4c9..99f0edeeafd 100644 --- a/pkgs/tools/misc/i3nator/default.nix +++ b/pkgs/tools/misc/i3nator/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "10rxvxq48dhzlw5p9fsj6x0ci4pap85s9b192zakgvk4h97ifp2p"; }; - cargoSha256 = "1i58ix414klm72562scqhb0lmy4wgpiksriz5qs4ss7lzvqdsizy"; + cargoSha256 = "04sx1dsznvh60s2yd9bzbvj6fgjvj37vv33qpww13fyph832i37g"; meta = with lib; { description = "Tmuxinator for the i3 window manager"; diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index 2b187b65760..c1f182d6966 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0mn0wm3bihn7ffqk0p79mb1hik54dbhc9diq1wh9ylpld2iqmz68"; }; - cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn"; + cargoSha256 = "1bvs23rb25qdwbrygzq11p8cvck5lxjp9llvs1cjdh0qzr65jwla"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 70460d86fc9..5ce1bb5d158 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "journaldriver"; version = "1.1.0"; - cargoSha256 = "1vyc9pglppfz5idahvcj01wpmmm6jw043zk896wdksywa5zcqn28"; + cargoSha256 = "1gzfwkcm63fn41jls16c5sqxz28b0hrfpjhwsvvbwcfv40qxjhsg"; src = fetchFromGitHub { owner = "tazjin"; diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 51134e48c04..d57a48598e0 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8"; }; - cargoSha256 = "0g67s6n45rxvv1q5s7x5ajh5n16p68bhlsrsjp46qamrraz63d68"; + cargoSha256 = "1b6bcqbdkpxgxyfz89d8fhxfxvqc988pa9wxq5fsihnix8bm7jdk"; buildInputs = lib.optional stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index ef708ab9afe..6cf31c7835c 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32"; }; - cargoSha256 = "1yix40351yasg7mjmz7qwvwh1dq292dv47gy2a3bwkzhcn6whyjf"; + cargoSha256 = "1h66d1brx441bg7vzbqdish4avgmc6h7rrkw2qf1siwmplwqqhw0"; meta = with lib; { description = "Write licenses to stdout"; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 0c3e206a9f2..17491b645d4 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix"; }; - cargoSha256 = "0a3l580ca23vx8isd1qff870ci3p7wf4qrm53jl7nhfjh7rg5a4w"; + cargoSha256 = "0pk6hwmzs58vgbkvmlpa4s4cd29izp6xq17zaix5v2didbzr5ixi"; meta = with lib; { description = "UNIX's missing `loop` command"; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 212cc997e76..54b3b443d0a 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-r/Rllu+tgKqz+vkxA8BSN+3V0lUUd6dEATfickQp4+s="; }; - cargoSha256 = "sha256-ZK4kKdW+TqT0NXzB1wtQwJA78cVRxvEoqImOIqLldvM="; + cargoSha256 = "sha256-O8P29eYlHgmmAADZ/DgTBmj0ZOa+4u/Oee+TMF+/4Ro="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 55e2b75684e..6412eaa1f80 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.fish ''; - cargoSha256 = "sha256-JCV1cj+RncY/myVJTJ5fNkVqTITqGusA71tv7zGG9Uw="; + cargoSha256 = "sha256-7RKewz5jBS2HhHvXHBUWaQQ/wq9nryS9E+DqzBOVjPs="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 5dab2044973..a80fdd56864 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc="; }; - cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4="; + cargoSha256 = "sha256-Bn2FlRESuW83ouGPiBwvGkIB0uCDDG0hdhRfRBks/0Q="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix index b1042d3ae55..9d1d6d5abe6 100644 --- a/pkgs/tools/misc/page/default.nix +++ b/pkgs/tools/misc/page/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $completions_dir/_page ''; - cargoSha256 = "0s1iwli5h6qkibi24v80izr38z84zfx1dv71fv06lzq38b6s4nd5"; + cargoSha256 = "19ff5h8z34z15wdnd3mj8bwlqcixwbimys77gfjmzb3w1g9ivlks"; meta = with lib; { description = "Use neovim as pager"; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 81590e1dd45..08adb3c199d 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6"; + cargoSha256 = "1iamlp5519h8mmgd4964cvyp7mmnqdg2d3qj5v7yzilyp4nz15jc"; meta = with lib; { description = "An autojump \"zap to directory\" helper"; diff --git a/pkgs/tools/misc/peep/default.nix b/pkgs/tools/misc/peep/default.nix index 161ea3f75e6..6379f24649b 100644 --- a/pkgs/tools/misc/peep/default.nix +++ b/pkgs/tools/misc/peep/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./0001-Add-Cargo.lock-by-running-cargo-vendor.patch ]; - cargoSha256 = "15qc9a4zpnq7lbcaji1mkik93qkx366misczbi1mipiq5w7sgn0l"; + cargoSha256 = "12jqhvf8kdi17c442hl8sfpgxhni07x59khjwyyn54bnwc5h3zf9"; meta = with lib; { description = "The CLI text viewer tool that works like less command on small pane within the terminal window"; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 4e5a3476f53..a8f57bd78c4 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y"; }; - cargoSha256 = "0a41a6kgwgz4040c2369jldvk6xy6s6fkgayca0qy7hdwc4bcxdp"; + cargoSha256 = "1i29wps7wz6b0qarqqg8rplq7ak1zz83k6m182sjk17cni74n21l"; nativeBuildInputs = [ pkg-config file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/psw/default.nix b/pkgs/tools/misc/psw/default.nix index 09b9010bed6..c3d9b347ce1 100644 --- a/pkgs/tools/misc/psw/default.nix +++ b/pkgs/tools/misc/psw/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1nwmps3zw99lrz6k1j14w4rcm7yj8vhf4cs9wjfc3c1zfjibz9iz"; }; - cargoSha256 = "0a6hhangbx62nsyrfzbxjv7cg5c9d8wh83f02ay72gkf48sqy75h"; + cargoSha256 = "1y2am1bz68q7d9bn4264al13fv2j6a87bwrd60ycx0qak9fczlmv"; meta = with lib; { description = "A command line tool to write random bytes to stdout"; diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix index dc07e3dd4f4..ed15e81709d 100644 --- a/pkgs/tools/misc/rargs/default.nix +++ b/pkgs/tools/misc/rargs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd"; }; - cargoSha256 = "0qzkhx0n28f5wy4fral3adn499q3f10q71cd544s4ghqwqn4khc9"; + cargoSha256 = "18yd4dpzjyw6w1ms74pzxqyn5fkh8q4rsg6rqsp6bsz7300fxxvh"; doCheck=false; # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 88f4840e2f0..1f2d48b86ec 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1h8hfyxxl4bpx8azzxj0snmzccn6xjd9vc2iyp8i2ar7aiyhf5yd"; }; - cargoSha256 = "1bjkwn57vm3in8lajhm7p9fjwyqhmkrb3fyq1k7lqjvrrh9jysb2"; + cargoSha256 = "1ixjkb82863z160spylza2a5hk82x0c4wjjnzgakbzgrwv29pai3"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix index c4c496b978f..48e8667cc7e 100644 --- a/pkgs/tools/misc/shell-hist/default.nix +++ b/pkgs/tools/misc/shell-hist/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf"; }; - cargoSha256 = "0mfgax937na351qvi5n6s1ql9136djqiydzyfyax4684sp3kp613"; + cargoSha256 = "1b2cfs03vlaz7jnr67ilgjfi7cm59izpcdi6pyvbzv8s46z2dysp"; meta = with lib; { description = "Inspect your shell history"; diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index c8b0090375c..123dc715546 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s="; }; - cargoSha256 = "sha256-1sekLS+jhMeFJcW7pH/X8t28//xA+L54u81uKOo1kHE="; + cargoSha256 = "sha256-sUPOf9er+BOMqDJ8C6+Xjjqj6NQUV2JTzGA4yUWtDWM="; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 7909aaa1a72..63931914e94 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "vim" ]; - cargoSha256 = "0xh4f8c62kzj2fx7hyhdy13zhay13a6d2d7i9yz0n40dfgf70qx0"; + cargoSha256 = "1jk2vcm2z6r1xd6md98jzpcy7kdwp5p2fzxvvaz9qscyfnx28x17"; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index affea98ea55..1782e327f8a 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr"; }; - cargoSha256 = "0c2478c5gblvci0s68pv8386kxhs88dxzcpd2rq6l82bjn7yzymd"; + cargoSha256 = "0v5vkxr2sncw4r4pwvk0jbk4as7zwwfvjk2cpj9872zp07s35a77"; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index ba63ec290d4..f47a5808d06 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0y1c0v2zjpav1n72pgf3kpqdz6ixp2mjhcvvza4gzfp865c236nc"; }; - cargoSha256 = "06ljy213x9lhvqjysz9cjhrrg0ns07qkz27pxd8rih0mk6cck45g"; + cargoSha256 = "0ca6maapn2337i78mq97199xjqk87ckw14k8kspc8kx5wnics2hl"; meta = with lib; { description = "Tagref helps you refer to other locations in your codebase."; diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 358c3229563..985f2dccd68 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1f37qlw4nxdhlqlqzzb4j11gsv26abk2nk2qhbzj77kp4v2b125x"; }; - cargoSha256 = "0g5fjj677qzhw3nw7f3n5gghsj2y811bdclxpy8aq2n58gbwvhvc"; + cargoSha256 = "1rjnparpcn8rnqy43xl4gg151p1a0zj9sna600hz01r41g1hgccq"; buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 0e724059e99..307a472c73f 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; + cargoSha256 = "1lza3kc43581a09ss82bb5p0r74dy7si2x07cj4cb8dizl60b71v"; meta = with lib; { description = "Utility for easy management of Tensorflow containers"; diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index d60a65214b7..5db3998409e 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = ["--features" "bin"]; - cargoSha256 = "0nxm2k8dx6nxyghvpw44wqfd1n65947v2wqxxvy641hin4d7xzma"; + cargoSha256 = "08ip6x4kink244majlk595yh551c2ap3ry58wly994mh8wf6ifwb"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index ff0661de46a..6ea2ee0e225 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PPOsb9bne0q/WGAL3W2RGo/0yxyz/XXU3xYXKcCIqX0="; }; - cargoSha256 = "sha256-IirU/4hE+jo5A9pB7RnePhqcbCZXBCe0Ki6i7eEWIbk="; + cargoSha256 = "sha256-E5cURTLVVAUKygdbWUlptEsReodqw2GTAUNd21dkSvQ="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/tools/misc/tydra/default.nix index 00c8aa2a2c3..fd8e8e6ee5a 100644 --- a/pkgs/tools/misc/tydra/default.nix +++ b/pkgs/tools/misc/tydra/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1kvyski3qy2lwlpipynq894i0g9x2j4a1iy2mgdwfibfyfkv2jnm"; }; - cargoSha256 = "11l3fvym16wrrpm9vy4asmqdh8qynwjy0w4gx2bbcnc6300ag43a"; + cargoSha256 = "0handd5vxxvmlllzxhvwgadl4r7yc78f068r8jryprpap31azg3a"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/uwuify/default.nix b/pkgs/tools/misc/uwuify/default.nix index 849703ffd76..b276abf3e5c 100644 --- a/pkgs/tools/misc/uwuify/default.nix +++ b/pkgs/tools/misc/uwuify/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I="; }; - cargoSha256 = "sha256-iyoGLFIfHToOwqEb5lQ1nXR0W1gLOVMfvw39LX6ib+U="; + cargoSha256 = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index e131d8bd4e7..ef7bd00f0e1 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0m928hy2q8byfpm55nziiz86gcnhdnw3zpj78d8wx0pp318zjbla"; }; - cargoSha256 = "10xddr5cccc5cmhn4kwi27h3krmgapd7bqcp4rhjlbhdhsw7qxkx"; + cargoSha256 = "1sn1cq3kaswnz2z9q5h84qipp64ha7jv5kix31lm7v6nam0f5awz"; meta = with lib; { description = "A generator for LS_COLORS with support for multiple color themes"; diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index 18699e5911d..7057fed8ca1 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { # The tests are long-running and not that useful doCheck = false; - cargoSha256 = "0fnkcjxcsiw9j0ibh4z7zy0m6r5d84q5hvr2darwpckbn9ryrh3k"; + cargoSha256 = "1wh1yb02w5afghd19i2s0v8mq4lq20djsljrr44xciq68bqfdcp0"; meta = with lib; { description = "Terminal-based personal organizer"; diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index 8ed952a82ce..047f14ab432 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1646j0lgg3hhznifvbkvr672p3yqlcavswijawaxq7n33ll8vmcn"; }; - cargoSha256 = "16d1b3pamkg29nq80n6cbzc4zl9z3cgfvdxjkr2z4xrnzmkn1ysi"; + cargoSha256 = "10al0j8ak95x4d85lzphgq8kmdnb809l6gahfp5miyvsfd4dxmpi"; meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix index b130de94975..fadeec41031 100644 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ b/pkgs/tools/misc/xprite-editor/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; - cargoSha256 = "1a0zy8gfc1gdk8nnv5qr4yspqy1jsip5nql3w74rl6h46cplpf5y"; + cargoSha256 = "0z1ip667d1qwvm9md3zg8ib9jixpg7qj5ypwib7r2928h14yg7ck"; cargoBuildFlags = [ "--bin" "xprite-native" ]; diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix index b22dfc7e4cd..99a8193c6ca 100644 --- a/pkgs/tools/misc/xxv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3"; }; - cargoSha256 = "1gnyig87a0yqgkng52fpn6hv629vym6k7ydljnxrhb5phmj2qbqx"; + cargoSha256 = "0pmpvlmy4pw252is34r9af1ysrp78xs8pz8cw4rys9s4fh2hmhjb"; buildInputs = lib.optionals useNcurses [ ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index e3ef0f62ef0..233c57bc635 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n"; }; - cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02"; + cargoSha256 = "119szaighki565w28la6qg25s3cv8wviqin9f7f9w8x2rif3ipb3"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 00b35dc4192..a071b5b4a3a 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0b57c7z87xwrirmq9aa9jswqyj5bavkifmq7a9hgfphcmwcskmdb"; }; - cargoSha256 = "0bms93xg75b23ls2hb8dv26y4al4nr67pqcm57rp9d4rbsfafg8c"; + cargoSha256 = "1xn6scc8nrb9xk89hsp9v67jvyww23rjaq5fcagpbqdwf5dvg4ja"; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 157720651f4..f9747d4e0a0 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -18,7 +18,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn"; }; - cargoSha256 = "1k6mffcs9g0z5lh8hpflyharx6653cs1f2rjpldab0fc5fjmjfza"; + cargoSha256 = "0z6i9wzz5gy9rs8cxfmwg4mpfajv0xvj4nn6jfl7f1rw6k457jc9"; buildInputs = [ sqlite ]; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 4fe57eb4990..1374e4473c0 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; + cargoSha256 = "0zgzaq303zy8lymhldm6dpm5hwsxi2ph42zw5brvsdjmgm9ga0rb"; postInstall = '' installShellCompletion completions/dog.{bash,fish,zsh} diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 3be4707a529..f29a7ee705f 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "07zz0dj0wjwrc1rmayz7s8kpcv03i0ygl4vfwsam72qd4nf6v538"; }; - cargoSha256 = "1nbfbmm9v1yp7380zdzz7qrc7x6krwlvgn5x5yzb8yn1rc99jzx4"; + cargoSha256 = "04gj9gaysjcm2d81ds2raak847hr8w84jgfdwqd51wi8xm32w5jf"; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index a32e98ca18a..fb04ad2ff49 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0="; }; - cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o="; + cargoSha256 = "sha256-/QEytergBF/eAn1deOchoS0ib9tiax13CRtrwgrds1s="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 193a0b9e0fb..123ab3d76ee 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { sha256 = "0wk6n082gnj9xk46n542h1012h8gyhldca23bs7vl73g0534g878"; }; sourceRoot = "source/relay-rust"; - cargoSha256 = "0i7f52r697gjw30m8k60hd3y6wsn5lpz419r083a1rhpbinzd26q"; + cargoSha256 = "03r8ivsvmhi5f32gj4yacbyzanziymszya18dani53bq9zis9z31"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 33ea36da38a..af40a60777e 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-lApm1JLXNjDKLj6zj25OaZDVp7lLW3qyrDsvJrudl8I="; }; - cargoSha256 = "sha256-2PxhtAqROgufVGGH7VtEJJU6Sa2OrGbbMVRUWYbAD0Q="; + cargoSha256 = "sha256-d1NjPwT3YDp1U9JWeUejpWDbJonFlt5lYbUf7p3jVT0="; meta = with lib; { description = "Ping, but with a graph"; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index eacb598674d..2424018d885 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "1rpwzrr9bvw375vn97y5fqhraqz35d3ani9kfflvn2758x3g8gwf"; + cargoSha256 = "0r33vg9431jv32r03ryxb3rc4mp6h1kc00d3h1knssfvkwsh31yn"; postInstall = '' wrapProgram $out/bin/httplz \ diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 360c3572139..afccd8376d8 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg"; + cargoSha256 = "0q27p2hyw6c1fh5x8kwsrw8a1hk6z90z0z3w86ga8ryz53xg4vdi"; meta = with lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/tools/networking/rshijack/default.nix index e4bb7315a45..76a674dead0 100644 --- a/pkgs/tools/networking/rshijack/default.nix +++ b/pkgs/tools/networking/rshijack/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0y01hi3jpfawqlqs8ka0vwfhjw5j5gkhk2nz5m13ns2h27bw20v7"; }; - cargoSha256 = "0l1kavacnjvi22l6pawgkqqxnjaizi3pddqkhwjshw4pzzixzvli"; + cargoSha256 = "1rbp94wxr8kqjfg35hf44vn3qa0f0jcq8i50a8d0g5y2qf12h04d"; meta = with lib; { description = "TCP connection hijacker"; diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index 68b4859a5fb..13cf29c0dca 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk="; }; - cargoSha256 = "sha256-BUo3Y2tLvhOrk2w2GzYeWKpXH7TAOEdBI6vVtW2/cCs="; + cargoSha256 = "sha256-dxE1o7JqGvWwOtuhHgq0t9Zw1wQt5lt1OJJY992jjjA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 9d786d60b12..9f1ac89ce8e 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - cargoSha256 = "0v1hx6kjsmydx6ckjqj31y2gcpvax4mshwrniicplkka3q6hx9ra"; + cargoSha256 = "14mmfj5my8gbsdhlhz17w8wjcc085c6dkj78kwr2hhsbcxp1vjgg"; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 0b682fa97c1..5ed6aa632d3 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -23,7 +23,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "sha256-kCT2ulB+c2OlsABkyXyzrHfD/G92EPCdTO34FR5oSws="; + cargoSha256 = "sha256-J/0KO33vZmOvm6V7qCXInuAJTbRqyy5/qj6p6dEmoas="; meta = with lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index c1824334789..e750327e4ba 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1vvb619cq3n88y2s8lncwcyrhb5s4gpjfiyia91pilcpnfdb04y2"; }; - cargoSha256 = "0k0ig3dynj46kh8g7d6bljcaalmp40pvdbhbjmlxrmwnjq6bhzcq"; + cargoSha256 = "1pjd62yz7pavcinc96g2x0f5giadl9aqvz1i5vhfanh6mj6mrbl1"; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 7acdc2d7e9c..50908caf439 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "cOlya3ngIoaoqzh0fIbNAjwO7S7wZCQk7WVqgZona8A="; }; - cargoSha256 = "5B2fY+S9z6o+CHCIK93+Yj8dpaiQi4PSMQw1mfXg1NA="; + cargoSha256 = "sha256-jjC7G4JsLyj5LC29DBI996E+Ha/tVrcv7A95MmB7A08="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index 853bf87346f..acbb0be3b9c 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "0w6khry1ncyqy5h6996xw1f6viw4wdrfji5m8lz9gm487xlq5v0b"; }; - cargoSha256 = "0d4fz0rhqy1n30wfl2pmf76zpp21agr3h0hswp3r5bfnxqp6i54h"; + cargoSha256 = "05lcm5fzsn3h6dl2n2yq52r2vagrgmab08kafinz2kdcvv05wpk5"; # The BLAKE3 C library is intended to be built by the project depending on it # rather than as a standalone library. diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix index 353aafa2a7e..b0fba9d047a 100644 --- a/pkgs/tools/nix/nix-query-tree-viewer/default.nix +++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { gtk3 ]; - cargoSha256 = "1pbyi7knqmqxbpi3jhl492is9zkaxdpdnmbm11nqwc1nvvbjblzc"; + cargoSha256 = "1i9sjs77v1c3lch93pzjgr1zl0k1mlwkdpf3zfp13hyjn6zpldnj"; meta = with lib; { description = "GTK viewer for the output of `nix store --query --tree`"; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index d97a3d5bae3..ef5ddc528ab 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ]; - cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3"; + cargoSha256 = "1nv6g8rmjjbwqmjkrpqncypqvx5c7xp2zlx5h6rw2j9d1wlys0v5"; meta = with lib; { description = "Generate documentation for Nix functions"; diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index f1ea25e3bfd..b203d2992fb 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dqirvn8pq6ssxjlf6rkqcsx6ndasws93lz2v9f9s01k9ny8x8mq"; }; - cargoSha256 = "138aq64rb08s96q3xqcmvl3ax78rhjkwfa6v9iz8ywl32066gahb"; + cargoSha256 = "0mm79hfh8p1rs02pkpcv25p59b24q1rymwh11yxry4d4f12b6aw0"; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/pkgs/tools/nix/rnix-hashes/default.nix b/pkgs/tools/nix/rnix-hashes/default.nix index acdf230749c..4aebb35bc93 100644 --- a/pkgs/tools/nix/rnix-hashes/default.nix +++ b/pkgs/tools/nix/rnix-hashes/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoSha256 = "vaG+0t+XAckV9F4iIgcTkbIUurxdQsTCfOnRnrOKoRc="; + cargoSha256 = "sha256-p6W9NtOKzVViyFq5SQvnIsik7S3mqUqxI/05OiC+P+Q="; meta = with lib; { description = "Nix Hash Converter"; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 3cb5340d1d7..f9305d3e402 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-MsXNneKj2xCci1guj1TKcIrX7XByJ5/lWUmjxAsgzPY="; }; - cargoSha256 = "sha256-NdzgIB6uXMtGiLwOACEIeAb4iv7mYLnwRte3M/TkSMA="; + cargoSha256 = "sha256-ssAmY+o+/2+C9sol+PeFlpNwVuN5JNoofgkr3cUW+S4="; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index 682cfde78fa..af0424c5bec 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1cdmgdag9chjifsp2hxr9j15hb6l6anqq38y8srj1nk047a3kbcw"; }; - cargoSha256 = "1gjbvgpicy9n311qh9a5n0gdyd2rnc0b9zypnzk2ibn1pgaikafy"; + cargoSha256 = "15pf4x2aw8sl65g63cz4yv9y78yc2wi25h9khpqx6i7gyd7dxbsc"; meta = with lib; { description = "Cargo subcommand for building dependency graphs of Rust projects"; diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 78e428b5c7e..de5abca29be 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256:0fh1lq793k4ddpqsf2av447hcb74vcq53afkm3g4672k48mjjw1y"; }; - cargoSha256 = "1h1sy54p7zxijydnhzvkxli90d72biv1inni17licb0vb9dihmnf"; + cargoSha256 = "0ah3zjx36ibax4gi66g13finh4m2k0aidxkg2nxx1c2aqj847mm1"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix index 5bca56d993d..37fd43a1bcf 100644 --- a/pkgs/tools/package-management/cargo-graph/default.nix +++ b/pkgs/tools/package-management/cargo-graph/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5"; }; - cargoSha256 = "0fzj88iy57c39yi8pf3agfmsf2dck06f0yqmlnsaxvvp4cknkw1n"; + cargoSha256 = "0wyvly7aq4njlxnmgpfgbh08fxgqh85kw7d938pm6qxmj27zn4p2"; meta = with lib; { description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs"; diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/tools/package-management/cargo-kcov/default.nix index 8b2dbe3e489..c37a7306368 100644 --- a/pkgs/tools/package-management/cargo-kcov/default.nix +++ b/pkgs/tools/package-management/cargo-kcov/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br"; }; - cargoSha256 = "1dzm33cfriwgq4zvg6l6y76d5lp9hpcywdkwpl92qyjqg1hx8a1w"; + cargoSha256 = "0m5gfyjzzwd8wkbb388vmd785dy334x0migq3ssi7dlah9zx62bj"; doCheck = false; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix index ba461398e66..f5fcf37ac70 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/tools/package-management/cargo-license/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./add-Cargo.lock.patch ]; - cargoSha256 = "0bkaj54avvib1kipk8ky7gyxfs00qm80jd415zp53hhvinphzb5v"; + cargoSha256 = "1gda6m5g545fgx8ash96w408mxi5rb8hrv73c0xs0gx7hfyx5zcj"; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 7a900860110..7fb077344e4 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WWU+aNMNOOstHiGRE5nj2biWCL3uwyqJKgt0xCAfS0s="; }; - cargoSha256 = "sha256-G3UgcFW0WxvCYRvHCTuRpSCOT3XdvdZCN53HhpWQxS4="; + cargoSha256 = "sha256-W+/owW9Hl1cSBlfSN8Gea575tkjmZlwa5X6TCYyaLsM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 892de0ade27..425cef9353d 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.2.patch ]; - cargoSha256 = "150fpb7wyyxi40z4wai6c94mn84g700c2228316g6y8i07c8ix0d"; + cargoSha256 = "1viqdl8zncxyyxsd8xhx1jxqh24g03nn6fyi0iwwba5vvmif1rak"; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 735c940f18b..6b7f51d3ab6 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-lBCGSeEVxlXrn1RHqMEYSXLOehJw/DiL+33nx4+rV2Y="; }; - cargoSha256 = "sha256-QL71pJ5RBWRRse5DXwctMvu+z818jEEQjaNBXHLy20Y="; + cargoSha256 = "sha256-7LpUaOeBTIpi6A3cTRQAc1QostRgJp6bOf+AXy3mjyE="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 695cd2976d8..ae01601dde4 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "1xz3qngs8p0s62dq4d46c01z3k1vvgg856767g56b13c38pzfh28"; + cargoSha256 = "0xsy13yxm8vblab73gynb781ya168w66c32i1lyv0ns1lnz61dmh"; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 07d0e9f3a9d..a8a2c2242fd 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; - cargoSha256 = "0apdr9z18p6m4lfjv8k9zv2mqc7vssd2d536zfv1pns0pdqsfw50"; + cargoSha256 = "161lz96a52s53rhhkxxhcg41bsmh8w6rv6nl8gwqmg3biszy7hah"; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl curl ] diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix index 91f9a39514b..75f47d35ce2 100644 --- a/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "12g0sbgs2dfnk0agp1kagfi1yhk26ga98zygxxrjhjxrqb2n5w80"; }; - cargoSha256 = "0svnz9r0lrmz333qpbpdddjd46vh9i74qchws8aifa2qwnqy0kmn"; + cargoSha256 = "1wp8wdv25j8ybq2j04z3nl4yc95wkj5h740lzpyps08yaxj8bncr"; meta = with lib; { description = "Deploy software or an entire NixOS system configuration to another NixOS system"; diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 0ef3602c597..0345830fb9d 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; }; - cargoSha256 = "13y3b60xnry71999kygvkr29gkyjss3ga3rzb43ajah4qp90rsqs"; + cargoSha256 = "0hp31b5q4s6grkha2jz55945cbjkqdpvx1l8m49zv5prczhd7mz5"; meta = with lib; { description = "Make creating nix expressions easy"; diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index d36dfc8e18c..9cfc68146f9 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/b3sum"; - cargoSha256 = "0n8hp83hw7g260vmf4qcicpca75faam7k0zmb0k4cdzsar96gdrr"; + cargoSha256 = "18l6j756s6qfmiy3z2cai7i62wskf04xi7y4dlcv4aiv4sv3nx9r"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 5676e4005c1..cac9362bf02 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "139by5y2ma3v52nabzr5man1qy395rchs2dlivkj9xi829kg4mcr"; + cargoSha256 = "0vdi792bzqxj8g215r9r5anzs4qhqsm6sjzwpj1l9861bn7j4xsz"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index 26922c35f2d..1bc0d77878c 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; - cargoSha256 = "sha256-4VuM1bPkl9XCI9XsZIJvw3kHSKgT4P7x6I83F2KCFD0="; + cargoSha256 = "sha256-d6t/bvHpnH4lKv78tp/8DC/VrQBnaiZhnf8GrlcYhJw="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index b358507bbae..e726da34031 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "154kprbqc59f06ciz60il4ax299zapwa0hz8vjn25rl4gr5gzn4l"; }; - cargoSha256 = "1nc699n7f732lhzfhsfknay6z3igyiqy5jymm5x815mv9y1vwaj1"; + cargoSha256 = "1b9jqkg11d0ih46km063inqqjwfy1nrwb2xb3dagg3hi8hahpqpb"; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 0b3a94d816b..e1cd9ec359f 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-82Le0kdt/fnSQwsRRYHy4Jv9rsCPGf5dIWmoZE2cPxY="; }; - cargoSha256 = "sha256-nk4nrsePiUirVPoOPehCOf5ZoGVj3jy7PnSZENnpcaM="; + cargoSha256 = "sha256-sCauVxc6JPJ4dBi5LOt+v9bdlRW+oF4cd/sfG5Xdv70="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 4cdc3f6d89e..cc2765bd707 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -14,7 +14,7 @@ buildRustPackage rec { patches = [ ./fix-tests.patch ]; - cargoSha256 = "1wpn67v0xmxhn1dgzhh1pwz1yc3cizmfxhpb7qv9b27ynx4486ji"; + cargoSha256 = "1sv5czhrafk15yj5xyd1x9jdqn1dz6aqpxxnyz49icx53qlg9f8g"; cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 80cc8c8cc1f..adf514006b1 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fdbsz1v7bb5dm3zqjs1qf73lb1m4qzkqyb3h3hbyrp9vklgxsgw"; }; - cargoSha256 = "039xarscwqndpyrr3sgzkhqna3c908zh06id8x2qaykm8l248zs9"; + cargoSha256 = "0658jbx59qrsgpfczzlfrbp2qm7kh0c5561bsxzmgiri7fcz9w0n"; postPatch = '' substituteInPlace src/main.rs \ diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 35fc6e278b8..2998c6469fd 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0zavkf0grkqljyiywcprsiv8igidk8vc3yfj3fzqvbhm43vnnbdw"; }; - cargoSha256 = "172f0gsy5hssrqv0l1np3c0qd1ayp6nqbpqmgwrkc4l37y5fn232"; + cargoSha256 = "0zv6mnjbp44vp85rw4l1nqk4yb7dzqp031r8rgqq2avbnq018yhk"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 1577b476401..93b7eb0ecbe 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-vnSpItch9RDUyYxERKRwYPmRLwRG9gAI7iIY+7iRs1w="; }; - cargoSha256 = "sha256-1QqNI7rdH5wb1Zge8gkJtzg2Hgd/Vk9DAU9ULk/5wiw="; + cargoSha256 = "sha256-qgOZxuzAeDgT93TccfnVTj3OQzalHfude0ETTVMM2Pk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 29c1d6376fe..0f7be5eb447 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "sha256-4oH1A88Qn0c6hkE/1b6mTrEIph8xT98j+DkP9/5JALs="; + cargoSha256 = "sha256-EYgfU7DVqboI3YMqYY5N89Rzltm5CHSZHJP/znGehxw="; doCheck = false; diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index cb48a48ff49..4253ff3e7c9 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-2cP3kZnjlMmN3nWRPh1M+hk+dyssGNpJjlluDsm702g="; }; - cargoSha256 = "sha256-JFDtmi10iCK66/2ovg8tGAgGDW8Y4b5IYkSbDqu0PmQ="; + cargoSha256 = "sha256-xxYfaGhAtLESpy4gdE3IjE29W+DGnI1ed020mxjT3TI="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index a29e1630116..2c1baa24f6f 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7"; }; - cargoSha256 = "19ccylnmmlm2d8kc178cffpjwrjlia6b4v3nzvxcs81a396ymr7b"; + cargoSha256 = "19mk0hl7cr5qb3r64zi0hcsn4yqbg8c3g2f9jywm0g2c13ak36li"; meta = with lib; { description = "CLI tool to manage POSIX message queues"; diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index 01590db0fd0..85b4f9fe2ac 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1r84xzv3p0ml3wac2j7j5fkm7i93v2xvadb8f8al5wi57q39irj7"; }; - cargoSha256 = "1nbfgz7njc10b0abs6zwi6wzhlwllps3wah6abc1mj5yhrzwccmh"; + cargoSha256 = "1f7yhnbgccqmz8hpc1xdv97j53far6d5p5gqvq6xxaqq9irf9bgj"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 3a7f8a55a12..8fc9637bfb9 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax"; }; - cargoSha256 = "16s7swv2sp15gry1j1pcyz29cspvafczaf4v02x4fd2jbn2y3f6r"; + cargoSha256 = "0c2mk2bcz4qjyqmf11yqhnhy4pqxr77b3c1gvr5jfmjshx4ff7v2"; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix index 66441d73713..f9f5736015b 100644 --- a/pkgs/tools/text/angle-grinder/default.nix +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE="; }; - cargoSha256 = "sha256-NkghuZHNT3Rq2wqiyKzjP+u9ZpeHU5H6oBLS0oQ7LcU="; + cargoSha256 = "sha256-LJ7zudUeso28zJqLhqWGWqf+L4o75rJjtTx9BpWKRIE="; meta = with lib; { description = "Slice and dice logs on the command line"; diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index e5a1bc9c2a0..c8d1b1064ac 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1pyda3b6svxzc98d7ggl7v9xd0xhilmpjrnajzh77zcwzq42s17l"; }; - cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5"; + cargoSha256 = "0ywywbcnc9jm0cfd6kbq8vl6r5dl16sxn7pwi2k6l0sj75pm1i6h"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index 7816f79649c..05b32512687 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j"; }; - cargoSha256 = "1p18926pfff1yayb2i28v0nz37j52hqqv7244yfrzgidi29kyvbc"; + cargoSha256 = "1fdcz7vnmrw92y7bx49napi7j2jjc41liz5k63kbijfwqnaaiswy"; meta = with lib; { description = "A human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 5dcf6f3da47..8391b75a67b 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1piz0l7qdcvjzfykm6rzqc8s1daxp3cj3923v9cmm41bc2v0p5q0"; }; - cargoSha256 = "1w0q5w0bf1682jvzcml8cgmr9mrgi4if0p63wzchyjav330dp6pk"; + cargoSha256 = "08l01ivmln9gwabwa1p0gk454qyxlcpnlxx840vys476f4pw7vvf"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 78baa32630b..a77a5dc081e 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; - cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa"; + cargoSha256 = "05rfjangmyvmqm0bvl4bcvc7m4zhg66gknh85sxr3bzrlwzacwgw"; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/each/default.nix b/pkgs/tools/text/each/default.nix index a1d14ed2110..0218cf5dde2 100644 --- a/pkgs/tools/text/each/default.nix +++ b/pkgs/tools/text/each/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "04rx8jf871l4darfx6029dhpnbpmzwjgzazayp1qcaadsk8207z5"; }; - cargoSha256 = "1rcmymjff9sc0dv4zplklivfws14wqx6q4ky47arg6jkj3dyprp8"; + cargoSha256 = "1r7nzfh7v2mlp0wdrcpqfj68h3zmip2m3d4z2nwxyikmw7c80car"; meta = with lib; { description = " A better way of working with structured data on the command line"; diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix index 738fd69dc64..99c90400522 100644 --- a/pkgs/tools/text/fst/default.nix +++ b/pkgs/tools/text/fst/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ]; cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "0svn2gzipslz939396rcydqx3i1x07l7acas7fhql12n59n2yrxw"; + cargoSha256 = "0440p0hb3nlq9wwk3zac9dldanslrddvqn4gib0vl7aikxkcvh4l"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 838cdf075bd..baa5f5988bf 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-51S4I1YIbdgXkhuT7KnhJe71nGCQmr9JmuGtp7Bcxqo="; }; - cargoSha256 = "sha256-2kBJcImytsSd7Q0kj1bsP/NXxyy2Pr8gHb8iNf6h3/4="; + cargoSha256 = "sha256-4bYLrmyI7cPUes6DYREiIB9gDze0KO2jMP/jPzvWbwQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index f6752938d46..6f6750b1b02 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-mnDUIJhEGNoh3eq2Vhww1T/tpZh9RP+RxbRsBNrpOzw="; + cargoSha256 = "sha256-y9yg4EQDL+RcD6NI7n6W/Hi6Tw4Wr1Kf6hbcIuidIf4="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 0b324a0a772..0fc39b8da28 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1wjpgi7m3lxybllkr3r60zaphp02ykq2syq72q9ail2760cjcir6"; }; - cargoSha256 = "0arwxqrpxdws4q1pnqzqkp1yv5aas08lkzh1vcgmf26j58sycniy"; + cargoSha256 = "1l71xj5crfb51wfp2bdvdqp1l8kg182n5d6w23lq2wjszaqcj7cw"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 61c24ae39e4..ca337deec93 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps"; }; - cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; + cargoSha256 = "1nyfxma2vwfq6r614ng8qq8vanb540a5z0ibs85wz5sjm3hp1l4f"; cargoBuildFlags = lib.optional withPCRE2 "--features pcre2"; diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 3af039ccdae..2f9249711ed 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q"; }; - cargoSha256 = "0wrv4k63pc1v0apmxmmci9qaykcv9ig3nfxy6id5caqrckp73cr4"; + cargoSha256 = "0z1i1yfj1wdzbzapnvfr9ngn9z30xwlkrfhz52npbirysy1al5xk"; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index a3290aff211..1536e72ad29 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0c5bsqs6c55x4j640vhzlmbiylhp5agr7lx0jrwcjazfyvxihc01"; }; - cargoSha256 = "1mksmdp1wnsjd8gw1g3l16a24fk05xa9mxygc0qklr41bqf8kw8b"; + cargoSha256 = "1iwgy9zzdxay6hb9pz47jchy03jrsy5csxijlq4i228qhqnvq1lr"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/tools/text/uwc/default.nix index cf8e5658f76..14fe74723a3 100644 --- a/pkgs/tools/text/uwc/default.nix +++ b/pkgs/tools/text/uwc/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1ywqq9hrrm3frvd2sswknxygjlxi195kcy7g7phwq63j7hkyrn50"; }; - cargoSha256 = "0ra62cf75b1c4knxxpbdg8m0sy2k02r52j606fp5l9crp0fml8l0"; + cargoSha256 = "04pslga3ff766cpb73n6ivzmqfa0hm19gcla8iyv6p59ddsajh3q"; doCheck = true; diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index 026218b00e1..303b38d65c2 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045"; }; - cargoSha256 = "1q59nvklh5r2mrsz656z6js3j2l6rqyhfz6l0yq28df5kyahk91b"; + cargoSha256 = "1bh60zgflaa5n914irkr4bpq3m4h2ngcj6bp5xx1qj112dwgvmyb"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 1145fabf486..ba722837026 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XQ3KRM12X80JPFMnQs//8ZJEv+AV1sr3BH0Nw/PH0HQ="; }; - cargoSha256 = "sha256-YOg4W933qUBcvo2y3nmvEWqxTfqWKDi3GCoTJWLnXxk="; + cargoSha256 = "sha256-930tFAKMCmTFS9faIWLSVtWN/gAA9UAUMuRo61XISYA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/typesetting/tex/tex-match/default.nix b/pkgs/tools/typesetting/tex/tex-match/default.nix index 4d02e2e1acf..65bfcd02d78 100644 --- a/pkgs/tools/typesetting/tex/tex-match/default.nix +++ b/pkgs/tools/typesetting/tex/tex-match/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 ]; - cargoSha256 = "1sm2fd3dhs59rvmfjzrfz0qwqzyc9dllb8ph0wc2x0r3px16c71x"; + cargoSha256 = "13ihwrckpsb4j1ai923vh151frw0yriwg9yylj9lk0ycps51y1sn"; meta = with lib; { description = "Search through over 1000 different LaTeX symbols by sketching. A desktop version of detexify"; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 16699e15ba6..8c409eb531b 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1j92prjyr86wyx58h10xq9c9z28ky86h291x65w7qrxpj658aiz1"; + cargoSha256 = "0miq6iiywwbxm6k0alnqg6bnd14pwc8vl9d8fgg6c0vjlfy5zhlb"; nativeBuildInputs = [ nasm cargo-c ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; -- cgit 1.4.1 From cc60f81e69154789ad3e23f0ec60110ed3f7aece Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 14 May 2021 17:27:25 +0200 Subject: writeDirectReferencesToFile: init --- doc/builders/trivial-builders.chapter.md | 21 ++++++++++++++ pkgs/build-support/trivial-builders.nix | 29 ++++++++++++++++++++ pkgs/build-support/trivial-builders/test.nix | 20 ++++++++++++++ pkgs/build-support/trivial-builders/test.sh | 41 ++++++++++++++++++++++++++++ pkgs/test/default.nix | 2 ++ 5 files changed, 113 insertions(+) create mode 100644 pkgs/build-support/trivial-builders/test.nix create mode 100755 pkgs/build-support/trivial-builders/test.sh (limited to 'pkgs/test') diff --git a/doc/builders/trivial-builders.chapter.md b/doc/builders/trivial-builders.chapter.md index 32944567c05..432183eaf0f 100644 --- a/doc/builders/trivial-builders.chapter.md +++ b/doc/builders/trivial-builders.chapter.md @@ -50,3 +50,24 @@ Many more commands wrap `writeTextFile` including `writeText`, `writeTextDir`, ` ## `symlinkJoin` {#trivial-builder-symlinkJoin} This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. + +## `writeDirectReferencesToFile` {#trivial-builder-writeDirectReferencesToFile} + +Writes the set of references to the output file, that is, their immediate dependencies. + +This produces the equivalent of `nix-store -q --references`. + +For example, + +```nix +writeDirectReferencesToFile (writeScriptBin "hi" ''${hello}/bin/hello'') +``` + +produces an output path `/nix/store/-runtime-references` containing + +```nix +/nix/store/-hello-2.10 +``` + +but none of `hello`'s dependencies, because those are not referenced directly +by `hi`'s output. diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 142a04f9a10..0bf67d21b3b 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -438,6 +438,35 @@ rec { done < graph ''; + /* + Write the set of references to a file, that is, their immediate dependencies. + + This produces the equivalent of `nix-store -q --references`. + */ + writeDirectReferencesToFile = path: runCommand "runtime-references" + { + exportReferencesGraph = ["graph" path]; + inherit path; + } + '' + touch ./references + while read p; do + read dummy + read nrRefs + if [[ $p == $path ]]; then + for ((i = 0; i < nrRefs; i++)); do + read ref; + echo $ref >>./references + done + else + for ((i = 0; i < nrRefs; i++)); do + read ref; + done + fi + done < graph + sort ./references >$out + ''; + /* Print an error message if the file with the specified name and * hash doesn't exist in the Nix store. This function should only diff --git a/pkgs/build-support/trivial-builders/test.nix b/pkgs/build-support/trivial-builders/test.nix new file mode 100644 index 00000000000..0902a537222 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test.nix @@ -0,0 +1,20 @@ +{ lib, nixosTest, path, writeText, hello, figlet, stdenvNoCC }: + +nixosTest { + name = "nixpkgs-trivial-builders"; + nodes.machine = { ... }: { + virtualisation.writableStore = true; + + # Test runs without network, so we don't substitute and prepare our deps + nix.binaryCaches = lib.mkForce []; + environment.etc."pre-built-paths".source = writeText "pre-built-paths" ( + builtins.toJSON [hello figlet stdenvNoCC] + ); + }; + testScript = '' + machine.succeed(""" + cd ${lib.cleanSource path} + ./pkgs/build-support/trivial-builders/test.sh 2>/dev/console + """) + ''; +} diff --git a/pkgs/build-support/trivial-builders/test.sh b/pkgs/build-support/trivial-builders/test.sh new file mode 100755 index 00000000000..eec501ae601 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# -------------------------------------------------------------------------- # +# +# trivial-builders test +# +# -------------------------------------------------------------------------- # +# +# This file can be run independently (quick): +# +# $ pkgs/build-support/trivial-builders/test.sh +# +# or in the build sandbox with a ~20s VM overhead +# +# $ nix-build -A tests.trivial-builders +# +# -------------------------------------------------------------------------- # + +# strict bash +set -euo pipefail + +# debug +# set -x +# PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' + +cd "$(dirname ${BASH_SOURCE[0]})" # nixpkgs root + +testDirectReferences() { + expr="$1" + diff -U3 \ + <(sort <$(nix-build --no-out-link --expr "with import ../../.. {}; writeDirectReferencesToFile ($expr)")) \ + <(nix-store -q --references $(nix-build --no-out-link --expr "with import ../../.. {}; ($expr)") | sort) +} + +testDirectReferences 'hello' +testDirectReferences 'figlet' +testDirectReferences 'writeText "hi" "hello"' +testDirectReferences 'writeText "hi" "hello ${hello}"' +testDirectReferences 'writeText "hi" "hello ${hello} ${figlet}"' + +echo 'OK!' diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 89656dde292..b9f05bdff8d 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -50,5 +50,7 @@ with pkgs; cuda = callPackage ./cuda { }; + trivial = callPackage ../build-support/trivial-builders/test.nix {}; + writers = callPackage ../build-support/writers/test.nix {}; } -- cgit 1.4.1 From 166948d4794be5c56c6279bf580ac416b1bcf022 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sat, 22 May 2021 13:55:47 +0200 Subject: cc-wrapper: don't set rpath on static-pie executables --- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 33 ++++++++++++--------- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 15 +++++----- pkgs/build-support/wrapper-common/utils.bash | 35 +++++++++++++++++++++++ pkgs/test/cc-wrapper/default.nix | 3 +- 4 files changed, 62 insertions(+), 24 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index e54dd6f4714..58ddc2aee90 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -20,15 +20,23 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi -setDynamicLinker=1 # Optionally filter out paths not refering to the store. expandResponseParams "$@" + +# NIX_LINK_TYPE is set if ld has been called through our cc wrapper +if [[ -n "${NIX_LINK_TYPE_@suffixSalt@:-}" ]]; then + linkType=$NIX_LINK_TYPE_@suffixSalt@ +else + linkType=$(checkLinkType "$@") +fi + if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" - && ( -z "$NIX_IGNORE_LD_THROUGH_GCC_@suffixSalt@" || -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ) ]]; then + && ( -z "$NIX_IGNORE_LD_THROUGH_GCC_@suffixSalt@" || -z "${NIX_LINK_TYPE_@suffixSalt@:-}" ) ]]; then rest=() nParams=${#params[@]} declare -i n=0 + while (( "$n" < "$nParams" )); do p=${params[n]} p2=${params[n+1]:-} # handle `p` being last one @@ -48,11 +56,6 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" # Our ld is not built with sysroot support (Can we fix that?) : else - if [[ "$p" = -static || "$p" = -static-pie ]]; then - # Using a dynamic linker for static binaries can lead to crashes. - # This was observed for rust binaries. - setDynamicLinker=0 - fi rest+=("$p") fi n+=1 @@ -61,22 +64,24 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" params=(${rest+"${rest[@]}"}) fi + source @out@/nix-support/add-hardening.sh extraAfter=() extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) -if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then - extraAfter+=($NIX_LDFLAGS_@suffixSalt@) - extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) +if [ -z "${NIX_LINK_TYPE_@suffixSalt@:-}" ]; then + extraAfter+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@)) + extraBefore+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@)) + # By adding dynamic linker to extraBefore we allow the users set their # own dynamic linker as NIX_LD_FLAGS will override earlier set flags - if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@") fi fi -extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) +extraAfter+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_AFTER_@suffixSalt@)) # These flags *must not* be pulled up to -Wl, flags, so they can't go in # add-flags.sh. They must always be set, so must not be disabled by @@ -173,7 +178,7 @@ do prev="$p" done -if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then +if [[ "$link32" == "1" && "$linkType" == dynamic && -e "@out@/nix-support/dynamic-linker-m32" ]]; then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=( @@ -183,7 +188,7 @@ if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynami fi # Add all used dynamic libraries to the rpath. -if [ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 ]; then +if [[ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 && "$linkType" != static-pie ]]; then # For each directory in the library search path (-L...), # see if it contains a dynamic library used by a -l... flag. If # so, add the directory to the rpath. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 2e62aef4604..aa25de33641 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -29,9 +29,10 @@ cc1=0 cxxInclude=1 cxxLibrary=1 cInclude=1 -setDynamicLinker=1 expandResponseParams "$@" +linkType=$(checkLinkType "$@") + declare -i n=0 nParams=${#params[@]} while (( "$n" < "$nParams" )); do @@ -60,8 +61,6 @@ while (( "$n" < "$nParams" )); do cxxInclude=0 elif [ "$p" = -nostdinc++ ]; then cxxInclude=0 - elif [[ "$p" = -static || "$p" = -static-pie ]]; then - setDynamicLinker=0 elif [[ "$p" != -?* ]]; then # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 @@ -151,24 +150,24 @@ if [ "$dontLink" != 1 ]; then # Add the flags that should only be passed to the compiler when # linking. - extraAfter+=($NIX_CFLAGS_LINK_@suffixSalt@) + extraAfter+=($(filterRpathFlags "$linkType" $NIX_CFLAGS_LINK_@suffixSalt@)) # Add the flags that should be passed to the linker (and prevent # `ld-wrapper' from adding NIX_LDFLAGS_@suffixSalt@ again). - for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@); do extraBefore+=("-Wl,$i") done - if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") fi - for i in $NIX_LDFLAGS_@suffixSalt@; do + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@); do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") else extraAfter+=("-Wl,$i") fi done - export NIX_LDFLAGS_SET_@suffixSalt@=1 + export NIX_LINK_TYPE_@suffixSalt@=$linkType fi # As a very special hack, if the arguments are just `-v', then don't diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index 66b7c3f3e83..a0e32252020 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -123,3 +123,38 @@ expandResponseParams() { fi done } + +checkLinkType() { + local arg mode + type="dynamic" + for arg in "$@"; do + if [[ "$arg" = -static ]]; then + type="static" + elif [[ "$arg" = -static-pie ]]; then + type="static-pie" + fi + done + echo "$type" +} + +# When building static-pie executables we cannot have rpath +# set. At least glibc requires rpath to be empty +filterRpathFlags() { + local linkType=$1 ret="" i + shift + + if [[ "$linkType" == "static-pie" ]]; then + while [[ "$#" -gt 0 ]]; do + i="$1"; shift 1 + if [[ "$i" == -rpath ]]; then + # also skip its argument + shift + else + ret+="$i " + fi + done + else + ret=$@ + fi + echo $ret +} diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index d82ba296e2f..b483372dea0 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -35,8 +35,7 @@ in stdenv.mkDerivation { printf "checking whether compiler builds valid static C binaries... " >&2 $CC ${staticLibc} -static -o cc-static ${./cc-main.c} ./cc-static - # our glibc does not have pie enabled yet. - ${lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + ${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") '' printf "checking whether compiler builds valid static pie C binaries... " >&2 $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ./cc-static-pie -- cgit 1.4.1 From 7836469dbe40783c640e2c0fafd2e55248ffea31 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 21 May 2021 12:48:43 +0200 Subject: neovimUtils: makeNeovimConfig accepts plugins/customRc mimics home-manager interface and makes it easier to associate configs with plugins. Added a test as well. --- pkgs/applications/editors/neovim/utils.nix | 40 +++++++++++++++++++++++++++--- pkgs/misc/vim-plugins/vim-utils.nix | 13 +++++----- pkgs/test/vim/default.nix | 35 ++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 12 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 3e6e88dd228..a7d8f00c664 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -29,6 +29,11 @@ let , withNodeJs ? false , withRuby ? true + # expects a list of plugin configuration + # expects { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } + , plugins ? [] + # forwarded to configure.customRC + , customRC ? "" # same values as in vimUtils.vimrcContent , configure ? { } @@ -44,7 +49,33 @@ let ''; }; - requiredPlugins = vimUtils.requiredPlugins configure; + # transform all plugins into an attrset + pluginsNormalized = map (x: if x ? plugin then { optional = false; } // x else { plugin = x; optional = false;}) plugins; + + + configurePatched = configure // { + packages.nix = { + start = lib.filter (f: f != null) + (map (x: if x.optional == false then x.plugin else null) + pluginsNormalized); + opt = lib.filter (f: f != null) + (map (x: if x.optional == true then x.plugin else null) + pluginsNormalized); + }; + customRC = pluginRc + customRC; + }; + + # A function to get the configuration string (if any) from an element of 'plugins' + pluginConfig = p: + if (p.config or "") != "" then '' + " ${p.plugin.pname or p.plugin.name} {{{ + ${p.config} + " }}} + '' else ""; + + pluginRc = lib.concatMapStrings pluginConfig pluginsNormalized; + + requiredPlugins = vimUtils.requiredPlugins configurePatched; getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; @@ -89,12 +120,13 @@ let "--suffix" "PATH" ":" binPath ]; - manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; }); - neovimRcContent = vimUtils.vimrcContent configure; + + manifestRc = vimUtils.vimrcContent (configurePatched // { customRC = ""; }) ; + neovimRcContent = vimUtils.vimrcContent configurePatched; in assert withPython2 -> throw "Python2 support has been removed from neovim, please remove withPython2 and extraPython2Packages."; - args // { + builtins.removeAttrs args ["plugins"] // { wrapperArgs = makeWrapperArgs; inherit neovimRcContent; inherit manifestRc; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 210e2aee5e3..52bf4341fa5 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -232,8 +232,7 @@ let let /* pathogen mostly can set &rtp at startup time. Its used very commonly. */ - pathogenImpl = lib.optionalString (pathogen != null) - (let + pathogenImpl = let knownPlugins = pathogen.knownPlugins or vimPlugins; plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); @@ -248,11 +247,11 @@ let execute pathogen#infect('${pluginsEnv}/{}') filetype indent plugin on | syn on - ''); + ''; /* vim-plug is an extremely popular vim plugin manager. */ - plugImpl = lib.optionalString (plug != null) + plugImpl = ('' source ${vimPlugins.vim-plug.rtp}/plug.vim call plug#begin('/dev/null') @@ -340,10 +339,12 @@ let entries = [ beforePlugins - vamImpl pathogenImpl plugImpl + vamImpl (nativeImpl packages) customRC - ]; + ] + ++ lib.optional (pathogen != null) pathogenImpl + ++ lib.optional (plug != null) plugImpl; in lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries); diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 4ca004a60c3..9128e1bcb11 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,14 +1,45 @@ -{ vimUtils, vim_configurable, neovim, vimPlugins -, lib, fetchFromGitHub, +{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable +, neovim-unwrapped }: let inherit (vimUtils) buildVimPluginFrom2Nix; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; + + plugins = with vimPlugins; [ + { + plugin = vim-obsession; + config = '' + map $ Obsession + ''; + } + ]; + + nvimConfNix = neovimUtils.makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + wrapNeovim = suffix: config: + wrapNeovimUnstable neovim-unwrapped (config // { + extraName = suffix; + wrapperArgs = lib.escapeShellArgs (config.wrapperArgs ++ + ["--add-flags" "-u ${writeText "init.vim" config.neovimRcContent}"] + ); + }); in { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; + ### neovim tests + ##############3 + nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + + ### vim tests + ##############3 vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; -- cgit 1.4.1 From 4a860879ea76c2be86a696cb885cc51bfe8f61fa Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 25 May 2021 22:37:57 +0200 Subject: wrapNeovimUnstable: accept a wrapRc boolean additional argument not generated by makeNeovimConfig If true (the default), appends "-u " to the wrapped arguments. Set to false if you want to control where to save the generated config (e.g., in ~/.config/init.vim or project/.nvimrc) --- pkgs/applications/editors/neovim/wrapper.nix | 24 +++++++++++++++++------- pkgs/test/vim/default.nix | 8 +++----- 2 files changed, 20 insertions(+), 12 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 1feb21387ea..4defc2d4327 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -12,8 +12,8 @@ neovim: let wrapper = { extraName ? "" - # should contain all args but the binary - , wrapperArgs ? "" + # should contain all args but the binary. Can be either a string or list + , wrapperArgs ? [] , manifestRc ? null , withPython2 ? false , withPython3 ? true, python3Env ? null @@ -21,10 +21,18 @@ let , rubyEnv ? null , vimAlias ? false , viAlias ? false + + # additional argument not generated by makeNeovimConfig + # it will append "-u " to the wrapped arguments + # set to false if you want to control where to save the generated config + # (e.g., in ~/.config/init.vim or project/.nvimrc) + , wrapRc ? true , ... - }: + }@args: let + wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; + # If configure != {}, we can't generate the rplugin.vim file with e.g # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in # the wrapper. That's why only when configure != {} (tested both here and @@ -32,8 +40,10 @@ let # wrapper with most arguments we need, excluding those that cause problems to # generate rplugin.vim, but still required for the final wrapper. finalMakeWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ - [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]; + [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] + ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] + ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" args.neovimRcContent}" ] + ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; @@ -67,7 +77,7 @@ let in '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim - makeWrapper ${lib.escapeShellArgs manifestWrapperArgs} ${wrapperArgs} + makeWrapper ${lib.escapeShellArgs manifestWrapperArgs} ${wrapperArgsStr} # Some plugins assume that the home directory is accessible for # initializing caches, temporary files, etc. Even if the plugin isn't @@ -97,7 +107,7 @@ let '') + '' rm $out/bin/nvim - makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgs} + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} ''; paths = [ neovim ]; diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 9128e1bcb11..c75836aa9a8 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -26,20 +26,18 @@ let wrapNeovim = suffix: config: wrapNeovimUnstable neovim-unwrapped (config // { extraName = suffix; - wrapperArgs = lib.escapeShellArgs (config.wrapperArgs ++ - ["--add-flags" "-u ${writeText "init.vim" config.neovimRcContent}"] - ); + wrapRc = true; }); in { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; ### neovim tests - ##############3 + ################## nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; ### vim tests - ##############3 + ################## vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; -- cgit 1.4.1 From d3769e43c34fe16a263938c584e6cdc92b18f6d5 Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Sat, 8 May 2021 11:33:29 +0200 Subject: rustPlatform.importCargoLock: add test cases for importCargoLock --- .../rust/test/import-cargo-lock/basic/Cargo.lock | 83 +++ .../rust/test/import-cargo-lock/basic/Cargo.toml | 8 + .../rust/test/import-cargo-lock/basic/default.nix | 18 + .../rust/test/import-cargo-lock/basic/src/main.rs | 9 + .../rust/test/import-cargo-lock/default.nix | 8 + .../git-dependency-no-rev/Cargo.lock | 79 +++ .../git-dependency-no-rev/Cargo.toml | 8 + .../git-dependency-no-rev/default.nix | 21 + .../git-dependency-no-rev/src/main.rs | 9 + .../import-cargo-lock/git-dependency/Cargo.lock | 79 +++ .../import-cargo-lock/git-dependency/Cargo.toml | 8 + .../import-cargo-lock/git-dependency/default.nix | 21 + .../import-cargo-lock/git-dependency/src/main.rs | 9 + .../rust/test/import-cargo-lock/maturin/Cargo.lock | 682 +++++++++++++++++++++ .../test/import-cargo-lock/maturin/default.nix | 43 ++ pkgs/test/default.nix | 1 + 16 files changed, 1086 insertions(+) create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix (limited to 'pkgs/test') diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock new file mode 100644 index 00000000000..fd1b5e42ad3 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock @@ -0,0 +1,83 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "basic" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml new file mode 100644 index 00000000000..f555bb0de62 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "basic" +version = "0.1.0" +authors = ["Daniël de Kok "] +edition = "2018" + +[dependencies] +rand = "0.8" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix new file mode 100644 index 00000000000..d595b58109a --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix @@ -0,0 +1,18 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "basic"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/basic + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs new file mode 100644 index 00000000000..50b4ed799e4 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/default.nix new file mode 100644 index 00000000000..2dd525a8ac3 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -0,0 +1,8 @@ +{ callPackage }: + +{ + basic = callPackage ./basic { }; + gitDependency = callPackage ./git-dependency { }; + gitDependencyNoRev = callPackage ./git-dependency-no-rev { }; + maturin = callPackage ./maturin { }; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock new file mode 100644 index 00000000000..54b9c7c5739 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock @@ -0,0 +1,79 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "git-dependency-no-rev" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.3" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml new file mode 100644 index 00000000000..770dfb86f52 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "git-dependency-no-rev" +version = "0.1.0" +authors = ["Daniël de Kok "] +edition = "2018" + +[dependencies] +rand = { git = "https://github.com/rust-random/rand.git" } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix new file mode 100644 index 00000000000..fc36edc4077 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix @@ -0,0 +1,21 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "git-dependency-no-rev"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; + }; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/git-dependency-no-rev + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs new file mode 100644 index 00000000000..50b4ed799e4 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock new file mode 100644 index 00000000000..50600ef4caa --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock @@ -0,0 +1,79 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "git-dependency" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.3" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.1" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml new file mode 100644 index 00000000000..11ee8b1763e --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "git-dependency" +version = "0.1.0" +authors = ["Daniël de Kok "] +edition = "2018" + +[dependencies] +rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix new file mode 100644 index 00000000000..17276c5f5c3 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix @@ -0,0 +1,21 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "git-dependency"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; + }; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/git-dependency + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs new file mode 100644 index 00000000000..50b4ed799e4 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock new file mode 100644 index 00000000000..5e698d4ff73 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock @@ -0,0 +1,682 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "assert_approx_eq" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "byteorder" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "const_fn" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" + +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +dependencies = [ + "cfg-if", + "const_fn", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +dependencies = [ + "autocfg", + "cfg-if", + "lazy_static", +] + +[[package]] +name = "ctor" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "inventory" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" +dependencies = [ + "ctor", + "ghost", + "inventory-impl", +] + +[[package]] +name = "inventory-impl" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" + +[[package]] +name = "lock_api" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "memoffset" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-bigint" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "proptest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" +dependencies = [ + "bitflags", + "byteorder", + "lazy_static", + "num-traits", + "quick-error", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", +] + +[[package]] +name = "pyo3" +version = "0.13.2" +dependencies = [ + "assert_approx_eq", + "cfg-if", + "ctor", + "hashbrown", + "indoc", + "inventory", + "libc", + "num-bigint", + "num-complex", + "parking_lot", + "paste", + "proptest", + "pyo3", + "pyo3-macros", + "rustversion", + "serde", + "serde_json", + "trybuild", + "unindent", +] + +[[package]] +name = "pyo3-macros" +version = "0.13.2" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.13.2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_xorshift" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex-syntax" +version = "0.6.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" + +[[package]] +name = "rustapi-module" +version = "0.1.0" +dependencies = [ + "pyo3", +] + +[[package]] +name = "rustversion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "syn" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b" +dependencies = [ + "glob", + "lazy_static", + "serde", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "word-count" +version = "0.1.0" +dependencies = [ + "pyo3", + "rayon", +] diff --git a/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix new file mode 100644 index 00000000000..af0de596b38 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, python3 +, rustPlatform +}: + +python3.pkgs.buildPythonPackage rec { + pname = "word-count"; + version = "0.13.2"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "PyO3"; + repo = "pyo3"; + rev = "v${version}"; + hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + buildAndTestSubdir = "examples/word-count"; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + pythonImportsCheck = [ "word_count" ]; + + meta = with lib; { + description = "PyO3 word count example"; + homepage = "https://github.com/PyO3/pyo3"; + license = licenses.asl20; + maintainers = [ maintainers.danieldk ]; + }; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b24fc539c93..406b3191b7f 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -40,6 +40,7 @@ with pkgs; rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; + importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; vim = callPackage ./vim {}; -- cgit 1.4.1 From c73371e04b97493a34ac24ca09abc6a726d07697 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 29 May 2021 16:36:39 +0200 Subject: neovim: fix neovim.override (#124785) * neovim: temporary revert to unbreak user configs Newly introduced "plugins" parameter is disabled until we get a better testing infrastructure to minimize breaking changes. --- pkgs/applications/editors/neovim/utils.nix | 17 +++-------------- pkgs/test/vim/default.nix | 9 +++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index a7d8f00c664..ae814fa9b4e 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -54,15 +54,7 @@ let configurePatched = configure // { - packages.nix = { - start = lib.filter (f: f != null) - (map (x: if x.optional == false then x.plugin else null) - pluginsNormalized); - opt = lib.filter (f: f != null) - (map (x: if x.optional == true then x.plugin else null) - pluginsNormalized); - }; - customRC = pluginRc + customRC; + customRC = pluginRc + customRC + (configure.customRC or ""); }; # A function to get the configuration string (if any) from an element of 'plugins' @@ -173,11 +165,8 @@ let assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; wrapNeovimUnstable neovim (res // { - wrapperArgs = lib.escapeShellArgs ( - res.wrapperArgs ++ lib.optionals (configure != {}) [ - "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" - ]) + " " + extraMakeWrapperArgs - ; + wrapperArgs = lib.escapeShellArgs res.wrapperArgs + extraMakeWrapperArgs; + wrapRc = (configure != {}); }); in { diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index c75836aa9a8..c809940fc4c 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -36,6 +36,15 @@ in ################## nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + nvim_via_override = neovim.override { + configure = { + packages.foo.start = [ vimPlugins.ale ]; + customRC = '' + :help ale + ''; + }; + }; + ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { -- cgit 1.4.1 From 4a2cbcfbb4e9563b81af2637ddaf4ff8cce97930 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 28 May 2021 23:44:43 +0200 Subject: neovim: add some tests To test the generated RC is included in the file and that we have the option not to wrap the RC. run: nix-build -A tests.vim --- pkgs/applications/editors/neovim/utils.nix | 2 + pkgs/applications/editors/neovim/wrapper.nix | 28 +++++++----- pkgs/test/vim/default.nix | 66 +++++++++++++++++++++++++--- pkgs/test/vim/neovim-override.vim | 7 +++ 4 files changed, 85 insertions(+), 18 deletions(-) create mode 100644 pkgs/test/vim/neovim-override.vim (limited to 'pkgs/test') diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index ae814fa9b4e..c753d2cca2c 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -148,6 +148,7 @@ let , vimAlias ? false , viAlias ? false , configure ? {} + , extraName ? "" }: let /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ @@ -160,6 +161,7 @@ let extraPython3Packages = compatFun extraPython3Packages; inherit withNodeJs withRuby viAlias vimAlias; inherit configure; + inherit extraName; }; in assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 7fa15efd82c..07a1dad7c09 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -27,23 +27,24 @@ let # set to false if you want to control where to save the generated config # (e.g., in ~/.config/init.vim or project/.nvimrc) , wrapRc ? true + , neovimRcContent ? "" , ... }@args: let wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - # If configure != {}, we can't generate the rplugin.vim file with e.g - # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in - # the wrapper. That's why only when configure != {} (tested both here and - # when postBuild is evaluated), we call makeWrapper once to generate a - # wrapper with most arguments we need, excluding those that cause problems to - # generate rplugin.vim, but still required for the final wrapper. - finalMakeWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] - ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" args.neovimRcContent}" ] - ; + # If configure != {}, we can't generate the rplugin.vim file with e.g + # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in + # the wrapper. That's why only when configure != {} (tested both here and + # when postBuild is evaluated), we call makeWrapper once to generate a + # wrapper with most arguments we need, excluding those that cause problems to + # generate rplugin.vim, but still required for the final wrapper. + finalMakeWrapperArgs = + [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] + ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] + ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; @@ -116,7 +117,10 @@ let preferLocalBuild = true; nativeBuildInputs = [ makeWrapper ]; - passthru = { unwrapped = neovim; }; + passthru = { + unwrapped = neovim; + initRc = neovimRcContent; + }; meta = neovim.meta // { # To prevent builds on hydra diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index c809940fc4c..3bdc3234134 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,9 +1,12 @@ { vimUtils, vim_configurable, writeText, neovim, vimPlugins , lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable , neovim-unwrapped +, fetchFromGitLab +, pkgs }: let inherit (vimUtils) buildVimPluginFrom2Nix; + inherit (neovimUtils) makeNeovimConfig; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; @@ -16,27 +19,55 @@ let } ]; - nvimConfNix = neovimUtils.makeNeovimConfig { + nvimConfNix = makeNeovimConfig { inherit plugins; customRC = '' " just a comment ''; }; - wrapNeovim = suffix: config: + nvimConfDontWrap = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + wrapNeovim2 = suffix: config: wrapNeovimUnstable neovim-unwrapped (config // { extraName = suffix; - wrapRc = true; }); + + nmt = fetchFromGitLab { + owner = "rycee"; + repo = "nmt"; + rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; + sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; + }; + + runTest = neovim-drv: buildCommand: + pkgs.runCommandLocal "test-${neovim-drv.name}" ({ + nativeBuildInputs = [ ]; + meta.platforms = neovim-drv.meta.platforms; + }) ('' + source ${nmt}/bash-lib/assertions.sh + vimrc="${writeText "init.vim" neovim-drv.initRc}" + vimrcGeneric="$out/patched.vim" + mkdir $out + ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" + '' + buildCommand); + in -{ + pkgs.recurseIntoAttrs ( +rec { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; ### neovim tests ################## - nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; nvim_via_override = neovim.override { + extraName = "-via-override"; configure = { packages.foo.start = [ vimPlugins.ale ]; customRC = '' @@ -45,6 +76,29 @@ in }; }; + + # nixpkgs should detect that no wrapping is necessary + nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimConfNix; + + + # this will generate a neovimRc content but we disable wrapping + nvimDontWrap = wrapNeovim2 "-dont-wrap" (makeNeovimConfig { + wrapRc = false; + customRC = '' + " this shouldn't trigger the creation of an init.vim + ''; + }); + + nvim_dontwrap-test = runTest nvimDontWrap '' + ! grep "-u" ${nvimDontWrap}/bin/nvim + ''; + + nvim_via_override-test = runTest nvim_via_override '' + assertFileContent \ + "$vimrcGeneric" \ + "${./neovim-override.vim}" + ''; + ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { @@ -107,4 +161,4 @@ in test_nvim_with_remote_plugin = neovim.override { configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; }; -} +}) diff --git a/pkgs/test/vim/neovim-override.vim b/pkgs/test/vim/neovim-override.vim new file mode 100644 index 00000000000..34a1a8f1f43 --- /dev/null +++ b/pkgs/test/vim/neovim-override.vim @@ -0,0 +1,7 @@ +" configuration generated by NIX +set nocompatible + +set packpath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir +set runtimepath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir + +:help ale -- cgit 1.4.1 From 83f6711464e03a856fb554693fe2e0f3af2ab0d5 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 8 Jun 2021 00:52:17 +0200 Subject: neovim.tests: added more tests to check for creation of vi/vim aliases. These tests also now follow the coding conventions of having tests in passthru.test . --- .../editors/neovim/neovim-override.vim | 7 ++ pkgs/applications/editors/neovim/tests.nix | 135 +++++++++++++++++++++ pkgs/applications/editors/neovim/wrapper.nix | 4 + pkgs/test/vim/default.nix | 107 +--------------- pkgs/test/vim/neovim-override.vim | 7 -- 5 files changed, 149 insertions(+), 111 deletions(-) create mode 100644 pkgs/applications/editors/neovim/neovim-override.vim create mode 100644 pkgs/applications/editors/neovim/tests.nix delete mode 100644 pkgs/test/vim/neovim-override.vim (limited to 'pkgs/test') diff --git a/pkgs/applications/editors/neovim/neovim-override.vim b/pkgs/applications/editors/neovim/neovim-override.vim new file mode 100644 index 00000000000..34a1a8f1f43 --- /dev/null +++ b/pkgs/applications/editors/neovim/neovim-override.vim @@ -0,0 +1,7 @@ +" configuration generated by NIX +set nocompatible + +set packpath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir +set runtimepath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir + +:help ale diff --git a/pkgs/applications/editors/neovim/tests.nix b/pkgs/applications/editors/neovim/tests.nix new file mode 100644 index 00000000000..f9d0d659b73 --- /dev/null +++ b/pkgs/applications/editors/neovim/tests.nix @@ -0,0 +1,135 @@ +{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable +, neovim-unwrapped +, fetchFromGitLab +, pkgs +}: +let + inherit (vimUtils) buildVimPluginFrom2Nix; + inherit (neovimUtils) makeNeovimConfig; + + packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; + + plugins = with vimPlugins; [ + { + plugin = vim-obsession; + config = '' + map $ Obsession + ''; + } + ]; + + nvimConfNix = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + nvimAutoDisableWrap = makeNeovimConfig { }; + + nvimConfDontWrap = makeNeovimConfig { + inherit plugins; + customRC = '' + " just a comment + ''; + }; + + wrapNeovim2 = suffix: config: + wrapNeovimUnstable neovim-unwrapped (config // { + extraName = suffix; + }); + + nmt = fetchFromGitLab { + owner = "rycee"; + repo = "nmt"; + rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; + sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; + }; + + runTest = neovim-drv: buildCommand: + pkgs.runCommandLocal "test-${neovim-drv.name}" ({ + nativeBuildInputs = [ ]; + meta.platforms = neovim-drv.meta.platforms; + }) ('' + source ${nmt}/bash-lib/assertions.sh + vimrc="${writeText "init.vim" neovim-drv.initRc}" + vimrcGeneric="$out/patched.vim" + mkdir $out + ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" + '' + buildCommand); + +in + pkgs.recurseIntoAttrs ( +rec { + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; + + ### neovim tests + ################## + nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; + + nvim_via_override = neovim.override { + extraName = "-via-override"; + configure = { + packages.foo.start = [ vimPlugins.ale ]; + customRC = '' + :help ale + ''; + }; + }; + + nvim_with_aliases = neovim.override { + extraName = "-with-aliases"; + vimAlias = true; + viAlias = true; + }; + + # nixpkgs should detect that no wrapping is necessary + nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; + + # this will generate a neovimRc content but we disable wrapping + nvimDontWrap = wrapNeovim2 "-forced-nowrap" (makeNeovimConfig { + wrapRc = false; + customRC = '' + " this shouldn't trigger the creation of an init.vim + ''; + }); + + force-nowrap = runTest nvimDontWrap '' + ! grep "-u" ${nvimDontWrap}/bin/nvim + ''; + + nvim_via_override-test = runTest nvim_via_override '' + assertFileContent \ + "$vimrcGeneric" \ + "${./neovim-override.vim}" + ''; + + + checkAliases = runTest nvim_with_aliases '' + folder=${nvim_with_aliases}/bin + assertFileExists "$folder/vi" + assertFileExists "$folder/vim" + ''; + + # having no RC generated should autodisable init.vim wrapping + nvim_autowrap = runTest nvim_via_override '' + ! grep "-u" ${nvimShouldntWrap}/bin/nvim + ''; + + + # system remote plugin manifest should be generated, deoplete should be usable + # without the user having to do `UpdateRemotePlugins`. To test, launch neovim + # and do `:call deoplete#enable()`. It will print an error if the remote + # plugin is not registered. + test_nvim_with_remote_plugin = neovim.override { + extraName = "-pathogen-remote"; + configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + }; + + # only neovim makes use of `requiredPlugins`, test this here + test_nvim_with_vim_nix_using_pathogen = neovim.override { + extraName = "-pathogen"; + configure.pathogen.pluginNames = [ "vim-nix" ]; + }; +}) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 07a1dad7c09..96b61a43cca 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -4,6 +4,7 @@ , nodejs , nodePackages , python3Packages +, callPackage }: with lib; @@ -120,6 +121,9 @@ let passthru = { unwrapped = neovim; initRc = neovimRcContent; + + tests = callPackage ./tests.nix { + }; }; meta = neovim.meta // { diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 3bdc3234134..cb3953a63f5 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,104 +1,16 @@ -{ vimUtils, vim_configurable, writeText, neovim, vimPlugins -, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable -, neovim-unwrapped -, fetchFromGitLab +{ vimUtils, vim_configurable, writeText, vimPlugins +, lib, fetchFromGitHub , pkgs }: let inherit (vimUtils) buildVimPluginFrom2Nix; - inherit (neovimUtils) makeNeovimConfig; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - plugins = with vimPlugins; [ - { - plugin = vim-obsession; - config = '' - map $ Obsession - ''; - } - ]; - - nvimConfNix = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - - nvimConfDontWrap = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - - wrapNeovim2 = suffix: config: - wrapNeovimUnstable neovim-unwrapped (config // { - extraName = suffix; - }); - - nmt = fetchFromGitLab { - owner = "rycee"; - repo = "nmt"; - rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42"; - sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; - }; - - runTest = neovim-drv: buildCommand: - pkgs.runCommandLocal "test-${neovim-drv.name}" ({ - nativeBuildInputs = [ ]; - meta.platforms = neovim-drv.meta.platforms; - }) ('' - source ${nmt}/bash-lib/assertions.sh - vimrc="${writeText "init.vim" neovim-drv.initRc}" - vimrcGeneric="$out/patched.vim" - mkdir $out - ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" - '' + buildCommand); - in - pkgs.recurseIntoAttrs ( -rec { + pkgs.recurseIntoAttrs (rec { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; - ### neovim tests - ################## - nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; - - nvim_via_override = neovim.override { - extraName = "-via-override"; - configure = { - packages.foo.start = [ vimPlugins.ale ]; - customRC = '' - :help ale - ''; - }; - }; - - - # nixpkgs should detect that no wrapping is necessary - nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimConfNix; - - - # this will generate a neovimRc content but we disable wrapping - nvimDontWrap = wrapNeovim2 "-dont-wrap" (makeNeovimConfig { - wrapRc = false; - customRC = '' - " this shouldn't trigger the creation of an init.vim - ''; - }); - - nvim_dontwrap-test = runTest nvimDontWrap '' - ! grep "-u" ${nvimDontWrap}/bin/nvim - ''; - - nvim_via_override-test = runTest nvim_via_override '' - assertFileContent \ - "$vimrcGeneric" \ - "${./neovim-override.vim}" - ''; - ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { @@ -126,11 +38,6 @@ rec { vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; }; - # only neovim makes use of `requiredPlugins`, test this here - test_nvim_with_vim_nix_using_pathogen = neovim.override { - configure.pathogen.pluginNames = [ "vim-nix" ]; - }; - # regression test for https://github.com/NixOS/nixpkgs/issues/53112 # The user may have specified their own plugins which may not be formatted # exactly as the generated ones. In particular, they may not have the `pname` @@ -153,12 +60,4 @@ rec { }); vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; }; - - # system remote plugin manifest should be generated, deoplete should be usable - # without the user having to do `UpdateRemotePlugins`. To test, launch neovim - # and do `:call deoplete#enable()`. It will print an error if the remote - # plugin is not registered. - test_nvim_with_remote_plugin = neovim.override { - configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; - }; }) diff --git a/pkgs/test/vim/neovim-override.vim b/pkgs/test/vim/neovim-override.vim deleted file mode 100644 index 34a1a8f1f43..00000000000 --- a/pkgs/test/vim/neovim-override.vim +++ /dev/null @@ -1,7 +0,0 @@ -" configuration generated by NIX -set nocompatible - -set packpath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir -set runtimepath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir - -:help ale -- cgit 1.4.1 From a71e906e3a0bec9c5fece94262e96de83e58c1f3 Mon Sep 17 00:00:00 2001 From: deliciouslytyped <47436522+deliciouslytyped@users.noreply.github.com> Date: Mon, 14 Jun 2021 15:06:23 +0200 Subject: trivial-builders: refactor writeTextFile to be overridable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes #126344, specifically with the goal of enabling overriding the checkPhase argument. See `design notes` at the end for details. This allows among other things, enabling bash extension for the `checkPhase`. Previously using such bash extensions was prohibited by the `writeShellScript` code because there was no way to enable the extension in the checker. As an example: ```nix (writeShellScript "foo" '' shopt -s extglob echo @(foo|bar) '').overrideAttrs (old: { checkPhase = '' # use subshell to preserve outer environment ( export BASHOPTS shopt -s extglob ${old.checkPhase} ) ''; }) ``` This commit also adds tests for this feature to `pkgs/tests/default.nix`, under `trivial-overriding`. The test code is located at `pkgs/build-support/trivial-builders/test-overriding.nix`. Design notes: ------------- Per discussion with @sternenseemann, the original approach of just wrapping `writeTextFile` in `makeOverridable` had the issue that combined with `callPackage` in the following form, would shadow the `.override` attribute of the `writeTextFile`: ```nix with import ; callPackage ({writeShellScript}: writeShellScript "foo" "echo foo") ``` A better approach can be seen in this commit, where `checkPhase` is moved from an argument of `writeTextFile`, which is substituted into `buildCommand`, into an `mkDerivation` argument, which is substituted from the environment and `eval`-ed. (see the source) This way we can simple use `.overideAttrs` as usual, and this also makes `checkPhase` a bit more conformant to `mkDerivation` naming, with respect to phases generally being overridable attrs. Co-authored-by: sterni Co-authored-by: Naïm Favier --- pkgs/build-support/trivial-builders.nix | 4 +- .../trivial-builders/test-overriding.nix | 119 +++++++++++++++++++++ pkgs/test/default.nix | 1 + 3 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/trivial-builders/test-overriding.nix (limited to 'pkgs/test') diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 219f808403c..6f51ba512c1 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -116,7 +116,7 @@ rec { , checkPhase ? "" # syntax checks, e.g. for scripts }: runCommand name - { inherit text executable; + { inherit text executable checkPhase; passAsFile = [ "text" ]; # Pointless to do this on a remote machine. preferLocalBuild = true; @@ -132,7 +132,7 @@ rec { echo -n "$text" > "$n" fi - ${checkPhase} + eval "$checkPhase" (test -n "$executable" && chmod +x "$n") || true ''; diff --git a/pkgs/build-support/trivial-builders/test-overriding.nix b/pkgs/build-support/trivial-builders/test-overriding.nix new file mode 100644 index 00000000000..ddd5dc05075 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test-overriding.nix @@ -0,0 +1,119 @@ +# Check that overriding works for trivial-builders like +# `writeShellScript` via `overrideAttrs`. This is useful +# to override the `checkPhase`, e. g. when you want +# to enable extglob in `writeShellScript`. +# +# Run using `nix-build -A tests.trivial-overriding`. +{ lib +, runtimeShell +, runCommand +, callPackage +, writeShellScript +, writeTextFile +, writeShellScriptBin +}: + +let + extglobScript = '' + shopt -s extglob + touch success + echo @(success|failure) + rm success + ''; + + # Reuse the old `checkPhase` of `writeShellScript`, but enable extglob. + allowExtglob = old: { + checkPhase = '' + # make sure we don't change the settings for + # the rest of the derivation's build + ( + export BASHOPTS + shopt -s extglob + ${old.checkPhase} + ) + ''; + }; + + # Run old checkPhase, but only succeed if it fails. + # This HACK is required because we can't introspect build failures + # in nix: With `assertFail` we want to make sure that the default + # `checkPhase` would fail if extglob was used in the script. + assertFail = old: { + # write old checkPhase into a shell script, so we can check for + # the phase to fail even though we have `set -e`. + checkPhase = '' + if source ${writeShellScript "old-check-phase" old.checkPhase} 2>/dev/null; then + exit 1 + fi + ''; + }; + + simpleCase = case: + writeShellScript "test-trivial-overriding-${case}" extglobScript; + + callPackageCase = case: callPackage ( + { writeShellScript }: + writeShellScript "test-trivial-callpackage-overriding-${case}" extglobScript + ) { }; + + binCase = case: + writeShellScriptBin "test-trivial-overriding-bin-${case}" extglobScript; + + # building this derivation would fail without overriding + textFileCase = writeTextFile { + name = "test-trivial-overriding-text-file"; + checkPhase = "false"; + text = '' + #!${runtimeShell} + echo success + ''; + executable = true; + }; + + mkCase = f: type: isBin: + let + drv = (f type).overrideAttrs + (if type == "succ" then allowExtglob else assertFail); + in if isBin then "${drv}/bin/${drv.name}" else drv; + + writeTextOverrides = { + # Enabling globbing in checkPhase + simpleSucc = mkCase simpleCase "succ" false; + # Ensure it's possible to fail; in this case globbing is not enabled. + simpleFail = mkCase simpleCase "fail" false; + # Do the same checks after wrapping with callPackage + # to make sure callPackage doesn't mess with the override + callpSucc = mkCase callPackageCase "succ" false; + callpFail = mkCase callPackageCase "fail" false; + # Do the same check using `writeShellScriptBin` + binSucc = mkCase binCase "succ" true; + binFail = mkCase binCase "fail" true; + # Check that we can also override plain writeTextFile + textFileSuccess = textFileCase.overrideAttrs (_: { + checkPhase = "true"; + }); + }; + + # `runTest` forces nix to build the script of our test case and + # run its `checkPhase` which is our main interest. Additionally + # it executes the script and thus makes sure that extglob also + # works at run time. + runTest = script: + let + name = script.name or (builtins.baseNameOf script); + in writeShellScript "run-${name}" '' + if [ "$(${script})" != "success" ]; then + echo "Failed in ${script}" + exit 1 + fi + ''; +in + +runCommand "test-writeShellScript-overriding" { + passthru = { inherit writeTextOverrides; }; +} '' + ${lib.concatMapStrings (test: '' + ${runTest test} + '') (lib.attrValues writeTextOverrides)} + touch "$out" +'' diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8c9e7b6f281..ebf732839ce 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -52,6 +52,7 @@ with pkgs; cuda = callPackage ./cuda { }; trivial = callPackage ../build-support/trivial-builders/test.nix {}; + trivial-overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {}; writers = callPackage ../build-support/writers/test.nix {}; } -- cgit 1.4.1 From 53d6abc682bd46e0a823c30e0219101464cb927b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 23 Jun 2021 22:16:37 -0400 Subject: tests.texlive.texdoc: init --- pkgs/test/texlive/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'pkgs/test') diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index d8420d99136..86c0a7f795b 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -105,4 +105,18 @@ mkdir "$out" mv document*.svg "$out"/ ''; + + texdoc = runCommandNoCC "texlive-test-texdoc" { + nativeBuildInputs = [ + (with texlive; combine { + inherit scheme-infraonly luatex texdoc; + pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ]; + }) + ]; + } '' + texdoc --version + + texdoc --debug --list texdoc | tee "$out" + grep texdoc.pdf "$out" + ''; } -- cgit 1.4.1 From d26a4266e276e1127da1d616f97e7ae3360e4908 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova Date: Sun, 4 Jul 2021 11:47:33 +0100 Subject: tests.texlive.hyphen-base: init --- pkgs/test/texlive/default.nix | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'pkgs/test') diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 86c0a7f795b..caeca4ae00c 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -119,4 +119,37 @@ texdoc --debug --list texdoc | tee "$out" grep texdoc.pdf "$out" ''; + + # test that language files are generated as expected + hyphen-base = runCommandNoCC "texlive-test-hyphen-base" { + hyphenBase = lib.head texlive.hyphen-base.pkgs; + schemeFull = texlive.combined.scheme-full; + schemeInfraOnly = texlive.combined.scheme-infraonly; + } '' + mkdir -p "$out"/{scheme-infraonly,scheme-full} + + # create language files with no hyphenation patterns + cat "$hyphenBase"/tex/generic/config/language.us >language.dat + cat "$hyphenBase"/tex/generic/config/language.us.def >language.def + cat "$hyphenBase"/tex/generic/config/language.us.lua >language.dat.lua + + cat >>language.dat.lua <>language.def < Date: Mon, 12 Jul 2021 20:37:51 +0100 Subject: tests.texlive.fmtutilCnf: init --- pkgs/test/texlive/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkgs/test') diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index caeca4ae00c..2444334f526 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -152,4 +152,16 @@ | tee "$out/scheme-infraonly/$fname.patch" done ''; + + # test that fmtutil.cnf is fully regenerated on scheme-full + fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" { + kpathsea = lib.head texlive.kpathsea.pkgs; + schemeFull = texlive.combined.scheme-full; + } '' + mkdir -p "$out" + + diff --ignore-matching-lines='^# Generated by ' -u \ + {"$kpathsea","$schemeFull"/share/texmf}/web2c/fmtutil.cnf \ + | tee "$out/fmtutil.cnf.patch" + ''; } -- cgit 1.4.1 From 52acca72bff778d492aac4aceb144d12b2d7c771 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 13 Jul 2021 15:19:36 +0200 Subject: top-level/release-haskell.nix: test writers on all platforms Since the rust writer doesn't seem to get fixed on darwin, we'll just wrap the haskell writer test in our own derivation (which is possible since tests.writers exposes a bunch of internals via passthru) and expose it via tests.haskell which are already in mergeable. Finally a way to test the (hopefully) working haskell writer on darwin again! --- pkgs/test/haskell/default.nix | 1 + pkgs/test/haskell/writers/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/release-haskell.nix | 11 +---------- 3 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 pkgs/test/haskell/writers/default.nix (limited to 'pkgs/test') diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix index eb389f4051f..03e4f346155 100644 --- a/pkgs/test/haskell/default.nix +++ b/pkgs/test/haskell/default.nix @@ -4,4 +4,5 @@ lib.recurseIntoAttrs { shellFor = callPackage ./shellFor { }; documentationTarball = callPackage ./documentationTarball { }; setBuildTarget = callPackage ./setBuildTarget { }; + writers = callPackage ./writers { }; } diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix new file mode 100644 index 00000000000..aa99e2c3c05 --- /dev/null +++ b/pkgs/test/haskell/writers/default.nix @@ -0,0 +1,20 @@ +# Wrap only the haskell-related tests from tests.writers +# in their own derivation for Hydra CI in the haskell-updates +# jobset. Can presumably removed as soon as tests.writers is +# always green on darwin as well: +# https://github.com/NixOS/nixpkgs/issues/126182 +{ runCommand, tests }: + +let + inherit (tests.writers) + writeTest + bin + simple + ; +in + +runCommand "test-haskell-writers" {} '' + ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} + ${writeTest "success" "test-haskell-simple-writer" simple.haskell} + touch $out +'' diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9cc5fb7e0a0..5ca21134275 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -89,12 +89,7 @@ let haskellPackages = packagePlatforms pkgs.haskellPackages; haskell.compiler = packagePlatforms pkgs.haskell.compiler; - tests = let - testPlatforms = packagePlatforms pkgs.tests; - in { - haskell = testPlatforms.haskell; - writers = testPlatforms.writers; - }; + tests.haskell = packagePlatforms pkgs.tests.haskell; pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { # remove musl ghc865Binary since it is known to be broken and @@ -255,10 +250,6 @@ let constituents = accumulateDerivations [ # haskell specific tests jobs.tests.haskell - # writeHaskell and writeHaskellBin - # TODO: writeHaskell currently fails on darwin - jobs.tests.writers.x86_64-linux - jobs.tests.writers.aarch64-linux # important top-level packages jobs.cabal-install jobs.cabal2nix -- cgit 1.4.1 From 6bd0c16f89c88abca07c684d30584124cd979224 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 13 Jul 2021 15:22:34 +0200 Subject: tests.writers: also expose path via passthru --- pkgs/build-support/writers/test.nix | 2 +- pkgs/test/haskell/writers/default.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/test') diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d0824b17bd1..00cad9a96b5 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -193,7 +193,7 @@ let ''; in runCommand "test-writers" { - passthru = { inherit writeTest bin simple; }; + passthru = { inherit writeTest bin simple path; }; meta.platforms = lib.platforms.all; } '' ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)} diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix index aa99e2c3c05..1d8f4b2b79c 100644 --- a/pkgs/test/haskell/writers/default.nix +++ b/pkgs/test/haskell/writers/default.nix @@ -10,11 +10,13 @@ let writeTest bin simple + path ; in runCommand "test-haskell-writers" {} '' ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} ${writeTest "success" "test-haskell-simple-writer" simple.haskell} + ${writeTest "success" "test-haskell-path-writer" path.haskell} touch $out '' -- cgit 1.4.1 From 3e19234f34b4ac3090771e9b72e24870e820486a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 13 Jul 2021 15:37:22 +0200 Subject: tests.haskell: set meta.platforms This allows packagePlatforms to pick up on the overall supported platforms and schedule builds on Hydra for more than the evaluation platform (usually x86_64-linux). --- pkgs/test/haskell/documentationTarball/default.nix | 6 +++++- pkgs/test/haskell/setBuildTarget/default.nix | 7 ++++++- pkgs/test/haskell/shellFor/default.nix | 5 ++++- pkgs/test/haskell/writers/default.nix | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/haskell/documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix index aec3dc41f26..e3214fb49fe 100644 --- a/pkgs/test/haskell/documentationTarball/default.nix +++ b/pkgs/test/haskell/documentationTarball/default.nix @@ -4,7 +4,11 @@ let drv = haskellPackages.vector; docs = pkgs.haskell.lib.documentationTarball drv; -in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' +in pkgs.runCommand "test haskell.lib.documentationTarball" { + meta = { + inherit (docs.meta) platforms; + }; +} '' tar xvzf "${docs}/${drv.name}-docs.tar.gz" # Check for Haddock html diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index b1335e2a74c..5a8391d0886 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -30,7 +30,12 @@ let fi ''; -in pkgs.runCommand "test haskell.lib.setBuildTarget" {} '' +in +pkgs.runCommand "test haskell.lib.setBuildTarget" { + meta = { + inherit (drv.meta) platforms; + }; +} '' ${test "foo" "bar"} ${test "bar" "foo"} touch "$out" diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 37ad2e90d89..04f5e045361 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -29,5 +29,8 @@ additionalMaintainers = with lib.maintainers; [ cdepillabout ]; allMaintainers = oldMaintainers ++ additionalMaintainers; in - oldMeta // { maintainers = allMaintainers; }; + oldMeta // { + maintainers = allMaintainers; + inherit (cabal-install.meta) platforms; + }; }) diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix index 1d8f4b2b79c..f05fda4bc73 100644 --- a/pkgs/test/haskell/writers/default.nix +++ b/pkgs/test/haskell/writers/default.nix @@ -14,7 +14,11 @@ let ; in -runCommand "test-haskell-writers" {} '' +runCommand "test-haskell-writers" { + meta = { + inherit (tests.writers.meta) platforms; + }; +} '' ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} ${writeTest "success" "test-haskell-simple-writer" simple.haskell} ${writeTest "success" "test-haskell-path-writer" path.haskell} -- cgit 1.4.1