Merge branch 'master' into staging

Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh

pkgs/development/compilers/dmd/default.nix

@@ -1,25 +1,20 @@
-{ stdenv, fetchurl, gcc, unzip, curl }:
+{ stdenv, fetchurl, unzip, curl }:
 
 stdenv.mkDerivation {
-  name = "dmd-2.064.2";
+  name = "dmd-2.066.1";
 
   src = fetchurl {
-    url = http://downloads.dlang.org/releases/2013/dmd.2.064.2.zip;
-    sha256 = "1i0jdybigffwyb7c43j0c4aayxx3b93zzqrjxyw6zgp06yhi06pm";
+    url = http://downloads.dlang.org/releases/2014/dmd.2.066.1.zip;
+    sha256 = "1qifwgrl6h232zsnvcx3kmb5d0fsy7j9zv17r3b4vln7x5rvzc66";
   };
 
-  buildInputs = [ gcc unzip curl ];
+  buildInputs = [ unzip curl ];
 
-  configurePhase = "";
-  patchPhase = ''
-      cp src/VERSION src/dmd/
-      cp license.txt src/phobos/LICENSE_1_0.txt
-  '';
   buildPhase = ''
       cd src/dmd
       make -f posix.mak INSTALL_DIR=$out
       export DMD=$PWD/dmd
-      cd ../druntime 
+      cd ../druntime
       make -f posix.mak INSTALL_DIR=$out DMD=$DMD
       cd ../phobos
       make -f posix.mak INSTALL_DIR=$out DMD=$DMD
@@ -28,25 +23,36 @@ stdenv.mkDerivation {
 
   installPhase = ''
       cd src/dmd
-      tee dmd.conf.default << EOF
-          [Environment]
-          DFLAGS=-I$out/import -L-L$out/lib
-      EOF
+      mkdir $out
+      mkdir $out/bin
+      cp dmd $out/bin
+
+      cd ../druntime
+      mkdir $out/include
+      mkdir $out/include/d2
+      cp -r import/* $out/include/d2
 
-      make -f posix.mak INSTALL_DIR=$out install
-      export DMD=$PWD/dmd
-      cd ../druntime 
-      make -f posix.mak INSTALL_DIR=$out install
       cd ../phobos
-      make -f posix.mak INSTALL_DIR=$out install
-      cd ../..
+      mkdir $out/lib
+      ${let bits = if stdenv.is64bit then "64" else "32"; in
+      "cp generated/linux/release/${bits}/libphobos2.a $out/lib"
+      }
+
+      cp -r std $out/include/d2
+      cp -r etc $out/include/d2
+
+      cd $out/bin
+      tee dmd.conf << EOF
+      [Environment]
+      DFLAGS=-I$out/include/d2 -L-L$out/lib -L--no-warn-search-mismatch -L--export-dynamic
+      EOF
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "D language compiler";
     homepage = http://dlang.org/;
-    license = "open source, see included files";
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.free; # parts under different licenses
+    platforms = platforms.unix;
   };
 }
+

pkgs/development/compilers/mozart/binary.nix

@@ -22,9 +22,15 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = "http://www.mozart-oz.org/";
-    description = "The Mozart Programming System combines ongoing research in programming language design and implementation, constraint logic programming, distributed computing, and human-computer interfaces. Mozart implements the Oz language and provides both expressive power and advanced functionality.";
-
+    description = "Multiplatform implementation of the Oz programming language";
+    longDescription = ''
+      The Mozart Programming System combines ongoing research in
+      programming language design and implementation, constraint logic
+      programming, distributed computing, and human-computer
+      interfaces. Mozart implements the Oz language and provides both
+      expressive power and advanced functionality.
+    '';
     license = licenses.mit;
-    platforms = ["x86_64-linux"];
+    platforms = [ "x86_64-linux" ];
   };
 }

pkgs/development/compilers/rdmd/default.nix

@@ -1,29 +1,29 @@
-{ stdenv, fetchurl, writeText, lib, dmd }:
+{stdenv, lib, fetchgit, dmd}:
 
 stdenv.mkDerivation {
-  name = "rdmd-2.064";
-
-  src = fetchurl {
-    url = https://raw2.github.com/D-Programming-Language/tools/2.064/rdmd.d;
-    sha256 = "0b1g3ng6bkanvg00r6xb4ycpbh9x8b9dw589av665azxbcraqrs1";
-    name = "rdmd-src";
-  };
+  name = "rdmd-20141113";
 
   buildInputs = [ dmd ];
 
-  builder = writeText "drmd-builder.sh" ''
-      source $stdenv/setup
-      cp $src rdmd.d
-      dmd rdmd.d
-      mkdir -p $out/bin
-      cp rdmd $out/bin/
+  src = fetchgit {
+    url = git://github.com/D-Programming-Language/tools.git;
+    rev = "f496c68ee4e776597bd7382aa47f05da698a69e";
+    sha256 = "0vbhmz8nbh8ayml4vad0239kfg982vqfyqqrjv6wrlnjah97n5ms";
+  };
+
+  buildPhase = ''
+    dmd rdmd.d
   '';
 
+  installPhase = ''
+    mkdir -p $out/bin
+    cp rdmd $out/bin/
+	'';
+
   meta = {
     description = "Wrapper for D language compiler";
     homepage = http://dlang.org/rdmd.html;
     license = lib.licenses.boost;
-    maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/development/compilers/sbcl/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sbclBootstrap, clisp}:
+{ stdenv, fetchurl, sbclBootstrap, clisp, which}:
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nmb9amygr5flzk2z9fa6wzwqknbgd2qrkybxkxkamvbdwyayvzr";
   };
 
-  buildInputs = [ ]
+  buildInputs = [ which ]
     ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
     ++ (stdenv.lib.optional stdenv.isLinux clisp)
     ;
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
     sed -i src/code/target-load.lisp -e \
       '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
 
+    # Fix software version retrieval
+    sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp
+
     # Fix the tests
     sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
     sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp

pkgs/development/coq-modules/unimath/default.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchgit, coq}:
+
+stdenv.mkDerivation rec {
+
+  name = "coq-unimath-${coq.coq-version}-${version}";
+  version = "a2714eca";
+
+  src = fetchgit {
+    url = git://github.com/UniMath/UniMath.git;
+    rev = "a2714eca29444a595cd280ea961ec33d17712009";
+    sha256 = "0brhbslx4sxl8m9nxjbdl91gi99vcrikykl6b00f4cx5ww43csln";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 ];
+  propagatedBuildInputs = [ coq ];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/UniMath/UniMath;
+    description = "UniMath aims to formalize a substantial body of mathematics using the univalent point of view.";
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}

pkgs/development/interpreters/nix-exec/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "2.0.1";
+  version = "2.0.2";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "1iyz19c15yw0p5lgfbfh8arja2cy3apx5697cm671j4qzjkws32p";
+    sha256 = "0vgvvj0qywx9a1ihc8nddc3fcw69dinf136spw4i7qz4bszbs9j5";
   };
 
   buildInputs = [ pkgconfig nix git ];

pkgs/development/interpreters/pypy/2.4/default.nix

@@ -95,11 +95,12 @@ let
          --set LIBRARY_PATH "${LIBRARY_PATH}"
     '';
 
-    passthru = {
+    passthru = rec {
       inherit zlibSupport libPrefix;
       executable = "pypy";
       isPypy = true;
       buildEnv = callPackage ../../python/wrapper.nix { python = self; };
+      interpreter = "${self}/bin/${executable}";
     };
 
     enableParallelBuilding = true;

pkgs/development/interpreters/python/2.6/default.nix

@@ -93,6 +93,7 @@ let
       libPrefix = "python${majorVersion}";
       executable = libPrefix;
       sitePackages = "lib/${libPrefix}/site-packages";
+      interpreter = "${self}/bin/${executable}";
     };
 
     enableParallelBuilding = true;

pkgs/development/interpreters/python/2.7/default.nix

@@ -101,6 +101,7 @@ let
       libPrefix = "python${majorVersion}";
       executable = libPrefix;
       sitePackages = "lib/${libPrefix}/site-packages";
+      interpreter = "${self}/bin/${executable}";
     };
 
     enableParallelBuilding = true;

pkgs/development/interpreters/python/3.2/default.nix

@@ -80,6 +80,7 @@ stdenv.mkDerivation {
     isPy32 = true;
     is_py3k = true;  # deprecated
     sitePackages = "lib/${libPrefix}/site-packages";
+    interpreter = "${self}/bin/${executable}";
   };
 
   enableParallelBuilding = true;

pkgs/development/interpreters/python/3.3/default.nix

@@ -81,6 +81,7 @@ stdenv.mkDerivation {
     isPy33 = true;
     is_py3k = true;  # deprecated
     sitePackages = "lib/${libPrefix}/site-packages";
+    interpreter = "${self}/bin/${executable}";
   };
 
   enableParallelBuilding = true;

pkgs/development/interpreters/python/3.4/default.nix

@@ -83,6 +83,7 @@ stdenv.mkDerivation {
     isPy34 = true;
     is_py3k = true;  # deprecated
     sitePackages = "lib/${libPrefix}/site-packages";
+    interpreter = "${self}/bin/${executable}";
   };
 
   enableParallelBuilding = true;

pkgs/development/interpreters/racket/default.nix

@@ -1,38 +1,47 @@
-{ stdenv, fetchurl, cairo, file, pango, glib, gtk
-, which, libtool, makeWrapper, libjpeg, libpng
-, fontconfig, liberation_ttf, sqlite, openssl } :
+{ stdenv, fetchurl, cairo, file, fontconfig, glib, gtk, freefont_ttf
+, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which } :
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "6.1";
+  version = "6.1.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "fde283bf5899bb9266ce721db44631c9bac4a4864a7c3211de413fd9503178c6";
+    sha256 = "090269522d20e7a5ce85d2251a126745746ebf5e87554c05efe03f3b7173da75";
   };
 
-  # Various racket executables do run-time searches for these.
-  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib";
+  # Various Racket executables do runtime searches for these.
+  ffiSharedLibs = "${cairo}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${libjpeg}/lib:"
+                + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib";
 
-  buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ];
+  buildInputs = [ file fontconfig freefont_ttf libtool makeWrapper sqlite which ];
 
   preConfigure = ''
     export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH
 
-    # Chroot builds do not have access to /etc/fonts/fonts.conf, but the Racket bootstrap
-    # needs a working fontconfig, so here a simple standin is used.
+    # Chroot builds do not have access to /etc/fonts/fonts.conf,
+    # but the Racket bootstrap needs a working fontconfig,
+    # so here a simple temporary stand-in is used.
     mkdir chroot-fontconfig
     cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf
     sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
-    echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf
+    echo "<dir>${freefont_ttf}</dir>" >> chroot-fontconfig/fonts.conf
     echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
 
+    # remove extraneous directories from temporary fonts.conf
+    sed -e 's@<dir></dir>@@g' \
+        -e 's@<dir prefix="xdg">fonts</dir>@@g' \
+        -e 's@<dir>~/.fonts</dir>@@g' \
+        -e 's@<cachedir prefix="xdg">fontconfig</cachedir>@@g' \
+        -e 's@<cachedir>~/.fontconfig</cachedir>@@g' \
+        -i chroot-fontconfig/fonts.conf
+
     export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf
 
     cd src
     sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
-    sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure 
+    sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure
   '';
 
   configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
@@ -41,25 +50,25 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ;
+      wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}";
     done
   '';
 
   meta = {
-    description = "Programming language derived from Scheme (formerly called PLT Scheme)";
+    description = "A programmable programming language";
     longDescription = ''
-      Racket (formerly called PLT Scheme) is a programming language derived
-      from Scheme. The Racket project has four primary components: the
-      implementation of Racket, a JIT compiler; DrRacket, the Racket program
-      development environment; the TeachScheme! outreach, an attempt to turn
-      Computing and Programming into "an indispensable part of the liberal
-      arts curriculum"; and PLaneT, Racket's web-based package
-      distribution system for user-contributed packages.
+      Racket is a full-spectrum programming language. It goes beyond
+      Lisp and Scheme with dialects that support objects, types,
+      laziness, and more. Racket enables programmers to link
+      components written in different dialects, and it empowers
+      programmers to create new, project-specific dialects. Racket's
+      libraries support applications from web servers and databases to
+      GUIs and charts.
     '';
 
     homepage = http://racket-lang.org/;
-    license = stdenv.lib.licenses.lgpl2Plus; # and licenses of contained libraries
-    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = with stdenv.lib.maintainers; [ kkallio henrytill ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/clearsilver/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
-stdenv.mkDerivation {
-  name = "clearsilver-0.10.3";
+stdenv.mkDerivation rec {
+  name = "clearsilver-0.10.5";
 
   src = fetchurl {
-    url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz;
-    sha256 = "1lhbbf5rrqxb44y5clga7iifcfrh8sfjwpj4phnr3qabk92wdn3i";
+    url = "http://www.clearsilver.net/downloads/${name}.tar.gz";
+    sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
   };
 
   builder = ./builder.sh;

pkgs/development/libraries/cminpack/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "cminpack-1.3.2";
+stdenv.mkDerivation rec {
+  name = "cminpack-1.3.4";
   
   src = fetchurl {
-    url = http://devernay.free.fr/hacks/cminpack/cminpack-1.3.2.tar.gz;
-    sha256 = "09bqr44wqancbdsc39lvhdz7rci3hknmlrrrzv46skvwx6rgk9x0";
+    url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
+    sha256 = "1jh3ymxfcy3ykh6gnvds5bbkf38aminvjgc8halck356vkvpnl9v";
   };
 
   patchPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html;
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd3;
     description = "Software for solving nonlinear equations and nonlinear least squares problems";
   };
 

pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HDBC-odbc";
-  version = "2.3.1.1";
-  sha256 = "0zypgwy8yxzp69c2775gkzi8591b0l3wncn7vmq11l16ign95fc7";
+  version = "2.4.0.0";
+  sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ HDBC mtl time utf8String ];

pkgs/development/libraries/haskell/HFuse/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HFuse";
-  version = "0.2.4.3";
-  sha256 = "1daka673mx0gsnsa04pxani7n4wp93hflzxs3imzy4sgb30p7l01";
+  version = "0.2.4.4";
+  sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc";
   isLibrary = true;
   isExecutable = true;
   extraLibraries = [ fuse ];
@@ -17,6 +17,6 @@ cabal.mkDerivation (self: {
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })

pkgs/development/libraries/haskell/HandsomeSoup/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HandsomeSoup";
-  version = "0.3.4";
-  sha256 = "0xpimys8pb0kzqnfxxf04dbxfmcrry5pzgmagyydcrmafacg0vjb";
+  version = "0.3.5";
+  sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -15,7 +15,6 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [ hspec hxt ];
   jailbreak = true;
-  doCheck = false;
   meta = {
     homepage = "https://github.com/egonSchiele/HandsomeSoup";
     description = "Work with HTML more easily in HXT";

pkgs/development/libraries/haskell/ReadArgs/default.nix

@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ systemFilepath text ];
   testDepends = [ hspec systemFilepath text ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/rampion/ReadArgs";
     description = "Simple command line argument parsing";

pkgs/development/libraries/haskell/Unixutils/default.nix

@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4";
   buildDepends = [ filepath pureMD5 regexTdfa zlib ];
   meta = {
-    homepage = "http://src.seereason.com/haskell-unixutils";
+    homepage = "https://github.com/seereason/haskell-unixutils";
     description = "A crude interface between Haskell and Unix-like operating systems";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/cabal-cargs/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-cargs";
-  version = "0.7.3";
-  sha256 = "10707nja5j9hbx5yj7pq8s9zgfx21n36r4xhs71g70g6hwpciqjb";
+  version = "0.7.4";
+  sha256 = "0dar64xk3bcccyaz2b9v1qc8y63vrm60vb54k8c4n1j6cqzcdp8h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/cabal-lenses/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-lenses";
-  version = "0.4";
-  sha256 = "19ryd1qvsc301kdpk0zvw89aqhvk26ccbrgddm9j5m31mn62jl2d";
+  version = "0.4.1";
+  sha256 = "0gkd82g6q8ahrrfmnjzr4r9n5cgdmhpxkqvnsy50k043v0faa0cx";
   buildDepends = [ Cabal lens unorderedContainers ];
   jailbreak = true;
   meta = {

pkgs/development/libraries/haskell/cairo/0.12.5.3.nix

@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String
-, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cairo";
-  version = "0.12.5.3";
-  sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7";
-  buildDepends = [ mtl utf8String ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ cairo libc pkgconfig zlib ];
-  pkgconfigDepends = [ cairo ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Cairo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})

pkgs/development/libraries/haskell/cgrep/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cgrep";
-  version = "6.4.6";
-  sha256 = "13plsh6411k273qllpkcrkakwxcdmw0p6arj0j3gdqa7bbxii99s";
+  version = "6.4.7";
+  sha256 = "1937dvd69igx41sp1ljpghwqz0ki436pv0xmwz6bq1vny0axwmp7";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/colors/default.nix

@@ -4,13 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "colors";
-  version = "0.1.1";
-  sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm";
+  version = "0.2";
+  sha256 = "009qkab6m1gnvxc23ayhv5h2v9mpiji5hasiym7a8nm69p8678xa";
   buildDepends = [ profunctors ];
   meta = {
     homepage = "https://github.com/fumieval/colors";
     description = "A type for colors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })

pkgs/development/libraries/haskell/conduit-combinators/default.nix

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.3.0";
-  sha256 = "1ggdzll71a05743x3a8y1n43ais85simlqsng9da2z3qa42a9dz9";
+  version = "0.3.0.4";
+  sha256 = "1aphk79r3ibpb9gykdnz55isp7kf48jhz4h4vgplb0ndbmz8f8zm";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet

pkgs/development/libraries/haskell/conduit-extra/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.4.1";
-  sha256 = "18q2d9ga49gldw4i8a5vnncsr712b21ik0160gdw3czqilvf8nbr";
+  version = "1.1.4.2";
+  sha256 = "0s2ggca6g2104dylbrkn090xwsfrp0946bhwf7fgpfpg9gi1sz1g";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet stm streamingCommons text transformers

pkgs/development/libraries/haskell/conduit/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.2.2";
-  sha256 = "04wx9c7lybqmrvhw8h6zb9vp5qyqfs9p7a9a2m2yicf1p3p0q4n8";
+  version = "1.2.2.2";
+  sha256 = "0jabdv91zc64bwk709hkpjd7n4gy2cmsv2dhr5ydv35whmkhyry2";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void

pkgs/development/libraries/haskell/crypto-conduit/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.5.4";
-  sha256 = "1z628gj4sf50s7pd6p41c670rz98f8b6p3n2dvl93haczcg53l1n";
+  version = "0.5.5";
+  sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
   buildDepends = [
     cereal conduit conduitExtra cryptoApi resourcet transformers
   ];

pkgs/development/libraries/haskell/cufft/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cufft";
-  version = "0.1.0.3";
-  sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi";
+  version = "0.1.1.0";
+  sha256 = "0d13nf61698gzh0hcycx1z9bm2xpikkg27bjymsjhfwimvqn7z8h";
   buildDepends = [ cuda ];
   buildTools = [ c2hs ];
   meta = {

pkgs/development/libraries/haskell/either/default.nix

@@ -1,16 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, exceptions, free, monadControl, MonadRandom, mtl
-, semigroupoids, semigroups, transformers, transformersBase
+{ cabal, bifunctors, exceptions, free, monadControl, MonadRandom
+, mtl, profunctors, semigroupoids, semigroups, transformers
+, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "4.3.1";
-  sha256 = "1k7aqy3k0ivpbqhym79q49dx41gnrkn1nw2inkm6gv8dy7bj9h6x";
+  version = "4.3.2";
+  sha256 = "0bmw4qc263fs5ivf94qfzrq26v8kflb13gims7c474d4jhg8g0w1";
   buildDepends = [
-    exceptions free monadControl MonadRandom mtl semigroupoids
-    semigroups transformers transformersBase
+    bifunctors exceptions free monadControl MonadRandom mtl profunctors
+    semigroupoids semigroups transformers transformersBase
   ];
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
   meta = {

pkgs/development/libraries/haskell/entropy/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.3.4";
-  sha256 = "1khfvrk49zf0rd90d34983048mxy093ci2qk8866qq0hwi53b0q0";
+  version = "0.3.4.1";
+  sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";

pkgs/development/libraries/haskell/extra/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "extra";
-  version = "0.7";
-  sha256 = "11839h4915xjgmz8av60pn8qaw3b0ckbpw4l9nq5a77qb9rgpbfs";
+  version = "0.8";
+  sha256 = "06ydgniar294i9xzviz7qmr3xpnlkpvyvgigwxqfz50kv77w8ijw";
   buildDepends = [ filepath time ];
   testDepends = [ filepath QuickCheck time ];
   meta = {

pkgs/development/libraries/haskell/github/default.nix

@@ -1,18 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, caseInsensitive, conduit, cryptohash
-, dataDefault, failure, hashable, HTTP, httpConduit, httpTypes
-, network, text, time, unorderedContainers, vector
+{ cabal, aeson, attoparsec, base16Bytestring, byteable
+, caseInsensitive, conduit, cryptohash, dataDefault, failure
+, hashable, HTTP, httpConduit, httpTypes, network, text, time
+, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.11.1";
-  sha256 = "0s94ivp3c40zhwwfxa6nzzgwh2frfih8as81i0kidx4ca35wf92k";
+  version = "0.13";
+  sha256 = "1vvfrlz6p43mrzskvhp9skh6xbgd5pqcn06wvxw31plpamf5pmzn";
   buildDepends = [
-    aeson attoparsec caseInsensitive conduit cryptohash dataDefault
-    failure hashable HTTP httpConduit httpTypes network text time
-    unorderedContainers vector
+    aeson attoparsec base16Bytestring byteable caseInsensitive conduit
+    cryptohash dataDefault failure hashable HTTP httpConduit httpTypes
+    network text time unorderedContainers vector
   ];
   meta = {
     homepage = "https://github.com/fpco/github";

pkgs/development/libraries/haskell/gitlib-libgit2/default.nix

@@ -26,6 +26,7 @@ cabal.mkDerivation (self: {
     description = "Libgit2 backend for gitlib";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
   };
 })

pkgs/development/libraries/haskell/gitlib-test/default.nix

@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
+    broken = true;
   };
 })

pkgs/development/libraries/haskell/glib/0.12.5.4.nix

@@ -1,21 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "glib";
-  version = "0.12.5.4";
-  sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6";
-  buildDepends = [ utf8String ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ glib ];
-  patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk2hs.patch ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the GLIB library for Gtk2Hs";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})

pkgs/development/libraries/haskell/glib/gtk2hs.patch

@@ -1,15 +0,0 @@
-Author: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
-Date:   Mon Jul 7 21:28:50 2014 +1200
-
-    Fixes #1
-
---- a/glib.cabal.orig	2014-11-03 14:52:40.000000000 -0600
-+++ b/glib.cabal	2014-11-03 14:52:51.000000000 -0600
-@@ -36,6 +36,7 @@
-                         utf8-string >= 0.2 && < 0.4,
-                         containers
-         build-tools:    gtk2hsC2hs >= 0.13.8
-+        cpp-options:    -U__BLOCKS__ -D__attribute__(A)=
-         if flag(closure_signals)
-           cpp-options:  -DUSE_GCLOSURE_SIGNALS_IMPL
-           c-sources: System/Glib/hsgclosure.ccommit aa22754e04616c354557fc350f96a8f7f331e984

pkgs/development/libraries/haskell/gtk/0.12.5.7.nix

@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
-, pkgconfig, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "gtk";
-  version = "0.12.5.7";
-  sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
-  buildDepends = [ cairo gio glib mtl pango text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ glib gtk ];
-  patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk.patch ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Gtk+ graphical user interface library";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})

pkgs/development/libraries/haskell/gtk/gtk.patch

@@ -1,10 +0,0 @@
---- a/gtk.cabal.orig	2014-11-03 15:13:42.000000000 -0600
-+++ b/gtk.cabal	2014-11-03 15:14:05.000000000 -0600
-@@ -148,6 +148,7 @@
- 
-         build-tools:    gtk2hsC2hs >= 0.13.8,
-                         gtk2hsHookGenerator, gtk2hsTypeGen
-+        cpp-options:    -U__BLOCKS__ -D__attribute__(A)=
- 
-         exposed-modules:
-           Graphics.UI.Gtk

pkgs/development/libraries/haskell/highlighting-kate/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.9";
-  sha256 = "025j6d97nwjhhyhdz7bsfhzgpb1ld28va4r8yv7zfh1dvczs6lkr";
+  version = "0.5.11";
+  sha256 = "0jfgz4cyn6fylfrsk1yi0fykir8mhxdniq80h7hy5i2xv7qwf5vw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/hoauth2/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoauth2";
-  version = "0.4.2";
-  sha256 = "08vdrgzn1j02gn2j5apjhnv2lgp7i8xhvibqjcjf4l80spmja2h0";
+  version = "0.4.3";
+  sha256 = "1qmhk9h3rwp29dsjqbgsma4zgzdd6cw1jcryzd17rk32biiiylvg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/hsimport/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.6.2";
-  sha256 = "02v32gh5has3y8qk55cpdr0336n2hi33d5aw0ifpg84p89k8kr33";
+  version = "0.6.3";
+  sha256 = "0pmlspz09qj8zb1qpv6dxd25l69hh2ccsyvc37914dis74g9rw03";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/hspec-core/default.nix

@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations
+, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv
+, silently, tfRandom, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-core";
+  version = "2.0.1";
+  sha256 = "1yr2hkr1p95bpj5n6hqw20g8imqal6pva4nrvy0hmxdg53jyxcf7";
+  buildDepends = [
+    ansiTerminal async deepseq hspecExpectations HUnit QuickCheck
+    quickcheckIo random setenv tfRandom time transformers
+  ];
+  testDepends = [
+    ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta
+    HUnit QuickCheck quickcheckIo random setenv silently tfRandom time
+    transformers
+  ];
+  meta = {
+    homepage = "http://hspec.github.io/";
+    description = "A Testing Framework for Haskell";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/hspec-discover/default.nix

@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, hspecMeta }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-discover";
+  version = "2.0.1";
+  sha256 = "0k54j1id5yj60kjxs16w4hr52wanc55l131arypcjgf9w4yx3x3w";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath ];
+  testDepends = [ filepath hspecMeta ];
+  noHaddock = true;
+  meta = {
+    homepage = "http://hspec.github.io/";
+    description = "Automatically discover and run Hspec tests";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/hspec-meta/default.nix

@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations
-, HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time
+, HUnit, QuickCheck, quickcheckIo, random, setenv, time
 , transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.12.3";
-  sha256 = "106wzvramjw18a2wvmfik3z47zshq7yalgax389gx340g3wnrfp7";
+  version = "2.0.0";
+  sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv tfRandom time transformers
+    QuickCheck quickcheckIo random setenv time transformers
   ];
   doCheck = false;
   meta = {

pkgs/development/libraries/haskell/hspec/default.nix

@@ -1,26 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths
-, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
-, random, setenv, silently, stringbuilder, tfRandom, time
-, transformers
+{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta
+, QuickCheck, stringbuilder, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.12.3";
-  sha256 = "0lqihgsk46lwm4k2nc81pbi1gdfk7qnmjli90bvf4pbbhg5igjkn";
-  isLibrary = true;
-  isExecutable = true;
+  version = "2.0.1";
+  sha256 = "05kwxn5sws8gc1v8im2pyirrj5bzc6lnj22q2klgj4mg3apjd0jb";
   buildDepends = [
-    ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv tfRandom time transformers
-  ];
-  testDepends = [
-    ansiTerminal async deepseq filepath ghcPaths hspecExpectations
-    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
-    stringbuilder tfRandom time transformers
+    hspecCore hspecDiscover hspecExpectations QuickCheck transformers
   ];
+  testDepends = [ hspecCore hspecMeta QuickCheck stringbuilder ];
   doCheck = false;
   meta = {
     homepage = "http://hspec.github.io/";

pkgs/development/libraries/haskell/hspec2/default.nix

@@ -1,31 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths
-, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
-, random, setenv, silently, stringbuilder, tfRandom, time
-, transformers
-}:
+{ cabal, hspec, hspecDiscover }:
 
 cabal.mkDerivation (self: {
   pname = "hspec2";
-  version = "0.5.1";
-  sha256 = "1ax507vb0zm5jalp6pvlk1fjfil766pf7w61d1igpxr0s00lnvlq";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv tfRandom time transformers
-  ];
-  testDepends = [
-    ansiTerminal async deepseq filepath ghcPaths hspecExpectations
-    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
-    stringbuilder tfRandom time transformers
-  ];
+  version = "0.6.1";
+  sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
+  buildDepends = [ hspec hspecDiscover ];
   meta = {
     homepage = "http://hspec.github.io/";
     description = "Alpha version of Hspec 2.0";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    broken = true;
   };
 })

pkgs/development/libraries/haskell/labeled-tree/default.nix

@@ -0,0 +1,14 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "labeled-tree";
+  version = "1.0.0.0";
+  sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
+  meta = {
+    description = "Labeled tree structure";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/libjenkins/default.nix

@@ -1,24 +1,24 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, async, conduit, doctest, exceptions, filepath, free, hspec
-, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens
-, monadControl, network, networkUri, resourcet, text, transformers
-, xmlConduit
+{ cabal, async, attoparsec, doctest, filepath, free, hspec
+, hspecExpectationsLens, httpClient, httpClientTls, httpTypes, lens
+, liftedAsync, liftedBase, monadControl, mtl, network, networkUri
+, profunctors, text, transformers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "libjenkins";
-  version = "0.5.0";
-  sha256 = "010gid9r3kcajijg7x56c77l93vlbh7fy7akjrg7b73i4zy6jnl7";
+  version = "0.6.0";
+  sha256 = "0rcqmj5myi2wy2acd59gqdfwiiapw1zwzm71bjqb1y66z0rnrkx4";
   buildDepends = [
-    async conduit exceptions free httpClient httpConduit httpTypes lens
-    monadControl network networkUri resourcet text transformers
-    xmlConduit
+    attoparsec free httpClient httpClientTls httpTypes liftedAsync
+    liftedBase monadControl mtl network networkUri profunctors text
+    transformers
   ];
   testDepends = [
-    async conduit doctest exceptions filepath free hspec
-    hspecExpectationsLens httpClient httpConduit httpTypes lens
-    monadControl network networkUri resourcet text transformers
+    async attoparsec doctest filepath free hspec hspecExpectationsLens
+    httpClient httpClientTls httpTypes lens liftedAsync liftedBase
+    monadControl mtl network networkUri profunctors text transformers
     xmlConduit
   ];
   jailbreak = true;

pkgs/development/libraries/haskell/linear/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.11.3";
-  sha256 = "12a3qfkyb4h14630k312gpb5j7dxr38bqk5y2lnnafka8hcc6w5n";
+  version = "1.13";
+  sha256 = "1gad6dvri7a21v8zx6m2m3ghcvb4zfrra3c4ghrc7ywccxvzmxpc";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers

pkgs/development/libraries/haskell/pango/0.12.5.3.nix

@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "pango";
-  version = "0.12.5.3";
-  sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a";
-  buildDepends = [ cairo glib mtl text ];
-  buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ libc pkgconfig ];
-  pkgconfigDepends = [ cairo pango ];
-  patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./pango.patch ];
-  meta = {
-    homepage = "http://projects.haskell.org/gtk2hs/";
-    description = "Binding to the Pango text rendering engine";
-    license = self.stdenv.lib.licenses.lgpl21;
-    platforms = self.ghc.meta.platforms;
-  };
-})

pkgs/development/libraries/haskell/pango/pango.patch

@@ -1,10 +0,0 @@
---- a/pango.cabal.orig	2014-11-03 15:11:35.000000000 -0600
-+++ b/pango.cabal	2014-11-03 15:11:57.000000000 -0600
-@@ -52,6 +52,7 @@
-           build-depends:  base < 4
- 
-         build-tools:    gtk2hsC2hs >= 0.13.8, gtk2hsTypeGen
-+        cpp-options:    -U__BLOCKS__ -D__attribute__(A)=
- 
-         exposed-modules: Graphics.Rendering.Pango
-                          Graphics.Rendering.Pango.Font

pkgs/development/libraries/haskell/pipes-text/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-text";
-  version = "0.0.0.13";
-  sha256 = "1sqwrs5y9s16zikwb5w21fvrqf06ld0915kc065ikdcrd6z4sk43";
+  version = "0.0.0.15";
+  sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9";
   buildDepends = [
     pipes pipesBytestring pipesGroup pipesParse pipesSafe
     streamingCommons text transformers

pkgs/development/libraries/haskell/rethinkdb/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rethinkdb";
-  version = "1.15.2.0";
-  sha256 = "1cca6nrdaia5dgq2ah6sfr9qy01iasilw7zdw6k8vp5907alsh0f";
+  version = "1.15.2.1";
+  sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5";
   buildDepends = [
     aeson base64Bytestring binary dataDefault mtl network scientific
     text time unorderedContainers utf8String vector

pkgs/development/libraries/haskell/sdl2/default.nix

@@ -1,13 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, SDL2 }:
+{ cabal, SDL2, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "sdl2";
-  version = "1.2.0";
-  sha256 = "19q7x74b9ismxmlsblqvfy4w91bspl9n1fjccz8w1qylyilr6ca2";
+  version = "1.3.0";
+  sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa";
+  buildDepends = [ transformers ];
   extraLibraries = [ SDL2 ];
   pkgconfigDepends = [ SDL2 ];
+  noHaddock = true;
   meta = {
     description = "Low-level bindings to SDL2";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/shakespeare/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "2.0.1.1";
-  sha256 = "0xddm8xby19323d9bcd196b1ninlvfkv5b93w1da23m7w0hy509p";
+  version = "2.0.2";
+  sha256 = "18yzihkjxgchb4358pbm45xk9zcmpgbp3rr27mx08nj5n0mdkwyy";
   buildDepends = [
     aeson blazeHtml blazeMarkup exceptions parsec systemFileio
     systemFilepath text time transformers

pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix

@@ -1,6 +1,6 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, clientsession, configurator, errors
+{ cabal, clientsession, configurator, errors, lens
 , MonadCatchIOTransformers, mtl, postgresqlSimple
 , resourcePoolCatchio, snap, text, transformers
 , unorderedContainers
@@ -8,10 +8,10 @@
 
 cabal.mkDerivation (self: {
   pname = "snaplet-postgresql-simple";
-  version = "0.5";
-  sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm";
+  version = "0.6";
+  sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6";
   buildDepends = [
-    clientsession configurator errors MonadCatchIOTransformers mtl
+    clientsession configurator errors lens MonadCatchIOTransformers mtl
     postgresqlSimple resourcePoolCatchio snap text transformers
     unorderedContainers
   ];
@@ -20,7 +20,5 @@ cabal.mkDerivation (self: {
     description = "postgresql-simple snaplet for the Snap Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

pkgs/development/libraries/haskell/system-fileio/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.14";
-  sha256 = "1x5cricx2n1wwvdad4i3q8s3gb28a129v3kkj9rn9803xh43zh29";
+  version = "0.3.15";
+  sha256 = "06cnr3hzw8xd75529nfqajgb5xy5i4ddqybgjw1v1nwpq04mhihi";
   buildDepends = [ systemFilepath text time ];
   testDepends = [
     chell systemFilepath temporary text time transformers

pkgs/development/libraries/haskell/terminal-size/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "terminal-size";
-  version = "0.2.1.0";
-  sha256 = "0d41af1is3vdb1kgd8dk82fags86bgs67vkbzpdhjdwa3aimsxgn";
+  version = "0.3.0";
+  sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw";
   meta = {
     description = "Get terminal window height and width";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/twitter-conduit/default.nix

@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-conduit";
-  version = "0.0.7";
-  sha256 = "1xwfyhjkbdl19b7cpw12lgnjzqhpiqvfhag2l8zhks21yv0l3kg0";
+  version = "0.0.8";
+  sha256 = "16yxf9qdy1x2w4l4ix1kp1a9vcgmd1cvkqffkj52rzckcjpyd6fs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/yesod-bin/default.nix

@@ -5,14 +5,14 @@
 , ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase
 , network, optparseApplicative, parsec, projectTemplate, resourcet
 , shakespeare, split, streamingCommons, systemFileio
-, systemFilepath, tar, text, time, transformers, unixCompat
-, unorderedContainers, wai, waiExtra, warp, yaml, zlib
+, systemFilepath, tar, text, time, transformers, transformersCompat
+, unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.4.0.5";
-  sha256 = "06rwmcag0vlj8q647mwimk5fsjfmrxc6d1yg95b7a2g48rh1m25x";
+  version = "1.4.0.6";
+  sha256 = "1sx8fwi191zzq4p4lmmvk430dgf0zkik01ckxnkswvazmbjlm5vj";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -20,8 +20,9 @@ cabal.mkDerivation (self: {
     dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
     httpReverseProxy httpTypes liftedBase network optparseApplicative
     parsec projectTemplate resourcet shakespeare split streamingCommons
-    systemFileio systemFilepath tar text time transformers unixCompat
-    unorderedContainers wai waiExtra warp yaml zlib
+    systemFileio systemFilepath tar text time transformers
+    transformersCompat unixCompat unorderedContainers wai waiExtra warp
+    yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

pkgs/development/libraries/haskell/yesod-core/default.nix

@@ -13,8 +13,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.4.3";
-  sha256 = "1mglavffzvav4dzwqq70agz5rd4bdb66p40qa445fq1dxwbwcq6i";
+  version = "1.4.3.1";
+  sha256 = "11zds9zh6vpc83vv8aizd8vm5ajlnqdha5l0rz35n75c21iygg3w";
   buildDepends = [
     aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
     clientsession conduit conduitExtra cookie dataDefault deepseq

pkgs/development/libraries/haskell/yesod-test/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.4.0.3";
-  sha256 = "00rg8q5qwyp7aa409d8ir09vgbvwa9qxkgcjpwqa4lp3ncbpiw9j";
+  version = "1.4.1";
+  sha256 = "10z88ki694z0kzbg84gaj10h8s9hrj5ghgbxq4y486nvmp4px8f1";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network

pkgs/development/libraries/java/commons/bsf/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "commons-bsf-1.2";
+
+  src = fetchurl {
+    url = mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz;
+    sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp lib/bsf.jar $out/share/java/
+  '';
+
+  meta = {
+    description = "Interface to scripting languages, including JSR-223";
+    homepage = http://commons.apache.org/proper/commons-bsf/;
+    license = stdenv.lib.licenses.asl20;
+  };
+}
+

pkgs/development/libraries/java/commons/logging/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "commons-logging-1.2";
+
+  src = fetchurl {
+    url    = mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz;
+    sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp commons-logging-*.jar $out/share/java/
+  '';
+
+  meta = {
+    description = "Wrapper around a variety of logging API implementations";
+    homepage = http://commons.apache.org/proper/commons-logging;
+    license = stdenv.lib.licenses.asl20;
+  };
+}
+

pkgs/development/libraries/libgphoto2/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
+{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }:
 
 stdenv.mkDerivation rec {
   name = "libgphoto2-${meta.version}";
@@ -7,12 +7,12 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
     sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0";
   };
-  
+
   nativeBuildInputs = [ pkgconfig gettext ];
-  buildInputs = [ libtool libjpeg ];
+  buildInputs = [ libtool libjpeg libusb1 ];
 
   # These are mentioned in the Requires line of libgphoto's pkg-config file.
-  propagatedBuildInputs = [ libusb libexif ];
+  propagatedBuildInputs = [ libexif ];
 
   meta = {
     homepage = http://www.gphoto.org/proj/libgphoto2/;
@@ -20,12 +20,13 @@ stdenv.mkDerivation rec {
     longDescription = ''
       This is the library backend for gphoto2. It contains the code for PTP,
       MTP, and other vendor specific protocols for controlling and transferring data
-      from digital cameras. 
+      from digital cameras.
     '';
     version = "2.5.5.1";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
-    license = stdenv.lib.licenses.lgpl21Plus; 
+    license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }
+

pkgs/development/libraries/libusb/default.nix

@@ -1,16 +1,12 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, pkgconfig, libusb1}:
 
 stdenv.mkDerivation {
-  name = "libusb-0.1.12";
+  name = "libusb-compat-0.1.5";
 
-  # On non-linux, we get warnings compiling, and we don't want the
-  # build to break.
-  patchPhase = ''
-    sed -i s/-Werror// Makefile.in
-  '';
+  buildInputs = [ pkgconfig libusb1 ];
 
   src = fetchurl {
-    url = mirror://sourceforge/libusb/libusb-0.1.12.tar.gz;
-    sha256 = "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip";
+    url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2;
+    sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0";
   };
 }

pkgs/development/libraries/science/math/ipopt/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
+
+stdenv.mkDerivation rec {
+  version = "3.11.9";
+  name = "ipopt-${version}";
+
+  src = fetchurl {
+    url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
+    sha256 = "0sji4spl5dhw1s3f9y0ym09gi7d1c8wldn6wbiap4q8dq7cvklq5";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  buildInputs = [ gfortran blas liblapack ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A software package for large-scale nonlinear optimization";
+    homepage = https://projects.coin-or.org/Ipopt;
+    license = licenses.epl10;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh

@@ -12,6 +12,9 @@ shift
 
 export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS
 
+test -n "$NIX_LISP_LD_LIBRARY_PATH" &&
+	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH"
+
 case "$NIX_LISP" in
 	sbcl)
 		NIX_LISP_LOAD_FILE="--load"

pkgs/development/lisp-modules/define-package.nix

@@ -1,5 +1,5 @@
 args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, 
-  buildInputs ? [], meta ? {}, overrides?(x: {})}:
+  buildInputs ? [], meta ? {}, overrides?(x: {}), propagatedBuildInputs ? []}:
 let 
   deployConfigScript = ''
     config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh
@@ -38,7 +38,8 @@ basePackage = {
     ${deployConfigScript}
     ${deployLaunchScript}
   '';
-  propagatedBuildInputs = args.deps ++ [clwrapper clwrapper.lisp];
+  propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp] 
+    ++ (args.propagatedBuildInputs or []);
   buildInputs = buildInputs;
   dontStrip=true;
   meta = {

pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh

@@ -2,10 +2,16 @@
 
 name="$1"
 
-nix-instantiate "$(dirname "$0")"/../../../../ -A "lispPackages.$name" > /dev/null && exit
-[ "$NIX_LISP_PACKAGES_DEFINED" != "${NIX_LISP_PACKAGES_DEFINED/$name/@@}" ] && exit
+[ -z "$NIX_LISP_PACKAGES_DEFINED_LIST" ] && export NIX_LISP_PACKAGES_DEFINED_LIST="$(mktemp)"
 
-NIX_LISP_PACKAGES_DEFINED="$NIX_LISP_PACKAGES_DEFINED $1 "
+if [ -n "$NIX_LISP_UPDATE_PACKAGE" ] || [ -n "$NIX_LISP_UPDATE_PACKAGES" ]; then
+  export NIX_LISP_UPDATE_PACKAGE=
+else
+  nix-instantiate "$(dirname "$0")"/../../../../ -A "lispPackages.$name" > /dev/null && exit
+fi
+grep "^$name\$" "$NIX_LISP_PACKAGES_DEFINED_LIST" > /dev/null && exit
+
+echo "$name" >> "$NIX_LISP_PACKAGES_DEFINED_LIST"
 
 [ -z "$NIX_QUICKLISP_DIR" ] && {
   export NIX_QUICKLISP_DIR="$(mktemp -d --tmpdir nix-quicklisp.XXXXXX)"
@@ -26,14 +32,39 @@ ql_src="$(curl -L https://github.com/quicklisp/quicklisp-projects/raw/master/"$n
 ql_src_type="${ql_src%% *}"
 url="${ql_src##* }"
 
+[ "$ql_src_type" = "kmr-git" ] && {
+  ql_src_type=git
+  url="http://git.b9.com/$url.git"
+  export NIX_PREFETCH_GIT_DEEP_CLONE=1
+}
+
+[ "$ql_src_type" = ediware-http ] && {
+  ql_src_type=github
+  url="edicl/$url";
+}
+
+[ "$ql_src_type" = xach-http ] && {
+  ql_src_type=github
+  url="xach/$url";
+}
+
+[ "$ql_src_type" = github ] && {
+  ql_src_type=git
+  url="https://github.com/$url";
+  version="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)"
+  rev="refs/tags/$version";
+}
+
 [ "$ql_src_type" = git ] && {
   fetcher="pkgs.fetchgit"
-  [ "${url#git://github.com/}" != "$url" ] && {
+  ( [ "${url#git://github.com/}" != "$url" ] ||
+    [ "${url#https://github.com/}" != "$url" ]
+    ) && {
     url="${url/git:/https:}"
     url="${url%.git}"
-    rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename)
-    hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev")
-    version="git-$(date +%Y%m%d)";
+    [ -z "$rev" ] && rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename)
+    hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1)
+    [ -z "$version" ] && version="git-$(date +%Y%m%d)";
   }
   [ "${url#git://common-lisp.net/}" != "$url" ] && {
     http_repo_url="$url"
@@ -41,8 +72,26 @@ url="${ql_src##* }"
     http_repo_url="${http_repo_url/\/projects\// /r/projects/}"
     http_repo_head="$http_repo_url/refs/heads/master"
     echo "$http_repo_head" >&2
-    rev=$(curl -L "$http_repo_head");
+    [ -z "$rev" ] && rev=$(curl -L "$http_repo_head");
     hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev")
+    [ -z "$version" ] && version="git-$(date +%Y%m%d)";
+  }
+  [ "${url#http://git.b9.com/}" != "$url" ] && {
+    http_repo_url="$url"
+    http_repo_url="${http_repo_url/git:/http:}"
+    http_repo_head="$http_repo_url/refs/heads/master"
+    echo "$http_repo_head" >&2
+    rev=$(curl -L "$http_repo_head");
+    hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1)
+    version="git-$(date +%Y%m%d)";
+  }
+  [ "${url#http://common-lisp.net/}" != "$url" ] && {
+    http_repo_url="$url"
+    http_repo_url="${http_repo_url/git:/http:}"
+    http_repo_head="$http_repo_url/refs/heads/master"
+    echo "$http_repo_head" >&2
+    rev=$(curl -L "$http_repo_head");
+    hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1)
     version="git-$(date +%Y%m%d)";
   }
 }
@@ -57,13 +106,58 @@ url="${ql_src##* }"
   unset url
 }
 
-cat << EOF
+[ "$ql_src_type" = clnet-darcs ] && {
+  ql_src_type=darcs
+  url="http://common-lisp.net/project/$url/darcs/$url/"
+}
+
+[ "$ql_src_type" = darcs ] && {
+  fetcher="pkgs.fetchdarcs"
+  [ -z "$version" ] &&
+  version="$(curl "$url/_darcs/inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')"
+  [ -z "$version" ] &&
+  version="$(curl "$url/_darcs/hashed_inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')"
+  rev="$version";
+  hash=$(echo "
+  with (import <nixpkgs> {});
+      fetchdarcs {
+        url=''$url'';
+	rev=''$version'';
+	sha256=''0000000000000000000000000000000000000000000000000000000000000000'';
+    }" | nix-instantiate - | tail -n 1 |
+    xargs nix-store -r 2>&1 | tee /dev/stderr | grep 'instead has' | tail -n 1 |
+    sed -e 's/.* instead has .//;s/[^0-9a-z].*//')
+}
+
+[ "$ql_src_type" = froydware-http ] && {
+  dirurl = "http://method-combination.net/lisp/files/";
+  url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" | grep "/$url_" | tail -n 1)"
+  ql_src_type=http
+}
+
+[ "$ql_src_type" = http ] && {
+  fetcher="pkgs.fetchurl";
+  version="$(echo "$url" | sed -re 's@.*-([0-9.]+)[-._].*@\1@')"
+  hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)"
+}
+
+[ "$ql_src_type" = https ] && {
+  fetcher="pkgs.fetchurl";
+  version="$(echo "$url" | sed -re 's@.*-([0-9.]+)[-._].*@\1@')"
+  hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)"
+}
+
+if [ "$ql_src" = '{"error":"Not Found"}' ]; then
+	echo "# $name: not found"
+else
+cat << EOF | grep -Ev '^[ ]+$'
 
   $name = buildLispPackage rec {
     baseName = "$name";
     version = "${version:-\${Set me //}";
     description = "$description";
     deps = [$dependencies];
+    # Source type: $ql_src_type
     src = ${fetcher:-pkgs.fetchurl} {
       ${url:+url = ''$url'';}
       sha256 = "${hash:-0000000000000000000000000000000000000000000000000000000000000000}";
@@ -74,5 +168,6 @@ cat << EOF
     };
   };
 EOF
+fi
 
 for i in $dependencies; do "$0" "$i"; done

pkgs/development/lisp-modules/iterate.darcs-context

@@ -0,0 +1,116 @@
+
+Context:
+
+[make the #L reader macro standard conformant by not assuming anything about the representation of quasiquoted forms.
+Douglas Katzman <dougk@google.com>**20140423044759
+ Ignore-this: ccdda48acdf7b2033ac0f51ed48582fc
+] 
+
+[fix for test for.previous.var-with-type-declaration
+Jan Moringen <jmoringe@techfak.uni-bielefeld.de>**20140129144214
+ Ignore-this: a617d046d90816827d370d3bbf38d2df
+] 
+
+[housekeeping
+attila.lendvai@gmail.com**20140129143709
+ Ignore-this: a05c5fbace98b282a464b829711e064f
+] 
+
+[added test for.previous.var-with-type-declaration
+attila.lendvai@gmail.com**20140129143435
+ Ignore-this: 6e9f419e118724c660d519c3fa9f8dd2
+] 
+
+[added a restart to remove conflicting clauses
+Russ Tyndall <russ@acceleration.net>**20120508185107
+ Ignore-this: b7c4c6eec565dd435b8e9e5403fcb0a8
+] 
+
+[added new failing test bug/collect-at-beginning, as reported by Paul Sexton
+attila.lendvai@gmail.com**20121218144220
+ Ignore-this: d55e7c22deeaf89b90d03d7ef01179d6
+] 
+
+[Fix: If both AT BEGINNING and RESULT-TYPE are specified, RESULT-TYPE was ignored.
+attila.lendvai@gmail.com**20120509225435
+ Ignore-this: 20cf116df585ffedfbe63ce7a4092249
+ 
+ Patched by Ilya Perminov
+] 
+
+[fix package nickname in case sensitive mode
+attila.lendvai@gmail.com**20110927152614
+ Ignore-this: fb1ba1d418b4a20a0cd4e697d943a0e6
+] 
+
+[move list-of-forms? out of the #L eval-when, because it's also used by other parts of iterate
+attila.lendvai@gmail.com**20110119161133
+ Ignore-this: 97545988c4a3eab02434f222120b1a1
+] 
+
+[added bug/walk.2
+attila.lendvai@gmail.com**20100603093335
+ Ignore-this: faa1bd48d0450e76652552bb47bcff02
+] 
+
+[first-time-p bugfix: return-code :body must return list of forms
+Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525141533
+ if-first-time not declared obsolete
+ documentation strings for (iter:display-iterate-clauses) complete
+] 
+
+[fix defmacro-driver example in manual
+Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525081443] 
+
+[Use @:, @. and two spaces between sentences
+Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525080932
+ Move section on predicate (first-time-p) outside of gathering clauses
+ Various typos and some clarifications
+] 
+
+[document *list-end-test* removal in FOR...IN+ON
+Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070525074338] 
+
+[Renamed back to sharpL-reader
+attila.lendvai@gmail.com**20070506100744] 
+
+[Fix sharpL reader, add :execute to the eval-when to make (load "iterate" :compiling t) work on clisp
+attila.lendvai@gmail.com**20070506100704] 
+
+[Convert manual to Texinfo.
+Luis Oliveira <loliveira@common-lisp.net>**20060713142915] 
+
+[make FOR...IN/ON with dotted lists work like LOOP
+hoehle@users.sourceforge.net**20070503130604
+ More precisely, FOR ON accepts dotted lists, FOR IN errors out.
+ As a result, iterate::*list-end-test* was eliminated.
+ Behaviour is now constant and does not depend on some special variable.
+ Note: Documentation not yet updated, pending move to Texinfo.
+] 
+
+[walk-tagbody: more testcases
+Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070503095309] 
+
+[walk-tagbody must not macroexpand symbol/tags among its statements
+Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070404124132] 
+
+[add ELSE test cases, remove GNU Arch tag
+Joerg-Cyril Hoehle <hoehle@users.sourceforge.net>**20070503093008] 
+
+[Clean up #L stuff, do not leave #L enabled after loading iterate
+attila.lendvai@gmail.com**20070426153431] 
+
+[Set *list-end-test* to 'endp instead of 'atom, so (iter (for foo :in something-non-list)) fails instead of silently exists
+attila.lendvai@gmail.com**20070215151652] 
+
+[wrap code in progns, to avoid possiblity of multiple nil tags in tagbody
+ Henrik Hjelte <henrik@evahjelte.com>**20061025145324] 
+
+[test to detect bug, more than one nil tag in tagbody
+ Henrik Hjelte <henrik@evahjelte.com>**20061025145128] 
+
+[Added release.sh
+attila.lendvai@gmail.com**20060506155953] 
+
+[TAG 1.4.3
+attila.lendvai@gmail.com**20060505134701] 

pkgs/development/lisp-modules/lisp-packages.nix

@@ -32,13 +32,13 @@ let lispPackages = rec {
 
   iterate = buildLispPackage rec {
     baseName = "iterate";
-    version = "1.4.3";
+    version = "darcs-2014-11-01";
     description = "Iteration package for Common Lisp";
     deps = [];
     src = pkgs.fetchdarcs {
       url = "http://common-lisp.net/project/iterate/darcs/iterate";
-      sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w";
-      rev = version;
+      sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
+      context = ./iterate.darcs-context;
     };
     overrides = x: {
       configurePhase="buildPhase(){ true; }";
@@ -66,8 +66,6 @@ let lispPackages = rec {
       url = "https://github.com/fb08af68/esrap-peg.git";
       sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1";
       rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8'';
-      
-      
     };
   };
 
@@ -78,7 +76,6 @@ let lispPackages = rec {
     deps = [];
     src = pkgs.fetchcvs {
       sha256 = "a574b7f9615232366e3e5e7ee400d60dbff23f6d0e1def5a3c77aafdfd786e6a";
-      
       date = ''2013-10-28'';
       module = ''cl-unification'';
       cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-unification/cvsroot'';
@@ -94,8 +91,409 @@ let lispPackages = rec {
       url = "https://github.com/scymtym/esrap.git";
       sha256 = "c56616ac01be0f69e72902f9fd830a8af2c2fa9018b66747a5da3988ae38817f";
       rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26'';
-      
-      
+    };
+  };
+
+  clx-truetype = buildLispPackage rec {
+    baseName = "clx-truetype";
+    version = "git-20141112";
+    description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.";
+    deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/filonenko-mikhail/clx-truetype'';
+      sha256 = "fe3d3923909a8f0a19298bfa366bb265c5155eed43d4dd315920535d15424d65";
+      rev = ''6f72905c6886a656e5a1c8167097f12375c6da7d'';
+    };
+    overrides = x:{
+      configurePhase = "rm Makefile";
+    };
+  };
+
+  cl-fad = buildLispPackage rec {
+    baseName = "cl-fad";
+    version = "v0.7.2";
+    description = "Portable pathname library";
+    deps = [alexandria bordeaux-threads];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/edicl/cl-fad'';
+      sha256 = "87917ab4af4f713ad41faa72c7eaed2872f8dac47f49c0668ba8782590fdbca4";
+      rev = ''refs/tags/v0.7.2'';
+    };
+  };
+
+  bordeaux-threads = buildLispPackage rec {
+    baseName = "bordeaux-threads";
+    version = "0.8.3";
+    description = "Bordeaux Threads makes writing portable multi-threaded apps simple";
+    deps = [alexandria];
+    # Source type: http
+    src = pkgs.fetchurl {
+      url = ''http://common-lisp.net/project/bordeaux-threads/releases/bordeaux-threads-0.8.3.tar.gz'';
+      sha256 = "0c3n7qsx4jc3lg8s0n9kxfvhhyl0s7123f3038nsb96rf0bvb5hy";
+    };
+  };
+
+  zpb-ttf = buildLispPackage rec {
+    baseName = "zpb-ttf";
+    version = "release-1.0.3";
+    description = "Access TrueType font metrics and outlines from Common Lisp";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/xach/zpb-ttf'';
+      sha256 = "3092a3ba9f27b091224d11c0ccfb09c9a4632ebfd6c3986df3147f19e53606f2";
+      rev = ''refs/tags/release-1.0.3'';
+    };
+  };
+
+  cl-store = buildLispPackage rec {
+    baseName = "cl-store";
+    version = "git-20141112";
+    description = "Serialization package";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/skypher/cl-store'';
+      sha256 = "7096ad38d5c77d58f7aa0ef8df1884411173c140408cb7967922b315ab505472";
+      rev = ''2d2455c024fe64ee24cbf914c82254fa5bd09cab'';
+    };
+  };
+
+  cl-vectors = buildLispPackage rec {
+    baseName = "cl-vectors";
+    version = "git-20141112";
+    description = "cl-paths: vectorial paths manipulation";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/fjolliton/cl-vectors'';
+      sha256 = "2d1428911cd2699513a0b886661e9b54d1edf78558277ac83723a22c7fc9dea7";
+      rev = ''7b3e5d6a8abe3de307c1dc0c4347f4efa4f25f29'';
+    };
+  };
+
+  trivial-features = buildLispPackage rec {
+    baseName = "trivial-features";
+    version = "git-20141112";
+    description = "Ensures consistent *FEATURES* across multiple CLs.";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/trivial-features/trivial-features'';
+      sha256 = "2006aebe0c2bfed1c39a2195639e221fdc52a443b6c8522e535cbef2370a07fc";
+      rev = ''2b7cdc3b8073eb33655850b51223770b535da6d9'';
+    };
+  };
+
+  clsql = buildLispPackage rec {
+    baseName = "clsql";
+    version = "git-20141112";
+    description = "Common Lisp SQL Interface library";
+    deps = [uffi];
+    buildInputs = [pkgs.mysql pkgs.zlib];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''http://git.b9.com/clsql.git'';
+      sha256 = "dacd56bc9a0348e8101184bf154b971407a98f3a753d7cce34c7a44b4b19f8fd";
+      rev = ''180b52cb686a87487e12e87b13bafe131e6c3bef'';
+    };
+    overrides = x:{
+      preConfigure = ''
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql}/include/mysql"
+	export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql}/lib/mysql"
+      '';
+    };
+  };
+
+  uffi = buildLispPackage rec {
+    baseName = "uffi";
+    version = "git-20141112";
+    description = "Universal Foreign Function Library for Common Lisp";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''http://git.b9.com/uffi.git'';
+      sha256 = "219e4cfebfac251c922bcb9d517980b0988d765bd18b7f5cc765a43913aaacc6";
+      rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b'';
+    };
+  };
+
+  query-fs = buildLispPackage rec {
+    baseName = "query-fs";
+    version = "git-20141113";
+    description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries";
+    deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/fb08af68/query-fs'';
+      sha256 = "4ed66f255e50d2c9ea9f0b3fbaa92bde9b8acf6a5fafb0d7f12b254be9de99e9";
+      rev = ''831f0180967f09b1dd345fef82144f48334279c3'';
+    };
+  };
+
+  cl-fuse = buildLispPackage rec {
+    baseName = "cl-fuse";
+    version = "git-20141113";
+    description = "CFFI bindings to FUSE (Filesystem in user space)";
+    deps = [bordeaux-threads cffi cl-utilities iterate trivial-backtrace trivial-utf-8];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/fb08af68/cl-fuse'';
+      sha256 = "1l4ydxbwzlj6gkb1c9vc96rfbj951snaidpx10pxz4wdnzg3kq99";
+      rev = ''6feffaa34a21cfc7890b25357284858f924e8cb3'';
+    };
+    propagatedBuildInputs = [pkgs.fuse];
+    overrides = x : {
+      configurePhase = ''
+        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
+	export makeFlags="$makeFlags LISP=common-lisp.sh"
+      '';
+    };
+  };
+
+  cffi = buildLispPackage rec {
+    baseName = "cffi";
+    version = "0.14.0";
+    description = "The Common Foreign Function Interface";
+    deps = [alexandria babel trivial-features];
+    # Source type: http
+    src = pkgs.fetchurl {
+      url = ''http://common-lisp.net/project/cffi/releases/cffi_${version}.tar.gz'';
+      sha256 = "155igjh096vrp7n71c0xcg9qbcpj6547qjvzi9shxbpi6piw6fkw";
+    };
+  };
+
+  babel = buildLispPackage rec {
+    baseName = "babel";
+    version = "git-20141113";
+    description = "Babel, a charset conversion library.";
+    deps = [alexandria trivial-features];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/cl-babel/babel'';
+      sha256 = "abe7150f25ceb7eded520d95f1665a46f4233cf13b577fd02c3f6be54c32facc";
+      rev = ''74b35ea79b769c4f9aefad933923778ffa7915ab'';
+    };
+  };
+
+  cl-utilities = buildLispPackage rec {
+    baseName = "cl-utilities";
+    version = "1.2.4";
+    description = "A collection of Common Lisp utility functions";
+    deps = [];
+    # Source type: http
+    src = pkgs.fetchurl {
+      url = ''http://common-lisp.net/project/cl-utilities/cl-utilities-${version}.tar.gz'';
+      sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87";
+    };
+  };
+
+  trivial-utf-8 = buildLispPackage rec {
+    baseName = "trivial-utf-8";
+    version = "2011-09-08";
+    description = "A UTF-8 encoding library";
+    deps = [];
+    # Source type: darcs
+    src = pkgs.fetchdarcs {
+      url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/'';
+      sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1";
+    };
+  };
+
+  cl-fuse-meta-fs = buildLispPackage rec {
+    baseName = "cl-fuse-meta-fs";
+    version = "git-20141113";
+    description = "CFFI bindings to FUSE (Filesystem in user space)";
+    deps = [bordeaux-threads cl-fuse iterate pcall];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/fb08af68/cl-fuse-meta-fs'';
+      sha256 = "259303effea61baf293ffc5d080cb071ef15bed8fa1c76f0c1631f68d2aa3c85";
+      rev = ''d3d332471ce9330e3eaebf9d6cecdd2014c3599b'';
+    };
+  };
+
+  pcall = buildLispPackage rec {
+    baseName = "pcall";
+    version = "0.3";
+    description = "Common Lisp library intended to simplify 'result-oriented' parallelism";
+    deps = [bordeaux-threads];
+    # Source type: http
+    src = pkgs.fetchgit {
+      url = ''https://github.com/marijnh/pcall'';
+      sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps";
+      rev = "4e1ef32c33c2ca18fd8ab9afb4fa793c179a3578";
+    };
+  };
+
+  command-line-arguments = buildLispPackage rec {
+    baseName = "command-line-arguments";
+    version = "git-20141113";
+    description = "small library to deal with command-line arguments";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''http://common-lisp.net/project/qitab/git/command-line-arguments.git'';
+      sha256 = "91bb321e201034c35121860cb6ec05e39c6392d5906a52b9a2d33d0f76b06123";
+      rev = ''121f303bbef9c9cdf37a7a12d8adb1ad4be5a6ae'';
+    };
+  };
+
+  trivial-backtrace = buildLispPackage rec {
+    baseName = "trivial-backtrace";
+    version = "git-2014-11-01";
+    description = "trivial-backtrace";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git'';
+      sha256 = "1ql80z0igsng32rbp24h81pj5c4l87c1ana6c9lx3dlqpixzl4kj";
+      rev = ''48a6b081e00b0d85f1e001c7258393ed34d06bc9'';
+    };
+  };
+
+  drakma = buildLispPackage rec {
+    baseName = "drakma";
+    version = "v1.3.10";
+    description = "Full-featured http/https client based on usocket";
+    deps = [chipz chunga cl-ssl cl-base64 cl-ppcre flexi-streams puri usocket];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/edicl/drakma'';
+      sha256 = "0ecc37c9d5cc91a3b86746c4f20c0b1609969db01041df04ff6a9df1d021b30a";
+      rev = ''refs/tags/v1.3.10'';
+    };
+  };
+
+  chipz = buildLispPackage rec {
+    baseName = "chipz";
+    version = "git-20141113";
+    description = "A library for decompressing deflate, zlib, and gzip data";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/froydnj/chipz'';
+      sha256 = "73ae22d58b6db5b2c86af4a465260e48a5aca19827d2b7329e2870c1148da8e2";
+      rev = ''3402c94df1d0af7742df08d3ffa23fd5c04c9bf2'';
+    };
+  };
+
+  chunga = buildLispPackage rec {
+    baseName = "chunga";
+    version = "v1.1.5";
+    description = "Portable chunked streams";
+    deps = [trivial-gray-streams];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/edicl/chunga'';
+      sha256 = "5d045882be34b158185c491da85cfd4671f456435c9ff8fa311a864f633b0446";
+      rev = ''refs/tags/v1.1.5'';
+    };
+  };
+
+  trivial-gray-streams = buildLispPackage rec {
+    baseName = "trivial-gray-streams";
+    version = "git-20141113";
+    description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/trivial-gray-streams/trivial-gray-streams'';
+      sha256 = "8d5c041f95eb31aa313adc433edf91bb14656400cae1e0ec98ad7ed085bb7954";
+      rev = ''0483ade330508b4b2edeabdb47d16ec9437ee1cb'';
+    };
+  };
+
+  cl-ssl = buildLispPackage rec {
+    baseName = "cl+ssl";
+    version = "git-20141113";
+    description = "Common Lisp interface to OpenSSL.";
+    deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/cl-plus-ssl/cl-plus-ssl'';
+      sha256 = "6b99fc49ac38e49ee69a47ce5791606b8b811c01e5563bfd3164d393db6c4040";
+      rev = ''f8695c5df48ebc3557f76a8a08dd96429bdf8df2'';
+    };
+    propagatedBuildInputs = [pkgs.openssl];
+  };
+
+  flexi-streams = buildLispPackage rec {
+    baseName = "flexi-streams";
+    version = "v1.0.13";
+    description = "Flexible bivalent streams for Common Lisp";
+    deps = [trivial-gray-streams];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/edicl/flexi-streams'';
+      sha256 = "46d6b056cffc9ea201dedde847b071db744dfbadf0a21a261717272fe3d85cab";
+      rev = ''refs/tags/v1.0.13'';
+    };
+  };
+
+  trivial-garbage = buildLispPackage rec {
+    baseName = "trivial-garbage";
+    version = "git-20141113";
+    description = "Portable finalizers, weak hash-tables and weak pointers.";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/trivial-garbage/trivial-garbage'';
+      sha256 = "69f6c910921de436393ff5f93bee36443534756965fa34e43e04d9e8919212df";
+      rev = ''2721d36d71748d9736a82fe5afe333c52bae3084'';
+    };
+  };
+
+  cl-base64 = buildLispPackage rec {
+    baseName = "cl-base64";
+    version = "git-20141113";
+    description = "Base64 encoding and decoding with URI support.";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''http://git.b9.com/cl-base64.git'';
+      sha256 = "a34196544cc67d54aef74e31eff2cee62a7861a5675d010fcd925f1c61c23e81";
+      rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13'';
+    };
+  };
+
+  puri = buildLispPackage rec {
+    baseName = "puri";
+    version = "git-20141113";
+    description = "Portable Universal Resource Indentifier Library";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''http://git.b9.com/puri.git'';
+      sha256 = "71804698e7f3009fb7f570656af5d952465bfe77f72e9c41f7e2dda8a5b45c5e";
+      rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f'';
+    };
+  };
+
+  usocket = buildLispPackage rec {
+    baseName = "usocket";
+    version = "0.6.1";
+    description = "Universal socket library for Common Lisp";
+    deps = [];
+    # Source type: http
+    src = pkgs.fetchurl {
+      url = ''http://common-lisp.net/project/usocket/releases/usocket-${version}.tar.gz'';
+      sha256 = "1lnhjli85w20iy5nn6j6gsyxx42mvj8l0dfhwcjpl6dl2lz80r7a";
+    };
+  };
+
+  cl-html-parse = buildLispPackage rec {
+    baseName = "cl-html-parse";
+    version = "git-20141113";
+    description = "HTML Parser";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/gwkkwg/cl-html-parse'';
+      sha256 = "0153d4962493f106849fc7cbfe03c5ff874adae8d307ea2e1ceebbb009e2f89f";
+      rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579'';
     };
   };
 };

pkgs/development/python-modules/generic/default.nix

@@ -57,12 +57,13 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl
   name = namePrefix + name;
 
   buildInputs = [
-    python wrapPython setuptools
+    wrapPython setuptools
     (distutils-cfg.override { extraCfg = distutilsExtraCfg; })
   ] ++ buildInputs ++ pythonPath
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
-  propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
+  # propagate python to active setup-hook in nix-shell
+  propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ];
 
   pythonPath = [ setuptools ] ++ pythonPath;
 

pkgs/development/tools/analysis/checkstyle/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.0";
+  version = "6.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
-    sha256 = "08qjx7yfx5p7ydbcm6lzm15qcwkgcf1jw27i9fnyr01wppz9yrsx";
+    sha256 = "0g5ywnc64v2c4zlamm3l2x0l1z79199mcjz0xzv3j5wx7rsyasrc";
   };
 
   installPhase = ''

pkgs/development/tools/analysis/valgrind/default.nix

@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
         --replace 'obj:/usr/X11R6/lib' 'obj:*/lib' \
         --replace 'obj:/usr/lib' 'obj:*/lib'
     done
+
+    paxmark m $out/lib/valgrind/*-*-linux
   '';
 
   meta = {

pkgs/development/tools/atom-shell/default.nix

@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
+, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
+, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip
+}:
+let
+  atomEnv = buildEnv {
+    name = "env-atom";
+    paths = [
+      stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
+      fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
+      xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
+      xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
+      xlibs.libXcursor libcap
+    ];
+  };
+in stdenv.mkDerivation rec {
+  name = "atom-shell-${version}";
+  version = "0.19.1";
+
+  src = fetchurl {
+    url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip";
+    sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y";
+    name = "${name}.zip";
+  };
+
+  buildInputs = [ atomEnv makeWrapper unzip ];
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  unpackCmd = "unzip";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    unzip -d $out/bin $src
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+    $out/bin/atom
+    mv $out/bin/atom $out/bin/atom-shell
+    wrapProgram $out/bin/atom-shell \
+    --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Cross platform desktop application shell";
+    homepage = https://github.com/atom/atom-shell;
+    license = [ licenses.mit ];
+    maintainers = [ maintainers.fluffynukeit ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

pkgs/development/tools/build-managers/icmake/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "icmake-${version}";
+  version = "7.21.01";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz";
+    sha256 = "0jx547bb0h1z5f3v9kvjiq5bgarbrcs1h47y1nnwdkg0q1mqma1h";
+  };
+
+  preConfigure = ''
+    patchShebangs ./
+    sed -i "s;usr/;;g" INSTALL.im
+  '';
+
+  buildPhase = "./icm_bootstrap $out";
+
+  installPhase = "./icm_install all /";
+
+  meta = with stdenv.lib; {
+    description = "A program maintenance (make) utility using a C-like grammar";
+    homepage = http://icmake.sourceforge.net/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}

pkgs/development/tools/haskell/PastePipe/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "PastePipe";
-  version = "1.6";
-  sha256 = "08rsq2j3gy98a69pjldvbhawmnzxgld7abh9kszrb0kpjmd9sgc4";
+  version = "1.7";
+  sha256 = "0had11n44y7zjhhymdbvahwmxcxxrbxy7c9jxijhw3n7xqhdmva0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cmdargs HTTP network networkUri ];

pkgs/development/tools/haskell/cabal-bounds/default.nix

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.8.7";
-  sha256 = "03kp59nhdyq3bl91akd38iwvwwy3zgvadx85lwl3827nr6s774qk";
+  version = "0.8.8";
+  sha256 = "0jd901r6312yw4rzxvy5x7q18kjwjhgr5s5npczhwc4q7zvxdj7q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/tools/haskell/ghcid/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghcid";
-  version = "0.3.1";
-  sha256 = "09dyynqa42q6rcms8pghlyih8a3fahb5fbhc500grqc094kgfs7c";
+  version = "0.3.2";
+  sha256 = "1kx20la4snldhd709y69za8bs57v90nblghfrxrvmzhrmpvh4bn3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cmdargs extra filepath terminalSize time ];

pkgs/development/tools/haskell/hlint/default.nix

@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour
-, transformers, uniplate
+{ cabal, ansiTerminal, cmdargs, cpphs, extra, filepath
+, haskellSrcExts, hscolour, transformers, uniplate
 }:
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.9.10";
-  sha256 = "08pfc0mhqkhali0hjxpa26hr5ykfdmyldh0r04v1b42a1c60k1id";
+  version = "1.9.12";
+  sha256 = "0ga66b7lpvgx2w1fg5gnilncg75dfxcjcrx9hvjyxh7fin4y1z6a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdargs cpphs filepath haskellSrcExts hscolour transformers
-    uniplate
+    ansiTerminal cmdargs cpphs extra filepath haskellSrcExts hscolour
+    transformers uniplate
   ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/hlint/";

pkgs/development/tools/haskell/keter/default.nix

@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.3.5.1";
-  sha256 = "1g8cq74cjhy8r0435m4il0iak5g03jdiz40sn4801iy765rcylpv";
+  version = "1.3.5.3";
+  sha256 = "18dpi97q4sz5zxv2yc6ar5nbf9gvs71n6gmxd9mv5myknvsliif2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/tools/haskell/threadscope/default.nix

@@ -1,26 +1,24 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk
-, mtl, pango, time
+, mtl, pango, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "threadscope";
-  version = "0.2.4";
-  sha256 = "1208gp80vj3dngc4nrj1jk5y4h1181bgwq2qj764kcjvkaxch599";
+  version = "0.2.5";
+  sha256 = "1nrhgir855n6n764fapaqd94dhqmsxn07ky3zf04nrx0lca9ir52";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    binary cairo deepseq filepath ghcEvents glib gtk mtl pango time
+    binary cairo deepseq filepath ghcEvents glib gtk mtl pango text
+    time
   ];
   configureFlags = "--ghc-options=-rtsopts";
-  patches = [ ./threadscope.patch ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
     description = "A graphical tool for profiling parallel Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })

pkgs/development/tools/haskell/threadscope/threadscope.patch

@@ -1,14 +0,0 @@
---- a/threadscope.cabal.orig	2014-11-03 15:23:29.000000000 -0600
-+++ b/threadscope.cabal	2014-11-03 15:24:01.000000000 -0600
-@@ -41,7 +41,10 @@
- Executable threadscope
-   Main-is:           Main.hs
-   Build-Depends:     base >= 4.0 && < 5,
--                     gtk >= 0.12, cairo, glib, pango,
-+                     gtk >= 0.12 && < 0.13,
-+                     cairo < 0.13,
-+                     glib < 0.13,
-+                     pango < 0.13,
-                      binary, array, mtl, filepath,
-                      ghc-events >= 0.4.2,
-                      containers >= 0.2 && < 0.6,

pkgs/development/tools/misc/ShellCheck/default.nix

@@ -1,19 +1,24 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, json, mtl, parsec, QuickCheck, regexCompat }:
+{ cabal, json, mtl, parsec, QuickCheck, regexCompat, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "ShellCheck";
-  version = "0.3.4";
-  sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw";
+  version = "0.3.5";
+  sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ json mtl parsec QuickCheck regexCompat ];
-  testDepends = [ json mtl parsec QuickCheck regexCompat ];
+  buildDepends = [
+    json mtl parsec QuickCheck regexCompat transformers
+  ];
+  testDepends = [
+    json mtl parsec QuickCheck regexCompat transformers
+  ];
   meta = {
     homepage = "http://www.shellcheck.net/";
     description = "Shell script analysis tool";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.agpl3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };

pkgs/development/tools/misc/yodl/default.nix

@@ -1,31 +1,40 @@
-# This package is only used to create the documentation of zsh-cvs
-# eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html
-# latest release is newer though
+{ stdenv, fetchurl, perl, icmake }:
 
-{ stdenv, fetchurl, perl }:
+stdenv.mkDerivation rec {
+  name = "yodl-${version}";
+  version = "3.04.00";
 
-stdenv.mkDerivation {
-  name = "yodl-2.14.3";
-
-  buildInputs = [ perl ];
+  buildInputs = [ perl icmake ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz";
-    sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4";
+    url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz";
+    sha256 = "14sqd03j3w9g5l5rkdnqyxv174yz38m39ycncx86bq86g63igcv6";
   };
-  
-  patches =
-    [ (fetchurl {
-        url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz";
-        sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4";
-      })
-    ];
 
-  # This doesn't isntall docs yet, do you need them?
-  installPhase = ''
-    # -> $out
-    sed -i "s@'/usr/@'$out/@" contrib/build.pl
-    perl contrib/build.pl make-software
-    perl contrib/build.pl install-software
+  preConfigure = ''
+    patchShebangs scripts/.
+    sed -i 's;/usr;;g' INSTALL.im
+    substituteInPlace build --replace /usr/bin/icmake ${icmake}/bin/icmake
+    substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
   '';
+
+  buildPhase = ''
+    ./build programs
+    ./build man
+    ./build macros
+  '';
+
+  installPhase = ''
+    ./build install programs $out
+    ./build install man $out
+    ./build install macros $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A package that implements a pre-document language and tools to process it";
+    homepage = http://yodl.sourceforge.net/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
 }

pkgs/development/tools/pydb/default.nix

@@ -19,5 +19,6 @@ stdenv.mkDerivation {
     description = "Python debugger with GDB-like commands and Emacs bindings";
     homepage = http://bashdb.sourceforge.net/pydb/;
     license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/tools/winpdb/default.nix

@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, buildPythonPackage, wxPython, makeDesktopItem }:
+
+buildPythonPackage rec {
+  name = "winpdb-1.4.8";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "https://winpdb.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs";
+  };
+
+  propagatedBuildInputs = [ wxPython ];
+
+  desktopItem = makeDesktopItem {
+    name = "winpdb";
+    exec = "winpdb";
+    icon = "winpdb";
+    comment = "Platform independend Python debugger";
+    desktopName = "Winpdb";
+    genericName = "Python Debugger";
+    categories = "Application;Development;Debugger;";
+  };
+
+  # Don't call gnome-terminal with "--disable-factory" flag, which is
+  # unsupported since GNOME >= 3.10. Apparently, debian also does this fix:
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757718
+  postPatch = ''
+    sed -i "s/--disable-factory//" rpdb2.py
+  '';
+
+  postInstall = ''
+    mkdir -p "$out"/share/applications
+    cp "$desktopItem"/share/applications/* "$out"/share/applications/
+
+    mkdir -p "$out"/share/icons
+    cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Platform independent Python debugger";
+    longDescription = ''
+      Winpdb is a platform independent GPL Python debugger with support for
+      multiple threads, namespace modification, embedded debugging, encrypted
+      communication and is up to 20 times faster than pdb.
+    '';
+    homepage = http://winpdb.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}