diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:14:41 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:14:41 +0200 |
| commit | 3209775495eef54ed5c61592ff302dab002f8825 (patch) | |
| tree | 3a9ff53ad1b7c8ea6db32f5f081a6f64079d6b9a /pkgs/development | |
| parent | 610485faa7f8c043482c4a9c030938ed315557e5 (diff) | |
| parent | 6c72782d364149c7cfea1ea69fdbc1133acc80b5 (diff) | |
Merge master into staging
Diffstat (limited to 'pkgs/development')
814 files changed, 3465 insertions, 3288 deletions
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index dfdd8141aaaa8..45186914604dd 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 83de6f9e56975..f10c8ec86ff90 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 d6b83cb1af04e..db40c47794fa3 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 968c845a01196..ec5e08ffda402 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 58247e5aeb533..2a14a997e57da 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 6bfb71a9627d9..6ff2028e3c16e 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 b7c310cf01d2a..e44c21abe9460 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 e7cb7495c90e0..f16be1b28225f 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 8ed34cf9d1e04..6a8d5f11b75c0 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 8e268aa7eb744..e03039cb5e14e 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 5317cf25d41ba..06acebd2ba4a8 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 ce1987866007e..4dab2e06f48e8 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 202e552542223..72530f99cdbcc 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 93f1d9184b4d8..77e8fb51602cb 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 545bece12c488..169ddb5a6a310 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 75259ed398344..943391611de19 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 27164176b532d..bf3b192e1bbda 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 eeeabe301d135..0564329967e56 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 e5c77568a0ede..50d55aef23423 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 d671743ee629e..0c51868aef8da 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 e8c03c382308b..38d8bcd83cf59 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 4e69d7e0408c6..124fdbcdf9d44 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 2a80eccfb4036..71a6eaa8db8de 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 0e4d5bed0514c..f503427b326eb 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 5609de15d4cb0..0ce9fbb00e2e8 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 2a906d918aa35..0cf3a4cb12b48 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 8062e93df549d..7671fcdb0252e 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 d740a7ee673b8..c24cdeb43bfd2 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 182afa6b3496e..c93fb1fd9b227 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 522ad32e69f4f..ae22e1f1e4062 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 4c1e5d986dcf7..2824ce669ee62 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 57d9fccd266b9..df1394e4a24b8 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 f09a577110b76..46e9d8d72bed2 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 b4fa005c3de85..513d0307f6bf4 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 8ef528e2c92ae..d46e40f460b17 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 7944674437151..52a49c519b399 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 afeef2b3637cb..0a974fccc888b 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 7f1830430c45b..a6955c030519f 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 9c4b38f87dedc..e64c0c912d947 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 7aedf191abee0..a5d6247ffdc7e 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 cff6c1c446f14..e503b7a92ce48 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 49bbaf0e8df11..fcf486b3b41a3 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 b5a3a8c6be2d2..a504dc2ea463d 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 48301a8f28740..dc6a933a93459 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 0b29b04825a10..25bb082841424 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 96d4f9f558c8c..d54ffd96382d1 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 1bd4b88c72d48..f176894dedb9f 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 1654914ff8c4c..98b6f4adbbf68 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 28f908ee829f0..99869e6e80a74 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 a6fb611981760..8cfcb1af43d4e 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 ea3ea36eb6d36..01c08f4bd2091 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 458ad7db8efde..c974eb6f6d395 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 ae674d1fa8e8d..75037f6a07db1 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 6ce9c0d4792b4..2b543b9d793ab 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 776109ee74d18..21b0c1c3601c1 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 e9140d3fcc6aa..514c3a006e38a 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 0bdf5c71e1f3a..a8a6b3dfea874 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 07738048f8e25..5fd0271f0261d 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 ef2e1c29088fd..00b0083108b5a 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 5492e12da98c0..c7b4615e374a2 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 05801f2f08f07..9a47435cf140d 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 31750e2d0da82..68eebc33c6b90 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 5c2b7501f9798..901015bf2ff4a 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 8821441840647..840567496785f 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 66f0facc952cb..141daa88dcffd 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 c1f0b9f61294b..1f87cb83ab01d 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 818ad47a335af..1e68276945ecc 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 6fc448574f43d..a86f5b5039e75 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 16093758e8264..908a5f1218f76 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 58fb0ca22d7c5..63e5b50c3d472 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 cdf201cec7ad0..9ce7c9166bca7 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 f13883db74ff9..892ae99abaf53 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 f80cffe220ea9..9a3ccd1fd861c 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 7c9918cdd3974..2bba660b69cd6 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 c3ba316cd13bb..f445127c0da85 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 d10d6e3e60532..53820c97b1b03 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 31e86f94c0a26..acebb4beef6a3 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 6db9e19807bbc..7b5008fd04c2e 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 9eec23f1ba88f..21ccf77e4a24a 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 774cefb794041..f5bd3430ae707 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 16d7e2580b38e..e6c6889403685 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 7ed493fe92e96..6e8d9003bf431 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 3c29df7ec78e8..612f0db058215 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 b93a13abc9cac..de063500b7096 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 bdd367ef35238..55faf277b1595 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 901eea0f8f157..55faf277b1595 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 94b89cf3a952a..6038826534803 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 4c3c5d008f061..488d43a6fea4f 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 46caabf33917c..2ff3257c7fb73 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 b0dae9d2042aa..f3f9e2f57b728 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/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index ec93ba79d44ab..f74299334535a 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }: +{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, gputils ? null +, excludePorts ? [] }: + +with stdenv.lib; + +let + # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 + excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]); +in stdenv.mkDerivation rec { - version = "3.7.0"; name = "sdcc-${version}"; + version = "3.7.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5"; }; - # TODO: remove this comment when gputils != null is tested - buildInputs = [ bison flex boost texinfo gputils ]; + buildInputs = [ autoconf bison boost flex gputils texinfo ]; - configureFlags = '' - ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} - ''; + configureFlags = map (f: "--disable-${f}-port") excludedPorts; - meta = with stdenv.lib; { + meta = { description = "Small Device C Compiler"; longDescription = '' SDCC is a retargettable, optimizing ANSI - C compiler suite that targets @@ -27,8 +32,8 @@ stdenv.mkDerivation rec { PIC18 targets. It can be retargeted for other microprocessors. ''; homepage = http://sdcc.sourceforge.net/; - license = licenses.gpl2; + license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable; + maintainers = with maintainers; [ bjornfor yorickvp ]; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 099a591b407de..0523e099e4973 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 abbfdd2abb72e..9c1a36585907b 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 f2b6016ceb70e..8426635ce962b 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 1cc5dc368da3e..22721ca98bc2f 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 a44e81d3c19ca..d09e47a7f8456 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 c7e7cd4f4c3ff..0d9fb43be25ea 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 f73172e02d38e..825b4f349f0e8 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-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index b2e9d43ef08f4..42712df3295b8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -44,4 +44,17 @@ self: super: { # Use to be a core-library, but no longer is since GHC 8.4.x. hoopl = self.hoopl_3_10_2_2; + # lts-12.x versions do not compile. + primitive = self.primitive_0_6_4_0; + tagged = self.tagged_0_8_6; + + # Over-specified constraints. + async = doJailbreak super.async; # base >=4.3 && <4.12, stm >=2.2 && <2.5 + ChasingBottoms = doJailbreak super.ChasingBottoms; # base >=4.2 && <4.12, containers >=0.3 && <0.6 + hashable = doJailbreak super.hashable; # base >=4.4 && <4.1 + hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12 + integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12 + tar = doJailbreak super.tar; # containers >=0.2 && <0.6 + test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6 + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1daaf3409b5a5..06508c2b7b8fc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: default-package-overrides: # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. - base-compat-batteries ==0.10.1 - # LTS Haskell 12.0 + # LTS Haskell 12.1 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -217,7 +217,7 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.9 + - autoexporter ==1.1.10 - auto-update ==0.1.4 - avro ==0.3.2.0 - avwx ==0.3.0.2 @@ -232,7 +232,7 @@ default-package-overrides: - base64-string ==0.2 - base-compat ==0.10.4 - base-compat-batteries ==0.10.1 - - basement ==0.0.7 + - basement ==0.0.8 - base-orphans ==0.7 - base-prelude ==1.3 - base-unicode-symbols ==0.2.2.4 @@ -302,7 +302,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.37.1 + - brick ==0.37.2 - brittany ==0.11.0.0 - broadcast-chan ==0.1.1 - bsb-http-chunked ==0.0.0.2 @@ -424,7 +424,7 @@ default-package-overrides: - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - composition-prelude ==1.5.0.6 + - composition-prelude ==1.5.0.8 - compressed ==3.11 - concise ==0.1.0.1 - concurrency ==1.6.0.0 @@ -495,7 +495,7 @@ default-package-overrides: - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 - crypt-sha512 ==0 - - csg ==0.1.0.3 + - csg ==0.1.0.4 - csp ==1.4.0 - css-syntax ==0.0.7 - css-text ==0.1.3.0 @@ -557,13 +557,13 @@ default-package-overrides: - Decimal ==0.5.1 - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - - dejafu ==1.11.0.1 + - dejafu ==1.11.0.3 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - deque ==0.2.1 - - deriving-compat ==0.5 - - derulo ==1.0.2 + - deriving-compat ==0.5.1 + - derulo ==1.0.3 - detour-via-sci ==1.0.0 - df1 ==0.1.1 - dhall ==1.15.1 @@ -653,7 +653,7 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - email-validate ==2.3.2.6 - - enclosed-exceptions ==1.0.2 + - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.1 - enummapset ==0.5.2.2 - enumset ==0.0.4.1 @@ -677,7 +677,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.1.4 + - eventstore ==1.1.5 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.3 @@ -695,7 +695,7 @@ default-package-overrides: - exp-pairs ==0.1.6.0 - extensible ==0.4.9 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.8 + - extra ==1.6.9 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - facts ==0.0.1.0 @@ -729,7 +729,7 @@ default-package-overrides: - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.1 - - finite-typelits ==0.1.3.0 + - finite-typelits ==0.1.4.2 - first-class-patterns ==0.3.2.4 - fixed ==0.2.1.1 - fixed-length ==0.2 @@ -741,7 +741,7 @@ default-package-overrides: - flay ==0.4 - flexible-defaults ==0.0.2 - floatshow ==0.2.4 - - flow ==1.0.13 + - flow ==1.0.14 - fmlist ==0.9.2 - fn ==0.3.0.2 - focus ==0.1.5.2 @@ -757,7 +757,7 @@ default-package-overrides: - forma ==1.1.0 - format-numbers ==0.1.0.0 - formatting ==6.3.6 - - foundation ==0.0.20 + - foundation ==0.0.21 - free ==5.0.2 - freenect ==1.2.1 - freer-simple ==1.1.0.0 @@ -819,12 +819,12 @@ default-package-overrides: - ghcjs-codemirror ==0.0.0.2 - ghc-parser ==0.2.0.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.1.2 + - ghc-prof ==1.4.1.3 - ghc-syntax-highlighter ==0.0.2.0 - ghc-tcplugins-extra ==0.3 - - ghc-typelits-extra ==0.2.5 - - ghc-typelits-knownnat ==0.5 - - ghc-typelits-natnormalise ==0.6.1 + - ghc-typelits-extra ==0.2.6 + - ghc-typelits-knownnat ==0.5.1 + - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.15 - gi-cairo ==1.0.17 @@ -841,7 +841,7 @@ default-package-overrides: - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 - github ==0.19 - - github-release ==1.2.1 + - github-release ==1.2.2 - github-types ==0.2.1 - github-webhooks ==0.10.0 - gitrev ==1.3.1 @@ -888,7 +888,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.7 + - hapistrano ==0.3.5.8 - happstack-server ==7.5.1.1 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -911,14 +911,14 @@ default-package-overrides: - haskell-src-exts-simple ==1.20.0.0 - haskell-src-exts-util ==0.2.3 - haskell-src-meta ==0.8.0.3 - - haskell-tools-ast ==1.1.0.1 - - haskell-tools-backend-ghc ==1.1.0.1 - - haskell-tools-builtin-refactorings ==1.1.0.1 - - haskell-tools-debug ==1.1.0.1 - - haskell-tools-demo ==1.1.0.1 - - haskell-tools-prettyprint ==1.1.0.1 - - haskell-tools-refactor ==1.1.0.1 - - haskell-tools-rewrite ==1.1.0.1 + - haskell-tools-ast ==1.1.0.2 + - haskell-tools-backend-ghc ==1.1.0.2 + - haskell-tools-builtin-refactorings ==1.1.0.2 + - haskell-tools-debug ==1.1.0.2 + - haskell-tools-demo ==1.1.0.2 + - haskell-tools-prettyprint ==1.1.0.2 + - haskell-tools-refactor ==1.1.0.2 + - haskell-tools-rewrite ==1.1.0.2 - haskey ==0.3.0.2 - haskey-btree ==0.3.0.0 - haskey-mtl ==0.3.1.0 @@ -973,7 +973,7 @@ default-package-overrides: - hmpfr ==0.4.4 - Hoed ==0.5.1 - hoopl ==3.10.2.2 - - hOpenPGP ==2.7 + - hOpenPGP ==2.7.1 - hopenpgp-tools ==0.21.1 - hopfli ==0.2.2.1 - hostname ==1.0 @@ -995,8 +995,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-functors ==0.1.2.0 - hs-GeoIP ==0.3 @@ -1044,7 +1044,7 @@ default-package-overrides: - http2 ==1.6.3 - http-api-data ==0.3.8.1 - http-client ==0.5.13.1 - - http-client-openssl ==0.2.1.1 + - http-client-openssl ==0.2.2.0 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.3.2 @@ -1065,7 +1065,7 @@ default-package-overrides: - hw-conduit ==0.2.0.3 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 - - hw-excess ==0.2.0.0 + - hw-excess ==0.2.0.2 - hw-fingertree-strict ==0.1.1.1 - hw-hedgehog ==0.1.0.1 - hw-hspec-hedgehog ==0.1.0.5 @@ -1127,7 +1127,7 @@ default-package-overrides: - IntervalMap ==0.6.0.0 - intervals ==0.8.1 - intro ==0.3.1.0 - - invariant ==0.5 + - invariant ==0.5.1 - invertible ==0.2.0.5 - invertible-grammar ==0.1.1 - io-choice ==0.0.6 @@ -1164,7 +1164,7 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.9.2 - - json-feed ==1.0.2 + - json-feed ==1.0.3 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.4 - json-rpc-server ==0.2.6.0 @@ -1188,17 +1188,17 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.4 + - lackey ==1.0.5 - LambdaHack ==0.8.3.0 - lame ==0.1.1 - language-c ==0.8.1 - language-c-quote ==0.12.2 - - language-docker ==6.0.3 + - language-docker ==6.0.4 - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.3.19 + - language-puppet ==1.3.19.1 - lapack-carray ==0.0.2 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.0.1 @@ -1300,7 +1300,7 @@ default-package-overrides: - median-stream ==0.7.0.0 - med-module ==0.1.1 - megaparsec ==6.5.0 - - mega-sdist ==0.3.3 + - mega-sdist ==0.3.3.1 - memory ==0.14.16 - MemoTrie ==0.6.9 - mercury-api ==0.1.0.1 @@ -1309,7 +1309,7 @@ default-package-overrides: - messagepack-rpc ==0.5.1 - metrics ==0.4.1.1 - mfsolve ==0.3.2.0 - - microformats2-parser ==1.0.1.8 + - microformats2-parser ==1.0.1.9 - microlens ==0.4.9.1 - microlens-aeson ==2.3.0 - microlens-contra ==0.1.0.1 @@ -1505,7 +1505,7 @@ default-package-overrides: - pandoc-types ==1.17.5.1 - pango ==0.13.5.0 - papillon ==0.1.0.6 - - parallel ==3.2.1.1 + - parallel ==3.2.2.0 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - parsec ==3.1.13.0 @@ -1610,7 +1610,7 @@ default-package-overrides: - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1 - pretty-show ==1.7 - - pretty-simple ==2.1.0.0 + - pretty-simple ==2.1.0.1 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - primitive ==0.6.3.0 @@ -1676,10 +1676,10 @@ default-package-overrides: - rank2classes ==1.1.0.1 - Rasterific ==0.7.3 - rasterific-svg ==0.3.3.1 - - ratel ==1.0.4 - - ratel-wai ==1.0.2 + - ratel ==1.0.5 + - ratel-wai ==1.0.3 - ratio-int ==0.1.2 - - rattletrap ==4.1.1 + - rattletrap ==4.1.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -1713,7 +1713,7 @@ default-package-overrides: - regex-tdfa-text ==1.0.0.3 - reinterpret-cast ==0.1.0 - relational-query ==0.12.0.1 - - relational-query-HDBC ==0.7.0.0 + - relational-query-HDBC ==0.7.0.1 - relational-record ==0.2.2.0 - relational-schemas ==0.1.6.2 - renderable ==0.2.0.1 @@ -1754,7 +1754,7 @@ default-package-overrides: - safe-money ==0.6 - SafeSemaphore ==0.10.1 - saltine ==0.1.0.1 - - salve ==1.0.3 + - salve ==1.0.4 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 @@ -1762,8 +1762,8 @@ default-package-overrides: - sandman ==0.2.0.1 - say ==0.1.0.0 - sbp ==2.3.16 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1824,10 +1824,10 @@ default-package-overrides: - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.0 - - serverless-haskell ==0.6.1 + - serverless-haskell ==0.6.2 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - - servius ==1.2.0.3 + - servius ==1.2.1.0 - ses-html ==0.4.0.0 - set-cover ==0.0.9 - setenv ==0.1.1.3 @@ -1887,7 +1887,7 @@ default-package-overrides: - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - - Spintax ==0.3.2 + - Spintax ==0.3.3 - splice ==0.6.1.1 - split ==0.2.3.3 - splitmix ==0.0.1 @@ -1927,7 +1927,7 @@ default-package-overrides: - store ==0.5.0 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - - stratosphere ==0.24.1 + - stratosphere ==0.24.3 - streaming ==0.2.1.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 @@ -1947,7 +1947,7 @@ default-package-overrides: - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.0 - - strive ==5.0.5 + - strive ==5.0.6 - structs ==0.1.1 - stylish-haskell ==0.9.2.0 - summoner ==1.0.4 @@ -2184,7 +2184,7 @@ default-package-overrides: - vector-bytes-instances ==0.1.1 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-sized ==1.0.3.0 + - vector-sized ==1.0.4.0 - vector-space ==0.13 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 @@ -2192,7 +2192,7 @@ default-package-overrides: - verbosity ==0.2.3.0 - versions ==3.4.0.1 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.18 + - viewprof ==0.0.0.19 - vinyl ==0.8.1.1 - vivid ==0.3.0.2 - vivid-osc ==0.3.0.0 @@ -2205,7 +2205,7 @@ default-package-overrides: - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.22.1 + - wai-extra ==3.0.23.0 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.2 - wai-middleware-caching ==0.1.0.2 @@ -2221,7 +2221,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - - warp ==3.2.22 + - warp ==3.2.23 - warp-tls ==3.2.4.3 - warp-tls-uid ==0.2.0.5 - wave ==0.1.5 @@ -2269,7 +2269,7 @@ default-package-overrides: - writer-cps-mtl ==0.1.1.4 - writer-cps-transformers ==0.1.1.3 - ws ==0.0.4 - - wuss ==1.1.9 + - wuss ==1.1.10 - X11 ==1.9 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2303,22 +2303,22 @@ default-package-overrides: - xml-types ==0.3.6 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.31.1 + - yaml ==0.8.32 - yeshql ==4.1.0.0 - yeshql-core ==4.1.0.0 - yeshql-hdbc ==4.1.0.0 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.3 + - yesod-auth ==1.6.4.1 - yesod-auth-fb ==1.9.0 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.5 + - yesod-core ==1.6.6 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.1 - - yesod-form-bootstrap4 ==1.0.0 + - yesod-form ==1.6.2 + - yesod-form-bootstrap4 ==1.0.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 @@ -2327,7 +2327,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.2.4 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0 - - yesod-test ==1.6.4 + - yesod-test ==1.6.5 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0 - yes-precure5-command ==5.5.3 @@ -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/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 86494e9323b4a..4e62d47050635 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -442,7 +442,7 @@ self: super: builtins.intersectAttrs super { then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa else dontCheck super.fsnotify; - hidapi = addExtraLibrary super.hidapi pkgs.libudev; + hidapi = addExtraLibrary super.hidapi pkgs.udev; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; @@ -494,7 +494,7 @@ self: super: builtins.intersectAttrs super { # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; colour = dontCheck super.colour; - manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; }; + spatial-rotations = dontCheck super.spatial-rotations; LDAP = dontCheck (overrideCabal super.LDAP (drv: { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7b512e46da804..b8943a55394ab 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/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c68d84bdb8a5e..80274f515c52f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -394,6 +394,9 @@ stdenv.mkDerivation ({ local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf done + + # delete confdir if there are no libraries + find $packageConfDir -maxdepth 0 -empty -delete; ''} ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 9ea9dae02db17..591de1236d429 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ - optional stdenv.isLinux glibcLocales ++ + optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++ [ ghc pkgconfig stack ]; STACK_PLATFORM_VARIANT="nix"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c8ae0ef42363e..ff62e2eba3b2f 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 { @@ -10135,8 +10179,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.6"; - sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4"; + version = "0.3.0"; + sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10151,7 +10195,7 @@ self: { testHaskellDepends = [ aeson base hspec http-client http-types vector ]; - description = "A RESTful Web Service for IPv6-related data"; + description = "A RESTful microService for IPv6-related data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -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 { @@ -13312,14 +13374,19 @@ self: { }) {}; "OTP" = callPackage - ({ mkDerivation, base, Crypto, time }: + ({ mkDerivation, base, bytestring, cryptohash-sha1 + , cryptohash-sha256, cryptohash-sha512, tasty, tasty-hunit, time + }: mkDerivation { pname = "OTP"; - version = "0.0.0.1"; - sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb"; - libraryHaskellDepends = [ base Crypto time ]; - testHaskellDepends = [ base Crypto time ]; - description = "HMAC-Based and Time-Based One-Time Passwords"; + version = "0.1.0.0"; + sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb"; + libraryHaskellDepends = [ + base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 + time + ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit time ]; + description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)"; license = stdenv.lib.licenses.mit; }) {}; @@ -16785,19 +16852,6 @@ self: { ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; - version = "0.3.2"; - sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp"; - libraryHaskellDepends = [ - attoparsec base extra mtl mwc-random text - ]; - description = "Random text generation based on spintax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spintax_0_3_3" = callPackage - ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: - mkDerivation { - pname = "Spintax"; version = "0.3.3"; sha256 = "04vb07r26p4rxgsym5zhqsnyx4sr2a112sa31mdda5hjpy9j3pr1"; libraryHaskellDepends = [ @@ -16805,7 +16859,6 @@ self: { ]; description = "Random text generation based on spintax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock" = callPackage @@ -18753,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; @@ -22034,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 @@ -29622,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; @@ -30320,20 +30399,6 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.9"; - sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; - license = stdenv.lib.licenses.mit; - }) {}; - - "autoexporter_1_1_10" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; version = "1.1.10"; sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r"; isLibrary = true; @@ -30342,7 +30407,6 @@ self: { executableHaskellDepends = [ base Cabal directory filepath ]; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autom" = callPackage @@ -32449,23 +32513,11 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.7"; - sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Foundation scrap box of array & string"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "basement_0_0_8" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "basement"; version = "0.0.8"; sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basen-bytestring" = callPackage @@ -33272,8 +33324,8 @@ self: { }: mkDerivation { pname = "bench-graph"; - version = "0.1.2"; - sha256 = "055g038zp8px22dwb5h113fxms5m9g46b5x81h249nyybp258fyk"; + version = "0.1.3"; + sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47"; libraryHaskellDepends = [ base Chart Chart-diagrams csv directory filepath transformers ]; @@ -35096,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 }: @@ -38166,8 +38218,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.37.1"; - sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy"; + version = "0.37.2"; + sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40640,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; @@ -40652,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; @@ -40975,8 +41025,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.10.0"; - sha256 = "1ry2zk81x7jd14ayi49vh8nan10sbphkbj6s5y15a6w0vs4wznn1"; + version = "2.10.1"; + sha256 = "1xwfr53flc2cv7gk583ycmiw7v9x93v1gvhiy6ilqw8a8915vncb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41019,6 +41069,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "cabal2spec_2_2_1" = callPackage + ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty + , tasty-golden, time + }: + mkDerivation { + pname = "cabal2spec"; + version = "2.2.1"; + sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal filepath time ]; + executableHaskellDepends = [ + base Cabal filepath optparse-applicative + ]; + testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; + description = "Convert Cabal files into rpm spec files"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "cabalQuery" = callPackage ({ mkDerivation, base, Cabal, containers, directory, MissingH , pretty @@ -43091,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 @@ -47357,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; @@ -49007,23 +49081,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.0.6"; - sha256 = "13rjy6i48nsy3nqk79b4cqgiapjg11knzkzajmxy6ps6iq308vjn"; - libraryHaskellDepends = [ base ]; - description = "Higher-order function combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "composition-prelude_1_5_0_8" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "composition-prelude"; version = "1.5.0.8"; sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composition-tree" = callPackage @@ -50075,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 @@ -50190,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 @@ -52741,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 = [ @@ -54188,8 +54250,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.3"; - sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx"; + version = "0.1.0.4"; + sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56629,8 +56691,8 @@ self: { pname = "data-interval"; version = "1.3.0"; sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; - revision = "1"; - editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6"; + revision = "2"; + editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -56856,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 @@ -56872,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 { @@ -57167,10 +57274,8 @@ self: { ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { pname = "data-standards"; - version = "0.1.0.0"; - sha256 = "014fk5lsj35iax9amgcn0r9kifyr2ar3afi4zs651l1xl7csmywz"; - revision = "1"; - editedCabalFile = "0g4hlyzkski4zha53w6asanjnk9s2jp5dgql353szm4flldfsx07"; + version = "0.1.0.1"; + sha256 = "0nx8hgv653nh138f9s2x36hwv92sbj5wzl4isaylxn12qqlwx94d"; libraryHaskellDepends = [ base hashable unordered-containers ]; description = "A collection of standards representable by simple data types"; license = stdenv.lib.licenses.mpl20; @@ -58955,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; @@ -59101,22 +59206,6 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "1.11.0.1"; - sha256 = "04a4nnipb7qlw0kz4gy7flzndas3zppjxjbp8vvpcc7n5mqcj89x"; - libraryHaskellDepends = [ - base concurrency containers contravariant deepseq exceptions - leancheck profunctors random transformers - ]; - description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dejafu_1_11_0_3" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; version = "1.11.0.3"; sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx"; libraryHaskellDepends = [ @@ -59125,7 +59214,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -59655,30 +59743,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deriving-compat" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged - , template-haskell, th-abstraction, transformers - , transformers-compat + "deriveJsonNoPrefix" = callPackage + ({ mkDerivation, aeson, base, hspec, template-haskell, text + , unordered-containers }: mkDerivation { - pname = "deriving-compat"; - version = "0.5"; - sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell - th-abstraction transformers transformers-compat - ]; + pname = "deriveJsonNoPrefix"; + version = "0.1.0.1"; + sha256 = "1zwk181c8fv0cv6w3daz3gyb0rwp2cm56piv19iz2vfv3jk9rqqs"; + libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat + aeson base hspec template-haskell text unordered-containers ]; - testToolDepends = [ hspec-discover ]; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; + description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner"; + license = stdenv.lib.licenses.asl20; }) {}; - "deriving-compat_0_5_1" = callPackage + "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers @@ -59699,7 +59780,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -59729,21 +59809,6 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.2"; - sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Parse and render JSON simply"; - license = stdenv.lib.licenses.mit; - }) {}; - - "derulo_1_0_3" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "derulo"; version = "1.0.3"; sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m"; isLibrary = true; @@ -59753,7 +59818,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Parse and render JSON simply"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "descrilo" = callPackage @@ -62893,6 +62957,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "distribution-opensuse" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class + , pretty, text, time, turtle + }: + mkDerivation { + pname = "distribution-opensuse"; + version = "1.1.0"; + sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring containers deepseq Diff extra foldl + 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; + }) {}; + "distribution-plot" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, colour, containers , data-default-class, distribution, lens @@ -64394,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; }) {}; @@ -64774,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 @@ -65902,6 +65983,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "edges" = callPackage + ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl + , monad-par, pointed, potoki, potoki-cereal, primitive + , primitive-extras, profunctors, QuickCheck, quickcheck-instances + , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck + , text, vector + }: + mkDerivation { + pname = "edges"; + version = "0.4.0.1"; + sha256 = "1a599zi2im1ics8gnb0v0iv2rpzwzl8i2qfglgi1cxzdhcymn5sa"; + libraryHaskellDepends = [ + base cereal contravariant deferred-folds foldl monad-par pointed + potoki potoki-cereal primitive primitive-extras profunctors + QuickCheck semigroupoids text vector + ]; + testHaskellDepends = [ + cereal foldl QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Tools for efficient immutable graphs"; + license = stdenv.lib.licenses.mit; + }) {}; + "edis" = callPackage ({ mkDerivation, base, bytestring, cereal, hedis }: mkDerivation { @@ -65919,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 @@ -66315,8 +66422,8 @@ self: { }: mkDerivation { pname = "eigen"; - version = "2.1.7"; - sha256 = "080dv9hxjfqaarj0vzmaxjc382a3aqp4z69k6nl4vs09g2i1cfg4"; + version = "3.3.4.1"; + sha256 = "0kpbnl5yrsp9923al5g9x48yf88m4vsdryq69g8fmlh0wdqkdapa"; libraryHaskellDepends = [ base binary bytestring primitive transformers vector ]; @@ -67220,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 @@ -67471,28 +67578,6 @@ self: { }: mkDerivation { pname = "enclosed-exceptions"; - version = "1.0.2"; - sha256 = "1wc9h6zdnb5impvvml6vnjapajjanw7zgpnzg7c0v7115nwfm6vv"; - revision = "1"; - editedCabalFile = "0rjm8g2bm9a7qzklkp0rh5az4qh8nsl0hl119gjik671knygkdj0"; - libraryHaskellDepends = [ - base deepseq lifted-base monad-control transformers - transformers-base - ]; - testHaskellDepends = [ - async base deepseq hspec lifted-base monad-control QuickCheck stm - transformers transformers-base - ]; - description = "Catching all exceptions from within an enclosed computation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "enclosed-exceptions_1_0_3" = callPackage - ({ mkDerivation, async, base, deepseq, hspec, lifted-base - , monad-control, QuickCheck, stm, transformers, transformers-base - }: - mkDerivation { - pname = "enclosed-exceptions"; version = "1.0.3"; sha256 = "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg"; libraryHaskellDepends = [ @@ -67505,7 +67590,6 @@ self: { ]; description = "Catching all exceptions from within an enclosed computation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "encode-string" = callPackage @@ -68494,6 +68578,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "errors-ext_0_4_2" = callPackage + ({ mkDerivation, base, binary-ext, bytestring, conduit, errors + , exceptions, HUnit, monad-control, monad-loops, mtl, transformers + }: + mkDerivation { + pname = "errors-ext"; + version = "0.4.2"; + sha256 = "064nvpc8yy3n6nvc7cmxmgblmarg4wlvawj0k7bc3mj6h0rnavj0"; + libraryHaskellDepends = [ + base errors exceptions monad-control mtl transformers + ]; + testHaskellDepends = [ + base binary-ext bytestring conduit errors exceptions HUnit + monad-control monad-loops mtl transformers + ]; + description = "`bracket`-like functions for `ExceptT` over `IO` monad"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -69149,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 @@ -69596,41 +69702,6 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.1.4"; - sha256 = "0xhhw5dxq1h4w7dpngrhnaipzhfpzvs4y7jdvimzk86hvgv0mmfj"; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base machines - monad-control monad-logger mono-traversable mtl protobuf random - safe-exceptions semigroups stm stm-chans text time - transformers-base unordered-containers uuid - ]; - testHaskellDepends = [ - aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger hashable lifted-async - lifted-base monad-control mono-traversable protobuf safe-exceptions - semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time - transformers-base unordered-containers uuid - ]; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_1_1_5" = callPackage - ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring - , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, hashable, http-client - , interpolate, lifted-async, lifted-base, machines, monad-control - , monad-logger, mono-traversable, mtl, protobuf, random - , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec - , tasty-hunit, text, time, transformers-base, unordered-containers - , uuid - }: - mkDerivation { - pname = "eventstore"; version = "1.1.5"; sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8"; libraryHaskellDepends = [ @@ -70595,6 +70666,8 @@ self: { pname = "extended-reals"; version = "0.2.3.0"; sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw"; + revision = "1"; + editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -70755,22 +70828,6 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.8"; - sha256 = "1kngk46nkrjkpqaj845c6r823r8aawlk1ir693lr6rskhy1k7dlp"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_9" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; version = "1.6.9"; sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b"; libraryHaskellDepends = [ @@ -70779,7 +70836,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -71935,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 { @@ -73319,8 +73408,8 @@ self: { pname = "finite-field"; version = "0.9.0"; sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643"; - revision = "1"; - editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds"; + revision = "2"; + editedCabalFile = "11zivn1cjwxc7xy8q50raz1wpfgl0b459ai0f4j304rv7yiwrhdp"; libraryHaskellDepends = [ base deepseq hashable singletons template-haskell ]; @@ -73337,23 +73426,11 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "finite-typelits"; - version = "0.1.3.0"; - sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv"; - libraryHaskellDepends = [ base deepseq ]; - description = "A type inhabited by finitely many values, indexed by type-level naturals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "finite-typelits_0_1_4_2" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "finite-typelits"; version = "0.1.4.2"; sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj"; libraryHaskellDepends = [ base deepseq ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "firebase-database" = callPackage @@ -74406,25 +74483,12 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.13"; - sha256 = "0dg29g1d7xi14yf4yjxiy9cmslqgz5c4z141q4bzqn6ms0rwrxx7"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_14" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; version = "1.0.14"; sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -75786,19 +75850,6 @@ self: { ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.20"; - sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms"; - libraryHaskellDepends = [ base basement ghc-prim ]; - testHaskellDepends = [ base basement ]; - benchmarkHaskellDepends = [ base basement gauge ]; - description = "Alternative prelude with batteries and no dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foundation_0_0_21" = callPackage - ({ mkDerivation, base, basement, gauge, ghc-prim }: - mkDerivation { - pname = "foundation"; version = "0.0.21"; sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf"; libraryHaskellDepends = [ base basement ghc-prim ]; @@ -75806,7 +75857,6 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -76061,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; @@ -76757,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 ]; @@ -80730,27 +80779,6 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.2"; - sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1_3" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; version = "1.4.1.3"; sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr"; isLibrary = true; @@ -80764,7 +80792,6 @@ self: { ]; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-aeson" = callPackage @@ -80983,27 +81010,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2.5"; - sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit template-haskell - ]; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_2_6" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; version = "0.2.6"; sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm"; libraryHaskellDepends = [ @@ -81016,7 +81022,6 @@ self: { ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage @@ -81026,26 +81031,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.5"; - sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_5_1" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; version = "0.5.1"; sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v"; libraryHaskellDepends = [ @@ -81057,7 +81042,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -81066,22 +81050,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.6.1"; - sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_6_2" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; version = "0.6.2"; sha256 = "04a338yfcl6jm1daax08zsy03myii4llzih4mlprkyid8i0yn740"; libraryHaskellDepends = [ @@ -81090,7 +81058,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-presburger" = callPackage @@ -81628,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"; @@ -81639,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 @@ -82324,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"; @@ -82335,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 @@ -82574,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" @@ -82586,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 @@ -83098,29 +83066,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.2.1"; - sha256 = "1q01yk6nl60iylsqzz1gzg3q1gpjn6bi13p5lddx1z5hd6hri80h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_2_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; version = "1.2.2"; sha256 = "0mnkj8p90inaw6cic60hx05yq2lf2aahmv313qi59di5jqkyg106"; isLibrary = true; @@ -83135,7 +83080,6 @@ self: { ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -83669,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 @@ -87715,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 @@ -88698,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 @@ -89408,55 +89376,6 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.7"; - sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype prettyprinter QuickCheck - quickcheck-instances resourcet semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unliftio-core unordered-containers zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib - ]; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hOpenPGP_2_7_1" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib - }: - mkDerivation { - pname = "hOpenPGP"; version = "2.7.1"; sha256 = "02nws5px5zb9rvsl3hpqr15iw56n0d2pwgdrk3d047l4hx9cbm95"; libraryHaskellDepends = [ @@ -89490,7 +89409,6 @@ self: { ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -90914,8 +90832,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.10.3"; - sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj"; + version = "1.10.4"; + sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92295,32 +92213,6 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.7"; - sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_5_8" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; version = "0.3.5.8"; sha256 = "0yg1wgg4mkfjf49xfcnijrwmj747yzbybsvkaq515i618nz5x57z"; isLibrary = true; @@ -92338,7 +92230,6 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -95463,22 +95354,6 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "1.1.0.1"; - sha256 = "1g450ikg2wi7whw46ibm9pc7jdnk5lng8l7lqryi0nigmrmgz355"; - libraryHaskellDepends = [ - base classyplate ghc mtl pretty references template-haskell - uniplate - ]; - description = "Haskell AST for efficient tooling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-ast_1_1_0_2" = callPackage - ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references - , template-haskell, uniplate - }: - mkDerivation { - pname = "haskell-tools-ast"; version = "1.1.0.2"; sha256 = "0j81dmg2mgxlc4wy054a13bvx549xs19fr729rirdj2illdgbw1c"; libraryHaskellDepends = [ @@ -95487,7 +95362,6 @@ self: { ]; description = "Haskell AST for efficient tooling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-ast-fromghc" = callPackage @@ -95548,23 +95422,6 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "1.1.0.1"; - sha256 = "030ylilmgn4drp00d3683kwfyq9rky5i8ihpvmqjkphyq7bbwva4"; - libraryHaskellDepends = [ - base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl - references safe split template-haskell transformers uniplate - ]; - description = "Creating the Haskell-Tools AST from GHC's representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-backend-ghc_1_1_0_2" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th - , haskell-tools-ast, mtl, references, safe, split, template-haskell - , transformers, uniplate - }: - mkDerivation { - pname = "haskell-tools-backend-ghc"; version = "1.1.0.2"; sha256 = "0c054gvnn38r5vlpka5jsvq3n8lcn3j77jg45g1zl1az0099mzhl"; libraryHaskellDepends = [ @@ -95573,7 +95430,6 @@ self: { ]; description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-builtin-refactorings" = callPackage @@ -95587,38 +95443,6 @@ self: { }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.1.0.1"; - sha256 = "0xlcwyydspn73nv7yi1djncqhswszqn9skrm6hm96scfyqvvxbwa"; - libraryHaskellDepends = [ - aeson base Cabal classyplate containers deepseq directory filepath - ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-refactor - haskell-tools-rewrite minisat-solver mtl portable-lines references - split template-haskell transformers uniplate - ]; - testHaskellDepends = [ - base Cabal containers directory either filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-refactor - haskell-tools-rewrite mtl references split tasty tasty-hunit - template-haskell time transformers uniplate - ]; - description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-builtin-refactorings_1_1_0_2" = callPackage - ({ mkDerivation, aeson, base, Cabal, classyplate, containers - , deepseq, directory, either, filepath, ghc, ghc-paths - , haskell-tools-ast, haskell-tools-backend-ghc - , haskell-tools-prettyprint, haskell-tools-refactor - , haskell-tools-rewrite, minisat-solver, mtl, portable-lines - , references, split, tasty, tasty-hunit, template-haskell, time - , transformers, uniplate - }: - mkDerivation { - pname = "haskell-tools-builtin-refactorings"; version = "1.1.0.2"; sha256 = "1wm7c63cw4izg6vlrm2xdyrfvf4cwcqs2n144y8k0zf442xaq5l9"; libraryHaskellDepends = [ @@ -95719,31 +95543,6 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.1.0.1"; - sha256 = "1l84y0pqwcq1y6509gg68flfa1ai5zl2psn57lp1nm17i7cddsjw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base classyplate criterion filepath ghc ghc-paths haskell-tools-ast - haskell-tools-backend-ghc haskell-tools-builtin-refactorings - haskell-tools-prettyprint haskell-tools-refactor mtl references - split template-haskell uniplate - ]; - executableHaskellDepends = [ base ]; - description = "Debugging Tools for Haskell-tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-debug_1_1_0_2" = callPackage - ({ mkDerivation, base, classyplate, criterion, filepath, ghc - , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc - , haskell-tools-builtin-refactorings, haskell-tools-prettyprint - , haskell-tools-refactor, mtl, references, split, template-haskell - , uniplate - }: - mkDerivation { - pname = "haskell-tools-debug"; version = "1.1.0.2"; sha256 = "1lnv9j4h45g0z1s9pf86py39p2bs8dbz3xybg0bwz89yix8h7nhl"; isLibrary = true; @@ -95770,37 +95569,6 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.1.0.1"; - sha256 = "1rzpwy7fvc51vs9sqpxvja84bqjgrpj6943cc2p06d1ynl7vzmk5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-builtin-refactorings haskell-tools-prettyprint - haskell-tools-refactor http-types mtl references transformers wai - wai-websockets warp websockets - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson base bytestring directory filepath HUnit network tasty - tasty-hunit websockets - ]; - description = "A web-based demo for Haskell-tools Refactor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-demo_1_1_0_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings - , haskell-tools-prettyprint, haskell-tools-refactor, http-types - , HUnit, mtl, network, references, tasty, tasty-hunit, transformers - , wai, wai-websockets, warp, websockets - }: - mkDerivation { - pname = "haskell-tools-demo"; version = "1.1.0.2"; sha256 = "0c2m6xqcl22x9ay3n9j64lphmsvxsgcwymvbxscwpki9mv7wbvkx"; isLibrary = true; @@ -95859,22 +95627,6 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "1.1.0.1"; - sha256 = "1x8zz8i66cfnvif991bj9nkidp2bwlhs9zfkxwlyhvhrlda45q8f"; - libraryHaskellDepends = [ - base containers ghc haskell-tools-ast mtl references split text - uniplate - ]; - description = "Pretty printing of Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-prettyprint_1_1_0_2" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl - , references, split, text, uniplate - }: - mkDerivation { - pname = "haskell-tools-prettyprint"; version = "1.1.0.2"; sha256 = "01j212inqx7hq24kcw7n0619bgz7bj576xrh06h10n0wqhd6qfbq"; libraryHaskellDepends = [ @@ -95883,7 +95635,6 @@ self: { ]; description = "Pretty printing of Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-refactor" = callPackage @@ -95896,36 +95647,6 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "1.1.0.1"; - sha256 = "0kfw41f4js9s6mf533q7vm7ym63hb289j77r2ypm08490bqjhi9g"; - libraryHaskellDepends = [ - aeson base Cabal containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl references - split template-haskell transformers uniplate - ]; - testHaskellDepends = [ - base Cabal containers directory either filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl old-time - polyparse references split tasty tasty-hunit template-haskell time - transformers uniplate - ]; - description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-refactor_1_1_0_2" = callPackage - ({ mkDerivation, aeson, base, Cabal, containers, directory, either - , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-rewrite, mtl, old-time, polyparse, references - , split, tasty, tasty-hunit, template-haskell, time, transformers - , uniplate - }: - mkDerivation { - pname = "haskell-tools-refactor"; version = "1.1.0.2"; sha256 = "12gkmji62kvnqjih9845hmsdj2f52hvmqgrz7s5wclpn3b5fhczq"; libraryHaskellDepends = [ @@ -95953,28 +95674,6 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "1.1.0.1"; - sha256 = "0j1925x0qkkm8n0klqbawgd419ra9jrfl4y4hn75j3w4zxzh3v5j"; - libraryHaskellDepends = [ - base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl - references - ]; - testHaskellDepends = [ - base directory filepath haskell-tools-ast haskell-tools-prettyprint - tasty tasty-hunit - ]; - description = "Facilities for generating new parts of the Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-rewrite_1_1_0_2" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc - , haskell-tools-ast, haskell-tools-prettyprint, mtl, references - , tasty, tasty-hunit - }: - mkDerivation { - pname = "haskell-tools-rewrite"; version = "1.1.0.2"; sha256 = "1az7924bsiapn7g8gj75vdi47alrlly0wnwhcd7p8a24kh1hj055"; libraryHaskellDepends = [ @@ -97149,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 ]; @@ -97164,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; @@ -97184,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"; @@ -97202,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 @@ -98410,6 +98152,8 @@ self: { pname = "hbro"; version = "1.7.0.0"; sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh"; + revision = "1"; + editedCabalFile = "0slsd0f0qvlh4l6777b8iaskd4ij04193mcjwnq8p7szslxx40q1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98439,6 +98183,8 @@ self: { pname = "hbro-contrib"; version = "1.7.0.0"; sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam"; + revision = "1"; + editedCabalFile = "1vfkwzd5rsv0065bldkd90fprp1qspfqg44ip5i4ihnbj4vawv9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -101098,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; @@ -103993,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 = [ @@ -104015,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 @@ -104032,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 @@ -105742,7 +105493,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_29_4" = callPackage + "hpack_0_29_5" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , http-client, http-client-tls, http-types, HUnit, infer-license @@ -105752,8 +105503,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.29.4"; - sha256 = "1d1kn4bzcwqmqkc6y9mp63674hgayx4mprv9fg8mrr29z3fl09hj"; + version = "0.29.5"; + sha256 = "1jm70x2d1d5la780aksq3088k5vj8s6j2srslij9slsfkw6mmv56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105818,8 +105569,8 @@ self: { }: mkDerivation { pname = "hpack-dhall"; - version = "0.2.0"; - sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m"; + version = "0.3.0"; + sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109148,6 +108899,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_5_5" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.5.5"; + sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm"; + libraryHaskellDepends = [ + base call-stack hspec-core hspec-discover hspec-expectations HUnit + QuickCheck transformers + ]; + testHaskellDepends = [ + base call-stack directory hspec-core hspec-discover + hspec-expectations hspec-meta HUnit QuickCheck stringbuilder + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -109243,6 +109018,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_5_5" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.5.5"; + sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -109298,6 +109100,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_5_5" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.5.5"; + sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -109547,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 @@ -110954,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 ]; @@ -111376,23 +111211,6 @@ self: { }: mkDerivation { pname = "http-client-openssl"; - version = "0.2.1.1"; - sha256 = "173s2m73xcf6ramy680ky4zhxhmrymh98g2hv5xa2pnj489j7vi4"; - libraryHaskellDepends = [ base HsOpenSSL http-client network ]; - testHaskellDepends = [ - base HsOpenSSL hspec http-client http-types - ]; - doCheck = false; - description = "http-client backend using the OpenSSL library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-openssl_0_2_2_0" = callPackage - ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types - , network - }: - mkDerivation { - pname = "http-client-openssl"; version = "0.2.2.0"; sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn"; libraryHaskellDepends = [ base HsOpenSSL http-client network ]; @@ -111402,7 +111220,6 @@ self: { doCheck = false; description = "http-client backend using the OpenSSL library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-request-modifiers" = callPackage @@ -112989,6 +112806,8 @@ self: { pname = "hw-dsv"; version = "0.2.1"; sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv"; + revision = "1"; + editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113035,14 +112854,14 @@ self: { "hw-excess" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base - , QuickCheck, safe, storable-record, vector + , QuickCheck, safe, vector }: mkDerivation { pname = "hw-excess"; - version = "0.2.0.0"; - sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi"; + version = "0.2.0.2"; + sha256 = "1xm1nwab2zhlyd0n536pd5sny4miqr8p41pasl9mqvg89v6x0db7"; libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe storable-record vector + base hw-bits hw-prim hw-rankselect-base safe vector ]; testHaskellDepends = [ base hspec hw-bits hw-prim QuickCheck vector @@ -113093,10 +112912,25 @@ 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 @@ -113107,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 ]; @@ -113499,6 +113335,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-simd" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava + , containers, criterion, deepseq, directory, hedgehog, hspec + , hw-bits, hw-hspec-hedgehog, hw-prim, hw-rankselect + , hw-rankselect-base, mmap, text, vector + }: + mkDerivation { + pname = "hw-simd"; + version = "0.0.0.3"; + sha256 = "1kkaigvkh932gcdvn7ll93qkz332bp6ylg5wsf8saxnir1n1362k"; + libraryHaskellDepends = [ + base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect + hw-rankselect-base vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bits-extra bytestring deepseq directory hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text + vector + ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava containers criterion deepseq + directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap + vector + ]; + description = "SIMD library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -115562,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 @@ -116139,6 +116040,8 @@ self: { pname = "imm"; version = "1.3.0.0"; sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; + revision = "1"; + editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116713,6 +116616,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexation" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, hashable, list-t, potoki, potoki-cereal, profunctors + , stm-containers, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "indexation"; + version = "0.2.0.2"; + sha256 = "10wm6k8rjdk4pq9pypnbh9pbqzr0vxbfgmj66d18grpr9g2mk5j1"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl hashable list-t + potoki potoki-cereal profunctors stm-containers text transformers + unordered-containers vector + ]; + description = "Tools for entity indexation"; + license = stdenv.lib.licenses.mit; + }) {}; + "indexed" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -118171,30 +118092,6 @@ self: { "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers - , contravariant, ghc-prim, hspec, profunctors, QuickCheck - , semigroups, StateVar, stm, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.5"; - sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0"; - revision = "2"; - editedCabalFile = "01n0v2qmbyd44z3wvha6vmbf1nr3bar205nk1r8hsq9jsmrfzaj1"; - libraryHaskellDepends = [ - array base bifunctors comonad containers contravariant ghc-prim - profunctors semigroups StateVar stm tagged template-haskell - th-abstraction transformers transformers-compat - unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck template-haskell ]; - description = "Haskell98 invariant functors"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "invariant_0_5_1" = callPackage - ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, hspec-discover, profunctors , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell , th-abstraction, transformers, transformers-compat @@ -118214,7 +118111,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible" = callPackage @@ -118597,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 @@ -118804,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 @@ -119670,8 +119614,8 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.7"; - sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay"; + version = "0.1.0.8"; + sha256 = "1zp5kddiczkb85ac7y6wn145bzx3hpvzzhincgq8f1ykcr23miz9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory @@ -119748,8 +119692,8 @@ self: { ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-hw"; - version = "0.1.0.5"; - sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck"; + version = "0.1.0.6"; + sha256 = "0az65nj7pl32gyffv2z2vmcgm36cm740y765n4r7389drls5lj5d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; @@ -119763,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 @@ -120734,14 +120676,14 @@ self: { ({ mkDerivation, base, haskeline, hspec, HUnit }: mkDerivation { pname = "jord"; - version = "0.1.0.0"; - sha256 = "1dnjxlyclk1a1bghkg1c6wash37pq88grqpv8pr3gr6in3wkibc5"; + version = "0.2.0.0"; + sha256 = "0akf6jjijwgn4jsvlzvj7mh9fx9wx0p05gf7bara6hiqj58y6k65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base haskeline ]; testHaskellDepends = [ base hspec HUnit ]; - description = "Geographic position calculations on Great Circles"; + description = "Geographical Position Calculations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121306,25 +121248,6 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.2"; - sha256 = "1485c4rljprf09nn8hd5fdpipjzpcylgmzz3ckw4nna5fhyx2n40"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = stdenv.lib.licenses.mit; - }) {}; - - "json-feed_1_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; version = "1.0.3"; sha256 = "08y6w4sad6f0f5gs3znw9yfp51cskw9q81xq5q70g6glq14lph50"; libraryHaskellDepends = [ @@ -121336,7 +121259,6 @@ self: { ]; description = "JSON Feed"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -123097,13 +123019,16 @@ 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.1"; - sha256 = "1mps3w7d9yq262anpw8zdrhni2xw0idfw9364jh5rjs3fv41h4l1"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.2.0"; + sha256 = "1hkp6zn86bvn817vvxd2yqjgfh76n0ynvyqq2942frl1i0v19ymw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring vector ]; + executableHaskellDepends = [ base base16-bytestring bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring cryptonite HUnit memory parsec QuickCheck quickcheck-instances test-framework test-framework-hunit @@ -123112,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; }) {}; @@ -124390,25 +124315,12 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.4"; - sha256 = "1x0jrsk9jp7k0l6xz7nxrcdkglld1ab21kh6w1a253zklpwd3vz1"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lackey_1_0_5" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; version = "1.0.5"; sha256 = "0ixiqppj7sdkbhp2i6nr4xch82j4r6gxwwn0rvbb0x6wzikkdrf3"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lacroix" = callPackage @@ -125239,17 +125151,17 @@ self: { "language-ats" = callPackage ({ mkDerivation, alex, ansi-wl-pprint, array, base , composition-prelude, containers, cpphs, criterion, deepseq, happy - , hspec, hspec-dirstream, micro-recursion-schemes, microlens - , microlens-th, system-filepath, transformers + , hspec, hspec-dirstream, microlens, recursion-schemes + , system-filepath, transformers }: mkDerivation { pname = "language-ats"; - version = "1.2.0.11"; - sha256 = "1kz30k8fdmnrx5zcyy3kpvr81p50m7bwsxgp5qqjrhk2i1a1igfp"; + version = "1.2.0.15"; + sha256 = "0ldjbsnspn55xbkwcjbyswiqlpf885si5xl2z0n5kvvwmlrgmfkx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq - micro-recursion-schemes microlens microlens-th transformers + microlens recursion-schemes transformers ]; libraryToolDepends = [ alex cpphs happy ]; testHaskellDepends = [ @@ -125268,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 @@ -125443,28 +125355,6 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "6.0.3"; - sha256 = "0rp94hgbh2knz8xn146shgaw0qp6lnp0skxzknsi0l6d3xzzr7qr"; - libraryHaskellDepends = [ - base bytestring containers free megaparsec mtl prettyprinter split - template-haskell text th-lift time - ]; - testHaskellDepends = [ - base bytestring containers directory filepath free Glob hspec HUnit - megaparsec mtl prettyprinter process QuickCheck split - template-haskell text th-lift time - ]; - description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "language-docker_6_0_4" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process - , QuickCheck, split, template-haskell, text, th-lift, time - }: - mkDerivation { - pname = "language-docker"; version = "6.0.4"; sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1"; libraryHaskellDepends = [ @@ -125478,7 +125368,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dockerfile" = callPackage @@ -126039,51 +125928,6 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.19"; - sha256 = "1g6b6dmjx1nk29r55qccvk6csbjig2yc493bmq0dlnqgbn0aiimp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory exceptions - filecache filepath formatting hashable hruby hslogger hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process protolude random - regex-pcre-builtin scientific servant servant-client split stm - strict-base-types text time transformers unix unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers Glob hslogger - http-client lens megaparsec mtl optparse-applicative parallel-io - regex-pcre-builtin strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl - pcre-utils protolude scientific strict-base-types temporary text - transformers unordered-containers vector - ]; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_19_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, filepath - , formatting, Glob, hashable, hruby, hslogger, hspec - , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson - , megaparsec, memory, mtl, operational, optparse-applicative - , parallel-io, parsec, pcre-utils, process, protolude, random - , regex-pcre-builtin, scientific, servant, servant-client, split - , stm, strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; version = "1.3.19.1"; sha256 = "0f1g9sq3ysyjyps8p68wxh1rmjb3v7iw9gmj8zd7wb5kyjlc4xph"; isLibrary = true; @@ -126112,7 +125956,7 @@ self: { ]; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -127642,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 { @@ -128538,8 +128394,8 @@ self: { ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: mkDerivation { pname = "libnotify"; - version = "0.2"; - sha256 = "0nazjlilbz3l32fn11shwxjlabvd2kfpxa7vnirpfp1y6k406mk6"; + version = "0.2.1"; + sha256 = "0a55lmalnn840zbryva19k3z4y79fq2q2qjl88wii3im53x0mzmy"; libraryHaskellDepends = [ base bytestring glib gtk ]; librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; @@ -134461,8 +134317,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.3.3"; - sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8"; + version = "0.5.3.4"; + sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -135223,15 +135079,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "math-functions_0_3_0_0" = callPackage + "math-functions_0_3_0_1" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector, vector-th-unbox }: mkDerivation { pname = "math-functions"; - version = "0.3.0.0"; - sha256 = "19kbc0kyxfjb7lhs2kkla59gqj7ag96r2z8ba2rfhl2104n3709k"; + version = "0.3.0.1"; + sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2"; libraryHaskellDepends = [ base data-default-class deepseq primitive vector vector-th-unbox ]; @@ -136320,25 +136176,6 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.3.3"; - sha256 = "0vwk3fq34f8nnviw7fxpyqx365v4khvjr45pzgxsgc7rfx7hcw9c"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring conduit conduit-extra http-conduit optparse-simple - rio rio-orphans tar-conduit yaml - ]; - description = "Handles uploading to Hackage from mega repos"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mega-sdist_0_3_3_1" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit - , yaml - }: - mkDerivation { - pname = "mega-sdist"; version = "0.3.3.1"; sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww"; isLibrary = false; @@ -136349,7 +136186,6 @@ self: { ]; description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec" = callPackage @@ -136771,8 +136607,8 @@ self: { pname = "menoh"; version = "0.1.1"; sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789"; - revision = "1"; - editedCabalFile = "1mbn1aq24dvaa1amwypik69dmg1x8mm1dz1h4kadzvljc4ld870i"; + revision = "2"; + editedCabalFile = "1hfgg9n86cp3qa9ziycx2134zsvsn76ilkmwrqnc7yb50279dw1b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137275,43 +137111,6 @@ self: { }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.8"; - sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-qq attoparsec base base-compat blaze-markup bytestring - containers data-default either errors html-conduit lens-aeson - network-uri pcre-heavy safe tagsoup text time transformers - unordered-containers vector xml-lens xss-sanitize - ]; - executableHaskellDepends = [ - aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty text wai-cli - wai-extra - ]; - testHaskellDepends = [ - aeson-qq base base-compat bytestring data-default hspec - hspec-expectations-pretty-diff html-conduit mtl network-uri - raw-strings-qq template-haskell text time xml-lens - ]; - description = "A Microformats 2 parser"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "microformats2-parser_1_0_1_9" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base - , base-compat, blaze-html, blaze-markup, bytestring, containers - , data-default, either, errors, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, tagsoup, template-haskell, text, time, transformers - , unordered-containers, vector, wai-cli, wai-extra, xml-lens - , xss-sanitize - }: - mkDerivation { - pname = "microformats2-parser"; version = "1.0.1.9"; sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish"; isLibrary = true; @@ -145620,6 +145419,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-messagepack-rpc" = callPackage + ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions + , text, unordered-containers + }: + mkDerivation { + pname = "network-messagepack-rpc"; + version = "0.1.0.0"; + sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3"; + libraryHaskellDepends = [ + base bytestring data-msgpack safe-exceptions text + unordered-containers + ]; + description = "MessagePack RPC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "network-messagepack-rpc-websocket" = callPackage + ({ mkDerivation, async, base, bytestring, data-msgpack, envy, hspec + , network-messagepack-rpc, QuickCheck, skews, text, websockets + , wss-client + }: + mkDerivation { + pname = "network-messagepack-rpc-websocket"; + version = "0.1.0.0"; + sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6"; + libraryHaskellDepends = [ + base network-messagepack-rpc text websockets wss-client + ]; + testHaskellDepends = [ + async base bytestring data-msgpack envy hspec + network-messagepack-rpc QuickCheck skews text wss-client + ]; + description = "WebSocket backend for MessagePack RPC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-metrics" = callPackage ({ mkDerivation, base, binary, bytestring, data-default, network , random, time @@ -145675,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 @@ -147187,6 +147020,8 @@ self: { pname = "non-empty"; version = "0.3"; sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p"; + revision = "1"; + editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -147194,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 { @@ -150342,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 @@ -151742,6 +151594,55 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "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 + , deepseq, Diff, directory, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls + , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types + , parsec, process, QuickCheck, random, safe, SHA, skylighting + , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, temporary, texmath, text, time, unix + , unordered-containers, vector, weigh, xml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.2.2.1"; + sha256 = "19d6cd8ry735ziazfkk6xhrjbvx5ywpbqmhxr3wbmp8kyp6c7x7m"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring binary blaze-html + blaze-markup bytestring case-insensitive cmark-gfm containers + data-default deepseq directory doctemplates exceptions filepath + Glob haddock-library hslua hslua-module-text HsYAML HTTP + http-client http-client-tls http-types JuicyPixels mtl network + network-uri pandoc-types parsec process random safe SHA skylighting + split syb tagsoup temporary texmath text time unix + unordered-containers vector xml zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + executable-path filepath Glob hslua pandoc-types process QuickCheck + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time + xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion mtl text time weigh + ]; + doCheck = false; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -152701,19 +152602,6 @@ self: { }) {}; "parallel" = callPackage - ({ mkDerivation, array, base, containers, deepseq }: - mkDerivation { - pname = "parallel"; - version = "3.2.1.1"; - sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj"; - revision = "1"; - editedCabalFile = "12sgigg7r4nmyhbfn1p09ajf4s576yca31b7daj5zpp1mxgb5x7i"; - libraryHaskellDepends = [ array base containers deepseq ]; - description = "Parallel programming library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parallel_3_2_2_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, ghc-prim }: mkDerivation { pname = "parallel"; @@ -152722,7 +152610,6 @@ self: { libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parallel-io" = callPackage @@ -159320,8 +159207,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.3"; sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1"; - revision = "1"; - editedCabalFile = "11jrr3xbkc828564sg3cc6ca1qaibbp43lbyrgi32kjy5l97w7y0"; + revision = "2"; + editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; @@ -160654,8 +160541,8 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.2.1.1"; - sha256 = "19rd5ykifa7bv32cyxp8hi942sl7xwav0cqhygp6kngw3vsrsnv8"; + version = "0.3"; + sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core text @@ -161599,25 +161486,6 @@ self: { }: mkDerivation { pname = "pretty-simple"; - version = "2.1.0.0"; - sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base containers mtl parsec text transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-simple_2_1_0_1" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, criterion - , doctest, Glob, mtl, parsec, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; version = "2.1.0.1"; sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs"; isLibrary = true; @@ -161629,7 +161497,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -162000,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 ]; @@ -163412,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 @@ -163497,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"; @@ -163509,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"; @@ -163531,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 @@ -163875,8 +163807,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.6.0"; sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra"; - revision = "1"; - editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n"; + revision = "2"; + editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -164842,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; @@ -165851,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; @@ -166112,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 @@ -167784,27 +167717,6 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.4"; - sha256 = "14ivx9hb7hjy0i7ybz92mcr800zzfspfldzw9jr6qpmrnv43nqdd"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types text uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_1_0_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, text, uuid - }: - mkDerivation { - pname = "ratel"; version = "1.0.5"; sha256 = "0an55fbl8q7d0h4zlpx8vg4kijwmw99f2fvf50nq06c6snlfjg4r"; libraryHaskellDepends = [ @@ -167817,7 +167729,6 @@ self: { ]; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -167826,21 +167737,6 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.0.2"; - sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel-wai_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; version = "1.0.3"; sha256 = "0bkk41qk0040a6sbsc5ky968gw1y5501ji7l2040hwz8j4z8wm84"; libraryHaskellDepends = [ @@ -167848,7 +167744,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-systems" = callPackage @@ -167880,36 +167775,6 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.1.1"; - sha256 = "1wwglqr84ijzrbsrid5cfhm96ljnfdj59z766wjbr8fx5gmrcdfw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit template-haskell - temporary text transformers - ]; - description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rattletrap_4_1_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, template-haskell, temporary, text, transformers - }: - mkDerivation { - pname = "rattletrap"; version = "4.1.2"; sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2"; isLibrary = true; @@ -167931,7 +167796,6 @@ self: { ]; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "raven-haskell" = callPackage @@ -169350,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 @@ -169755,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 { @@ -170910,6 +170795,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_12_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.12.1.0"; + sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -170919,8 +170827,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.7.0.0"; - sha256 = "1kzryjkfkg4f616ijyx28p72v9a45gpvjs7jpksb1by24ll9ly46"; + version = "0.7.0.1"; + sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -170934,7 +170842,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query-HDBC_0_7_0_1" = callPackage + "relational-query-HDBC_0_7_1_1" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic , QuickCheck, quickcheck-simple, relational-query @@ -170943,8 +170851,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.7.0.1"; - sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0"; + version = "0.7.1.1"; + sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -171084,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 @@ -171932,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 @@ -174669,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 @@ -175643,25 +175607,12 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.3"; - sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Semantic version numbers and constraints"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salve_1_0_4" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "salve"; version = "1.0.4"; sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salvia" = callPackage @@ -176239,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 @@ -178169,16 +178120,16 @@ self: { "self-extract" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed - , path, path-io, process, unix-compat, ztar + , path, path-io, unix-compat, ztar }: mkDerivation { pname = "self-extract"; - version = "0.3.1"; - sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556"; + version = "0.3.3"; + sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring Cabal extra file-embed path path-io process + base binary bytestring Cabal extra file-embed path path-io unix-compat ztar ]; executableHaskellDepends = [ base ]; @@ -178945,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 @@ -180999,8 +180952,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.1"; - sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b"; + version = "0.6.2"; + sha256 = "1nlby06n8wkildflwlszcy9iljji19mdfkaw0fnnll0l7gir14v5"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -181018,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 @@ -181026,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 @@ -181223,24 +181176,6 @@ self: { "servius" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring - , http-types, markdown, shakespeare, text, wai, wai-app-static - }: - mkDerivation { - pname = "servius"; - version = "1.2.0.3"; - sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base blaze-builder blaze-html bytestring http-types markdown - shakespeare text wai wai-app-static - ]; - description = "Warp web server with template rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servius_1_2_1_0" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, bytestring , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static }: mkDerivation { @@ -181255,7 +181190,6 @@ self: { ]; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -183241,8 +183175,8 @@ self: { pname = "sign"; version = "0.4.3"; sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp"; - revision = "1"; - editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f"; + revision = "2"; + editedCabalFile = "1j4kxvxd3cl9k2nhlgnx8zrh1ygd0m75q0m2wrqcqv0pf1z39lya"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -184091,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 { @@ -184551,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 @@ -184940,6 +184892,8 @@ self: { pname = "skylighting-core"; version = "0.7.2"; sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq"; + revision = "1"; + editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185161,6 +185115,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "slick" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers, lens + , lens-aeson, mustache, pandoc, shake, text, time + }: + mkDerivation { + pname = "slick"; + version = "0.1.0.2"; + sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm"; + libraryHaskellDepends = [ + aeson base binary bytestring containers lens lens-aeson mustache + pandoc shake text time + ]; + testHaskellDepends = [ + aeson base binary bytestring containers lens lens-aeson mustache + pandoc shake text time + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "slidemews" = callPackage ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers , mtl, pandoc, snap-core, snap-server, utf8-string @@ -186163,6 +186136,8 @@ self: { pname = "snap-templates"; version = "1.0.0.1"; sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c"; + revision = "1"; + editedCabalFile = "0m54p36hvwn3zaixalb5jiy9siq1ksf5da5d0407rys87wfy711b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186354,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 @@ -187690,6 +187665,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "solve" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "solve"; + version = "1.0"; + sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq"; + libraryHaskellDepends = [ base containers ]; + description = "Solving simple games"; + license = stdenv.lib.licenses.mit; + }) {}; + "sonic-visualiser" = callPackage ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl , pretty, utf8-string, xml @@ -190039,6 +190025,8 @@ self: { pname = "stack-prism"; version = "0.1.7"; sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz"; + revision = "1"; + editedCabalFile = "1xd0hcp003ijakpcjgcmllsa65i0924has9wllvsj8i0mnapcni3"; libraryHaskellDepends = [ base profunctors tagged template-haskell transformers ]; @@ -192000,30 +191988,6 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.24.1"; - sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers hashable lens - template-haskell text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring containers hashable hspec - hspec-discover lens template-haskell text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stratosphere_0_24_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , hashable, hspec, hspec-discover, lens, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; version = "0.24.3"; sha256 = "1dvac89fzciklhkkagmhq93sk7mscnp3k4nw9izbfr5gyfdmvvdz"; isLibrary = true; @@ -192039,7 +192003,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stratum-tool" = callPackage @@ -192270,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 ]; @@ -192281,24 +192246,25 @@ self: { }) {}; "streaming-benchmarks" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit - , csv, deepseq, directory, gauge, list-t, list-transformer, logict - , machines, mtl, pipes, random, split, streaming, streamly, text - , transformers, typed-process, vector + ({ mkDerivation, base, bench-graph, bytestring, Chart + , Chart-diagrams, conduit, csv, deepseq, directory, drinkery, gauge + , getopt-generics, machines, mtl, pipes, random, split, streaming + , streamly, template-haskell, text, transformers, typed-process + , vector }: mkDerivation { pname = "streaming-benchmarks"; - version = "0.1.0"; - sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq"; + version = "0.2.0"; + sha256 = "1vpflmvz2vrll9bangl61rdjnngdxbrmpzg3xha8h85ij3458c0x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Chart Chart-diagrams csv directory split text - typed-process + base bench-graph bytestring Chart Chart-diagrams csv directory + getopt-generics split text transformers typed-process ]; benchmarkHaskellDepends = [ - base conduit deepseq gauge list-t list-transformer logict machines - mtl pipes random streaming streamly transformers vector + base conduit deepseq drinkery gauge machines mtl pipes random + streaming streamly template-haskell transformers vector ]; description = "Benchmarks to compare streaming packages"; license = stdenv.lib.licenses.mit; @@ -193075,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 @@ -193373,29 +193342,6 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.5"; - sha256 = "1kzkhq791ycx5q20vg6pfl1y1mirlk9h00s4ii1pf5l56lw6kgq1"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - testHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types markdown-unlit template-haskell text - time transformers - ]; - testToolDepends = [ markdown-unlit ]; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strive_5_0_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "strive"; version = "5.0.6"; sha256 = "0dpf986nbsz5j47dl26073qyz290nznghi85mzj2gw0rlj9dp937"; libraryHaskellDepends = [ @@ -193410,7 +193356,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strptime" = callPackage @@ -193486,8 +193431,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "0.9.3.1"; - sha256 = "0cw358jcdmlvgxsl2cjpb6gfyjizhxhsvlwqh52cwrs87sg9vpsp"; + version = "0.9.4.0"; + sha256 = "1mwrr0brmjb15ncjqapqaslrz3akzn3bs3ajnwsa1d0ji25l2igd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194062,6 +194007,33 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "summoner_1_0_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory + , filepath, generic-deriving, hedgehog, neat-interpolation + , optparse-applicative, process, tasty, tasty-discover + , tasty-hedgehog, text, time, tomland, universum + }: + mkDerivation { + pname = "summoner"; + version = "1.0.5"; + sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring directory filepath + generic-deriving neat-interpolation optparse-applicative process + text time tomland universum + ]; + executableHaskellDepends = [ base universum ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog universum + ]; + testToolDepends = [ tasty-discover ]; + description = "Tool for creating completely configured production Haskell projects"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -194379,8 +194351,8 @@ self: { }: mkDerivation { pname = "superrecord"; - version = "0.5.0.0"; - sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a"; + version = "0.5.0.1"; + sha256 = "0l1zimami83701djj47nk3izb10m6jxszq52zwmb8411dbn9pclb"; libraryHaskellDepends = [ aeson base bytestring constraints deepseq ghc-prim mtl text ]; @@ -194449,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 ]; @@ -194476,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 @@ -198715,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 @@ -198790,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 { @@ -202639,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 @@ -207764,7 +207831,7 @@ self: { }) {}; "udev" = callPackage - ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }: + ({ mkDerivation, base, bytestring, udev, posix-paths, unix }: mkDerivation { pname = "udev"; version = "0.1.0.0"; @@ -207772,12 +207839,12 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; - libraryPkgconfigDepends = [ libudev ]; + libraryPkgconfigDepends = [ udev ]; description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libudev;}; + }) {inherit (pkgs) udev;}; "udp-conduit" = callPackage ({ mkDerivation, base, chunked-data, conduit-combinators @@ -209739,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 { @@ -212003,22 +212081,6 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.0.3.0"; - sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx"; - libraryHaskellDepends = [ - adjunctions base deepseq distributive finite-typelits - indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-sized_1_0_4_0" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive - , finite-typelits, indexed-list-literals, primitive, vector - }: - mkDerivation { - pname = "vector-sized"; version = "1.0.4.0"; sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4"; libraryHaskellDepends = [ @@ -212027,7 +212089,6 @@ self: { ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage @@ -212436,24 +212497,6 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.18"; - sha256 = "1cf37vhj21yd6d1bia7jlwwc0bw6d2lwj7wkl936argn3zzxrqf6"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick containers directory ghc-prof lens scientific text - vector vector-algorithms vty - ]; - description = "Text-based interactive GHC .prof viewer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "viewprof_0_0_0_19" = callPackage - ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens - , scientific, text, vector, vector-algorithms, vty - }: - mkDerivation { - pname = "viewprof"; version = "0.0.0.19"; sha256 = "1v8lnc3naklznwrla34zgx4hf5vzb2762f9p1cxkb5fdnwslbmlc"; isLibrary = false; @@ -212464,7 +212507,6 @@ self: { ]; description = "Text-based interactive GHC .prof viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "views" = callPackage @@ -213545,36 +213587,6 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.22.1"; - sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base bytestring case-insensitive cookie fast-logger hspec - http-types HUnit resourcet text time transformers wai zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_23_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; version = "3.0.23.0"; sha256 = "10chij5jy057q1c4zybmb6jq5kff9i9iqijz31q51s6l0fh1zkw8"; isLibrary = true; @@ -213592,7 +213604,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -215051,40 +215062,6 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.22"; - sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory doctest ghc-prim hashable - hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck silently simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network unix unix-compat - ]; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_23" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, doctest - , gauge, ghc-prim, hashable, hspec, http-client, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; version = "3.2.23"; sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0"; libraryHaskellDepends = [ @@ -215107,7 +215084,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -215490,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 @@ -216949,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; @@ -218396,20 +218372,6 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.9"; - sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wuss_1_1_10" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; version = "1.1.10"; sha256 = "0l4mlmr3b8ndx4nmb3rf0n0bpjxhzxmqv1mslxl432kf02312z09"; libraryHaskellDepends = [ @@ -218417,7 +218379,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wx" = callPackage @@ -219481,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 @@ -221047,14 +221010,14 @@ self: { "yaml" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, resourcet, scientific, semigroups, template-haskell - , temporary, text, transformers, unordered-containers, vector + , conduit, containers, directory, filepath, hspec, HUnit, mockery + , resourcet, scientific, semigroups, template-haskell, temporary + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.8.31.1"; - sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v"; + version = "0.8.32"; + sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -221063,15 +221026,15 @@ self: { filepath resourcet scientific semigroups template-haskell text transformers unordered-containers vector ]; - libraryPkgconfigDepends = [ libyaml ]; testHaskellDepends = [ - aeson base base-compat bytestring conduit directory hspec HUnit - mockery resourcet temporary text transformers unordered-containers - vector + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit mockery resourcet scientific + semigroups template-haskell temporary text transformers + unordered-containers vector ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; + }) {}; "yaml_0_9_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring @@ -221646,6 +221609,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yeshql_4_1_0_1" = callPackage + ({ mkDerivation, base, yeshql-core, yeshql-hdbc }: + mkDerivation { + pname = "yeshql"; + version = "4.1.0.1"; + sha256 = "1dlxq8vp18fagfymlzqa4j0ns174s31d7p1vi54wz0b55ml91if4"; + libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ]; + description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-core" = callPackage ({ mkDerivation, base, containers, convertible, filepath, parsec , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -221665,6 +221640,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yeshql-core_4_1_0_1" = callPackage + ({ mkDerivation, base, containers, convertible, filepath, parsec + , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "yeshql-core"; + version = "4.1.0.1"; + sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn"; + libraryHaskellDepends = [ + base containers convertible filepath parsec template-haskell + ]; + testHaskellDepends = [ + base containers stm tasty tasty-hunit tasty-quickcheck + ]; + description = "YesQL-style SQL database abstraction (core)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-hdbc" = callPackage ({ mkDerivation, base, containers, convertible, filepath, HDBC , parsec, stm, tasty, tasty-hunit, tasty-quickcheck @@ -221686,6 +221680,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yeshql-hdbc_4_1_0_1" = callPackage + ({ mkDerivation, base, containers, convertible, filepath, HDBC + , parsec, stm, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, yeshql-core + }: + mkDerivation { + pname = "yeshql-hdbc"; + version = "4.1.0.1"; + sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc"; + libraryHaskellDepends = [ + base containers convertible filepath HDBC parsec template-haskell + yeshql-core + ]; + testHaskellDepends = [ + base containers HDBC stm tasty tasty-hunit tasty-quickcheck + ]; + description = "YesQL-style SQL database abstraction (HDBC backend)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit @@ -221693,8 +221708,8 @@ self: { }: mkDerivation { pname = "yeshql-postgresql-simple"; - version = "4.1.0.0"; - sha256 = "1dnwlrgnxg3gvfg6xmfrxqvqbi73402g9m82phqb6s624ifjir0c"; + version = "4.1.0.1"; + sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq"; libraryHaskellDepends = [ base containers convertible filepath parsec postgresql-simple template-haskell yeshql-core @@ -221833,35 +221848,6 @@ self: { "yesod-auth" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptonite, data-default, email-validate, file-embed - , http-client, http-client-tls, http-conduit, http-types, memory - , mime-mail, network-uri, nonce, persistent, persistent-template - , random, resourcet, safe, shakespeare, template-haskell, text - , time, transformers, unliftio, unliftio-core, unordered-containers - , wai, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.6.3"; - sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory mime-mail network-uri nonce persistent persistent-template - random resourcet safe shakespeare template-haskell text time - transformers unliftio unliftio-core unordered-containers wai - yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_4_1" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , cryptonite, data-default, email-validate, file-embed, http-client , http-client-tls, http-conduit, http-types, memory, network-uri @@ -221885,7 +221871,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -222421,45 +222406,6 @@ self: { ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec - , hspec-expectations, http-types, HUnit, monad-logger, mtl, network - , old-locale, parsec, path-pieces, primitive, QuickCheck, random - , resourcet, safe, semigroups, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.5"; - sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq deepseq-generics directory fast-logger - http-types monad-logger mtl old-locale parsec path-pieces primitive - random resourcet safe semigroups shakespeare template-haskell text - time transformers unix-compat unliftio unordered-containers vector - wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces QuickCheck random resourcet shakespeare - streaming-commons template-haskell text transformers unliftio wai - wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text transformers - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_6" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie , deepseq, fast-logger, gauge, hspec, hspec-expectations , http-types, HUnit, monad-logger, mtl, network, parsec , path-pieces, random, resourcet, rio, shakespeare @@ -222490,7 +222436,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -222755,29 +222700,6 @@ self: { ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.6.1"; - sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet , semigroups, shakespeare, text, time, transformers, wai , xss-sanitize, yesod-core, yesod-persistent }: @@ -222794,23 +222716,9 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage - ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }: - mkDerivation { - pname = "yesod-form-bootstrap4"; - version = "1.0.0"; - sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq"; - libraryHaskellDepends = [ - base shakespeare text yesod-core yesod-form - ]; - description = "renderBootstrap4"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form-bootstrap4_1_0_2" = callPackage ({ mkDerivation, base, text, yesod-core, yesod-form }: mkDerivation { pname = "yesod-form-bootstrap4"; @@ -222819,7 +222727,6 @@ self: { libraryHaskellDepends = [ base text yesod-core yesod-form ]; description = "renderBootstrap4"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bulma" = callPackage @@ -223719,32 +223626,6 @@ self: { "yesod-test" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, conduit, containers - , cookie, hspec, hspec-core, html-conduit, http-types, HUnit - , network, persistent, pretty-show, semigroups, text, time - , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types - , yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.4"; - sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network persistent pretty-show semigroups text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_5" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, network, pretty-show , semigroups, text, time, transformers, unliftio, wai, wai-extra @@ -223766,7 +223647,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -225651,8 +225531,8 @@ self: { ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { pname = "zmidi-core"; - version = "0.8.2"; - sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh"; + version = "0.9.0"; + sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5"; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Read and write MIDI files"; license = stdenv.lib.licenses.bsd3; @@ -225904,18 +225784,21 @@ self: { }) {}; "ztar" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath, path - , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib + ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq + , directory, extra, filepath, path, path-io, process, QuickCheck + , tasty, tasty-quickcheck, text, unix-compat, zip, zlib }: mkDerivation { pname = "ztar"; - version = "0.1.0"; - sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d"; + version = "0.2.0"; + sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i"; libraryHaskellDepends = [ - base bytestring directory filepath path tar zip zlib + base bytestring deepseq directory filepath path process text + unix-compat zip zlib ]; testHaskellDepends = [ - base extra path path-io QuickCheck tasty tasty-quickcheck + base bytestring bytestring-arbitrary extra path path-io QuickCheck + tasty tasty-quickcheck ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 38e8dfd24c4e7..c7fbab6ab88c0 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/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 87ac65307aabb..95dac230cc556 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -128,7 +128,7 @@ let preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; installPhase = '' export HOME="$TMP" mkdir -p "$out" diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 1cd687058b3a4..ff19e52135c80 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 c2ae87582df63..2ad0bc0285e5a 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 d0ba1912e9a4c..d94d4a5a14d09 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 5cea1fd533f2d..19ac6d3559265 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 de00ebdf2cb06..e9aa2a3dc426b 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 6ea3ac73a4b11..ba0a00b30376a 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 b0eeb89ce431f..848b8666f27de 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 196c899fcea99..8110598e17304 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 271490c995745..09af492490cf2 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 6221bf3fb8433..6d8de7bae27ee 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 5a4893db06375..eb34391e1993c 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -1,15 +1,13 @@ -{ stdenv, fetchurl, readline, compat ? false -, hostPlatform -}: +{ stdenv, fetchurl, readline, compat ? false }: stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.3"; - version = "${luaversion}.4"; + version = "${luaversion}.5"; src = fetchurl { url = "https://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; + sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"; }; buildInputs = [ readline ]; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 73b979e9ca4fa..9ee628f498ee6 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 4deadefcc4bc0..40a70623dcb7e 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 3032b5e4c2a12..52a3c64f81caf 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 18bc875fb334d..be11b38a0b83a 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 2feb15b647dad..2a18dbff9e6eb 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 cd1a0fc6e18f4..fd84d924d7b80 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 7da2cfdd15276..7e583087c083f 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 434c233827092..588880c1e82e5 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 9ea0876b1ce6b..6b9e26e99fcd8 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 ad88895fa67d5..adee8d594f18b 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 e68cfc3148ffd..95a893a209c12 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/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 36d1a8326e70b..d002f6eb31c1e 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -5,7 +5,7 @@ , readline, sqlite , disableDocs ? false , CoreFoundation -, gsettings_desktop_schemas +, gsettings-desktop-schemas }: let @@ -20,7 +20,7 @@ let glib gmp gtk3 - gsettings_desktop_schemas + gsettings-desktop-schemas libedit libjpeg libpng @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ] + buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; preConfigure = '' diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 8a13c4efce611..4d98f18eee4a7 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 bd27041ba2d2c..9e6d35b818f40 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 31ef51802ed61..594bbc05b7ceb 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 3bf4ba2dc2f01..a472ccaafbf2d 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 a6dfec49b2a25..77154b54fd8fe 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 cceec44e6ae60..a3c3b2bf96f68 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 df87f51768df5..ca7cc7027be71 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 e9ce5b1ce8cf8..8cc79dc1d228a 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 912ea53c3d3ac..60fafd60ad0b6 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 219c8df803b76..24e06b0d65a9a 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 703679ba3a55a..ec93e2f64671f 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 8b787855c4dee..580cd1bd73f5b 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 8805dc74a26c3..093bb811489fc 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 003fce0ea8c31..09ca4908d7891 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 214abb21f2cda..736c9a2f9e0ce 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 5ae9ead9ced41..503e4b0fa43b2 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 cdc660ca3f326..11b94a0181a19 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 1e764aff4cc1f..397e80961e064 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 4486149cfcef3..db46412ceb554 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 47250f2b3da28..a4e4968f562f7 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 64e3690eb3e64..880a2824fb0a8 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, bash, pkgconfig }: +{ stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { name = "capstone-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; + sha256 = "1wbd1g3r32ni6zd9vwrq3kn7fdp9y8qwn9zllrrbk8n5wyaxcgci"; }; configurePhase = '' patchShebangs make.sh ''; diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 7c44c2e0ab0cf..7cb75d8de0f39 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 eba94288e8fe0..705aa7252d1f7 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 c1bf789c59bd7..ba5b2aa43718a 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 fb12921817566..c3ca9aa442bd2 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 c17a140b9c570..013913e529725 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 ea7d920dc8283..40c633dda523c 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 e4d1fa2073fab..62014489f30c0 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/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 5287db756094c..710338842f8d2 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation { - name = "elementary-cmake-modules"; +stdenv.mkDerivation rec { + name = "elementary-cmake-modules-${version}"; + version = "0.1.0"; src = fetchFromGitHub { owner = "elementary"; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index e341ce842eb66..79b29a90463ee 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 5169688614820..04d085bde73c9 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 c5ce5e252fac6..34c649022cf5b 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 a3ce9ea9c2bf8..4607d3e2f1975 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 3d9027db1602e..e763e5c1159ca 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 9e76c1e640017..a1cc11fb8c1e7 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/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index a229beb5ccb89..e769cb5051345 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 -, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc -, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: +, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }: let version = "0.99.3"; - desktop_schemas = gnome3.gsettings_desktop_schemas; + desktop_schemas = gnome3.gsettings-desktop-schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -28,12 +28,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection - gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper + gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ - bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xlibs.libXau + bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp + libsoup lzma ostree polkit python3 systemd xorg.libXau ]; checkInputs = [ valgrind ]; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/flatpak \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" ''; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 67bf7503db987..2b3f75b80dbd3 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals withBlas [ "--with-blas=${openblas}" ]; + + # issues with ntl -- https://github.com/wbhart/flint2/issues/487 + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + patches = [ (fetchpatch { # Always produce libflint.so.MAJOR; will be included in the next flint version diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index ccf2d6d058559..2b6a949c23269 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 c2d99446d81b7..01c4140f3b5ca 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 8b534edd2498a..76e89b97617e2 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 2f5374851d820..e15626a160e27 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 23aa86af377c5..fce052aeb223a 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 6745bc1ecf5fa..d700c3d3c1604 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 d2987be6a3d50..ccfa7e536111d 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/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 5796425e4385a..56d8cd21f844f 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -3,7 +3,7 @@ , python3Packages , wrapGAppsHook , atk -, dbus_libs +, dbus , evemu , frame , gdk_pixbuf @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { [ pygobject3 ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; - buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail + buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix deleted file mode 100644 index eb7a6d6aaf21a..0000000000000 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip -, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection -}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "geoclue-2.4.8"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook gobjectIntrospection - ]; - - buildInputs = [ glib json-glib libsoup geoip - dbus dbus-glib avahi - ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; - - propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ]; - - preConfigure = '' - substituteInPlace configure --replace "-Werror" "" - ''; - - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++ - optionals stdenv.isDarwin [ - "--disable-silent-rules" - "--disable-3g-source" - "--disable-cdma-source" - "--disable-modem-gps-source" - "--disable-nmea-source" ]; - - postInstall = '' - sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" - ''; - - meta = with stdenv.lib; { - description = "Geolocation framework and some data providers"; - homepage = https://freedesktop.org/wiki/Software/GeoClue/; - maintainers = with maintainers; [ raskin garbas ]; - platforms = with platforms; linux ++ darwin; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index bf0af502d017c..2588d7f3d547c 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,36 +1,56 @@ -{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2, - libxslt, glib-networking }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf +, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection +, withDemoAgent ? false +}: + +with stdenv.lib; stdenv.mkDerivation rec { - name = "geoclue-0.12.0"; + name = "geoclue-${version}"; + version = "2.4.10"; + src = fetchurl { - url = "https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz"; - sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; + url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4"; }; - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ]; - - propagatedBuildInputs = [dbus glib dbus-glib]; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - sed -e '/-Werror/d' -i configure + outputs = [ "out" "dev" "devdoc" ]; + + nativeBuildInputs = [ + pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection + ]; + + buildInputs = [ + glib json-glib libsoup avahi + ] ++ optionals withDemoAgent [ + libnotify gdk_pixbuf + ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; + + propagatedBuildInputs = [ glib glib-networking ]; + + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--enable-introspection" + "--enable-gtk-doc" + "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}" + ] ++ optionals stdenv.isDarwin [ + "--disable-silent-rules" + "--disable-3g-source" + "--disable-cdma-source" + "--disable-modem-gps-source" + "--disable-nmea-source" + ]; + + # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73 + postInstall = '' + sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; + maintainers = with maintainers; [ raskin garbas ]; + platforms = with platforms; linux ++ darwin; license = licenses.lgpl2; }; - - passthru = { - updateInfo = { - downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/"; - }; - }; } diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index b92f6e61f56a5..83030a7a01422 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/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index fafcf82258ab1..af0830ab70421 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; + buildInputs = [ xlibsWrapper libXmu libXi ] + ++ optionals stdenv.isDarwin [ AGL ]; propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ff870f525f23b..8a07a9f9f2276 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,10 +1,11 @@ -{ 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 # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false +, coreutils, dbus, libxml2, tzdata, desktop-file-utils +, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5c504d0d8e25f..8b4a213aae051 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 472ec83fb02c4..a81cd91fdc76c 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 984603827c8d3..081d896a6e0b8 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 6cdd19f307dfd..6155b8b18bd0f 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 94c09b716832e..e7da60a9d1a22 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 720ff06ceaa50..9c19bdbdc29a0 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 4f952359f7111..37d4843db8d45 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 dfd3383cdbad0..49216b70fe12f 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 11e0894df3c35..ad7309be04453 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 8371b27804092..db75705c825ab 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 75583624f5457..9c47ef0260b4e 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 ac680f8432ab0..2f46016adac81 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 11b451e76fdfc..7255894f3b1fe 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 f206a169b93de..c0dc0753cd013 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/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 642e10ea541d3..75818f756921a 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst_plugins_base }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }: stdenv.mkDerivation rec { name = "gupnp-dlna-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - buildInputs = [ gupnp gst_plugins_base ]; + buildInputs = [ gupnp gst-plugins-base ]; meta = { homepage = https://wiki.gnome.org/Projects/GUPnP/; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 7ac5b8756335f..86cbd01a60261 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 ee8a5107b341f..9f0a6c34512ff 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 ee868d371ce5e..705fb816b2e5e 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 3568edb7890ce..8abff4c5f0592 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 ed500ca518fd3..a5b226ee9c744 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 4dfe190124b17..d78c59e9c25a0 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 5280a95afb401..5f6a6f51a5220 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 eff57d6f2fd9e..cf9c554d57f4a 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 8731bd8e73664..b9dcc927172f6 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 a9b5d596b395c..be83dbc52f455 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/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index a74340a6dc969..66f10f4abc1e6 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch @@ -1,21 +1,23 @@ -Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -=================================================================== ---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake -+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -@@ -200,32 +200,6 @@ +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index 52b2eb2..a04596c 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -232,34 +232,6 @@ # GNUInstallDirs code deals with re-configuring, but that is dealt with # by the _define_* macros in this module). set(_LIBDIR_DEFAULT "lib") -# Override this default 'lib' with 'lib64' iff: -# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling -# - we are NOT on debian +-# - we are NOT on flatpak -# - we are on a 64 bits system -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" -# See http://wiki.debian.org/Multiarch -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) +- AND NOT CMAKE_CROSSCOMPILING +- AND NOT DEFINED ENV{FLATPAK_ID}) - if (EXISTS "/etc/debian_version") # is this a debian system ? - if(CMAKE_LIBRARY_ARCHITECTURE) - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9b4f26a906334..1d389f914ddf4 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.47/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index cd5f2163dd955..d5a407ee16f26 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 7aabeb021545e..34e01b4c1b623 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/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 0a600fe8d0570..68b5c08aa0909 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, + extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, karchive, ki18n, qtbase, perl, perlPackages }: @@ -24,7 +24,7 @@ mkDerivation { patches = [ ./kdoctools-no-find-docbook-xml.patch ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook" ]; postFixup = '' moveToOutput "share/doc" "$dev" diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index ae945ab73384e..ca015151e0f1c 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 c0b4b63128610..6779faa50cdcf 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 3efd4cf4e2a8b..c633aee30a1be 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/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d0db2284509b6..1ad2254ccf895 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/attica-5.47.0.tar.xz"; - sha256 = "17i580hhi9rpd6d4nf408snlnf8xivwskkzbjja0snajx0nrd8bj"; - name = "attica-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz"; + sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8"; + name = "attica-5.48.0.tar.xz"; }; }; baloo = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/baloo-5.47.0.tar.xz"; - sha256 = "15jpbl47pr86h5ji2x3079b6x38fchc2pf03rjqlf5mgkabdpafq"; - name = "baloo-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz"; + sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj"; + name = "baloo-5.48.0.tar.xz"; }; }; bluez-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/bluez-qt-5.47.0.tar.xz"; - sha256 = "1pqgvpgr9xmgv8cxgvqx08jnabgmgzh2skkhwc9d9rdc2i4g7b1k"; - name = "bluez-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz"; + sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949"; + name = "bluez-qt-5.48.0.tar.xz"; }; }; breeze-icons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/breeze-icons-5.47.0.tar.xz"; - sha256 = "0fyzk196r8r0mzvijs9ws8ldh5vrw4yrgnvd1szb57vyy1agnnd7"; - name = "breeze-icons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz"; + sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh"; + name = "breeze-icons-5.48.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/extra-cmake-modules-5.47.0.tar.xz"; - sha256 = "1591d27r6a2b7jn6zi2ik0i195pvl014dwxfpxv974hbbb8qnvcp"; - name = "extra-cmake-modules-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz"; + sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw"; + name = "extra-cmake-modules-5.48.0.tar.xz"; }; }; frameworkintegration = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/frameworkintegration-5.47.0.tar.xz"; - sha256 = "0iwdfa7q8ryszsl2w3bgix8bxkn3jj2lfdlcicfz9qh6av76p4yf"; - name = "frameworkintegration-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz"; + sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y"; + name = "frameworkintegration-5.48.0.tar.xz"; }; }; kactivities = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kactivities-5.47.0.tar.xz"; - sha256 = "01h5a4m0wkgz1gafhbqdidxdr2x6g5siwcx4csv9293pc5xf0qcd"; - name = "kactivities-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz"; + sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8"; + name = "kactivities-5.48.0.tar.xz"; }; }; kactivities-stats = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kactivities-stats-5.47.0.tar.xz"; - sha256 = "0linsga4d7lincnpj747wnbgidp2x7xk3jzh31lpfq8izkmqz1q5"; - name = "kactivities-stats-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz"; + sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6"; + name = "kactivities-stats-5.48.0.tar.xz"; }; }; kapidox = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kapidox-5.47.0.tar.xz"; - sha256 = "1z2ka5fnwqsmjhxdbahk7gkjmhgzndg3lq6196dmpws1zjqf14vq"; - name = "kapidox-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz"; + sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4"; + name = "kapidox-5.48.0.tar.xz"; }; }; karchive = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/karchive-5.47.0.tar.xz"; - sha256 = "0r8xxfg1wsnpzyfggpzhxap853gqfsnmbci1al6xyd0pslgcsb5r"; - name = "karchive-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz"; + sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6"; + name = "karchive-5.48.0.tar.xz"; }; }; kauth = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kauth-5.47.0.tar.xz"; - sha256 = "1s80grzkxvbkw39z5xida50ijb0k3aqy80k5h0025m9rqpbc7ir9"; - name = "kauth-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz"; + sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7"; + name = "kauth-5.48.0.tar.xz"; }; }; kbookmarks = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kbookmarks-5.47.0.tar.xz"; - sha256 = "0b4b2yp3pvlisf0g1gwnisn2rc94wn874aad3dlg0607kd11xmwk"; - name = "kbookmarks-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz"; + sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar"; + name = "kbookmarks-5.48.0.tar.xz"; }; }; kcmutils = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcmutils-5.47.0.tar.xz"; - sha256 = "0qpsjijd51cxmp3y8knr6k6bx8bg5hhngsh63nr8yskpms38kj5d"; - name = "kcmutils-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz"; + sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw"; + name = "kcmutils-5.48.0.tar.xz"; }; }; kcodecs = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcodecs-5.47.0.tar.xz"; - sha256 = "1qhdj54cx98dqdy8bqkxm8jgq8mm2i7l3h9vyd2bvvzc8nzhd1hv"; - name = "kcodecs-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz"; + sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n"; + name = "kcodecs-5.48.0.tar.xz"; }; }; kcompletion = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcompletion-5.47.0.tar.xz"; - sha256 = "1wdw434bi90ldmdxw8wpkgszligqapy19klpnn528vh3gv5is00p"; - name = "kcompletion-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz"; + sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp"; + name = "kcompletion-5.48.0.tar.xz"; }; }; kconfig = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kconfig-5.47.0.tar.xz"; - sha256 = "0ifv7i6w7jz221rw07vb40sljx95kdjhxd7l9nfx95dbd5bjb0nq"; - name = "kconfig-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz"; + sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3"; + name = "kconfig-5.48.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kconfigwidgets-5.47.0.tar.xz"; - sha256 = "05pxa7519f0730wrbh2bsqzfvc9dwvrh8l9vjh24rkaiaxnzhd6k"; - name = "kconfigwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz"; + sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9"; + name = "kconfigwidgets-5.48.0.tar.xz"; }; }; kcoreaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcoreaddons-5.47.0.tar.xz"; - sha256 = "0ihbggv5ziazhv66cnc6d4h4m2bci0cgwh498k49phaagrsh9zs0"; - name = "kcoreaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz"; + sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f"; + name = "kcoreaddons-5.48.0.tar.xz"; }; }; kcrash = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kcrash-5.47.0.tar.xz"; - sha256 = "15wn4g7c26f3cpk7q2imci7p8pmcksw47h6csihyvlpi3b6ykqg9"; - name = "kcrash-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz"; + sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8"; + name = "kcrash-5.48.0.tar.xz"; }; }; kdbusaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdbusaddons-5.47.0.tar.xz"; - sha256 = "04270rnfmasb9cq7kj40wny7vgkb7hksjnhr4sgyg4v2p8v5dmib"; - name = "kdbusaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz"; + sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr"; + name = "kdbusaddons-5.48.0.tar.xz"; }; }; kdeclarative = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdeclarative-5.47.0.tar.xz"; - sha256 = "183l926yyhdw270rcwqh2lf1rjd4a9vbkcjlqyss2k7d79mj6m9s"; - name = "kdeclarative-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz"; + sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd"; + name = "kdeclarative-5.48.0.tar.xz"; }; }; kded = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kded-5.47.0.tar.xz"; - sha256 = "0z5xsxalxasnyhhkvy247a08l37012fiaahwyy0477p7p5x3c845"; - name = "kded-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz"; + sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954"; + name = "kded-5.48.0.tar.xz"; }; }; kdelibs4support = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kdelibs4support-5.47.0.tar.xz"; - sha256 = "1rij23ns9axlwi2fvbiz2wv3y3vh1p9cm3nxkkrj3axc0hs39n20"; - name = "kdelibs4support-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz"; + sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf"; + name = "kdelibs4support-5.48.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdesignerplugin-5.47.0.tar.xz"; - sha256 = "0ijdjjfqj2wpl0jrr2n90i74d378986lkqwdicig2rwkylsivr1g"; - name = "kdesignerplugin-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz"; + sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l"; + name = "kdesignerplugin-5.48.0.tar.xz"; }; }; kdesu = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdesu-5.47.0.tar.xz"; - sha256 = "1rc2v13d4i0wwzmgrbwf6i6khcd4wfa79flq764cvx62flingfvr"; - name = "kdesu-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz"; + sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5"; + name = "kdesu-5.48.0.tar.xz"; }; }; kdewebkit = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdewebkit-5.47.0.tar.xz"; - sha256 = "1yg4lydz03y6cc1f44larfd4xnvnbnzpkfa97qxjzvvrk06hdxx3"; - name = "kdewebkit-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz"; + sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv"; + name = "kdewebkit-5.48.0.tar.xz"; }; }; kdnssd = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdnssd-5.47.0.tar.xz"; - sha256 = "0xgv4fvhyr3gk99vaicq45zqf5mnbc4xpyz66jfhsk1w655bqijp"; - name = "kdnssd-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz"; + sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5"; + name = "kdnssd-5.48.0.tar.xz"; }; }; kdoctools = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kdoctools-5.47.0.tar.xz"; - sha256 = "06zlk04ldi9cq3ricni74s3737gmvs73g2k9mgfkdjq5grcsw177"; - name = "kdoctools-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz"; + sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8"; + name = "kdoctools-5.48.0.tar.xz"; }; }; kemoticons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kemoticons-5.47.0.tar.xz"; - sha256 = "1hg72mf629g67wll5b80rw9k85qia1jdfhabg64vy7n7i9fm912y"; - name = "kemoticons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz"; + sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9"; + name = "kemoticons-5.48.0.tar.xz"; }; }; kfilemetadata = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kfilemetadata-5.47.0.tar.xz"; - sha256 = "0ywp45akvn0cky757azkf6p4ql2l02xy7fplbhv7j6qz39s0p2vm"; - name = "kfilemetadata-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz"; + sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f"; + name = "kfilemetadata-5.48.0.tar.xz"; }; }; kglobalaccel = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kglobalaccel-5.47.0.tar.xz"; - sha256 = "1lcac55kanddpn6nphmyixp33mk8zmhfih7p9vzhnxvrc5k9r6hb"; - name = "kglobalaccel-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz"; + sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7"; + name = "kglobalaccel-5.48.0.tar.xz"; }; }; kguiaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kguiaddons-5.47.0.tar.xz"; - sha256 = "14pivzmpsmmqrhvmvlc10fc7mc6gdq214qy27r4dsxmjdvgljhhj"; - name = "kguiaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz"; + sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz"; + name = "kguiaddons-5.48.0.tar.xz"; }; }; kholidays = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kholidays-5.47.0.tar.xz"; - sha256 = "001misp4bdd4q05ns4bch7gx1j8h2wpa2is7zdazqy0bp1blsfwb"; - name = "kholidays-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz"; + sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4"; + name = "kholidays-5.48.0.tar.xz"; }; }; khtml = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/khtml-5.47.0.tar.xz"; - sha256 = "1c9fja1mb2jrlrial2mz2bvw004s14kn7jnakawqg0d19fhlqg1h"; - name = "khtml-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz"; + sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1"; + name = "khtml-5.48.0.tar.xz"; }; }; ki18n = { - version = "5.47.0"; + version = "5.48.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ki18n-5.47.0.tar.xz"; - sha256 = "1a190wf2ms09cwzpk1ylx7kjfz8yvzv2p14fjwyld6vf32hgl9r6"; - name = "ki18n-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz"; + sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h"; + name = "ki18n-5.48.1.tar.xz"; }; }; kiconthemes = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kiconthemes-5.47.0.tar.xz"; - sha256 = "14j8d1glrcd6a9xn86jxa7wx80bpf5wax5vkv09swcbbshp7vqdp"; - name = "kiconthemes-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz"; + sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4"; + name = "kiconthemes-5.48.0.tar.xz"; }; }; kidletime = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kidletime-5.47.0.tar.xz"; - sha256 = "0dirflwwnq83nxml66kk4bf70nl04dhrg8pvh9md3hip5cn6mq2f"; - name = "kidletime-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz"; + sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm"; + name = "kidletime-5.48.0.tar.xz"; }; }; kimageformats = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kimageformats-5.47.0.tar.xz"; - sha256 = "19j6wdfv9yncdgcm5ij0rz5rv0a3jlgdnwmyrw1gjyz5isv2qp4f"; - name = "kimageformats-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz"; + sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc"; + name = "kimageformats-5.48.0.tar.xz"; }; }; kinit = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kinit-5.47.0.tar.xz"; - sha256 = "1rc0ig4gw7lkvkpwcik6krn5w1zqj6y710c58i9kr9vxxpffj170"; - name = "kinit-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz"; + sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a"; + name = "kinit-5.48.0.tar.xz"; }; }; kio = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kio-5.47.0.tar.xz"; - sha256 = "0847dxrhdywrx2v6knf6l70slm8dfz4n4j1c1si13jrj1fp2w4ji"; - name = "kio-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz"; + sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0"; + name = "kio-5.48.0.tar.xz"; }; }; kirigami2 = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kirigami2-5.47.0.tar.xz"; - sha256 = "1mdahdb5z0i9bf63480b2j6xm7cgsh1anx0cljn2hivglpixjbgd"; - name = "kirigami2-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz"; + sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52"; + name = "kirigami2-5.48.0.tar.xz"; }; }; kitemmodels = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kitemmodels-5.47.0.tar.xz"; - sha256 = "0151arf7s5ns2qadn86z385i9v9z8rga0jcj8pnw329k4pjpc2ks"; - name = "kitemmodels-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz"; + sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf"; + name = "kitemmodels-5.48.0.tar.xz"; }; }; kitemviews = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kitemviews-5.47.0.tar.xz"; - sha256 = "0dnk7y50d5wxpl4fppb0hdzy5w6xa04a178y49zggpjm5x048mp5"; - name = "kitemviews-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz"; + sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w"; + name = "kitemviews-5.48.0.tar.xz"; }; }; kjobwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kjobwidgets-5.47.0.tar.xz"; - sha256 = "05vgqm3nfpbwbnv46ajb8hc5wzs1444513ahay1qn8vpah4kqbpp"; - name = "kjobwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz"; + sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w"; + name = "kjobwidgets-5.48.0.tar.xz"; }; }; kjs = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kjs-5.47.0.tar.xz"; - sha256 = "1rhvmdwmsr48ih0qrpwphiwcl25af8shwj8nrkq619krc549gf8q"; - name = "kjs-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz"; + sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4"; + name = "kjs-5.48.0.tar.xz"; }; }; kjsembed = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kjsembed-5.47.0.tar.xz"; - sha256 = "104nv33zpqh78zxqj1z9sj6cyliv0l9gzgmsc4n9nq9fcr1f2hdd"; - name = "kjsembed-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz"; + sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx"; + name = "kjsembed-5.48.0.tar.xz"; }; }; kmediaplayer = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kmediaplayer-5.47.0.tar.xz"; - sha256 = "0cz0m2sa48893p6vq4pm92xmvq2aqqgfmijlskzdpd3gp3x9l1qw"; - name = "kmediaplayer-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz"; + sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq"; + name = "kmediaplayer-5.48.0.tar.xz"; }; }; knewstuff = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knewstuff-5.47.0.tar.xz"; - sha256 = "04zn4iy0gy00d835qjfmb0prm802ggphj4aw328v29474nqs14nf"; - name = "knewstuff-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz"; + sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv"; + name = "knewstuff-5.48.0.tar.xz"; }; }; knotifications = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knotifications-5.47.0.tar.xz"; - sha256 = "08cm2aks35lzspchyb6p25bfk4mrljb6wf7yi29674k4kg7gr6sv"; - name = "knotifications-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz"; + sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb"; + name = "knotifications-5.48.0.tar.xz"; }; }; knotifyconfig = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/knotifyconfig-5.47.0.tar.xz"; - sha256 = "0zava15sabmxc38ngmw9yylwnm27h8ah8df0jadxbqjpaaf0jssl"; - name = "knotifyconfig-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz"; + sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm"; + name = "knotifyconfig-5.48.0.tar.xz"; }; }; kpackage = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpackage-5.47.0.tar.xz"; - sha256 = "1pwlvcmn9crjgqf1ccwb86zq962jnwavx6h6dcx7vb982z772j98"; - name = "kpackage-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz"; + sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr"; + name = "kpackage-5.48.0.tar.xz"; }; }; kparts = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kparts-5.47.0.tar.xz"; - sha256 = "1b21kmn8bjq69qhldacqpby9pa56c4y8j84kkwailylk3nngilsf"; - name = "kparts-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz"; + sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv"; + name = "kparts-5.48.0.tar.xz"; }; }; kpeople = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpeople-5.47.0.tar.xz"; - sha256 = "13x1f5jwxhmdq5qq43qzfmxm20j95dwa0fck1ns1rg8k7gazmdqb"; - name = "kpeople-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz"; + sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7"; + name = "kpeople-5.48.0.tar.xz"; }; }; kplotting = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kplotting-5.47.0.tar.xz"; - sha256 = "0sw448g5wa2gz6krzp7d8q1ryh6qs51hgxv432fjpblijnwzb6xx"; - name = "kplotting-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz"; + sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg"; + name = "kplotting-5.48.0.tar.xz"; }; }; kpty = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kpty-5.47.0.tar.xz"; - sha256 = "1q4hkm701ridf07a4m93zvifi1sk6vn8z1h0b1rz5srxasaxnxlh"; - name = "kpty-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz"; + sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk"; + name = "kpty-5.48.0.tar.xz"; }; }; kross = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/portingAids/kross-5.47.0.tar.xz"; - sha256 = "13nav8fihj1pammiwz8na482qpsmcxmyxd47rqhwldvxz1z0kbq1"; - name = "kross-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz"; + sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q"; + name = "kross-5.48.0.tar.xz"; }; }; krunner = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/krunner-5.47.0.tar.xz"; - sha256 = "0j3j6831y5j96cl19jdwcnd9h4rl95ymj3gy5sxilazgafzfihbd"; - name = "krunner-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz"; + sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn"; + name = "krunner-5.48.0.tar.xz"; }; }; kservice = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kservice-5.47.0.tar.xz"; - sha256 = "0ryipmvydh924zjpfzmwivwagaad9dicnfcfa4drrygbwnm60bd9"; - name = "kservice-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz"; + sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis"; + name = "kservice-5.48.0.tar.xz"; }; }; ktexteditor = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ktexteditor-5.47.0.tar.xz"; - sha256 = "1k089k9ssk06734wnjyfmvlgxy2hqxh7fgy5qiyjvp807kmf4jkb"; - name = "ktexteditor-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz"; + sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7"; + name = "ktexteditor-5.48.0.tar.xz"; }; }; ktextwidgets = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/ktextwidgets-5.47.0.tar.xz"; - sha256 = "19w84d6v8yrci4fb6c7m91q2ykc9p24cf85cnm6lsb8ggis4dsyr"; - name = "ktextwidgets-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz"; + sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg"; + name = "ktextwidgets-5.48.0.tar.xz"; }; }; kunitconversion = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kunitconversion-5.47.0.tar.xz"; - sha256 = "0avm3g78zfzrh4h6ampf54n9j715ii5cra8praq0waiy94idn7cq"; - name = "kunitconversion-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz"; + sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db"; + name = "kunitconversion-5.48.0.tar.xz"; }; }; kwallet = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwallet-5.47.0.tar.xz"; - sha256 = "0hy3kzkcqbzkjkvnaaanfdcnwcidnbw6j14ifvhlh2padql7kyix"; - name = "kwallet-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz"; + sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr"; + name = "kwallet-5.48.0.tar.xz"; }; }; kwayland = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwayland-5.47.0.tar.xz"; - sha256 = "0j15xzlzxqi0g8lj5k9w0lbnvx26h6bblgz8rhqlkl80ml2wzgfv"; - name = "kwayland-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz"; + sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4"; + name = "kwayland-5.48.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwidgetsaddons-5.47.0.tar.xz"; - sha256 = "0d2sxh6g7igjdsgj9agknx8zvymyvq9rb0xkfbr044vg5q0g99js"; - name = "kwidgetsaddons-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz"; + sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7"; + name = "kwidgetsaddons-5.48.0.tar.xz"; }; }; kwindowsystem = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kwindowsystem-5.47.0.tar.xz"; - sha256 = "1hfbjy17b6iw6443a3zw304syi4j0vid7nmm5hqdv8685lnp4wx6"; - name = "kwindowsystem-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz"; + sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n"; + name = "kwindowsystem-5.48.0.tar.xz"; }; }; kxmlgui = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kxmlgui-5.47.0.tar.xz"; - sha256 = "194linh0px5mk404hbgrzcfx9zblk4q835nvj4lrbl62nffzwnlp"; - name = "kxmlgui-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz"; + sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h"; + name = "kxmlgui-5.48.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/kxmlrpcclient-5.47.0.tar.xz"; - sha256 = "1wmsycpg5yljdpa0slv47baqpag6jzg75g0l2jddl3knznp7br8i"; - name = "kxmlrpcclient-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz"; + sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40"; + name = "kxmlrpcclient-5.48.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/modemmanager-qt-5.47.0.tar.xz"; - sha256 = "00wxsc4wz5fflld4h1w77726w1c06g1ql5qld2r30yibx1fb2slb"; - name = "modemmanager-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz"; + sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im"; + name = "modemmanager-qt-5.48.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/networkmanager-qt-5.47.0.tar.xz"; - sha256 = "02c2d1jm3azzbwd52awq6ikjsgfg9f2dc12dkw14zkz41r87gcyh"; - name = "networkmanager-qt-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz"; + sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v"; + name = "networkmanager-qt-5.48.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/oxygen-icons5-5.47.0.tar.xz"; - sha256 = "19w7ab5b7qdhj3j0pg8378k918kwjd1m5lm13jdg2kkn1f4j0j4m"; - name = "oxygen-icons5-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz"; + sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw"; + name = "oxygen-icons5-5.48.0.tar.xz"; }; }; plasma-framework = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/plasma-framework-5.47.0.tar.xz"; - sha256 = "1d3f2k5y966jnwrjps1x5lx9scpakq3ri3111m5h0vidkrlvnhsa"; - name = "plasma-framework-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz"; + sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82"; + name = "plasma-framework-5.48.0.tar.xz"; }; }; prison = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/prison-5.47.0.tar.xz"; - sha256 = "17j12mg11fnjnlj04fzxd5x95cs2f34xc2lk09hjlm7ihkw932xh"; - name = "prison-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz"; + sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q"; + name = "prison-5.48.0.tar.xz"; }; }; purpose = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/purpose-5.47.0.tar.xz"; - sha256 = "1symzvzk50d3szz2rh7c9jd60hzpvlv6d8n7r6j9rzrplvshk879"; - name = "purpose-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz"; + sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp"; + name = "purpose-5.48.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/qqc2-desktop-style-5.47.0.tar.xz"; - sha256 = "1w897ixs0bfhzrzq8v4yg3rsrd8zmb08j5xh52ysb4mp7zs8jcyk"; - name = "qqc2-desktop-style-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz"; + sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an"; + name = "qqc2-desktop-style-5.48.0.tar.xz"; }; }; solid = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/solid-5.47.0.tar.xz"; - sha256 = "041fvxxlazbpdl5ncdpxzj8jq48rk31kd1nqsm8p5wqglzrz6dsl"; - name = "solid-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz"; + sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns"; + name = "solid-5.48.0.tar.xz"; }; }; sonnet = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/sonnet-5.47.0.tar.xz"; - sha256 = "14nfrv1z1lpjhxsxhjx8bi88yp1qx4dzwf6v22w0mk71qc6z2rgr"; - name = "sonnet-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz"; + sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4"; + name = "sonnet-5.48.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/syntax-highlighting-5.47.0.tar.xz"; - sha256 = "0bv25cv3xvhl9v23dn3yxhdcv5ag2i1zhvna6gnng6k30n316v0c"; - name = "syntax-highlighting-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz"; + sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5"; + name = "syntax-highlighting-5.48.0.tar.xz"; }; }; threadweaver = { - version = "5.47.0"; + version = "5.48.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.47/threadweaver-5.47.0.tar.xz"; - sha256 = "0h48b6mvgq3igbs6jzngj1iad7m5kgkird17shk86ma79k6igriz"; - name = "threadweaver-5.47.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz"; + sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125"; + name = "threadweaver-5.48.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cf4b85043bb27..194b57c053426 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 c6c3ba53d2c38..5c53f5e6ad5da 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 3f44dbb9c1389..256989992c5a0 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 853d23c974586..dcff8c2757e1f 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 61b4559ebab0c..2c418c1bc5f57 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 1147322be6da8..6ea449387172b 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 7defa71fc0ee1..01a78b5b4be64 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 5791b0808b4a3..e9ba4ae5ac212 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 fde8a06eb4162..0c0fc3861c9ea 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 b726d9c2b42aa..5eb90aaf05c91 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 8b2f0b0da92db..3a1b77525143d 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 3f244d399f7e7..c02e2108f2376 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/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index e84df0c1aedf9..b5402984d16f0 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml -, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key +, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml +, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 418e9cf0b5733..e4864aded279f 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 4f0ba439417f2..4f4007649d04c 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 7f4eaa5fd14b4..295028abc97d8 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 34ba39d799ed5..1342ee6773f71 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 bc4cea1b47022..c68e171084b93 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 b1a6238a37801..d150d4a003309 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 05c320c42aecc..5e94d00dcdb7d 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 652848d8a955c..29f346e9acfbb 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/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index b2a0021d53b56..e7157afbaee53 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; meta = { diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 96b42ac068ccb..8616a0146755a 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 fbe421e9974e5..c6056ee49fbf3 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 b0013d0f94912..90daf2ddf7434 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 6498014aee8d0..d0be9e25b87e7 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/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 7569f2613bbd7..555828bfaf6a4 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor +, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor , getopt, perlPackages, ocamlPackages , appliance ? null , javaSupport ? false, jdk ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong + systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) ++ stdenv.lib.optional javaSupport jdk; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 516e6bbbe88c8..bcc85abbd3efc 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 a153001a9600c..0289a5331f893 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 a100b0cc59323..dd8e3c4a4f878 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/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 1bde9336c66df..1f5ee90337aa5 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus-glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu , gtkVersion ? "3", gtk2 ? null, gtk3 ? null , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus-glib libdbusmenu-glib + glib dbus-glib libdbusmenu python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index fef5e7278b818..612de78b741dc 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 87cae22468528..f352c8e9ed198 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 4b547fde3ab0c..79439f822696d 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 c918c61abf0d6..2c59fa03ea06a 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 66c7e7e882e81..135f1caf97e2f 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 8da097c3d386c..8dc64f2c2b57c 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 5ad9cf1e7b771..4173588ac522a 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 02e634b22a344..0e0499251eb91 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 b7a78cb3daf66..3f43667712357 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 8168ff0edae43..38ba93d4f7c59 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 b77ba49822fdb..f311d1a033533 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 f6bfff78fa269..def5ee0e19a21 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 8152c1ea85246..306c73a9b551c 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 48b0ed6d711c4..b64c3e5177825 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 578053bbb4273..4ea2209160f82 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/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index bd54b3aa343a2..400a107c5186f 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, x11}: +{stdenv, fetchurl, automake, autoconf, xlibsWrapper}: stdenv.mkDerivation { name = "libstroke-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; - buildInputs = [ automake autoconf x11 ]; + buildInputs = [ automake autoconf xlibsWrapper ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index aab0da90d394e..6eb8b6b1a8e9d 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 0000000000000..fce15b121b426 --- /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 fd58f4f44e78d..b5ab9d310da33 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 c492a15bfa4e0..c5a12432280b9 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 dbf1d7a3756fd..6a32ccf5c1b14 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/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index c902a8b216a85..ce8d741adf23c 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/libuv/libuv/pull/1909.patch"; + url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch"; sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; }) ]; diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index 95d4be08548ac..6868e5c8cfa9c 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/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b12ed9613510d..02c13e413e33d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, libtool, autoconf, automake -, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 731892d33b4d8..515aa25374434 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 7d4b75d6cdf81..fb7f828f61f05 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/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 1150d04e1b491..263796cdc783b 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobjectIntrospection }: let - version = "5.3"; + version = "5.4"; in stdenv.mkDerivation rec { name = "libxklavier-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz"; - sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; + src = fetchgit { + url = "git://anongit.freedesktop.org/git/libxklavier"; + rev = name; + sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -17,14 +18,20 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ]; buildInputs = [ gobjectIntrospection ]; + preAutoreconf = '' + export NOCONFIGURE=1 + gtkdocize + ''; + configureFlags = [ "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-bin-base=${xorg.xkbcomp}/bin" "--disable-xmodmap-support" + "--enable-gtk-doc" ]; meta = with stdenv.lib; { @@ -34,4 +41,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8a3d7abdfa576..b28f241d56ee4 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 @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; license = lib.licenses.mit; - platforms = lib.platforms.unix; + platforms = lib.platforms.all; maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1bb90ee195dad..4dfdea582a253 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 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index ff09aeab2c6fb..af665c6d9a4a8 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 7178e64b6b6a0..7bd0d1970f4e4 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 3f008744c1b48..5fa1035868d1b 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 7f4d8cc19c8e4..ad6d2df1d8bdf 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 93c8a0474d961..c45fa6bc61aab 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/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 3828ebcb7a707..367c4e9638422 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate -, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl +, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl }: stdenv.mkDerivation rec { @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libetpan cmake icu cyrus_sasl libctemplate libuchardet glib - libtidy libxml2 libuuid openssl + html-tidy libxml2 libuuid openssl ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace " icule iculx" "" \ --replace "tidy/tidy.h" "tidy.h" \ - --replace "/usr/include/tidy" "${libtidy}/include" \ + --replace "/usr/include/tidy" "${html-tidy}/include" \ --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ --replace buffio.h tidybuffio.h diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 8b756e338e483..4b69d5d0aafe4 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 f49b7ba2c4b4d..b8a8c64011ca0 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 0ae17b4d3f619..f18c1e693cbcc 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 62a31161d64f5..480afcf607a6f 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 2d4de33904226..d8075c41a7036 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 444ec9dac2bef..d96f90b4bfd67 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 6c5a0e5279ce9..b5a36c184ff74 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 b9b25e7f43b3b..2ecae98387e18 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/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index cbe977a01926d..0cb69f937564c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation rec { "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" - ++ lib.optional (abiVersion == "5") "--with-abi-version=5"; + ++ lib.optional (abiVersion == "5") "--with-abi-version=5" + ++ lib.optionals hostPlatform.isWindows [ + "--enable-sp-funcs" + "--enable-term-driver" + ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index e0adb312677c5..65679c7e28251 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/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 32467e4849b54..ab50cf1e17ca0 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -1,27 +1,60 @@ -{ stdenv, fetchurl, perl, gmp, libtool +{ stdenv +, lib +, fetchurl +, perl +, gmp +, gf2x ? null +# I asked the ntl maintainer weather or not to include gf2x by default: +# > If I remember correctly, gf2x is now thread safe, so there's no reason not to use it. +, withGf2x ? true +, tune ? false # tune for current system; non reproducible and time consuming }: +assert withGf2x -> gf2x != null; + stdenv.mkDerivation rec { name = "ntl-${version}"; - version = "9.11.0"; + version = "11.2.1"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p"; + sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489"; }; - buildInputs = [ perl gmp libtool ]; + buildInputs = [ + gmp + ]; + + nativeBuildInputs = [ + perl # needed for ./configure + ]; sourceRoot = "${name}/src"; enableParallelBuilding = true; - dontAddPrefix = true; + dontAddPrefix = true; # DEF_PREFIX instead - configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ]; + # reference: http://shoup.net/ntl/doc/tour-unix.html + configureFlags = [ + "DEF_PREFIX=$(out)" + "SHARED=on" # genereate a shared library (as well as static) + "NATIVE=off" # don't target code to current hardware (reproducibility, portability) + "TUNE=${ + if tune then + "auto" + else if stdenv.targetPlatform.isx86 then + "x86" # "chooses options that should be well suited for most x86 platforms" + else + "generic" # "chooses options that should be OK for most platforms" + }" + ] ++ lib.optionals withGf2x [ + "NTL_GF2X_LIB=on" + "GF2X_PREFIX=${gf2x}" + ]; - # doCheck = true; # takes some time + doCheck = true; # takes some time - meta = { + meta = with lib; { description = "A Library for doing Number Theory"; longDescription = '' NTL is a high-performance, portable C++ library providing data @@ -30,7 +63,8 @@ stdenv.mkDerivation rec { the integers and over finite fields. ''; homepage = http://www.shoup.net/ntl/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ timokau ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 3483d4bed778d..fb36839fe2337 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 94aba672887d0..2715ff4dfaffc 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/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index fb1199367037e..a0a39980d45da 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "opencollada-${version}"; - version = "1.6.62"; + version = "1.6.63"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCOLLADA"; rev = "v${version}"; - sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r"; + sha256 = "1x8hz5nkz4lxsf17jv8sdl92dmbbpkqck8jkkc6g32d8gbs3gha1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 1d3a9629fd0ce..264c05e1af9df 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 20a62ef67f981..a073a29b507de 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 60ee30177c020..293274a57767c 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 187f861337568..7d84392d204ae 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 0251de77d03eb..b5b9ae7664650 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 }: @@ -45,7 +44,9 @@ let if hostPlatform == buildPlatform then "./config" else if hostPlatform.isMinGW - then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" + then "./Configure mingw${optionalString + (hostPlatform.parsed.cpu.bits != 32) + (toString hostPlatform.parsed.cpu.bits)}" else if hostPlatform.isLinux then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" else if hostPlatform.isiOS diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 62c093f310fb1..51270427397d1 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 5dc5df8e95b95..e58e347c7f3e5 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 c23e7c9617eb0..a9a8c5c2563e8 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 73e7fd42cdba8..e0819cde679b6 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 9993060eb728b..a8655c2dcbe3b 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 32a05d10d3a67..b287e52b24313 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 0c9d879fbd096..2f79a2b76ab9c 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 eb34b94118a97..1dacdba1b1ce3 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/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7e7314c936dd3..c50fc9fb35c8f 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg +, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf, freefont_ttf }: @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils - alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 84709441b5e71..9a43470de3b72 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "podofo-0.9.5"; + name = "podofo-0.9.6"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; - sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5"; + sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index aa9a3f9fdc0a7..a577d318523db 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 06154e0008ba5..1a20d806b968b 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 4e74e31e3ec82..51253676341ff 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 4227575acb091..01d0fc510aaae 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 5407a79cd7750..2a706fc7b6e8d 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 b9ed5eddd5cf6..8732b1061342f 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 e109fe447aa23..755e6a9487e76 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 15e19c77567a0..0d9cb81afda93 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 1b7a7c1fceaae..d0bab88b2f214 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 2f8c142323d22..516d38340dc53 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 8691e20ec4521..62da679157f01 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 49585f601d146..da56c07779b9c 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 a8611b3124053..b94cdd22f7f05 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 8d096e18f08fc..ae858738ec166 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 77e76ad638abf..35d16ee5e19b6 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 90389055a415a..786fce0fb6381 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 77cb7cf1f2b6f..55c1a641fc3d2 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 916bf122b3c24..c1994533b78d8 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/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 1a98ecc874365..c89e9e4296cfd 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -9,10 +9,11 @@ in { cudnn_cudatoolkit_7 = generic rec { - version = "4.0"; + # Old URL is v4 instead of v4.0 for some reason... + version = "4"; cudatoolkit = cudatoolkit_7; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz"; - sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f"; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz"; + sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd"; }; cudnn_cudatoolkit_7_5 = generic rec { diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 51bda19cf1391..bb1258655b5bf 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -5,24 +5,18 @@ { stdenv , lib -, requireFile , cudatoolkit +, fetchurl }: stdenv.mkDerivation rec { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; - - src = requireFile rec { - name = srcName; + src = fetchurl { + # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}"; inherit sha256; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library - at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://\$PWD/${name} - ''; }; installPhase = '' diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c68454fbe4a1d..e6af2251b1f18 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 3601066cb22f2..632380328db16 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 dfaf1c679dd79..f794c3841b932 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 3207bdb3a7f27..9004378647173 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 22d66b7e71d1f..771ad033ed915 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 0b815f9095f9c..ba3791a8a8bdb 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/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 63060bf555331..36768acd991ac 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus_tools, pkgconfig +, clucene_core, fam, zlib, dbus, pkgconfig }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ]; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 0185bd2733b40..4f711a639f731 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/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 24dc3667d172a..d14010c857e4b 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus_daemon dbus-python ]; + checkInputs = [ dbus.daemon dbus-python ]; patches = [ # https://github.com/TelepathyIM/telepathy-qt/issues/25 diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 99f0bb65441c2..24251cf0cc1d2 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 9f9d8e62de506..aa4a7890b23ef 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 9112079a90eaa..ce666becc8553 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 438b4eda454bf..14211ea65e9ab 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/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 4dd01f664d198..a8515975c353a 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,36 +1,27 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2 -, swig, glib, utillinux, cryptsetup, nss, gpgme +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 +, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme }: let - version = "0.3.10"; + version = "0.3.11"; in stdenv.mkDerivation rec { name = "volume_key-${version}"; src = fetchgit { url = https://pagure.io/volume_key.git; - rev = "ece1ce305234da454e330905c615ec474d9781c5"; - sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva"; + rev = "volume_key-${version}"; + sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; }; outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ]; buildInputs = [ glib cryptsetup nss utillinux gpgme ]; - patches = [ - # Use pkg-config for locating Python.h - # https://pagure.io/volume_key/pull-request/12 - (fetchpatch { - url = https://pagure.io/fork/cathay4t/volume_key/c/8eda66d3b734ea335e37cf9d7d173b9e8ebe2fd9.patch; - sha256 = "01lr1zijk0imkk681zynm4w5ad3y6c9vdrmrzaib7w7ima75iczr"; - }) - ]; - makeFlags = [ - "pyexecdir=$(py)/${python2.sitePackages}" - "pythondir=$(py)/${python2.sitePackages}" + "pyexecdir=$(py)/${python3.sitePackages}" + "pythondir=$(py)/${python3.sitePackages}" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 984a106236ce0..bdfe3d1c5c60a 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 797c64729ecf8..e154403697fec 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/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4b84f696eec69..e44a678194ae8 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: + xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: let version = "1.1.77.0"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; + buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 29a27e53f2255..9eb3254001d59 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 d832becbed88f..3555a92322855 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 bbc33f33e7014..fce0dae6c7313 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 c905c40cf9603..c4d94af850dd5 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 a672bbf52a90a..572adfeb0bb69 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL - libX11 libXfixes dbus_libs wayland-protocols + libX11 libXfixes dbus wayland-protocols libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 17f8646b51770..e343c301127fa 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 7865724efa407..ad1cc2efc8797 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 274a70057bdd7..69b5b95e7613a 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/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 33cf5dd4af84a..7acbaa260a0c0 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 -, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, autoconf, automake, libtool, gettext, dbus, telepathy-glib , gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; buildInputs = [ - glib sqlite dbus_libs telepathy-glib dbus-glib + glib sqlite dbus telepathy-glib dbus-glib gtk3 json-glib librdf_raptor2 python2Packages.rdflib ]; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index f67964748dca1..9d00652771729 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 c834ab7a305b1..019a44482b9a0 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 9b9486e9758c7..22aa818f8756d 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 7c618a9fffb25..c90a9e091920e 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 f2125676e5a2a..68c8a7e087b54 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 65df45d95a50c..4612e6175b916 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 a9808173b626c..c8f34e0fa17f2 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 531d429df244f..a420c22054f6e 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 a413743eb8d54..42a7bd595853f 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 61a35f2b58c63..0321572e72a6d 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 dfabda0428f09..825fea4eb9068 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 57c9c03ba42b9..d506acf876ee9 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 8967b0970c568..67468edbb6cb6 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 e8034b11c2375..f546e4711acce 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 6d284b7b01208..4434e711d9ded 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 750da99d5d6a7..1b78d0d289839 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 fe511ec40bdff..a4a66ecfa64ff 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 312d0eb10a44e..ec7599f2bd3fb 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 e1fb59658528f..1ae6fa0f4ec42 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 f4941aa80cd63..bb5ab940638a8 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 ae8ed6de87760..7c69878900cd4 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 1568533d92af1..91b8db69a36b1 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 11d5ac4491ebf..76e2a55620cb8 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 f276ec72736db..f85b128652d0c 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 e5cbad3e9e836..62a3ae2bb7d11 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 4dfdce68bc8af..79f2d38ef10dd 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 a3ddc2fd953eb..b44c0c8a9874b 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 db25e6ae53478..006361ed80c12 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 4f6842606b451..c34d79f3d13de 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 953dd0a58a4ac..c65d95d9ef7a3 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 d72e0839d1e8b..5647b9a92707e 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 1fc10b9c8db75..6bbdf5f911e03 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 6334804c4f708..3c289fefa9ab5 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 a8cfc070bf999..29460307e6983 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 82d06b1c93b2f..e1d6a1477a7b0 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 4e7c84566a0ac..67636d3f6cf3e 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 e636df0805e7d..5c1f90220eb3d 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 5edceaf4ad97e..cd0db041c5b22 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 ffa2e595c26a2..c90b252313bf9 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 be2897d19a4a6..41ead034791a1 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 d5be4be7daf43..8ed7c1a449936 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 9056cfbdcca8f..d55f7700092c8 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 7f5cc1e048de8..9cc6338c8b890 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 1359e13b949ef..6819e4b25713e 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 9a4afce3280f0..a772694b9830d 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 1a562c2288bb9..5efc576695527 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 dd93a599d699e..9a285fea2f18b 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 4f4e1f812233d..e044f097701d3 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 56bbb58383775..6946141f11213 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 8cc04c2c64ac3..1af66736f30ff 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 c925382d81d44..753f21dbcb96a 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 1986f7c88f7ac..0ac190993d80d 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 39c2060af0275..afb8b3885681d 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 6c45649673203..3a4b05e052697 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 6a4751f799ea0..11b9351c03ada 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 b9ab71744c3a1..c70c3f2e1e126 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 c7031f4aa3fc9..733185e2b26f1 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 74e5d7e97e95a..090aa670ad9ef 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 111d995274983..91493d7431e82 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 efa76ea00a0e2..b43deeceb8679 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 1e8ea65c73d9a..fd8651e89cf5b 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 390c5eb7a2058..20b3ff3b8f509 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 6765a9cc5c30a..b09a483290f76 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 5bdd0fd63c5ad..bbd94cb7882ad 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 53963c100c74e..26adf373826e1 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 61c23a6d0b375..a6de1f0ae8c68 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 720e0cc08503c..eee72cb9613d5 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 97c59d8581fb1..827487be69bf5 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 bab2541fd7444..291dd03c8d114 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 8882bbf66474b..72c426ce0372d 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 4a2b9846271bd..1acb17a8f7a34 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 24f0e9bfd7a5a..962525b47e42d 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 25f84826ec18d..0122ec9ff61da 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 8b304aadd9efd..f82cf33e30794 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 a7290c8bb98f3..1a8f854185a2f 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 189388efe324f..afeb3f1957b0e 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 6f0f0d0b120b8..0bf43174412c5 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 20d558e37c1a5..2f0aa34299509 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 4a283cc9910b3..19eef7cf18257 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 4d7213a8603e3..938f5ccf4474c 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 5621d2ec704b5..7db7cae27096f 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 2e776e273be11..4cd67e1af86b7 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 bc1977ce2d693..6315621597623 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 dc84ea34337e9..5410167e0a262 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 05ea4d5d566b5..c2f97badda93d 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 93fcdde5bb384..e5bbb7800520c 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 a4c3c15160d1a..a05d49245b257 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 5482d7ac87cd6..1986f7e48f69e 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 165dda1fa0271..e1590bb0c9ae0 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 165a566b1b71a..38b56ac7beb1e 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 9d5f4f4e669df..45dd73d4a3211 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 3afe4149fa343..24cfbcf5b7af0 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 3948cfce0e8e0..1f53b87128283 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 53d7847acee6f..2aa74d751dbfe 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 7421e2fa0b1af..46453f30d3bf3 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 9b26c40409599..2b7d9855665f7 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 1e031b135d29e..181946802d708 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 a965d6ed11630..b34c9279c3070 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 176cd06a9cc35..dbb167e27b32c 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 82b3da7a37c46..b59be96bb6211 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 b995e0e2540af..5178551df4538 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 e8c1a948fe929..22bbb4d3be41d 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 e86f08b57ca90..7b615928da9aa 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 124e8b80ba024..fa07eee0d7e14 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 4f0a7d4aebc26..550fa1da3edf7 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 13bddd3ffb8f6..879cdb9bd0958 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 29a792000e995..48878995bb4e8 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 30c820ec6c19d..e2b31cdda7942 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 cd81a7facc227..820ee2a95d81a 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 f0756e1572e72..9f307f24dfaf3 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 3065bb17c05d3..00198cd27cffa 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 2ad260f5d4069..1492a15aadf38 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 ba32cf7ea695d..6db4bbdc31486 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 32314b81edca5..584eb3ae2c521 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 808ddc57096d2..20013b8a1ed44 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 28b88d3b46a0e..37d97f42aa1fe 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 f46efd9f496ec..ce371076256e9 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 fd89457ed310b..2fbe4932bedac 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 bc8e375271d6a..ee15be954186a 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 c3ed7bed7426f..489a31b3242c1 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 0004badd6f402..187e0924ccacd 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 1c3c1fdefbeab..bf7c35fa69895 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 a4a7b63b8a3f0..6fc3f16b3ad22 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 240dd5513e85c..2a9cb2a2cfdf9 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 791b05e81cad2..c9ca8f7ec0473 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 5a9bae58bd6d4..b5da73a32d21e 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 3bc9882585f63..8efb1c083f26d 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 de15ffaabc693..d4b9195c5558e 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 395122b4da9e1..f85f80ea23991 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 99ac6c3ec45ba..3e07188986d07 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 08ae54e0b73bb..1afe23416331b 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 2c0b0e623ca96..0c636e1208847 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 7247694227615..3f1456f6e948d 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 0e355723604e4..425a53987caf7 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 b07a205ba2158..cc75649119bd4 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 f004e6d541c5e..1c42b1283eee6 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 7e6cc206cdc0b..0a82238b703e3 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 e83fd4163e4a7..967941666c848 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 5ffa51def0d27..7778e73f92f75 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 cfd6389ce5fb4..bcf3271479657 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 1ccb31d5120a7..14bae27592ab7 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 6a52076252e86..62e63a8e5b31b 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 8e770c504c3b2..7bef3e8293515 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 afba2e17bf64b..680f6e02cd01b 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 4d2a168f79cc0..0aa38aed296d7 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 232a4a19fd858..f27cfc44e57bd 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 e19850be8ceef..db48326535dbd 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 bcab5c4347595..6285ac28fce19 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 3a3aeb7b22670..da742b310507d 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 69a5e8c11d486..67120bf0f3d00 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 d01029652a98e..47c206fda5e8b 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 fdc408e1c4c10..f6af0855b9f54 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 0808cf4f20110..0000000000000 --- 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/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index f207683d2b0b0..8f3f331fd5097 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] - ++ lib.optionals doCheck [ dbus_tools pygobject3 ] + ++ lib.optionals doCheck [ dbus.out pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. ++ lib.optional (! python ? modules) ncurses; diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 937b6df422927..e4cd21bce4a37 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 6426333ed26a3..3281953650064 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 6b048db90e308..fa06117a64495 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 dabc3244592af..7ce8877bbce01 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 27b1a3e6122c3..20f4bc7e0c33f 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 334778c93aab4..97f04828300b8 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 a0a619a39c848..99859ac151754 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 a05ac1ba679eb..c4d600ec994e2 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 c5ac67106a2fe..67ff86e8f7292 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 2612cfde1f50f..eaed804245fa5 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 f4fc3cf3fa242..89cbdf0fbf820 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 17b9d018c397a..d9a0682a02e00 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 c09d54ad55553..a528244cb0f9b 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 ca1c9a09e4eb9..d2e806e43b901 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 3faa6d914d257..1b3ab52c4c396 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 7f2c7a582290d..aa8050de08855 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/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix new file mode 100644 index 0000000000000..7f1726a2c4b9e --- /dev/null +++ b/pkgs/development/python-modules/graphite-api/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml +, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy +}: + +buildPythonPackage rec { + pname = "graphite-api"; + version = "1.1.3"; + + disabled = isPyPy; + + src = fetchFromGitHub { + owner = "brutasse"; + repo = "graphite-api"; + rev = version; + sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass"; + }; + + # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3 + patches = [ ./flask-caching-rebased.patch ]; + + checkPhase = "nosetests"; + + propagatedBuildInputs = [ + flask + flask-caching + cairocffi + pyparsing + pytz + pyyaml + raven + six + structlog + tzlocal + ]; + + checkInputs = [ nose mock ]; + + LD_LIBRARY_PATH = "${cairo.out}/lib"; + + meta = with lib; { + description = "Graphite-web, without the interface. Just the rendering HTTP API"; + homepage = https://github.com/brutasse/graphite-api; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch new file mode 100644 index 0000000000000..2d4a2f29bc438 --- /dev/null +++ b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch @@ -0,0 +1,132 @@ +diff --git a/graphite_api/config.py b/graphite_api/config.py +index 5e1e382..dc033a8 100644 +--- a/graphite_api/config.py ++++ b/graphite_api/config.py +@@ -112,11 +112,11 @@ def configure(app): + app.cache = None + if 'cache' in config: + try: +- from flask.ext.cache import Cache ++ from flask_caching import Cache + except ImportError: + warnings.warn("'cache' is provided in the configuration but " +- "Flask-Cache is not installed. Please `pip install " +- "Flask-Cache`.") ++ "flask-caching is not installed. Please `pip " ++ "install flask-caching`.") + else: + cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60, + 'CACHE_KEY_PREFIX': 'graphite-api:'} +diff --git a/requirements.txt b/requirements.txt +index c68b446..7826b0c 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,5 +1,5 @@ + Flask +-Flask-Cache ++Flask-Caching + cairocffi + pyparsing>=1.5.7 + pytz +diff --git a/setup.py b/setup.py +index 0337cbe..df07989 100644 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ setup( + extras_require={ + 'sentry': ['raven[flask]'], + 'cyanite': ['cyanite'], +- 'cache': ['Flask-Cache'], ++ 'cache': ['Flask-Caching'], + 'statsd': ['statsd'], + }, + zip_safe=False, +diff --git a/tests/test_render.py b/tests/test_render.py +index be5609d..a0e7190 100644 +--- a/tests/test_render.py ++++ b/tests/test_render.py +@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper + from . import TestCase, WHISPER_DIR + + try: +- from flask.ext.cache import Cache ++ from flask_caching import Cache + except ImportError: + Cache = None + +diff --git a/tox.ini b/tox.ini +index 85a0abb..c820393 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -47,7 +47,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -56,7 +56,7 @@ basepython = python3.3 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:py34] +@@ -66,7 +66,7 @@ commands = + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:py35] +@@ -76,7 +76,7 @@ commands = + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:pyparsing1] +@@ -84,7 +84,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing==1.5.7 + mock + +@@ -93,7 +93,7 @@ basepython = pypy + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -102,7 +102,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask<0.9 +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -111,7 +111,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask<0.10 +- Flask-Cache ++ Flask-Caching + pyparsing + mock + diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix index 8afe6379dc7c8..d572b10fd625a 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 144e826b675d7..2b95b1473cb21 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 bbd4760bdf893..5131e64a3c2b7 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 b72544611833b..8337fd2230ba5 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 83e369ec0fcdf..6701c5a5b7e98 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 0000000000000..49d1062abc319 --- /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 ef2444c0d2f05..c67d56b153e04 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 a91988bd97d06..f2066fee2a4a2 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 65d1f4f682202..17896a58469c4 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 3a6d69cc829fb..f11fccb086bcd 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 c934d24dab7b2..a6a955507a792 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 dbd2e36b7b840..8598654e2060b 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 19169e88b125a..a1e795421b075 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 be59a112be746..3b221238f3af4 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 95672600a30ae..17a6b158d3f22 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 58ca72a3dc984..02d10b832ff2c 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 2fc66e810d061..fc58c6ca6a1dc 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 14e83584678ce..ef01fde2daa73 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 cf0a1a865a19f..75e55944e987d 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 a99d4542ba5aa..26b42020fc340 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 ad6b938c9888c..4689050ba6c70 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 c9b9b4896139f..bc91139728b0e 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 4a96ce8ad0513..ff1a6e49b0133 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 5d52b52ac7f2f..7316526aa2804 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 d27637874af8e..b6d761f077ce5 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 ccd0eb6cc9f89..3f7710acb3c16 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 8569d9287ac82..491069cd87fb9 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 7bd14f2d10cab..34350dd4821f8 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 1d1be733f9985..6862967e420f3 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 dfe91309ea400..bc4b9e914653f 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 a6561d3e07ace..3901f7c310d06 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 c1e5344326077..e8130e8038fdf 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 c94acdd3ba5a8..3620248904cef 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 e9f6177cfa1bb..324c7c6c2d24e 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 d1c799c95dee5..2ff50e1fa92ea 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 c9eb12bd52b46..dbe3cb4bc2d8b 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 e4b2bdefad206..cfb70724210ef 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 3f974872b9594..6dbfa1fae6035 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 f689bc2ff49d8..a3a9096a335c6 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/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 0be0f892d731b..9aabd6d94e2ca 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, libmysql }: +{ stdenv, buildPythonPackage, fetchPypi, mysql }: buildPythonPackage rec { pname = "mysqlclient"; version = "1.3.12"; buildInputs = [ - libmysql + mysql.connector-c ]; # Tests need a MySQL database diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index dfa87c843ff25..b167b7f427c1f 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 4cc5769d8d836..27fc7d11e7519 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 af7e4dde59e3b..e60233c3590e4 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 9645e54f7ec1d..56edc44bce71f 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 d6531eda2ef12..d9e884dabbe0f 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 3f37940ed8aeb..474609220cfae 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 2c0a2c44f6eb2..c481aa0dfea70 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 08fdddb73467e..ef07f2a36e32a 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 ac150af4b7824..34573626bacac 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 18cc23338bf69..4092f5e1c4f35 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 165de7bd2baf4..24539c7bbcef5 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 2d1f707a8ebd8..1ee93c753d80d 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 b861797c4a8f2..4f2e7f3ca8455 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/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 3676c676cc60e..afbb5e2b567cd 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.3"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "0kp0crzjginmga6qvwwppar5b2pbdvwryf6vdpxgx7kkwzv33w97"; + sha256 = "0jblc0bvzcns1dmsax6n0cvdg8867hm7snvdxa2l7v305h6gssjw"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 3f90e6b2da7d4..5675be3239739 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 8c3de8bd0351b..82aaebb100393 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 0fbfa5108c1b5..2a6996c628e6b 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 5269ecd5d8b40..2c6eb7e5fbf7f 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 0ae689034a3ad..2b00a007f90b3 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 f51c6989c011b..841e003bc897c 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 212c06cc9421f..18fb14c3aa9a5 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 eaf353af08231..f6b2bfa939c62 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 7fbdfb7c33eb3..84fe2f6955458 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 6adc1e7ec04ca..be409e348ea3b 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 5fd1be7c15cc2..fd1866d22f434 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 845630e514fac..d4ed6088409b0 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 b074f9f4934ea..23ed4917cc58b 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 af975e333f0f2..e7858888d3610 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 b4ef42cb22abb..35041f8447ba9 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 5a4a81f13accc..b6c9ae5e8ba61 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 08c266da6963a..916bf7f692d21 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 5271677dc1eab..d4c46d6b83597 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 524fb4af61c59..c6264f08de868 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 a0dd6113b750c..5af6ef9922894 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 1263c498a46b3..3b7011fa74821 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 bceb2b50cc596..463cd8044e1da 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 08fc87127959e..09b7f38613030 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 8175ef2b1725b..55f96416efd47 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/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 0efb77d27b3ea..a747d42e418aa 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: +{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }: let pname = "PyQt-x11-gpl"; @@ -42,7 +42,7 @@ in buildPythonPackage { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper qt4 lndir dbus_libs ]; + buildInputs = [ makeWrapper qt4 lndir dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b669c14564160..6a3e3e66e2c9d 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,5 @@ -{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper -, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs +{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig +, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity }: @@ -32,7 +32,7 @@ in buildPythonPackage { nativeBuildInputs = [ pkgconfig qmake lndir ]; - buildInputs = [ dbus_libs ]; + buildInputs = [ dbus ]; propagatedBuildInputs = [ sip qtbase qtsvg qtwebkit qtwebengine @@ -53,7 +53,7 @@ in buildPythonPackage { ${python.executable} configure.py -w \ --confirm-license \ - --dbus=${dbus_libs.dev}/include/dbus-1.0 \ + --dbus=${dbus.dev}/include/dbus-1.0 \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/${python.sitePackages} \ diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 89799988fa1f1..280981ab2c246 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 6681b1b199add..1ffc546cfa1e2 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 288b141d32e82..ab46c726f6c70 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 4555479af43eb..3ca4f832c8cfc 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 c2d205f2833c3..101594750fd5c 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 c12d4b8add03d..163063ae57fc0 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 38d34a958545f..84f337e1b83aa 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 f4d87dc035c1a..e8c71bff18b2d 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 18162d105acfa..962ebbecbaaa4 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 0000000000000..c072b661cc42a --- /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 d09a9bbd6d80d..159e0ce15fb42 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 646308feece4a..5a55c1f47bb2e 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 26107ea3c4af2..4de7777fa8b91 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 174e0871ca2f0..5f7cded86fda9 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 1eda590a864fe..0f02560c81f8d 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 9c4224ce64c68..0000000000000 --- 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 cdbba1806735f..badaf9b3787bf 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 de2683595e5f2..6ea233f695bb4 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 a356db74f07cf..0b3e84c351288 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 6bd294671dee9..2286d9c2dc7fb 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 4cc74431fc852..662045a9ce1e4 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 d9c8791817655..ed0bf42ae6872 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 7184795639c40..d8c43c1ea8661 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 ed358213492e4..c642039d4fea8 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 0000000000000..1a07e001caec6 --- /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 edaf7cd90cc5f..39af29da81457 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 5e57dd3f093da..41878b19d0859 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 1cef1510ccf52..0e4b6cfa1e475 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/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix new file mode 100644 index 0000000000000..981b6693f7d47 --- /dev/null +++ b/pkgs/development/python-modules/simpy/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "simpy"; + version = "3.0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hqgxk3lggf21jq9lh8838cdl24mdkdnpzh0w4m28d0zn2wjb5nh"; + }; + + meta = with lib; { + homepage = https://simpy.readthedocs.io/en/latest/; + description = "A process-based discrete-event simulation framework based on standard Python."; + license = [ licenses.mit ]; + maintainers = with maintainers; [ shlevy ]; + }; +} diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 006f52f1d38b7..8c66df80dc587 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 16c1841a3d625..d2a306356b6d2 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 211419f86b1bf..50d58877b7ea0 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 9ac04e18e4f6c..a122a0c40ec87 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 3c650bd60ddac..7a93d64a89f5c 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 c56a5d7889f63..9f8087a305d91 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 21b21f174d0be..4e3621157f939 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 628be2e946af6..1e35d95c5e1f8 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 d42430248216f..9b22ad3e54560 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 0ffaf315d54b4..0ced52c7ba105 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 b581282002380..88e6c8d167429 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 b55c42cfa561e..edc4bbdebb133 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 829d7bcfcb2b6..6f3eae60c635f 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 c6efe5ba2397e..44fcb9b46ff9b 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 359f13e2a00bf..4ceeb026634ce 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 87fa393ce5e33..0b77f70680120 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/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 9a6a3c39eec1f..0f96b100435a9 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,11 +1,13 @@ { lib, fetchPypi, buildPythonPackage, - protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp + protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp, isPy3k }: buildPythonPackage rec { pname = "trezor"; version = "0.9.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0cfc8c3e14a93..5bd0f5f81d2ba 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 3bb75fb2ac291..8320500fc141d 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 235f33da59944..42588347c8517 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 276ed481601c1..eb2fa2bd042d5 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 ab4ce1be2b1a6..805941cab60db 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 c152271af3359..ef6089baa507f 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 b2ce75c43c3a5..32145623e4da4 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 e98fcf205fd59..c3ac5b51cb0fa 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 039a751a5e14d..a9041f9a76f75 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 9b53c180397df..d9b8fc892c165 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 0000000000000..68b39dee53e98 --- /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 f8f933b96abb1..79f6ddca5434f 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 0000000000000..6b3d3266b21b3 --- /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 418fcebaefd52..f283479c8de8d 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 9aab2ba9e8441..c23f332638d04 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 e2bf3a569d048..a4988332b226d 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 68ab42a76dd7c..acaee897d9376 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 16f1abe1a899e..f902ca58c3845 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 85e93959e4b5f..b8e666a92f9a3 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 ee3754595f394..7c5932c4e761e 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 63da7044c0cfb..e42f1bf257114 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 2f9a822383256..b1d0b76f086c8 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 83f1dddeeb60a..39520fdb0ba11 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 3585681478c86..7e6d1102f6669 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/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index bf1d1357f5e75..d2c27b9f4853e 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://www.clarkware.com/software/JDepend.html; license = licenses.bsd3; platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 30d82aca83ae4..fb0f7414841cf 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 b174d6c069b71..b9b9b8abfb929 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 131533896ff94..cbcfa981b6b5b 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/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 1da6c6a1e8648..1ecdd9f32ce5c 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -8,14 +8,23 @@ stdenv.mkDerivation rec { sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; }; + patchPhase = '' + sed -i '1s;^;#include <unistd.h>\n;' src/objects/tool_object.cpp + sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_config.cpp + sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_config.cpp + sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_utils.cpp + sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_utils.cpp + ''; + buildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - broken = true; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 5bda2d945eb6c..19609e15c7651 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 953a10ca47ab7..5f2e9b5f440d8 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 a98c2b4e04bde..52fec3f131b9b 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/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 0441ba0c665de..b59a93d373248 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused +{ stdenv, lib, fetchurl, runCommand, makeWrapper +, jdk, zip, unzip, bash, writeCBin, coreutils +, which, python, gnused, gnugrep, findutils # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -6,9 +8,25 @@ , libcxx, CoreFoundation, CoreServices, Foundation }: +let + srcDeps = stdenv.lib.singleton ( + fetchurl { + url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"; + sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b"; + } + ); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath [ bash coreutils findutils gnugrep gnused which ]; + +in stdenv.mkDerivation rec { - version = "0.13.0"; + version = "0.15.1"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -22,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2"; + sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6"; }; sourceRoot = "."; @@ -41,7 +59,7 @@ stdenv.mkDerivation rec { int main(int argc, char *argv[]) { char *path = getenv("PATH"); - char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}"; + char *pathToAppend = "${defaultShellPath}"; char *newPath; if (path != NULL) { int length = strlen(path) + 1 + strlen(pathToAppend) + 1; @@ -67,6 +85,9 @@ stdenv.mkDerivation rec { # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ --replace /bin/sh ${customBash}/bin/bash + + echo "build --experimental_distdir=${distDir}" >> .bazelrc + echo "fetch --experimental_distdir=${distDir}" >> .bazelrc echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc @@ -75,6 +96,15 @@ stdenv.mkDerivation rec { sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + + # --experimental_strict_action_env (which will soon become the + # default, see bazelbuild/bazel#2574) hardcodes the default + # action environment to a value that on NixOS at least is bogus. + # So we hardcode it to something useful. + substituteInPlace \ + src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \ + --replace /bin:/usr/bin ${defaultShellPath} + patchShebangs . ''; @@ -126,7 +156,7 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends + echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 96e9d0f9a439f..50b1d09ef9333 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 5d486f47844eb..2260f083b71b7 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 3729abfe247d6..adb279cdea68f 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 f6da92fe62195..c61bf3287db18 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 9ff32f1b34844..e77647b2fed44 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 52e29acc9d81b..b9a8c97bd5eb5 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 f810f97ef4979..f5ca69e59c840 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 c0af019297854..2ccd6637d088a 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 5da32f2334a78..c394d87e09ec3 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 38a197aa900b7..1ad52f327e15b 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 ff6dc07ea9e96..d9e260a13de3e 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 d3842a39f18b6..4b0242a3956d2 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 f52d53526fa1d..3bd31523412aa 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 000943f117f63..e86d61cf6c9a1 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 b820dc997e443..95ee4e93f2a8f 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp +{ stdenv, buildGoPackage, fetchFromGitHub +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , go-md2man }: let @@ -26,7 +26,7 @@ in buildGoPackage rec { hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man.bin ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux libseccomp ]; + buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; # Copied from the skopeo package, doesn’t seem to make a difference? # If something related to these libs failed, uncomment these lines. diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f42adffc5f420..603b155ee4f9a 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 df06793eaec0b..1d81d469eb29a 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 f96d3e810ca55..3e3e239fbfb3f 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 8d43736d3a8a5..b2b903b095c69 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 e3c8d7ed014de..7e660f3fcd909 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 7f66317167a5f..46104e78d1d7b 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 9a7a600d13436..b101e52aad9cc 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 905314efe5a9b..26d96a6412639 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 6823ae3372cb8..f3ade82e52e8a 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 f6920a83e09c9..7e8a41590724f 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 32025edb30641..8ec6aec9918e0 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 253f5b374d3c3..de9fb82f66f24 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 4ec9e0daa47af..1f786f127c91a 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 38432e58d0d90..695a532305a91 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 3dc0d3fca88cb..a89861faebbcf 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 082edb37a4f3d..e21749f90d029 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 df14c29c37283..9bbdc8c8334d2 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 d6cc527e6418a..18367d14f6e59 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/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 377791007a369..b4a35b3a21c03 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -25,7 +25,7 @@ , gitMinimal , glib , gnutar -, json_glib +, json-glib , libcap , libdwarf , libsoup @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { elfutils flatpak glib - json_glib + json-glib libcap libdwarf libsoup diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index 3d4d542d2f926..4c67a45d8c30d 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 4b87e74a6308e..9a783deecee6d 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 fe159c85c3d64..5e1cd03e0af5d 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 e47b84354d62a..52cd37f988501 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 9a8b592b038de..38ceea7d417be 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 2501c36dd5cdd..a20e1658988c6 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 e4ef9d26da257..fcdb56460e19c 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 6644c8fcfc4f7..3227ed8eec2ea 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 5c69f34e28b30..14c319320d0c6 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 99f049314ae80..a617e582c9801 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 f1452bc121148..86b7246b4113f 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 298657fe38c57..ea9c92c0d0a12 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 ad22d4ea40796..b8230561fb42d 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 ccdab780e6cfa..6c8270f85986f 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 e9a7e7ac89183..05e87d0846066 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 d4be771e8d6b9..e85fb1201012c 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 a80f1569329c1..440b5e2eb0b71 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 65bc55c6d8d7b..69b20dd3a179e 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 31697750a702e..a2a049615b78c 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 ff82127f0c4b8..47a9c550fa8bc 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 edf967f7d1100..5e372b4f3874d 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 fb91015e10c8f..f1c754ddff96a 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 88c4fc14a6661..30dd7f217915d 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 6511bdd20102f..905580482d45f 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 e71e296212cd5..b2c764c5a8566 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 af738bc71a93d..34b9e1df19064 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 e2aa27a96eb5a..b6a78071bc87d 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 dd0379e83a7c2..c53d6608efd33 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 d46f7b3e88337..e8e8acd6a9a41 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 d53b39021339d..694428f55a6ba 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 11f4a5c8bd0a8..af5c0e9c2f9fe 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 9e41ef3813180..afac17b525198 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 8adea820ec767..58f50dd2f7e30 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 c4df52da17013..a5dd0a8827281 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 660917ee9f1ff..265d425bbcfb5 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 affc400a9ed0f..6646b84725267 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 0b71c6719dc4a..2badd0ed26a9a 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 ab84cb37656ee..2d7225ee03edc 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 51610349c45ef..6519f349bfc8a 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 34d1d8a829b13..c5cb277c256f6 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 bf97976712699..0b86deb52055e 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 4df04f44f56ad..75ae9f1ba8b24 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 b734eadae902b..d9fab774b76ac 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 d745bc65cbb27..0000000000000 --- 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 82b224b37f42d..591254c73f578 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 4d8a9b05847a1..a1f33fdfc9e70 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 12d3f97dfc41f..29bf92d2b6e5f 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 13978645c2998..273f9db0c399a 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 296d9673d8f15..f0f21f8f4d5a8 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/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix new file mode 100644 index 0000000000000..aaaee20b81a8f --- /dev/null +++ b/pkgs/development/tools/misc/gputils/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "gputils-${version}"; + version = "1.5.0-1"; + + src = fetchurl { + url = "mirror://sourceforge/gputils/${name}.tar.bz2"; + sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; + }; + + meta = with stdenv.lib; { + homepage = https://gputils.sourceforge.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ yorickvp ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 4fdd017306acc..f4f72491970c0 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; @@ -22,7 +22,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystPluginUnicodeEncoding + CatalystRuntime CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -52,7 +52,6 @@ let SetScalar Starman SysHostnameLong - TestMore TextDiff TextTable XMLSimple diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 08729f6b41b2d..d92b20a12b020 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 71bc3b87a7ac6..27f49ebcf38ca 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 9205f6caf0dc6..017c6ad804915 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 208f0ebd411b2..23b7119e7d744 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 e6f7ac3290b4a..c45e7841d450e 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 219281f4ec171..7235af49c2e6c 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 3da98f38ebc76..553ded815ef83 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 9b4fd05dc0a01..48a2e7bd2cb16 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 4263b80789a20..d6c5256ca84df 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 c8747e66e39b3..11caf8e7b20e8 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 dea1ab2a4459b..6a34c1c130d98 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 f09dbfdb16538..df7630e2d16f2 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 fc1513ecf34bc..6840bcac0dc58 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 7cdf7dc939641..7c7bf79acc7d6 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 6d269552f6289..7980130459559 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 31a5c3ea17bb4..5ec8cca344d4f 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 aa9feda985a3f..73b7da119abe5 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 340c57f281766..1341e071842b4 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 }: @@ -7,12 +7,12 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.2.0"; name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y"; + sha256 = "1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 287bb8beb5245..469e64acff06d 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 27596878f346e..86c1f82678aee 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 3c062dbe1ab4a..949d798f7e88f 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/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index de94b7a8eff34..38d385d1d5532 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -6,8 +6,8 @@ with stdenv.lib; let - baseVersion = "4.5"; - revision = "0"; + baseVersion = "4.6"; + revision = "2"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl"; + sha256 = "1k23i1qsw6d06sy7g0vd699rbvwv6vbw211fy0nn0705a5zndbxv"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 614ffe5e218d6..624866ea9e378 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/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 5e88384c58dbf..775b744f83988 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -19,7 +19,7 @@ let alsaLib cups expat - libudev + udev gnome2.GConf diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 88c975b573521..55797948a84a5 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 a2c75a02aa28a..da3b27ebacc58 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 850fb5ad7f580..2b9792e4df255 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/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 77ab75d1446cd..7be1a9777c025 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "racer-${version}"; - version = "2.0.12"; + version = "2.0.14"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = version; - sha256 = "0y1xlpjr8y8gsmmrjlykx4vwzf8akk42g35kg3kc419ry4fli945"; + sha256 = "0kgax74qa09axq7b175ph3psprgidwgsml83wm1qwdq16gpxiaif"; }; - cargoSha256 = "1h3jv4hajdv6k309kjr6b6298kxmd0faw081i3788sl794k9mp0j"; + cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk"; # rustup is required for test buildInputs = [ makeWrapper rustup ]; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index 370318d1ff299..50c890e3c47e2 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 3b1e8c2c8a75d..48bfbdd689b88 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/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 0535a11e0ceb2..dc157b6725303 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux , go-md2man }: with stdenv.lib; @@ -28,7 +28,7 @@ buildGoPackage rec { excludedPackages = "integration"; nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; + buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ]; buildFlagsArray = '' -ldflags= @@ -37,8 +37,8 @@ buildGoPackage rec { ''; preBuild = '' - export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" - export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include" + export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib" ''; postBuild = '' diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 041aee7a1c5cc..534c69200e026 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 f6687f4e4328b..a3499258a9995 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 0db25f88d7688..ab90bb27bd5eb 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 2a4ddaf803985..0fbcd7b71a601 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 8951f16e43c44..d6d5d6d3ea662 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader, - glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-validation-layers-${version}"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ]; + buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; 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 b99780d41382d..17c64f0548b3e 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 f8b1c1bf31e9d..77ef8565a34ed 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 d585a35b0bc55..4d62f5b857141 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 52231d0a83186..a08e01a48b7f5 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/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index fbf76842c20e0..1487ed4e1ddc5 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 @@ -8,8 +8,8 @@ let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango - gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango + gtk2-x11 nspr nss stdenv.cc.cc libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 0220fbd8df824..e63f609fc2b6c 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 c51e1595ee723..6c3509d632f2b 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 { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pkgs.alsaLib pkgs.cairo pkgs.cups - pkgs.dbus_daemon.lib + pkgs.dbus.daemon.lib pkgs.expat pkgs.gdk_pixbuf pkgs.glib |