diff options
Diffstat (limited to 'pkgs/development')
756 files changed, 2008 insertions, 1330 deletions
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index dfdd8141aaa..45186914604 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -1,5 +1,5 @@ -{ pkgs, newScope }: +{ newScope }: let callPackage = newScope self; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 83de6f9e569..f10c8ec86ff 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, erlang }: let - inherit (stdenv.lib) getVersion versionAtLeast makeExtensible; + inherit (stdenv.lib) makeExtensible; lib = pkgs.callPackage ./lib.nix {}; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index d6b83cb1af0..db40c47794f 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -49,7 +49,6 @@ rec { */ callElixir = drv: args: let - inherit (stdenv.lib) versionAtLeast; builder = callPackage ../interpreters/elixir/generic-builder.nix args; in callPackage drv { @@ -71,7 +70,6 @@ rec { */ callLFE = drv: args: let - inherit (stdenv.lib) versionAtLeast; builder = callPackage ../interpreters/lfe/generic-builder.nix args; in callPackage drv { diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 968c845a011..ec5e08ffda4 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared-mime-info, gtksourceview, gtk2 -, targetVersion ? "4.5" }: +{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant +, shared-mime-info, gtksourceview, gtk2 }: let release = "alpha"; diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix index 58247e5aeb5..2a14a997e57 100644 --- a/pkgs/development/compilers/chicken/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/eggDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchegg, chicken, makeWrapper }: +{ stdenv, chicken, makeWrapper }: { name, src , buildInputs ? [] , chickenInstallFlags ? [] @@ -8,7 +8,6 @@ let libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/"; overrides = import ./overrides.nix; - lib = stdenv.lib; baseName = (builtins.parseDrvName name).name; override = if builtins.hasAttr baseName overrides then diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 6bfb71a9627..6ff2028e3c1 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub , llvmPackages , cmake, boehmgc, gmp, zlib, ncurses, boost - , waf, python, git, sbcl + , python, git, sbcl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index b7c310cf01d..e44c21abe94 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib +{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses, expat, python27, zlib , gcc48, gcc49, gcc5, gcc6 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index e7cb7495c90..f16be1b2822 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -6,7 +6,6 @@ , libuuid , zlib , curl -, patchelf }: let diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 8ed34cf9d1e..6a8d5f11b75 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }: +{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }: # To update: # 1) Update versions in ./update-elm.rb and run it. diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 8e268aa7eb7..e03039cb5e1 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,5 +1,5 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs -, jre, binaryen, enableWasm ? true , python2Packages, cmake +{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler +, jre, binaryen, enableWasm ? true , cmake }: let diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 5317cf25d41..06acebd2ba4 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -1,4 +1,4 @@ -{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }: +{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, ... }: let rev = emscriptenVersion; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ce198786600..4dab2e06f48 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, +{ stdenv, fetchurl, fetchFromGitHub, glib, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, libGLU, libXmu, libXt, libICE, libSM }: diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 202e5525422..72530f99cdb 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,4 +1,4 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }: +{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }: stdenv.mkDerivation rec { name = "gambit-${version}"; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 93f1d9184b4..77e8fb51602 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -2,7 +2,6 @@ callPackage ./build.nix { version = "4.8.9"; - git-version = "4.8.9"; SRC = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 545bece12c4..169ddb5a6a3 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -2,7 +2,6 @@ callPackage ./build.nix { version = "unstable-2018-05-30"; - git-version = "4.8.9-54-gffe8841b"; SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 75259ed3983..943391611de 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -28,7 +28,6 @@ , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -54,9 +53,6 @@ with builtins; let version = "4.8.5"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = [ ] diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 27164176b53..bf3b192e1bb 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -28,7 +28,6 @@ , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -54,9 +53,6 @@ with builtins; let version = "4.9.4"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index eeeabe301d1..0564329967e 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -29,7 +29,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -53,9 +52,6 @@ with builtins; let version = "5.5.0"; sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index e5c77568a0e..50d55aef234 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -29,7 +29,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -52,9 +51,6 @@ with builtins; let version = "6.4.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index d671743ee62..0c51868aef8 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -41,9 +40,6 @@ with builtins; let version = "7.3.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index e8c03c38230..38d8bcd83cf 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +{ stdenv, targetPackages, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -41,9 +40,6 @@ with builtins; let version = "8.1.0"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 4e69d7e0408..124fdbcdf9d 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -22,7 +22,6 @@ stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places -, darwin ? null , flex ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages @@ -42,9 +41,6 @@ with builtins; let version = "7-20170409"; - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; - enableParallelBuilding = true; patches = diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 2a80eccfb40..71a6eaa8db8 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mpfr, m4, binutils, fetchcvs, emacs, zlib, which +{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace , libXext, xextproto, libXt, libXaw, libXmu } : diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 0e4d5bed051..f503427b326 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mpfr, m4, binutils, fetchcvs, emacs, zlib, which +{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which , texinfo, libX11, xproto, inputproto, libXi, gmp , libXext, xextproto, libXt, libXaw, libXmu } : diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 5609de15d4c..0ce9fbb00e2 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeStaticLibraries, +{ stdenv, makeStaticLibraries, coreutils, rsync, bash, openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql, version, git-version, GAMBIT, SRC }: diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 2a906d918aa..0cf3a4cb12b 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -3,10 +3,10 @@ # build-tools , bootPkgs, hscolour -, coreutils, fetchurl, fetchpatch, perl +, coreutils, fetchurl, perl , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 8062e93df54..7671fcdb025 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -5,7 +5,7 @@ , bootPkgs, hscolour , coreutils, fetchpatch, fetchurl, perl, sphinx -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index d740a7ee673..c24cdeb43bf 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -6,7 +6,7 @@ , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx , runCommand -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 182afa6b349..c93fb1fd9b2 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -5,7 +5,7 @@ , bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 522ad32e69f..ae22e1f1e40 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -3,9 +3,9 @@ # build-tools , bootPkgs, alex, happy, hscolour -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4c1e5d986dc..2824ce669ee 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -5,7 +5,7 @@ , bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchgit, perl, python3, m4 -, libffi, libiconv ? null, ncurses +, libiconv ? null, ncurses , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix index 57d9fccd266..df1394e4a24 100644 --- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix +++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix @@ -4,7 +4,6 @@ , python3 , gcc , cabal-install -, gmp , runCommand , lib , stdenv diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index f09a577110b..46e9d8d72be 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -3,7 +3,6 @@ , broken ? false , test-framework , test-framework-hunit -, test-framework-quickcheck2 , data-default , ghc-paths , haskell-src-exts @@ -20,10 +19,8 @@ , transformers-compat , haddock-api , regex-posix -, callPackage , bootPkgs, gmp -, jailbreak-cabal , runCommand , nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm @@ -32,11 +29,11 @@ , lens , parallel, safe, shelly, split, stringsearch, syb , tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub, Cabal +, vector, yaml, fetchgit, fetchFromGitHub , alex, happy, git, gnumake, autoconf, patch , automake, libtool , cryptohash -, haddock, hspec, xhtml, primitive, cacert, pkgs +, haddock, hspec, xhtml, pkgs , coreutils , libiconv diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index b4fa005c3de..513d0307f6b 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps , pcre, cacert, llvm -, Security, Foundation, bash +, Security, Foundation , makeWrapper, git, subversion, mercurial, bazaar }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 8ef528e2c92..d46e40f460b 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps , pcre, cacert, llvm -, Security, Foundation, bash +, Security, Foundation , makeWrapper, git, subversion, mercurial, bazaar }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 79446744371..52a49c519b3 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }: let # pre-download some cache entries ('mx' will not be able to download under nixbld1) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index afeef2b3637..0a974fccc88 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }: +{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }: let generic = { version, sha256, prePatch }: diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index 7f1830430c4..a6955c03051 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }: +{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }: let version = "6M62"; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index 9c4b38f87de..e64c0c912d9 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -1,6 +1,6 @@ { stdenv, git, clang, fetchFromGitHub, requireFile, - openssl, xz, gnutar, gcc, + openssl, xz, gnutar, automake, autoconf, libtool, clangStdenv } : clangStdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 7aedf191abe..a5d6247ffdc 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, fetchpatch, 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/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index cff6c1c446f..e503b7a92ce 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchgit, fetchurl, fetchzip +{ stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, runCommand , paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib -, llvm, libffi, ncurses +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 49bbaf0e8df..fcf486b3b41 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchgit, fetchurl, fetchzip +{ stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, runCommand , paxctl # libjulia dependencies , libunwind, readline, utf8proc, zlib -, llvm, libffi, ncurses +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index b5a3a8c6be2..a504dc2ea46 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl +{ stdenv, fetchurl # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl # libjulia dependencies diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 48301a8f287..dc6a933a934 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata +{ stdenv, fetchurl, cmake, llvm, curl, tzdata , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 0b29b04825a..25bb0828414 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index 96d4f9f558c..d54ffd96382 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,4 +1,4 @@ -{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: +{stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { name = "dragonegg-${version}"; diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 1bd4b88c72d..f176894dedb 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,5 +1,5 @@ -{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl -, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl +, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 1654914ff8c..98b6f4adbbf 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 28f908ee829..99869e6e80a 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index a6fb6119817..8cfcb1af43d 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -8,7 +8,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index ea3ea36eb6d..01c08f4bd20 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 458ad7db8ef..c974eb6f6d3 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -8,14 +8,12 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , zlib , compiler-rt_src , debugVersion ? false , enableSharedLibraries ? (buildPlatform == hostPlatform) -, darwin , buildPackages , buildPlatform , hostPlatform diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index ae674d1fa8e..75037f6a07d 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 6ce9c0d4792..2b543b9d793 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index 776109ee74d..21b0c1c3601 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -1,9 +1,7 @@ { stdenv , fetch , cmake -, zlib , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index e9140d3fcc6..514c3a006e3 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -6,7 +6,6 @@ , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +14,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index 0bdf5c71e1f..a8a6b3dfea8 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 07738048f8e..5fd0271f026 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index ef2e1c29088..00b0083108b 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 5492e12da98..c7b4615e374 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index 05801f2f08f..9a47435cf14 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -1,9 +1,7 @@ { stdenv , fetch , cmake -, zlib , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 31750e2d0da..68eebc33c6b 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch -, fetchpatch , cmake , python , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +13,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 5c2b7501f97..901015bf2ff 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 88214418406..84056749678 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 66f0facc952..141daa88dcf 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,6 +1,5 @@ -{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +{ lowPrio, newScope, stdenv, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith -, darwin , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index c1f0b9f6129..1f87cb83ab0 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { name = "libc++-${version}"; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 818ad47a335..1e68276945e 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -3,7 +3,6 @@ , cmake , libxml2 , llvm -, python , version }: diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 6fc448574f4..a86f5b5039e 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -1,12 +1,10 @@ { stdenv , fetch -, fetchpatch , cmake , python , libffi , libbfd , libxml2 -, valgrind , ncurses , version , release_version @@ -15,7 +13,6 @@ , enableManpages ? false , enableSharedLibraries ? true , enableWasm ? true -, darwin }: let diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 16093758e82..908a5f1218f 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -1,7 +1,6 @@ { stdenv , fetch , cmake -, zlib , llvm , perl , version diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix index 58fb0ca22d7..63e5b50c3d4 100644 --- a/pkgs/development/compilers/matter-compiler/default.nix +++ b/pkgs/development/compilers/matter-compiler/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "matter_compiler-0.5.1"; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index cdf201cec7a..9ce7c9166bc 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mcpp }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mcpp-2.7.2"; diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix index f13883db74f..892ae99abaf 100644 --- a/pkgs/development/compilers/mono/4.0.nix +++ b/pkgs/development/compilers/mono/4.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.0.4.1"; diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix index f80cffe220e..9a3ccd1fd86 100644 --- a/pkgs/development/compilers/mono/4.4.nix +++ b/pkgs/development/compilers/mono/4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix index 7c9918cdd39..2bba660b69c 100644 --- a/pkgs/development/compilers/mono/4.6.nix +++ b/pkgs/development/compilers/mono/4.6.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix index c3ba316cd13..f445127c0da 100644 --- a/pkgs/development/compilers/mono/4.8.nix +++ b/pkgs/development/compilers/mono/4.8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix index d10d6e3e605..53820c97b1b 100644 --- a/pkgs/development/compilers/mono/5.0.nix +++ b/pkgs/development/compilers/mono/5.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix index 31e86f94c0a..acebb4beef6 100644 --- a/pkgs/development/compilers/mono/5.4.nix +++ b/pkgs/development/compilers/mono/5.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix index 6db9e19807b..7b5008fd04c 100644 --- a/pkgs/development/compilers/mono/5.8.nix +++ b/pkgs/development/compilers/mono/5.8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc }: callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 9eec23f1ba8..21ccf77e4a2 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf }: +{ lib, stdenv, fetchurl }: assert stdenv ? glibc; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 774cefb7940..f5bd3430ae7 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: +{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { name = "obliv-c-${version}"; version = "0.0pre20170827"; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index 16d7e2580b3..e6c68894036 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -2,8 +2,7 @@ let useX11 = stdenv.isi686 || stdenv.isx86_64; - useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 7ed493fe92e..6e8d9003bf4 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 3c29df7ec78..612f0db0582 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,5 +1,5 @@ { stdenv -, runCommand, fetchurl, file, zlib +, runCommand, fetchurl, zlib , version }: diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index b93a13abc9c..de063500b70 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -2,11 +2,9 @@ , stdenv , requireFile , makeWrapper -, unzip , file , xorg ? null , packageType ? "JDK" # JDK, JRE, or ServerJRE -, pluginSupport ? true , glib , libxml2 , ffmpeg_2 @@ -28,7 +26,7 @@ assert swingSupport -> xorg != null; let - version = "10.0.1"; + version = "10.0.2"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -51,19 +49,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; - sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; + sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre10-downloads-4417026.html"; - sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; + sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; - sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; + sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c"; } else abort "unknown package Type ${packageType}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index bdd367ef352..55faf277b15 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "171"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; - sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; - sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; - sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 901eea0f8f1..55faf277b15 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "172"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; - sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; - sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; - sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 94b89cf3a95..60388265348 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { curryBase = haskellPackages.callPackage ( { mkDerivation, base, Cabal, containers, directory, either - , filepath, mtl, pretty, stdenv, syb, time + , filepath, mtl, pretty, syb, time }: mkDerivation { pname = "curry-base"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { curryFront = haskellPackages.callPackage ( { mkDerivation, base, Cabal, containers, directory - , filepath, mtl, network-uri, process, stdenv, syb, transformers + , filepath, mtl, network-uri, process, syb, transformers }: mkDerivation { pname = "curry-frontend"; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 4c3c5d008f0..488d43a6fea 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bash, cacert, zlib, buildRustPackage, curl, darwin +{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin , version , src , platform @@ -6,8 +6,7 @@ }: let - inherit (stdenv.lib) getLib optionalString; - inherit (darwin) libiconv; + inherit (stdenv.lib) optionalString; inherit (darwin.apple_sdk.frameworks) Security; bootstrapping = versionType == "bootstrap"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 46caabf3391..2ff3257c7fb 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib +{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin , version , patches ? [] diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b0dae9d2042..f3f9e2f57b7 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -13,7 +13,7 @@ , doCheck ? true , broken ? false , buildPlatform, hostPlatform -} @ args: +}: let inherit (stdenv.lib) optional optionalString; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 099a591b407..0523e099e49 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , boost, bison, flex, openjdk, doxygen -, perl, graphviz, libtool, ncurses, zlib, sqlite +, perl, graphviz, ncurses, zlib, sqlite , autoreconfHook }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index abbfdd2abb7..9c1a3658590 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -27,7 +27,6 @@ , git , libgit2 , fetchFromGitHub -, fetchpatch , paxctl , findutils , makeWrapper diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index f2b6016ceb7..8426635ce96 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, file, openssl, mlton +{ stdenv, fetchurl, file, openssl, mlton , mysql, postgresql, sqlite, gcc }: diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 1cc5dc368da..22721ca98bc 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, coq, ncurses, which , graphviz, withDoc ? false , src, name }: diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index a44e81d3c19..d09e47a7f84 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ncurses, which +{ stdenv, coq, ncurses, which , graphviz, withDoc ? false , src, name, patches ? [] }: diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c7e7cd4f4c3..0d9fb43be25 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb"; + sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -244,19 +244,21 @@ self: super: { # base bound digit = doJailbreak super.digit; - # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat - hnix = (overrideCabal super.hnix (old: { + # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably) + # This is due to GenList having been removed from generic-random in 1.2.0.0 + # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) + # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though + hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: { patches = old.patches or [] ++ [ # should land in hnix-5.2 (pkgs.fetchpatch { url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch"; sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh"; name = "disable-hpack-test-by-default.patch"; - }) + }) ]; testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; - broken = true; # can't cope with deriving-compat 0.5.x. - })); + }))); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -1100,4 +1102,10 @@ self: super: { unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; # dontCheck: printf double rounding behavior prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter; + + # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73 + hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch { + url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch"; + sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index f73172e02d3..825b4f349f0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -96,4 +96,83 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); +} // # All the following is needed to build tensorflow. +( +let + tensorflow-haskell = pkgs.fetchFromGitHub { + owner = "tensorflow"; + repo = "haskell"; + rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7"; + sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8"; + fetchSubmodules = true; + }; +in +{ + proto-lens-descriptors = super.proto-lens-descriptors.override { + proto-lens = self.proto-lens_0_2_2_0; + lens-labels = self.lens-labels_0_1_0_2; + }; + proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override { + haskell-src-exts = self.haskell-src-exts_1_19_1; + }; + proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override { + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + }; + tensorflow-proto = (super.callPackage ( + { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types + , proto-lens-protoc, stdenv + }: + mkDerivation { + pname = "tensorflow-proto"; + version = "0.1.0.0"; + src = tensorflow-haskell; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base proto-lens proto-lens-protobuf-types proto-lens-protoc + ]; + libraryToolDepends = [ pkgs.protobuf ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow protocol buffers"; + license = stdenv.lib.licenses.asl20; + } + ) { + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; + }).overrideAttrs (_oldAttrs: { + sourceRoot = "source/tensorflow-proto"; + }); + tensorflow = (super.callPackage ( + { mkDerivation, async, attoparsec, base, bytestring, c2hs + , containers, data-default, exceptions, fgl, HUnit, lens-family + , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv + , temporary, libtensorflow, tensorflow-proto, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "tensorflow"; + version = "0.1.0.2"; + src = tensorflow-haskell; + libraryHaskellDepends = [ + async attoparsec base bytestring containers data-default exceptions + fgl lens-family mainland-pretty mtl proto-lens semigroups split + temporary tensorflow-proto text transformers vector + ]; + librarySystemDepends = [ libtensorflow ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit lens-family proto-lens + tensorflow-proto test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow bindings"; + license = stdenv.lib.licenses.asl20; + } + ) {}).overrideAttrs (_oldAttrs: { + sourceRoot = "source/tensorflow"; + }); } +) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f50b02a7a95..06508c2b7b8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2392,6 +2392,7 @@ extra-packages: - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x + - lens-labels == 0.1.* # required for proto-lens-descriptors - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2399,6 +2400,9 @@ extra-packages: - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 + - proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - QuickCheck < 2 # required by test-framework-quickcheck and its users - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -2581,6 +2585,7 @@ dont-distribute-packages: passman-core: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-fragment-shader-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7b512e46da8..b8943a55394 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -11,7 +11,7 @@ let inherit (lib) extends makeExtensible; - inherit (haskellLib) overrideCabal makePackageSet; + inherit (haskellLib) makePackageSet; haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5816f295e0d..85355782171 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -758,6 +758,50 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda_2_5_4_1" = callPackage + ({ mkDerivation, alex, array, async, base, binary, blaze-html + , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq + , directory, EdisonCore, edit-distance, emacs, equivalence + , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable + , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process + , regex-tdfa, stm, strict, template-haskell, text, time + , transformers, unordered-containers, uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.5.4.1"; + sha256 = "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filemanip filepath process ]; + libraryHaskellDepends = [ + array async base binary blaze-html boxes bytestring containers + data-hash deepseq directory EdisonCore edit-distance equivalence + filepath geniplate-mirror gitrev hashable hashtables haskeline + ieee754 mtl murmur-hash pretty process regex-tdfa stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex cpphs happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + postInstall = '' + files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) + for f in "''${files[@]}" ; do + $out/bin/agda $f + done + for f in "''${files[@]}" ; do + $out/bin/agda -c --no-main $f + done + $out/bin/agda-mode compile + ''; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -10626,6 +10670,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_4_0" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover + , JuicyPixels + }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.4.0"; + sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -18744,12 +18806,15 @@ self: { }) {}; "Win32-errors" = callPackage - ({ mkDerivation, base, template-haskell, text, Win32 }: + ({ mkDerivation, base, hspec, QuickCheck, template-haskell, text + , Win32 + }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.1"; - sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031"; + version = "0.2.2.3"; + sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6"; libraryHaskellDepends = [ base template-haskell text Win32 ]; + testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22025,6 +22090,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-typescript_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, template-haskell + , temporary, text, th-abstraction, unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.1.0"; + sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process template-haskell temporary text + th-abstraction unordered-containers + ]; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -29613,8 +29701,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.0.0.2"; - sha256 = "0sv7xgmipb9cqyiry5mp0fr6abr7r45167ifq7sa518gz7a2a7ax"; + version = "3.0.0.4"; + sha256 = "0ynh8f0fn7fhpvslb5y5hl6kwcdycm15b3qfcr4x98yz71hk373s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -35060,16 +35148,16 @@ self: { }) {}; "bindings-sane" = callPackage - ({ mkDerivation, base, bindings-DSL, saneBackends }: + ({ mkDerivation, base, bindings-DSL, sane-backends }: mkDerivation { pname = "bindings-sane"; version = "0.0.1"; sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2"; libraryHaskellDepends = [ base bindings-DSL ]; - libraryPkgconfigDepends = [ saneBackends ]; + libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.lgpl3; - }) {inherit (pkgs) saneBackends;}; + }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage ({ mkDerivation, base, bindings-DSL, scsynth }: @@ -40604,10 +40692,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.3.0.0"; - sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls"; - revision = "1"; - editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq"; + version = "0.4.0.0"; + sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -40616,7 +40702,7 @@ self: { containers directory filepath text vector ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring containers mtl + ansi-terminal base base-compat bytestring containers directory mtl optparse-applicative parsec text vector ]; doHaddock = false; @@ -40983,14 +41069,14 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "cabal2spec_2_2_0" = callPackage + "cabal2spec_2_2_1" = callPackage ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty , tasty-golden, time }: mkDerivation { pname = "cabal2spec"; - version = "2.2.0"; - sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp"; + version = "2.2.1"; + sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -43076,6 +43162,8 @@ self: { pname = "cborg"; version = "0.2.0.0"; sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340"; + revision = "2"; + editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l"; libraryHaskellDepends = [ array base bytestring containers ghc-prim half integer-gmp primitive text @@ -47342,15 +47430,16 @@ self: { "codeworld-api" = callPackage ({ mkDerivation, base, blank-canvas, cereal, cereal-text - , containers, hashable, mtl, random, random-shuffle, text, time + , containers, ghc-prim, hashable, mtl, random, random-shuffle, text + , time }: mkDerivation { pname = "codeworld-api"; - version = "0.2.4"; - sha256 = "17rpm9414fbwzxnpdvp67zlv6sl7ymkflgbbb50nhq7vv9z69dbc"; + version = "0.2.5"; + sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m"; libraryHaskellDepends = [ - base blank-canvas cereal cereal-text containers hashable mtl random - random-shuffle text time + base blank-canvas cereal cereal-text containers ghc-prim hashable + mtl random random-shuffle text time ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; @@ -50048,6 +50137,8 @@ self: { pname = "conduit-parse"; version = "0.2.1.0"; sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm"; + revision = "1"; + editedCabalFile = "1bgxjn9lbx67584xpwl2k9jrwvlgyqf4vkv0s7vs1nnc1h6qk7qw"; libraryHaskellDepends = [ base conduit dlist mtl parsers safe safe-exceptions text transformers @@ -50163,10 +50254,8 @@ self: { }: mkDerivation { pname = "conf-json"; - version = "1.1"; - sha256 = "0jgyl56fgs506x4s28g14s08lcfnn6k4wh39j73cl576mlghr1rx"; - revision = "6"; - editedCabalFile = "1dyvz8jczzhr62s5cqr7gc4qd826nwgxkij0k41pfipw6jz0sc4f"; + version = "1.2"; + sha256 = "1j0m0zl1a7rkwczz58322kwsd9dzgwz2ia2q8l9h42ln239q0fbs"; libraryHaskellDepends = [ aeson base bytestring directory ]; testHaskellDepends = [ aeson base binary bytestring directory hspec QuickCheck @@ -52714,8 +52803,8 @@ self: { ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: mkDerivation { pname = "crackNum"; - version = "2.0"; - sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp"; + version = "2.1"; + sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56829,6 +56918,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-msgpack_0_0_12" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack"; + version = "0.0.12"; + sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 data-msgpack-types text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers data-msgpack-types hashable hspec + QuickCheck text unordered-containers vector void + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-msgpack-types" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , QuickCheck, text, unordered-containers, vector, void @@ -56845,6 +56961,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-msgpack-types_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack-types"; + version = "0.0.2"; + sha256 = "19c7285mrs9d1afgpdq4cprv44fif76ahahg3xpzijc5lhgxmzal"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable QuickCheck text + unordered-containers vector void + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-named" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, text }: mkDerivation { @@ -58926,8 +59060,8 @@ self: { ({ mkDerivation, base, containers, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.6"; - sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir"; + version = "0.6.3"; + sha256 = "1b020879qdbh08pzgxwj5y7fk31n071crbcs9601j7fxj4a1i0hq"; libraryHaskellDepends = [ base containers foldl ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; @@ -62830,8 +62964,8 @@ self: { }: mkDerivation { pname = "distribution-opensuse"; - version = "1.0.0"; - sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr"; + version = "1.1.0"; + sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62839,6 +62973,7 @@ self: { hashable hsemail mtl parsec-class pretty text time turtle ]; executableHaskellDepends = [ base containers text turtle ]; + testHaskellDepends = [ base ]; description = "Types, functions, and tools to manipulate the openSUSE distribution"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64344,18 +64479,12 @@ self: { }) {}; "drinkery" = callPackage - ({ mkDerivation, base, conduit, conduit-combinators, exceptions - , gauge, list-t, ListT, machines, mtl, pipes, transformers - }: + ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { pname = "drinkery"; - version = "0.3"; - sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4"; + version = "0.4"; + sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q"; libraryHaskellDepends = [ base exceptions mtl transformers ]; - benchmarkHaskellDepends = [ - base conduit conduit-combinators exceptions gauge list-t ListT - machines mtl pipes transformers - ]; description = "Boozy streaming library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64724,6 +64853,8 @@ self: { pname = "dublincore-xml-conduit"; version = "0.1.0.2"; sha256 = "17jzyj49j88xwsz54higi81a6v8kvb8i338n5416z1ni475qsynl"; + revision = "1"; + editedCabalFile = "1rljgmi4jb6yhigfy394jb64q5f5qx7i1g68pw6zgq9ziz91p321"; libraryHaskellDepends = [ base conduit conduit-combinators safe-exceptions text time timerep uri-bytestring xml-conduit xml-types @@ -65893,9 +66024,11 @@ self: { }: mkDerivation { pname = "edit"; - version = "0.0.1.1"; - sha256 = "0smxb6v4n83b09dyaj388hhi7kx1ca6axg60q3adnixy13a284lz"; - libraryHaskellDepends = [ base deepseq transformers ]; + version = "1.0.0.0"; + sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd"; + libraryHaskellDepends = [ + base comonad deepseq QuickCheck transformers + ]; testHaskellDepends = [ base comonad doctest QuickCheck tasty tasty-discover tasty-quickcheck uniplate @@ -67194,8 +67327,8 @@ self: { }: mkDerivation { pname = "email-header"; - version = "0.4.0"; - sha256 = "0lmdb8s29w5wbrwsfcn43z354ms3xblffprgvg22rb16ny1410hn"; + version = "0.4.1"; + sha256 = "14xs001ab0p2y6f9hl9lw8bwd4fcg23y5ia3wfcafn6893pbb5f6"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring case-insensitive containers exceptions text text-icu time @@ -69120,6 +69253,8 @@ self: { pname = "euler-tour-tree"; version = "0.1.0.1"; sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4"; + revision = "1"; + editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6"; libraryHaskellDepends = [ base containers fingertree mtl parser-combinators transformers Unique @@ -71856,6 +71991,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fcm-client" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , conduit, conduit-extra, containers, data-default-class + , http-client, http-conduit, http-types, HUnit, lens + , optparse-applicative, QuickCheck, resourcet, retry, scientific + , stm-conduit, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, utf8-string + }: + mkDerivation { + pname = "fcm-client"; + version = "0.1.0.0"; + sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl"; + revision = "1"; + editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers data-default-class + http-client http-conduit http-types lens scientific text time + ]; + executableHaskellDepends = [ + aeson async base bytestring conduit conduit-extra + data-default-class http-client http-types lens optparse-applicative + resourcet retry stm-conduit text utf8-string + ]; + testHaskellDepends = [ + aeson base containers data-default-class HUnit lens QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + description = "Admin API for Firebase Cloud Messaging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fdo-notify" = callPackage ({ mkDerivation, base, containers, dbus }: mkDerivation { @@ -75943,20 +76111,19 @@ self: { "fraxl" = callPackage ({ mkDerivation, async, base, dependent-map, dependent-sum - , exceptions, free, mtl, time, transformers, type-aligned - , vinyl-plus + , exceptions, free, mtl, time, transformers, type-aligned, vinyl }: mkDerivation { pname = "fraxl"; - version = "0.1.0.0"; - sha256 = "0q21g7ggdfrl7afkx9g2apx2nzh7fs7fpy63zhjylav16xhycc56"; - revision = "1"; - editedCabalFile = "1fjwfiydrw1dga0dy6cwwji4kjzichr6nx7hazkx11r08lqncxzi"; + version = "0.2.0.1"; + sha256 = "1k5fcl6d9yxc2773x0vv7z8q1pq3mf6l29icr4yc4wxsxw4l3r7k"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base dependent-map dependent-sum exceptions free mtl - transformers type-aligned vinyl-plus + transformers type-aligned vinyl ]; - testHaskellDepends = [ base mtl time transformers ]; + benchmarkHaskellDepends = [ base time ]; description = "Cached and parallel data fetching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -76639,8 +76806,8 @@ self: { ({ mkDerivation, base, bytestring, process, text }: mkDerivation { pname = "fromhtml"; - version = "0.1.0.3"; - sha256 = "1zj811728g1hwpagq7jl1qxppn164vn4b27pxn20151iljipq1va"; + version = "0.1.0.4"; + sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring process text ]; @@ -81428,7 +81595,7 @@ self: { "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , libdbusmenu-glib, text, transformers + , libdbusmenu, text, transformers }: mkDerivation { pname = "gi-dbusmenu"; @@ -81439,11 +81606,11 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ libdbusmenu-glib ]; + libraryPkgconfigDepends = [ libdbusmenu ]; doHaddock = false; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) libdbusmenu-glib;}; + }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -82124,7 +82291,8 @@ self: { "gi-xlib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers, x11 + , haskell-gi-base, haskell-gi-overloading, text, transformers + , xlibsWrapper }: mkDerivation { pname = "gi-xlib"; @@ -82135,11 +82303,11 @@ self: { base bytestring containers haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ x11 ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; doHaddock = false; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) x11;}; + }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -82374,8 +82542,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180626"; - sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q"; + version = "6.20180719"; + sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -82386,7 +82554,7 @@ self: { isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse process split unix-compat utf8-string + hslogger IfElse process split transformers unix-compat utf8-string ]; executableHaskellDepends = [ aeson async base bloomfilter byteable bytestring case-insensitive @@ -83445,6 +83613,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_0_4_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.4.0"; + sha256 = "0qja5mdnbgrsdiwqjfwrzzynbybwg5yksvnwgazak0wv2p86i5yh"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -87491,23 +87680,26 @@ self: { }) {}; "greenclip" = callPackage - ({ mkDerivation, base, binary, classy-prelude, directory, microlens - , microlens-mtl, text, unix, utf8-string, vector, X11 + ({ mkDerivation, base, binary, bytestring, directory, exceptions + , hashable, libXau, microlens, microlens-mtl, protolude, text, unix + , vector, wordexp, X11, xcb, xdmcp, xlibsWrapper }: mkDerivation { pname = "greenclip"; - version = "2.0.1"; - sha256 = "05f146ff9ff4kyaxx92jwb5g0nj0bb2j41hx12b4vjk28vik1x5y"; + version = "3.0.2"; + sha256 = "1b1nx2jnwal1fhwh7cq0hv1nrwc2hzzh96yab6cpv0r8bm34qxs7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base binary classy-prelude directory microlens microlens-mtl text - unix utf8-string vector X11 + base binary bytestring directory exceptions hashable microlens + microlens-mtl protolude text unix vector wordexp X11 ]; + executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; + inherit (pkgs) xlibsWrapper;}; "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network @@ -88474,16 +88666,16 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk3, x11 }: + ({ mkDerivation, base, glib, gtk3, xlibsWrapper }: mkDerivation { pname = "gtk-traymanager"; version = "1.0.1"; sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di"; libraryHaskellDepends = [ base glib gtk3 ]; - libraryPkgconfigDepends = [ x11 ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) x11;}; + }) {inherit (pkgs) xlibsWrapper;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory @@ -90640,8 +90832,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.10.3"; - sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj"; + version = "1.10.4"; + sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96656,8 +96848,8 @@ self: { }: mkDerivation { pname = "haskus-binary"; - version = "0.6.0.0"; - sha256 = "0r0np4kdvyfslgjqs983dzv4xi5s62splahn2ra55qjbm8lpmps0"; + version = "1.0"; + sha256 = "1gw08zx7mqhi6n0wx6s6n4fvw5ambbdxnahr3r3p22yfqnqcp4y2"; libraryHaskellDepends = [ base bytestring cereal haskus-utils mtl ]; @@ -96671,19 +96863,19 @@ self: { }) {}; "haskus-system-build" = callPackage - ({ mkDerivation, base, directory, filepath, hashable, haskus-utils - , optparse-applicative, optparse-simple, process, simple-download - , temporary, text, yaml + ({ mkDerivation, base, conduit, directory, filepath, hashable + , haskus-utils, http-conduit, optparse-applicative, optparse-simple + , process, temporary, text, yaml }: mkDerivation { pname = "haskus-system-build"; - version = "0.7.0.0"; - sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g"; + version = "1.0"; + sha256 = "1xzl5f8wilmdq9bg37zzdcv59cqp8kxnhbm6fd8pzqnj8w1pkwdk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath hashable haskus-utils optparse-applicative - optparse-simple process simple-download temporary text yaml + base conduit directory filepath hashable haskus-utils http-conduit + optparse-applicative optparse-simple process temporary text yaml ]; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; @@ -96691,17 +96883,20 @@ self: { }) {}; "haskus-utils" = callPackage - ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl - , stm, stm-containers, tasty, tasty-quickcheck, template-haskell - , transformers, vector + ({ mkDerivation, base, containers, extra, file-embed + , haskus-utils-data, haskus-utils-types, haskus-utils-variant + , list-t, mtl, recursion-schemes, stm, stm-containers, tasty + , tasty-quickcheck, template-haskell, transformers, vector }: mkDerivation { pname = "haskus-utils"; - version = "0.8.0.0"; - sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3"; + version = "1.0"; + sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd"; libraryHaskellDepends = [ - base containers extra file-embed list-t mtl stm stm-containers - template-haskell transformers vector + base containers extra file-embed haskus-utils-data + haskus-utils-types haskus-utils-variant list-t mtl + recursion-schemes stm stm-containers template-haskell transformers + vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Haskus utility modules"; @@ -96709,6 +96904,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-utils-data" = callPackage + ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl + , recursion-schemes, transformers + }: + mkDerivation { + pname = "haskus-utils-data"; + version = "1.0"; + sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4"; + libraryHaskellDepends = [ + base containers extra haskus-utils-types mtl recursion-schemes + transformers + ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-utils-types" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "haskus-utils-types"; + version = "1.0"; + sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf"; + libraryHaskellDepends = [ base ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-utils-variant" = callPackage + ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }: + mkDerivation { + pname = "haskus-utils-variant"; + version = "1.0"; + sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn"; + libraryHaskellDepends = [ + base haskus-utils-data haskus-utils-types + ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskyapi" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , directory, http-conduit, markdown, mtl, network, parsec @@ -97917,6 +98152,8 @@ self: { pname = "hbro"; version = "1.7.0.0"; sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh"; + revision = "1"; + editedCabalFile = "0slsd0f0qvlh4l6777b8iaskd4ij04193mcjwnq8p7szslxx40q1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97946,6 +98183,8 @@ self: { pname = "hbro-contrib"; version = "1.7.0.0"; sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam"; + revision = "1"; + editedCabalFile = "1vfkwzd5rsv0065bldkd90fprp1qspfqg44ip5i4ihnbj4vawv9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -100605,34 +100844,40 @@ self: { }) {}; "hgeometry" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, containers - , contravariant, criterion, data-clist, deepseq, deepseq-generics - , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens - , linear, mtl, optparse-applicative, parsec, QuickCheck, random - , semigroupoids, semigroups, singletons, template-haskell, text - , time, vector, vinyl + ({ mkDerivation, aeson, approximate-equality, array, base + , bifunctors, bytestring, colour, containers, contravariant + , criterion, data-clist, deepseq, deepseq-generics, dlist, doctest + , fingertree, fixed-vector, hexpat, hspec, hspec-discover, lens + , linear, mtl, optparse-applicative, parsec, QuickCheck + , quickcheck-instances, random, reflection, semigroupoids + , semigroups, singletons, template-haskell, text, vector, vinyl + , yaml }: mkDerivation { pname = "hgeometry"; - version = "0.6.0.0"; - sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij"; + version = "0.7.0.0"; + sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz"; revision = "1"; - editedCabalFile = "19j3n0kf7n2n0spyr83gdjngxnfxvyr1sryvhq8jflsxq44d8rdg"; + editedCabalFile = "1wjwpfiic3jbhg77qm2nzgvybnpk0h3wwpywkpfxz8sv1yhb8pa2"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bifunctors bytestring containers contravariant data-clist - deepseq directory fixed-vector Frames hexpat lens linear mtl - optparse-applicative parsec random semigroupoids semigroups - singletons template-haskell text time vector vinyl + aeson base bifunctors bytestring colour containers contravariant + data-clist deepseq dlist fingertree fixed-vector hexpat lens linear + mtl parsec QuickCheck quickcheck-instances random reflection + semigroupoids semigroups singletons template-haskell text vector + vinyl yaml ]; testHaskellDepends = [ - array base bytestring containers data-clist doctest Frames hspec - lens linear QuickCheck random semigroups vector vinyl + approximate-equality array base bytestring colour containers + data-clist doctest hspec lens linear QuickCheck + quickcheck-instances random semigroups singletons vector vinyl ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics Frames lens QuickCheck - semigroups + base bytestring containers criterion deepseq deepseq-generics + fixed-vector lens linear optparse-applicative QuickCheck semigroups ]; description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; @@ -103500,21 +103745,19 @@ self: { , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff , directory, exceptions, filepath, generic-random, Glob, hashable - , hashing, haskeline, http-client, http-client-tls, http-types - , interpolate, lens-family, lens-family-core, lens-family-th - , logict, megaparsec, monadlist, mtl, optparse-applicative - , pretty-show, process, QuickCheck, quickcheck-instances - , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups - , serialise, split, syb, tasty, tasty-hunit, tasty-quickcheck + , hashing, haskeline, hedgehog, hspec-discover, http-client + , http-client-tls, http-types, interpolate, lens-family + , lens-family-core, lens-family-th, logict, megaparsec, monadlist + , mtl, optparse-applicative, pretty-show, process, regex-tdfa + , regex-tdfa-text, repline, scientific, semigroups, serialise + , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck , tasty-th, template-haskell, text, these, time, transformers, unix , unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.5.1"; - sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al"; - revision = "1"; - editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr"; + version = "0.5.2"; + sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103522,7 +103765,7 @@ self: { containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq deriving-compat directory exceptions filepath hashable hashing haskeline http-client - http-client-tls http-types lens-family lens-family-core + http-client-tls http-types interpolate lens-family lens-family-core lens-family-th logict megaparsec monadlist mtl optparse-applicative pretty-show process regex-tdfa regex-tdfa-text scientific semigroups serialise split syb template-haskell text these time @@ -103539,11 +103782,12 @@ self: { ansi-wl-pprint base base16-bytestring bytestring containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq Diff directory exceptions filepath generic-random - Glob hashing interpolate megaparsec mtl optparse-applicative - pretty-show process QuickCheck quickcheck-instances serialise split - tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text - time transformers unix unordered-containers + Glob hashing hedgehog interpolate megaparsec mtl + optparse-applicative pretty-show process serialise split tasty + tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell text time transformers unix unordered-containers ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring containers criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256 @@ -109124,6 +109368,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "hspec-need-env" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-expectations + , setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.0"; + sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + description = "Read environment variables for hspec tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -110531,8 +110789,8 @@ self: { }: mkDerivation { pname = "html-parse"; - version = "0.2.0.1"; - sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw"; + version = "0.2.0.2"; + sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -112548,6 +112806,8 @@ self: { pname = "hw-dsv"; version = "0.2.1"; sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv"; + revision = "1"; + editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112652,12 +112912,27 @@ self: { pname = "hw-hedgehog"; version = "0.1.0.1"; sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6"; + revision = "1"; + editedCabalFile = "0a5qlh5dwsnv14ngimbsvpgxx4hf0c0wdi5yfv7afwj9h2afdpfz"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base ]; description = "Extra hedgehog functionality"; license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, hedgehog, vector }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.0.2"; + sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base ]; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hspec-hedgehog" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit , transformers @@ -112666,6 +112941,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.0.5"; sha256 = "0kznqpliqnahyayi1q08mfz4qwhqvz54hb8cv6r2ps3lyjnpmlfk"; + revision = "1"; + editedCabalFile = "05fg0d89652yhsji35ckh9qiiy4y7c04i6zya9hrkgwl2jaq55fv"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -115150,6 +115427,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_9_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal + , cmdargs, containers, directory, filepath, ghc, ghc-boot + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint + , hspec, hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, setenv, shelly + , split, stm, strict, system-argv0, text, transformers, unix + , unordered-containers, utf8-string, uuid, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.9.1.0"; + sha256 = "1r71bijgfcsgsymg9aqjkgplg8c9g65zddr7dqf7d3mv2bpb5ain"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cereal cmdargs containers + directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline + haskell-src-exts hlint http-client http-client-tls ipython-kernel + mtl parsec process random shelly split stm strict system-argv0 text + transformers unix unordered-containers utf8-string uuid vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv + shelly text transformers + ]; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -115727,6 +116040,8 @@ self: { pname = "imm"; version = "1.3.0.0"; sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; + revision = "1"; + editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118178,6 +118493,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_4_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.4.0"; + sha256 = "12y9ym7gjdwlixp727z4hf0hmi8x021shvrv6vhg4s4bgn3rvch5"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -118385,6 +118726,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_9_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , cryptonite, directory, filepath, memory, mtl, process, temporary + , text, transformers, unordered-containers, uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.9.1.0"; + sha256 = "0944riw00i3m8n3cab0g9c14b24xryf9w8ddlddnmxgys4sn8qak"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring cereal containers cryptonite directory + filepath memory mtl process temporary text transformers + unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -119344,10 +119707,8 @@ self: { }: mkDerivation { pname = "ivory-opts"; - version = "0.1.0.5"; - sha256 = "0h4k2fy8w2hcyglfgl1jzxr6as04lc4ks8wk4id8h4gpn6bgdfrn"; - revision = "1"; - editedCabalFile = "1mn1jrpwzm1pcmw942i0kg0na56zagxsqcqs9y32j1xnlkgljkpn"; + version = "0.1.0.6"; + sha256 = "014dnfflf09gfn6c47jjg25lq95bx9sl6nkj18zylyzy0f1qszrq"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -122658,15 +123019,15 @@ self: { ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text + , text, vector }: mkDerivation { pname = "keccak"; - version = "0.1.2"; - sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g"; + version = "0.2.0"; + sha256 = "1hkp6zn86bvn817vvxd2yqjgfh76n0ynvyqq2942frl1i0v19ymw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring ]; + libraryHaskellDepends = [ base bytestring vector ]; executableHaskellDepends = [ base base16-bytestring bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring cryptonite HUnit memory parsec @@ -122676,7 +123037,7 @@ self: { benchmarkHaskellDepends = [ base bytestring cryptonite gauge memory ]; - description = "haskell keccak functions"; + description = "cryptographic functions based on the sponge construction"; license = stdenv.lib.licenses.mit; }) {}; @@ -124795,8 +125156,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.14"; - sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18"; + version = "1.2.0.15"; + sha256 = "0ldjbsnspn55xbkwcjbyswiqlpf885si5xl2z0n5kvvwmlrgmfkx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -124819,8 +125180,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.7.0"; - sha256 = "0w7r5ngpz3ifahjfccz6ma9m2jdmn5nqimk5154hk35skcjwrswx"; + version = "0.7.1"; + sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ base parsec process QuickCheck tasty tasty-expected-failure @@ -127125,6 +127486,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels_0_1_0_2" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "lens-labels"; + version = "0.1.0.2"; + sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-labels" = callPackage ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { @@ -145137,10 +145510,8 @@ self: { }: mkDerivation { pname = "network-msgpack-rpc"; - version = "0.0.4"; - sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; - revision = "2"; - editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3"; + version = "0.0.5"; + sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -146649,6 +147020,8 @@ self: { pname = "non-empty"; version = "0.3"; sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p"; + revision = "1"; + editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -146656,6 +147029,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + }: + mkDerivation { + pname = "non-empty"; + version = "0.3.0.1"; + sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z"; + libraryHaskellDepends = [ + base containers deepseq QuickCheck utility-ht + ]; + description = "List-like structures with static restrictions on the number of elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "non-empty-containers" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -149804,6 +150192,8 @@ self: { pname = "opml-conduit"; version = "0.6.0.4"; sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8"; + revision = "1"; + editedCabalFile = "160sazqsrmm2755642c5y5i38miiglqb66cy5k0hy4k2jkdmjfbi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers @@ -151204,7 +151594,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_2" = callPackage + "pandoc_2_2_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -151219,8 +151609,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.2.2"; - sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc"; + version = "2.2.2.1"; + sha256 = "19d6cd8ry735ziazfkk6xhrjbvx5ywpbqmhxr3wbmp8kyp6c7x7m"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -161477,8 +161867,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.3"; - sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz"; + version = "0.3.0.1"; + sha256 = "0qipddb5065z6c7klbaz75d8jbx39k8qppv8d7xb6hnj28v62ab7"; libraryHaskellDepends = [ base cereal deferred-folds foldl primitive profunctors vector ]; @@ -162889,6 +163279,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libpulseaudio;}; + "proto-lens_0_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, lens-family, parsec, pretty, text + , transformers, void + }: + mkDerivation { + pname = "proto-lens"; + version = "0.2.2.0"; + sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class + lens-family parsec pretty text transformers void + ]; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, deepseq, lens-family, lens-labels, parsec @@ -162974,9 +163382,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-protobuf-types_0_2_2_0" = callPackage + ({ mkDerivation, base, Cabal, lens-family, proto-lens + , proto-lens-protoc, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.2.2.0"; + sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-family proto-lens proto-lens-protoc text + ]; + libraryToolDepends = [ protobuf ]; + description = "Basic protocol buffer message types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, text + , proto-lens-protoc, protobuf, text }: mkDerivation { pname = "proto-lens-protobuf-types"; @@ -162986,16 +163412,44 @@ self: { libraryHaskellDepends = [ base lens-family proto-lens proto-lens-protoc text ]; + libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) protobuf;}; + + "proto-lens-protoc_0_2_2_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , data-default-class, directory, filepath, haskell-src-exts + , lens-family, lens-labels, process, proto-lens + , proto-lens-descriptors, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.2.2.3"; + sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers data-default-class directory + filepath haskell-src-exts lens-family lens-labels process + proto-lens proto-lens-descriptors text + ]; + libraryToolDepends = [ protobuf ]; + executableHaskellDepends = [ + base bytestring containers data-default-class filepath + haskell-src-exts lens-family proto-lens proto-lens-descriptors text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, deepseq, directory, filepath , haskell-src-exts, lens-family, lens-labels, pretty, process - , proto-lens, text + , proto-lens, protobuf, text }: mkDerivation { pname = "proto-lens-protoc"; @@ -163008,13 +163462,14 @@ self: { directory filepath haskell-src-exts lens-family lens-labels pretty process proto-lens text ]; + libraryToolDepends = [ protobuf ]; executableHaskellDepends = [ base bytestring containers data-default-class deepseq filepath haskell-src-exts lens-family proto-lens text ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) protobuf;}; "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers @@ -164319,30 +164774,30 @@ self: { "puzzle-draw" = callPackage ({ mkDerivation, aeson, base, blaze-svg, bytestring, containers - , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec - , linear, mtl, optparse-applicative, parsec, process, SVGFonts - , tasty, tasty-golden, tasty-hspec, tasty-hunit, text - , unordered-containers, vector-space, yaml + , deepseq, diagrams-lib, diagrams-rasterific, filepath, hashable + , hspec, linear, mtl, optparse-applicative, parsec, SVGFonts, tasty + , tasty-hspec, tasty-hunit, text, unordered-containers + , vector-space, yaml }: mkDerivation { pname = "puzzle-draw"; - version = "0.2.0.0"; - sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02"; + version = "0.3.0.0"; + sha256 = "0vnmq65khi1lcrf3rz4ym7lnv3178rvnb884rln0jspil6bs4cs7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers diagrams-lib diagrams-svg filepath hashable - linear mtl optparse-applicative parsec SVGFonts text + aeson base containers diagrams-lib diagrams-rasterific filepath + hashable linear mtl optparse-applicative parsec SVGFonts text unordered-containers vector-space yaml ]; executableHaskellDepends = [ - aeson base diagrams-lib diagrams-svg filepath optparse-applicative - process tasty tasty-golden yaml + aeson base containers diagrams-lib diagrams-rasterific filepath + optparse-applicative yaml ]; testHaskellDepends = [ - base blaze-svg bytestring containers deepseq diagrams-lib - diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml + base blaze-svg bytestring containers deepseq diagrams-lib hspec + tasty tasty-hspec tasty-hunit text yaml ]; description = "Creating graphics for pencil puzzles"; license = stdenv.lib.licenses.mit; @@ -165328,14 +165783,15 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.12"; - sha256 = "1gnzaw5vvn5xk6h9zjvdjicxq35ppwvrs87fys1lk51c402npvz7"; + version = "0.4.13"; + sha256 = "19kndmc019dhz0b8iajplpiifl1x3ph39zwp2c2n3rp5v41syxrs"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers ]; testHaskellDepends = [ - aeson base primitive QuickCheck tagged transformers vector + aeson base containers primitive QuickCheck semigroupoids tagged + transformers vector ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; @@ -165589,8 +166045,8 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.0.1"; - sha256 = "1yx1kyd6p58b7s10v0lkq1v162vnz90p6m9jlwbr4s6qxa0sm31r"; + version = "0.1.1.0"; + sha256 = "1dxazyn5h2njhjs41x2cb5nwydf87a29yxgy7wv40s6fq6ajj084"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -168758,7 +169214,7 @@ self: { libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; license = stdenv.lib.licenses.bsd3; - }) {raptor2 = null; inherit (pkgs) redland;}; + }) {raptor2 = null; redland = null;}; "redo" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath @@ -169163,6 +169619,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-fragment-shader-canvas" = callPackage + ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens + , reflex-dom, text, transformers + }: + mkDerivation { + pname = "reflex-dom-fragment-shader-canvas"; + version = "0.1"; + sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl"; + revision = "1"; + editedCabalFile = "1s08vdpwyyfrfw7hfbn2i2m9b3dszcdd7dmfyd0z1pbxy6wj1xmz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghcjs-dom jsaddle lens reflex-dom text transformers + ]; + executableHaskellDepends = [ base reflex-dom text ]; + description = "A reflex-dom widget to draw on a canvas with a fragment shader program"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflex-dom-helpers" = callPackage ({ mkDerivation, base, reflex, reflex-dom, template-haskell }: mkDerivation { @@ -170515,6 +170992,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "relude" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty + , tasty-hedgehog, text, transformers, unordered-containers + , utf8-string + }: + mkDerivation { + pname = "relude"; + version = "0.1.0"; + sha256 = "16q9mh35c989pmy4xz602svfz57x2kbl8v82mjsapigmnxa41r8x"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude from Kowainik"; + license = stdenv.lib.licenses.mit; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -171363,8 +171865,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.1.0.1"; - sha256 = "1ywh83ydy48mlix7mglnkhsjj3b13jqs2gs52by6q1g438nb31in"; + version = "0.1.1.0"; + sha256 = "15qpd11ijbip88pf7sn1cmms369cv963l2xdp3wxg7qvlf362ns8"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -174100,6 +174602,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "rss-conduit_0_4_2_2" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default + , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck + , quickcheck-instances, resourcet, safe, safe-exceptions + , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, vinyl, xml-conduit, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.4.2.2"; + sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; + revision = "1"; + editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d"; + libraryHaskellDepends = [ + atom-conduit base conduit conduit-combinators containers + dublincore-xml-conduit lens-simple safe safe-exceptions singletons + text time timerep uri-bytestring vinyl xml-conduit xml-types + ]; + testHaskellDepends = [ + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit lens-simple + mono-traversable QuickCheck quickcheck-instances resourcet + safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text + time uri-bytestring vinyl xml-conduit xml-types + ]; + description = "Streaming parser/renderer for the RSS standard"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rss2irc" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq , feed, http-client, http-conduit, http-types, io-storage, irc @@ -175657,8 +176190,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.9"; - sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m"; + version = "7.10"; + sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -177591,8 +178124,8 @@ self: { }: mkDerivation { pname = "self-extract"; - version = "0.3.2"; - sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q"; + version = "0.3.3"; + sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178363,6 +178896,8 @@ self: { pname = "serialise"; version = "0.2.0.0"; sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0"; + revision = "2"; + editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -180436,7 +180971,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "serverless-haskell_0_7_0" = callPackage + "serverless-haskell_0_7_1" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq @@ -180444,8 +180979,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.7.0"; - sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj"; + version = "0.7.1"; + sha256 = "1vjiv56w591vparjw3372fz2vsa5hcm5j3p90j00x882gm23wf22"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -183490,6 +184025,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-vec3_0_4_0_8" = callPackage + ({ mkDerivation, base, criterion, doctest, doctest-driver-gen + , QuickCheck, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "simple-vec3"; + version = "0.4.0.8"; + sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a"; + libraryHaskellDepends = [ base QuickCheck vector ]; + testHaskellDepends = [ + base doctest doctest-driver-gen tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Three-dimensional vectors of doubles with basic operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-zipper" = callPackage ({ mkDerivation, base, hspec, lens }: mkDerivation { @@ -183950,8 +184503,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.3.0.0"; - sha256 = "0h1qcc9d721yczd1szylxpxc1nzi2np6xa5b1rlsck6yjr238bwz"; + version = "0.3.0.1"; + sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -184568,8 +185121,8 @@ self: { }: mkDerivation { pname = "slick"; - version = "0.1.0.0"; - sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds"; + version = "0.1.0.2"; + sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm"; libraryHaskellDepends = [ aeson base binary bytestring containers lens lens-aeson mustache pandoc shake text time @@ -185583,6 +186136,8 @@ self: { pname = "snap-templates"; version = "1.0.0.1"; sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c"; + revision = "1"; + editedCabalFile = "0m54p36hvwn3zaixalb5jiy9siq1ksf5da5d0407rys87wfy711b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185774,8 +186329,8 @@ self: { }: mkDerivation { pname = "snaplet-customauth"; - version = "0.1.0"; - sha256 = "1xc45lvhr3psqhv87n75f5968q129fgz3cz6362qvcnbnyyiznz3"; + version = "0.1.1"; + sha256 = "0alh5jaygcxnjpm5r3qx2c6al1x73shzwqi67820rzqxix2np8pc"; libraryHaskellDepends = [ aeson base base64-bytestring binary binary-orphans bytestring configurator containers errors heist hoauth2 http-client @@ -189470,6 +190025,8 @@ self: { pname = "stack-prism"; version = "0.1.7"; sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz"; + revision = "1"; + editedCabalFile = "1xd0hcp003ijakpcjgcmllsa65i0924has9wllvsj8i0mnapcni3"; libraryHaskellDepends = [ base profunctors tagged template-haskell transformers ]; @@ -191676,6 +192233,8 @@ self: { pname = "streaming-base64"; version = "0.1.0.0"; sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; + revision = "1"; + editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r"; libraryHaskellDepends = [ base safe-exceptions streaming streaming-bytestring transformers ]; @@ -192482,16 +193041,19 @@ self: { "string-random" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , pcre-heavy, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, transformers + , optparse-applicative, pcre-heavy, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "string-random"; - version = "0.1.0.0"; - sha256 = "090lin4b0y7xccwpnw8q33kfdljjw6annbl2d1jldird7db086ah"; + version = "0.1.1.0"; + sha256 = "0gypx0lg9kz8s2aksj2qg238m41cnl49k4bxwz7sgf94h12nhil2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers random text transformers ]; + executableHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base bytestring pcre-heavy QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -193859,24 +194421,22 @@ self: { }) {}; "sv" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors - , bytestring, charset, containers, contravariant, deepseq, hedgehog - , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids - , semigroups, tasty, tasty-hedgehog, tasty-hunit, text - , transformers, trifecta, utf8-string, validation, vector, void + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava + , contravariant, hedgehog, hw-dsv, lens, Only, parsers + , semigroupoids, semigroups, sv-core, tasty, tasty-hedgehog + , tasty-hunit, text, transformers, trifecta, utf8-string + , validation, vector }: mkDerivation { pname = "sv"; - version = "0.1"; - sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s"; + version = "1.0"; + sha256 = "1sgyly9b6nrij5hpj3ffvwj6m3ygm43wbi8xkd2gxs2jh5zjzvw3"; libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base bifunctors bytestring charset - containers contravariant deepseq lens mtl parsec parsers - profunctors readable semigroupoids semigroups text transformers - trifecta utf8-string validation vector void + attoparsec base bifunctors bytestring contravariant hw-dsv + semigroupoids sv-core transformers utf8-string validation ]; testHaskellDepends = [ - ansi-wl-pprint base bytestring contravariant hedgehog lens parsers + base bytestring cassava contravariant hedgehog lens Only parsers semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text trifecta utf8-string validation vector ]; @@ -193886,24 +194446,88 @@ self: { }) {}; "sv-cassava" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv - , text, utf8-string, validation, vector + ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit + , sv-core, text, utf8-string, validation, vector }: mkDerivation { pname = "sv-cassava"; - version = "0.1"; - sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15"; + version = "0.2"; + sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin"; libraryHaskellDepends = [ - attoparsec base bytestring cassava sv utf8-string vector + attoparsec base bytestring cassava sv-core utf8-string validation + vector ]; testHaskellDepends = [ - base bytestring cassava HUnit sv text validation vector + base bytestring cassava HUnit sv-core text validation vector ]; description = "Integration to use sv with cassava's parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sv-core" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, contravariant, deepseq, lens, mtl, parsec + , profunctors, QuickCheck, readable, semigroupoids, semigroups + , tasty, tasty-quickcheck, text, transformers, trifecta + , utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv-core"; + version = "0.1"; + sha256 = "0zqzj6i4xbw7bjzn40mimn4rw1g88jndrdxzdmrbdigfdncxhyl3"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring containers contravariant + deepseq lens mtl parsec profunctors readable semigroupoids + semigroups text transformers trifecta utf8-string validation vector + void + ]; + testHaskellDepends = [ + base bytestring profunctors QuickCheck semigroupoids semigroups + tasty tasty-quickcheck text validation vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "sv-svfactor" = callPackage + ({ mkDerivation, base, bytestring, lens, profunctors, sv-core + , svfactor, validation + }: + mkDerivation { + pname = "sv-svfactor"; + version = "0.1"; + sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0"; + libraryHaskellDepends = [ + base bytestring lens profunctors sv-core svfactor validation + ]; + description = "sv-core + svfactor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "svfactor" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, charset + , deepseq, hedgehog, lens, parsec, parsers, semigroupoids + , semigroups, tasty, tasty-hedgehog, tasty-hunit, text + , transformers, trifecta, utf8-string, vector + }: + mkDerivation { + pname = "svfactor"; + version = "0.1"; + sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring charset deepseq lens parsec + parsers semigroupoids semigroups text transformers trifecta + utf8-string vector + ]; + testHaskellDepends = [ + base bytestring hedgehog lens parsers semigroups tasty + tasty-hedgehog tasty-hunit text trifecta utf8-string vector + ]; + description = "Syntax-preserving CSV manipulation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "svg-builder" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, hashable, text , unordered-containers @@ -198125,17 +198749,20 @@ self: { }) {}; "tensorflow-proto" = callPackage - ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc }: + ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc + , protobuf + }: mkDerivation { pname = "tensorflow-proto"; version = "0.1.0.0"; sha256 = "06k87dvpsf8pnbb1qq5gjxpjc2sra95y1bwmsnpmlg1qn0ppi5mn"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage ({ mkDerivation, base, bytestring, cereal, snappy-framing @@ -198200,6 +198827,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "termbox" = callPackage + ({ mkDerivation, array, base, c2hs }: + mkDerivation { + pname = "termbox"; + version = "0.1.0"; + sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + description = "termbox bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "termbox-bindings" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -202049,6 +202691,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "timer-wheel" = callPackage + ({ mkDerivation, atomic-primops, base, ghc-prim, primitive + , psqueues + }: + mkDerivation { + pname = "timer-wheel"; + version = "0.1.0"; + sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j"; + libraryHaskellDepends = [ + atomic-primops base ghc-prim primitive psqueues + ]; + description = "A timer wheel"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -209149,6 +209806,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "uploadtest" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "uploadtest"; + version = "0.0.0"; + sha256 = "17hi7ibasy0lhvzhv52k0dynvhxlsmywliymyygwk1jv740z1bdz"; + libraryHaskellDepends = [ base ]; + description = "Upload test"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "upskirt" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -214798,8 +215466,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2"; - sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd"; + version = "0.1.2.1"; + sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -216257,35 +216925,35 @@ self: { "winery" = callPackage ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu - , deepseq, fingertree, gauge, hashable, mtl, prettyprinter - , prettyprinter-ansi-terminal, serialise, text, transformers - , unordered-containers, vector + , deepseq, gauge, hashable, megaparsec, mtl, prettyprinter + , prettyprinter-ansi-terminal, scientific, serialise, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "winery"; - version = "0.1.1"; - sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar"; + version = "0.1.2"; + sha256 = "0g18xgby2k5cgb1ymyv92ii9rqj07ng12v2qfsp8yk15fcrx0ky9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; executableHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; benchmarkHaskellDepends = [ - base binary bytestring cassava containers cpu deepseq fingertree - gauge hashable mtl prettyprinter prettyprinter-ansi-terminal - serialise text transformers unordered-containers vector + base binary bytestring cassava containers cpu deepseq gauge + hashable megaparsec mtl prettyprinter prettyprinter-ansi-terminal + scientific serialise text transformers unordered-containers vector ]; description = "Sustainable serialisation library"; license = stdenv.lib.licenses.bsd3; @@ -218774,6 +219442,8 @@ self: { pname = "xml-conduit-parse"; version = "0.3.1.2"; sha256 = "0233jcpv7lzan2hh6siw2rrjkjp4f5i1kkpjpdfija01f8by3an1"; + revision = "1"; + editedCabalFile = "0jnnr4z3c6rq2dz0ldiic5zwkrp36igf6gip11qrm9ss2pk9khbl"; libraryHaskellDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types @@ -225120,8 +225790,8 @@ self: { }: mkDerivation { pname = "ztar"; - version = "0.1.3"; - sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1"; + version = "0.2.0"; + sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i"; libraryHaskellDepends = [ base bytestring deepseq directory filepath path process text unix-compat zip zlib diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 38e8dfd24c4..c7fbab6ab88 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -28,7 +28,6 @@ }: let - inherit (stdenv.lib) optional; wrapper = ./hoogle-local-wrapper.sh; isGhcjs = ghc.isGhcjs or false; opts = lib.optionalString; @@ -36,10 +35,6 @@ let if !isGhcjs then "haddock" else "haddock-ghcjs"; - ghcName = - if !isGhcjs - then "ghc" - else "ghcjs"; ghcDocLibDir = if !isGhcjs then ghc.doc + ''/share/doc/ghc*/html/libraries'' diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 1cd687058b3..ff19e52135c 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,7 +1,7 @@ # Build one of the packages that comes with idris # name: The name of the package # deps: The dependencies of the package -{ idris, build-idris-package, lib }: name: deps: +{ idris, build-idris-package }: name: deps: let inherit (builtins.parseDrvName idris.name) version; in diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index c2ae87582df..2ad0bc0285e 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.7.3"; + version = "0.8"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x"; + sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index d0ba1912e9a..d94d4a5a14d 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, fetchpatch }: +{ mkDerivation, fetchpatch }: mkDerivation rec { version = "19.3.6.6"; diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 5cea1fd533f..19ac6d35592 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation }: mkDerivation rec { version = "20.3.8"; diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index de00ebdf2cb..e9aa2a3dc42 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation }: mkDerivation rec { version = "21.0"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 6ea3ac73a4b..ba0a00b3037 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index b0eeb89ce43..848b8666f27 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring -, coverageAnalysis ? null, gnu ? null +, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 196c899fcea..8110598e173 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform , fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring -, coverageAnalysis ? null, gnu ? null +, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 271490c9957..09af492490c 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, readline }: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 6221bf3fb84..6d8de7bae27 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, readline, compat ? false -, hostPlatform -}: +{ stdenv, fetchurl, readline, compat ? false }: let dsoPatch = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 5a4893db063..2c4f3657aac 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, readline, compat ? false -, hostPlatform -}: +{ stdenv, fetchurl, readline, compat ? false }: stdenv.mkDerivation rec { name = "lua-${version}"; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 73b979e9ca4..9ee628f498e 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, hostPlatform }: +{ stdenv, lib, fetchurl }: rec { luajit = luajit_2_1; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4deadefcc4b..40a70623dcb 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurlBoot, buildPackages -, enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper +, enableThreading ? stdenv ? glibc, makeWrapper }: with lib; @@ -156,26 +156,17 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.1.8"; + crossVersion = "1.2"; perl-cross-src = fetchurlBoot { url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; - sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; - }; - - # https://github.com/arsv/perl-cross/issues/60 - perl-cross-gcc7-patch = fetchpatch { - url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; - sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; + sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cd perl-cross-* - patch -Np1 -i ${perl-cross-gcc7-patch} - cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3032b5e4c2a..52a3c64f81c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,6 +1,6 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix -{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison +{ lib, stdenv, fetchurl, composableDerivation, flex, bison , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 18bc875fb33..be11b38a0b8 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: let version = "0.9.5.1.1"; in diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 2feb15b647d..2a18dbff9e6 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ fetchurl, python2Packages }: let version = "0.9.6.4"; in diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index cd1a0fc6e18..fd84d924d7b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -10,7 +10,6 @@ , zlib , callPackage , self -, gettext , db , expat , libffi @@ -19,7 +18,7 @@ # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -33,7 +32,6 @@ let majorVersion = "2.7"; minorVersion = "15"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; @@ -161,10 +159,6 @@ let # don't rely on detecting glibc-isms. ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no"; - postConfigure = if hostPlatform.isCygwin then '' - sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' - '' else null; - buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib ] diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 7da2cfdd152..7e583087c08 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -15,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +29,6 @@ let majorVersion = "3.4"; minorVersion = "8"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 434c2338270..588880c1e82 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -15,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +29,6 @@ let majorVersion = "3.5"; minorVersion = "5"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 9ea0876b1ce..6b9e26e99fc 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, fetchpatch, buildPackages -, glibc , bzip2 , expat , libffi @@ -16,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +28,6 @@ let majorVersion = "3.6"; minorVersion = "6"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index ad88895fa67..adee8d594f1 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, fetchpatch -, glibc , bzip2 , expat , libffi @@ -16,7 +15,7 @@ , CF, configd , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -29,7 +28,6 @@ let majorVersion = "3.7"; minorVersion = "0"; minorVersionSuffix = ""; - pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index e68cfc3148f..95a893a209c 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -4,7 +4,7 @@ , makeWrapper, callPackage, self, gdbm, db , python-setup-hook # For the Python package set -, pkgs, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: {}) }: assert zlibSupport -> zlib != null; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 8a13c4efce6..4d98f18eee4 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, patchelf, glibc, libX11, libXt, perl }: +{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }: stdenv.mkDerivation rec { name = "rebol-nightly-${version}"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 89d394c8756..bb6f2758f4c 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -32,8 +32,6 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - isRuby20 = ver.majMin == "2.0"; - isRuby21 = ver.majMin == "2.1"; isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 31ef51802ed..594bbc05b7c 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: +{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 3bf4ba2dc2f..a472ccaafbf 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv # Version specific stuff , release, version, src diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index a6dfec49b2a..77154b54fd8 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, gdbm, libX11, libXt }: +{ stdenv, fetchurl, unzip, libX11, libXt }: stdenv.mkDerivation rec { name = "unicon-lang-${version}"; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index cceec44e6ae..a3c3b2bf96f 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: let # workaround https://github.com/NixOS/nixpkgs/issues/37364 diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index df87f51768d..ca7cc7027be 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -6,7 +6,7 @@ with pkgs.javaPackages; let collections = import ./collections.nix { inherit pkgs; }; fetchMaven = pkgs.callPackage ./m2install.nix { }; - plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; }; + plugins = import ./mavenPlugins.nix { inherit pkgs; }; poms = import ./poms.nix { inherit fetchMaven; }; in rec { # Maven needs all of these to function diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index e9ce5b1ce8c..8cc79dc1d22 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, maven }: +{ pkgs }: with pkgs; with pkgs.javaPackages; diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index 912ea53c3d3..60fafd60ad0 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, bicpl }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arguments"; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 219c8df803b..24e06b0d65a 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }: +{ stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { name = "assimp-${version}"; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 703679ba3a5..ec93e2f6467 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, fetchurl, writeText }: +{ stdenv, unzip, fetchurl }: let version = "24"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 8b787855c4d..580cd1bd73f 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }: +{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: let version = "1.8.2"; diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 8805dc74a26..093bb811489 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }: stdenv.mkDerivation rec { baseName = "belcard"; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 003fce0ea8c..09ca4908d78 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub +{ stdenv, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub , cmake, zlib, bctoolbox }: diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 214abb21f2c..736c9a2f9e0 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox }: stdenv.mkDerivation rec { baseName = "belr"; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 5ae9ead9ced..503e4b0fa43 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -19,7 +19,7 @@ assert enableSerialization -> boost != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index cdc660ca3f3..11b94a0181a 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }: stdenv.mkDerivation rec { baseName = "bzrtp"; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 1e764aff4cc..397e80961e0 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "actor-framework-${version}"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 4486149cfce..db46412ceb5 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv +{ stdenv, fetchurl, pkgconfig, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 47250f2b3da..a4e4968f562 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; ver_min = "2"; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 64e3690eb3e..0fc0dfb0706 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pkgconfig }: +{ stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { name = "capstone-${version}"; diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 7c44c2e0ab0..7cb75d8de0f 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.3"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index eba94288e8f..705aa7252d1 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes +{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, gobjectIntrospection, gtk3, gnome3 }: diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index c1bf789c59b..ba5b2aa4371 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv }: +{ fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { name = "crypto++-${version}"; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index fb129218175..c3ca9aa442b 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -5,7 +5,7 @@ # Options from inherited versions , version, sha256 -, patchSrc ? "src", extraPatches ? [ ] +, extraPatches ? [ ] , license ? stdenv.lib.licenses.sleepycat , drvArgs ? {} }: diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index c17a140b9c5..013913e5297 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index ea7d920dc82..40c633dda52 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index e4d1fa2073f..62014489f30 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -2,8 +2,6 @@ , fetchFromGitHub , fetchpatch , autoreconfHook -, libtool -, gettext , pari , ntl , gmp diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index e341ce842eb..79b29a90463 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "expat-2.2.5"; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 51696886148..04d085bde73 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook +{ stdenv, fetchurl, autoreconfHook , mp4v2Support ? true, mp4v2 ? null , drmSupport ? false # Digital Radio Mondiale }: diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index c5ce5e252fa..34c649022cf 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , hostPlatform /* * Licensing options (yes some are listed twice, filters and such are not listed) @@ -80,7 +80,6 @@ #, libnut ? null # NUT (de)muxer, native (de)muser exists , libogg ? null # Ogg container used by vorbis & theora , libopus ? null # Opus de/encoder -, libsndio ? null # sndio playback/record support , libssh ? null # SFTP protocol , libtheora ? null # Theora encoder , libv4l ? null # Video 4 Linux support diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index a3ce9ea9c2b..4607d3e2f19 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, perl, libsixel, yasm +{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 3d9027db160..e763e5c1159 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -42,7 +42,7 @@ */ let - inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32; + inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32; inherit (stdenv.lib) optional optionals enableFeature; cmpVer = builtins.compareVersions; diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 9e76c1e6400..a1cc11fb8c1 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg +{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index ccf2d6d0585..2b6a949c232 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent , double-conversion, glog, google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index c2d99446d81..01c4140f3b5 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchurl, fetchpatch +{ stdenv, substituteAll, fetchurl , pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , hostPlatform }: diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 8b534edd249..76e89b97617 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,4 +1,4 @@ -{ runCommand, lib, writeText, fontconfig, fontDirectories }: +{ runCommand, lib, fontconfig, fontDirectories }: runCommand "fc-cache" rec { diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 2f5374851d8..e15626a160e 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }: +, stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "frame-${version}"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 23aa86af377..fce052aeb22 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, copyPathsToStore -, hostPlatform +{ stdenv, fetchurl , pkgconfig, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib @@ -10,7 +9,7 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { name = "freetype-${version}"; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 6745bc1ecf5..d700c3d3c16 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "gbenchmark-${version}"; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index d2987be6a3d..ccfa7e53611 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg +{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg , librsvg, pango, gtk2, bzip2, intltool, libintl , OpenGL ? null }: diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index b92f6e61f56..83030a7a014 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python }: +{ stdenv, fetchurl, python }: stdenv.mkDerivation rec { name = "geos-3.6.2"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index fd6e0a65abc..8a07a9f9f22 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python +{ stdenv, fetchurl, gettext, pkgconfig, perl, python , libiconv, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5c504d0d8e2..8b4a213aae0 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -20,7 +20,7 @@ { stdenv, lib , buildPlatform, hostPlatform , buildPackages -, fetchurl, fetchpatch ? null +, fetchurl ? null , linuxHeaders ? null , gd ? null, libpng ? null , bison diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 472ec83fb02..a81cd91fdc7 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv -, tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake +, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake , yacc, texinfo # Version dependent args diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 984603827c8..081d896a6e0 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 6cdd19f307d..6155b8b18bd 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: +, libgsf, libxml2, libxslt, cairo, pango, librsvg }: stdenv.mkDerivation rec { name = "goffice-0.10.39"; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 94c09b71683..e7da60a9d1a 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which , autoreconfHook , git diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 720ff06ceaa..9c19bdbdc29 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gss, libidn, kerberos }: +{ fetchurl, stdenv, libidn, kerberos }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 4f952359f71..37d4843db8d 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "gsl-2.5"; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dfd3383cdba..49216b70fe1 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, meson, ninja, gettext, gobjectIntrospection -, python, gstreamer, orc, pango, libtheora, libvisual +, python, gstreamer, orc, pango, libtheora , libintl, libopus , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 11e0894df3c..ad7309be044 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -12,7 +12,7 @@ assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "gst-plugins-good-1.14.0"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 8371b278040..db75705c825 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia +{ fetchurl, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintl , ApplicationServices diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 75583624f54..9c47ef0260b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo -, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx -, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc +, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx +, taglib, libpulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index ac680f8432a..2f46016adac 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }: +, libmad, libdvdread, a52dec, x264, orc, lame, libintl }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-0.10.19"; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 11b451e76fd..7255894f3b1 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm +, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm , libvpx, python }: diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index f206a169b93..c0dc0753cd0 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, substituteAll, which }: +, pango, pkgconfig, which }: stdenv.mkDerivation rec { name = "gtkd-${version}"; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 4f3bc64b5d4..4c858242bb5 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3 +{ stdenv, fetchurl, pkgconfig, gettext, gnome3 , glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index ee8a5107b34..9f0a6c34512 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -163,6 +163,7 @@ let name = "hunspell-dict-${shortName}-linguistico-${version}"; readmeFile = dictFileName + "_README.txt"; meta = with stdenv.lib; { + description = "Hunspell dictionary for ${shortDescription}"; homepage = https://sourceforge.net/projects/linguistico/; license = licenses.gpl3; maintainers = with maintainers; [ renzo ]; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index ee868d371ce..705fb816b2e 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,5 +1,5 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames +{ stdenv, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform }: diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 3568edb7890..8abff4c5f05 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, utillinux, +{ stdenv, cmake, pkgconfig, utillinux, protobuf, zeromq, cppzmq, version, src # parametrize version and src so we can easily have pkgs # for different versions diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index ed500ca518f..a5b226ee9c7 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, ghostscript }: +{ stdenv, autoreconfHook, ghostscript }: stdenv.mkDerivation { name = "ijs-${ghostscript.version}"; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 4dfe190124b..d78c59e9c25 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, python3, xz}: +{stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { name = "iso-codes-${version}"; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 5280a95afb4..5f6a6f51a52 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { name = "itk-4.13.0"; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index eff57d6f2fd..cf9c554d57f 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.16.1"; + version = "1.17"; name = "commons-compress-${version}"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; - sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37"; + sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0"; }; installPhase = '' diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 8731bd8e736..b9dcc927172 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "jbig2dec-0.14"; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index a9b5d596b39..be83dbc52f4 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext -, gobjectIntrospection, dbus, fixDarwinDylibNames, gnome3 +, gobjectIntrospection, fixDarwinDylibNames, gnome3 }: let diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index cd5f2163dd9..d5a407ee16f 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, writeScript, + mkDerivation, lib, extra-cmake-modules, qtbase, qttools, shared-mime-info }: diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 7aabeb02154..34e01b4c1b6 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, - kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative + kwidgetsaddons, kwindowsystem, qtdeclarative }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index ae945ab7338..ca015151e0f 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, qtbase, qttools, qtx11extras, diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index c0b4b631286..6779faa50cd 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchurl, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n, qtbase, }: diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 3efd4cf4e2a..c633aee30a1 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, fetchpatch, + mkDerivation, lib, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cf4b85043bb..194b57c0534 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk3, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index c6c3ba53d2c..5c53f5e6ad5 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig +{ stdenv, lib, fetchurl, extra-cmake-modules , qtbase, kdeFrameworks , libatasmart, parted , utillinux }: diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index 3f44dbb9c13..256989992c5 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 + qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 }: mkDerivation rec { diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 853d23c9745..dcff8c2757e 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { name = "frog-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; - name = "frog-${release.version}.tar.gz"; }; + name = "frog-v${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 61b4559ebab..2c418c1bc5f 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu -, languageMachines }: let diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json index 1147322be6d..6ea44938717 100644 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json @@ -1,5 +1,5 @@ { - "version": "v0.13", + "version": "0.13", "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13", "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg" } diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 7defa71fc0e..01a78b5b4be 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu -, languageMachines }: + }: let release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json); diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 5791b0808b4..e9ba4ae5ac2 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }: stdenv.mkDerivation rec { version = "0.3.2"; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index fde8a06eb41..0c0fc3861c9 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, hostPlatform }: +{ stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b726d9c2b42..5eb90aaf05c 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -18,10 +18,10 @@ assert faacSupport -> enableUnfree; -let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in +let inherit (stdenv.lib) optional hasPrefix enableFeature; in /* ToDo: - - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools + - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools - maybe do some more splitting into outputs */ diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 8b2f0b0da92..3a1b7752514 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }: +{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }: # library that allows libbluray to play BDplus protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 3f244d399f7..c02e2108f23 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPackages -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped +{ stdenv +, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped , libiberty, zlib }: diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 418e9cf0b57..e4864aded27 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite, gnome3 +{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: let diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 4f0ba439417..4f4007649d0 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, collectd }: +{ stdenv, collectd }: with stdenv.lib; collectd.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 7f4eaa5fd14..295028abc97 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 +{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: let diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 34ba39d799e..1342ee6773f 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -3,7 +3,7 @@ let baseName = "libdbusmenu-qt"; v = "0.9.2"; - homepage = "http://launchpad.net/${baseName}"; + homepage = "https://launchpad.net/${baseName}"; name = "${baseName}-${v}"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_DOC=OFF"; - + meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index bc4cea1b470..c68e171084b 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, groff }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "libedit-20180525-3.1"; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index b1a6238a378..d150d4a0033 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }: +{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }: stdenv.mkDerivation rec { version = "20171104"; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 05c320c42ae..5e94d00dcdb 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig -, libtiff, giflib, libjpeg, libpng, monoDLLFixer +, libtiff, giflib, libjpeg, libpng , libXrender, libexif }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 652848d8a95..29f346e9acf 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, - autoreconfHook, intltool, docbook_xsl, xauth, sudo + autoreconfHook, intltool, docbook_xsl, xauth }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 96b42ac068c..8616a014675 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: stdenv.mkDerivation rec { name = "libgphoto2-${meta.version}"; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index fbe421e9974..c6056ee49fb 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,5 +1,5 @@ {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, - libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, + libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib, libimobiledevice, pythonPackages, mutagen, monoSupport ? true, mono, gtk-sharp-2_0 }: diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index b0013d0f949..90daf2ddf74 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,8 +1,6 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 , python, perl, gdk_pixbuf, libiconv, libintl }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "libgsf-1.14.42"; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 6498014aee8..d0be9e25b87 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, libtool, gnome3, gtk-doc }: +{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libtool, gnome3, gtk-doc }: let pname = "libgtop"; version = "2.38.0"; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 516e6bbbe88..bcc85abbd3e 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, staticBuild ? false }: +{ stdenv, buildPackages, staticBuild ? false }: let inherit (buildPackages.buildPackages) gcc; in diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index a153001a960..0289a5331f8 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, writeText, zlib, gperf}: +{stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { name = "libid3tag-${version}"; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index a100b0cc593..dd8e3c4a4f8 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }: +{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }: with stdenv.lib; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index fef5e7278b8..612de78b741 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 87cae224685..f352c8e9ed1 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd -, doxygen, catch, pkgconfig, git +, doxygen, catch, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 4b547fde3ab..79439f82269 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux }: let diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index c918c61abf0..2c59fa03ea0 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, autoreconfHook264, bison, binutils-unwrapped +, autoreconfHook264, bison, binutils-unwrapped , libiberty, libbfd }: diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 66c7e7e882e..135f1caf97e 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , fixedPoint ? false, withCustomModes ? true }: let diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 8da097c3d38..8dc64f2c2b5 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python2Packages, glib }: +{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }: let inherit (python2Packages) python cython; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 5ad9cf1e7b7..4173588ac52 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, zlib, apngSupport ? true -, buildPlatform, hostPlatform -}: +{ stdenv, fetchurl, zlib, apngSupport ? true }: assert zlib != null; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 02e634b22a3..0e0499251eb 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib , dbus, networkmanager, spidermonkey_38, pcre, python2, python3 , SystemConfiguration, CoreFoundation, JavaScriptCore }: diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index b7a78cb3daf..3f436677123 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, libxslt, curl }: +{ stdenv, fetchurl, libxml2, libxslt }: stdenv.mkDerivation rec { name = "raptor2-2.0.15"; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 8168ff0edae..38ba93d4f7c 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { name = "libsass-${version}"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz"; }; - patchPhase = '' + patches = [ + # CVE-2018-11693, is in master but no release yet + (fetchpatch { + url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch"; + sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl"; + }) + ]; + + preConfigure = '' export LIBSASS_VERSION=${version} ''; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index b77ba49822f..f311d1a0335 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl , libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: let pname = "libsecret"; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index f6bfff78fa2..def5ee0e19a 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }: +{ stdenv, fetchurl, pkgconfig, gnum4 }: let ver_maj = "2.10"; # odd major numbers are unstable ver_min = "0"; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 8152c1ea852..306c73a9b55 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl -, buildPlatform, hostPlatform , enableSigbusFix ? false # required by kernels < 3.18.6 }: diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 48b0ed6d711..b64c3e51778 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, +{ stdenv, fetchFromGitHub, libtool, gettext, pkgconfig, vala, gnome-common, gobjectIntrospection, libgee, json-glib, skk-dicts }: diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 578053bbb42..4ea2209160f 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index aab0da90d39..6eb8b6b1a8e 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsvm-${version}"; - version = "3.22"; + version = "3.23"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd"; + sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5"; }; buildPhase = '' diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix new file mode 100644 index 00000000000..fce15b121b4 --- /dev/null +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, patchelf }: +stdenv.mkDerivation rec { + pname = "libtensorflow"; + version = "1.8.0"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz"; + sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha"; + }; + + # Patch library to use our libc, libstdc++ and others + buildCommand = '' + . $stdenv/setup + mkdir -pv $out + tar -C $out -xzf $src + chmod +w $out/lib/libtensorflow.so + chmod +w $out/lib/libtensorflow_framework.so + ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so + ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so + chmod -w $out/lib/libtensorflow.so + chmod -w $out/lib/libtensorflow_framework.so + ''; + + meta = with stdenv.lib; { + inherit version; + description = "C API for TensorFlow"; + license = licenses.asl20; + maintainers = [maintainers.basvandijk]; + platforms = platforms.linux; + homepage = https://www.tensorflow.org/versions/master/install/install_c; + }; +} diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index fd58f4f44e7..b5ab9d310da 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: +{stdenv, fetchurl, libogg, libvorbis, pkgconfig}: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c492a15bfa4..c5a12432280 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }: let version = "4.0.9"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index dbf1d7a3756..6a32ccf5c1b 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }: +{ stdenv, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { name = "libunwind-${version}"; diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index 95d4be08548..6868e5c8cfa 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libdrm, libva }: diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 731892d33b4..515aa253744 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -33,7 +33,6 @@ , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -, experimentalSupport ? false # experimental features # Experimental features , experimentalSpatialSvcSupport ? false # Spatial scalable video coding , experimentalFpMbStatsSupport ? false @@ -41,7 +40,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; + inherit (stdenv) is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 7d4b75d6cdf..fb7f828f61f 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -35,7 +35,6 @@ , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -, experimentalSupport ? false # experimental features # Experimental features , experimentalSpatialSvcSupport ? false # Spatial scalable video coding , experimentalFpMbStatsSupport ? false diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8a3d7abdfa5..51c142a8111 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl , zlib, xz, python2, findXMLCatalogs, libiconv , buildPlatform, hostPlatform , pythonSupport ? buildPlatform == hostPlatform diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1bb90ee195d..5b6fdb462c2 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2 +{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2 , buildPlatform, hostPlatform , cryptoSupport ? false , pythonSupport ? buildPlatform == hostPlatform diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index ff09aeab2c6..af665c6d9a4 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "libyaml-cpp-${version}"; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 7178e64b6b6..7bd0d1970f4 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: let version = "0.1.7"; in diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 3f008744c1b..5fa1035868d 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "linenoise-ng-${version}"; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 7f4d8cc19c8..ad6d2df1d8b 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3 +{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3 , libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 93c8a0474d9..c45fa6bc61a 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, boost, gtest }: +{ stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { name = "lucene++-${version}"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 8b756e338e4..4b69d5d0aaf 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm +{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen , python, libXext, libmatroska, openssl, fetchpatch diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index f49b7ba2c4b..b8a8c64011c 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 +{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264 , fetchgit, cmake }: diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index 0ae17b4d3f6..f18c1e693cb 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -1,7 +1,5 @@ -{ stdenv, stdenvAdapters, fetchurl, pkgconfig, intltool, flex, bison -, python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau -, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt -, enableExtraFeatures ? false # not maintained +{ stdenv, fetchurl, pkgconfig, intltool, flex, bison +, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau , OpenGL, apple_sdk, Xplugin }: diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9c0bf29d490..028930ba066 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, lib -, pkgconfig, intltool, autoreconfHook, substituteAll +{ stdenv, fetchurl, lib +, pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2d4de339042..d8075c41a70 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper +{ stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, movit, pkgconfig, sox , gtk2 diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index 444ec9dac2b..d96f90b4bfd 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }: +{ stdenv, fetchurl, which, pkgconfig, mono }: stdenv.mkDerivation rec { name = "mono-zeroconf-${version}"; diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 6c5a0e5279c..b5a36c184ff 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, perl, gfortran +{ stdenv, fetchurl, perl, gfortran , slurm, openssh, hwloc } : diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index b9b25e7f43b..2ecae98387e 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, m4, which, yasm }: +{ stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { name = "mpir-${version}"; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index e0adb312677..65679c7e282 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline, makeWrapper }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: stdenv.mkDerivation rec { name = "neardal-0.7-post-git-20150930"; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 3483d4bed77..fb36839fe23 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }: +{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }: let version = "016"; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 94aba672887..2715ff4dfaf 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, oracle-instantclient, libaio }: +{ stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }: stdenv.mkDerivation rec { name = "odpic-${version}"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 1d3a9629fd0..264c05e1af9 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch +, fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, google-gflags, protobuf , config diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 20a62ef67f9..a073a29b507 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl, readline, mysql, postgresql, sqlite }: -let - inherit (stdenv.lib) getDev getLib; -in stdenv.mkDerivation rec { name = "opendbx-1.4.6"; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 60ee30177c0..293274a5776 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { name = "openexr-${lib.getVersion ilmbase}"; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 187f8613375..7d84392d204 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, hostPlatform, fetchurl, lib }: +{ stdenv, fetchurl, lib }: stdenv.mkDerivation rec { name = "openpam-${version}"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0251de77d03..b4b932f8d05 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, buildPackages, perl , buildPlatform, hostPlatform -, fetchpatch , withCryptodev ? false, cryptodevHeaders , enableSSL2 ? false }: diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 62c093f310f..51270427397 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit , darwin @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1"; + sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 5dc5df8e95b..e58e347c7f3 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: +{ stdenv, cmake, fetchFromGitHub, bctoolbox }: stdenv.mkDerivation rec { baseName = "ortp"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index c23e7c9617e..a9a8c5c2563 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz, fribidi -, libintl, gobjectIntrospection, darwin +{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz +, libintl, gobjectIntrospection, darwin, fribidi }: with stdenv.lib; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 73e7fd42cdb..e0819cde679 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pcre2-${version}"; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 9993060eb72..a8655c2dcbe 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: +{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "herwig-${version}"; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index 32a05d10d3a..b287e52b243 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }: +{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }: stdenv.mkDerivation rec { name = "mcgrid-${version}"; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 0c9d879fbd0..2f79a2b76ab 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "nlojet++-${version}"; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index eb34b94118a..1dacdba1b1c 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: +{ stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { name = "yoda-${version}"; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index aa9a3f9fdc0..a577d318523 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,12 +1,10 @@ { fetchurl -, fetchpatch , stdenv , perl , libxml2 , postgresql , geos , proj -, flex , gdal , json_c , pkgconfig diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 06154e0008b..1a20d806b96 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, version, src +{ stdenv, version, src , autoreconfHook, zlib, gtest , ... }: diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 4e74e31e3ec..51253676341 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, cmake, qt4}: +{stdenv, fetchurl, cmake, qt4}: let pn = "qimageblitz"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 4227575acb0..01d0fc510aa 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, substituteAll , hostPlatform -, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext +, libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig +, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 5407a79cd77..2a706fc7b6e 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper, + stdenv, fetchurl, fetchFromGitHub, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index b9ed5eddd5c..8732b106134 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, + stdenv, fetchurl, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index e109fe447aa..755e6a9487e 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, + stdenv, fetchurl, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 15e19c77567..0d9cb81afda 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -3,14 +3,14 @@ src, patches, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, which, + which, # darwin support - darwin, libiconv, libcxx, + darwin, libiconv, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, - xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg, + xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, zlib, # optional dependencies diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 1b7a7c1fcea..d0bab88b2f2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,6 +1,5 @@ { qtModule, stdenv, qtbase, qtdeclarative, pkgconfig , alsaLib, gstreamer, gst-plugins-base, libpulseaudio -, darwin }: with stdenv.lib; diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 2f8c142323d..516d38340dc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -1,4 +1,4 @@ -{ qtModule, stdenv, lib, qtbase, substituteAll, systemd }: +{ qtModule, stdenv, lib, qtbase, systemd }: let inherit (lib) getLib optional; in diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 8691e20ec45..62da679157f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -4,7 +4,6 @@ , sqlite, systemd, glib, gst_all_1, cmake , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin -, substituteAll , flashplayerFix ? false , src ? null , version ? null diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index 49585f601d1..da56c07779b 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -1,4 +1,4 @@ -{ lib, buildEnv, qtbase }: name: paths: +{ buildEnv, qtbase }: name: paths: buildEnv { inherit name; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index a8611b31240..b94cdd22f7f 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "qtstyleplugins-2017-03-11"; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 8d096e18f08..ae858738ec1 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qtbase, qmake }: +{ fetchurl, stdenv, zlib, qtbase, qmake }: stdenv.mkDerivation rec { name = "quazip-0.7.3"; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 77e76ad638a..35d16ee5e19 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python2Packages, hexio +{ stdenv, fetchFromGitHub, python2Packages, hexio , which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 90389055a41..786fce0fb63 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -5,7 +5,6 @@ # Optional Arguments , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null -, numactl ? null # Malloc implementation , jemalloc ? null, gperftools ? null diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 77cb7cf1f2b..55c1a641fc3 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool +{ stdenv, fetchurl, autoconf, automake, gettext, libtool , gfortran, openblas }: with stdenv.lib; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 916bf122b3c..c1994533b78 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, config, fetchFromGitHub, fetchpatch +{ stdenv, lib, config, fetchFromGitHub , cmake , glog, google-gflags, gtest , protobuf, snappy diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c68454fbe4a..e6af2251b1f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,8 +11,7 @@ let atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } else null; usedLibExtension = if shared then ".so" else ".a"; - inherit (stdenv.lib) optional optionals concatStringsSep; - inherit (builtins) hasAttr attrNames; + inherit (stdenv.lib) optional optionals; version = "3.8.0"; in diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix index 3601066cb22..632380328db 100644 --- a/pkgs/development/libraries/science/networking/ns3/default.nix +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub, fetchurl +, fetchFromGitHub , python # for binding generation diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index dfaf1c679dd..f794c3841b9 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos -, pkgconfig, gnused, expat, openldap, libiconv }: +, pkgconfig, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 3207bdb3a7f..90043786471 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: +{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }: stdenv.mkDerivation rec { name = "smpeg2-svn${version}"; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 22d66b7e71d..771ad033ed9 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk, alsaLib, ncurses }: +{ stdenv, fetchurl, alsaLib, ncurses }: stdenv.mkDerivation rec { name = "speech_tools-${version}.0"; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 0b815f9095f..ba3791a8a8b 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib +{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl , lz4 }: diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 0185bd2733b..4f711a639f7 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , Carbon ? null , libjpeg ? null , libpng ? null diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 99f0bb65441..24251cf0cc1 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }: +{ fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { name = "libtirpc-1.0.3"; diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix index 9f9d8e62de5..aa4a7890b23 100644 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, pkgconfig, python }: +{ stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { name = "unicorn-emulator-${version}"; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 9112079a90e..ce666becc85 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -1,5 +1,5 @@ # This old version of V8 is still needed for the R V8 module -{ stdenv, callPackage, fetchFromGitHub, gyp, readline, python, which, icu, ... }: +{ stdenv, fetchFromGitHub, gyp, readline, python, which, icu, ... }: assert readline != null; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 438b4eda454..14211ea65e9 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase +{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase , libjpeg, libpng, libtiff, openexr, python2Packages }: let diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 984a106236c..bdfe3d1c5c6 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 797c64729ec..e154403697f 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vulkan Header files and API registry"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 29a27e53f22..9eb3254001d 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv }: +{ stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "wavpack-${version}"; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index d832becbed8..3555a923228 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index bbc33f33e70..fce0dae6c73 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, libffi, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c905c40cf96..c4d94af850d 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -13,7 +13,6 @@ let + optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 2b9244ff1b1..572adfeb0bb 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL , libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 17f8646b517..e343c301127 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig -, git, xorg, gnum4, libxcb, gperf }: +, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 7865724efa4..ad1cc2efc87 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchgit, cmake -, avxSupport ? false , cudaSupport ? false, cudatoolkit , ncclSupport ? false, nccl , llvmPackages @@ -9,13 +8,13 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "0.7"; + version = "0.72"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; rev = "refs/tags/v${version}"; - sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l"; + sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 274a70057bd..69b5b95e761 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib -, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg +, libvorbis, libtheora, speex, zlib, perl, ffmpeg , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index f67964748dc..9d006527717 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci"; + sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index c834ab7a305..019a44482b9 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, asdf, which, bash, lisp ? null}: +{stdenv, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 9b9486e9758..22aa818f875 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''alexandria''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 7c618a9fffb..c90a9e09192 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''array-utils''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix index f2125676e5a..68c8a7e087b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''asdf-finalizers''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a5..4612e6175b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''asdf-system-connections''; version = ''20170124-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index a9808173b62..c8f34e0fa17 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''chipz''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df24..a420c22054f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-aa''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8d..42a7bd59585 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-anonfun''; version = ''20111203-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 61a35f2b58c..0321572e72a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-html-parse''; version = ''20161031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428f..825fea4eb90 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix index 57c9c03ba42..d506acf876e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-log''; version = ''cl-log.1.0.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index 8967b0970c5..67468edbb6c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-markup''; version = ''20131003-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c23..f546e4711ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-paths''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 6d284b7b012..4434e711d9d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-unification''; version = ''20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 750da99d5d6..1b78d0d2898 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-utilities''; version = ''1.2.4''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index fe511ec40bd..a4a66ecfa64 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''clack-socket''; version = ''clack-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 312d0eb10a4..ec7599f2bd3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''closer-mop''; version = ''20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index e1fb5965852..1ae6fa0f4ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''command-line-arguments''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index f4941aa80cd..bb5ab940638 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''css-lite''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix index ae8ed6de877..7c69878900c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''db3''; version = ''cl-20150302-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix index 1568533d92a..91b8db69a36 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''eos''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix index 11d5ac4491e..76e2a55620c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''garbage-pools''; version = ''20130720-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index f276ec72736..f85b128652d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''iterate''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e5cbad3e9e8..62a3ae2bb7d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''kmrcl''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 4dfdce68bc8..79f2d38ef10 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''lack-component''; version = ''lack-20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index a3ddc2fd953..b44c0c8a987 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''lift''; version = ''20151031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index db25e6ae534..006361ed80c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''map-set''; version = ''20160628-hg''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 4f6842606b4..c34d79f3d13 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''marshal''; version = ''cl-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a4..c65d95d9ef7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''md5''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index d72e0839d1e..5647b9a9270 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''metabang-bind''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 1fc10b9c8db..6bbdf5f911e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''metatilities-base''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 6334804c4f7..3c289fefa9a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''misc-extensions''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf9..29460307e69 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''mt19937''; version = ''1.1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 82d06b1c93b..e1d6a1477a7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''named-readtables''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a0..67636d3f6cf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''net_dot_didierverna_dot_asdf-flv''; version = ''asdf-flv-version-2.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e..5c1f90220eb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''parse-number''; version = ''v1.7''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix index 5edceaf4ad9..cd0db041c5b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''plump-lexer''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c26..c90b252313b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''ptester''; version = ''20160929-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index be2897d19a4..41ead034791 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''rfc2388''; version = ''20130720-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7daf..8ed7c1a4499 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''rt''; version = ''20101006-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcca..d55f7700092 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''salza2''; version = ''2.0.9''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 7f5cc1e048d..9cc6338c8b8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''string-case''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 1359e13b949..6819e4b2571 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''swank''; version = ''slime-v2.20''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 9a4afce3280..a772694b983 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-backtrace''; version = ''20160531-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 1a562c2288b..5efc5766955 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-features''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index dd93a599d69..9a285fea2f1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 4f4e1f81223..e044f097701 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-indent''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 56bbb583837..6946141f112 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-mimes''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64a..1af66736f30 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-types''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index c925382d81d..753f21dbcb9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-utf-8''; version = ''20111001-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f7..0ac190993d8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''uffi''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 39c2060af02..afb8b388568 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''uiop''; version = ''3.3.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c456496732..3a4b05e0526 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''unit-test''; version = ''20120520-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799e..11b9351c03a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''vom''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c3..c70c3f2e1e1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''xsubseq''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3f..733185e2b26 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''yacc''; version = ''cl-20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 74e5d7e97e9..090aa670ad9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''zpb-ttf''; version = ''1.0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 111d9952749..91493d7431e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -1,6 +1,5 @@ -{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}: +{pkgs, quicklisp-to-nix-packages}: let - addDeps = newdeps: x: {deps = x.deps ++ newdeps;}; addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; skipBuildPhase = x: { overrides = y: ((x.overrides y) // { buildPhase = "true"; }); diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index efa76ea00a0..b43deeceb86 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 1e8ea65c73d..fd8651e89cf 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -25,9 +25,6 @@ stdenv.mkDerivation rec { sed_script_1 = "'s|^PROGDIR=`dirname $0`" + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - sed_script_2 = - "'s|^MYNDKDIR=`dirname $0`" + - "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 390c5eb7a20..20b3ff3b8f5 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -7,10 +7,6 @@ args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux" - else if stdenv.system == "x86_64-darwin" then "macosx" - else throw "Platform: ${stdenv.system} is not supported!"; - androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; abiVersions = []; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6765a9cc5c3..b09a483290f 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: +{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: rec { androidenv = pkgs.androidenv; diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index 5bdd0fd63c5..bbd94cb7882 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,4 +1,4 @@ -{stdenv, xcodeenv, kitchensink, bundleId}: +{xcodeenv, kitchensink, bundleId}: xcodeenv.simulateApp { name = "simulate-${kitchensink.name}"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix index 53963c100c7..26adf373826 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, fetchurl, unzip, makeWrapper}: stdenv.mkDerivation { name = "mobilesdk-6.3.1.GA"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix index 61c23a6d0b3..a6de1f0ae8c 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, fetchurl, unzip, makeWrapper}: let # Gradle is a build system that bootstraps itself. This is what it actually diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 720e0cc0850..eee72cb9613 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -56,7 +56,7 @@ let ) dependencies); # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: + composePackage = { name, packageName, src, dependencies ? [], ... }: '' DIR=$(pwd) cd $TMPDIR @@ -176,7 +176,7 @@ let # dependencies in the package.json file to the versions that are actually # being used. - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }: '' if [ -d "${packageName}" ] then diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index 97c59d8581f..827487be69b 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -buildOcaml rec { +stdenv.mkDerivation rec { version = "0.8.3"; - name = "astring"; + name = "ocaml${ocaml.version}-astring-${version}"; src = fetchurl { url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index bab2541fd74..291dd03c8d1 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}: +{stdenv, atd, yojson, biniou, buildOcaml, fetchurl, which}: buildOcaml rec { name = "atdgen"; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 8882bbf6647..72c426ce037 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch , 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, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, + 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, utop, which, makeWrapper, writeText }: diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index 4a2b9846271..1acb17a8f7a 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, buildOcaml, fetchurl, type_conv}: +{stdenv, buildOcaml, fetchurl, type_conv}: buildOcaml rec { name = "bin_prot"; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 24f0e9bfd7a..962525b47e4 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder , ppx_fields_conv, ppx_sexp_conv, ppx_deriving -, base64, fieldslib, jsonm, logs, re, stringext, uri +, base64, fieldslib, jsonm, re, stringext, uri }: stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 25f84826ec1..0122ec9ff61 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools +{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools , async ? null, lwt ? null }: diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 8b304aadd9e..f82cf33e307 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, - js_of_ocaml, lwt_react, cryptokit, + lwt_react, cryptokit, ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix index a7290c8bb98..1a8f854185a 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, erm_xml, nocrypto }: buildOcaml rec { version = "0.3"; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 189388efe32..afeb3f1957b 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, jbuilder, git-http , cohttp-lwt-unix -, tls, magic-mime, cmdliner, mtime +, tls, cmdliner, mtime }: stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 6f0f0d0b120..0bf43174412 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri , alcotest, mtime, nocrypto }: diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 20d558e37c1..2f0aa342995 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib +{ stdenv, fetchurl, ocaml, ocamlbuild, findlib , jbuilder, sexplib, ppx_sexp_conv }: -buildOcaml rec { - name = "ipaddr"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ipaddr-${version}"; version = "2.8.0"; src = fetchurl { @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw"; }; - buildInputs = [ findlib ocamlbuild jbuilder ]; + buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib ]; inherit (jbuilder) installPhase; diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix index 4a283cc9910..19eef7cf182 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix, +{stdenv, buildOcamlJane, async_kernel, async_unix, bin_prot, core, ppx_custom_printf, fieldslib, herelib, pipebang, sexplib, async_rpc_kernel}: diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 4d7213a8603..938f5ccf447 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -1,6 +1,6 @@ -{stdenv, buildOcamlJane, fetchurl, core_kernel, +{stdenv, buildOcamlJane, core_kernel, bin_prot, fieldslib, - sexplib, herelib, opam, js_build_tools, ocaml_oasis}: + sexplib, herelib}: buildOcamlJane rec { name = "async_kernel"; diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix index 5621d2ec704..7db7cae2709 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, +{stdenv, buildOcamlJane, async_kernel, bin_prot, comparelib, core, fieldslib, herelib, pipebang, sexplib}: diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix index 2e776e273be..4cd67e1af86 100644 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcamlJane, fetchurl, async_kernel, +{stdenv, buildOcamlJane, async_kernel, async_unix, async_extra}: buildOcamlJane rec { diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index bc1977ce2d6..63156215976 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -1,5 +1,5 @@ -{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes -, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers +{ stdenv, buildOcamlJane, async, comparelib, core, ctypes +, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis }: buildOcamlJane rec { diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index dc84ea34337..5410167e0a2 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -1,9 +1,8 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, core, bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - re2, textutils, - ocaml_oasis, opam, js_build_tools}: + re2, textutils}: buildOcamlJane rec { name = "core_extended"; diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix index 05ea4d5d566..c2f97badda9 100644 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -1,8 +1,7 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, core_kernel, bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - ocaml_oasis, opam, js_build_tools}: + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: buildOcamlJane rec { name = "core"; diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index 93fcdde5bb3..e5bbb780052 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -1,7 +1,6 @@ -{stdenv, buildOcamlJane, fetchurl, +{stdenv, buildOcamlJane, bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - ocaml_oasis, opam, js_build_tools}: + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: buildOcamlJane rec { name = "core_kernel"; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index a4c3c15160d..a05d49245b2 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes, +{ stdenv, janePackage, ocamlbuild, angstrom, cryptokit, ctypes, magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num, openssl , ppxlib diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 5482d7ac87c..1986f7e48f6 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 165dda1fa02..e1590bb0c9a 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: +{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 165a566b1b7..38b56ac7beb 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }: stdenv.mkDerivation rec { version = "0.7.5"; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 9d5f4f4e669..45dd73d4a32 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -1,15 +1,26 @@ -{ stdenv, buildOcaml, fetchurl, ppx_tools }: +{ stdenv, fetchurl, ocaml, findlib, jbuilder, alcotest +, ocaml-migrate-parsetree +}: -buildOcaml rec { - name = "ppx_blob"; - version = "0.2"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_blob-${version}"; + version = "0.4.0"; src = fetchurl { - url = "https://github.com/johnwhitington/ppx_blob/archive/v${version}.tar.gz"; - sha256 = "0kvqfm47f4xbgz0cl7ayz29myyb24xskm35svqrgakjq12nkpsss"; + url = "https://github.com/johnwhitington/ppx_blob/releases/download/${version}/ppx_blob-${version}.tbz"; + sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16"; }; - buildInputs = [ ppx_tools ]; + unpackCmd = "tar xjf $curSrc"; + + buildInputs = [ ocaml findlib jbuilder alcotest ocaml-migrate-parsetree ]; + + buildPhase = "dune build -p ppx_blob"; + + doCheck = true; + checkPhase = "dune runtest -p ppx_blob"; + + inherit (jbuilder) installPhase; meta = with stdenv.lib; { homepage = https://github.com/johnwhitington/ppx_blob; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 3afe4149fa3..24cfbcf5b7a 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,7 +1,11 @@ -{ stdenv, buildOcaml, ocaml, fetchzip +{ stdenv, ocaml, findlib, ocamlbuild, fetchzip , cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree }: +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ppx_deriving is not available for OCaml ${ocaml.version}" +else + let param = if ocaml.version == "4.03.0" then { @@ -14,23 +18,21 @@ let param = extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ]; }; in -buildOcaml rec { - name = "ppx_deriving"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_deriving-${version}"; inherit (param) version; - minimumSupportedOcamlVersion = "4.02"; - src = fetchzip { - url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz"; + url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; inherit (param) sha256; }; - hasSharedObjects = true; - - buildInputs = [ cppo ounit ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; propagatedBuildInputs = param.extraPropagatedBuildInputs ++ [ ppx_tools result ]; + createFindlibDestdir = true; + installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 3948cfce0e8..1f53b871282 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchFromGitHub, buildOcaml, ocaml, opaline, - cppo, ppx_tools, ounit, ppx_deriving}: +{stdenv, fetchFromGitHub, buildOcaml, opaline, + cppo, ounit, ppx_deriving}: buildOcaml rec { name = "ppx_import"; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 53d7847acee..2aa74d751db 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -17,6 +17,9 @@ let param = { "4.06" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; + "4.07" = { + version = "5.1+4.06.0"; + sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; }."${ocaml.meta.branch}"; in stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 7421e2fa0b1..46453f30d3b 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -2,12 +2,7 @@ # This is the original pycaml version with patches from debian. -let debian = fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz"; - sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; - }; - -in stdenv.mkDerivation { +stdenv.mkDerivation { name = "pycaml-0.82-14"; srcs = [ diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index 9b26c404095..2b7d9855665 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test, +{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, bin_prot_p4, comparelib, sexplib_p4, rsync}: buildOcaml rec { diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 1e031b135d2..181946802d7 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit +, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: with stdenv.lib; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index a965d6ed116..b34c9279c30 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re +, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, camlp4 ? null }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; @@ -13,13 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ]; + buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ] + ++ stdenv.lib.optional withP4 camlp4; propagatedBuildInputs = [ uutf re ]; createFindlibDestdir = true; - configureFlags = "--enable-syntax"; + configureFlags = stdenv.lib.optional withP4 "--enable-syntax"; meta = with stdenv.lib; { homepage = http://ocsigen.org/tyxml/; diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index 176cd06a9cc..dbb167e27b3 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildPerlPackage, stdenv, perl }: +{ fetchFromGitHub, buildPerlPackage, stdenv }: buildPerlPackage rec { name = "MNI-Perllib-2012-04-13"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 82b3da7a37c..b59be96bb62 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: { name, src, version, source-date, source-url, ... }: diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b995e0e2540..5178551df45 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs: +{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}: let i686 = pkgsi686Linux.callPackage ./vms.nix {}; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index e8c1a948fe9..22bbb4d3be4 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, +{ stdenv, fetchurl, pkgconfig, pure, haskellPackages }: stdenv.mkDerivation rec { diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index e86f08b57ca..7b615928da9 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }: + pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 124e8b80ba0..fa07eee0d7e 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, isPy3k , python , glibcLocales , pkgconfig diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 4f0a7d4aebc..550fa1da3ed 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -1,5 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted -, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +{lib, buildPythonPackage, fetchPypi , geoip, nose}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 13bddd3ffb8..879cdb9bd09 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "JPype1"; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 29a792000e9..48878995bb4 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, gnugrep }: let diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 30c820ec6c1..e2b31cdda79 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -9,7 +9,6 @@ , isPy3k , nose , numpy -, pydot_ng , scipy , six , libgpuarray diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index cd81a7facc2..820ee2a95d8 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage , certbot , nose , cryptography diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index f0756e1572e..9f307f24dfa 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }: buildPythonPackage rec { pname = "aiohttp-jinja2"; diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix index 3065bb17c05..00198cd27cf 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp/cors.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder , typing, aiohttp }: diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 2ad260f5d40..1492a15aadf 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }: +{ lib, buildPythonPackage, fetchPypi, aiohttp }: buildPythonPackage rec { pname = "aiohue"; diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index ba32cf7ea69..6db4bbdc314 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }: +{ buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "anyjson"; diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 32314b81edc..584eb3ae2c5 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix index 808ddc57096..20013b8a1ed 100644 --- a/pkgs/development/python-modules/area53/default.nix +++ b/pkgs/development/python-modules/area53/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , boto }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 28b88d3b46a..37d97f42aa1 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, lib, - coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt + dicttoxml, pexpect, prettytable, requests_toolbelt }: buildPythonPackage rec { pname = "argcomplete"; diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index f46efd9f496..ce371076256 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -1,5 +1,4 @@ -{ lib -, cffi +{ cffi , six , hypothesis , pytest diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index fd89457ed31..2fbe4932bed 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six +{ buildPythonPackage, pytest, requests, requests_oauthlib, six , fetchFromGitHub, responses, stdenv }: diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index bc8e375271d..ee15be95418 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -1,7 +1,6 @@ { lib , fetchPypi , buildPythonPackage -, pytestrunner , pythonOlder }: diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix index c3ed7bed742..489a31b3242 100644 --- a/pkgs/development/python-modules/asyncio/default.nix +++ b/pkgs/development/python-modules/asyncio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "asyncio"; diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index 0004badd6f4..187e0924cca 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }: buildPythonPackage rec { pname = "asynctest"; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 1c3c1fdefbe..bf7c35fa698 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }: +{ stdenv, buildPythonPackage, fetchPypi, numpy, future }: buildPythonPackage rec { pname = "autograd"; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index a4a7b63b8a3..6fc3f16b3ad 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi -, buildPythonApplication, isPy27, python, pythonOlder +, buildPythonApplication, python, pythonOlder , mock, nose, pathpy, pyhamcrest, pytest , glibcLocales, parse, parse-type, six , traceback2 diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 240dd5513e8..2a9cb2a2cfd 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }: +{ stdenv, python, fetchPypi, makeWrapper, unzip }: let wheel_source = fetchPypi { diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 791b05e81ca..c9ca8f7ec04 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , nose , numpy diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index 5a9bae58bd6..b5da73a32d2 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , requests diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix index 3bc9882585f..8efb1c083f2 100644 --- a/pkgs/development/python-modules/bz2file/default.nix +++ b/pkgs/development/python-modules/bz2file/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi }: diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index de15ffaabc6..d4b9195c555 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "cachetools"; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 395122b4da9..f85f80ea239 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pyserial diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 99ac6c3ec45..3e07188986d 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , python diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 08ae54e0b73..1afe2341633 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -1,7 +1,5 @@ { lib -, stdenv , buildPythonPackage -, fetchPypi , fetchFromGitHub , nose , can diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix index 2c0b0e623ca..0c636e12088 100644 --- a/pkgs/development/python-modules/cdecimal/default.nix +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }: +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: with stdenv.lib; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 72476942276..3f1456f6e94 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 0e355723604..425a53987ca 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest , coveralls diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index b07a205ba21..cc75649119b 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python +{ stdenv, lib , buildPythonPackage, fetchPypi, isPy3k , filelock, protobuf, numpy, pytest, mock , cupy, cudaSupport ? false diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index f004e6d541c..1c42b1283ee 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest }: diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 7e6cc206cdc..0a82238b703 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , iowait, psutil, pyzmq, tornado, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index e83fd4163e4..967941666c8 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama -, contextlib2 ? null, subprocess32 ? null -, pytest, mock, which, fetchFromGitHub, glibcLocales +, contextlib2 ? null +, pytest, mock, which, glibcLocales }: buildPythonPackage rec { pname = "cmd2"; diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix index 5ffa51def0d..7778e73f92f 100644 --- a/pkgs/development/python-modules/cmd2/old.nix +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +{ stdenv, buildPythonPackage, pythonOlder , pyperclip, six, pyparsing, vim , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix index cfd6389ce5f..bcf32714796 100644 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }: +{ lib, buildPythonPackage, fetchPypi, requests-cache }: buildPythonPackage rec { pname = "coinmarketcap"; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 1ccb31d5120..14bae27592a 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python, stdenv, nose +{ buildPythonPackage, fetchPypi, stdenv }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 6a52076252e..62e63a8e5b3 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ConfigArgParse"; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 8e770c504c3..7bef3e82935 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "configparser"; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index afba2e17bf6..680f6e02cd0 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }: buildPythonPackage rec { pname = "construct"; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 4d2a168f79c..0aa38aed296 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , mock }: diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index 232a4a19fd8..f27cfc44e57 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}: +{stdenv, lib, buildPythonPackage, fetchPypi, bash, which}: buildPythonPackage rec { version = "0.7"; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index e19850be8ce..db48326535d 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }: buildPythonPackage rec { pname = "credstash"; diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index bcab5c43475..6285ac28fce 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchPypi -, cryptography }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 3a3aeb7b226..da742b31050 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildPythonPackage +{ stdenv, buildPythonPackage , fetchPypi, isPy3k, linuxPackages, gcc5 , fastrlock, numpy, six, wheel, pytest, mock , cudatoolkit, cudnn, nccl diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 69a5e8c11d4..67120bf0f3d 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }: +{ stdenv, buildPythonPackage, fetchPypi, ncurses }: buildPythonPackage rec { pname = "cx_Freeze"; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index d01029652a9..47c206fda5e 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub , decorator, requests, simplejson , nose, mock }: diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index fdc408e1c4c..f6af0855b9f 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k +{ lib, fetchPypi, buildPythonPackage , nose , parameterized , mock diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix deleted file mode 100644 index 0808cf4f201..00000000000 --- a/pkgs/development/python-modules/dateutil/1_5.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }: - -buildPythonPackage rec { - pname = "python-dateutil"; - version = "2.7.3"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8"; - }; - - propagatedBuildInputs = [ six ]; - - meta = with stdenv.lib; { - description = "Powerful extensions to the standard datetime module"; - homepage = https://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; -} diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 937b6df4229..e4cd21bce4a 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , chardet, six}: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 6426333ed26..32819536500 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "defusedxml"; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index 6b048db90e3..fa06117a644 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { pname = "django-tagging"; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index dabc3244592..7ce8877bbce 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, openssl, makeWrapper, buildPythonPackage +{ stdenv, fetchPypi, openssl, buildPythonPackage , pytest, dnspython, pynacl, authres, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 27b1a3e6122..20f4bc7e0c3 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: +{ buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "dugong"; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 334778c93aa..97f04828300 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi -, pycrypto, pillow, protobuf, future, ecpy +, pycrypto, pillow, protobuf, future }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index a0a619a39c8..99859ac1517 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: buildPythonPackage rec { pname = "email_validator"; diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index a05ac1ba679..c4d600ec994 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "faulthandler"; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index c5ac67106a2..67ff86e8f72 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }: +{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 2612cfde1f5..eaed804245f 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,5 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six, - fetchurl }: +{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }: buildPythonPackage rec { pname = "flake8-future-import"; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index f4fc3cf3fa2..89cbdf0fbf8 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,5 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic -}: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }: with stdenv.lib; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 17b9d018c39..d9a0682a02e 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchurl , isPy3k , docutils , requests diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix index c09d54ad555..a528244cb0f 100644 --- a/pkgs/development/python-modules/fpdf/default.nix +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fpdf"; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index ca1c9a09e4e..d2e806e43b9 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -4,8 +4,6 @@ , html5lib , wcwidth , nose -, python -, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3faa6d914d2..1b3ab52c4c3 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -5,9 +5,6 @@ , six , scipy , smart_open -, scikitlearn -, testfixtures -, unittest2 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 7f2c7a58229..aa8050de088 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, -pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, +pkgconfig, boost, expat, scipy, cgal, gmp, mpfr, gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, buildPythonPackage }: diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix index 8afe6379dc7..d572b10fd62 100644 --- a/pkgs/development/python-modules/gurobipy/linux.nix +++ b/pkgs/development/python-modules/gurobipy/linux.nix @@ -1,10 +1,7 @@ { fetchurl, python }: assert python.pkgs.isPy27; -let utf = - if python.ucsEncoding == 2 then "16" - else if python.ucsEncoding == 4 then "32" - else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; -in python.pkgs.buildPythonPackage + +python.pkgs.buildPythonPackage { pname = "gurobipy"; version = "7.5.2"; src = fetchurl diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 144e826b675..2b95b1473cb 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage +{ stdenv, fetchPypi, isPy27, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig, unittest2 , mpi4py ? null, openssh }: diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index bbd4760bdf8..5131e64a3c2 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, watchdog, mock }: diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index b7254461183..8337fd2230b 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , requests, six, dateutil }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index d5ee59ac2d9..88705962627 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python +{ lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34 -, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock +, doCheck ? true, pytest, pytest_xdist, flaky, mock }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix new file mode 100644 index 00000000000..49d1062abc3 --- /dev/null +++ b/pkgs/development/python-modules/image-match/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: + +buildPythonPackage { + pname = "image-match"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "ascribe"; + repo = "image-match"; + rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950"; + sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + scikitimage + ]; + + # remove elasticsearch requirement due to version incompatibility + postPatch = '' + substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," "" + ''; + + # tests cannot work without elasticsearch + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ascribe/image-match; + description = "Quickly search over billions of images"; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix index ef2444c0d2f..c67d56b153e 100644 --- a/pkgs/development/python-modules/iowait/default.nix +++ b/pkgs/development/python-modules/iowait/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "iowait"; diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index a91988bd97d..f2066fee2a4 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, pythonOlder # Build dependencies , glibcLocales # Test dependencies @@ -13,7 +12,6 @@ , mock # Runtime dependencies , backports_shutil_get_terminal_size -, jedi , decorator , pathlib2 , pickleshare diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 65d1f4f6822..17896a58469 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,11 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, nose , sphinx , numpydoc -, isPy3k -, stdenv , pytest }: diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index 3a6d69cc829..f11fccb086b 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "jsmin"; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index c934d24dab7..a6a955507a7 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi , ipython diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index dbd2e36b7b8..8598654e206 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi , fetchzip @@ -13,7 +12,6 @@ , traitlets , requests , pythonOlder -, nodejs-8_x , nodePackages }: diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 19169e88b12..a1e795421b0 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kaitaistruct"; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index be59a112be7..3b221238f3a 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, pytestpep8, pytest_xdist , six, numpy, scipy, pyyaml, h5py }: diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 95672600a30..17a6b158d3f 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , pyasn1, pyasn1-modules, pytest , openldap, cyrus_sasl }: diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 58ca72a3dc9..02d10b832ff 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi , pbr, ldap, fixtures, testresources, testtools }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 2fc66e810d0..fc58c6ca6a1 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub -, python, cmake, sip, protobuf, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, cmake, sip, protobuf, pythonOlder }: buildPythonPackage rec { pname = "libarcus"; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 14e83584678..ef01fde2daa 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -8,7 +8,6 @@ , six , nose , Mako -, python , cudaSupport ? false, cudatoolkit , nvidia_x11 , openclSupport ? true, ocl-icd, clblas }: diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index cf0a1a865a1..75e55944e98 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a99d4542ba5..26b42020fc3 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }: +{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index ad6b938c988..4689050ba6c 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, - isPy3k, pythonOlder, lib, requests, diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index c9b9b489613..bc91139728b 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "lmtpd"; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 4a96ce8ad05..ff1a6e49b01 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 5d52b52ac7f..7316526aa28 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index d27637874af..b6d761f077c 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index ccd0eb6cc9f..3f7710acb3c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozfile diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 8569d9287ac..491069cd87f 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , moznetwork diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 7bd14f2d10c..34350dd4821 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 1d1be733f99..6862967e420 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , moznetwork diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index dfe91309ea4..bc4b9e91465 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index a6561d3e07a..3901f7c310d 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index c1e53443260..e8130e8038f 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozinfo diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index c94acdd3ba5..3620248904c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index e9f6177cfa1..324c7c6c2d2 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozdevice diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index d1c799c95de..2ff50e1fa92 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozinfo diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index c9eb12bd52b..dbe3cb4bc2d 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , mozlog diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index e4b2bdefad2..cfb70724210 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask +{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }: diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 3f974872b95..6dbfa1fae60 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six -, fetchPypi, lib +, fetchPypi }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index f689bc2ff49..a3a9096a335 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , cython -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index dfa87c843ff..b167b7f427c 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -13,7 +13,6 @@ , testpath , jupyter_core , nbformat -, nbconvert , ipykernel , pandocfilters , tornado diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 4cc5769d8d8..27fc7d11e75 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -5,7 +5,6 @@ , lxml , libxml2 , libxslt -, pytest , nose , rednose }: diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index af7e4dde59e..e60233c3590 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9645e54f7ec..56edc44bce7 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: +{ fetchurl, buildPythonPackage, lib, six, pythonAtLeast, pythonOlder }: buildPythonPackage rec { version = "3.2.5"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d6531eda2ef..d9e884dabbe 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }: +{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas, hostPlatform }: buildPythonPackage rec { pname = "numpy"; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 3f37940ed8a..474609220cf 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -1,9 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, requests -, nose -, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index 2c0a2c44f6e..c481aa0dfea 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -1,8 +1,6 @@ { buildPythonPackage , fetchPypi -, python , stdenv -, fetchurl , pytest , glibcLocales , cython @@ -23,7 +21,7 @@ }: let - inherit (stdenv.lib) optional optionalString concatStringsSep; + inherit (stdenv.lib) optional optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 08fdddb7346..ef07f2a36e3 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -2,7 +2,6 @@ , fetchPypi , python , stdenv -, fetchurl , pytest , glibcLocales , cython @@ -24,7 +23,7 @@ }: let - inherit (stdenv.lib) optional optionals optionalString concatStringsSep; + inherit (stdenv.lib) optional optionals optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index ac150af4b78..34573626bac 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch +{ stdenv, fetchPypi , buildPythonPackage, pythonOlder , pytest, pytestrunner , parse, six, enum34 diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 18cc23338bf..4092f5e1c4f 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch +{ stdenv, fetchPypi , buildPythonPackage, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 165de7bd2ba..24539c7bbce 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , nose , bcrypt diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 2d1f707a8eb..1ee93c753d8 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, glibcLocales, pandoc, git +, glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator , blinker, pillow, beautifulsoup4, markupsafe }: diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index b861797c4a8..4f2e7f3ca84 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , fetchPypi , zope_interface -, pkgs }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 3f90e6b2da7..5675be32397 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi , plaster, PasteDeploy , pytest, pytestcov }: diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 8c3de8bd035..82aaebb1003 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi , pytest, pytestcov }: diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 0fbfa5108c1..2a6996c628e 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchPypi -, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 5269ecd5d8b..2c6eb7e5fbf 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest }: diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 0ae689034a3..2b00a007f90 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch -, python, substituteAll +, substituteAll }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index f51c6989c01..841e003bc89 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -1,9 +1,6 @@ { lib , fetchurl , buildPythonPackage -, git -, mercurial -, bazaar , psutil , pygit2 }: diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 212c06cc942..18fb14c3aa9 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -2,7 +2,6 @@ , python , buildPythonPackage , fetchFromGitHub -, isPy3k , pytest , python-utils , sphinx diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index eaf353af082..f6b2bfa939c 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "prometheus_client"; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 7fbdfb7c33e..84fe2f69554 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , darwin -, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 6adc1e7ec04..be409e348ea 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub -, cacert , buildPythonPackage, python-jose, pyjwt }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 5fd1be7c15c..fd1866d22f4 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pyyaml , unidecode -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 845630e514f..d4ed6088409 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch -, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, lxml, cssutils, future, enum34, six }: diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index b074f9f4934..23ed4917cc5 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil }: +{ stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }: buildPythonPackage rec { pname = "pycollada"; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index af975e333f0..e7858888d36 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pycryptodome }: +{ buildPythonPackage, pycryptodome }: # This is a dummy package providing the drop-in replacement pycryptodome. # https://github.com/NixOS/nixpkgs/issues/21671 diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index b4ef42cb22a..35041f8447b 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, gmp }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { version = "3.6.2"; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 5a4a81f13ac..b6c9ae5e8ba 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11 +{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype }: diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 08c266da696..916bf7f692d 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch +{ stdenv, buildPythonPackage, fetchurl, isPy27, fetchpatch , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 5271677dc1e..d4c46d6b835 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -1,5 +1,5 @@ { stdenv, castxml, fetchFromGitHub, buildPythonPackage, -llvmPackages, clang }: +llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; version = "1.9.1"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 524fb4af61c..c6264f08de8 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: buildPythonPackage rec { major = "3.26"; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index a0dd6113b75..5af6ef99228 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -12,7 +12,6 @@ , pytest , nose , parameterized -, matplotlib }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix index 1263c498a46..3b7011fa748 100644 --- a/pkgs/development/python-modules/pymvglive/default.nix +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "PyMVGLive"; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index bceb2b50cc5..463cd8044e1 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}: buildPythonPackage rec { pname = "pynacl"; diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 08fc8712795..09b7f386130 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, libvorbis, flac, libogg, libopus, opusfile }: +{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile }: buildPythonPackage rec { pname = "PyOgg"; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 8175ef2b172..55f96416efd 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "pyowm"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ebad81f809b..6a3e3e66e2c 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper +{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig , qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 89799988fa1..280981ab2c2 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -4,7 +4,6 @@ , absl-py , enum34 , future -, futures , mock , mpyq , numpy diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 6681b1b199a..1ffc546cfa1 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }: +{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: buildPythonPackage rec { pname = "PySDL2"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 288b141d32e..ab46c726f6c 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: # This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 4555479af43..3ca4f832c8c 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}: +{lib, buildPythonPackage, fetchPypi, pytest, cram, bash}: buildPythonPackage rec { version = "0.2.0"; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index c2d205f2833..101594750fd 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: +{lib, buildPythonPackage, fetchPypi, pytest, flake8}: buildPythonPackage rec { pname = "pytest-flake8"; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c12d4b8add0..163063ae57f 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }: buildPythonPackage rec { pname = "pytest-mock"; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 38d34a95854..84f337e1b83 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }: +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }: buildPythonPackage rec { pname = "pytest-xdist"; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index f4d87dc035c..e8c71bff18b 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -1,5 +1,4 @@ { lib -, python , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 18162d105ac..962ebbecbaa 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, pythonOlder, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, - fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake, - stdenv, linkFarm, symlinkJoin, + fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, + linkFarm, symlinkJoin, utillinux, which }: assert cudnn == null || cudatoolkit != null; diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix new file mode 100644 index 00000000000..c072b661cc4 --- /dev/null +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, nose +, pytest +, numpy +}: + +buildPythonPackage rec { + pname = "PyWavelets"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9"; + }; + + checkInputs = [ nose pytest ]; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy ]; + + # Somehow nosetests doesn't run the tests, so let's use pytest instead + checkPhase = '' + py.test pywt/tests + ''; + + meta = { + description = "Wavelet transform module"; + homepage = https://github.com/PyWavelets/pywt; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d09a9bbd6d8..159e0ce15fb 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2 +{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2 , m2crypto, ply, pyyaml, six , httpretty, lxml, mock, pytest, requests }: diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index 646308feece..5a55c1f47bb 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -1,4 +1,4 @@ -{lib, fetchurl, python, buildPythonPackage, makeWrapper}: +{fetchurl, python, buildPythonPackage, makeWrapper}: buildPythonPackage rec { pname = "PyXML"; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 26107ea3c4a..4de7777fa8b 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , pytest , tornado diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 174e0871ca2..5f7cded86fd 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "qasm2image"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nelimeee"; repo = "qasm2image"; - rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa"; - sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3"; + rev = "57a640621bbbc74244f07e2e068a26411b0d9b24"; + sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 1eda590a864..0f02560c81f 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -2,8 +2,6 @@ , isPy3k , buildPythonPackage , fetchPypi -, fetchurl -, python , numpy , scipy , sympy @@ -21,13 +19,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.5.4"; + version = "0.5.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf"; + sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17"; }; buildInputs = [ cmake ] @@ -50,13 +48,9 @@ buildPythonPackage rec { # Pypi's tarball doesn't contain tests doCheck = false; - patches = [ - ./setup.py.patch - ]; - meta = { description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications"; - homepage = https://github.com/QISKit/qiskit-sdk-py; + homepage = https://github.com/QISKit/qiskit-terra; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ pandaman diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch deleted file mode 100644 index 9c4224ce64c..00000000000 --- a/pkgs/development/python-modules/qiskit/setup.py.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -18,13 +18,13 @@ from setuptools.dist import Distribution - - requirements = [ - "IBMQuantumExperience>=1.9.2", -- "matplotlib>=2.1,<2.2", -- "networkx>=2.0,<2.1", -- "numpy>=1.13,<1.15", -- "ply==3.10", -- "scipy>=0.19,<1.2", -- "sympy>=1.0,<1.2", -- "pillow>=4.2.1,<5.2" -+ "matplotlib>=2.1", -+ "networkx>=2.0", -+ "numpy>=1.13", -+ "ply>=3.10", -+ "scipy>=0.19", -+ "sympy>=1.0", -+ "pillow>=4.2.1" - ] diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index cdbba180673..badaf9b3787 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , isodate , html5lib diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index de2683595e5..6ea233f695b 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "redis"; version = "2.10.6"; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index a356db74f07..0b3e84c3512 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -1,9 +1,7 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , freetype , pillow -, pip , glibcLocales , python , isPyPy diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 6bd294671de..2286d9c2dc7 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python +{ buildPythonPackage, fetchPypi, python , mock, testrepository, testtools , requests, six }: diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 4cc74431fc8..662045a9ce1 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , cookies, mock, requests, six }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index d9c87918176..ed0bf42ae68 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: +{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: buildPythonPackage rec { pname = "rhpl"; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 7184795639c..d8c43c1ea86 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, hypothesis }: +{ stdenv, buildPythonPackage, fetchPypi, hypothesis }: buildPythonPackage rec { pname = "rubymarshal"; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index ed358213492..c642039d4fe 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython +{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython , chardet, lmtpd, pythondaemon, six, jinja2, mock }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix new file mode 100644 index 00000000000..1a07e001cae --- /dev/null +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, numpy +, scipy +, matplotlib +, networkx +, six +, pillow +, pywavelets +, dask +, cloudpickle +, pytest +}: + +buildPythonPackage rec { + pname = "scikit-image"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "325f75eb80fbc5371136e37f323445309ca9f65b6c6f718d0d0e2189e5de1224"; + }; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle ]; + + checkInputs = [ pytest ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "Image processing routines for SciPy"; + homepage = http://scikit-image.org; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index edaf7cd90cc..39af29da814 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi, python , nose, pillow , gfortran, glibcLocales , numpy, scipy diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5e57dd3f093..41878b19d08 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 1cef1510ccf..0e4b6cfa1e4 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , isPy27 , testfixtures diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 006f52f1d38..8c66df80dc5 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi , boto , boto3 diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 16c1841a3d6..d2a306356b6 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,7 +1,5 @@ { lib -, pkgs , buildPythonPackage -, python , fetchPypi , pythonOlder , html5lib diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 211419f86b1..50d58877b7e 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pytest , mock -, pytest_xdist , isPy3k , pysqlite }: diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 9ac04e18e4f..a122a0c40ec 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , requests, six -, backports_unittest-mock, pluggy, pytest, pytestrunner }: +, backports_unittest-mock, pytest, pytestrunner }: buildPythonPackage rec { pname = "sseclient"; diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix index 3c650bd60dd..7a93d64a89f 100644 --- a/pkgs/development/python-modules/syncserver/default.nix +++ b/pkgs/development/python-modules/syncserver/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , isPy27 , unittest2 diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index c56a5d7889f..9f8087a305d 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi , setuptools_scm , six, pytz}: diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 21b21f174d0..4e3621157f9 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, isPy35, isPy36, pythonOlder +, isPy3k, isPy36, pythonOlder , astor , gast , numpy diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 628be2e946a..1e35d95c5e1 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, mock, manuel, pytest, sybil, zope_component, django }: +, mock, manuel, pytest, sybil, zope_component }: buildPythonPackage rec { pname = "testfixtures"; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index d4243024821..9b22ad3e545 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -4,7 +4,6 @@ , fetchPypi , cachetools , cld2-cffi -, cython , cytoolz , ftfy , ijson diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 0ffaf315d54..0ced52c7ba1 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, lib }: +{ fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { version = "3.9.2"; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index b5812820023..88e6c8d1674 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, pkgs , buildPythonPackage , fetchPypi , pythonOlder @@ -11,7 +10,6 @@ , msgpack-python , preshed , numpy -, python , murmurhash , pathlib , hypothesis diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index b55c42cfa56..edc4bbdebb1 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ fetchPypi, buildPythonPackage , semantic-version, boto3, flask, docutils, requests }: diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 829d7bcfcb2..6f3eae60c63 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage , requests }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index c6efe5ba239..44fcb9b46ff 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , fetchgit , testfixtures , cornice diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 359f13e2a00..4ceeb026634 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi , py , virtualenv diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 87fa393ce5e..0b77f706801 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -5,8 +5,6 @@ , coverage , glibcLocales , flake8 -, matplotlib -, pandas }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0cfc8c3e14a..5bd0f5f81d2 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; version = "1.1.0"; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 3bb75fb2ac2..8320500fc14 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, tzlocal, pytz }: +, pytz }: buildPythonPackage rec { pname = "tzlocal"; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index 235f33da599..42588347c85 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "UkPostcodeParser"; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 276ed481601..eb2fa2bd042 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, cmake +{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index ab4ce1be2b1..805941cab60 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -7,7 +7,6 @@ , contextlib2 , wrapt , pytest -, httpbin , pytest-httpbin , yarl , pythonOlder diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index c152271af33..ef6089baa50 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , mock , boto3, envs, python-jose, requests }: diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index b2ce75c43c3..32145623e4d 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index e98fcf205fd..c3ac5b51cb0 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34 }: +{ buildPythonPackage, fetchPypi, h11, enum34 }: buildPythonPackage rec { pname = "wsproto"; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 039a751a5e1..a9041f9a76f 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,7 +5,6 @@ , numpy , pandas , python -, fetchurl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 9b53c180397..d9b8fc892c1 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -3,30 +3,28 @@ , nose , scipy , xgboost +, substituteAll }: buildPythonPackage rec { pname = "xgboost"; inherit (xgboost) version src meta; - propagatedBuildInputs = [ scipy ]; - checkInputs = [ nose ]; - - postPatch = let - libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}"; + patches = [ + (substituteAll { + src = ./lib-path-for-python.patch; + libpath = "${xgboost}/lib"; + }) + ]; - in '' - cd python-package + postPatch = "cd python-package"; - sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py - sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py - cat <<EOF >xgboost/libpath.py - def find_lib_path(): - return ["${xgboost}/lib/${libname}"] - EOF - ''; + propagatedBuildInputs = [ scipy ]; + buildInputs = [ xgboost ]; + checkInputs = [ nose ]; - postInstall = '' - rm -rf $out/xgboost + checkPhase = '' + ln -sf ../demo . + nosetests ../tests/python ''; } diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch new file mode 100644 index 00000000000..68b39dee53e --- /dev/null +++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch @@ -0,0 +1,59 @@ +diff --git a/python-package/setup.py b/python-package/setup.py +index e6c3386f..4ed0a8bd 100644 +--- a/python-package/setup.py ++++ b/python-package/setup.py +@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py') + libpath = {'__file__': libpath_py} + exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath) + +-LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()] +-print("Install libxgboost from: %s" % LIB_PATH) + # Please use setup_pip.py for generating and deploying pip installation + # detailed instruction in setup_pip.py + setup(name='xgboost', +@@ -35,7 +33,6 @@ setup(name='xgboost', + # this will use MANIFEST.in during install where we specify additional files, + # this is the golden line + include_package_data=True, +- data_files=[('xgboost', LIB_PATH)], + license='Apache-2.0', + classifiers=['License :: OSI Approved :: Apache Software License'], + url='https://github.com/dmlc/xgboost') +diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py +index d87922c0..859a30fb 100644 +--- a/python-package/xgboost/libpath.py ++++ b/python-package/xgboost/libpath.py +@@ -19,32 +19,4 @@ def find_lib_path(): + lib_path: list(string) + List of all found library path to xgboost + """ +- curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) +- # make pythonpack hack: copy this directory one level upper for setup.py +- dll_path = [curr_path, os.path.join(curr_path, '../../lib/'), +- os.path.join(curr_path, './lib/'), +- os.path.join(sys.prefix, 'xgboost')] +- if sys.platform == 'win32': +- if platform.architecture()[0] == '64bit': +- dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/')) +- # hack for pip installation when copy all parent source directory here +- dll_path.append(os.path.join(curr_path, './windows/x64/Release/')) +- else: +- dll_path.append(os.path.join(curr_path, '../../windows/Release/')) +- # hack for pip installation when copy all parent source directory here +- dll_path.append(os.path.join(curr_path, './windows/Release/')) +- dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path] +- elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): +- dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path] +- elif sys.platform == 'darwin': +- dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path] +- +- lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)] +- +- # From github issues, most of installation errors come from machines w/o compilers +- if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False): +- raise XGBoostLibraryNotFound( +- 'Cannot find XGBoost Library in the candidate path, ' + +- 'did you install compilers and run build.sh in root path?\n' +- 'List of candidates:\n' + ('\n'.join(dll_path))) +- return lib_path ++ return ["@libpath@/libxgboost.so"] diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index f8f933b96ab..79f6ddca543 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19"; }; - patches = [ ./skip-broken-test.patch ]; + patches = [ ./skip-broken-test.patch ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch new file mode 100644 index 00000000000..6b3d3266b21 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch @@ -0,0 +1,24 @@ +From 43fd87037be1c98b6afa20f179f2e2d8ef5491ba Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Fri, 20 Jul 2018 10:07:22 -0500 +Subject: [PATCH] remove test that fails w/musl (setlocale() always succeeds) + +--- + ZConfig/tests/test_datatypes.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ZConfig/tests/test_datatypes.py b/ZConfig/tests/test_datatypes.py +index 7c8d80c..addecd2 100644 +--- a/ZConfig/tests/test_datatypes.py ++++ b/ZConfig/tests/test_datatypes.py +@@ -229,7 +229,6 @@ class DatatypeTestCase(unittest.TestCase): + convert = self.types.get("locale") + # Python supports "C" even when the _locale module is not available + self.assertEqual(convert("C"), "C") +- self.assertRaises(ValueError, convert, "locale-does-not-exist") + + def test_datatype_port(self): + convert = self.types.get("port-number") +-- +2.18.0 + diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 418fcebaefd..f283479c8de 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -19,7 +19,6 @@ , pytest , pytestcov , requests-mock -, testtools , tornado }: diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 9aab2ba9e84..c23f332638d 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchPypi , buildPythonPackage -, isPy3k , zope_testrunner , transaction , six diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index e2bf3a569d0..a4988332b22 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, fetchpatch , zope_interface , zope_exceptions , zope_testing diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 68ab42a76dd..acaee897d93 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -47,11 +47,11 @@ let "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; }; deriveBiocAnn = mkDerive { - mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; }; deriveBiocExp = mkDerive { - mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; }; deriveCran = mkDerive { diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 16f1abe1a89..f902ca58c38 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -61,7 +61,7 @@ let else name; - copyIfBundledByPath = { bundledByPath ? false, ...}@main: + copyIfBundledByPath = { bundledByPath ? false, ...}: (if bundledByPath then assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/ else "" diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index 85e93959e4b..b8e666a92f9 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -22,9 +22,9 @@ rec { else gemset; }; - filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; + filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; - platformMatches = {rubyEngine, version, ...}@ruby: attrs: ( + platformMatches = {rubyEngine, version, ...}: attrs: ( !(attrs ? "platforms") || builtins.length attrs.platforms == 0 || builtins.any (platform: diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix index ee3754595f3..7c5932c4e76 100644 --- a/pkgs/development/ruby-modules/bundled-common/test.nix +++ b/pkgs/development/ruby-modules/bundled-common/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs: +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }: let testConfigs = { inherit lib; diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix index 63da7044c0c..e42f1bf2571 100644 --- a/pkgs/development/ruby-modules/bundler-env/test.nix +++ b/pkgs/development/ruby-modules/bundler-env/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs: +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}: let bundlerEnv = callPackage ./default.nix stubs // { basicEnv = callPackage ../bundled-common stubs; diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 2f9a8223832..b1d0b76f086 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, makeWrapper, ruby, coreutils }: +{ buildRubyGem, ruby }: buildRubyGem rec { inherit ruby; diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index 83f1dddeeb6..39520fdb0ba 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, ruby }: +{ lib, bundlerApp }: bundlerApp rec { pname = "solargraph"; diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix index 3585681478c..7e6d1102f66 100644 --- a/pkgs/development/ruby-modules/testing/stubs.nix +++ b/pkgs/development/ruby-modules/testing/stubs.nix @@ -1,8 +1,5 @@ { stdenv, lib, ruby, callPackage, ... }: let - real = { - inherit (stdenv) mkDerivation; - }; mkDerivation = {name, ...}@argSet: derivation { inherit name; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 30d82aca83a..fb0f7414841 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }: +{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }: let name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index b174d6c069b..b9b9b8abfb9 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl, +{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl, gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 131533896ff..cbcfa981b6b 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: +{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.13.0"; diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 5bda2d945eb..19609e15c76 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub , arrow, futures, logfury, requests, six, tqdm }: diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 953a10ca47a..5f2e9b5f440 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils, cmake, zlib, fetchFromGitHub }: +{ stdenv, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2018-06-15"; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index a98c2b4e04b..52fec3f131b 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "bazel-buildtools"; + name = "bazel-buildtools-unstable-${version}"; version = "2018-05-24"; goPackagePath = "github.com/bazelbuild/buildtools"; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 96e9d0f9a43..50b1d09ef93 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -2,7 +2,7 @@ let baseName = "bloop"; - version = "1.0.0-M11"; + version = "1.0.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -16,12 +16,12 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1"; + outputHash = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh"; }; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; - nailgunCommit = "60c2d130"; + nailgunCommit = "0c8b937b"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 5d486f47844..2260f083b71 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }: +{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "buck-${version}"; - version = "v2017.10.01.01"; + name = "buck-unstable-${version}"; + version = "2017-10-01"; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 3729abfe247..adb279cdea6 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: +{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: let withPlugins = plugins: runCommand "wrapped-${package.name}" { diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index f6da92fe621..c61bf3287db 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 +{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps , buildPlatform, hostPlatform }: diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9ff32f1b348..e77647b2fed 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, python }: +{ lib, python }: let newPython = python.override { packageOverrides = self: super: { diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 52e29acc9d8..b9a8c97bd5e 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }: +{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: let diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f810f97ef49..f5ca69e59c8 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.8.1"; + name = "gradle-4.9"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg"; + sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; }; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index c0af0192978..2ccd6637d08 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let +{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix index 5da32f2334a..c394d87e09e 100644 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ b/pkgs/development/tools/build-managers/nant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper , targetVersion ? "4.5" }: let diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 38a197aa900..1ad52f327e1 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, runCommand, curl }: +{ stdenv, pythonPackages }: with stdenv.lib; with pythonPackages; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index ff6dc07ea9e..d9e260a13de 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,6 +1,6 @@ -{ stdenv, writeText, callPackage, fetchurl, +{ stdenv, fetchurl, fetchHex, erlang, hermeticRebar3 ? true, - tree, fetchFromGitHub, hexRegistrySnapshot }: + tree, hexRegistrySnapshot }: let version = "3.6.1"; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index d3842a39f18..4b0242a3956 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, fetchurl, fetchpatch, python2Packages }: +{ stdenv, fetchurl, python2Packages }: let name = "scons"; in python2Packages.buildPythonApplication { diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index f52d53526fa..3bd31523412 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,4 +1,4 @@ -{ callPackage, stdenv }: +{ callPackage }: let mkScons = args: callPackage (import ./common.nix args) { }; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 000943f117f..e86d61cf6c9 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2 }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "waf-${version}"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 2dca2b6cd42..95ee4e93f2a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +{ stdenv, buildGoPackage, fetchFromGitHub , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , go-md2man }: diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f42adffc5f4..603b155ee4f 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub , pythonPackages -, pkgconfig , cmake , llvmPackages , withMan ? true diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index df06793eaec..1d81d469eb2 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }: +{ lib, bundlerEnv, ruby_2_4, perl, autoconf }: bundlerEnv { # Last updated via: diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index f96d3e810ca..3e3e239fbfb 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby }: bundlerEnv { name = "compass-1.0.3"; diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 8d43736d3a8..b2b903b095c 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: with lib; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index e3c8d7ed014..7e660f3fcd9 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildCommand = '' install -Dm555 $src $out/bin/coursier + patchShebangs $out/bin/coursier wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ''; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 7f66317167a..46104e78d1d 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact +{ stdenv, fetchurl, jre, makeWrapper , mysqlSupport ? true, mysql_jdbc ? null }: assert mysqlSupport -> mysql_jdbc != null; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9a7a600d134..b101e52aad9 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "delve-${version}"; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 905314efe5a..26d96a64126 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , pythonPackages , glibcLocales , devpi-server diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 6823ae3372c..f3ade82e52e 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,4 @@ - { stdenv, pythonPackages, glibcLocales, nginx }: + { stdenv, pythonPackages, nginx }: pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index f6920a83e09..7e8a4159072 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool -, makeWrapper, python2Packages }: +{fetchurl, pkgconfig, libxml2Python, libxslt, intltool +, python2Packages }: python2Packages.buildPythonApplication { name = "gnome-doc-utils-0.20.10"; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 32025edb306..8ec6aec9918 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Make six available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. postInstall = '' - ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/ + ln -s ${python.pkgs.six}/${python.sitePackages}/* $out/share/gtk-doc/python/ ''; doCheck = false; # requires a lot of stuff diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 253f5b374d3..de9fb82f66f 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/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 = "easyjson-unstable-${version}"; diff --git a/pkgs/development/tools/egg2nix/chicken-eggs.nix b/pkgs/development/tools/egg2nix/chicken-eggs.nix index 4ec9e0daa47..1f786f127c9 100644 --- a/pkgs/development/tools/egg2nix/chicken-eggs.nix +++ b/pkgs/development/tools/egg2nix/chicken-eggs.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv }: +{ pkgs }: rec { inherit (pkgs) eggDerivation fetchegg; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 38432e58d0d..695a532305a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: let version = "1.8.2"; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 3dc0d3fca88..a89861faebb 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ]; + buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix index 082edb37a4f..e21749f90d0 100644 --- a/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildRebar3, buildHex, +{ fetchFromGitHub, buildRebar3, # Erlang dependencies: ibrowse_4_2_2, diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index df14c29c372..9bbdc8c8334 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex +{ stdenv, buildHex , getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }: diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index d6cc527e641..18367d14f6e 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }: +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { name = "fac-${version}"; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 3d4d542d2f9..4c67a45d8c3 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, man }: +{ stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { name = "git-ftp-${version}"; version = "1.5.1"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 4b87e74a630..9a783deecee 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-bindata-${version}"; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index fe159c85c3d..5e1cd03e0af 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "go-outline-${version}"; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index e47b84354d6..52cd37f9885 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-repo-root-${version}"; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index 9a8b592b038..38ceea7d417 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-symbols-${version}"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 2501c36dd5c..a20e1658988 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gocode-${version}"; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index e4ef9d26da2..fcdb56460e1 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "goconvey-${version}"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 6644c8fcfc4..3227ed8eec2 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "godef-${version}"; diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix index 5c69f34e28b..14c319320d0 100644 --- a/pkgs/development/tools/goimports/default.nix +++ b/pkgs/development/tools/goimports/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "goimports-${version}"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 99f049314ae..a617e582c98 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "lint-${version}"; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index f1452bc1211..86b7246b411 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gomodifytags-${version}"; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 298657fe38c..ea9c92c0d0a 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gopkgs-${version}"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index ad22d4ea407..b8230561fb4 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gotags-${version}"; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index ccdab780e6c..6c8270f8598 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotests-${version}"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index e9a7e7ac891..05e87d08460 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, go, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gotools-${version}"; - version = "20170807-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "5d2fd3ccab986d52112bf301d47a819783339d0e"; + name = "gotools-unstable-${version}"; + version = "2018-07-20"; + rev = "be728107ea8275e6f58ba07e246b94181acaab24"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn"; + sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix index d4be771e8d6..e85fb120101 100644 --- a/pkgs/development/tools/gotools/deps.nix +++ b/pkgs/development/tools/gotools/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + rev = "0ed95abb35c445290478a5348a7b38bb154135fd"; + sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl"; }; } ] diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index a80f1569329..440b5e2eb0b 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "govers-${version}"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 65bc55c6d8d..69b20dd3a17 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gox-${version}"; diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 31697750a70..a2a049615b7 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }: +{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }: let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix index ff82127f0c4..47a9c550fa8 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/server.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -3,7 +3,7 @@ let hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); in stdenv.mkDerivation { - name = "hyper-haskell-server-with-packages"; + name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index edf967f7d11..5e372b4f387 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,4 +1,4 @@ -{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages +{ lib, haskellLib, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix index fb91015e10c..f1c754ddff9 100644 --- a/pkgs/development/tools/haskell/leksah/default.nix +++ b/pkgs/development/tools/haskell/leksah/default.nix @@ -3,7 +3,7 @@ let leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]); in stdenv.mkDerivation { - name = "leksah"; + name = "leksah-${leksahEnv.version}"; buildInputs = [ gtk3 ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 88c4fc14a66..30dd7f21791 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -1,6 +1,6 @@ { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty -, tasty-golden, transformers, fetchFromGitHub, fetchpatch +, tasty-golden, transformers, fetchFromGitHub }: mkDerivation { diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index 6511bdd2010..905580482d4 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth }: +{ stdenv, fetchFromGitHub, python, pcsclite, pth }: stdenv.mkDerivation rec { pname = "hexio"; diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index e71e296212c..b2c764c5a85 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: +{ stdenv, makeWrapper, requireFile, gcc, unzip }: with stdenv.lib; # v2.1: last version with NHM/WSM arch support diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index af738bc71a9..34b9e1df190 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, patchelf, unzip }: +{ stdenv, requireFile, unzip }: with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index e2aa27a96eb..b6a78071bc8 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, llvmPackages, irony }: +{ stdenv, cmake, llvmPackages, irony }: stdenv.mkDerivation rec { name = "irony-server-${version}"; diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index dd0379e83a7..c53d6608efd 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "jmespath-${version}"; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index d46f7b3e883..e8e8acd6a9a 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, jmespath }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "jp-${version}"; diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix index d53b3902133..694428f55a6 100644 --- a/pkgs/development/tools/json2hcl/default.nix +++ b/pkgs/development/tools/json2hcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "json2hcl"; diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index 11f4a5c8bd0..af5c0e9c2f9 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: with lib; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 9e41ef38131..afac17b5251 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "leaps-${version}"; diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix index 8adea820ec7..58f50dd2f7e 100644 --- a/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { name = "librarian-puppet-go-${version}"; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index c4df52da170..a5dd0a88272 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "manul-unstable-2016-09-30"; diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 660917ee9f1..265d425bbcf 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { name = "autogen-${version}"; diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index affc400a9ed..6646b847252 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: +{ stdenv, fetchurl, perl, autoconf, doCheck ? false }: stdenv.mkDerivation rec { name = "automake-1.16.1"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0b71c6719dc..2badd0ed26a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages , fetchurl, zlib, autoreconfHook264 -, buildPlatform, hostPlatform, targetPlatform +, hostPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: @@ -10,7 +10,7 @@ let # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 version = "2.30"; basename = "binutils-${version}"; - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index ab84cb37656..2d7225ee03e 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, bash, libftdi +, gcc-arm-embedded, libftdi , python, pythonPackages }: diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 51610349c45..6519f349bfc 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cscope, tk, makeWrapper }: +{ fetchurl, stdenv, tk, makeWrapper }: stdenv.mkDerivation rec { name = "cbrowser-0.8"; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 34d1d8a829b..c5cb277c256 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: +{ stdenv, fetchurl, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index bf979767126..0b86deb5205 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ fetchFromGitHub, makeWrapper , cmake, llvmPackages, ncurses }: let diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 4df04f44f56..75ae9f1ba8b 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,4 +1,4 @@ -{ pkgs, ctags, writeScriptBin }: +{ pkgs, ctags }: with pkgs.stdenv.lib; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index b734eadae90..d9fab774b76 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,15 +1,13 @@ { fetchurl, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.6"; + name = "dejagnu-1.6.1"; src = fetchurl { url = "mirror://gnu/dejagnu/${name}.tar.gz"; - sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0"; + sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz"; }; - patches = [ ./wrapped-runtest-program-name.patch ]; - buildInputs = [ expect makeWrapper ]; doCheck = true; diff --git a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch deleted file mode 100644 index d745bc65cbb..00000000000 --- a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch +++ /dev/null @@ -1,15 +0,0 @@ -This patch gives `runtest' a `$0' that contains `runtest' instead -of `.runtest-wrapped'. This is required because `runtest' checks -what `$0' looks like to determine the target. - ---- dejagnu-1.4.4/runtest 2003-08-17 03:27:59.000000000 +0200 -+++ dejagnu-1.4.4/runtest 2010-03-18 15:57:58.000000000 +0100 -@@ -10,6 +10,7 @@ - # Get the execution path to this script and the current directory. - # - mypath=${0-.} -+mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`" - if expr ${mypath} : '.*/.*' > /dev/null - then - : - diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 82b224b37f4..591254c73f5 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, ncurses, gettext +{ stdenv, fetchurl, ncurses , withLibrary ? false, libtool , unicodeSupport ? true }: -let optional = stdenv.lib.optional; - optStr = stdenv.lib.optionalString; +let optStr = stdenv.lib.optionalString; buildShared = !stdenv.isDarwin; in diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 4d8a9b05847..a1f33fdfc9e 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, findutils # for xargs + # for xargs , gettext , libtool , makeWrapper diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 12d3f97dfc4..29bf92d2b6e 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -4,14 +4,14 @@ let in python27Packages.buildPythonApplication rec { pname = "gdbgui"; - version = "0.11.1.2"; + version = "0.13.0.0"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7"; + sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix index 13978645c29..273f9db0c39 100644 --- a/pkgs/development/tools/misc/gdbgui/requirements.nix +++ b/pkgs/development/tools/misc/gdbgui/requirements.nix @@ -11,7 +11,7 @@ let inherit (pkgs) makeWrapper; - inherit (pkgs.stdenv.lib) fix' extends inNixShell; + inherit (pkgs.stdenv.lib) fix' extends; pythonPackages = import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 296d9673d8f..f0f21f8f4d5 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, makeWrapper -, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags, pkgconfig +, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags }: stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 4fdd017306a..cf516b16f4b 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,9 +1,9 @@ { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc +, guile, perl, postgresql, nukeReferences, git, boehmgc , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, fetchpatch, pixz }: +, rpm, dpkg, cdrkit, pixz }: with stdenv; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 08729f6b41b..d92b20a12b0 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, autoreconfHook, utilmacros, gnome2 }: +, procps, utilmacros, gnome2 }: stdenv.mkDerivation rec { name = "intel-gpu-tools-1.22"; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 71bc3b87a7a..27f49ebcf38 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "linuxkit-${version}"; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 9205f6caf0d..017c6ad8049 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitLab }: +{ stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { name = "loccount-${version}"; version = "1.2"; diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 208f0ebd411..23b7119e7d7 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix index e6f7ac3290b..c45e7841d45 100644 --- a/pkgs/development/tools/misc/moby/default.nix +++ b/pkgs/development/tools/misc/moby/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, go, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "moby-${version}"; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 219281f4ec1..7235af49c2e 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, libiconv, vanilla ? false }: +{stdenv, fetchurl, libiconv, vanilla ? false }: with stdenv.lib; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 3da98f38ebc..553ded815ef 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "stm32flash-0.5"; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 9b4fd05dc0a..48a2e7bd2cb 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 4263b80789a..d6c5256ca84 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb, fetchgit }: +{ stdenv, unzip, libusb, fetchgit }: let version = "2.1"; in diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index c8747e66e39..11caf8e7b20 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, conduit, magic-mime, tzdata +, cohttp, conduit, magic-mime }: assert stdenv.lib.versionOlder "4.02" ocaml.version; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index dea1ab2a445..6a34c1c130d 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }: +{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: let version = "0.9.1"; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index f09dbfdb165..df7630e2d16 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap +, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: let bits = if stdenv.system == "x86_64-linux" then "x64" diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index fc1513ecf34..6840bcac0dc 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap +, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig +, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify -, ffmpeg, libxcb, libXScrnSaver, cups +, ffmpeg, libxcb, cups , sqlite, udev }: let diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 7cdf7dc9396..7c7bf79acc7 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }: +{ stdenv, fetchurl, ocaml, writeText }: let pname = "camlidl"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 6d269552f62..79801304595 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9"; + sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv"; }; buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 31a5c3ea17b..5ec8cca344d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx , ocaml-migrate-parsetree, ppx_tools_versioned -, js_of_ocaml, ocaml_lwt +, js_of_ocaml, ocaml_lwt, lwt_log }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; - propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ]; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; buildPhase = "jbuilder build -p js_of_ocaml-lwt"; } diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index aa9feda985a..73b7da119ab 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchurl, makeWrapper, +{ stdenv, lib, fetchurl, makeWrapper, ocaml, unzip, ncurses, curl, aspcud }: diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 340c57f2817..74f450a9e3a 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder , lambdaTerm, cppo, makeWrapper }: diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 287bb8beb52..469e64acff0 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }: +{ stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.5"; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 27596878f34..86c1f82678a 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, glib, pkgconfig, python, scons, pythonPackages }: +{ stdenv, fetchgit, glib, pkgconfig, python, scons }: stdenv.mkDerivation rec { name = "hammer-${version}"; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 3c062dbe1ab..949d798f7e8 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -5,24 +5,6 @@ }: let - fakeXcrun = writeScriptBin "xcrun" '' - #!${stdenv.shell} - echo >&2 "Fake xcrun: ''$@" - args=() - while (("$#")); do - case "$1" in - -sdk*) shift;; - -find*) shift;; - *) args+=("$1");; - esac - shift - done - - if [ "''${#args[@]}" -gt "0" ]; then - echo >&2 "Fake xcrun: ''${args[@]}" - exec "''${args[@]}" - fi - ''; fakeClang = writeScriptBin "clang" '' #!${stdenv.shell} if [[ "$@" == *.c ]]; then diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 614ffe5e218..624866ea9e3 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/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 = "quicktemplate-unstable-${version}"; diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 88c975b5735..55797948a84 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }: +{ lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { name = "redis-dump-0.3.5"; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index a2c75a02aa2..da3b27ebacc 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs, pkgconfig }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: stdenv.mkDerivation rec { name = "rtags-${version}"; diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 850fb5ad7f5..2b9792e4df2 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerEnv, ruby, makeWrapper }: +{ lib, bundlerEnv, ruby }: bundlerEnv rec { pname = "rubocop"; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index 370318d1ff2..50c890e3c47 100644 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform }: with rustPlatform; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 3b1e8c2c8a7..48bfbdd689b 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg +{ stdenv, fetchurl, makeWrapper, jre , htmlunit-driver, chromedriver, chromeSupport ? true }: with stdenv.lib; @@ -6,9 +6,6 @@ with stdenv.lib; let minorVersion = "3.6"; patchVersion = "0"; - arch = if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "i686-linux" then "i386" - else ""; in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 041aee7a1c5..534c69200e0 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}: +{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index f6687f4e432..a3499258a99 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }: +{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { name = "textql-${version}"; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 0db25f88d76..ab90bb27bd5 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, python3Packages, stdenv }: +{ fetchFromGitHub, lib, python3Packages }: with python3Packages; diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 2a4ddaf8039..0fbcd7b71a6 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "vndr-${version}"; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index da2612415ba..d6d5d6d3ea6 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index b99780d4138..17c64f0548b 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "ws-${version}"; diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index f8b1c1bf31e..77ef8565a34 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand +{ lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics , targetPlatform , xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX" @@ -7,8 +7,6 @@ let - inherit (lib) toLower; - toolchainName = "com.apple.dt.toolchain.XcodeDefault"; sdkName = "${xcodePlatform}${sdkVer}"; diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix index d585a35b0bc..4d62f5b8571 100644 --- a/pkgs/development/tools/xib2nib/default.nix +++ b/pkgs/development/tools/xib2nib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }: +{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: stdenv.mkDerivation { name = "xib2nib-730e177"; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index 52231d0a831..a08e01a48b7 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: +{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }: buildPythonApplication rec { pname = "yq"; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 0220fbd8df8..e63f609fc2b 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "minify-${version}"; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index c51e1595ee7..cbe7d3da8aa 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, udev, makeWrapper, makeDesktopItem }: +{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "postman-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildPhase = ":"; # nothing to build icon = fetchurl { - url = "https://www.getpostman.com/img-rebrand/logo.png"; - sha256 = "0jdhl9c07b1723j2f172z3s5p5lh8sqa1rcvdzz3h6z5zwn21g7v"; + url = "https://www.getpostman.com/img/v2/media-kit/Logo/PNG/pm-logo-horiz.png"; + sha256 = "271b88317bd787f4a30ab374148e73314d60fb1b220ef791611774a061c49f30"; }; desktopItem = makeDesktopItem { |