diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
| commit | 6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch) | |
| tree | c5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/development | |
| parent | ef93931efff0323fd13c4270415b578c73b5ef35 (diff) | |
| parent | 83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff) | |
| download | nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2 nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip | |
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/development')
527 files changed, 1850 insertions, 977 deletions
diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index cca0f0d4adbc..fcdd2eb51811 100644 --- a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ stdenv , makeWrapper , runCommand, wrapBintoolsWith, wrapCCWith , buildAndroidndk, androidndk, targetAndroidndkPkgs diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/default.nix b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix index 341cdf72028d..e35444ed516e 100644 --- a/nixpkgs/pkgs/development/androidndk-pkgs/default.nix +++ b/nixpkgs/pkgs/development/androidndk-pkgs/default.nix @@ -1,5 +1,4 @@ { androidenv, buildPackages, pkgs, targetPackages -, includeSources ? true, licenseAccepted ? false }: rec { @@ -21,7 +20,7 @@ rec { inherit (buildPackages) makeWrapper; inherit (pkgs) - lib stdenv + stdenv runCommand wrapBintoolsWith wrapCCWith; # buildPackages.foo rather than buildPackages.buildPackages.foo would work, # but for splicing messing up on infinite recursion for the variants we diff --git a/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix index 9cefd1dfe54f..2178226ab9d3 100644 --- a/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix +++ b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.6.0"; diff --git a/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix index a94d803f0d32..389e07beca6c 100644 --- a/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -1,4 +1,4 @@ -{ stdenv, rebar3, curl }: +{ stdenv, rebar3 }: { name, version, sha256, src , meta ? {} @@ -29,4 +29,5 @@ stdenv.mkDerivation ({ outputHash = sha256; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + inherit meta; }) diff --git a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix index 837d0ccf15cf..1ec9f244d6c1 100644 --- a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix +++ b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix @@ -1,5 +1,5 @@ -{ stdenv, writeText, erlang, rebar3, openssl, libyaml, - pc, lib }: +{ stdenv, writeText, erlang, rebar3, openssl, + lib }: { name, version , src @@ -18,8 +18,6 @@ with stdenv.lib; let - debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; - shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.name}"; buildInputs = [ drv ]; diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix index 04f7551f32d9..2d3324ceaca4 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/nixpkgs/pkgs/development/compilers/compcert/default.nix b/nixpkgs/pkgs/development/compilers/compcert/default.nix index 4538d3031489..33957b5a8dcf 100644 --- a/nixpkgs/pkgs/development/compilers/compcert/default.nix +++ b/nixpkgs/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper +{ stdenv, lib, fetchFromGitHub, makeWrapper , coq, ocamlPackages, coq2html , tools ? stdenv.cc }: diff --git a/nixpkgs/pkgs/development/compilers/dmd/default.nix b/nixpkgs/pkgs/development/compilers/dmd/default.nix index 7b85b3e85ba4..b3b58e836215 100644 --- a/nixpkgs/pkgs/development/compilers/dmd/default.nix +++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch +{ stdenv, lib, fetchFromGitHub , makeWrapper, unzip, which, writeTextFile , curl, tzdata, gdb, darwin, git -, callPackage, targetPackages, ldc +, targetPackages, ldc , version ? "2.085.1" , dmdSha256 ? "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660" , druntimeSha256 ? "109f2glsqrlshk06761xlw4r5v22mivp873cq9g5gcax3g00k617" diff --git a/nixpkgs/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix index f14bce5d96b3..cd91ea6478db 100644 --- a/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildEnv +{ lib, stdenv , haskell, nodejs -, fetchurl, fetchpatch, makeWrapper, git }: +, fetchurl, fetchpatch, makeWrapper }: let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; diff --git a/nixpkgs/pkgs/development/compilers/factor-lang/default.nix b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix index 65fb8a9c82dd..0f9a1a94bcc9 100644 --- a/nixpkgs/pkgs/development/compilers/factor-lang/default.nix +++ b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix @@ -1,12 +1,9 @@ -{ stdenv, fetchurl, glib, glibc, git, +{ stdenv, fetchurl, glib, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, pango, cairo, gtk2, gdk_pixbuf, gtkglext, mesa, xorg, openssl, unzip }: -let - inherit (stdenv.lib) optional; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "factor-lang-${version}"; version = "0.98"; rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix index c180dc6ac861..dce1879ebd00 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.1.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx , bash , libiconv ? null, ncurses diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix index 141516015429..2edb49bd4633 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3, m4, sphinx , bash , libiconv ? null, ncurses diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index 8681aceacd7f..53b6dd431342 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -1,6 +1,6 @@ { haskellLib }: -let inherit (haskellLib) dontCheck doJailbreak dontHaddock; +let inherit (haskellLib) doJailbreak dontHaddock; in self: super: { haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/base.nix b/nixpkgs/pkgs/development/compilers/ghcjs/base.nix index 93e6a47934fc..e9c303b88b6e 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs/base.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs/base.nix @@ -29,7 +29,7 @@ , lens , parallel, safe, shelly, split, stringsearch, syb , tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub +, vector, yaml , alex, happy, git, gnumake, autoconf, patch , automake, libtool , cryptohash diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix index 784d66a0f242..3c46dfc107b8 100644 --- a/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, jq, python, spirv-tools, spirv-headers }: +{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }: stdenv.mkDerivation rec { name = "glslang-${version}"; version = "7.11.3113"; diff --git a/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix index 1001aac8306d..69507685f29b 100644 --- a/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "go-jsonnet-${version}"; diff --git a/nixpkgs/pkgs/development/compilers/go/1.10.nix b/nixpkgs/pkgs/development/compilers/go/1.10.nix index d18d260b5058..39de36293c8e 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.10.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.10.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , fetchpatch }: diff --git a/nixpkgs/pkgs/development/compilers/go/1.11.nix b/nixpkgs/pkgs/development/compilers/go/1.11.nix index b545e25d8011..d382bd90e479 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.11.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.11.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages, pkgsTargetTarget }: @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.11.10"; + version = "1.11.11"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "06rw962xigbrxblp942jbh7k133blpxg2xfrxi32qdhxkmmfj9yz"; + sha256 = "130g5lhg4h5xwa6chvxfi80nvdx8qb26xfbamzgyc8i5xwrprzqz"; }; # perl is used for testing go vet diff --git a/nixpkgs/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix index 7fee3b234087..247845b6ad8c 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages, pkgsTargetTarget }: @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.12.5"; + version = "1.12.6"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1s034pr60h20lsw171vbzqxqvcqn0s04dxfyqczyfcmkrf4g199a"; + sha256 = "1jmlj8pygg4hjpkziicihcf76lz61w1qljdpm3hqlqsmfk65qv69"; }; # perl is used for testing go vet diff --git a/nixpkgs/pkgs/development/compilers/graalvm/default.nix b/nixpkgs/pkgs/development/compilers/graalvm/default.nix index 3cb0d7430ab3..b30f47c08e50 100644 --- a/nixpkgs/pkgs/development/compilers/graalvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/graalvm/default.nix @@ -6,10 +6,6 @@ let version = "1.0.0-rc15"; truffleMake = ./truffle.make; - R = fetchurl { - url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz"; - sha256 = "1vap2k8kj5icy9naw61f9zyphf4rs0c9rxvil0zxkwx0xvsvyqq4"; - }; makeMxGitCache = list: out: '' mkdir ${out} ${lib.concatMapStrings ({ url, name, rev, sha256 }: '' diff --git a/nixpkgs/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix index 2657ee6633b7..1cbe95232eb7 100644 --- a/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: diff --git a/nixpkgs/pkgs/development/compilers/julia/shared.nix b/nixpkgs/pkgs/development/compilers/julia/shared.nix index 131b72624842..d8d521952bda 100644 --- a/nixpkgs/pkgs/development/compilers/julia/shared.nix +++ b/nixpkgs/pkgs/development/compilers/julia/shared.nix @@ -9,7 +9,7 @@ { stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, llvm, cmake +, cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib # standard library dependencies diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix index d6839f0f2909..122576cc726e 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix @@ -9,7 +9,6 @@ , version , release_version , zlib -, libcxxabi , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? !enableManpages diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index c0a0e0851450..5a8b8922eb06 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, fetchpatch, cmake, libxml2, llvm, version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix index a187d0adc994..a4ceb9102ef8 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, libcxx, fetchpatch }: +{ stdenv, version, fetch, cmake, fetchpatch }: stdenv.mkDerivation { name = "libunwind-${version}"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix index 5d8d08167298..4ff6cc995a02 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix @@ -1,6 +1,5 @@ { stdenv , fetch -, fetchpatch , cmake , python , libffi diff --git a/nixpkgs/pkgs/development/compilers/nim/default.nix b/nixpkgs/pkgs/development/compilers/nim/default.nix index 0d319d235fd3..aaf45ac36f6d 100644 --- a/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { patchPhase = let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' ''; disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' ''; - disableCompile = ''sed -i -e 's/^/#/' ''; in '' substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep" substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin" diff --git a/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/11.nix index 5840061ed53e..415dacc662ab 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir +, alsaLib, bootjdk, perl, fontconfig, zlib, lndir , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath diff --git a/nixpkgs/pkgs/development/compilers/openspin/default.nix b/nixpkgs/pkgs/development/compilers/openspin/default.nix index 71bda3e03d96..690707265b4a 100644 --- a/nixpkgs/pkgs/development/compilers/openspin/default.nix +++ b/nixpkgs/pkgs/development/compilers/openspin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "openspin-${version}"; diff --git a/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 749fbcc2fafb..e16e2c514a85 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { pname = "ponyc"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "011qxhiq75j6d37ws4nb6a8bdfw2cvlcsb2fgdkn1hx2xb81h6wc"; + sha256 = "1yi41a03039yz9rf34l9iq8haf5vb6gwzplr04rahfhd8xsd38gq"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/nixpkgs/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix index 5c3c08952074..0e3de0c4ab98 100644 --- a/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, overrideCC +{ stdenv, lib , buildPackages , newScope, callPackage , CoreFoundation, Security , llvmPackages_5 -, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost +, pkgsBuildTarget, pkgsBuildBuild }: rec { makeRustPlatform = { rustc, cargo, ... }: { rust = { diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 59264ca6efad..fb658afe07e8 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget -, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm_7, ncurses, darwin, git, cmake, curl, rustPlatform +, fetchurl, file, python2, tzdata, ps +, llvm_7, darwin, git, cmake, rustPlatform , which, libffi, gdb , withBundledLLVM ? false }: diff --git a/nixpkgs/pkgs/development/compilers/sdcc/default.nix b/nixpkgs/pkgs/development/compilers/sdcc/default.nix index bd24217771eb..4fd46c35a0a9 100644 --- a/nixpkgs/pkgs/development/compilers/sdcc/default.nix +++ b/nixpkgs/pkgs/development/compilers/sdcc/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { name = "sdcc-${version}"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "08dvvdxd99hb50wvs8m986v3scfj1rdjw18js7pk5n3vxf6nccdk"; + sha256 = "0dn0cy6whcrvbfh9x467jdi8dmzjrvixz2bz63pgxwzpz9rsxv4l"; }; buildInputs = [ autoconf bison boost flex gputils texinfo zlib ]; diff --git a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index 97b4a627540c..bf452d21d1dc 100644 --- a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib -, libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm +{ stdenv, fetchgit, jdk, gmp, readline, openssl, unixODBC, zlib +, libarchive, db, pcre, libedit, libossp_uuid, libXpm , libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin , git, cacert, cmake, libyaml , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] diff --git a/nixpkgs/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix index 33f4d2a33fce..94d0a4327d9d 100644 --- a/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -1,5 +1,4 @@ { stdenv -, targetPackages , cmake , coreutils , glibc diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index 6da9d6d3d02d..6400f6e13875 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook -, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, gnome3 +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook +, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll }: let diff --git a/nixpkgs/pkgs/development/compilers/x11basic/default.nix b/nixpkgs/pkgs/development/compilers/x11basic/default.nix index a26bc41c5945..88666148da3f 100644 --- a/nixpkgs/pkgs/development/compilers/x11basic/default.nix +++ b/nixpkgs/pkgs/development/compilers/x11basic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, fetchFromGitHub , automake, autoconf, readline , libX11, bluez, SDL2 }: diff --git a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix index 55d59b931404..e33b9427223e 100644 --- a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp }: +{ stdenv, fetchFromGitHub, coq }: let param = { diff --git a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix index 14a7f2dc4e24..a074b27ff658 100644 --- a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix @@ -17,6 +17,10 @@ let params = { rev = "V8.9.0"; sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; }; + "8.10" = { + rev = "V8.10+beta1"; + sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404"; + }; }; param = params."${coq.coq-version}"; in diff --git a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix index 191812b3f2eb..c67342f1a2f7 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix @@ -13,6 +13,7 @@ let params = }; "8.8" = v_8_8; "8.9" = v_8_8; + "8.10" = v_8_8; }; param = params."${coq.coq-version}" ; in diff --git a/nixpkgs/pkgs/development/coq-modules/ssreflect/default.nix b/nixpkgs/pkgs/development/coq-modules/ssreflect/default.nix index 1fcb7e2da8ae..01df38375efb 100644 --- a/nixpkgs/pkgs/development/coq-modules/ssreflect/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coq, ncurses, which +{ stdenv, coq, ncurses, which , graphviz, mathcomp, withDoc ? false }: diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index b2d7d0eaf9cb..87d3b5ae496c 100644 --- a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -96,7 +96,7 @@ assert stdenv.hostPlatform.isWindows -> enableStaticLibraries == false; let inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast - concatStringsSep enableFeature optionalAttrs toUpper; + concatStringsSep enableFeature optionalAttrs; isGhcjs = ghc.isGhcjs or false; isHaLVM = ghc.isHaLVM or false; diff --git a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index 04cbd88989a6..a4c040673487 100644 --- a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -187,7 +187,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # for any version that has been released on hackage as opposed to only # versions released before whatever version of all-cabal-hashes you happen # to be currently using. - callHackageDirect = {pkg, ver, sha256}@args: + callHackageDirect = {pkg, ver, sha256}: let pkgver = "${pkg}-${ver}"; in self.callCabal2nix pkg (pkgs.fetchzip { url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix index bc2d0e5be5a8..16f3e7f73e20 100644 --- a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -119,7 +119,6 @@ let # packageJSON=./package.json; cljdeps = import ./deps.nix { inherit pkgs; }; - cljpaths = cljdeps.makePaths {}; classp = cljdeps.makeClasspaths { extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; }; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index bc0b728ecce4..914c3a0f5cfe 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook +, libxml2, libxslt, ncurses, openssl, perl, autoconf , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport @@ -48,7 +48,7 @@ in stdenv.mkDerivation ({ inherit src version; - nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ]; + nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; buildInputs = [ ncurses openssl ] ++ optionals wxSupport wxPackages2 diff --git a/nixpkgs/pkgs/development/interpreters/gauche/default.nix b/nixpkgs/pkgs/development/interpreters/gauche/default.nix index bb3294e2097b..a0d20b7ebe4f 100644 --- a/nixpkgs/pkgs/development/interpreters/gauche/default.nix +++ b/nixpkgs/pkgs/development/interpreters/gauche/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gauche-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd"; + sha256 = "0jxp1ladpy8kvfvk561c64spf1c3d6giqla6zscqkd6qa480vcry"; }; nativeBuildInputs = [ pkgconfig texinfo ]; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix index bc41d86256b2..f383c7283698 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -1,7 +1,6 @@ # Generic builder for lua packages { lib , lua -, stdenv , wrapLua # Whether the derivation provides a lua module or not. , toLuaModule diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index fb709227180f..08645dfb77f3 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -59,7 +59,7 @@ in rec { luajit_2_1 = import ../luajit/2.1.nix { self = luajit_2_1; - inherit callPackage lib; + inherit callPackage; }; } diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix index 7f584c0f0aff..14bd4a416468 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix @@ -3,7 +3,6 @@ , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false -, lib , requiredLuaModules , makeWrapperArgs ? [] }: diff --git a/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix index 0f223963132e..e8f1b8b338c4 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix @@ -1,4 +1,4 @@ -{ self, callPackage, lib }: +{ self, callPackage }: callPackage ./default.nix { inherit self; version = "2.1.0-beta3"; diff --git a/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/nixpkgs/pkgs/development/interpreters/luajit/default.nix index abd1fda47cb6..7db8feb98e71 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPackages +{ stdenv, fetchurl, buildPackages , name ? "luajit-${version}" , isStable , sha256 diff --git a/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix index 9142a1f4fc36..95122aebf039 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix @@ -3,9 +3,7 @@ , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false -, lib , requiredPerlModules -, makeWrapperArgs ? [] }: # Create a perl executable that knows about additional packages. diff --git a/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix index 058a83b6b436..01cffe93024f 100644 --- a/nixpkgs/pkgs/development/interpreters/picolisp/default.nix +++ b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, makeWrapper }: +{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://www.software-lab.de/${name}.tgz"; sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk"; }; - buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk; + buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; patchPhase = '' sed -i "s/which java/command -v java/g" mkAsm @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { ''} ''; sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}''; + postBuild = '' + cd ../src; make gate + ''; installPhase = '' cd .. @@ -30,9 +33,11 @@ stdenv.mkDerivation rec { cp -r . "$out/share/picolisp/build-dir" ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp" ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp" + ln -s "$out/lib/picolisp/bin/httpGate" "$out/bin/httpGate" makeWrapper $out/bin/picolisp $out/bin/pil \ + --prefix PATH : ${w3m}/bin \ --add-flags "$out/lib/picolisp/lib.l" \ --add-flags "@lib/misc.l" \ --add-flags "@lib/btree.l" \ diff --git a/nixpkgs/pkgs/development/interpreters/python/build-python-package.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package.nix index 98322312f7f3..61c1186cef9e 100644 --- a/nixpkgs/pkgs/development/interpreters/python/build-python-package.nix +++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package.nix @@ -23,7 +23,7 @@ let common = import ./build-python-package-common.nix { inherit python; }; mkPythonDerivation = import ./mk-python-derivation.nix { inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook; - inherit toPythonModule namePrefix writeScript update-python-libraries; + inherit toPythonModule namePrefix update-python-libraries; }; in diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index bc90d93a7e3d..e7d07b9ad1c0 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -10,7 +10,6 @@ , sqlite , tcl ? null, tk ? null, tix ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false , zlib -, callPackage , self , CF, configd, coreutils , python-setup-hook diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 60ea3bdf4c7f..5eb7f3ec1661 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -10,7 +10,6 @@ , sqlite , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false , zlib -, callPackage , self , CF, configd , python-setup-hook diff --git a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index b3561bcbb725..6a9e3d48bdb5 100644 --- a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -10,7 +10,6 @@ # Whether the derivation provides a Python module or not. , toPythonModule , namePrefix -, writeScript , update-python-libraries }: diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index 3cdc30b92340..42b652978bcc 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, callPackage, self, gdbm, db, lzma +, self, gdbm, db, lzma , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) diff --git a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index 552f230ee712..6af198e65ead 100644 --- a/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -41,8 +41,6 @@ let majorVersion = substring 0 1 pythonVersion; - setupHook = python-setup-hook sitePackages; - deps = [ bzip2 zlib diff --git a/nixpkgs/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix index c2147fb5f6a7..e37c43a0bd65 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeFontsConf, makeWrapper +{ stdenv, fetchurl, makeFontsConf , cacert , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 2342b693aef6..2c14955b976f 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages, lib -, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub +, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix @@ -11,7 +11,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -35,7 +35,7 @@ let }; self = lib.makeOverridable ( { stdenv, buildPackages, lib - , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub + , fetchurl, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , rubygemsSupport ? true , zlib, zlibSupport ? true diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index db28cbe28fae..b9548284355d 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "rubygems"; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix index feac99b2d8e5..2ec5923b0e1f 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr, buildPackages }: +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, zip, which, readline, icu, zlib, nspr, buildPackages }: let version = "52.9.0"; diff --git a/nixpkgs/pkgs/development/java-modules/build-maven-package.nix b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix index 499b2c65b770..a7196c6e0314 100644 --- a/nixpkgs/pkgs/development/java-modules/build-maven-package.nix +++ b/nixpkgs/pkgs/development/java-modules/build-maven-package.nix @@ -5,7 +5,7 @@ with builtins; with stdenv.lib; let - mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv maven; }; + mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; }; in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; diff --git a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix index ca7cc7027be7..f63c91cd360a 100644 --- a/nixpkgs/pkgs/development/java-modules/maven-minimal.nix +++ b/nixpkgs/pkgs/development/java-modules/maven-minimal.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, maven }: +{ stdenv, pkgs }: with stdenv.lib; with pkgs.javaPackages; diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix index f59a3fd713f9..429da8de8350 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix index ba68f046b0a0..9d506b10e353 100644 --- a/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "aravis"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "0zlmw040iv0xx9qw7ygzbl96bli6ivll2fbziv19f4bdc0yhqjpw"; + sha256 = "0lmgx854z522dwcxsg37bxdyiai9fnycpx1nvgayksj38h39kfn2"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/arb/default.nix b/nixpkgs/pkgs/development/libraries/arb/default.nix index 4c34e40586f3..eb58003a5f63 100644 --- a/nixpkgs/pkgs/development/libraries/arb/default.nix +++ b/nixpkgs/pkgs/development/libraries/arb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, mpir, gmp, mpfr, flint}: +{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index c65689136646..10649092d20d 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.400.4"; + version = "9.500.2"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1wv08i8mq16hswxkll3kmbfih4hz4d8v7apszm76lwxpya2bm65l"; + sha256 = "17npgyavzrbf4d3m28f9j7j8hk2pc91ai9nkkp39hkdflq3kw6hb"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index 28302fbbe32f..76010dacc5e2 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { # autoipd won't build on darwin ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd"; + NIX_CFLAGS_COMPILE = "-DAVAHI_SERVICE_DIR=\"/etc/avahi/services\""; + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' sed -i '20 i\ #define __APPLE_USE_RFC_2292' \ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index c8f284acc135..380a5071aeee 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix index 2618d35ff794..d6ebaf3c5663 100644 --- a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 }: diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index 90dd8ff1744f..f7bd189022f8 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , which , buildPackages , toolset ? /**/ if stdenv.cc.isClang then "clang" diff --git a/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix index 67f5350d8fe6..2d0fd4cb1bcf 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "catch2-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index 4025d386d77b..bffbf4011deb 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "0hvr030588jnm5s8zgxvhkg13al83dy6273rbdi801cmgfcwxq29"; + sha256 = "1q409xrri67vqhda6f6jfqnvzj1b3b9xlpi27vm9vl10k2lv4m3a"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 442ed2a4b9a5..80b6480323be 100644 --- a/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -1,30 +1,25 @@ -{ fetchurl, stdenv, libGLU_combined }: +{ fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }: stdenv.mkDerivation rec { - name = "coin3d-${version}"; - version = "3.1.3"; + pname = "coin"; + version = "unstable-2019-06-12"; - src = fetchurl { - url = "https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz"; - sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q"; + src = fetchFromBitbucket { + owner = "Coin3D"; + repo = "coin"; + rev = "8d860d7ba112b22c4e9b289268fd8b3625ab81d3"; + sha256 = "1cpncljqvw28k5wvpgchv593nayhby5gwpvbnyllc9hb9ms816xn"; }; - patches = [ - (fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch; - name = "gcc-4.7.patch"; - sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20"; - }) - ./gcc-4.8.patch # taken from FC-17 source rpm - # see https://bitbucket.org/Coin3D/coin/issues/128/crash-in-cc_memalloc_deallocate - # patch adapted from https://bitbucket.org/Coin3D/coin/pull-requests/75/added-fix-for-issue-128-provided-by-fedora/diff - ./sbhashentry.patch - ]; + postPatch = '' + sed -i /cpack.d/d CMakeLists.txt + ''; - buildInputs = [ libGLU_combined ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost libGLU_combined ]; meta = { - homepage = http://www.coin3d.org/; + homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = stdenv.lib.licenses.gpl2Plus; description = "High-level, retained-mode toolkit for effective 3D graphics development"; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/nixpkgs/pkgs/development/libraries/coin3d/gcc-4.8.patch b/nixpkgs/pkgs/development/libraries/coin3d/gcc-4.8.patch deleted file mode 100644 index be5b8b03b638..000000000000 --- a/nixpkgs/pkgs/development/libraries/coin3d/gcc-4.8.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9f5d96a2b9a71ab539237d2dab4c54fc46fc5c5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home> -Date: Thu, 18 Apr 2013 19:17:06 +0200 -Subject: [PATCH 10/10] GCC-4.8.0 fixes - ---- - src/fonts/freetype.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/fonts/freetype.cpp b/src/fonts/freetype.cpp -index 760b88b..e705d3a 100644 ---- a/src/fonts/freetype.cpp -+++ b/src/fonts/freetype.cpp -@@ -32,18 +32,18 @@ - - 20050613 mortene. */ - --#include "fonts/freetype.h" -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif /* HAVE_CONFIG_H */ - --#include <stdlib.h> -+#include <cstdlib> - #include <assert.h> - - #include "glue/freetype.h" - #include "glue/GLUWrapper.h" - -+#include "fonts/freetype.h" -+ - /* ************************************************************************* */ - - #ifdef __cplusplus --- -1.8.1.4 - diff --git a/nixpkgs/pkgs/development/libraries/coin3d/sbhashentry.patch b/nixpkgs/pkgs/development/libraries/coin3d/sbhashentry.patch deleted file mode 100644 index 88c9a5f02a25..000000000000 --- a/nixpkgs/pkgs/development/libraries/coin3d/sbhashentry.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u --label /tmp/Coin-3.1.3/src/misc/SbHash.h --label \#\<buffer\ SbHash.h\> /tmp/Coin-3.1.3/src/misc/SbHash.h /tmp/buffer-content-21756V0 ---- a/src/misc/SbHash.h -+++ b/src/misc/SbHash.h -@@ -88,8 +88,8 @@ - SbHashEntry<Type, Key> * entry = static_cast<SbHashEntry<Type, Key> *>( ptr); - cc_memalloc_deallocate(entry->memhandler, ptr); - } -- SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {} -- -+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler) -+ : key(key), obj(obj), memhandler(memhandler) {} - Key key; - Type obj; - SbHashEntry<Type, Key> * next; -@@ -218,7 +218,7 @@ - /* Key not already in the hash table; insert a new - * entry as the first element in the bucket - */ -- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj); -+ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler); - entry->next = this->buckets[i]; - this->buckets[i] = entry; - - -Diff finished. Sat Sep 9 19:50:32 2017 diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index 06eac4423e78..0bdaf1be9551 100644 --- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext -, pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false +, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles }: with stdenv.lib; diff --git a/nixpkgs/pkgs/development/libraries/czmq/4.x.nix b/nixpkgs/pkgs/development/libraries/czmq/4.x.nix index 06801dfb7d24..13cee8fe86ba 100644 --- a/nixpkgs/pkgs/development/libraries/czmq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/czmq/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zeromq }: +{ stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { version = "4.2.0"; diff --git a/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix index aae7861fef4f..18244d83dee7 100644 --- a/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/nixpkgs/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,5 +1,4 @@ { stdenv -, fetchurl , fetchFromGitHub , autoreconfHook , pkgconfig diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix index 681062cd6713..62f04e061cfa 100644 --- a/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pari , ntl diff --git a/nixpkgs/pkgs/development/libraries/editline/default.nix b/nixpkgs/pkgs/development/libraries/editline/default.nix index e2a989f4ef23..6dfd4edd0716 100644 --- a/nixpkgs/pkgs/development/libraries/editline/default.nix +++ b/nixpkgs/pkgs/development/libraries/editline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "editline-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/eigen/default.nix b/nixpkgs/pkgs/development/libraries/eigen/default.nix index 25d0760a32d1..6aec15f976bb 100644 --- a/nixpkgs/pkgs/development/libraries/eigen/default.nix +++ b/nixpkgs/pkgs/development/libraries/eigen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, cmake}: +{stdenv, fetchurl, cmake}: let version = "3.3.7"; diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 3f731bdf799e..d3095099d3c1 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, zlib, expat, gettext +{ stdenv, fetchFromGitHub, zlib, expat, gettext , autoconf }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 4ea17e588a9b..4c4949b37be8 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 6974adf74cec..2cfc87d6a2e5 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: +{ stdenv, fetchFromGitHub, cmake, enableShared ? true }: stdenv.mkDerivation rec { version = "5.3.0"; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index 00ac6abbc8eb..61a96af618a4 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.05.27.00"; + version = "2019.06.17.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "00xacaziqllps069xzg7iz68rj5hr8mj3rbi4shkrr9jq51y9ikj"; + sha256 = "0v639yqk029c585x3140rdfbz3xrdjwc858bqfy4yv31pyrn608l"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index d98d9e8107e9..48c232c122b3 100644 --- a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +{ stdenv, fetchurl, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, gobject-introspection, doCheck ? false, makeWrapper }: diff --git a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix index 4215f0ebc30d..0e3f79b1814c 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw -, gexiv2, libwebp, gnome3, libintl }: +, gexiv2, libwebp, libintl }: stdenv.mkDerivation rec { pname = "gegl"; diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index a2c7bdc5bde6..4b577d36857a 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null diff --git a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix index 43b8434b4961..494d9acb6bb6 100644 --- a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix +++ b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: -let inherit (stdenv.lib) optional optionalString; in +let inherit (stdenv.lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-5.1.3"; diff --git a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix index f320c303123e..de31128e5a67 100644 --- a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix +++ b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix @@ -3,7 +3,7 @@ , buildPackages , withStatic ? false }: -let inherit (stdenv.lib) optional optionalString; in +let inherit (stdenv.lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-6.1.2"; diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index 26c472930ed5..b1fdb916b5ce 100644 --- a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, flex, bison, meson, ninja, pkgconfig, libffi, python3 -, libintl, cctools, cairo, gnome3, glibcLocales, fetchpatch +, libintl, cctools, cairo, gnome3, glibcLocales , substituteAll, nixStoreDir ? builtins.storeDir , x11Support ? true }: diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index c1bdcd6956e7..d454ca63fd7f 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection +{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection , meson , ninja , python3 diff --git a/nixpkgs/pkgs/development/libraries/gsignond/default.nix b/nixpkgs/pkgs/development/libraries/gsignond/default.nix index a81e72bf66fb..88a4ecb36225 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/default.nix @@ -61,7 +61,7 @@ unwrapped = stdenv.mkDerivation rec { in if plugins == [] then unwrapped else import ./wrapper.nix { - inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins; + inherit makeWrapper symlinkJoin plugins; gsignond = unwrapped; } diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix index 6182ea283cba..887376d31874 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix index d1fa37939a78..655f73931f67 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix b/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix index 04463aac3796..a4738e4b6a73 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }: +{ makeWrapper, symlinkJoin, gsignond, plugins }: symlinkJoin { name = "gsignond-with-plugins-${gsignond.version}"; diff --git a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix index 4ff58843d155..839f0a75156b 100644 --- a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, pkgconfig , cmake }: diff --git a/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/nixpkgs/pkgs/development/libraries/leptonica/default.nix index 52d835d7a206..dd3c42e8b7f5 100644 --- a/nixpkgs/pkgs/development/libraries/leptonica/default.nix +++ b/nixpkgs/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, which, gnuplot +{ stdenv, fetchurl, autoreconfHook, pkgconfig, which, gnuplot , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib }: diff --git a/nixpkgs/pkgs/development/libraries/libao/default.nix b/nixpkgs/pkgs/development/libraries/libao/default.nix index c1cf3215c16c..826f72b1f5fb 100644 --- a/nixpkgs/pkgs/development/libraries/libao/default.nix +++ b/nixpkgs/pkgs/development/libraries/libao/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap -, CoreAudio, CoreServices, AudioUnit, AudioToolbox +, CoreAudio, CoreServices, AudioUnit , usePulseAudio }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index c7d7bfb1e824..62e0a850bad3 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3, writeText }: +{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: stdenv.mkDerivation rec { name = "libaom-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/libaosd/default.nix b/nixpkgs/pkgs/development/libraries/libaosd/default.nix index e63bfd20c797..dd3320005a41 100644 --- a/nixpkgs/pkgs/development/libraries/libaosd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cairo, pango, +{ stdenv, fetchFromGitHub, pkgconfig, cairo, pango, libX11, libXcomposite, autoconf, automake }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix index d908a8af85da..d22518e96d42 100644 --- a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: let diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix index a98748d3b52b..b7ca9dda1ea7 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "0f138xlldzci8wic89i9vpka3mdsn8r78khpnk3wijlbgjhphr0h"; + sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; diff --git a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix index d7638dd20597..3d32f4d0b953 100644 --- a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "libcsptr-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix index 07823072bad4..6c9fabf5cae7 100644 --- a/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; + enableParallelBuilding = true; + meta = { homepage = "https://github.com/strukturag/libde265"; description = "Open h.265 video codec implementation"; diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix index 2bc2bcb5b856..611287b9aaa8 100644 --- a/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, findutils, fixDarwinDylibNames +{ stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: diff --git a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix index 65d04cb53f16..f553afdfc709 100644 --- a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, perl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "libfaketime-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/libfsm/default.nix b/nixpkgs/pkgs/development/libraries/libfsm/default.nix new file mode 100644 index 000000000000..5491fab3edf2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfsm/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub +, bmake +}: + +stdenv.mkDerivation rec { + name = "libfsm-${version}"; + version = "0.1pre1869_${builtins.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "katef"; + repo = "libfsm"; + rev = "f70c3c5778a79eeecb52f9fd35c7cbc241db0ed6"; + sha256 = "1hgv272jdv6dwnsdjajyky537z84q0cwzspw9br46qj51h8gkwvx"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ bmake ]; + enableParallelBuilding = true; + + # note: build checks value of '$CC' to add some extra cflags, but we don't + # necessarily know which 'stdenv' someone chose, so we leave it alone (e.g. + # if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all + # cases.) it's unclear exactly what should be done if we want those flags, + # but the defaults work fine. + buildPhase = "PREFIX=$out bmake -r install"; + + # fix up multi-output install. we also have to fix the pkgconfig libdir + # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in + # our case; libdir should really be set to the $lib output. + installPhase = '' + mkdir -p $lib $dev/lib + + mv $out/lib $lib/lib + mv $out/include $dev/include + mv $out/share/pkgconfig $dev/lib/pkgconfig + rmdir $out/share + + for x in libfsm.pc libre.pc; do + substituteInPlace "$dev/lib/pkgconfig/$x" \ + --replace 'libdir=''${prefix}/lib' "libdir=$lib/lib" + done + ''; + + outputs = [ "out" "lib" "dev" ]; + + meta = with stdenv.lib; { + description = "DFA regular expression library & friends"; + homepage = "https://github.com/katef/libfsm"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libgdamm/default.nix b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix index 4367cc5b2764..f5cc5efa06a1 100644 --- a/nixpkgs/pkgs/development/libraries/libgdamm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3 -, mysqlSupport ? false, mysql ? null -, postgresSupport ? false, postgresql ? null }: +, mysqlSupport ? false +, postgresSupport ? false }: let gda = libgda.override { diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index dc221156f461..f3e1b8b0f997 100644 --- a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, buildPackages, fetchurl, gettext +{ stdenv, lib, buildPackages, fetchurl, gettext , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { diff --git a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix index cf5c80c9b219..c58812eca58b 100644 --- a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }: +, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: let pname = "libhttpseverywhere"; diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix index 916530220526..b86a48ecd1ba 100644 --- a/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection -, python3, tzdata, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glib, libxml2, icu }: +, python3, tzdata, glib, libxml2, icu }: stdenv.mkDerivation rec { name = "libical-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 57c35ab86777..371d7b838d40 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, nasm }: +{ stdenv, fetchurl, cmake, nasm }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index a3af7aab526d..c2731e44efbc 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -3,7 +3,7 @@ }: let - version = "3.9.0"; + version = "3.10.0"; in stdenv.mkDerivation rec { name = "liblouis-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "11vq9rnmrfqka3fiyrxs0q1gpvpj4m9jmrkwd1yvrq94fndgvh1m"; + sha256 = "1wimv2wfl566jp8hhrxr91dmx20hldqzj70dar8i9k3hzq1kmb4q"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmikmod/default.nix b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix index ef095fd4336a..284d415454de 100644 --- a/nixpkgs/pkgs/development/libraries/libmikmod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { name = "libmikmod-3.3.11.1"; diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix index d9db09f1e98e..222a0df055bb 100644 --- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook , asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, json_c, kmod, which, file, utillinux, systemd, keyutils +, json_c, kmod, which, utillinux, systemd, keyutils }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index 9efeb0f678e0..04f0db030bb0 100644 --- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl +{ stdenv, fetchurl, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: diff --git a/nixpkgs/pkgs/development/libraries/libssh/default.nix b/nixpkgs/pkgs/development/libraries/libssh/default.nix index fe7bc094fdce..65de6db3b47b 100644 --- a/nixpkgs/pkgs/development/libraries/libssh/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { name = "libssh-0.8.7"; diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index cd8192e34fb9..046229e8f1d7 100644 --- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf +{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf , zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses }: diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index e725439a3f1a..f5026da4c3b9 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { version = "1.29.1"; diff --git a/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/nixpkgs/pkgs/development/libraries/libwebp/default.nix index 14be410bd165..b0457e76f2fc 100644 --- a/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { ++ optional tiffSupport libtiff ++ optional gifSupport giflib; + enableParallelBuilding = true; + meta = { description = "Tools and library for the WebP image format"; homepage = https://developers.google.com/speed/webp/; diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index de131052314a..33f818f7d62c 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl , zlib, xz, python2, ncurses, findXMLCatalogs , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null diff --git a/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix index 5e1e947b8f7c..94c2ca095829 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: stdenv.mkDerivation rec { - name = "libxml++-${maj_ver}.${min_ver}"; - maj_ver = "3.0"; - min_ver = "1"; + pname = "libxml++"; + version = "3.0.1"; src = fetchurl { - url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz"; + url = "mirror://gnome/sources/libxml++/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; - outputs = [ "out" "devdoc" ]; + outputs = [ "out" "dev" "doc" "devdoc" ]; nativeBuildInputs = [ pkgconfig perl ]; @@ -18,6 +17,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 ]; + postFixup = '' + substituteInPlace $dev/lib/pkgconfig/libxml++-3.0.pc \ + --replace 'docdir=''${datarootdir}' "docdir=$doc/share" + ''; + meta = with stdenv.lib; { homepage = http://libxmlplusplus.sourceforge.net/; description = "C++ wrapper for the libxml2 XML parser library, version 3"; diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix index 11f975187b0b..9af0c20d7014 100644 --- a/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , givaro , pkgconfig @@ -12,14 +11,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "linbox"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; - sha256 = "038br15hhc8dc1hq0pkv6vb1qx9hjr7hjv3w9fq9qwkd870h2v1q"; + sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/nixpkgs/pkgs/development/libraries/mapnik/default.nix index 1424ef9e12b4..3a90a4cdf33e 100644 --- a/nixpkgs/pkgs/development/libraries/mapnik/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapnik/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, fetchpatch +{ stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff -, libwebp, libxml2, proj, python, scons, sqlite, zlib +, libwebp, libxml2, proj, python, sqlite, zlib # supply a postgresql package to enable the PostGIS input plugin , postgresql ? null diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 3ab1e0a79749..ca0e73078a16 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }: +, boost, openssl, zlib, libsodium, olm, nlohmann_json }: stdenv.mkDerivation rec { name = "mtxclient-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/nsss/default.nix b/nixpkgs/pkgs/development/libraries/nsss/default.nix index f503799e6b1c..cd1205e2c7d4 100644 --- a/nixpkgs/pkgs/development/libraries/nsss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nsss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index 2d1e0ffb2005..83b1cfc2addf 100644 --- a/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,22 +1,10 @@ -{ stdenv -, fetchurl -, cmake -, tcl -, tk -, vtk -, mesa_glu -, libXext -, libXmu -, libXi -, doxygen -}: +{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, + libGL, libGLU, libXext, libXmu, libXi }: -let version = "7.3.0p3"; - commit = "V${builtins.replaceStrings ["."] ["_"] version}"; - -in stdenv.mkDerivation { - - name = "opencascade-occt-${version}"; +stdenv.mkDerivation rec { + pname = "opencascade-occt"; + version = "7.3.0p3"; + commit = "V${builtins.replaceStrings ["."] ["_"] version}"; src = fetchurl { name = "occt-${commit}.tar.gz"; @@ -24,10 +12,8 @@ in stdenv.mkDerivation { sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ tcl tk vtk mesa_glu libXext libXmu libXi doxygen ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ]; meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 676666d7f472..5e78f9f92ecf 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch +, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, google-gflags, protobuf , config @@ -35,20 +35,20 @@ }: let - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc"; + sha256 = "1gf0rbgd5s13q46bdna0bqn4yz9rxfhvlhbp5ds9hs326q8zprg8"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h"; + sha256 = "115qcq0k2wmvhxw5lyv14yrd8m6xq3qy0pdby90ml2yl1caymbfy"; }; # Contrib must be built in order to enable Tesseract support: @@ -147,6 +147,12 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; + patches = lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/7621b91769098359e893e68ad474040ca7940fa1.patch"; + sha256 = "12qb14yd5934ig61lzs4pg29gak9wjyhnj7nmfx5r213jj1a4m21"; + }); + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index a21cd6d079bf..b4ad2bcb8679 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -35,20 +35,20 @@ }: let - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48"; + sha256 = "0m1f51m11iz4vxfrmnhawksd669ld247rlfdq5fhkvfk3r7aidw6"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy"; + sha256 = "1phmmba96m5znjf3wxwhxavgzgp3bs5qqsjk9ay1i63rdacz4vlf"; }; # Contrib must be built in order to enable Tesseract support: diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 1a0e589373ca..61d42e4452fc 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +{ stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index ef617a92eaa7..67b903970d3e 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let - common = args@{ version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { + common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { name = "openssl-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 0e1be8633468..9ca329c67613 100644 --- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -4,28 +4,15 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.23.15"; + version = "0.23.16.1"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "0kf7zz2cvd6j09qkff3rl3wfisva82ia1z9h8bmy4ifwkv4yl9fv"; + sha256 = "0jr62qkbqxp3iawgksk1qc3gp8p6x09sg5v7xac80ghyfxil15wy"; }; - patches = [ - (fetchpatch { - # https://github.com/p11-glue/p11-kit/issues/212 - url = "https://github.com/p11-glue/p11-kit/commit/2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562.patch"; - sha256 = "13wi32hpzilvzxn57crn79h88q38jm2fzd5zxj4wnhv9dhwqr6lg"; - }) - (fetchpatch { - # https://github.com/p11-glue/p11-kit/issues/220 - url = "https://github.com/p11-glue/p11-kit/commit/e2170b295992cb7fdf115227a78028ac3780619f.patch"; - sha256 = "0433d8drfxaabsxwkkl4kr0jx8jr2l3a9ar11szipd9jwvrqnyr7"; - }) - ]; - outputs = [ "out" "dev"]; outputBin = "dev"; diff --git a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix index 842fae5ea938..47c6a27639d4 100644 --- a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix +++ b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix @@ -1,12 +1,10 @@ -{ lib -, fetchFromGitHub +{ fetchFromGitHub , stdenv , cmake , eigen , nlopt , ipopt , boost -, writeText }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index 08a1613c2feb..fd2b9feff68b 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake +{ stdenv, fetchFromGitHub, cmake , qhull, flann, boost, vtk, eigen, pkgconfig, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 7123858b8edc..5f51c6a194c7 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals enableGDML [ xercesc ] ++ stdenv.lib.optionals enableXM [ motif ] ++ stdenv.lib.optionals enableQT [ qtbase ] - ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ]; + ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ]; postFixup = '' # Don't try to export invalid environment variables. diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix index f28f0fd64203..0b1f3f0490d2 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, xercesc +{ stdenv, cmake, xercesc # The target version of Geant4 , geant4 diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index 2a033304b66e..d3bbb8679746 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, glib /*just passthru*/ }: +{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { name = "pixman-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix index ce3f5ab6b789..722c1cae8721 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/default.nix +++ b/nixpkgs/pkgs/development/libraries/podofo/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig , openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch -, gcc5 # TODO(@Dridus) remove this at next hash break }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/polkit/default.nix b/nixpkgs/pkgs/development/libraries/polkit/default.nix index fb16a7fb6939..b5b9f1f7fa4d 100644 --- a/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam, perl +{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl , intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? stdenv.isLinux, systemd diff --git a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix index 06444e776703..bd20dc540c06 100644 --- a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, gtest, doxygen -, graphviz, lcov, writeText }: +{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen +, graphviz, lcov }: stdenv.mkDerivation rec { pname = "properties-cpp"; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index 883dff56f2ee..610efcfef298 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, which, buildPackages +, autoreconfHook, zlib, gmock, buildPackages , version, sha256 , ... }: diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index dceda3c04bd4..5bccbf74965a 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: +{ stdenv, fetchurl, libjpeg, zlib, perl }: let version = "8.4.2"; in diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 2a474ab0ffea..40f4c56e8091 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -1,6 +1,6 @@ { qtModule, stdenv, lib, fetchurl , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel -, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt +, fontconfig, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin diff --git a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix index 51beba898f6c..22bcc56c82ab 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }: +{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }: stdenv.mkDerivation rec { version = "2.0.0"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 38b77781867d..16850fb1665e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.5"; name = "brial-${version}"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "08skgmwz190mvpkh0ddx92ilva6bxidxwh1qg16ipi768x92193s"; + sha256 = "1nv56fp3brpzanxj7vwvxqdafqfsfhdgq5imr3m94psw5gdfqwja"; }; # FIXME package boost-test and enable checks diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index c26e9c575ab2..46538d0022e7 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -7,8 +7,7 @@ shared ? false }: let - usedLibExtension = if shared then ".so" else ".a"; - inherit (stdenv.lib) optional optionals; + inherit (stdenv.lib) optional; version = "3.8.0"; in diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 350cfb1f7a24..2dcac58bf6ca 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg, darwin }: +{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin }: /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 8ec00f7e2b8b..d967bbf8c3e1 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config +{ stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). diff --git a/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/nixpkgs/pkgs/development/libraries/skalibs/default.nix index e56d677e8a46..c885f00a33c5 100644 --- a/nixpkgs/pkgs/development/libraries/skalibs/default.nix +++ b/nixpkgs/pkgs/development/libraries/skalibs/default.nix @@ -1,11 +1,11 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.8.0.0"; - sha256 = "06hyiq68jh32qwr2mydw3dbnm4zzpynnnmprd5g4iqavsycyvh53"; + version = "2.8.1.0"; + sha256 = "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723"; description = "A set of general-purpose C programming libraries"; diff --git a/nixpkgs/pkgs/development/libraries/soqt/default.nix b/nixpkgs/pkgs/development/libraries/soqt/default.nix index 9769596621b1..98226ce20f4a 100644 --- a/nixpkgs/pkgs/development/libraries/soqt/default.nix +++ b/nixpkgs/pkgs/development/libraries/soqt/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, stdenv, coin3d, qt4, pkgconfig }: +{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "soqt-${version}"; - version = "1.5.0"; + pname = "soqt"; + version = "1.6.0a"; - src = fetchurl { - url = "https://bitbucket.org/Coin3D/coin/downloads/SoQt-${version}.tar.gz"; - sha256 = "14dbh8ynzjcgwgxjc6530c5plji7vn62kbdf447w0dp53564p8zn"; + src = fetchhg { + url = "https://bitbucket.org/Coin3D/soqt"; + rev = "5f2afb4890e0059eb27e1671f980d10ebfb9e762"; + sha256 = "0j9lsci4cx95v16l0jaky0vzh4lbdliwz7wc17442ihjaqiqmv8m"; + fetchSubrepos = true; }; - buildInputs = [ coin3d qt4 ]; + buildInputs = [ coin3d qt5.qtbase ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = { homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; diff --git a/nixpkgs/pkgs/development/libraries/soxt/default.nix b/nixpkgs/pkgs/development/libraries/soxt/default.nix index c219d5bfb362..50ba9c944ab5 100644 --- a/nixpkgs/pkgs/development/libraries/soxt/default.nix +++ b/nixpkgs/pkgs/development/libraries/soxt/default.nix @@ -1,15 +1,18 @@ -{ fetchurl, stdenv, coin3d, motif, xlibsWrapper, libGLU_combined }: +{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }: stdenv.mkDerivation rec { - name = "soxt-${version}"; - version = "1.3.0"; + pname = "soxt"; + version = "unstable-2019-06-14"; - src = fetchurl { - url = "https://bitbucket.org/Coin3D/coin/downloads/SoXt-${version}.tar.gz"; - sha256= "f5443aadafe8e2222b9b5a23d1f228bb0f3e7d98949b8ea8676171b7ea5bf013"; + src = fetchhg { + url = "https://bitbucket.org/Coin3D/soxt"; + rev = "85e135bb266fbb17e47fc336b876a576a239c15c"; + sha256 = "0vk5cgn53yqf7csqdnlnyyhi4mbgx4wlsq70613p5fgxlvxzhcym"; + fetchSubrepos = true; }; - buildInputs = [ coin3d motif xlibsWrapper libGLU_combined ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ coin3d motif xlibsWrapper libGLU_combined libXmu ]; meta = with stdenv.lib; { homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; diff --git a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index 0169a42ed65e..d597fd16ad07 100644 --- a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -1,14 +1,12 @@ { stdenv , fetchurl , pkgconfig -, fetchpatch , meson , ninja , python3 , spice-protocol , gettext , openssl -, libpulseaudio , pixman , gobject-introspection , libjpeg_turbo diff --git a/nixpkgs/pkgs/development/libraries/spice/default.nix b/nixpkgs/pkgs/development/libraries/spice/default.nix index 902bc6a5560f..9e50a3b86b94 100644 --- a/nixpkgs/pkgs/development/libraries/spice/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice/default.nix @@ -1,5 +1,4 @@ { stdenv -, substituteAll , fetchurl , meson , ninja diff --git a/nixpkgs/pkgs/development/libraries/theft/default.nix b/nixpkgs/pkgs/development/libraries/theft/default.nix index 881f9c033a38..8d72d9a7d8ec 100644 --- a/nixpkgs/pkgs/development/libraries/theft/default.nix +++ b/nixpkgs/pkgs/development/libraries/theft/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; name = "theft-${version}"; src = fetchFromGitHub { - owner = "silentbicycle"; - repo = "theft"; - rev = "v${version}"; - sha256 = "1csdhnb10k7vsyd44vjpg430nf6a909wj8af2zawdkbvnxn5wxc4"; + owner = "silentbicycle"; + repo = "theft"; + rev = "v${version}"; + sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; }; preConfigure = "patchShebangs ./scripts/mk_bits_lut"; @@ -17,13 +17,21 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - postInstall = "install -m644 vendor/greatest.h $out/include/"; + + # fix the libtheft.pc file to use the right installation + # directory. should be fixed upstream, too + postInstall = '' + install -m644 vendor/greatest.h $out/include/ + + substituteInPlace $out/lib/pkgconfig/libtheft.pc \ + --replace "/usr/local" "$out" + ''; - meta = { + meta = with stdenv.lib; { description = "A C library for property-based testing"; - platforms = stdenv.lib.platforms.linux; - homepage = "https://github.com/silentbicycle/theft/"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.kquick ]; + homepage = "https://github.com/silentbicycle/theft/"; + platforms = platforms.unix; + license = licenses.isc; + maintainers = with maintainers; [ kquick thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix index 6e4640fabb7b..be09bb73b3aa 100644 --- a/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? [] +{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? [] , enableAqua ? stdenv.isDarwin, darwin , ... }: diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index b6f1136ea2b9..07892e970875 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobject-introspection +{ stdenv, fetchFromGitHub, autoreconfHook, gobject-introspection , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/utmps/default.nix b/nixpkgs/pkgs/development/libraries/utmps/default.nix index 81562659c0d9..16d4a8fa40b5 100644 --- a/nixpkgs/pkgs/development/libraries/utmps/default.nix +++ b/nixpkgs/pkgs/development/libraries/utmps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/nixpkgs/pkgs/development/libraries/volume-key/default.nix index 32f816023e5a..f6669f2f8fea 100644 --- a/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 , ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme , autoconf, automake, libtool -, writeShellScriptBin , buildPackages }: diff --git a/nixpkgs/pkgs/development/libraries/vte/2.90.nix b/nixpkgs/pkgs/development/libraries/vte/2.90.nix index 4b2b74c5e1d5..f4e8c128ccbf 100644 --- a/nixpkgs/pkgs/development/libraries/vte/2.90.nix +++ b/nixpkgs/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, glib, gtk3, ncurses, gobject-introspection }: +{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 602b112ef594..67ea5051a92f 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman, mesa_noglu , libcapSupport ? true, libcap diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index a89f132b8322..4d95b43ff876 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchFromGitHub, fetchurl, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xorgproto, gstreamer, gst-plugins-base, GConf, setfile , libGLSupported diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 6e559cfb6a94..7a32aba24ff8 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes , cf-private, derez, rez, setfile , AGL, Cocoa, Kernel diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 780b7d630cb7..b8cf86999e0b 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 37e55afc4e9f..74d263a94179 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; installPhase = let - libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so"; + libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' mkdir -p $out cp -r ../include $out diff --git a/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/nixpkgs/pkgs/development/libraries/zziplib/default.nix index 6aede4e9653f..010c73336b92 100644 --- a/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zziplib/default.nix @@ -1,4 +1,4 @@ -{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: +{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: stdenv.mkDerivation rec { name = "zziplib-${version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-17828.patch"; + url = "https://github.com/gdraheim/zziplib/commit/f609ae8971f3c0ce6.diff"; + sha256 = "0jhiz4fgr93wzh6q03avn95b2nsf6402jaki6hxirxyhs5v9ahry"; + }) + ]; postPatch = '' sed -i -e s,--export-dynamic,, configure ''; diff --git a/nixpkgs/pkgs/development/lua-modules/default.nix b/nixpkgs/pkgs/development/lua-modules/default.nix index 372d609792c2..091b94f58f51 100644 --- a/nixpkgs/pkgs/development/lua-modules/default.nix +++ b/nixpkgs/pkgs/development/lua-modules/default.nix @@ -1,5 +1,5 @@ # inspired by pkgs/development/haskell-modules/default.nix -{ pkgs, stdenv, lib +{ pkgs, lib , lua , overrides ? (self: super: {}) }: diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index e00a5b904c50..0f448343e968 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }@args: +{ pkgs, ... }: self: super: with super; { diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index 40b2ed775cd5..e5802c12e816 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: +{requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" , platformToolsVersion ? "28.0.1" diff --git a/nixpkgs/pkgs/development/mobile/androidenv/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/default.nix index 8d57f737c340..b05167460717 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/default.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/default.nix @@ -5,7 +5,7 @@ rec { composeAndroidPackages = import ./compose-android-packages.nix { - inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook; + inherit (pkgs) requireFile autoPatchelfHook; inherit pkgs pkgs_i686 licenseAccepted; }; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix index 01669024b3b8..6c8f6d664d75 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix @@ -8,7 +8,6 @@ let androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages); - extraParams = removeAttrs args ([ "name" ] ++ androidSdkArgNames); # Extract the parameters meant for the Android SDK androidParams = { diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix index 9e19afb24429..a7e158bd3bb1 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix @@ -20,10 +20,6 @@ let androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk; - realXcodewrapperArgs = { - inherit xcodeBaseDir; - } // xcodewrapperArgs; - xcodewrapper = composeXcodeWrapper xcodewrapperArgs; deleteKeychain = '' diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix index 336194cf0a81..e29801c51f97 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: +{pkgs, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: rec { titaniumsdk = let diff --git a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index 64bbd91a3d56..30e3687676ab 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ stdenv, fetchFromGitHub, fetchurl , ocaml, findlib, ocamlbuild, ocaml_oasis, - bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, utop, ppx_tools_versioned, which, makeWrapper, writeText diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix index 23585ad009c5..3d293b1a1ac4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildDunePackage -, ppx_fields_conv, ppx_sexp_conv, ppx_deriving +, ppx_fields_conv, ppx_sexp_conv , base64, fieldslib, jsonm, re, stringext, uri }: diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index d35a57f6b4bc..010df7d8df92 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, - lwt_react, cryptokit, - ipaddr, ocamlnet, ocaml_pcre, + lwt_react, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 5c0726176f6d..a8fff893d5c9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,6 +1,6 @@ -{ stdenv, janePackage, ocamlbuild, angstrom, cryptokit, ctypes, +{ janePackage, ocamlbuild, angstrom, cryptokit, ctypes, magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, - zarith, num, openssl + num, openssl , ppxlib }: diff --git a/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix index 0ef3cf167341..30aea547cbd1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ounit, pcre, uutf }: +{ stdenv, fetchFromGitHub, ocaml, findlib, pcre, uutf }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "jingoo is not available for OCaml ${ocaml.version}" diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix index 7ba22a025f49..fbd061a6566b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, lwt, ppx_tools_versioned }: +{ buildDunePackage, lwt, ppx_tools_versioned }: buildDunePackage { pname = "lwt_ppx"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix index bac6cd707940..e69b9dabeabc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { name = "menhir-${version}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 1a46c1e939b6..d25a5f4ce06c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-mlgmpidl-${version}"; - version = "1.2.8"; + version = "1.2.10"; src = fetchFromGitHub { owner = "nberth"; repo = "mlgmpidl"; rev = version; - sha256 = "1csqplyxi5gq6ma7g4la2x20mhz1plmjallsankv0mn0x69zb1id"; + sha256 = "181vpqx8zdairq645b8qpkzj4fnkb508iavk7sqzskag1s8613qn"; }; buildInputs = [ perl gmp mpfr ocaml findlib camlidl ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix index 5ab6ff226f21..7cc455b01957 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, sqlexpr, ounit +{ buildDunePackage, sqlexpr, ounit , ppx_core, ppx_tools_versioned, re, lwt_ppx }: diff --git a/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix index 65595992e2c1..378bcf3acec0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, zmq, ocaml_lwt }: +{ buildDunePackage, zmq, ocaml_lwt }: buildDunePackage rec { pname = "zmq-lwt"; diff --git a/nixpkgs/pkgs/development/pharo/vm/default.nix b/nixpkgs/pkgs/development/pharo/vm/default.nix index 5178551df453..a60afcd59ed7 100644 --- a/nixpkgs/pkgs/development/pharo/vm/default.nix +++ b/nixpkgs/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}: +{ stdenv, callPackage, pkgsi686Linux, ...}: let i686 = pkgsi686Linux.callPackage ./vms.nix {}; diff --git a/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/nixpkgs/pkgs/development/python-modules/Cython/default.nix index 277a3b047d1c..3c685e0f34bc 100644 --- a/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -8,7 +8,6 @@ , gdb , numpy , ncurses -, fetchpatch }: let @@ -26,11 +25,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.7"; + version = "0.29.10"; src = fetchPypi { inherit pname version; - sha256 = "55d081162191b7c11c7bfcb7c68e913827dfd5de6ecdbab1b99dab190586c1e8"; + sha256 = "26229570d6787ff3caa932fe9d802960f51a89239b990d275ae845405ce43857"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix index d449ae8bbf69..44ec253fbf78 100644 --- a/nixpkgs/pkgs/development/python-modules/JPype1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/JPype1/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, pytest }: +{ buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "JPype1"; diff --git a/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/nixpkgs/pkgs/development/python-modules/Mako/default.nix index e611d660b843..1144ca2a27f5 100644 --- a/nixpkgs/pkgs/development/python-modules/Mako/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.0.9"; + version = "1.0.10"; src = fetchPypi { inherit pname version; - sha256 = "0728c404877cd4ca72c409c0ea372dc5f3b53fa1ad2bb434e1d216c0444ff1fd"; + sha256 = "7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965"; }; checkInputs = [ markupsafe nose mock pytest_3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/nixpkgs/pkgs/development/python-modules/Nikola/default.nix index c6548f1b5984..52cf7598da8d 100644 --- a/nixpkgs/pkgs/development/python-modules/Nikola/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Nikola/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , isPy3k , fetchPypi -, fetchpatch , doit , glibcLocales , pytest diff --git a/nixpkgs/pkgs/development/python-modules/Theano/default.nix b/nixpkgs/pkgs/development/python-modules/Theano/default.nix index b2d0aaa5b6b9..554eaf977911 100644 --- a/nixpkgs/pkgs/development/python-modules/Theano/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Theano/default.nix @@ -1,8 +1,6 @@ { stdenv , runCommandCC -, lib , fetchPypi -, gcc , buildPythonPackage , isPyPy , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/nixpkgs/pkgs/development/python-modules/Wand/default.nix index 0b61f671f836..18e5c80615a4 100644 --- a/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "a2c318993791fab4fcfd460045415176f81d42f8c6fd8a88fb8d74d2f0f34b97"; + sha256 = "e2e08e19a37c61e85eaa307fe319889af46fe4cac6c23e3ae668b96be3e497ff"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix b/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix index 4636f51d4bd1..ced0ff28090d 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, fetchpatch, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , agate, openpyxl, xlrd, nose }: diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 78669e707184..37e0211d98db 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "aef9b6595f962182ad00c990095fb51d731c280e1d183e2b28cf0bdb5a942d0c"; + sha256 = "54630f769b0a25e83744673068db89cdd099f830818cea7ea9c43eb23add7941"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix index 4dc9401d5306..78b1c215c2bd 100644 --- a/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiozeroconf/default.nix @@ -3,7 +3,6 @@ , fetchPypi , netifaces , isPy27 -, python }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/nixpkgs/pkgs/development/python-modules/alembic/default.nix index 429efb8d0688..88fd18431d68 100644 --- a/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.9"; + version = "1.0.10"; src = fetchPypi { inherit pname version; - sha256 = "40b9a619aa5f25ea1e1508adcda88b33704ef28e02c9cfa6471e5c772ecf0829"; + sha256 = "828dcaa922155a2b7166c4f36ec45268944e4055c86499bd14319b4c8c0094b7"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix index c462c41822ab..9313a255fd05 100644 --- a/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder, pyyaml +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pyyaml , python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2 }: diff --git a/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/nixpkgs/pkgs/development/python-modules/alerta/default.nix index c366fc770b33..257e89790fa9 100644 --- a/nixpkgs/pkgs/development/python-modules/alerta/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alerta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeWrapper +{ stdenv, buildPythonPackage, fetchPypi , six, click, requests, pytz, tabulate, pythonOlder }: diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix index ccba946abbb4..9e3a97c1312e 100644 --- a/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -1,15 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ stdenv, buildPythonPackage, fetchPypi , pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales , entrypoints, jsonschema, numpy, pandas, six, toolz, typing , pythonOlder, recommonmark }: buildPythonPackage rec { pname = "altair"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0x4zm1xia6sln8dhwd803jlcii2a62fx3rlnj5vsa8g3anfc2v24"; + sha256 = "63934563a7a7b7186335858206a0b9be6043163b8b54a26cd3b3299a9e5e391f"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 632600a8fe34..e067504987d8 100644 --- a/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.7.7"; + version = "0.7.8"; src = fetchPypi { inherit pname version; - sha256 = "c3c7922f7b80107620f541a6c16435485e7045771b3ecfb998deacee0eb90753"; + sha256 = "15xv7lhivjhgsaw5j30w1fkk8y33r8nkr2hwp8z1jmsxhdv9l03y"; }; nativeBuildInputs = [ Babel ]; diff --git a/nixpkgs/pkgs/development/python-modules/arelle/default.nix b/nixpkgs/pkgs/development/python-modules/arelle/default.nix index a0acadd8db75..85033a1846f2 100644 --- a/nixpkgs/pkgs/development/python-modules/arelle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arelle/default.nix @@ -1,6 +1,6 @@ { gui ? true, buildPythonPackage, fetchFromGitHub, lib, - sphinx, lxml, isodate, numpy, pytest, openpyxl, + sphinx, lxml, isodate, numpy, openpyxl, tkinter ? null, py3to2, isPy3k, python, ... }: diff --git a/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/nixpkgs/pkgs/development/python-modules/arrow/default.nix index 0a8e7e6f4823..e357bef0dfdf 100644 --- a/nixpkgs/pkgs/development/python-modules/arrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arrow/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.13.1"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "6f54d9f016c0b7811fac9fb8c2c7fa7421d80c54dbdd75ffb12913c55db60b8a"; + sha256 = "82dd5e13b733787d4eb0fef42d1ee1a99136dc1d65178f70373b3678b3181bfc"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix b/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix index b6ebea815ccc..cdbbe547aec7 100644 --- a/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix +++ b/nixpkgs/pkgs/development/python-modules/astroid/1.6.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy +{ lib, fetchPypi, buildPythonPackage , lazy-object-proxy, six, wrapt, enum34, singledispatch, backports_functools_lru_cache , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index a078a4207163..42335a0393fe 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder , cryptography , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl , openssl, openssh }: diff --git a/nixpkgs/pkgs/development/python-modules/audioread/default.nix b/nixpkgs/pkgs/development/python-modules/audioread/default.nix index d4c485e909ca..addd187abeb6 100644 --- a/nixpkgs/pkgs/development/python-modules/audioread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/audioread/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, pytestrunner }: buildPythonPackage rec { pname = "audioread"; - version = "2.1.6"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - sha256 = "b0b9270c20833a75ce0d167fb2fdad52ddcd8e8f300be8afad3ac9715850bc50"; + sha256 = "073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168"; }; + nativeBuildInputs = [ pytestrunner ]; + # No tests, need to disable or py3k breaks doCheck = false; @@ -20,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/sampsyo/audioread"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/python-modules/av/default.nix b/nixpkgs/pkgs/development/python-modules/av/default.nix index c32719140ea7..8998abd6986a 100644 --- a/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -3,7 +3,6 @@ , fetchPypi , numpy , ffmpeg_4 -, libav , pkgconfig }: diff --git a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index f0d5f8833921..7634be181047 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "1.1.19"; + version = "1.1.21"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "622d9360a1b61172b4c0d1cc58f939c68402aa19ca44872ab3d224d913aa6d0c"; + sha256 = "25d696d2affbf5fe9b13aebe66271fce545e673e7e1eeaaec2d73599ba639d63"; }; propagatedBuildInputs = [ azure-nspkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix new file mode 100644 index 000000000000..2b7c7ded276c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, six +, requests +}: + +buildPythonPackage rec { + version = "3.1.0"; + pname = "azure-cosmos"; + + src = fetchPypi { + inherit pname version; + sha256 = "1955kpn2y16k5mil90bnnyscnh1hyh4d5l5v5b90ms969p61i9zl"; + }; + + propagatedBuildInputs = [ six requests ]; + + # requires an active Azure Cosmos service + doCheck = false; + + meta = with lib; { + description = "Azure Cosmos DB API"; + homepage = https://github.com/Azure/azure-cosmos-python; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-common/default.nix index 6561163c3a2b..dc7a0c3107c0 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-common/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-storage-common"; - version = "1.4.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "7ab607f9b8fd27b817482194b1e7d43484c65dcf2605aae21ad8706c6891934d"; + sha256 = "4ec87c7537d457ec95252e0e46477e2c1ccf33774ffefd05d8544682cb0ae401"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure/default.nix b/nixpkgs/pkgs/development/python-modules/azure/default.nix index 541cf1e72702..87a39255561e 100644 --- a/nixpkgs/pkgs/development/python-modules/azure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure/default.nix @@ -5,7 +5,6 @@ , futures , pyopenssl , requests -, pythonOlder , isPy3k }: diff --git a/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix index 95cbd7ca0411..1b8b8f2ba47e 100644 --- a/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pytest }: +{ stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "backports.shutil_which"; diff --git a/nixpkgs/pkgs/development/python-modules/blis/default.nix b/nixpkgs/pkgs/development/python-modules/blis/default.nix index 5fee40a941f9..e038e07507a0 100644 --- a/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , buildPythonPackage , fetchPypi , cython diff --git a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix index 687b7cec4cf4..1455a783593f 100644 --- a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,26 +3,26 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.33.1"; + version = "0.33.4"; format = "wheel"; - sha256 = "8eb4a788b3aec8abf5ff68d4165441bc57420c9f64ca5f471f58c3969fe08668"; + sha256 = "5e79117472686ac0c4aef5bad5172ea73a1c2d1646b808c35926bd26bdfb0c08"; }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "41.0.0"; + version = "41.0.1"; format = "wheel"; - sha256 = "e67486071cd5cdeba783bd0b64f5f30784ff855b35071c8670551fd7fc52d4a1"; + sha256 = "c7769ce668c7a333d84e17fe8b524b1c45e7ee9f7908ad0a73e1eda7e6a5aebf"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "19.0.3"; + version = "19.1.1"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "bd812612bbd8ba84159d9ddc0266b7fbce712fc9bc98c82dee5750546ec8ec64"; + sha256 = "993134f0475471b91452ca029d4390dc8f298ac63a712814f101cd1b6db46676"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix index 700f5b3d0c52..a286249ea0f3 100644 --- a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pkgs -, isPy3k , python }: diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 066d7058fed5..6f3e6f17e147 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, - txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, + txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, glibcLocales }: @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1fdahbpihs93pj640y2079yilca6w7vlwirfcz221885ih148257"; + sha256 = "cf35d2a87b11aba29c59e47e843deba1be9649114e792e830252ed8f7c35f963"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index f95d71dc2903..c1903b7b10fc 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1ajgvnhwvryi10q9bklpfazi7vxw2my9jlqgwnjccycbr6yznzsw"; + sha256 = "25968ace0c62cb773ed85d4ddbe07fd5aee68f4455909243ffb3ac12608cf82e"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index c8ebdf34b868..006f20a52c68 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, python, setuptoolsTrial, mock, twisted, future }: +{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future }: buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0nldf4ws1nrkhbapxiy2s8j9fjfbkhp17c5912p6qy3ximfcfa93"; + sha256 = "a26c68debb70f15abee307aff7b225e91a2eedca9c8d571212c391e615c36f53"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/nixpkgs/pkgs/development/python-modules/cachetools/default.nix b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix index 2581ba9c95f0..51bf0e753a91 100644 --- a/nixpkgs/pkgs/development/python-modules/cachetools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cachetools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachetools"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "9efcc9fab3b49ab833475702b55edd5ae07af1af7a4c627678980b45e459c460"; + sha256 = "8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/nixpkgs/pkgs/development/python-modules/caldav/default.nix index 027bc1784d1c..aa3aa8b9c02b 100644 --- a/nixpkgs/pkgs/development/python-modules/caldav/default.nix +++ b/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "caldav"; - version = "0.6.0"; + version = "0.6.1"; propagatedBuildInputs = [ tzlocal requests vobject lxml ]; src = fetchPypi { inherit pname version; - sha256 = "1ll9knpc50yxx858hrvfnapdi2a6g1pz9cnjhwffry2x7r4ckarz"; + sha256 = "eddb7f4e6a3eb5f02eaa2227817a53ac4372d4c4d51876536f4c6f00282f569e"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index 28148450f076..e54136a50276 100644 --- a/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, lib, fetchPypi , pytest, filelock, mock, pep8 -, cython, isPy27, isPy37, glibcLocales +, cython, isPy27 , six, pyshp, shapely, geos, proj, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , xvfb_run diff --git a/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index dbf5a8686cd9..1551c98143c9 100644 --- a/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -2,7 +2,6 @@ , libev , buildPythonPackage , fetchPypi -, pkgs , cython , futures , six diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 41c9493922a9..d499a937f501 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect +{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect , case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet }: diff --git a/nixpkgs/pkgs/development/python-modules/cement/default.nix b/nixpkgs/pkgs/development/python-modules/cement/default.nix index c2f5a09e851a..edcb4086cf21 100644 --- a/nixpkgs/pkgs/development/python-modules/cement/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cement/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cement"; - version = "3.0.2"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "8c692493c9d97b07e4a2c0770223fa5ee12a3110cfcb246d7d26fffe22edd22e"; + sha256 = "10a8459dc9fc31d6c038ede24a9081c5c3bd5fcd75b071e01baf281f81c9eace"; }; # Disable test tests since they depend on a memcached server running on diff --git a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix index adf363e05131..81f6ef1e8371 100644 --- a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cerberus"; - version = "1.3"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0afhm8x812shj1fbj9jri6wcrlv0avcfis7619sl140mlhpgpzkz"; + sha256 = "0be48fc0dc84f83202a5309c0aa17cd5393e70731a1698a50d118b762fbe6875"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/nixpkgs/pkgs/development/python-modules/chalice/default.nix index f982ffefb2a7..19aaf3368e5d 100644 --- a/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -11,7 +11,6 @@ , six , typing , wheel -, pythonOlder , watchdog , pytest , hypothesis diff --git a/nixpkgs/pkgs/development/python-modules/cleo/default.nix b/nixpkgs/pkgs/development/python-modules/cleo/default.nix index 31a33b73c2bc..a1da38cb6eaa 100644 --- a/nixpkgs/pkgs/development/python-modules/cleo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cleo/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cleo"; - version = "0.7.2"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "091nzpfp5incd2fzqych78rvyx4i3djr50cnizbjzr3dc7g00l3s"; + sha256 = "58d26642fa608a1515093275cd98875100c7d50f01fc1f3bbb7a78dbb73e4b14"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/click/default.nix b/nixpkgs/pkgs/development/python-modules/click/default.nix index 1ae0cba4844a..9951b1711b39 100644 --- a/nixpkgs/pkgs/development/python-modules/click/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, locale, pytest }: buildPythonPackage rec { pname = "click"; diff --git a/nixpkgs/pkgs/development/python-modules/clikit/default.nix b/nixpkgs/pkgs/development/python-modules/clikit/default.nix index 0d5247c02e05..d8179d2e3b64 100644 --- a/nixpkgs/pkgs/development/python-modules/clikit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clikit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "clikit"; - version = "0.2.3"; + version = "0.2.4"; src = fetchPypi { inherit pname version; - sha256 = "0zr1s0xhk62p9a6zcp5whvsb27lddyk8gx03k9l8q18jp7y3igbv"; + sha256 = "d6807cf4a41e6b981b056075c0aefca2db1dabc597ed18fa4d92b8b2e2678835"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index 32f852a2b63b..8b171fb3c8df 100644 --- a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0f5f5rgwckci2fqwbzjk5sfpwxqn5gy0biz8sjll4v5zgvjsswxq"; + sha256 = "b873ade57ebf6c42a9d4e8c705fc2b16777e9d2e53fec5b113914dc65f2eae38"; }; LC_ALL="en_US.UTF-8"; diff --git a/nixpkgs/pkgs/development/python-modules/cntk/default.nix b/nixpkgs/pkgs/development/python-modules/cntk/default.nix index 564116bc6755..43a7b7646dae 100644 --- a/nixpkgs/pkgs/development/python-modules/cntk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cntk/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pkgs , numpy diff --git a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix index 06b5e762852a..5dfcd2f415b9 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix @@ -6,7 +6,6 @@ , distributed , pytest , scikitlearn -, scipy }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix index 8a2bd2187f94..cd38c8f137c5 100644 --- a/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "1.1.5"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "4b0b82a4d61714d3a49953274b1a8a689a51eacf89c4c2ff18aa7f6282ce515e"; + sha256 = "5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index d6315575766f..af2607bca146 100644 --- a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.14.5"; + version = "3.14.6"; src = fetchPypi { inherit pname version; - sha256 = "5e0c73fbec99d2782479f6d8c292be87ed8672eb42b451e7f7a5d52a3458c4e5"; + sha256 = "2e1889a0981381f557b0d14cba900adf7476817c53c13bfb04e2a30b3db0f1d3"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/distlib/default.nix b/nixpkgs/pkgs/development/python-modules/distlib/default.nix index 73bc143beeb6..aea6bcd9504b 100644 --- a/nixpkgs/pkgs/development/python-modules/distlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.2.9"; + version = "0.2.9.post0"; src = fetchPypi { inherit pname version; - sha256 = "1z9c4ig19hjk18agwljv5ib3pphicg50w9z5zsnqn97q7vnv17gm"; + sha256 = "ecb3d0e4f71d0fa7f38db6bcc276c7c9a1c6638a516d726495934a553eb3fbe0"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/distro/default.nix b/nixpkgs/pkgs/development/python-modules/distro/default.nix index 09868b2f7555..ad8da4255d69 100644 --- a/nixpkgs/pkgs/development/python-modules/distro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: +{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov }: buildPythonPackage rec { pname = "distro"; diff --git a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix index b66f6b8f73a3..68fe4c913d69 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, python }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/django-sites/default.nix b/nixpkgs/pkgs/development/python-modules/django-sites/default.nix index 63c61131261d..2882e1dc2b93 100644 --- a/nixpkgs/pkgs/development/python-modules/django-sites/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-sites/default.nix @@ -4,22 +4,29 @@ buildPythonPackage rec { pname = "django-sites"; version = "0.10"; - meta = { - description = '' - Alternative implementation of django "sites" framework - based on settings instead of models. - ''; - homepage = https://github.com/niwinz/django-sites; - license = lib.licenses.bsd3; - }; - src = fetchPypi { inherit pname version; sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3"; }; + # LICENSE file appears to be missing from pypi package, but expected by the installer + # https://github.com/niwinz/django-sites/issues/11 + postPatch = '' + touch LICENSE + ''; propagatedBuildInputs = [ django ]; - # django.core.exceptions.ImproperlyConfigured: Requested settings, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. + # required files for test don't seem to be included in pypi package, full source for 0.10 + # version doesn't appear to be present on github + # https://github.com/niwinz/django-sites/issues/9 doCheck = false; + + meta = { + description = '' + Alternative implementation of django "sites" framework + based on settings instead of models. + ''; + homepage = https://github.com/niwinz/django-sites; + license = lib.licenses.bsd3; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/django/1_11.nix b/nixpkgs/pkgs/development/python-modules/django/1_11.nix index 90fd82f28f46..e4e4d129a8d0 100644 --- a/nixpkgs/pkgs/development/python-modules/django/1_11.nix +++ b/nixpkgs/pkgs/development/python-modules/django/1_11.nix @@ -1,5 +1,4 @@ { stdenv, buildPythonPackage, fetchurl, substituteAll, - pythonOlder, geos, gdal, pytz, withGdal ? false }: diff --git a/nixpkgs/pkgs/development/python-modules/django/1_8.nix b/nixpkgs/pkgs/development/python-modules/django/1_8.nix index ee2408f73405..b6b51a07e9f6 100644 --- a/nixpkgs/pkgs/development/python-modules/django/1_8.nix +++ b/nixpkgs/pkgs/development/python-modules/django/1_8.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchurl -, pythonOlder }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/nixpkgs/pkgs/development/python-modules/django/2_2.nix index 8f3065633a1d..d2d8682ade22 100644 --- a/nixpkgs/pkgs/development/python-modules/django/2_2.nix +++ b/nixpkgs/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.1"; + version = "2.2.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1spa701phl8ha7qmfr89hwpa43kf52zbrs3xyc0rlvxianykrk3g"; + sha256 = "1xbqsa016szsqx6pnggrlxs81169hd8adzmdvp969007xg9k0gbm"; }; patches = stdenv.lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix index 11ad13cb4a1a..007d70ca8106 100644 --- a/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, django_environ, mock, django, six +, django_environ, mock, django , pytest, pytestrunner, pytest-django }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix index 9dfdf51186fc..69c2f5317289 100644 --- a/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.3"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "0xjs803r5fxaqpkjbpsb17j8racxa4q1nvjjaj1akkgkgw9dj343"; + sha256 = "ed46722389fb2441860d471c7538967dee545bcee891d3d907b04f4baa98f5fa"; }; # tests assume the availability of a mysql/postgresql database diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index 49e5c5f0b6a0..12dcbf3993ab 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.9.3"; + version = "3.9.4"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "1w1rc8cpw89sll5wsg1aj1w3klk91a1bsdz9y4zhg5xrc0qpd118"; + sha256 = "c12869cfd83c33d579b17b3cb28a2ae7322a53c3ce85580c2a2ebe4e3f56c4fb"; }; # Test settings are missing diff --git a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix index c8ecbceb5e86..678276b1b31a 100644 --- a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "0.0.13"; + version = "0.0.14"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "1p0x81q3m3nlj4rqal9a959xcbjhncb548wd4wr3l7dpiajqqc9c"; + sha256 = "0b829a9e25ac9af17a0affa41c0fca6541a03b8edb0178f60dc036e2ce59eeb5"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/docrep/default.nix b/nixpkgs/pkgs/development/python-modules/docrep/default.nix index 46106971b6e7..8e6b00d808cb 100644 --- a/nixpkgs/pkgs/development/python-modules/docrep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docrep/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "docrep"; - version = "0.2.5"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "a67c34d3a44892d3e2a0af0ac55c02b949a37ced9d55c0d7ade76362ba6692d7"; + sha256 = "c48939ae14d79172839a5bbaf5a570add47f6cc44d2c18f6b1fac8f1c38dec4d"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/dynd/default.nix b/nixpkgs/pkgs/development/python-modules/dynd/default.nix index 337763afbd46..d4cd0e711a0d 100644 --- a/nixpkgs/pkgs/development/python-modules/dynd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dynd/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , isPyPy , isPy3k , cython diff --git a/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix index 46948f2485c1..7f8a803740d0 100644 --- a/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.5"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "0gdl6y37g8rns2i26d2zlx7x4kbpql9h5qd8k23ka69q6frcpb8k"; + sha256 = "f757cd16cdab5b87117b4ee6cf197f99bfa109253364c7bd717ad0bcd39218a0"; }; # No tests diff --git a/nixpkgs/pkgs/development/python-modules/effect/default.nix b/nixpkgs/pkgs/development/python-modules/effect/default.nix index 8e4ad446746a..6b8329550da3 100644 --- a/nixpkgs/pkgs/development/python-modules/effect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/effect/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchPypi -, isPy37 , lib , six , attrs diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 1ca8c9b55ff2..b906f94b4272 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -5,7 +5,6 @@ , elasticsearch , ipaddress , python-dateutil -, pytz , six }: diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index a909d2589427..dc991f529fcb 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.0.1"; + version = "7.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0ax00k6xi7g419azjdn8g19zad304xmxw62pcfp3njawqnlnwp24"; + sha256 = "cbc73831c63fa2824538df76fcb2c4be007b43dbd9e7788ae70ea6d24109925b"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix index 16e94bd785f0..a06f276232ef 100644 --- a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix @@ -9,7 +9,6 @@ , six , pathlib , python_magic -, isPy3k , lib }: diff --git a/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix index 4a921b2390d7..e2e0a4d4d92e 100644 --- a/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastentrypoints/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastentrypoints"; diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index a31b5670732a..260d1b7f4b30 100644 --- a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, fetchpatch, numba, numpy, pandas, +{ lib, buildPythonPackage, fetchPypi, fetchpatch, numba, numpy, pandas, pytestrunner, thrift, pytest, python-snappy, lz4 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix index 40a1d759c127..25aae4591eb5 100644 --- a/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , re2 -, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/nixpkgs/pkgs/development/python-modules/filelock/default.nix index a548f1ab5d2e..3592a1f28c71 100644 --- a/nixpkgs/pkgs/development/python-modules/filelock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filelock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.0.10"; + version = "3.0.12"; src = fetchPypi { inherit pname version; - sha256 = "1rjv7g85smh6hrq6n9h721kh83qjv8mfp0ksdnbqbbsd82xw246n"; + sha256 = "18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/nixpkgs/pkgs/development/python-modules/flake8/default.nix index 675e5ea86f59..a860ea152ebb 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing }: diff --git a/nixpkgs/pkgs/development/python-modules/flask/default.nix b/nixpkgs/pkgs/development/python-modules/flask/default.nix index 67cd9aa457e9..df39b2ea7253 100644 --- a/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -2,12 +2,12 @@ , itsdangerous, click, werkzeug, jinja2, pytest }: buildPythonPackage rec { - version = "1.0.2"; + version = "1.0.3"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48"; + sha256 = "ad7c6d841e64296b962296c2c2dabc6543752985727af86a975072dea984b6f3"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix index 80a6f439de80..3f0fd31d8a15 100644 --- a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix @@ -5,19 +5,20 @@ , six , mock , nose +, pytest }: buildPythonPackage rec { pname = "freezegun"; - version = "0.3.11"; + version = "0.3.12"; src = fetchPypi { inherit pname version; - sha256 = "e839b43bfbe8158b4d62bb97e6313d39f3586daf48e1314fb1083d2ef17700da"; + sha256 = "2a4d9c8cd3c04a201e20c313caf8b6338f1cfa4cda43f46a94cc4a9fd13ea5e7"; }; propagatedBuildInputs = [ dateutil six ]; - checkInputs = [ mock nose ]; + checkInputs = [ mock nose pytest ]; meta = with stdenv.lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/nixpkgs/pkgs/development/python-modules/gateone/default.nix b/nixpkgs/pkgs/development/python-modules/gateone/default.nix index 136c089ee4b6..e0b6b3e49fa4 100644 --- a/nixpkgs/pkgs/development/python-modules/gateone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gateone/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , tornado , futures , html5lib diff --git a/nixpkgs/pkgs/development/python-modules/genpy/default.nix b/nixpkgs/pkgs/development/python-modules/genpy/default.nix index 0a8344f8b924..c8bbeefd6acd 100644 --- a/nixpkgs/pkgs/development/python-modules/genpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genpy/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pytools , numpy -, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/genshi/default.nix b/nixpkgs/pkgs/development/python-modules/genshi/default.nix index ad6f4ee1b21e..c86fae5d0e9d 100644 --- a/nixpkgs/pkgs/development/python-modules/genshi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genshi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Genshi"; - version = "0.7.1"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "0d87ae62cf2ed92133f35725da51e02d09f79bb4cb986f0d948408a0279dd3f8"; + sha256 = "7933c95151d7dd2124a2b4c8dd85bb6aec881ca17c0556da0b40e56434b313a0"; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) diff --git a/nixpkgs/pkgs/development/python-modules/geopy/default.nix b/nixpkgs/pkgs/development/python-modules/geopy/default.nix index da338648e4cf..9dbfeb7472c0 100644 --- a/nixpkgs/pkgs/development/python-modules/geopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.18.1"; + version = "1.20.0"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "07a21f699b3daaef726de7278f5d65f944609306ab8a389e9f56e09abf86eac8"; + sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2"; }; doCheck = false; # too much diff --git a/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/nixpkgs/pkgs/development/python-modules/gipc/default.nix index e2065e632d23..8255668de1cf 100644 --- a/nixpkgs/pkgs/development/python-modules/gipc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gipc/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , gevent }: diff --git a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index d59bc5a70b89..1acc9603db34 100644 --- a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi , httplib2, google_auth, google-auth-httplib2, six, uritemplate, oauth2client }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix index c39d14fcf5eb..51782dce167a 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "0.32.1"; + version = "0.32.2"; src = fetchPypi { inherit pname version; - sha256 = "bb113894e1322102d4917740be4870798cad76aa4291ff742ada5548988b2223"; + sha256 = "40d1fc8009c228f70bd0e2176e73a3f101051ad73889b3d25a5df672c029a8bd"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix index 54d772d7e9c3..f514d22ef081 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "e00bddc03670be206ddcbc5c1cbda0acc51db963f0ff54189bd6710f8e93a4c9"; + sha256 = "7a44d9b0263cbbe05963522f61ba177e64282043f30999e0bc3368fd79a3af12"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix index e9ff0b81ec70..398c2b664677 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.29.2"; + version = "0.29.3"; src = fetchPypi { inherit pname version; - sha256 = "d1476115c983094f124fe8b7a1350414072c048bf236336f3ab0816912e6e6bf"; + sha256 = "a876811e44554fb8a8db4df4a2be649f356e1d9d97eefccfaf5a8d5273819d22"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix index d6a6ede039de..5dc45ad469db 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "1.10.0"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "13ac67399289b202b409e6cef7a87dea32ddabf902f69a677bd05554f6aecf0b"; + sha256 = "a70201ca9f3972ff0e3272c5628b22ed9227e10ac00e570c28087377733632df"; }; checkInputs = [ pytest mock webapp2 django flask ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index fd67709dd375..1bdd3635b210 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.28.3"; + version = "0.28.4"; src = fetchPypi { inherit pname version; - sha256 = "5999f327bfa6692679e82690c3e61f11097bbbe3ecee370210625676bac605e6"; + sha256 = "ae43be426532b875c161625626ab759ecef633801e21f14b2ef8380884a2193b"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index c52440e0ee14..f347a1f2553c 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.28.3"; + version = "0.28.4"; src = fetchPypi { inherit pname version; - sha256 = "8188a098c2c6603aa0cad50f8778a84a0f36a62062309a331a41271372fac798"; + sha256 = "d5b097a15fa9bb50442ccaf25fdb4622fdf09b8a873abf549c432d8fdc16c2f1"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix index aab9f827da0f..efb0c6aacd8c 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.15.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "13b9ah54z6g3w8p74a1anmyz84nrxy27snqv6vp95wsizp8zwsyn"; + sha256 = "8032e576e2f91a1d3de2355118040c3bcd9916e0453a6b3f64c1b42ed151690a"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix b/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix index 99fed298c1d3..1422469784d1 100644 --- a/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "0.20.2"; + version = "0.20.3"; src = fetchPypi { inherit pname version; - sha256 = "2129e736d5a21242a4840dc4b494720feb51edd6fafdc12cd6da4b0cb24e5295"; + sha256 = "438ac953248c93972a5b1a0be24ec9bf75c947cee4159dd731b585ce81911f87"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix index d17b98e2b680..337624012aad 100644 --- a/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.9"; + version = "1.5.10"; src = fetchPypi { inherit pname version; - sha256 = "627ec53fab43d06c1b5c950e217fa9819e169daf753111a7f244e94bf8fb3384"; + sha256 = "d564872083af40bbcc7091340f17db778a316525c7c76497d58d11b98ca2aa74"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/nixpkgs/pkgs/development/python-modules/gpy/default.nix b/nixpkgs/pkgs/development/python-modules/gpy/default.nix index cb4cdca1e472..8bbcaed377a8 100644 --- a/nixpkgs/pkgs/development/python-modules/gpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpy/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.9.6"; + version = "1.9.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f11d649b3320d4cb836d283706754953277c8696977726803ccd3ee1355a94a7"; + sha256 = "33a55bb99fe5c7cdd8df4f8e220e3b87574afde49f5654b3ef7c0445018af4a0"; }; # running tests produces "ImportError: cannot import name 'linalg_cython'" diff --git a/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix b/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix index 58aa6c84ade3..41c13b1fbd4c 100644 --- a/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "graph_nets"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "15cbs9smmgqz2n9mnlzdbqj3iv9iw179d2g0f9lnimdy7xl4jqdf"; + sha256 = "6f27f0358a477d4ec3ab300bf09944b4dfdd5c10b0a5f7ac06bcb32d1327ebe1"; }; buildInputs = []; diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 4e548577f906..f16a5800bb44 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib, grpc, grpcio}: +{ stdenv, buildPythonPackage, fetchPypi, lib, grpcio}: buildPythonPackage rec { pname = "grpcio-tools"; diff --git a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix index 7f0ba451af67..c729874846da 100644 --- a/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , pkgs , python , pygobject3 diff --git a/nixpkgs/pkgs/development/python-modules/gumath/default.nix b/nixpkgs/pkgs/development/python-modules/gumath/default.nix index b066f323d682..2937b876dec4 100644 --- a/nixpkgs/pkgs/development/python-modules/gumath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gumath/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , numba , ndtypes , xnd diff --git a/nixpkgs/pkgs/development/python-modules/gym/default.nix b/nixpkgs/pkgs/development/python-modules/gym/default.nix index ea920663846a..e27aed0627b3 100644 --- a/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.12.1"; + version = "0.12.5"; src = fetchPypi { inherit pname version; - sha256 = "f8bee3672759aeec4271169dcbb2afc069b898c7f92882d965c59be8085f2b35"; + sha256 = "027422f59b662748eae3420b804e35bbf953f62d40cd96d2de9f842c08de822e"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix index 0ec55dae3e4d..cd3264b78bb2 100644 --- a/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix index d20c43754fce..72d818c25d62 100644 --- a/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix @@ -6,17 +6,27 @@ , scipy , scikitlearn , fetchPypi +, fetchpatch }: buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.20"; + version = "0.8.22"; src = fetchPypi { inherit pname version; - sha256 = "263e9f34db63eec217d50f2ca3e65049c065775dc4095b5ee817824cd2b5b51b"; + sha256 = "5cfdc25375123eb9a72363449979141cc928c1953f220f0f81d7baabcaccec2d"; }; + patches = [ + # Fix Tests. Drop in release >0.8.20 + (fetchpatch { + name = "test-rsl-missing-import.patch"; + url = https://github.com/scikit-learn-contrib/hdbscan/commit/e40ccef139e56e38adf7bd6912cd63efd97598f9.patch; + sha256 = "0cfq4ja7j61h2zwd1jw5gagcz2sg18kjnx29sb0bwa13wfw6fip0"; + }) + ]; + checkInputs = [ nose ]; propagatedBuildInputs = [ cython numpy scipy scikitlearn ]; diff --git a/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 405b66ce724b..bd0cbda48d8a 100644 --- a/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.12.2"; + version = "1.12.3"; src = fetchPypi { inherit pname version; - sha256 = "0i4lfnajz685hlp9m0bjn7s279bv6mm5118b1qmldzqdnvw4s032"; + sha256 = "df64c0f163fe8b43d28cf5bcdeb8abc45d882aedca525b870f17987edd0c80a2"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix index ad25b8977c05..c4afe809cfb6 100644 --- a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchgit +{ stdenv, fetchgit , cmake, pkgconfig , python , mpi ? null diff --git a/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index bbea01f49001..53e42027ba22 100644 --- a/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -5,7 +5,6 @@ , requests-cache , pygments , pyquery -, python }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix index 2c24d7b9d6a6..a09ed7b94208 100644 --- a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.6"; + version = "0.4.7"; src = fetchPypi { inherit pname version; - sha256 = "0pxcwk5lc8ljil77xqywr0bq1xxj11z92lpfj185ac72d2b1sma5"; + sha256 = "1gzs9fa38m80y509fg58ylwhxgy7w28ww968pi6wmfrih9ib6l93"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix index 7d8f25ca9540..cf78a6185365 100644 --- a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix @@ -8,8 +8,6 @@ , nose , nose-exclude , coverage -, certifi -, urllib3 , rednose , nose-randomly , six diff --git a/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix b/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix index 2e2e4e1cb774..d7950d3adb69 100644 --- a/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, idna, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, idna }: buildPythonPackage rec { pname = "hyperlink"; diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index 2db6ad1c3d03..8837e34c788e 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.2"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9"; + sha256 = "432c548d6138cb57a3d8f62f079a025a29b8ae34a50dd3b496bbf661818f2bc0"; }; # Tests not included in PyPI tarball diff --git a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix index 5bc281d2be1e..e5087a105360 100644 --- a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix @@ -3,7 +3,6 @@ , fetchPypi , ipaddress , python -, pythonOlder }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix index 0c5ce54a229c..d950036ec484 100644 --- a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imgaug"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "03dcbb3d7485de372eacde4b890b676e0c7a992524ee4bc72bd05a9a1cc5f9a4"; + sha256 = "42b0c4c8cbe197d4f5dbd33960a1140f8a0d9c22c0a8851306ecbbc032092de8"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix index 4f7ba65a27f3..eeb27b14080a 100644 --- a/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxgraph/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, influxdb, graphite_api, memcached, gnugrep +, influxdb, graphite_api, memcached }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix index f9ced7e63daf..ce265d013785 100644 --- a/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/infoqscraper/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , html5lib , six , beautifulsoup4 diff --git a/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix new file mode 100644 index 000000000000..58e7f61b6762 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/inquirer/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi, python-editor, readchar, blessings, pytest, pytestcov, pexpect, pytest-mock }: + +buildPythonPackage rec { + pname = "inquirer"; + version = "2.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "01lf51y3bxsxkghbdk9hr42yvihpwi2s5zpxnra3bx41r35msvjz"; + }; + + propagatedBuildInputs = [ python-editor readchar blessings ]; + + # No real changes in 2.0.0...e0edfa3 + postPatch = '' + substituteInPlace setup.py \ + --replace "readchar == 2.0.1" "readchar >= 2.0.0" + ''; + + checkInputs = [ pytest pytestcov pexpect pytest-mock ]; + + checkPhase = '' + pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/magmax/python-inquirer"; + description = "A collection of common interactive command line user interfaces, based on Inquirer.js"; + license = licenses.mit; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix index 2646ee1b9363..c7f6e5c82194 100644 --- a/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -15,7 +15,6 @@ , six , tornado , pytest -, pythonOlder , isPy27 }: diff --git a/nixpkgs/pkgs/development/python-modules/intelhex/default.nix b/nixpkgs/pkgs/development/python-modules/intelhex/default.nix index 6ed21597aff0..20098485ad48 100644 --- a/nixpkgs/pkgs/development/python-modules/intelhex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intelhex/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , fetchpatch -, fetchurl }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/ipython/5.nix b/nixpkgs/pkgs/development/python-modules/ipython/5.nix index 3709ba40dc03..15e7d00bcece 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython/5.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch # Build dependencies , glibcLocales # Test dependencies diff --git a/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 10bc1ecf2f87..f94b690b7f7b 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -17,22 +17,30 @@ , pexpect , appnope , backcall +, fetchpatch }: buildPythonPackage rec { pname = "ipython"; - version = "7.2.0"; + version = "7.5.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12"; + sha256 = "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26"; }; prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace setup.py --replace "'gnureadline'" " " ''; + patches = [ + (fetchpatch { + url = "https://github.com/ipython/ipython/commit/e1b53e9ef91a43b9e275bb9e48b4253218375d87.patch"; + sha256 = "sha256:0q7zsgalwxss6aikhakbdkvvz0g4ac4sa3ncrklm74ksqh56rsgb"; + }) + ]; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/isodate/default.nix b/nixpkgs/pkgs/development/python-modules/isodate/default.nix index 4422e1614fb6..425a295e5a53 100644 --- a/nixpkgs/pkgs/development/python-modules/isodate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isodate/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , python , six }: diff --git a/nixpkgs/pkgs/development/python-modules/isort/default.nix b/nixpkgs/pkgs/development/python-modules/isort/default.nix index 532b743bab42..979213f945be 100644 --- a/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }: let - skipTests = lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; + skipTests = [ "test_requirements_finder" "test_pipfile_finder" ] ++ lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; in buildPythonPackage rec { pname = "isort"; - version = "4.3.17"; # Note 4.x is the last version that supports Python2 + version = "4.3.20"; # Note 4.x is the last version that supports Python2 src = fetchPypi { inherit pname version; - sha256 = "268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a"; + sha256 = "c40744b6bc5162bbb39c1257fe298b7a393861d50978b565f3ccd9cb9de0182a"; }; propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; diff --git a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix index 0b3d1981dc68..98725ca4767e 100644 --- a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , nose , jinja2 , pyyaml @@ -9,21 +8,20 @@ buildPythonPackage rec { pname = "j2cli"; - version = "0.3.8"; - disabled = isPy3k; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1f1a5fzap4ji5l7x8bprrgcpy1071lpa9g5h8jz7iqzgqynkaygi"; + sha256 = "6f6f643b3fa5c0f72fbe9f07e246f8e138052b9f689e14c7c64d582c59709ae4"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; propagatedBuildInputs = [ jinja2 pyyaml ]; meta = with stdenv.lib; { - homepage = https://github.com/kolypto/j2cli; + homepage = "https://github.com/kolypto/j2cli"; description = "Jinja2 Command-Line Tool"; - license = licenses.bsd3; + license = licenses.bsd2; longDescription = '' J2Cli is a command-line tool for templating in shell-scripts, leveraging the Jinja2 library. diff --git a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 764e47501cb3..6d9086748572 100644 --- a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, pip , pbr , mock , python-jenkins diff --git a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index 226f1743a2a0..15191858daa8 100644 --- a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonApplication, EditorConfig, fetchpatch, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index beccc2f06b89..3fe986fc3351 100644 --- a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, six -, pytest, pytest-flake8, backports_unittest-mock, keyring, setuptools_scm +, pytest, backports_unittest-mock, keyring, setuptools_scm }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix index 08c9e8b763dc..6de2af1e505e 100644 --- a/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, python }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix index fc5b0b2fe045..13fe196e471c 100644 --- a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }: +{ stdenv, fetchPypi, buildPythonPackage, pyasn1 }: buildPythonPackage rec { pname = "ldap3"; diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index 9eba46cd303f..3f9f58b5203f 100644 --- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.23"; + version = "0.1.24"; src = fetchPypi { inherit pname version; - sha256 = "476a1d1f6d9e7f72befff0ea4e631461882c9c1c620b92878503bf46383c8d20"; + sha256 = "fc111ed5db8da93f280928d966f9d87416b464f5f09cec80b60e88c4c1265026"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libsexy/default.nix b/nixpkgs/pkgs/development/python-modules/libsexy/default.nix index 03797575a83e..78e0dae2634c 100644 --- a/nixpkgs/pkgs/development/python-modules/libsexy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, glib, python }: buildPythonPackage rec { pname = "libsexy"; diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 9f120f852fcb..d1220a6abbf3 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "0al5qcvzcl4v70vngbv39jg422jsy0m1b5q9pp54cc7m9b666jax"; + sha256 = "0nh6dvf8g93hv7cma6r8l88k8l20zck6a0ax29mrdg03f9hqdk9a"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index 9b268686b8ff..b63704bf8e08 100644 --- a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, libusb1, pytest }: buildPythonPackage rec { pname = "libusb1"; - version = "1.7"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "03vylg5mdsxp2nyk8sm7yxmb470hcb92q263dfq8d6b9xp96ckwx"; + sha256 = "adf64a4f3f5c94643a1286f8153bcf4bc787c348b38934aacd7fe17fbeebc571"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix index 94394c11e04e..a316edaf80aa 100644 --- a/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , pkgs , isPyPy , pycrypto diff --git a/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index 15e53dcffb2a..e70438a8817d 100644 --- a/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.25.0"; + version = "0.29.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025"; + sha256 = "3adb0d4c9a17ad3dca82c7e88118babd61eeee0ee985ce31fa43ec27aa98c963"; }; nativeBuildInputs = [ llvm ]; diff --git a/nixpkgs/pkgs/development/python-modules/lmdb/default.nix b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix index 5835fe3196d4..3b384182ae03 100644 --- a/nixpkgs/pkgs/development/python-modules/lmdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.94"; + version = "0.95"; src = fetchPypi { inherit pname version; - sha256 = "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww"; + sha256 = "0nx9f193gzl33r1lbqhb96h1igya7pz8wmahr8m9x5zgc05hal91"; }; checkInputs = [ pytest cffi ]; diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index cbdd43af811f..392cc66786a1 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 +, freetype, libpng, pkgconfig, mock, pytz, pygobject3 , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobject-introspection , enableGtk3 ? false, cairo diff --git a/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix index 4a6f6b0c4dd1..df691fb05c80 100644 --- a/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix @@ -3,6 +3,7 @@ , fetchPypi , mecab , swig +, setuptools_scm }: buildPythonPackage rec { @@ -17,10 +18,13 @@ buildPythonPackage rec { nativeBuildInputs = [ mecab # for mecab-config swig + setuptools_scm ]; buildInputs = [ mecab ]; + doCheck = false; + meta = with lib; { description = "A python wrapper for mecab: Morphological Analysis engine"; homepage = https://github.com/SamuraiT/mecab-python3; diff --git a/nixpkgs/pkgs/development/python-modules/micawber/default.nix b/nixpkgs/pkgs/development/python-modules/micawber/default.nix index e3dffbfcb489..d3b5c79e967a 100644 --- a/nixpkgs/pkgs/development/python-modules/micawber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "2e19cd5e9ce5b8b57714389e4b709af7dedc4f8f44e9df5566a9d3ccefaac38e"; + sha256 = "002g31h4fcrrlfcrcbqa94aggszadm0p91c28n19vgssinmbz0ia"; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/minio/default.nix b/nixpkgs/pkgs/development/python-modules/minio/default.nix index 7eea7596f433..f5a37832e8fc 100644 --- a/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi +{ lib, buildPythonPackage, isPy3k, fetchPypi , urllib3, python-dateutil , pytz, faker, mock, nose }: buildPythonPackage rec { pname = "minio"; - version = "4.0.14"; + version = "4.0.17"; src = fetchPypi { inherit pname version; - sha256 = "72c8ab7b1c25f875273e66762982816af8ada2ced88b6cd991e979f479c34875"; + sha256 = "0fb1faab701008a1ff05b9b2497b6ba52d1aff963323356ed86f2771b186db6b"; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix b/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix index 8090ac199da8..cc00643b71ae 100644 --- a/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, fetchpatch, isPy3k +{ lib, buildPythonPackage, fetchurl, isPy3k , pytest, werkzeug, pygments }: diff --git a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix index 7171409bec84..73c2f6c8e684 100644 --- a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix @@ -6,7 +6,6 @@ , decorator , imageio , imageio-ffmpeg -, isPy3k , proglog , requests , tqdm diff --git a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix index 17ae66a0fdd3..45b64355e45b 100644 --- a/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.4.2"; + version = "0.4.4.3"; src = fetchPypi { inherit pname version; - sha256 = "a1638108538aaba55bebaef9d847dfb3064bb1c829e68301716a6a956fa6a0d6"; + sha256 = "a02c0069fb580c6a2dda9b98d40d34fda3840863112a5465ba9b54fa2ee005a5"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix b/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix index 7e71f618d8a0..a494bbfff07e 100644 --- a/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix @@ -1,7 +1,6 @@ { pkgs , buildPythonPackage , fetchPypi -, python , adal , msrest }: diff --git a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index d782cac27d0a..11552a7c342e 100644 --- a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.4.1"; + version = "5.5.0"; src = fetchPypi { inherit pname version; - sha256 = "302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4"; + sha256 = "138381baa41d83584459b5cfecfc38c800ccf1f37d9ddd0bd440783346a4c39c"; }; checkInputs = [ nose pytest glibcLocales ]; diff --git a/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix index 2816315f1052..ee4434c1d1d7 100644 --- a/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "40891e556dc9e252da2a649028cacb949fc8efb81062ada7d9a87a01b08bb454"; + sha256 = "eeda6c59b61130b9116a3d935e7c80ec5f617d7db8918d23289b2426efa229eb"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix index eaf75d467cb1..10baadcab302 100644 --- a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.4"; + version = "0.6.6"; src = fetchPypi { inherit pname version; - sha256 = "47d5af7398f16d609eebd02be2ecbd997b364032b5dc6d4927c810ea24f39080"; + sha256 = "2b367354d1cd25b79b8798a0b4c1949590d890057f2a252e6e970a9ab744e009"; }; checkInputs = [ nose rednose ]; diff --git a/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix b/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix index 2110f3628a80..0d5923820d27 100644 --- a/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix @@ -1,6 +1,4 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub +{ buildPythonPackage , numpy , libndtypes , isPy27 diff --git a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix index ea0a359a49c3..75dcf9b32c4c 100644 --- a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchpatch , fetchPypi , pbr , pythonix diff --git a/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/nixpkgs/pkgs/development/python-modules/nltk/default.nix index 2c6858915ce9..7e3134a44d20 100644 --- a/nixpkgs/pkgs/development/python-modules/nltk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,4 @@ -{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k, fetchpatch }: +{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k }: buildPythonPackage rec { version = "3.4.3"; diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index bf5ca3d55830..b8d9f7d58a93 100644 --- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -3,7 +3,6 @@ , fetchurl , vmprof , pyqt4 -, scons , isPyPy , pkgs }: @@ -13,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.3.1"; + version = "0.6.4"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0h05krv871ymz55k6lrdlfyqndck6lwyy69dk5v4sakgfd5iawqf"; + sha256 = "18np970h6s97m7j6ymqizq1ylnhb6l5msmxqgnayrllirhg7a8pf"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/numba/default.nix b/nixpkgs/pkgs/development/python-modules/numba/default.nix index 41aa7f7a0c8a..ebb7aac39241 100644 --- a/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "0.40.1"; + version = "0.44.0"; pname = "numba"; src = fetchPypi { inherit pname version; - sha256 = "52d046c13bcf0de79dbfb936874b7228f141b9b8e3447cc35855e9ad3e12aa33"; + sha256 = "56421bfc62f3c7c996ff11d5db7fc410909564e41b55379a82b9188fa4aa22f9"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 171496584ef2..d82adaeea289 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, python, buildPythonPackage, gfortran, pytest, blas, writeTextFile }: +{ lib, fetchPypi, python, buildPythonPackage, gfortran, pytest, blas, writeTextFile }: let blasImplementation = lib.nameFromURL blas.name "-"; @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.3"; + version = "1.16.4"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "78a6f89da87eeb48014ec652a65c4ffde370c036d780a995edaeb121d3625621"; + sha256 = "7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7"; }; nativeBuildInputs = [ gfortran pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/odfpy/default.nix b/nixpkgs/pkgs/development/python-modules/odfpy/default.nix index f4dba0858dbf..c62f6ae681c2 100644 --- a/nixpkgs/pkgs/development/python-modules/odfpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/odfpy/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, python -, isPy27 , defusedxml , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/nixpkgs/pkgs/development/python-modules/ovito/default.nix index cae337904b20..73230b2e8fb3 100644 --- a/nixpkgs/pkgs/development/python-modules/ovito/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ovito/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit , cmake -, qtbase, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh +, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh , pythonPackages }: diff --git a/nixpkgs/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix index 821a543eeb17..fccd46c605db 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -7,12 +7,6 @@ , markdown , pyct , testpath -, pytest -, scipy -, plotly -, altair -, vega_datasets -, hvplot }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix index 32c945f332a7..a1fdeec28f83 100644 --- a/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, xdg_utils +{ lib, buildPythonPackage, fetchFromGitHub, xdg_utils , requests, filetype, pyparsing, configparser, arxiv2bib , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , pylibgen, click, python-slugify, habanero, isbnlib diff --git a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index e41ec9689d28..a1ecced51eb5 100644 --- a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -5,12 +5,9 @@ , bcrypt , pynacl , pyasn1 -, python , pytest , pytest-relaxed , mock -, isPyPy -, isPy33 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/paramz/default.nix b/nixpkgs/pkgs/development/python-modules/paramz/default.nix index f537b8d8e314..0183379ac004 100644 --- a/nixpkgs/pkgs/development/python-modules/paramz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paramz/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "paramz"; - version = "0.9.4"; + version = "0.9.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "179ca77a965e6e724217257793e3c8c022285ea2190a85e0826ac98dea316219"; + sha256 = "0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a"; }; propagatedBuildInputs = [ numpy scipy six decorator ]; diff --git a/nixpkgs/pkgs/development/python-modules/pastel/default.nix b/nixpkgs/pkgs/development/python-modules/pastel/default.nix index 2d99447f724f..532970c62c28 100644 --- a/nixpkgs/pkgs/development/python-modules/pastel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pastel/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "pastel"; diff --git a/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/nixpkgs/pkgs/development/python-modules/peewee/default.nix index acb46af46b33..bfc9f5a1f7c6 100644 --- a/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.9.5"; + version = "3.9.6"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "0c2hkkpp9rajnw5px17wd72x95k7wc2a0iy55pjhi5ly2cqd9ylv"; + sha256 = "1pgmsd7v73d0gqxsa4wnm9s3lyffw46wvvkqn25xgh4v8z869fg2"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pep8/default.nix b/nixpkgs/pkgs/development/python-modules/pep8/default.nix index 85d274944a78..6794b6f5f668 100644 --- a/nixpkgs/pkgs/development/python-modules/pep8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pep8/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, pythonAtLeast }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 222f51374755..f30a73be8fb3 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.11"; + version = "8.10.12"; src = fetchPypi { inherit pname version; - sha256 = "1rd46dryxkwlha9lfqqwywazlh908ngh6076zz3myhzf8h3dmxnz"; + sha256 = "708c19860afb05085d5fe91b52fcbce9e1be3c020fe8c9b6f6d028879f5a7d5e"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pims/default.nix b/nixpkgs/pkgs/development/python-modules/pims/default.nix index 4e45d5203e66..4504886d03d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -6,7 +6,6 @@ , six , numpy , tifffile -, pytest , nose }: diff --git a/nixpkgs/pkgs/development/python-modules/pip/default.nix b/nixpkgs/pkgs/development/python-modules/pip/default.nix index da5fc24fb22e..76f3b0b7176b 100644 --- a/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "19.0.3"; + version = "19.1.1"; src = fetchPypi { inherit pname version; - sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2"; + sha256 = "44d3d7d3d30a1eb65c7e5ff1173cdf8f7467850605ac7cc3707b6064bddd0958"; }; # pip detects that we already have bootstrapped_pip "installed", so we need diff --git a/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/nixpkgs/pkgs/development/python-modules/pivy/default.nix index 37c999e86b4c..9ff1094aec13 100644 --- a/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -1,31 +1,40 @@ -{ stdenv -, buildPythonPackage -, fetchhg -, pkgs -, isPy3k -}: +{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs }: buildPythonPackage rec { - version = "20101207"; pname = "pivy"; - disabled = isPy3k; # Judging from SyntaxError + version = "0.6.5a2"; - src = fetchhg { - url = "https://bitbucket.org/Coin3D/pivy"; - rev = "8eab90908f2a3adcc414347566f4434636202344"; - sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; + src = fetchFromGitHub { + owner = "FreeCAD"; + repo = "pivy"; + rev = version; + sha256 = "1w03jaha36bjyfaz8hchnv8yrkm5715w15crhd3qrlagz8fs38hm"; }; nativeBuildInputs = with pkgs; [ - swig1 coin3d soqt + swig qt5.qmake cmake ]; buildInputs = with pkgs; with xorg; [ - coin3d soqt + coin3d soqt qt5.qtbase libGLU_combined libXi libXext libSM libICE libX11 ]; + NIX_CFLAGS_COMPILE = [ + "-I${pkgs.qt5.qtbase.dev}/include/QtCore" + "-I${pkgs.qt5.qtbase.dev}/include/QtGui" + "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" + "-I${pkgs.qt5.qtbase.dev}/include/QtWidgets" + ]; + + doCheck = false; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ + \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' + ''; + meta = with stdenv.lib; { homepage = http://pivy.coin3d.org/; description = "A Python binding for Coin"; diff --git a/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 55963299f9c8..f5be6ec308e9 100644 --- a/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "498c35a2a482f7c7937fc2f3681fec653a0191dd21e40e754a6b774234cd167e"; + sha256 = "164aav7i3ann1lv3xbb76ylpph4hissl0wsnmil1s3m0r7sk7jsx"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/nixpkgs/pkgs/development/python-modules/poetry/default.nix index 1b593ff0e6c6..9aa3b7eb64a3 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry/default.nix @@ -32,11 +32,11 @@ let in buildPythonPackage rec { pname = "poetry"; - version = "0.12.10"; + version = "0.12.16"; src = fetchPypi { inherit pname version; - sha256 = "00npb0jlimnk4r01zkhfmns4843j1hfhd388s326da5pd8n0dq7l"; + sha256 = "0h4ldchggsh6gli16p1z25c4jj1in3yyzgqf285zidnjc6rlrqc8"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix b/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix index d0adb43daf84..35607b536f34 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry/jsonschema.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, callPackage +{ lib, buildPythonPackage, fetchPypi, isPy27 , attrs , pyrsistent , six diff --git a/nixpkgs/pkgs/development/python-modules/pplpy/default.nix b/nixpkgs/pkgs/development/python-modules/pplpy/default.nix index 6f118a51c879..a693c8cad4cc 100644 --- a/nixpkgs/pkgs/development/python-modules/pplpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pplpy/default.nix @@ -1,12 +1,10 @@ { lib -, python , fetchPypi , buildPythonPackage , gmp , mpfr , libmpc , ppl -, pari , cython , cysignals , gmpy2 diff --git a/nixpkgs/pkgs/development/python-modules/priority/default.nix b/nixpkgs/pkgs/development/python-modules/priority/default.nix index f2f7a935cc41..f6e7efb78c20 100644 --- a/nixpkgs/pkgs/development/python-modules/priority/default.nix +++ b/nixpkgs/pkgs/development/python-modules/priority/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, hypothesis }: +{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: buildPythonPackage rec { pname = "priority"; diff --git a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix index a68ecf59ad0e..fcd802b34875 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar"; diff --git a/nixpkgs/pkgs/development/python-modules/ptable/default.nix b/nixpkgs/pkgs/development/python-modules/ptable/default.nix new file mode 100644 index 000000000000..02429f589cfc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ptable/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, nose }: + +buildPythonPackage rec { + pname = "ptable"; + version = "unstable-2019-06-14"; + + # https://github.com/kxxoling/PTable/issues/27 + src = fetchFromGitHub { + owner = "kxxoling"; + repo = "PTable"; + rev = "bcfdb92811ae1f39e1065f31544710bf87d3bc21"; + sha256 = "1cj314rp6irlvr0a2c4xffsm2idsb0hzwr38vzz6z3kbhphcb63i"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests --with-coverage --cover-package=prettytable --cover-min-percentage=75 + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/kxxoling/PTable"; + description = "A simple Python library designed to make it quick and easy to represent tabular data in visually appealing ASCII tables"; + license = licenses.bsd3; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 8cca405f7bfd..4f03137e7604 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, fetchpatch , requests , pytz , tzlocal @@ -23,11 +22,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.18"; + version = "3.19"; src = fetchPypi { inherit pname version; - sha256 = "053znyl68sjmlp3r4br5jxhqqswjfbb1rb8k6f9qpzcym37439r0"; + sha256 = "10ikvdx39phr7n01qa6y9i5lqg3blv0d6y1pwqniczaf558cfp3l"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix index 7dfd00db25f2..29cdfbc65990 100644 --- a/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyacoustid"; - version = "1.1.5"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "efb6337a470c9301a108a539af7b775678ff67aa63944e9e04ce4216676cc777"; + sha256 = "07394a8ae84625a0a6fef2d891d19687ff59cd955caaf48097da2826043356fd"; }; propagatedBuildInputs = [ requests audioread ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index 32c5f38b66d0..44acbe5c7a9d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix index 9817a73be92c..446ec81bb4f8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pyasn1 -, isPyPy , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix index 5027619d74c8..eb6de23e0eaa 100644 --- a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix @@ -1,5 +1,4 @@ { stdenv -, fetchurl , python , pkgs , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix index 944278ce3c2c..5a1d8d370c18 100644 --- a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.4.8"; + version = "2.4.9"; src = fetchPypi { inherit pname version; - sha256 = "0b6dkrac5zydxqfrf827xhamsimychrn77dsfnz1kf7c1crlwcw9"; + sha256 = "bcb5aaca2b8adf94a04fd5206eea113ddc1993c9f13ab39f4a37e98f92b6d7db"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix b/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix new file mode 100644 index 000000000000..4413f9eef2e7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, six +, requests +}: + +buildPythonPackage rec { + version = "2.3.3"; + pname = "pydocumentdb"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fcp3g62pc9hpa0r6vdjhaln4h0azywjqfzi8bd4414ja0mxmj3p"; + }; + + propagatedBuildInputs = [ six requests ]; + + # requires an active Azure Cosmos service + doCheck = false; + + meta = with lib; { + description = "Azure Cosmos DB API"; + homepage = https://github.com/Azure/azure-cosmos-python; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix index 026e5626c023..5ea7ba9c7a89 100644 --- a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unittest2 }: +{ stdenv, buildPythonPackage, fetchPypi, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; diff --git a/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix b/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix index 1163f007b092..2b20ba956009 100644 --- a/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub , boost, freetype, ftgl, libGLU_combined , python }: diff --git a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index e0f0f25c9add..9fc654292ab3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -5,7 +5,6 @@ , psutil , pyopenssl , pysendfile -, python }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/nixpkgs/pkgs/development/python-modules/pygal/default.nix index b0d533f5d68d..a3d6f6e4c21a 100644 --- a/nixpkgs/pkgs/development/python-modules/pygal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygal/default.nix @@ -41,6 +41,10 @@ buildPythonPackage rec { export LANG=en_US.UTF-8 ''; + postPatch = '' + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; + propagatedBuildInputs = [ cairosvg tinycss cssselect ] ++ stdenv.lib.optionals (!isPyPy) [ lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/nixpkgs/pkgs/development/python-modules/pygame/default.nix index 893b251f7b5e..b9c45ce8967d 100644 --- a/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pygame"; - version = "1.9.5"; + version = "1.9.6"; src = fetchPypi { inherit pname version; - sha256 = "d15e7238015095a12c19379565a66285e989fdcb3807ec360b27338cd8bdaf05"; + sha256 = "301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix index 18eced7e8067..ab46a5670eeb 100644 --- a/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, isPy27, fetchpatch +{ stdenv, buildPythonPackage, fetchurl, isPy27 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index 30e4444f5527..507310b4c51e 100644 --- a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -1,5 +1,4 @@ { lib -, fetchFromGitHub , buildPythonPackage , eigen , nlopt diff --git a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix index acb5c9648783..0ff269c98740 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix @@ -3,7 +3,6 @@ , fetchPypi , fetchFromBitbucket , isPy3k -, fetchurl , pkgs , python }: diff --git a/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix b/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix index a88b5ba7356c..c088ea6a3967 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, astroid, six, isort, +{ stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, pytest, pytestrunner, pyenchant }: diff --git a/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 64259872ce32..4faeb05280d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, +{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, isort, mccabe, pytest, pytestrunner }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix index dbe9107c7c83..c38f56885d14 100644 --- a/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -2,7 +2,6 @@ , fetchurl , buildPythonPackage , pymatgen -, lammps , pytestrunner , pytest , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix index a683c07d3afd..35e5f7aa69a2 100644 --- a/nixpkgs/pkgs/development/python-modules/pymc3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.6"; + version = "3.7"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "c00c0778d2451a348a9508f8b956fe280a0f9affd3f85140ac3948bc2902f5e9"; + sha256 = "0ijna2ghvniryllr56qr4vi4k9q58mq21yx36nj5kg2j17f7rkbr"; }; # No need for coverage stats in Nix builds diff --git a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix index 1db09842fa98..1a477ab23284 100644 --- a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , isPyPy , pkgs , python diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index 46de94cd0c68..288f35f23524 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig +{ lib, fetchurl, pythonPackages, pkgconfig , qmake, lndir, qtbase, qtsvg, qtwebengine, dbus , withConnectivity ? false, qtconnectivity , withWebKit ? false, qtwebkit diff --git a/nixpkgs/pkgs/development/python-modules/pyreadability/default.nix b/nixpkgs/pkgs/development/python-modules/pyreadability/default.nix index a95074b906e3..60bdbf011674 100644 --- a/nixpkgs/pkgs/development/python-modules/pyreadability/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyreadability/default.nix @@ -1,6 +1,5 @@ { lib, fetchPypi, buildPythonPackage , requests, chardet, cssselect, lxml -, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix b/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix index 5490cd4baa7a..f70f10da41ad 100644 --- a/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.3.2"; + version = "0.3.3"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "f00db7e7747e016479ef65e3f00115d66a4200e59914f016d50e4d3e32bc94b0"; + sha256 = "e980e2aa5a029e2f133d422a9154a21c9cca96c417c230ddde858e41aa43687b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index 1887020fd0f3..d99a703b173c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.5"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "ad679a91d453fe8426c4076d0da3a67265e5ccfe641879d75c9bc7660d075dfa"; + sha256 = "deae0e6191a04c3ee213c6fae6ed779602ef5da5ca5e2fa533f27bc04326bfbe"; }; # requires root priviledges diff --git a/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix new file mode 100644 index 000000000000..5314a5cc7135 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5, + shiboken2, pyside2 }: + +stdenv.mkDerivation rec { + pname = "pyside2-tools"; + + inherit (pyside2) version src; + + postPatch = '' + cd sources/pyside2-tools + ''; + + nativeBuildInputs = [ cmake wrapPython ]; + propagatedBuildInputs = [ shiboken2 pyside2 ]; + buildInputs = [ python qt5.qtbase ]; + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + postInstall = '' + rm $out/bin/pyside_tool.py + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "PySide2 development tools"; + license = licenses.gpl2; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix new file mode 100644 index 000000000000..afa48569e2ac --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage, python, fetchurl, stdenv, + cmake, ninja, qt5, shiboken2 }: + +stdenv.mkDerivation rec { + pname = "pyside2"; + version = "5.12.3"; + + src = fetchurl { + url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; + sha256 = "0hk89jm8pa0q6kifask5rrffa3bvx02dg2f97ibv7wds9dysnyjg"; + }; + + patches = [ + ./dont_ignore_optional_modules.patch + ]; + + postPatch = '' + cd sources/pyside2 + ''; + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + "-DPYTHON_EXECUTABLE=${python.interpreter}" + ]; + + nativeBuildInputs = [ cmake ninja qt5.qmake shiboken2 python ]; + buildInputs = with qt5; [ + qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript + qtwebsockets qtwebengine qtwebchannel qtcharts qtsensors qtsvg + ]; + + meta = with stdenv.lib; { + description = "LGPL-licensed Python bindings for Qt"; + license = licenses.lgpl21; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch b/nixpkgs/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch new file mode 100644 index 000000000000..681e16a2bfd3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyside2/dont_ignore_optional_modules.patch @@ -0,0 +1,11 @@ +--- pyside-setup-everywhere-src-5.12.3/sources/pyside2/CMakeLists.txt~ 2019-06-15 19:07:48.368704430 +0200 ++++ pyside-setup-everywhere-src-5.12.3/sources/pyside2/CMakeLists.txt 2019-06-15 19:08:04.429489908 +0200 +@@ -219,7 +219,7 @@ + # If the module was found, and also the module path is the same as the + # Qt5Core base path, we will generate the list with the modules to be installed + set(looked_in_message ". Looked in: ${${_name_dir}}") +- if("${${_name_found}}" AND (("${found_basepath}" GREATER "0") OR ("${found_basepath}" EQUAL "0"))) ++ if("${${_name_found}}") + message(STATUS "${module_state} module ${name} found (${ARGN})${looked_in_message}") + # record the shortnames for the tests + list(APPEND all_module_shortnames ${shortname}) diff --git a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index 7e9414d5207c..ced2906486a1 100644 --- a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.13"; + version = "0.0.14"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0azkbd20qdzdilv5pi4qngw7pjjcsv269dim7xh3qv7s9bp0xik8"; + sha256 = "6ebab661eb3ff9f814139924c18a87d0b1cab8a6af98d323e2b1ee313ed856c9"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix index 7c35ffda8850..45c84d167539 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.2"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "5ab07ed12c3c9035bfaad93921887736abf89130130b38de7dfa985e50542438"; + sha256 = "6839718ce9f779e81153d8a14a843a5c4b2d5e6574f3c916aec241022d717cb2"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index e37fa07f2723..3085ee06e870 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -4,7 +4,6 @@ , ansible , pytest , mock -, isPy3k }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix index 0a361627e8e9..b43c00e42d9f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner , pytest , py-cpuinfo , pythonOlder diff --git a/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix index f9e6846367c3..9fddb743964c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-faulthandler"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d"; + sha256 = "1bvfy6yyh2zlsrkpfmxy17149752m9y6ji9d34qp44bnci83dkjq"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix new file mode 100644 index 000000000000..1a4cc260ff44 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, coverage +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-testmon"; + version = "0.9.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "df00594e55f8f8f826e0e345dc23863ebac066eb749f8229c515a0373669c5bb"; + }; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ coverage ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + homepage = "https://github.com/tarpas/pytest-testmon/"; + description = "This is a py.test plug-in which automatically selects and re-executes only tests affected by recent changes"; + license = licenses.mit; + maintainers = [ maintainers.dmvianna ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix new file mode 100644 index 000000000000..12b06c2e1b63 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docopt +, colorama +, pytest +, watchdog +}: + +buildPythonPackage rec { + pname = "pytest-watch"; + version = "4.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9"; + }; + + # No Tests + doCheck = false; + + propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + + meta = with lib; { + homepage = "https://github.com/joeyespo/pytest-watch"; + description = "Local continuous test runner with pytest and watchdog"; + license = licenses.mit; + maintainers = with maintainers; [ dmvianna ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix index 37c7d0dae686..b3a9d666262c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.10.1"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "1q4sp6ppjiqlsz3h43q9iya4n3qkhx6ng16bcbacfxdyrp9xvcf9"; + sha256 = "6640acd76e6cab84648e4fec16c9d19de6700971f9d91d045e7120622167bfda"; }; checkInputs = [ click ipython ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index adb6d71fb40d..93dd9fb654f9 100644 --- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , buildPythonPackage , fetchFromGitHub , six diff --git a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index 44f1c0d6c39d..9cd55757aac7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -1,16 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, python , mock , pbr , pyyaml , six , multi_key_dict -, testtools , testscenarios -, testrepository -, kerberos , requests , unittest2 , requests-mock diff --git a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix index 8523020ccf50..35b7a706f609 100644 --- a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , isPyPy , python , pkgs diff --git a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index 2b55d975ed3d..07cbffad1f89 100644 --- a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.7.1"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "d9c1411b25600ea65bb534ad75bf4ab6efd9627abd86872f0e5453ff42220d06"; + sha256 = "3ea01520ebe28d270c79120a836d251fbb2187227695461a310fe0293f348b2d"; }; LC_ALL="en_US.utf-8"; diff --git a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index d3ab69ac9570..328b1ec0994d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , isPyPy -, python , snappy , cffi , nose diff --git a/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 37bfee1d246d..2de5b21d86f3 100644 --- a/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2019.1"; + version = "2019.1.1"; src = fetchPypi { inherit pname version; - sha256 = "f6972030e6c97089e49b832fd1f4e7959aee89bb6db929aaa3bde2553d78872b"; + sha256 = "ce2d702ae4ef10a70197b00b93141461140d00578f2a862fa946ca1446a300db"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix index b7c38c512652..ce0c514e3eca 100644 --- a/nixpkgs/pkgs/development/python-modules/pyutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyutil/default.nix @@ -4,7 +4,6 @@ , setuptoolsDarcs , setuptoolsTrial , simplejson -, zbase32 , twisted , isPyPy }: diff --git a/nixpkgs/pkgs/development/python-modules/pyuv/default.nix b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix index 04e2c2f08185..cd76b283028f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyuv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyuv/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , isPyPy , pkgs }: diff --git a/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix index 90a415060eb8..83403b3d1500 100644 --- a/nixpkgs/pkgs/development/python-modules/pywbem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, libxml2 -, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37, python +, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37 , httpretty, lxml, mock, pytest, requests, decorator, unittest2 }: diff --git a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix index 363f43c857dd..4321c025b56d 100644 --- a/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, isPy27 , fetchPypi , six , pillow diff --git a/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index 2912ef213c2b..6e3c25ef0dde 100644 --- a/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.4.4"; + version = "4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1qqyk5wlaps1m2hb5n2q1gynw2ayqn31dvxwwni4450ygf65arx6"; + sha256 = "4af84facdd6f00a6b9b2927255f717bb23ae4b7a20ba1d9ef0a5a5a8dbe01ae2"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 5d825f7579e2..9762fd280e06 100644 --- a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.23"; + version = "1.0.24"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1xypc86prwkv6ypy87g6r1p5y6d6c51vfxd3z6hjd1hv2ks7zjs1"; + sha256 = "0k5y4h0c4cjn1xl5fayh3a001kl42vvrhjyhp5r2fwn22z56a02p"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/nixpkgs/pkgs/development/python-modules/readchar/default.nix b/nixpkgs/pkgs/development/python-modules/readchar/default.nix new file mode 100644 index 000000000000..1ed4539dca08 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/readchar/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: + +buildPythonPackage rec { + pname = "readchar"; + version = "2.0.0"; + + # Don't use wheels on PyPI + src = fetchFromGitHub { + owner = "magmax"; + repo = "python-${pname}"; + rev = version; + sha256 = "0j1vj4f2j8x5f40rs6h8qplklcxcdbvkkvjpkpmr1xagw05i12bm"; + }; + + nativeBuildInputs = [ flake8 ]; + checkInputs = [ pytest pytestcov pexpect ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/magmax/python-readchar"; + description = "Python library to read characters and key strokes"; + license = licenses.mit; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/reikna/default.nix b/nixpkgs/pkgs/development/python-modules/reikna/default.nix index 2e828a2a8e82..6a7cbdcc5aff 100644 --- a/nixpkgs/pkgs/development/python-modules/reikna/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.2"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "c52f5ae13e35284feda8f6b67c0d6223c02c0292b1495969cf7a42f547b3fc18"; + sha256 = "52bbce24fa1fd7bb950d38ce9b60f497dd00ac6b26688d80ab9bce709f063e71"; }; checkInputs = [ sphinx pytestcov pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index 08800552607c..eba47a3b2d19 100644 --- a/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.20"; + version = "3.5.21"; src = fetchPypi { inherit pname version; - sha256 = "06l7jfax1izvbddmmjw9xpyb7iy4n99v3chyv75d9djaklnqs93v"; + sha256 = "08e6e63a4502d3a00062ba9ff9669f95577fbdb1a5f8c6cdb1230c5ee295273a"; }; checkInputs = [ glibcLocales ]; diff --git a/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix b/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix index b7010eccf0b3..46d1dbdbbd62 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchzip, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: with lib; buildPythonPackage rec { pname = "requests-aws4auth"; diff --git a/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix index 4522c7623283..340c558b7a42 100644 --- a/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy37 , docutils , nose , testtools diff --git a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix index bc36e5cba80a..eda1be2c1109 100644 --- a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1jprl2zm3pw2rfbda9rhg3v5bm8q36b8c9i4k8znimlf1mv8bcic"; + sha256 = "0344d0bd428126ce554e7ca2b61787b6a28d2bbd19fc70ed2dd85efe31176405"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix new file mode 100644 index 000000000000..d0e5b13ddbe8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, robotframework +, paramiko +, scp +}: + +buildPythonPackage rec { + version = "3.3.0"; + pname = "robotframework-sshlibrary"; + + src = fetchPypi { + inherit pname version; + sha256 = "fc5b5db63cf63a937bd4ada1a8b7508ec8a75d9454fa75e6410cbe72fd718de9"; + }; + + # unit tests are impure + doCheck = false; + + propagatedBuildInputs = [ robotframework paramiko scp ]; + + meta = with stdenv.lib; { + description = "SSHLibrary is a Robot Framework test library for SSH and SFTP"; + homepage = https://github.com/robotframework/SSHLibrary; + license = licenses.asl20; + }; + +} diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix index 01dcdb7104bd..a4ac86302cf8 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.94"; + version = "0.15.96"; src = fetchPypi { inherit pname version; - sha256 = "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8"; + sha256 = "343ace5ffbab036536a3da65e4cfd31b8292388a389f6305744984581a479b2a"; }; # Tests cannot load the module to test diff --git a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix index 432e2194b098..b5952e6ee156 100644 --- a/nixpkgs/pkgs/development/python-modules/samplerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/samplerate/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchgit , numpy , pkgs }: diff --git a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index cc83c31ca5df..c5e36f8ac070 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -13,7 +13,6 @@ , scipy , hdmedians , scikitlearn -, pytest , coverage , python , isPy3k diff --git a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix index 454066c1c163..04ea254ee928 100644 --- a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi , gfortran, glibcLocales , numpy, scipy, pytest, pillow }: diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 01c54ef5f16b..a69ab0d27a3c 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -1,12 +1,12 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, fetchpatch}: +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c"; + sha256 = "c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a"; }; checkInputs = [ nose pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix index 76f6232bafa7..079e88378c07 100644 --- a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, lib , python , six }: diff --git a/nixpkgs/pkgs/development/python-modules/sharedmem/default.nix b/nixpkgs/pkgs/development/python-modules/sharedmem/default.nix index 60c91b641098..d3222ac7d140 100644 --- a/nixpkgs/pkgs/development/python-modules/sharedmem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sharedmem/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "sharedmem"; - version = "0.3.5"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "1wr438m1jmcj6ccskzm6pchv6ldx7031h040adadjmkivz5rry41"; + sha256 = "c351ab3f6a4fe9fe0c692ab6a8c88013e625845b31a168ff12d16254ed4154d5"; }; propagatedBuildInputs = [ numpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix new file mode 100644 index 000000000000..82dfa3c4ea2a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage, python, fetchurl, stdenv, pyside2, + cmake, qt5, llvmPackages }: + +stdenv.mkDerivation rec { + pname = "shiboken2"; + + inherit (pyside2) version src; + + patches = [ + ./nix_compile_cflags.patch + ]; + + postPatch = '' + cd sources/shiboken2 + ''; + + CLANG_INSTALL_DIR = "${llvmPackages.libclang.out}"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.libclang python qt5.qtbase qt5.qtxmlpatterns ]; + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + postInstall = '' + rm $out/bin/shiboken_tool.py + ''; + + meta = with stdenv.lib; { + description = "Generator for the PySide2 Qt bindings"; + license = with licenses; [ gpl2 lgpl21 ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch b/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch new file mode 100644 index 000000000000..0884c020e832 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch @@ -0,0 +1,27 @@ +--- pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2019-06-15 10:31:04.712949189 +0200 ++++ pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2019-06-15 11:52:52.894987343 +0200 +@@ -317,15 +317,15 @@ + } + #endif // NEED_CLANG_BUILTIN_INCLUDES + +- // Append the c++ include paths since Clang is unable to find <list> etc +- // on RHEL 7 with g++ 6.3 or CentOS 7.2. +- // A fix for this has been added to Clang 5.0, so, the code can be removed +- // once Clang 5.0 is the minimum version. +- if (needsGppInternalHeaders()) { +- const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); +- for (const HeaderPath &h : gppPaths) { +- if (h.path.contains("c++")) +- headerPaths.append(h); ++ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); ++ for (const HeaderPath &h : gppPaths) { ++ // PySide2 requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ if (!h.path.contains("-qt")) { ++ // add using -isystem ++ headerPaths.append(h); ++ } else { ++ headerPaths.append({h.path, HeaderType::Standard}); + } + } + #else diff --git a/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix index cc60e81a59ee..9e80830f4380 100644 --- a/nixpkgs/pkgs/development/python-modules/simplejson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , stdenv -, isPy3k , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/nixpkgs/pkgs/development/python-modules/smart_open/default.nix index 9d2c71627196..325f59b1df22 100644 --- a/nixpkgs/pkgs/development/python-modules/smart_open/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "029b0ns6q9vl4pyk1w7jp4dvif1mfgr53a58z1p8zipwnhkfwnih"; + sha256 = "1y845mfsswyvczknwh359xprgc3hk8r17qy1wdibpz6y6pq0g3kq"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix index bb1375417911..1e008d96497b 100644 --- a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.0.9"; + version = "2.0.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0hlfcg0qdfavjzhxz4v2spjkj6440a1254wrncfkfkyff6rv9x3s"; + sha256 = "2a862a57ca65aa11cf010a19cdfee37e5728d486ee92684b00233442613b5120"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix index f4e699adcc88..b37c397488d8 100644 --- a/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.6.6"; + version = "6.6.8"; src = fetchPypi { inherit pname version; - sha256 = "dfb6d6c349cbdd463736e4be781cc005efeb1be91dbdc60cc76fda7cad142def"; + sha256 = "c32aa69ba8a9ae55daf6dbc265d7f56fe6026edef3bb81aeea7912b7b6b9f5b7"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index cb3d76e6a741..d4f17171e3b8 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9"; + sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index f66265ba5e06..7e1d08eb21b9 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.15"; + version = "0.17"; src = fetchPypi { inherit pname version; - sha256 = "06yl6aiw8gpq3wmi6wxy5lahfgbbmlw6nchq9h1ssi5lipwaxn7a"; + sha256 = "1e388ea0c8bc933adecf438f5243857ca238050a107d2768e5ffb490bbb733d7"; }; # No tests included. @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + homepage = "https://github.com/sphinx-contrib/plantuml/"; license = with licenses; [ bsd2 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 53eb223b25a7..96de95655e05 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , pytest , Wand , webob diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 596f9e47a08d..ba93fb040b9a 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, fetchpatch, python -, unittest2, scripttest, pytz, pylint, mock +, unittest2, scripttest, pytz, mock , testtools, pbr, tempita, decorator, sqlalchemy , six, sqlparse, testrepository }: diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index d7a7d45785ee..40eefc1db56b 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "894584fdb8d0e25e9f9ac0da20058e23c27d5ca55904cc0326e1a84101beef32"; + sha256 = "84e0da1a3d846df2f7c886540828f374b357924207e915c8885e0472acdf68dd"; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix index 86fcb6eaaabd..187f06c6ad9f 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.7.1"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "0f0a5d9430c40b9fa5065e210a7fd3aaabb0713313e72b1b7b7dc4c7d62e43d2"; + sha256 = "8aee27279231bae59e95b299e253b27ac2d78934989f4ccbe317c7b25faab6de"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix index 36cf33d8c252..82f1315ba3d2 100644 --- a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs , pbr , pytest }: diff --git a/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 180ff7580806..9c252aa9ce25 100644 --- a/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, requests, toml, pytest, pytestcov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytestcov, pytest-mock, pytest_xdist }: buildPythonPackage rec { pname = "stripe"; - version = "2.29.3"; + version = "2.30.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,14 +10,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "73f9af72ef8125e0d1c713177d006f1cbe95602beb3e10cb0b0a4ae358d1ae86"; + sha256 = "de6be07c9e8a350d588278186316f66c72af7036aa5e917d1a924fb875249034"; }; - postPatch = '' - substituteInPlace setup.py --replace "toml>=0.9,<0.10" "toml>=0.9" - ''; - - propagatedBuildInputs = [ toml requests ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; diff --git a/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/nixpkgs/pkgs/development/python-modules/structlog/default.nix index aa582aacaa94..f7e390bd6788 100644 --- a/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pytest , python-rapidjson , pretend diff --git a/nixpkgs/pkgs/development/python-modules/subprocess32/default.nix b/nixpkgs/pkgs/development/python-modules/subprocess32/default.nix index ccb73550a3f7..c77a41c3eb04 100644 --- a/nixpkgs/pkgs/development/python-modules/subprocess32/default.nix +++ b/nixpkgs/pkgs/development/python-modules/subprocess32/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "subprocess32"; - version = "3.5.3"; + version = "3.5.4"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6bc82992316eef3ccff319b5033809801c0c3372709c5f6985299c88ac7225c3"; + sha256 = "eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"; }; buildInputs = [ bash ]; diff --git a/nixpkgs/pkgs/development/python-modules/tables/default.nix b/nixpkgs/pkgs/development/python-modules/tables/default.nix index b042108d088e..7b1b4f7c36f3 100644 --- a/nixpkgs/pkgs/development/python-modules/tables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tables/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchPypi, python, buildPythonPackage -, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }: +, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }: buildPythonPackage rec { - version = "3.4.4"; + version = "3.5.2"; pname = "tables"; src = fetchPypi { inherit pname version; - sha256 = "bdc5c073712af2a43babd139c4855fc99496bb2c3f3f5d1b4770a985e6f9ce29"; + sha256 = "1hikrki0hx94ass31pn0jyz9iy0zhnkjacfk86m21cxsc8if685j"; }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; - propagatedBuildInputs = [ numpy numexpr six ]; + propagatedBuildInputs = [ numpy numexpr six mock ]; # The setup script complains about missing run-paths, but they are # actually set. diff --git a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index c792136cb4fb..b74fe9dc0de4 100644 --- a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.14"; + version = "0.2.15"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "94aaf98afc051b4e167783f3d972bd9b51ab736a1e45df100bf52984e53eebac"; + sha256 = "2ba603d95d5be6ddecd8ecaeaffba00b75b49dd80eb77f6228dd7b793ca67fd2"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix index 5b9e032c49a9..3b33ac413ba9 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k +{ stdenv, fetchPypi, buildPythonPackage , numpy , absl-py , mock diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index 03f1e66bf501..e4372fc2ec45 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, isPy36, pythonOlder +, isPy3k, pythonOlder , astor , gast , numpy @@ -13,7 +13,6 @@ , grpcio , mock , backports_weakref -, enum34 , tensorflow-estimator , tensorflow-tensorboard , cudaSupport ? false diff --git a/nixpkgs/pkgs/development/python-modules/tflearn/default.nix b/nixpkgs/pkgs/development/python-modules/tflearn/default.nix index 341c1da56801..03185ae4d9fe 100644 --- a/nixpkgs/pkgs/development/python-modules/tflearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tflearn/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, fetchurl, pytest, scipy, h5py +{ lib, fetchPypi, buildPythonPackage, pytest, scipy, h5py , pillow, tensorflow }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix new file mode 100644 index 000000000000..2c43ebf2c7e7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix @@ -0,0 +1,57 @@ +{ stdenv, buildPythonPackage, fetchPypi, twine, pbr, click, click-completion, validate-email, +pendulum, ptable, requests, inquirer, pythonOlder, pytest, pytestcov, pytest-mock, faker, factory_boy }: + + +buildPythonPackage rec { + pname = "toggl-cli"; + version = "2.1.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "togglCli"; + inherit version; + sha256 = "0iirvvb8772569v28d36bnryksm1qkkw48d48fw26j7ka01qq6mm"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "click-completion==0.5.0" "click-completion>=0.5.0" \ + --replace "pbr==5.1.2" "pbr>=5.1.2" \ + --replace "inquirer==2.5.1" "inquirer>=2.5.1" + ''; + + nativeBuildInputs = [ pbr twine ]; + checkInputs = [ pbr pytest pytestcov pytest-mock faker factory_boy ]; + + preCheck = '' + export TOGGL_API_TOKEN=your_api_token + export TOGGL_PASSWORD=toggl_password + export TOGGL_USERNAME=user@example.com + ''; + + checkPhase = '' + runHook preCheck + pytest -k "not premium and not TestDateTimeType and not TestDateTimeField" tests/unit --maxfail=20 + runHook postCheck + ''; + + propagatedBuildInputs = [ + click + click-completion + validate-email + pendulum + ptable + requests + inquirer + pbr + ]; + + meta = with stdenv.lib; { + homepage = "https://toggl.uhlir.dev/"; + description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; + license = licenses.mit; + maintainers = [ maintainers.mmahut ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index f224ec21b0e8..c5701902e08c 100644 --- a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -5,16 +5,15 @@ , coverage , glibcLocales , flake8 -, stdenv }: buildPythonPackage rec { pname = "tqdm"; - version = "4.31.1"; + version = "4.32.1"; src = fetchPypi { inherit pname version; - sha256 = "e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05"; + sha256 = "0a860bf2683fdbb4812fe539a6c22ea3f1777843ea985cb8c3807db448a0f7ab"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/nixpkgs/pkgs/development/python-modules/trustme/default.nix b/nixpkgs/pkgs/development/python-modules/trustme/default.nix index 27831a0359c3..6daa99aca6a6 100644 --- a/nixpkgs/pkgs/development/python-modules/trustme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trustme/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "8d12837c6242afe1660dee08d44d96f40c9a5074cc58caf39f8c8fdf4b526529"; + sha256 = "103f8n0c60593r0z8hh1zvk1bagxwnhrv3203xpiiddwqxalr04b"; }; checkInputs = [ pytest pyopenssl service-identity ]; diff --git a/nixpkgs/pkgs/development/python-modules/tweepy/default.nix b/nixpkgs/pkgs/development/python-modules/tweepy/default.nix index 97903a4a222b..3218ff43e279 100644 --- a/nixpkgs/pkgs/development/python-modules/tweepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tweepy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, requests, six, requests_oauthlib }: +{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }: buildPythonPackage rec { pname = "tweepy"; diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index d6fed4b9007f..a30c173b68b6 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.27.1"; + version = "6.28.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1yd4cpl4y01d3a956gsdg13vx02rb176wyh7mzr0aznkp38nyw5w"; + sha256 = "161s4nb4hhqgb8kc5wiq3s4jkv9a3fg9vycf5ga804vzfr04zlki"; }; buildInputs = [ nose mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix index bb9c874d9a18..f300ed727512 100644 --- a/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.3.2"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "096k1hipxxnsra5k86v6sm7bk1g0kb1f75yb44nvgf566kd6p119"; + sha256 = "9c492a560ff1c8713f0947cfc3ab755c368e26421d13087cd5b6c01b1529ea5b"; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix index de317ec1844e..35afe10f8d24 100644 --- a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPackages, buildPythonPackage, fetchPypi }: buildPythonPackage rec { name = "${pname}-${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix index 4546207b08c6..d951e436480b 100644 --- a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.24.2"; + version = "1.24.3"; src = fetchPypi { inherit pname version; - sha256 = "9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3"; + sha256 = "2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"; }; NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ diff --git a/nixpkgs/pkgs/development/python-modules/uuid/default.nix b/nixpkgs/pkgs/development/python-modules/uuid/default.nix index 0481e5c24c0f..5e31f6ccad09 100644 --- a/nixpkgs/pkgs/development/python-modules/uuid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "uuid"; diff --git a/nixpkgs/pkgs/development/python-modules/validate-email/default.nix b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix new file mode 100644 index 000000000000..ea2c5a8db749 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/validate-email/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "validate-email"; + version = "1.3"; + + src = fetchPypi { + inherit version; + pname = "validate_email"; + sha256 = "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/syrusakbary/validate_email"; + description = "Verify if an email address is valid and really exists"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix b/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix index 262d2a5d33a0..01efc61584fe 100644 --- a/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "0.2.1"; + version = "0.2.3"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982"; + sha256 = "658d03ea2d6727cbe70c30af71e9014d3d39114a3c50bd661b75aad188fdd3aa"; }; # requires X server diff --git a/nixpkgs/pkgs/development/python-modules/vmprof/default.nix b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix index a889613140da..25cd5b9a90d7 100644 --- a/nixpkgs/pkgs/development/python-modules/vmprof/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vmprof/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.4.12"; + version = "0.4.13"; pname = "vmprof"; src = fetchPypi { inherit pname version; - sha256 = "d6fa566512de1e17c9b585feae6e6997119e0d43c41c8461a9a2e8a8276618a4"; + sha256 = "b6121f3d989fe48c2fb7242acded5f1e2e86d25d05d73c41257f236fd9badb2c"; }; propagatedBuildInputs = [ requests six]; diff --git a/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix index e2e305635200..a91de2d7eeed 100644 --- a/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang +{ stdenv, lib, buildPythonPackage, fetchPypi, python, zlib, clang , ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/warlock/default.nix b/nixpkgs/pkgs/development/python-modules/warlock/default.nix index 46a5bd533b28..bc298b2794df 100644 --- a/nixpkgs/pkgs/development/python-modules/warlock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/warlock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "warlock"; - version = "1.3.0"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "01kajxvjp5n1p42n1kvv7rfcj2yyr44zmmzk48pywryfixr3yh6p"; + sha256 = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090"; }; propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; diff --git a/nixpkgs/pkgs/development/python-modules/webapp2/default.nix b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix index 91ce52ff5adc..584440eab6ae 100644 --- a/nixpkgs/pkgs/development/python-modules/webapp2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webapp2/default.nix @@ -3,7 +3,6 @@ , fetchPypi , webob , six -, jinja2 }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/weboob/default.nix b/nixpkgs/pkgs/development/python-modules/weboob/default.nix index 26eca0d24cc1..d78cb7f3de9c 100644 --- a/nixpkgs/pkgs/development/python-modules/weboob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weboob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchurl, fetchPypi, stdenv, isPy27 +{ buildPythonPackage, fetchurl, stdenv, isPy27 , nose, pillow, prettytable, pyyaml, dateutil, gdata , requests, mechanize, feedparser, lxml, gnupg, pyqt5 , libyaml, simplejson, cssselect, futures, pdfminer diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index 9b5e3f9ca5f9..483926ef30b5 100644 --- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi , itsdangerous, hypothesis -, pytest, requests, glibcLocales }: +, pytest, requests }: buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.2"; + version = "0.15.4"; src = fetchPypi { inherit pname version; - sha256 = "0a73e8bb2ff2feecfc5d56e6f458f5b99290ef34f565ffb2665801ff7de6af7a"; + sha256 = "a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6"; }; propagatedBuildInputs = [ itsdangerous ]; diff --git a/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/nixpkgs/pkgs/development/python-modules/wheel/default.nix index cfe66ce63d79..d7814984060e 100644 --- a/nixpkgs/pkgs/development/python-modules/wheel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wheel/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.33.1"; + version = "0.33.4"; src = fetchPypi { inherit pname version; - sha256 = "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d"; + sha256 = "62fcfa03d45b5b722539ccbc07b190e4bfff4bb9e3a4d470dd9f6a0981002565"; }; checkInputs = [ pytest pytestcov coverage ]; diff --git a/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix index 3adbaa942dd5..8d1443837cde 100644 --- a/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix @@ -1,4 +1,4 @@ -{lib, fetchFromGitHub, python, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4}: +{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4}: buildPythonPackage rec { pname = "wrf-python"; diff --git a/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix index c59e91ad3eab..c953fe9fe1e3 100644 --- a/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix +++ b/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "wxPython"; - version = "4.0.4"; + version = "4.0.6"; src = fetchPypi { inherit pname version; - sha256 = "0d9ef4260cb2f3e23ed9dcf6baa905ba585ac7d631613cddc299c4c83463ae29"; + sha256 = "35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/nixpkgs/pkgs/development/python-modules/xdot/default.nix index 8ad249a4c1a4..14f4b24747c7 100644 --- a/nixpkgs/pkgs/development/python-modules/xdot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xdot/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }: +, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3 }: buildPythonPackage rec { pname = "xdot"; diff --git a/nixpkgs/pkgs/development/python-modules/xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/xgboost/default.nix index 559789149736..bbe7c9862606 100644 --- a/nixpkgs/pkgs/development/python-modules/xgboost/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xgboost/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , pytest , nose , scipy diff --git a/nixpkgs/pkgs/development/python-modules/xnd/default.nix b/nixpkgs/pkgs/development/python-modules/xnd/default.nix index 8ffb8f96936b..558e414debf8 100644 --- a/nixpkgs/pkgs/development/python-modules/xnd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xnd/default.nix @@ -1,6 +1,4 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub +{ buildPythonPackage , ndtypes , libndtypes , libxnd diff --git a/nixpkgs/pkgs/development/python-modules/yattag/default.nix b/nixpkgs/pkgs/development/python-modules/yattag/default.nix index 5c02ea83ec99..89a9e1abdc46 100644 --- a/nixpkgs/pkgs/development/python-modules/yattag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yattag/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "yattag"; - version = "1.11.1"; + version = "1.11.2"; src = fetchPypi { inherit pname version; - sha256 = "94210945c868f696a31812a510c01724d61c9a4d279eb4adf340c0d2a4c0bfd7"; + sha256 = "0grf7hskbxfxj60qmd44xiwmr9mzmi09inilvhykw28m0c84s8fp"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 709ba455b5cc..dbf84aa182b0 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.22.0"; + version = "0.23.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09dqfbj37l7vnj0fj4a82dqgq9mwm6fnsnsmljg25k1ygcn5hrpy"; + sha256 = "1xgfs38wv52a73p9gmyz0vxj6c49516isjn9bhp8p3y4cywk7hz0"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix b/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix index a9d99274afe0..1e577fc487ca 100644 --- a/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "1.0.3"; + version = "1.0.4"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "0avr63rka9lrqngjfmny7hdds4klmg1nriwc7n3kgyrp44z2lk7c"; + sha256 = "0n4hng2zil1j8sbz0b83pxx8ndlh34h2mnmli3bqjmnrbry5zlr5"; }; # fails.. diff --git a/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix index 28f461689972..e0ec7bd6ca80 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix @@ -5,7 +5,6 @@ , zope_schema , zope_testrunner , manuel -, isPy3k }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/nixpkgs/pkgs/development/python-modules/zstd/default.nix index 3706fd06a15d..08b1d67ffee5 100644 --- a/nixpkgs/pkgs/development/python-modules/zstd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchpatch, fetchPypi, buildPythonPackage +{ stdenv, pkgconfig, fetchPypi, buildPythonPackage , zstd, pytest }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/test.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/test.nix index 7c5932c4e761..ab03f48445b3 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/test.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }: +{ lib, ruby, defaultGemConfig, test, should }: let testConfigs = { inherit lib; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix index d1b8e87aaebe..f8843c615821 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix @@ -36,10 +36,15 @@ let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // { + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // { inherit preferLocalBuild allowSubstitutes; # pass the defaults buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper; + + passthru = basicEnv.passthru // { + inherit basicEnv; + inherit (basicEnv) env; + } // passthru; }; in runCommand basicEnv.name cmdArgs '' diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler-env/test.nix b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test.nix index e42f1bf25711..8fdbafbba425 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler-env/test.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler-env/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}: +{ callPackage, test, stubs, should}: let bundlerEnv = callPackage ./default.nix stubs // { basicEnv = callPackage ../bundled-common stubs; diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index a7c94601dd88..d4edbf44a798 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.7"; + version = "1.6.8"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0d7iqgyvsyl8m02bwcsvp11q73xcsvzwwipjzlbqrgi0jivf34pw"; + sha256 = "1lqc071v5f8dy1da669l0bfw9p8l6yavzlizzig9m441zcrmbj5d"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 5a3ee3d8cbdd..2bb9f6e5d427 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub , buildPackages -, callPackage , pkgconfig , libusb, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash @@ -23,7 +22,7 @@ let inherit (stdenv.lib) optional; generic = { - version_commit, + version_commit, # unused gittap, gittip, rev, diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix new file mode 100644 index 000000000000..7c320c3ea03e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tflint"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "wata727"; + repo = pname; + rev = "v${version}"; + sha256 = "0kqlwncsxssi1jchmrg1wmv7dknp0shx33j7kkryy12wdxxcbwyb"; + }; + + modSha256 = "1j5hjr4l4ivvhrywk286zczsn9balaaq5l5qx4ga4v0llwspmygm"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Terraform linter focused on possible errors, best practices, and so on"; + homepage = "https://github.com/wata727/tflint"; + license = licenses.mpl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix index 4def201952a9..c362ae5734cb 100644 --- a/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: +{ stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.15.0"; diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index c4095a6f9b3c..73adfaec8386 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,6 +1,5 @@ { lib , python -, fetchFromGitHub }: let diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index 1a56933548f6..035bc16064d5 100644 --- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -1,7 +1,5 @@ { buildBazelPackage -, cacert , fetchFromGitHub -, fetchpatch , git , go , python diff --git a/nixpkgs/pkgs/development/tools/build-managers/alibuild/default.nix b/nixpkgs/pkgs/development/tools/build-managers/alibuild/default.nix index 68f00be342c3..c50e57160639 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/alibuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python}: +{ lib, python}: python.pkgs.buildPythonApplication rec { pname = "alibuild"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix index fa6b310ce618..898640a84fe6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, runCommandCC, bazel, runLocal, bazelTest }: +{ writeText, bazel, runLocal, bazelTest }: # Tests that certain executables are available in bazel-executed bash shells. diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index dbbc0d11ff1a..0d821fa61660 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -1,7 +1,6 @@ { buildBazelPackage , cacert , fetchFromGitHub -, fetchpatch , git , go , stdenv diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix index 1ea0fc049ba8..f8ed157e693b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,10 +1,12 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, runCommandCC, makeWrapper +{ stdenv, callPackage, lib, fetchurl, runCommand, runCommandCC, makeWrapper # this package (through the fixpoint glass) , bazel , lr, xe, zip, unzip, bash, writeCBin, coreutils -, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils +, which, python, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python3, writeScript # Apple dependencies -, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively , buildJdk, runJdk , buildJdkName @@ -15,45 +17,35 @@ }: let - srcDeps = [ - # From: $REPO_ROOT/WORKSPACE - (fetchurl { - url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip"; - sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7"; - }) - (fetchurl { - url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz"; - sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f"; - }) - (fetchurl { - url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"; - sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52"; - }) - (fetchurl { - url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"; - sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_linux-v3.2.zip"; - sha256 = "b93e7c556b01815afb6c248aa73f06b7ec912805bde8898eedac1e20d08f2e67"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_darwin-v3.2.zip"; - sha256 = "1437327179b4284f7082cee0bdc3328f040e62fc5cc59c32f6824b8c520e2b7b"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip"; - sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889"; - }) - (fetchurl { - url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"; - sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz"; - sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f"; - }) - ]; + version = "0.26.1"; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "000ny51hwnjyizm1md4w8q7m832jhf3c767pgbvg6nc7h67lzsf0"; + }; + + # Update with `eval $(nix-build -A bazel.updater)`, + # then add new dependencies from the dict in ./src-deps.json as required. + srcDeps = + let + srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + toFetchurl = d: fetchurl { + name = d.name; + urls = d.urls; + sha256 = d.sha256; + }; + in map toFetchurl [ + srcs.desugar_jdk_libs + srcs.io_bazel_skydoc + srcs.bazel_skylib + srcs.io_bazel_rules_sass + (if stdenv.hostPlatform.isDarwin + then srcs.${"java_tools_javac10_darwin-v3.2.zip"} + else srcs.${"java_tools_javac10_linux-v3.2.zip"}) + srcs.${"coverage_output_generator-v1.0.zip"} + srcs.build_bazel_rules_nodejs + srcs.${"android_tools_pkg-0.2.tar.gz"} + ]; distDir = runCommand "bazel-deps" {} '' mkdir -p $out @@ -97,8 +89,7 @@ let in stdenv.mkDerivation rec { - - version = "0.26.1"; + name = "bazel-${version}"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -108,6 +99,14 @@ stdenv.mkDerivation rec { inherit platforms; }; + inherit src; + sourceRoot = "."; + + patches = [ + ./python-stub-path-fix.patch + ] ++ lib.optional enableNixHacks ./nix-hacks.patch; + + # Additional tests that check bazel’s functionality. Execute # # nix-build . -A bazel.tests @@ -176,23 +175,19 @@ stdenv.mkDerivation rec { bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; }; - name = "bazel-${version}"; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; - sha256 = "000ny51hwnjyizm1md4w8q7m832jhf3c767pgbvg6nc7h67lzsf0"; - }; + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + cat ${runCommand "bazel-deps.json" {} '' + ${unzip}/bin/unzip ${src} WORKSPACE + ${python3}/bin/python3 ${./update-srcDeps.py} ./WORKSPACE > $out + ''} > ${builtins.toString ./src-deps.json} + ''; # Necessary for the tests to pass on Darwin with sandbox enabled. # Bazel starts a local server and needs to bind a local address. __darwinAllowLocalNetworking = true; - sourceRoot = "."; - - patches = [ - ./python-stub-path-fix.patch - ] ++ lib.optional enableNixHacks ./nix-hacks.patch; - # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. customBash = writeCBin "bash" '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index 08bc642b6307..17d5697a81ea 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, bazel, bazelTest, runLocal }: +{ writeText, bazel, bazelTest, runLocal }: let WORKSPACE = writeText "WORKSPACE" '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json b/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json new file mode 100644 index 000000000000..752f0a4c9909 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/src-deps.json @@ -0,0 +1,386 @@ +{ + "0.16.2.zip": { + "name": "0.16.2.zip", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz": { + "name": "2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz", + "sha256": "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz" + ] + }, + "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { + "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "android_tools_pkg-0.2.tar.gz": { + "name": "android_tools_pkg-0.2.tar.gz", + "sha256": "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz" + ] + }, + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "a36bac432d0dbd8c98249e484b2b69dd5720afa4abb58711a3c3def1c0bfa21d", + "strip_prefix": "j2objc-2.0.3", + "urls": [ + "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip", + "https://github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip" + ] + }, + "bazel_rbe_toolchains": { + "name": "bazel_rbe_toolchains", + "sha256": "f575778fb1366718f5e1204200ecf35796c558998c15303945d351f0b42669e5", + "strip_prefix": "bazel_rbe_toolchains-f50471a57cd05a313a953fa54756db6e8fd93673", + "urls": [ + "https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/f50471a57cd05a313a953fa54756db6e8fd93673.tar.gz", + "https://github.com/buchgr/bazel_rbe_toolchains/archive/f50471a57cd05a313a953fa54756db6e8fd93673.tar.gz" + ] + }, + "bazel_skylib": { + "name": "bazel_skylib", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "bazel_toolchains": { + "name": "bazel_toolchains", + "sha256": "67335b3563d9b67dc2550b8f27cc689b64fadac491e69ce78763d9ba894cc5cc", + "strip_prefix": "bazel-toolchains-cddc376d428ada2927ad359211c3e356bd9c9fbb", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "name": "build_bazel_rules_nodejs", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "strip_prefix": "rules_nodejs-0.16.2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "com_google_googletest": { + "name": "com_google_googletest", + "sha256": "0fb00ff413f6b9b80ccee44a374ca7a18af7315aea72a43c62f2acd1ca74e9b5", + "strip_prefix": "googletest-f13bbe2992d188e834339abe6f715b2b2f840a77", + "urls": [ + "https://mirror.bazel.build/github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz", + "https://github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz" + ] + }, + "coverage_output_generator-v1.0.zip": { + "name": "coverage_output_generator-v1.0.zip", + "sha256": "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip" + ] + }, + "desugar_jdk_libs": { + "name": "desugar_jdk_libs", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { + "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": { + "name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "io_bazel_rules_sass": { + "name": "io_bazel_rules_sass", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "io_bazel_skydoc": { + "name": "io_bazel_skydoc", + "sha256": "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f", + "strip_prefix": "skydoc-2d9566b21fbe405acf5f7bf77eda30df72a4744c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz" + ] + }, + "java_tools_javac10_darwin-v3.2.zip": { + "name": "java_tools_javac10_darwin-v3.2.zip", + "sha256": "1437327179b4284f7082cee0bdc3328f040e62fc5cc59c32f6824b8c520e2b7b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_darwin-v3.2.zip" + ] + }, + "java_tools_javac10_linux-v3.2.zip": { + "name": "java_tools_javac10_linux-v3.2.zip", + "sha256": "b93e7c556b01815afb6c248aa73f06b7ec912805bde8898eedac1e20d08f2e67", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_linux-v3.2.zip" + ] + }, + "java_tools_javac10_windows-v3.2.zip": { + "name": "java_tools_javac10_windows-v3.2.zip", + "sha256": "86d3cc7fa0dc91ccb8f78ae3af8440fe459177e22062043ee4b83d55e6b7dfb0", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_windows-v3.2.zip" + ] + }, + "java_tools_langtools_javac10": { + "name": "java_tools_langtools_javac10", + "sha256": "e379c71e051eb83e3fc9a08c9b404712707d8920ffcf1e8fd59c844965f0b0dd", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10.zip" + ] + }, + "java_tools_langtools_javac9": { + "name": "java_tools_langtools_javac9", + "sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9.zip" + ] + }, + "jdk10-server-release-1804.tar.xz": { + "name": "jdk10-server-release-1804.tar.xz", + "sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz" + ] + }, + "jdk9-server-release-1708.tar.xz": { + "name": "jdk9-server-release-1708.tar.xz", + "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" + ] + }, + "openjdk10_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk10_linux_archive", + "sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f", + "strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk11_linux_archive", + "sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48", + "strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz" + ] + }, + "openjdk12_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk12_linux_archive", + "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", + "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" + ] + }, + "openjdk9_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk9_linux_archive", + "sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8", + "strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "name": "openjdk_linux_aarch64", + "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz", + "http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "name": "openjdk_linux_vanilla", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "openjdk_macos": { + "downloaded_file_path": "zulu-macos.tar.gz", + "name": "openjdk_macos", + "sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz" + ] + }, + "openjdk_macos_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "name": "openjdk_macos_minimal", + "sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz" + ] + }, + "openjdk_macos_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "name": "openjdk_macos_vanilla", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "name": "openjdk_win_vanilla", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", + "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz", + "sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": { + "name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip", + "sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip" + ] + }, + "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz", + "sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz", + "sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-win_x64.zip": { + "name": "zulu11.2.3-jdk11.0.1-win_x64.zip", + "sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": { + "name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-win_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz", + "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz", + "sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": { + "name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip", + "sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip" + ] + } +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py new file mode 100755 index 000000000000..7fd1e5e2b048 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/update-srcDeps.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python3 +import sys +import json + +if len(sys.argv) == 1: + print("usage: ./this-script WORKSPACE", file=sys.stderr) + print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr) + print("Hail Eris.", file=sys.stderr) + sys.exit(1) + +http_archives = [] + +# just the kw args are the dict { name, sha256, urls … } +def http_archive(**kw): + http_archives.append(kw) +# like http_file +def http_file(**kw): + http_archives.append(kw) + +# this is inverted from http_archive/http_file and bundles multiple archives +def distdir_tar(**kw): + for archive_name in kw['archives']: + http_archives.append({ + "name": archive_name, + "sha256": kw['sha256'][archive_name], + "urls": kw['urls'][archive_name] + }) + +# stubs for symbols we are not interested in +# might need to be expanded if new bazel releases add symbols to the workspace +def workspace(name): pass +def load(*args): pass +def bind(**kw): pass +def list_source_repository(**kw): pass +def new_local_repository(**kw): pass +def local_repository(**kw): pass +DOC_VERSIONS = [] +def skydoc_repositories(**kw): pass +def rules_sass_dependencies(**kw): pass +def node_repositories(**kw): pass +def sass_repositories(**kw): pass +def register_execution_platforms(*args): pass + +# execute the WORKSPACE like it was python code in this module, +# using all the function stubs from above. +with open(sys.argv[1]) as f: + exec(f.read()) + +# transform to a dict with the names as keys +d = { el['name']: el for el in http_archives } + +print(json.dumps(d, sort_keys=True, indent=4)) diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch new file mode 100644 index 000000000000..9b1267257ad1 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch @@ -0,0 +1,10 @@ +--- bmake/make-bootstrap.sh.in.orig 2019-02-19 10:55:21.733606117 -0800 ++++ bmake/make-bootstrap.sh.in 2019-02-19 10:56:02.150771541 -0800 +@@ -4,6 +4,7 @@ + + srcdir=@srcdir@ + ++prefix="@prefix@" + DEFAULT_SYS_PATH="@default_sys_path@" + + case "@use_meta@" in diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix new file mode 100644 index 000000000000..f71b877c8c52 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl +, getopt +}: + +stdenv.mkDerivation rec { + name = "bmake-${version}"; + version = "20181221"; + + src = fetchurl { + url = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz"; + sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw"; + }; + + nativeBuildInputs = [ getopt ]; + + patches = [ + ./bootstrap-fix.patch + ./fix-unexport-env-test.patch + ]; + + meta = with stdenv.lib; { + description = "Portable version of NetBSD 'make'"; + homepage = "http://www.crufty.net/help/sjg/bmake.html"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch new file mode 100644 index 000000000000..339348f37c32 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch @@ -0,0 +1,13 @@ +--- bmake/unit-tests/unexport-env.mk.orig 2019-02-19 10:24:14.356713136 -0800 ++++ bmake/unit-tests/unexport-env.mk 2019-02-19 10:25:43.838775388 -0800 +@@ -3,8 +3,8 @@ + # pick up a bunch of exported vars + .include "export.mk" + +-# an example of setting up a minimal environment. +-PATH = /bin:/usr/bin:/sbin:/usr/sbin ++# preserve PATH so commands used in the "all" target are still available ++PATH := ${PATH} + + # now clobber the environment to just PATH and UT_TEST + UT_TEST = unexport-env diff --git a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix index 6963ccd161a1..30e88b497ad9 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "buck"; - version = "2019.05.22.01"; + version = "2019.06.17.01"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1fxprw18kd3cw1lzv4xi1lnbdni06hs4vm9yh0w548rsfn3wnmxq"; + sha256 = "1nmphjxqwp51j16qajgvi853dm7654x1w1737xr81zzpcbjw6qig"; }; patches = [ ./pex-mtime.patch ]; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://buckbuild.com/; + homepage = "https://buck.build/"; description = "A high-performance build tool"; - maintainers = [ maintainers.jgertm ]; + maintainers = [ maintainers.jgertm maintainers.marsam ]; license = licenses.asl20; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 721015f0c7c4..290860a0d9c3 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes diff --git a/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix index 7ee4c4ee2580..d89c5fdbabde 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin, writeText +{ stdenv, lib, fetchgit, darwin, writeText , git, ninja, python2 }: let diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index f9dc33a36e0e..c3346ad7e993 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook }: - +{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook +# optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` +, withTools ? null +}: +let + wafToolsArg = with stdenv.lib.strings; + optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\""; +in stdenv.mkDerivation rec { name = "waf-${version}"; version = "2.0.15"; @@ -24,7 +30,7 @@ stdenv.mkDerivation rec { python waf-light configure ''; buildPhase = '' - python waf-light build + python waf-light build${wafToolsArg} ''; installPhase = '' install waf $out diff --git a/nixpkgs/pkgs/development/tools/clang-tools/default.nix b/nixpkgs/pkgs/development/tools/clang-tools/default.nix index 42bcf7fd055f..bd8401ac80dd 100644 --- a/nixpkgs/pkgs/development/tools/clang-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, llvmPackages }: +{ stdenv, llvmPackages }: let clang = llvmPackages.clang-unwrapped; diff --git a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix index 4f285fa69618..70d0acfec884 100644 --- a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, go }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "cloudfoundry-cli-${version}"; diff --git a/nixpkgs/pkgs/development/tools/cppclean/default.nix b/nixpkgs/pkgs/development/tools/cppclean/default.nix index 96fe07a7799a..99f8d55bd87e 100644 --- a/nixpkgs/pkgs/development/tools/cppclean/default.nix +++ b/nixpkgs/pkgs/development/tools/cppclean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: with python3Packages; diff --git a/nixpkgs/pkgs/development/tools/dapper/default.nix b/nixpkgs/pkgs/development/tools/dapper/default.nix index 265763492b88..d5c7d309e98d 100644 --- a/nixpkgs/pkgs/development/tools/dapper/default.nix +++ b/nixpkgs/pkgs/development/tools/dapper/default.nix @@ -1,7 +1,6 @@ { buildGoPackage , lib , fetchFromGitHub -, fetchpatch }: buildGoPackage rec { diff --git a/nixpkgs/pkgs/development/tools/database/cdb/default.nix b/nixpkgs/pkgs/development/tools/database/cdb/default.nix index f0a4f6c34e25..553d622a83c6 100644 --- a/nixpkgs/pkgs/development/tools/database/cdb/default.nix +++ b/nixpkgs/pkgs/development/tools/database/cdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, writeText }: +{ stdenv, lib, fetchurl, fetchFromGitHub }: let version = "0.75"; diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 14fcc3f8607c..7eb34aa29ba4 100644 --- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "dbmate-${version}"; diff --git a/nixpkgs/pkgs/development/tools/database/pgcli/default.nix b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix index 602eb33fdc1c..31ffff3804f0 100644 --- a/nixpkgs/pkgs/development/tools/database/pgcli/default.nix +++ b/nixpkgs/pkgs/development/tools/database/pgcli/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "pgcli"; diff --git a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix index af58762f80eb..e67b417226f4 100644 --- a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix @@ -1,5 +1,5 @@ { stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang -, beamPackages, z3, python }: +, z3, python }: stdenv.mkDerivation rec { name = "cuter-${version}"; diff --git a/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix index 2c32cc5c6706..78735d8f76fc 100644 --- a/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHex, fetchRebar3Deps, rebar3Relx }: +{ fetchHex, fetchRebar3Deps, rebar3Relx }: rebar3Relx rec { name = "relx-exe"; diff --git a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix index 6210361eb883..292c0dc3a4e8 100644 --- a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix +++ b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , python3Packages , python3 , fetchFromGitHub diff --git a/nixpkgs/pkgs/development/tools/git-ftp/default.nix b/nixpkgs/pkgs/development/tools/git-ftp/default.nix index 4c67a45d8c30..2d61b27e2c2c 100644 --- a/nixpkgs/pkgs/development/tools/git-ftp/default.nix +++ b/nixpkgs/pkgs/development/tools/git-ftp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { name = "git-ftp-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "git-ftp"; repo = "git-ftp"; rev = version; - sha256 = "0nh2f58rwwfzmglm75fmmm10470a80q0vsihc2msa8xswngihg22"; + sha256 = "09qr8ciyfipcq32kl78ksvcra22aq7r4my685aajlbvkxgs0a867"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix b/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix index 9362ef3fe45d..02de300138d2 100644 --- a/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix +++ b/nixpkgs/pkgs/development/tools/github-changelog-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerApp}: +{ lib, bundlerApp}: bundlerApp rec { pname = "github_changelog_generator"; diff --git a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index 9841e7900cd5..361740def118 100644 --- a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, maven, writeText, makeWrapper, jre_headless, pcsclite }: +{ stdenv, fetchFromGitHub, jdk, maven, makeWrapper, jre_headless, pcsclite }: # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/jq/default.nix b/nixpkgs/pkgs/development/tools/jq/default.nix index 307968a68440..ebb875c92984 100644 --- a/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/nixpkgs/pkgs/development/tools/jq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, oniguruma }: +{ stdenv, fetchurl, oniguruma }: stdenv.mkDerivation rec { name = "jq-${version}"; diff --git a/nixpkgs/pkgs/development/tools/kubicorn/default.nix b/nixpkgs/pkgs/development/tools/kubicorn/default.nix index fb76aed7b9eb..a63de5507479 100644 --- a/nixpkgs/pkgs/development/tools/kubicorn/default.nix +++ b/nixpkgs/pkgs/development/tools/kubicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: with stdenv.lib; diff --git a/nixpkgs/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix index 49cea5e8ac81..69f246e921b5 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "kustomize-${version}"; diff --git a/nixpkgs/pkgs/development/tools/kythe/default.nix b/nixpkgs/pkgs/development/tools/kythe/default.nix index aaad6d31210c..c2bba7b32542 100644 --- a/nixpkgs/pkgs/development/tools/kythe/default.nix +++ b/nixpkgs/pkgs/development/tools/kythe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils , fetchurl, glibc, ncurses5 }: +{ stdenv, binutils , fetchurl, ncurses5 }: stdenv.mkDerivation rec { version = "0.0.30"; diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 1edd2944eab9..c33741740adc 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -6,7 +6,6 @@ , noSysDirs , gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform , bison ? null -, fetchpatch }: let diff --git a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix index 0e4af1348902..73de8eb8cb61 100644 --- a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix @@ -6,6 +6,7 @@ , libtool , makeWrapper , texinfo +, CoreServices }: stdenv.mkDerivation rec { @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1d1fvm36qgh6a5j9v24wai61d297pvzxr14jngjlhh4i474ff21i"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool makeWrapper texinfo ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index 05e0b1cd96f6..e37824d241cc 100644 --- a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { stdenv # Build time -, fetchurl, fetchpatch, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, zlib, dejagnu diff --git a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix index 36e83564346b..b021a3e222b3 100644 --- a/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gdbgui/default.nix @@ -2,15 +2,12 @@ , buildPythonApplication , fetchPypi , gdb -, iana-etc -, libredirect , flask , flask-socketio , flask-compress , pygdbmi , pygments , gevent -, breakpointHook , }: buildPythonApplication rec { diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix index e11dd5040b09..0d052f340958 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix @@ -2,7 +2,6 @@ , enableUnfree ? true , stdenv , makeWrapper -, fetchzip , fetchurl , nodejs-10_x , coreutils diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix index 0c3dd9f12c28..e8435549f4aa 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix @@ -2,7 +2,6 @@ , enableUnfree ? true , stdenv , makeWrapper -, fetchzip , fetchurl , nodejs-10_x , coreutils diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index b671a27ac747..42ca1a1b7d54 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.6"; + version = "2.10.7"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "0z2kh6svszi332012id373bjwzcmzj6fks993f6yi35zpqmzapgh"; + sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix index 27c8f609d5d6..adc4bbd5c39a 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "0aw580xx6x9hgbxrzil7yqv12j8yvi5d9iibldx3z5jz1pwj114y"; + sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm"; }; buildInputs = [ python ]; diff --git a/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix index 9f0e767c3d0b..80cfdc8b196d 100644 --- a/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; diff --git a/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix index bec855f3cee6..262afe4f1891 100644 --- a/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre, buildPackages }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; diff --git a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 91f2a5c58fc2..82d0ec6119ea 100644 --- a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, libusb, fetchgit }: +{ stdenv, libusb, fetchgit }: let version = "2.1"; in diff --git a/nixpkgs/pkgs/development/tools/packet/default.nix b/nixpkgs/pkgs/development/tools/packet/default.nix index 4c30d000ce20..82849be40b2c 100644 --- a/nixpkgs/pkgs/development/tools/packet/default.nix +++ b/nixpkgs/pkgs/development/tools/packet/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "packet-${version}"; diff --git a/nixpkgs/pkgs/development/tools/remarshal/default.nix b/nixpkgs/pkgs/development/tools/remarshal/default.nix index 10bfd0c2f2d0..460fb46671ff 100644 --- a/nixpkgs/pkgs/development/tools/remarshal/default.nix +++ b/nixpkgs/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "remarshal"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index da42e819ced6..03c3a75bc1a3 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.19.5"; + version = "0.20.0"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0xjyzsi3n3lb5g4gl6v0s4p87nazkqgjf244m792iji9i568ynjb"; + sha256 = "0hf8g91iv4c856whaaqrv5s8z56gi3086pva6vdwmn75gwxkw7zk"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/285cf8f9b0ab33db0d656fdc8e759feed55c0167/cargo-make-Cargo.lock"; - sha256 = "0l2i2hq43k482m2w6hpapaq53r8bjljfcszp6csljj4fvxcl62yj"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8b4ca42376199d4e4781473b4112ef8f18bbd1cc/cargo-make-Cargo.lock"; + sha256 = "1zffq7r1cnzdqw4d3vdvlwj56pfak9gj14ibn1g0j7lncwxw2dgs"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1rmdmvr5wc2m0yv3dy07cv9y1xrwlfri3hk97zjwv5f73wgncspy"; + cargoSha256 = "1r2fiwcjf739rkprrwidgsd9i5pjgk723ipazmlccz2jpwbrk7zr"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/nixpkgs/pkgs/development/tools/simavr/default.nix b/nixpkgs/pkgs/development/tools/simavr/default.nix index f2bbbef71896..04076a8f0cf6 100644 --- a/nixpkgs/pkgs/development/tools/simavr/default.nix +++ b/nixpkgs/pkgs/development/tools/simavr/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, libelf, which, git, pkgconfig, freeglut -, avrbinutils, avrgcc, avrlibc +{ stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut +, avrgcc, avrlibc , libGLU_combined , GLUT }: diff --git a/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix index 991edf9b568f..35ba9f8c006b 100644 --- a/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, openal, libmodplug, libvorbis, solarus, - qtbase, qttools, fetchpatch, glm }: + qtbase, qttools, glm }: stdenv.mkDerivation rec { name = "solarus-quest-editor-${version}"; diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix index 42042b87198d..4c5b1843229b 100644 --- a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix +++ b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoPatchelfHook -, icu, zlib, expat, dbus, libheimdal, openssl}: +, zlib, expat, dbus, openssl}: stdenv.mkDerivation rec { name = "sourcetrail-${version}"; diff --git a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index 702b7a564b22..5acf5ed0d231 100644 --- a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, cmake, writeText, python3 +{ stdenv, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/wp-cli/default.nix b/nixpkgs/pkgs/development/tools/wp-cli/default.nix index 211f71693976..c6c001143a95 100644 --- a/nixpkgs/pkgs/development/tools/wp-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/wp-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, writeText, php, runtimeShell }: +{ stdenv, lib, fetchurl, php, runtimeShell }: let version = "2.0.1"; diff --git a/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix b/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix index 74192d9c6744..5ff3ca6808dc 100644 --- a/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix +++ b/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix @@ -1,5 +1,5 @@ -{ stdenv, runCommand, lib, toolchainName, sdkName -, writeText, version, xcodePlatform, libcxx, symlinkJoin }: +{ runCommand, lib, toolchainName, sdkName +, writeText, version, xcodePlatform }: let inherit (lib.generators) toPlist; diff --git a/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix b/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix index bc49a48778fc..cd7b86163667 100644 --- a/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix +++ b/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand +{ stdenv, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics , runtimeShell, callPackage , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" diff --git a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index b4213c6ed944..6dc68750075c 100644 --- a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -114,7 +114,7 @@ in ''; passthru.updateScript = import ./update.nix { - inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; + inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; inherit (stdenv) lib; inherit majorVersion; }; diff --git a/nixpkgs/pkgs/development/web/nodejs/update.nix b/nixpkgs/pkgs/development/web/nodejs/update.nix index 7b5a4710aa09..47e1abc9b217 100644 --- a/nixpkgs/pkgs/development/web/nodejs/update.nix +++ b/nixpkgs/pkgs/development/web/nodejs/update.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , writeScript , coreutils , curl diff --git a/nixpkgs/pkgs/development/web/nodejs/v10.nix b/nixpkgs/pkgs/development/web/nodejs/v10.nix index fd0196961441..5743868d5d96 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v10.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v10.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, openssl, enableNpm ? true }: +{ callPackage, openssl, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; diff --git a/nixpkgs/pkgs/development/web/nodejs/v11.nix b/nixpkgs/pkgs/development/web/nodejs/v11.nix index 881c348a98a5..7b60a3772d3c 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v11.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v11.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, openssl, enableNpm ? true }: +{ callPackage, openssl, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; diff --git a/nixpkgs/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix index 1e68714f8c14..1ad8b3206d20 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; diff --git a/nixpkgs/pkgs/development/web/nodejs/v8.nix b/nixpkgs/pkgs/development/web/nodejs/v8.nix index cf877521144a..90d88215d3fd 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v8.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: +{ callPackage, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix {}; |