Merge branch 'master' into staging

Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix

doc/language-support.xml

@@ -624,7 +624,7 @@ $ cat > Gemfile
 source 'https://rubygems.org'
 gem 'sensu'
 $ bundler package --path /tmp/vendor/bundle
-$ $(nix-build '&nixpkgs>' -A bundix)/bin/bundix
+$ $(nix-build '<nixpkgs>' -A bundix)/bin/bundix
 $ cat > default.nix
 { lib, bundlerEnv, ruby }:
 

nixos/doc/manual/release-notes/rl-unstable.xml

@@ -57,7 +57,7 @@ was accordingly renamed to <literal>bomi</literal>
   <para>
 	Local printers are no longer shared or advertised by default. This behavior
 	can be changed by enabling <literal>services.printing.defaultShared</literal>
-	or <literal>services.printing.advertise</literal> respectively.
+	or <literal>services.printing.browsing</literal> respectively.
   </para>
 </listitem>
 

nixos/modules/security/grsecurity.nix

@@ -38,7 +38,7 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Enable the testing grsecurity patch, based on Linux 3.19.
+          Enable the testing grsecurity patch, based on Linux 4.0.
         '';
       };
 
@@ -223,7 +223,7 @@ in
           message   = ''
             If grsecurity is enabled, you must select either the
             stable patch (with kernel 3.14), or the testing patch (with
-            kernel 3.19) to continue.
+            kernel 4.0) to continue.
           '';
         }
         { assertion = !(cfg.stable && cfg.testing);

nixos/modules/services/misc/mesos-master.nix

@@ -40,10 +40,10 @@ in {
 
       extraCmdLineOptions = mkOption {
         description = ''
-	  Extra command line options for Mesos Master.
+          Extra command line options for Mesos Master.
 
-	  See https://mesos.apache.org/documentation/latest/configuration/
+          See https://mesos.apache.org/documentation/latest/configuration/
-	'';
+        '';
         default = [ "" ];
         type = types.listOf types.string;
         example = [ "--credentials=VALUE" ];
@@ -82,20 +82,21 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       serviceConfig = {
-	ExecStart = ''
+        ExecStart = ''
-	  ${pkgs.mesos}/bin/mesos-master \
+          ${pkgs.mesos}/bin/mesos-master \
-	    --port=${toString cfg.port} \
+            --port=${toString cfg.port} \
-	    --zk=${cfg.zk} \
+            ${if cfg.quorum == 0
-	    ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \
+              then "--registry=in_memory"
-	    --work_dir=${cfg.workDir} \
+              else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \
-	    --logging_level=${cfg.logLevel} \
+            --work_dir=${cfg.workDir} \
-	    ${toString cfg.extraCmdLineOptions}
+            --logging_level=${cfg.logLevel} \
-	'';
+            ${toString cfg.extraCmdLineOptions}
-	Restart = "on-failure";
+        '';
-	PermissionsStartOnly = true;
+        Restart = "on-failure";
+        PermissionsStartOnly = true;
       };
       preStart = ''
-	mkdir -m 0700 -p ${cfg.workDir}
+        mkdir -m 0700 -p ${cfg.workDir}
       '';
     };
   };

nixos/modules/services/printing/cupsd.nix

@@ -80,7 +80,7 @@ in
         '';
       };
 
-      advertise = mkOption {
+      browsing = mkOption {
         type = types.bool;
         default = false;
         description = ''
@@ -285,7 +285,7 @@ in
 
         DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
 
-        Browsing ${if cfg.advertise then "Yes" else "No"}
+        Browsing ${if cfg.browsing then "Yes" else "No"}
 
         WebInterface ${if cfg.webInterface then "Yes" else "No"}
 

pkgs/applications/misc/gnuradio-osmosdr/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd
-, makeWrapper
+, makeWrapper, hackrf
 , pythonSupport ? true, python, swig
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper
+    cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf
   ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
 
   postInstall = ''

pkgs/applications/networking/cluster/marathon/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-v${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
-    url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
+    url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "794c915e205aebd8273f2b40c6faea1517fc683cdc0169194c4a67ce8779fa41";
+    sha256 = "1g2z2c8p47rryyappwv0k3najb6bypvwgg7z9z8prvph2x6rafp6";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];

pkgs/applications/networking/cluster/mesos/default.nix

@@ -1,35 +1,38 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
 , automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
 , setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion
-, leveldb, glog
+, leveldb, glog, perf, utillinux, libnl, iproute
 }:
 
-let version = "0.21.0";
+let
-in stdenv.mkDerivation {
+  mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
-  dontDisableStatic = true;
+  soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
+in stdenv.mkDerivation rec {
+  version = "0.22.0";
   name = "mesos-${version}";
 
+  dontDisableStatic = true;
+
   src = fetchurl {
     url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz";
-    sha256 = "01ap8blrb046w26zf3i4r7vvnnhjsbfi20vz5yinmncqbzjjyx6i";
+    sha256 = "0z8c1vr7b06l3nqgbxq8ydcz79ayw75y2szipfqkw17c7gv6d7v8";
   };
 
   buildInputs = [
     makeWrapper autoconf automake libtool curl sasl jdk maven
     python wrapPython boto distutils-cfg setuptools leveldb
     subversion apr glog
+  ] ++ lib.optionals stdenv.isLinux [
+    libnl
   ];
 
   propagatedBuildInputs = [
     pythonProtobuf
   ];
 
-  mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
-
   preConfigure = ''
-    export MAVEN_OPTS="-Dmaven.repo.local=$(pwd)/.m2"
+    export MAVEN_OPTS="-Dmaven.repo.local=${mavenRepo}"
-    ln -s $mavenRepo .m2
 
     substituteInPlace src/launcher/fetcher.cpp \
       --replace '"tar' '"${gnutar}/bin/tar'    \
@@ -37,6 +40,29 @@ in stdenv.mkDerivation {
 
     substituteInPlace src/cli/mesos-scp        \
       --replace "'scp " "'${openssh}/bin/scp "
+
+    substituteInPlace src/cli/python/mesos/cli.py \
+      --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'"
+
+  '' + lib.optionalString (stdenv.isLinux) ''
+
+    substituteInPlace configure.ac             \
+      --replace /usr/include/libnl3 ${libnl}/include/libnl3
+
+    substituteInPlace src/linux/perf.cpp       \
+      --replace '"perf ' '"${perf}/bin/perf '
+
+    substituteInPlace src/slave/containerizer/isolators/filesystem/shared.cpp \
+      --replace '"mount ' '"${utillinux}/bin/mount ' \
+
+    substituteInPlace src/slave/containerizer/isolators/namespaces/pid.cpp \
+      --replace '"mount ' '"${utillinux}/bin/mount ' \
+
+    substituteInPlace src/slave/containerizer/isolators/network/port_mapping.cpp \
+      --replace '"tc ' '"${iproute}/bin/tc '   \
+      --replace '"ip ' '"${iproute}/bin/ip '   \
+      --replace '"mount ' '"${utillinux}/bin/mount ' \
+      --replace '/bin/sh' "${stdenv.shell}"
   '';
 
   configureFlags = [
@@ -45,27 +71,29 @@ in stdenv.mkDerivation {
     "--with-svn=${subversion}"
     "--with-leveldb=${leveldb}"
     "--with-glog=${glog}"
+    "--with-glog=${glog}"
+    "--enable-optimize"
     "--disable-python-dependency-install"
+  ] ++ lib.optionals stdenv.isLinux [
+    "--with-network-isolator"
   ];
 
   postInstall = ''
     rm -rf $out/var
     rm $out/bin/*.sh
 
-    ensureDir $out/share/java
+    mkdir -p $out/share/java
     cp src/java/target/mesos-*.jar $out/share/java
 
-    shopt -s extglob
+    MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext}
-    MESOS_NATIVE_JAVA_LIBRARY=$(echo $out/lib/libmesos.*(so|dylib))
-    shopt -u extglob
 
-    ensureDir $out/nix-support
+    mkdir -p $out/nix-support
     touch $out/nix-support/setup-hook
     echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
     echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
 
     # Inspired by: pkgs/development/python-modules/generic/default.nix
-    ensureDir "$out/lib/${python.libPrefix}"/site-packages
+    mkdir -p $out/lib/${python.libPrefix}/site-packages
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
     ${python}/bin/${python.executable} src/python/setup.py install \
       --install-lib=$out/lib/${python.libPrefix}/site-packages \
@@ -85,14 +113,14 @@ in stdenv.mkDerivation {
       fi
     done
 
+    for f in $out/libexec/mesos/python/mesos/*.py; do
+      ${python}/bin/${python.executable} -c "import py_compile; py_compile.compile('$f')"
+    done
+
     # wrap the python programs
-    declare -A pythonPathsSeen=()
-    program_PYTHONPATH="$out/libexec/mesos/python"
-    program_PATH=""
-    _addToPythonPath "$out"
     for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do
       wrapProgram "$out/bin/$prog" \
-        --prefix PYTHONPATH ":" $program_PYTHONPATH
+        --prefix PYTHONPATH ":" "$out/libexec/mesos/python"
       true
     done
   '';

pkgs/applications/video/smtube/default.nix

@@ -1,17 +1,18 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "smtube-15.1.0";
+  name = "smtube-15.5.10";
+
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0l87afj1fwhq8lnhv0djqdc8fy0kvs4q4jrvyiz46ifq7q10qyaf";
+    sha256 = "1if2b0h6snfmj5hnx4cs55zjbdvwagx95jv62f2jgh3m5gis0cbz";
   };
 
-  buildInputs = [ qt4 ];
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
 
-  preConfigure = ''
+  buildInputs = [ qt4 ];
-    makeFlags="PREFIX=$out"
-  '';
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";

pkgs/applications/video/vlc/default.nix

@@ -18,11 +18,11 @@ assert (!withQt5 -> qt4 != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy";
+    sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal";
   };
 
   buildInputs =

pkgs/development/compilers/gcc/5/default.nix

@@ -33,6 +33,7 @@
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
+, binutils ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -47,6 +48,9 @@ assert libelf != null -> zlib != null;
 # Make sure we get GNU sed.
 assert stdenv.isDarwin -> gnused != null;
 
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
+
 # The go frontend is written in c++
 assert langGo -> langCC;
 
@@ -285,6 +289,7 @@ stdenv.mkDerivation ({
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
     ++ (optional stdenv.isDarwin gnused)
+    ++ (optional stdenv.isDarwin binutils)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";

pkgs/development/haskell-modules/configuration-common.nix

@@ -517,10 +517,6 @@ self: super: {
   # https://github.com/cgaebel/stm-conduit/issues/33
   stm-conduit = dontCheck super.stm-conduit;
 
-  # https://github.com/fumieval/call/issues/3
-  call = markBrokenVersion "0.1.2" super.call;
-  rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;     # depends on call
-
   # The install target tries to run lots of commands as "root". WTF???
   hannahci = markBroken super.hannahci;
 
@@ -724,14 +720,8 @@ self: super: {
 
   # https://github.com/fumieval/audiovisual/issues/1
   audiovisual = markBroken super.audiovisual;
-
+  call = dontDistribute super.call;
-  # https://github.com/alephcloud/hs-stm-queue-extras/issues/2
+  rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
-  stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; });
-
-  # https://github.com/GaloisInc/cryptol/issues/197
-  cryptol = overrideCabal super.cryptol (drv: {
-    postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs";
-  });
 
   # https://github.com/haskell/haddock/issues/378
   haddock-library = dontCheck super.haddock-library;

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix

@@ -55,6 +55,11 @@ self: super: {
     sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
   });
 
+  language-glsl = appendPatch super.language-glsl (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/noteed/language-glsl/pull/10.patch";
+    sha256 = "1d8dmfqw9y7v7dlszb7l3wp0vj77j950z2r3r0ar9mcvyrmfm4in";
+  });
+
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;
@@ -140,8 +145,8 @@ self: super: {
     version = "0.1.0.0";
     src = fetchgit {
       url = git://github.com/ghcjs/ghcjs-prim.git;
-      rev = "ca08e46257dc276e01d08fb47a693024bae001fa"; # ghc-7.10 branch
+      rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch
-      sha256 = "0w7sqzp5p70yhmdhqasgkqbf3b61wb24djlavwil2j8ry9y472w3";
+      sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy";
     };
     buildDepends = [ primitive ];
     license = pkgs.stdenv.lib.licenses.bsd3;
@@ -318,11 +323,11 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
-  # https://github.com/bos/wreq/issues/61
+  # https://github.com/purefn/hipbot/issues/1
-  wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
-  wreq-sb = dontDistribute (dontCheck super.wreq-sb);
   hipbot = dontDistribute super.hipbot;
-  bitcoin-api = dontDistribute super.bitcoin-api;
+
+  # https://github.com/solatis/haskell-bitcoin-api/issues/1
+  bitcoin-api = markBroken super.bitcoin-api;
   bitcoin-api-extra = dontDistribute super.bitcoin-api-extra;
 
   # https://github.com/HugoDaniel/RFC3339/issues/14

pkgs/development/haskell-modules/hackage-packages.nix

@@ -2468,6 +2468,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "CirruParser" = callPackage
+    ({ mkDerivation, aeson, base, text, vector }:
+     mkDerivation {
+       pname = "CirruParser";
+       version = "0.0.1";
+       sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
+       buildDepends = [ aeson base text vector ];
+       homepage = "https://github.com/Cirru/parser.hs";
+       description = "Cirru Parser in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ClassLaws" = callPackage
     ({ mkDerivation, base, ChasingBottoms, mtl, QuickCheck }:
      mkDerivation {
@@ -17013,8 +17025,8 @@ self: {
      }:
      mkDerivation {
        pname = "ad";
-       version = "4.2.1.1";
+       version = "4.2.2";
-       sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka";
+       sha256 = "032ch6gjg88zfiwid4f1f7rms86z4x7jfmq496cgr50ycx9gsjxf";
        buildDepends = [
          array base comonad containers data-reify erf free nats reflection
          transformers
@@ -21799,16 +21811,17 @@ self: {
      }) {};
 
   "auto" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+    ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
-     , MonadRandom, profunctors, random, semigroups, transformers
+     , deepseq, MonadRandom, profunctors, random, semigroups
+     , transformers
      }:
      mkDerivation {
        pname = "auto";
-       version = "0.4.2.1";
+       version = "0.4.2.2";
-       sha256 = "0q5zz6q0dcc9chypbd2kci7kkn69ib0vdv48186jqzb3f50l59zw";
+       sha256 = "1n2kknp7b8agkvn3nk6w6cabzh3n89jakzx8pi46ig2ghcxz90wf";
        buildDepends = [
-         base bytestring cereal containers deepseq MonadRandom profunctors
+         base base-orphans bytestring cereal containers deepseq MonadRandom
-         random semigroups transformers
+         profunctors random semigroups transformers
        ];
        homepage = "https://github.com/mstksg/auto";
        description = "Denotative, locally stateful programming DSL & platform";
@@ -23119,8 +23132,8 @@ self: {
     ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }:
      mkDerivation {
        pname = "base58string";
-       version = "0.9.1";
+       version = "0.10.0";
-       sha256 = "1j7vk3par9z2svq8mwwxm73yd5yks25412l3n9mr081ybvywkckd";
+       sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv";
        buildDepends = [ aeson base binary bytestring text ];
        testDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -23502,12 +23515,11 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers, parsec }:
      mkDerivation {
        pname = "bencode";
-       version = "0.5.0.1";
+       version = "0.6.0.0";
-       sha256 = "1zr2sa76s761qhrmh1aymjr6drp8vxads5xf42r63rfdrzm6l3yj";
+       sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
        buildDepends = [ base binary bytestring containers parsec ];
        description = "Parser and printer for bencoded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencoding" = callPackage
@@ -23575,8 +23587,8 @@ self: {
      }:
      mkDerivation {
        pname = "bert";
-       version = "1.2.2.3";
+       version = "1.2.2.4";
-       sha256 = "1waq40hd9wqavzhnvfk1i6wjqkmfb4pl17h4acfzzyz8bj76alkq";
+       sha256 = "1vcbylvci91rqq5dxsa2gxc709klr0xkcflpdhcng69s6pihgsg4";
        buildDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          containers mtl network parsec time unix void
@@ -25341,15 +25353,15 @@ self: {
 
   "bitcoin-block" = callPackage
     ({ mkDerivation, base, binary, bitcoin-tx, bitcoin-types
-     , bytestring, cryptohash, hexstring, hspec, largeword
+     , bytestring, cryptohash, hexstring, hspec, largeword, lens
      }:
      mkDerivation {
        pname = "bitcoin-block";
-       version = "0.9.0";
+       version = "0.13.0";
-       sha256 = "0xqdf7hqcgrzmafh3lp3sq3jm6nblqbhfwvfihmjm4srdj1x77m2";
+       sha256 = "0xiljk9dfd4g2kqphj8xf03kx8d7jd296s8i5rgflc4140npaz20";
        buildDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
-         hexstring largeword
+         hexstring largeword lens
        ];
        testDepends = [
          base bitcoin-tx bitcoin-types bytestring hexstring hspec
@@ -25401,15 +25413,15 @@ self: {
 
   "bitcoin-tx" = callPackage
     ({ mkDerivation, base, binary, bitcoin-script, bitcoin-types
-     , bytestring, cryptohash, hexstring, hspec
+     , bytestring, cryptohash, hexstring, hspec, lens
      }:
      mkDerivation {
        pname = "bitcoin-tx";
-       version = "0.12.1";
+       version = "0.13.0";
-       sha256 = "130ci02j4zcpzmysg0ij54jvzh4j510jb37aa753fm3hpbgczzm5";
+       sha256 = "13iv72l8b2scz6l8319r1yshwn7h67l3dn1z8fl181njkiz5xk0w";
        buildDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
-         hexstring
+         hexstring lens
        ];
        testDepends = [ base bitcoin-script bytestring hexstring hspec ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -25423,8 +25435,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-types";
-       version = "0.9.1";
+       version = "0.9.2";
-       sha256 = "0hk03crwl8xh9gm3b53fgf76qd0jn4wbvvxjm1035lrbi028cm4y";
+       sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp";
        buildDepends = [
          base base58string binary bytestring hexstring text
        ];
@@ -26821,20 +26833,21 @@ self: {
      }) {};
 
   "breve" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, configurator
+    ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
-     , cryptohash, directory, hashtables, mtl, random, simple
+     , configurator, cryptohash, directory, hashtables, http-types, mtl
-     , transformers, wai, wai-extra, warp, xdg-basedir
+     , random, Spock, text, transformers, wai, wai-extra
+     , wai-middleware-static, warp, xdg-basedir
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.2.0.0";
+       version = "0.3.0.0";
-       sha256 = "0dndy14lxj18l0kr7ay1dclp3c960lmd6vqhnz8lkdz1p6cdq9hd";
+       sha256 = "14vhwicdi1cln594bfhhj65kwaxmimpzg4jh35mrycw0fpbfk6rp";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         aeson base binary bytestring configurator cryptohash directory
+         aeson base binary blaze-html bytestring configurator cryptohash
-         hashtables mtl random simple transformers wai wai-extra warp
+         directory hashtables http-types mtl random Spock text transformers
-         xdg-basedir
+         wai wai-extra wai-middleware-static warp xdg-basedir
        ];
        homepage = "https://github.com/rnhmjoj/breve";
        description = "a url shortener";
@@ -28170,6 +28183,7 @@ self: {
        testDepends = [ base ];
        description = "Simple interface to Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install_1_18_1_0" = callPackage
@@ -31095,6 +31109,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cirru-parser" = callPackage
+    ({ mkDerivation, aeson, base, text, vector }:
+     mkDerivation {
+       pname = "cirru-parser";
+       version = "0.0.2";
+       sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
+       buildDepends = [ aeson base text vector ];
+       homepage = "https://github.com/Cirru/parser.hs";
+       description = "Cirru Parser in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "citation-resolve" = callPackage
     ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers
      , curl, data-default, directory, doctest, download-curl, either
@@ -31363,8 +31389,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.3";
+       version = "0.5.4";
-       sha256 = "0x5qza2xv26m27inr0cm59vlizlbimb3gfdc1amal6nznjgrsflc";
+       sha256 = "08is6gr5z2i478lmah6liqinbp8r72zjqfcbfmrxa4vjr3ajrpw7";
        buildDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -31397,15 +31423,12 @@ self: {
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
-    ({ mkDerivation, base, clash-prelude, containers, mtl, QuickCheck
+    ({ mkDerivation, base, clash-prelude, QuickCheck }:
-     }:
      mkDerivation {
        pname = "clash-prelude-quickcheck";
-       version = "0.1.2.0";
+       version = "0.1.2.1";
-       revision = "1";
+       sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
-       sha256 = "1vnw7gaaj1ixz6j96dg6lqcafjbijkzxww0pij8hy4z3sm2370w0";
+       buildDepends = [ base clash-prelude QuickCheck ];
-       editedCabalFile = "f746784b2f0ed039d21e46d8b3adabb39ab6eb002d1c83fd8091619863be7f28";
-       buildDepends = [ base clash-prelude containers mtl QuickCheck ];
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31417,8 +31440,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5.3";
+       version = "0.5.4";
-       sha256 = "06b224qjvj1yqywzs2cz8pzb37n1p8y9zpw4jjb9q76qvr0x68q3";
+       sha256 = "1n35k6mmwf8ky99kc22nw5zwkp75pasjs1yx175h46ln3cqlm289";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31435,8 +31458,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.3";
+       version = "0.5.4";
-       sha256 = "1x43w6sjscvkikrczjdq94wq24k0q92fwifk4561kp6qm2brlw1q";
+       sha256 = "1zmbgsvqa6mgz3aj6xpv3daiic57rccbav1c5dnsfjbsp8x2jgnc";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -33391,9 +33414,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "composition";
-       version = "1.0.1.0";
+       version = "1.0.1.1";
-       sha256 = "1gx27vz2djiiwygcjaygjmiwjnls084b5v9km3jpimlz312qh5hc";
+       sha256 = "112ypxszskri2skj0qbf2a13j2kqnz2pbsrkyja32gs37ln7ca1p";
-       homepage = "http://patch-tag.com/r/DanBurton/composition/home";
        description = "Combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33515,8 +33537,8 @@ self: {
      }:
      mkDerivation {
        pname = "conceit";
-       version = "0.3.0.0";
+       version = "0.3.1.0";
-       sha256 = "1sy8qz7lf4a09b4i7nnzn2bl4lbmkmc613l9pjs7y2xf1qniawhg";
+       sha256 = "1nllcnwjzf7brsmgrrqfil0fppqinysmwcpr1k5ralrhaabwk64l";
        buildDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
@@ -33904,9 +33926,10 @@ self: {
      mkDerivation {
        pname = "conduit-audio";
        version = "0.1";
+       revision = "1";
        sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb";
+       editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c";
        buildDepends = [ base conduit vector ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
        license = "LGPL";
@@ -33919,12 +33942,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-lame";
        version = "0.1";
+       revision = "1";
        sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w";
+       editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a";
        buildDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
        extraLibraries = [ mp3lame ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
@@ -33938,12 +33962,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-samplerate";
        version = "0.1";
+       revision = "1";
        sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg";
+       editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63";
        buildDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
        extraLibraries = [ samplerate ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
@@ -33957,12 +33982,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-sndfile";
        version = "0.1";
+       revision = "1";
        sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd";
+       editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87";
        buildDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsndfile audio file library";
        license = "LGPL";
@@ -34026,7 +34052,9 @@ self: {
      mkDerivation {
        pname = "conduit-extra";
        version = "1.1.7.3";
+       revision = "1";
        sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l";
+       editedCabalFile = "d90996b02f7aeb417e54658bab2ecba414221de6cde817d2b18186d09e605091";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -34827,7 +34855,9 @@ self: {
      mkDerivation {
        pname = "control-monad-free";
        version = "0.6.1";
+       revision = "1";
        sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
+       editedCabalFile = "d08dceee154098bee492a1c00ef699a2a3a0e8a3851c5d49ccd49d5645a501a4";
        buildDepends = [ base prelude-extras transformers ];
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
@@ -37786,8 +37816,8 @@ self: {
      }:
      mkDerivation {
        pname = "dash-haskell";
-       version = "1.0.0.4";
+       version = "1.0.0.5";
-       sha256 = "12nggfrc10i4kmjjqgiqjw9lz2mapqxxvs9d6cba43x43pb8z893";
+       sha256 = "1asfcifmvyrkw0nfb7g7djwzqlgw7l021a5q9i66wj598fgxqn1j";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -43248,16 +43278,15 @@ self: {
      mkDerivation {
        pname = "dtab";
        version = "1.0";
-       revision = "1";
+       revision = "2";
        sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3";
-       editedCabalFile = "2a7a20cc1b621e5a04b3ca28b3d03d11792731256fb39e94882e5e735d52ac15";
+       editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base binary bytestring containers data-binary-ieee754 pretty
          transformers
        ];
-       jailbreak = true;
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44124,15 +44153,20 @@ self: {
      }) { inherit (pkgs) libedit;};
 
   "editor-open" = callPackage
-    ({ mkDerivation, base, bytestring, process, temporary, unix }:
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , directory, process, resourcet, temporary, transformers, unix
+     }:
      mkDerivation {
        pname = "editor-open";
-       version = "0.2.0.0";
+       version = "0.3.0.0";
-       sha256 = "0lv7rkapyvhsrri1094ls4biv7s5p5a30zm20ghqaky3nka2n18p";
+       sha256 = "1yfwwd3z3w6yadqqv96n65795gsg418iid35cwgxyf9l1jgk79f1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring process temporary unix ];
+       buildDepends = [
-       homepage = "https://notabug.org/pharpend/editor-open";
+         base bytestring conduit conduit-extra directory process resourcet
+         temporary transformers unix
+       ];
+       homepage = "https://github.com/pharpend/editor-open";
        description = "Open the user's $EDITOR for text input";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -46208,8 +46242,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.7.0.1";
+       version = "0.7.1.0";
-       sha256 = "1k94kh1wgskhh51by522sz58lzxpgv8qddfalwjmy845dfivbswg";
+       sha256 = "058r7csqf2lzcqskc9fv9lwr1h1glpirblyc51kn0qb16szigpwv";
        buildDepends = [
          aeson async base bytestring cereal containers network protobuf
          random sodium text time uuid
@@ -48531,8 +48565,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fixed-list";
-       version = "0.1.5";
+       version = "0.1.6";
-       sha256 = "07b1kzysf96jckx7yghb2a93l884x8fvxxd0g2ja3hwb5y403911";
+       sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
        buildDepends = [ base ];
        homepage = "http://github.com/jvranish/FixedList/tree/master";
        description = "A fixed length list type";
@@ -50192,8 +50226,8 @@ self: {
      }:
      mkDerivation {
        pname = "friday";
-       version = "0.2.1.1";
+       version = "0.2.1.2";
-       sha256 = "1snbmr1q60lg94zzfxfc0pfzyi695m7dc79vpi66c8kb5anwahw8";
+       sha256 = "08w97jbcg5641brd0pf1bnj6mk0lf7xa57v88y686mx6lsl80i3q";
        buildDepends = [
          base convertible deepseq primitive ratio-int transformers vector
        ];
@@ -51316,7 +51350,9 @@ self: {
      mkDerivation {
        pname = "generic-deepseq";
        version = "2.0.1.1";
+       revision = "1";
        sha256 = "1yajkzp79ri5i7n5ynv0i6spxyg6kyi6qvqj46brlgjag98526iv";
+       editedCabalFile = "58ed9aeb48cc2a00e3122780fcbf2732c4d6fc46198434926a8b1bcc91d4a29b";
        buildDepends = [ base ghc-prim ];
        description = "Generic deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -57017,7 +57053,9 @@ self: {
      mkDerivation {
        pname = "haddock-library";
        version = "1.2.0";
+       revision = "1";
        sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56";
+       editedCabalFile = "39bebb4a575c547378a245ee6028135602cbb73e5adbb4f7743449e5717517da";
        buildDepends = [ base bytestring deepseq transformers ];
        testDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
@@ -58429,7 +58467,9 @@ self: {
      mkDerivation {
        pname = "happstack-server";
        version = "7.4.3";
+       revision = "1";
        sha256 = "0ij359i1lmxs1gpzl6spli94s0mpp6mbbhjcf4jrbxkpavdg8g73";
+       editedCabalFile = "3da7c2f6d5add9d58bc1013cdb0f64bb07aec1ebc88bac40372c4533ed932cf6";
        buildDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -64436,8 +64476,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjcase";
-       version = "0.1.0.0";
+       version = "0.2.0.0";
-       sha256 = "0n2wy39i3v2asifk3n9mlz1dwgyv9fr2mkqp9dbdbawnk2g96y4l";
+       sha256 = "0d1pb24jqk2dj635hy1way9axr9719g1ppxmxr4jpbb0sj6xphjk";
        buildDepends = [
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers vector
@@ -75855,8 +75895,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.4.1";
+       version = "0.4.1.1";
-       sha256 = "0dmnv20nqv72wm42m5widcq0b63rnrslg8ylabc6hqp7xdqa7vil";
+       sha256 = "0caqvq7pl0jbka915xqy3sljjmwc2adk1hkm2775vnsvswh9nysg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -75864,7 +75904,6 @@ self: {
          filepath HPDF JuicyPixels process property-list resourcet temporary
          transformers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
@@ -79090,6 +79129,7 @@ self: {
          ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -85827,9 +85867,10 @@ self: {
      mkDerivation {
        pname = "midi-util";
        version = "0.1.1.1";
+       revision = "1";
        sha256 = "1g8rhx1n6rhyi49x6rkim1bnv7rg6wc0x89dzkrbzyxm28hkvjfk";
+       editedCabalFile = "2c42b8e0940125f6354a9174ad5cb19da6fc0122b4947576e28abb753a7cff14";
        buildDepends = [ base containers event-list midi non-negative ];
-       jailbreak = true;
        homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
        license = "GPL";
@@ -90268,18 +90309,20 @@ self: {
 
   "nested-routes" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , constraints, containers, hspec, http-media, http-types, lucid
+     , clay, composition, constraints, containers, hspec, http-media
-     , mtl, poly-arity, pred-trie, QuickCheck, quickcheck-instances
+     , http-types, lucid, mtl, poly-arity, pred-trie, QuickCheck
-     , regex-compat, semigroups, text, transformers, wai, wai-extra
+     , quickcheck-instances, regex-compat, semigroups, shakespeare, text
+     , transformers, wai, wai-extra, wai-util, witherable
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "0.3.2.1";
+       version = "1.0.0.1";
-       sha256 = "1mj6l01pfyjasa4zaff41vixbbcwdwwwhqv925bq3n1wkznwkzic";
+       sha256 = "04j11mamfpmc0isnxpss6b8qf21mlfs3ndpb8xbdcbcs9hp0xrrq";
        buildDepends = [
-         aeson attoparsec base blaze-html bytestring constraints containers
+         aeson attoparsec base blaze-html bytestring clay composition
-         http-media http-types lucid mtl poly-arity pred-trie regex-compat
+         constraints containers http-media http-types lucid mtl poly-arity
-         semigroups text transformers wai wai-extra
+         pred-trie regex-compat semigroups shakespeare text transformers wai
+         wai-extra wai-util witherable
        ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Declarative, compositional Wai responses";
@@ -93359,8 +93402,8 @@ self: {
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.2.0.0";
+       version = "0.2.0.1";
-       sha256 = "0dpsxssr8h3ph9c5plrmpxv9mv1mg5zb3wrwfbkyb5g7ja91qs4b";
+       sha256 = "1c787c8hq68g2zl1jji6bh2p8hm9fmpdcs898kr8n7b8xbw9jxfk";
        buildDepends = [
          base case-insensitive conduit containers data-default exceptions
          hashable hashable-time lens mono-traversable monoid-subclasses
@@ -94214,8 +94257,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.7";
+       version = "0.7.0.1";
-       sha256 = "1ayh9gpkj128rsxiqjbgwr62fipc5a5h5vkkjnicjxgpwshnrcb8";
+       sha256 = "09ihb3pxw6rk456a0kmgc51fvykz0f499fjd8idns5q1335l18q4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -95207,6 +95250,7 @@ self: {
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
@@ -96421,15 +96465,15 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "8.1";
+       version = "8.2";
-       sha256 = "1zzxgap0ipr4l63fc2rf7wxda03ss0f3wxpz6mlh066p7h9wfhyj";
+       sha256 = "04yydjvwnjilyxwqwrbwg5c2mph58728bacz2q8pbd0084lp77nd";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base bytestring Cabal configurator directory filepath HTTP
          network-uri process tagsoup text vty vty-ui
        ];
-       description = "pgdownloader";
+       description = "simply download a video from webpage and play it";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -106773,10 +106817,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "safe";
-       version = "0.3.8";
+       version = "0.3.9";
-       sha256 = "0k5lk85z2y8kgk7dx7km32g8vi55vnwln8ys2gs174ljd136cjdf";
+       sha256 = "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh";
        buildDepends = [ base ];
-       homepage = "http://community.haskell.org/~ndm/safe/";
+       homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107258,8 +107302,8 @@ self: {
      }:
      mkDerivation {
        pname = "sandi";
-       version = "0.3.4";
+       version = "0.3.5";
-       sha256 = "1f2id34ga5d7cfas9z3n9b28yxpga44rkn5qvkma41cpf4djg72r";
+       sha256 = "19dfiph5rrxs4shpw286r4agcz739f6afw2wyrlkl66lpaaxjvl5";
        buildDepends = [ base bytestring conduit exceptions ];
        testDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
@@ -108391,8 +108435,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdr";
-       version = "0.1.0.1";
+       version = "0.1.0.2";
-       sha256 = "1sy5sn401bdsnip99jc8qxp81j2ladrw9yvzmf3xf5hljyq7sxif";
+       sha256 = "17i16f9pgd8a2l9ywl516zh29mmk5z08j964blajl46wr38g320j";
        buildDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL
@@ -109224,42 +109268,61 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, base, hspec, parsec, QuickCheck
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
-     , string-conversions, template-haskell, text
+     , bytestring-conversion, case-insensitive, doctest, filemanip
+     , hspec, http-media, http-types, network-uri, parsec, QuickCheck
+     , quickcheck-instances, string-conversions, text, url
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.2.2";
+       version = "0.4.0";
-       sha256 = "1pblmnarq1939d2krwbmd9ssm68ar9ip54dl28zjv2j51vhhhzhc";
+       sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5";
        buildDepends = [
-         base parsec string-conversions template-haskell text
+         aeson attoparsec base bytestring bytestring-conversion
+         case-insensitive http-media http-types network-uri
+         string-conversions text
        ];
        testDepends = [
-         base hspec parsec QuickCheck string-conversions text
+         aeson attoparsec base bytestring doctest filemanip hspec parsec
+         QuickCheck quickcheck-instances string-conversions text url
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-blaze" = callPackage
+    ({ mkDerivation, base, blaze-html, http-media, servant }:
+     mkDerivation {
+       pname = "servant-blaze";
+       version = "0.4.0.0";
+       sha256 = "17l0fm296zg5nwfc6srnjl82qckabyac5yxm1dhqxwxq45kj42an";
+       buildDepends = [ base blaze-html http-media servant ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Blaze-html support for servant";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-client" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
      , either, exceptions, hspec, http-client, http-client-tls
-     , http-types, network, network-uri, QuickCheck, safe, servant
+     , http-media, http-types, HUnit, network, network-uri, QuickCheck
-     , servant-server, string-conversions, text, transformers, wai, warp
+     , safe, servant, servant-server, string-conversions, text
+     , transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.2.2";
+       version = "0.4.0";
-       sha256 = "0b96aglic4aawdcpaxyv9k807kjfrr0a9kniqgj5nfcpgwglnp5r";
+       sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
-         http-client-tls http-types network-uri safe servant
+         http-client-tls http-media http-types network-uri safe servant
          string-conversions text transformers
        ];
        testDepends = [
-         aeson base bytestring deepseq either hspec http-types network
+         aeson base bytestring deepseq either hspec http-client http-media
-         QuickCheck servant servant-server wai warp
+         http-types HUnit network QuickCheck servant servant-server text wai
+         warp
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
@@ -109267,45 +109330,62 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
+    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
-     , lens, servant, string-conversions, system-filepath, text
+     , case-insensitive, hashable, hspec, http-media, http-types, lens
-     , unordered-containers
+     , servant, string-conversions, text, unordered-containers
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.3.1";
+       version = "0.4.0";
-       sha256 = "1xbwi5ix5yanrcldc97dwim7s358g7hbr5pwk3r6azknwjzf5fd4";
+       sha256 = "0fbbs4w0yz0kj3gvms0xbikzfqjdqbbi19z26z3zdmc06crkhn4m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson aeson-pretty base bytestring hashable lens servant
+         aeson base bytestring bytestring-conversion case-insensitive
-         string-conversions system-filepath text unordered-containers
+         hashable http-media http-types lens servant string-conversions text
+         unordered-containers
        ];
+       testDepends = [ aeson base hspec servant string-conversions ];
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-jquery" = callPackage
-    ({ mkDerivation, aeson, base, filepath, hspec, language-ecmascript
+    ({ mkDerivation, aeson, base, charset, filepath, hspec
-     , lens, servant, servant-server, stm, transformers, warp
+     , hspec-expectations, language-ecmascript, lens, servant
+     , servant-server, stm, text, transformers, warp
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.2.2.1";
+       version = "0.4.0";
-       sha256 = "0s3c85jpy630bfnzq0wlzv38bkr18cpw5lffn6wh8pjwshd5y8zi";
+       sha256 = "1p8pdrqyj1pyrwghv3k26s4y4aprlkasbzcba9j5n528xvfg0zw5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base filepath lens servant servant-server stm transformers
+         aeson base charset filepath lens servant servant-server stm text
-         warp
+         transformers warp
+       ];
+       testDepends = [
+         base hspec hspec-expectations language-ecmascript lens servant
        ];
-       testDepends = [ base hspec language-ecmascript servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-lucid" = callPackage
+    ({ mkDerivation, base, http-media, lucid, servant }:
+     mkDerivation {
+       pname = "servant-lucid";
+       version = "0.4.0.0";
+       sha256 = "05jadyh3msl2jlrq1d8bmazxb356qdv0gzwpj9gkvrsp4i6ldgcl";
+       buildDepends = [ base http-media lucid servant ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Servant support for lucid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, pandoc-types, servant-docs, text
      , unordered-containers
@@ -109384,27 +109464,29 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
-     , either, exceptions, hspec, hspec-wai, http-types, network
+     , bytestring-conversion, directory, doctest, either, exceptions
+     , filemanip, hspec, hspec-wai, http-types, mmorph, mtl, network
      , network-uri, parsec, QuickCheck, safe, servant, split
      , string-conversions, system-filepath, temporary, text
      , transformers, wai, wai-app-static, wai-extra, warp
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.2.4";
+       version = "0.4.0";
-       sha256 = "11bds7zhkvqg9w27kb0dd792qvz8gjgkmkpbnijvwwzah5gmipi0";
+       sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson attoparsec base bytestring either http-types network-uri safe
+         aeson attoparsec base bytestring either http-types mmorph mtl
-         servant split string-conversions system-filepath text transformers
+         network-uri safe servant split string-conversions system-filepath
-         wai wai-app-static warp
+         text transformers wai wai-app-static warp
        ];
        testDepends = [
-         aeson base bytestring directory either exceptions hspec hspec-wai
+         aeson base bytestring bytestring-conversion directory doctest
-         http-types network parsec QuickCheck servant string-conversions
+         either exceptions filemanip hspec hspec-wai http-types mtl network
-         temporary text transformers wai wai-extra warp
+         parsec QuickCheck servant string-conversions temporary text
+         transformers wai wai-extra warp
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
@@ -113582,12 +113664,12 @@ self: {
      }) {};
 
   "sorted-list" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "sorted-list";
-       version = "0.1.2.1";
+       version = "0.1.4.1";
-       sha256 = "0jjzhi2wj4ca8bvwbv5nnljyli7c9ravigkndk85wdyzz74n0qbh";
+       sha256 = "119h4dz8bkwgpl0w9x5q7q7s50jf5zsr7bikh1l446xqzyax2wi4";
-       buildDepends = [ base ];
+       buildDepends = [ base deepseq ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -114983,8 +115065,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-build-plan";
-       version = "0.1.0.0";
+       version = "0.1.1.0";
-       sha256 = "01vnfmsxx6m6x9wip5pqbg5yffprlc94cdj5ahqs2fyqvzs4j8rb";
+       sha256 = "1slqkcmvnrbbg50qdf368q5h7svngw77b984mpg39p44mc7ghwyg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -119744,21 +119826,20 @@ self: {
      }) {};
 
   "termbox-bindings" = callPackage
-    ({ mkDerivation, base, c2hs, termbox }:
+    ({ mkDerivation, base, c2hs }:
      mkDerivation {
        pname = "termbox-bindings";
-       version = "0.1.0.3";
+       version = "0.1.0.5";
-       sha256 = "00s3j6ccc63ycbj2lxzl2200ffwzslaxdny7d0b9dyzgn6n1pal7";
+       sha256 = "0hv72kkpx6narykfbf6m59gq4l8gym6fm52n1zzazac1802zw0dv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base ];
        buildTools = [ c2hs ];
-       extraLibraries = [ termbox ];
        homepage = "https://github.com/luciferous/termbox-bindings";
-       description = "Bindings to the termbox library";
+       description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { termbox = null;};
+     }) {};
 
   "terminal-progress-bar" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans
@@ -122784,7 +122865,6 @@ self: {
        ];
        description = "BitTorrent file parser and generater";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tostring" = callPackage
@@ -125292,8 +125372,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.1.2";
+       version = "0.1.2.1";
-       sha256 = "14mcv61ci6azzykx287b9cpcwyzbzr66i5s43vdd9wnzrg4mia03";
+       sha256 = "0vwqbq3xmacc9fa95wvy2l6r4h831a8g6w1pbxbip2bgqmybsfvk";
        buildDepends = [
          base containers contravariant mtl profunctors template-haskell
          transformers transformers-compat
@@ -130998,15 +131078,13 @@ self: {
      }) {};
 
   "word-trie" = callPackage
-    ({ mkDerivation, base, binary, containers, derive, hspec
+    ({ mkDerivation, base, binary, containers, hspec, QuickCheck }:
-     , QuickCheck
-     }:
      mkDerivation {
        pname = "word-trie";
-       version = "0.2.0.4";
+       version = "0.3.0";
-       sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f";
+       sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3";
-       buildDepends = [ base binary containers derive ];
+       buildDepends = [ base binary containers ];
-       testDepends = [ base binary containers derive hspec QuickCheck ];
+       testDepends = [ base binary containers hspec QuickCheck ];
        homepage = "https://github.com/yi-editor/word-trie";
        description = "Implementation of a finite trie over words";
        license = stdenv.lib.licenses.gpl2;
@@ -131203,35 +131281,35 @@ self: {
      }) {};
 
   "wreq" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base16-bytestring, base64-bytestring, byteable, bytestring
      , case-insensitive, containers, cryptohash, directory, doctest
      , exceptions, filepath, ghc-prim, hashable, http-client
      , http-client-tls, http-types, HUnit, lens, lens-aeson, mime-types
-     , network-info, old-locale, PSQueue, QuickCheck, snap-core
+     , network-info, old-locale, psqueues, QuickCheck, snap-core
      , snap-server, template-haskell, temporary, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, unix-compat, unordered-containers, uuid
+     , transformers, unix-compat, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "wreq";
-       version = "0.3.0.1";
+       version = "0.4.0.0";
-       sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4";
+       sha256 = "15vjamr3sain8cdgqhg0jfy0rz3bbb6chrivyzvki5rs2g6pzrja";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive containers cryptohash exceptions ghc-prim hashable
          http-client http-client-tls http-types lens lens-aeson mime-types
-         old-locale PSQueue template-haskell text time unordered-containers
+         old-locale psqueues template-haskell text time unordered-containers
        ];
        testDepends = [
-         aeson aeson-pretty aeson-qq base base64-bytestring bytestring
+         aeson aeson-pretty base base64-bytestring bytestring
          case-insensitive containers directory doctest filepath hashable
          http-client http-types HUnit lens lens-aeson network-info
          QuickCheck snap-core snap-server temporary test-framework
-         test-framework-hunit test-framework-quickcheck2 text transformers
+         test-framework-hunit test-framework-quickcheck2 text time
-         unix-compat uuid
+         transformers unix-compat uuid vector
        ];
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
@@ -132260,8 +132338,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.2.5.1";
+       version = "1.2.6";
-       sha256 = "1p3rhmp0j8yayylx936asq7ggn9z50fg3vmd108bfrab2wzqrs4f";
+       sha256 = "1ybl0maakz4arqbblipafwggh0m2n8ljyp91iiihb4674kynrciz";
        buildDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -135234,23 +135312,23 @@ self: {
 
   "yi-language" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, derive, filepath, hashable, hspec, lens
+     , data-default, filepath, hashable, hspec, lens, oo-prototypes
-     , oo-prototypes, pointedlist, QuickCheck, regex-base, regex-tdfa
+     , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell
-     , template-haskell, transformers-base, unordered-containers
+     , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.1.1.0";
+       version = "0.2.0";
-       sha256 = "1gsh0njslncfh0r5wg1rq9w4f03ixkk5grd9zigkspsndhij7379";
+       sha256 = "1a0lvddn35q9jqr0w7g2m268dy8s9dwsss7sf4460rvkg1xvkvvh";
        buildDepends = [
-         array base binary containers data-default derive hashable lens
+         array base binary containers data-default hashable lens
          oo-prototypes pointedlist regex-base regex-tdfa template-haskell
          transformers-base unordered-containers
        ];
        testDepends = [
-         array base binary containers data-default derive filepath hashable
+         array base binary containers data-default filepath hashable hspec
-         hspec lens pointedlist QuickCheck regex-base regex-tdfa
+         lens pointedlist QuickCheck regex-base regex-tdfa template-haskell
-         template-haskell transformers-base unordered-containers
+         transformers-base unordered-containers
        ];
        buildTools = [ alex ];
        homepage = "https://github.com/yi-editor/yi-language";
@@ -135570,6 +135648,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yxdb-utils" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bimap, binary
+     , binary-conduit, bytestring, Codec-Compression-LZF, conduit
+     , conduit-combinators, conduit-extra, containers, csv-conduit
+     , Decimal, directory, exceptions, ghc-prim, HUnit, lens
+     , monad-loops, mtl, newtype, old-locale, parsec, primitive
+     , QuickCheck, quickcheck-instances, reinterpret-cast, resourcet
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, text-binary, time, transformers, vector, xml-conduit
+     }:
+     mkDerivation {
+       pname = "yxdb-utils";
+       version = "0.1.0.1";
+       sha256 = "05aba4fdpqx7sar7yrw4gg341wzfhhlbvx7453ns8mccqhx9dag8";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         array attoparsec base bimap binary binary-conduit bytestring
+         Codec-Compression-LZF conduit conduit-combinators conduit-extra
+         containers csv-conduit Decimal directory exceptions ghc-prim lens
+         monad-loops mtl newtype old-locale parsec primitive
+         reinterpret-cast resourcet text text-binary time transformers
+         vector xml-conduit
+       ];
+       testDepends = [
+         array attoparsec base bimap binary binary-conduit bytestring
+         Codec-Compression-LZF conduit conduit-combinators conduit-extra
+         containers csv-conduit Decimal directory exceptions ghc-prim HUnit
+         lens monad-loops mtl newtype old-locale parsec primitive QuickCheck
+         quickcheck-instances reinterpret-cast resourcet test-framework
+         test-framework-hunit test-framework-quickcheck2 text text-binary
+         time transformers vector xml-conduit
+       ];
+       description = "Utilities for reading and writing Alteryx .yxdb files";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "z3" = callPackage
     ({ mkDerivation, base, containers, gomp, hspec, mtl, QuickCheck, z3
      }:

pkgs/development/libraries/geoip/default.nix

@@ -1,15 +1,24 @@
-{ stdenv, fetchurl }:
+# in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP
+# e.g. geolite-legacy
+{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }:
 
 let version = "1.6.2"; in
 
 stdenv.mkDerivation {
-  name = "geoip-${version}";
+  name = "${drvName}-${version}";
 
   src = fetchurl {
     url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz";
     sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
   };
 
+  postInstall = ''
+    DB=${toString geoipDatabase}
+    if [ -n "$DB" ]; then
+      ln -s $DB/share/GeoIP $out/share/GeoIP
+    fi
+  '';
+
   meta = {
     description = "Geolocation API";
     maintainers = [ stdenv.lib.maintainers.raskin ];

pkgs/development/libraries/libinput/default.nix

@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.14.1";
+  name = "libinput-0.15.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0r0v5jqbnwgndq6ns3ss3kv1438ny302m7bg1najcl1dpqp21v9b";
+    sha256 = "07gw2bhjikiix6bgln03n0zqnbqw18svlf2dfpsv893xjwcdnmhn";
   };
 
   configureFlags = [

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

@@ -1,33 +1,21 @@
-{ stdenv, fetchurl, perl, perlXMLParser, gettext }:
+{ stdenv, fetchurl, gettext, perl, perlXMLParser }:
-let
+
-  s = # Generated upstream information
+stdenv.mkDerivation rec {
-  rec {
+  name = "intltool-${version}";
-    baseName="intltool";
+  version = "0.51.0";
-    version="0.51.0";
+
-    name="${baseName}-${version}";
-    hash="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
-    url="https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";
-    sha256="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
-  };
-  propagatedBuildInputs = [perl perlXMLParser];
-  buildInputs = [];
-  in
-stdenv.mkDerivation {
-  inherit (s) name version;
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
   };
-  inherit buildInputs;
 
-  # not needed by intltool itself but (probably) needed for its usage
+  propagatedBuildInputs = [ gettext perl perlXMLParser ];
-  propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Translation helper tool";
-    homepage = "http://launchpad.net/intltool/";
+    homepage = http://launchpad.net/intltool/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = with maintainers; [ raskin ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
-    inherit (s) version;
   };
 }

pkgs/development/tools/misc/intltool/default.upstream

@@ -1,2 +0,0 @@
-attribute_name intltool
-url https://launchpad.net/intltool/+download

pkgs/misc/emulators/emulationstation/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "emulationstation-${version}";
-  version = "2.0.0-rc1";
+  version = "2.0.1a";
 
   src = fetchFromGitHub {
     owner = "Aloshi";
     repo = "EmulationStation";
-    rev = "8739519e1591819cab85e1d2056804d20c197dac";
+    rev = "646bede3d9ec0acf0ae378415edac136774a66c5";
-    sha256 = "1psq5cqyq2yy1lqxrcj7pfp8szfmzhamxf3111l97w2h2zzcgvq9";
+    sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v";
   };
 
   buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
@@ -25,4 +25,4 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.mit;
   };
-}
+}

pkgs/misc/emulators/wine/base.nix

@@ -0,0 +1,61 @@
+{ stdenv, lib, pkgArches,
+  name, version, src, monos, geckos, platforms,
+  buildScript ? null, configureFlags ? ""
+}:
+
+assert stdenv.isLinux;
+assert stdenv.cc.cc.isGNU or false;
+
+stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
+  builder = buildScript;
+}) // {
+  inherit name src configureFlags;
+
+  buildInputs = lib.concatLists (map (pkgs: (with pkgs; [
+    pkgconfig alsaLib ncurses libpng libjpeg lcms2 fontforge libxml2 libxslt
+    openssl gnutls cups makeWrapper flex bison mesa mesa_noglu.osmesa
+  ]) ++ (with pkgs.xlibs; [
+    xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
+  ])) pkgArches);
+
+  # Wine locates a lot of libraries dynamically through dlopen().  Add
+  # them to the RPATH so that the user doesn't have to set them in
+  # LD_LIBRARY_PATH.
+  NIX_LDFLAGS = map (path: "-rpath ${path}/lib") ([
+    stdenv.cc.cc
+  ] ++ (lib.concatLists (map (pkgs:
+        (with pkgs; [
+    freetype fontconfig mesa mesa_noglu.osmesa libdrm
+    libpng libjpeg openssl gnutls cups ncurses
+  ]) ++ (with pkgs.xlibs; [
+    libXinerama libXrender libXrandr libXcursor libXcomposite
+  ])) pkgArches)));
+
+  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
+  # elements specified above.
+  dontPatchELF = true;
+
+  ## FIXME
+  # Add capability to ignore known failing tests
+  # and enable doCheck
+  doCheck = false;
+  
+  postInstall = let
+    links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";
+  in ''
+    mkdir -p $out/share/wine/gecko $out/share/wine/mono/
+    ${lib.strings.concatStringsSep "\n"
+          ((map (links "share/wine/gecko") geckos)
+        ++ (map (links "share/wine/mono")  monos))}
+  '';
+  
+  enableParallelBuilding = true;
+
+  meta = {
+    inherit version platforms;
+    homepage = "http://www.winehq.org/";
+    license = "LGPL";
+    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
+    maintainers = [stdenv.lib.maintainers.raskin];
+  };
+})

pkgs/misc/emulators/wine/builder-wow.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+source $stdenv/setup
+
+unpackPhase
+patchPhase
+
+configureScript=$TMP/$sourceRoot/configure
+mkdir -p $TMP/wine-wow $TMP/wine64
+
+cd $TMP/wine64
+sourceRoot=`pwd`
+configureFlags="--enable-win64"
+configurePhase
+buildPhase
+# checkPhase
+
+cd $TMP/wine-wow
+sourceRoot=`pwd`
+configureFlags="--with-wine64=../wine64"
+configurePhase
+buildPhase
+# checkPhase
+
+eval "$preInstall"
+cd $TMP/wine64 && make install
+cd $TMP/wine-wow && make install
+eval "$postInstall"
+fixupPhase

pkgs/misc/emulators/wine/default.nix

@@ -0,0 +1,15 @@
+## Configuration:
+# Control you default wine config in nixpkgs-config:
+# wine = {
+#   release = "stable"; # "stable", "unstable"
+#   build = "wineWow"; # "wine32", "wine64", "wineWow"
+# };
+# Make additional configurations on demand:
+# wine.overrideConfig { build = "wine32"; };
+{ lib, system, callPackage,
+  wineRelease ? "stable",
+  wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32") }:
+
+lib.getAttr wineBuild (callPackage ./packages.nix {
+  inherit wineRelease;
+})

pkgs/misc/emulators/wine/packages.nix

@@ -0,0 +1,60 @@
+{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
+  wineRelease ? "stable"
+}:
+
+let sources = with lib.getAttr wineRelease (import ./versions.nix); {
+      version = wineVersion;
+      src = fetchurl {
+        url = "mirror://sourceforge/wine/wine-${wineVersion}.tar.bz2";
+        sha256 = wineSha256;
+      };
+
+      wineGecko32 = fetchurl {
+        url = "mirror://sourceforge/wine/wine_gecko-${geckoVersion}-x86.msi";
+        sha256 = geckoSha256;
+      };
+
+      wineGecko64 = fetchurl {
+        url = "mirror://sourceforge/wine/wine_gecko-${gecko64Version}-x86_64.msi";
+        sha256 = gecko64Sha256;
+      };
+
+      wineMono = fetchurl {
+        url = "mirror://sourceforge/wine/wine-mono-${monoVersion}.msi";
+        sha256 = monoSha256;
+      };
+    };
+    inherit (sources) version;
+in {
+  wine32 = import ./base.nix {
+    name = "wine32-${version}";
+    inherit (sources) version src;
+    inherit (pkgsi686Linux) lib stdenv;
+    pkgArches = [ pkgsi686Linux ];
+    geckos = with sources; [ wineGecko32 ];
+    monos = with sources; [ wineMono ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+  wine64 = import ./base.nix {
+    name = "wine64-${version}";
+    inherit (sources) version src;
+    inherit lib stdenv;
+    pkgArches = [ pkgs ];
+    geckos = with sources; [ wineGecko64 ];
+    monos = with sources; [ wineMono ];
+    configureFlags = "--enable-win64";
+    platforms = [ "x86_64-linux" ];
+  };
+  wineWow = import ./base.nix {
+    name = "wineWow-${version}";
+    inherit (sources) version src;
+    inherit lib;
+    stdenv = stdenv_32bit;
+    pkgArches = [ pkgs pkgsi686Linux ];
+    geckos = with sources; [ wineGecko32 wineGecko64 ];
+    monos = with sources; [ wineMono ];
+    buildScript = ./builder-wow.sh;
+    platforms = [ "x86_64-linux" ];
+  };
+}
+

pkgs/misc/emulators/wine/stable.nix

@@ -1,81 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
-, ncurses, libpng, libjpeg, lcms2, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
-}:
-
-assert stdenv.isLinux;
-assert stdenv.cc.cc.isGNU or false;
-
-let
-    version = "1.6.2";
-    name = "wine-${version}";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh";
-    };
-
-    gecko = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
-      sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
-    };
-
-    gecko64 = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
-      sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
-    };
-
-    mono = fetchurl {
-      url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
-      sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
-    };
-
-in stdenv.mkDerivation rec {
-  inherit version name src;
-
-  buildInputs = [
-    pkgconfig
-    xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
-    xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
-    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
-    alsaLib ncurses libpng libjpeg lcms2 fontforge
-    libxml2 libxslt openssl gnutls cups makeWrapper
-  ];
-
-  # Wine locates a lot of libraries dynamically through dlopen().  Add
-  # them to the RPATH so that the user doesn't have to set them in
-  # LD_LIBRARY_PATH.
-  NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
-    freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
-    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
-    xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
-    openssl gnutls cups
-  ];
-
-  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
-  # elements specified above.
-  dontPatchELF = true;
-
-  postInstall = ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko.name}
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
-  '' + ''
-    install -D ${mono} $out/share/wine/mono/${mono.name}
-
-    paxmark psmr $out/bin/wine{,-preloader}
-
-    wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://www.winehq.org/";
-    license = "LGPL";
-    inherit version;
-    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/misc/emulators/wine/unstable.nix

@@ -1,78 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
-, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
-}:
-
-assert stdenv.isLinux;
-assert stdenv.cc.cc.isGNU or false;
-
-let
-    version = "1.7.42";
-    name = "wine-${version}";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss";
-    };
-
-    gecko = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.36-x86.msi";
-      sha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
-    };
-
-    gecko64 = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.36-x86_64.msi";
-      sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh";
-    };
-
-    mono = fetchurl {
-      url = "mirror://sourceforge/wine/wine-mono-4.5.4.msi";
-      sha256 = "1wnn273f232141x9x0sahg4w499x0g2p0xphxmwm5wh1xrzyvg10";
-    };
-
-in stdenv.mkDerivation rec {
-  inherit version name src;
-
-  buildInputs = [
-    pkgconfig
-    xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
-    xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
-    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
-    alsaLib ncurses libpng libjpeg lcms fontforge
-    libxml2 libxslt openssl gnutls cups makeWrapper
-  ];
-
-  # Wine locates a lot of libraries dynamically through dlopen().  Add
-  # them to the RPATH so that the user doesn't have to set them in
-  # LD_LIBRARY_PATH.
-  NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
-    freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
-    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
-    xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
-    openssl gnutls cups ncurses
-  ];
-
-  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
-  # elements specified above.
-  dontPatchELF = true;
-
-  postInstall = ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko.name}
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
-    install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
-  '' + ''
-    install -D ${mono} $out/share/wine/mono/${mono.name}
-    wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://www.winehq.org/";
-    license = "LGPL";
-    inherit version;
-    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/misc/emulators/wine/versions.nix

@@ -0,0 +1,25 @@
+{
+  unstable = {
+    wineVersion = "1.7.42";
+    wineSha256  = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss";
+    geckoVersion = "2.36";
+    geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
+    gecko64Version = "2.36";
+    gecko64Sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh";
+    monoVersion = "4.5.6";
+    monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+  };
+  stable = {
+    wineVersion = "1.6.2";
+    wineSha256  = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh";
+    geckoVersion = "2.21";
+    geckoSha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
+    gecko64Version = "2.21";
+    gecko64Sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
+    monoVersion = "4.5.6";
+    monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+    ## TESTME wine stable should work with most recent mono
+    #monoVersion = "0.0.8";
+    #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
+  };
+}

pkgs/os-specific/linux/edac-utils/default.nix

@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, perl, makeWrapper
+, sysfsutils, dmidecode, kmod }:
+
+stdenv.mkDerivation {
+  name = "edac-utils-2015-01-07";
+
+  src = fetchFromGitHub {
+    owner = "grondo";
+    repo = "edac-utils";
+    rev = "f9aa96205f610de39a79ff43c7478b7ef02e3138";
+    sha256 = "1dmfqb15ffldl5zirbmwiqzpxbcc2ny9rpfvxcfvpmh5b69knvdg";
+  };
+
+  nativeBuildInputs = [ perl makeWrapper ];
+  buildInputs = [ sysfsutils ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ];
+
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+  ];
+
+  postInstall = ''
+    wrapProgram "$out/sbin/edac-ctl" \
+      --set PATH : "" \
+      --prefix PATH : "${dmidecode}/bin" \
+      --prefix PATH : "${kmod}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/grondo/edac-utils;
+    description = "handles the reporting of hardware-related memory errors.";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}

pkgs/os-specific/linux/kernel/patches.nix

@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.41";
-      revision  = "201505072056";
+      revision  = "201505101121";
       branch    = "stable";
-      sha256    = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg";
+      sha256    = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "4.0.2";
-      revision  = "201505072057";
+      revision  = "201505101122";
       branch    = "test";
-      sha256    = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2";
+      sha256    = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24";
     };
 
   grsec_fix_path =

pkgs/os-specific/linux/pam/CVE-2014-2583.patch

@@ -1,49 +0,0 @@
-From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Wed, 26 Mar 2014 22:17:23 +0000
-Subject: pam_timestamp: fix potential directory traversal issue (ticket #27)
-
-pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
-the timestamp pathname it creates, so extra care should be taken to
-avoid potential directory traversal issues.
-
-* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
-"." and ".." tty values as invalid.
-(get_ruser): Treat "." and ".." ruser values, as well as any ruser
-value containing '/', as invalid.
-
-Fixes CVE-2014-2583.
-
-Reported-by: Sebastian Krahmer <krahmer@suse.de>
-
-diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c
-index 5193733..b3f08b1 100644
---- a/modules/pam_timestamp/pam_timestamp.c
-+++ b/modules/pam_timestamp/pam_timestamp.c
-@@ -158,7 +158,7 @@ check_tty(const char *tty)
- 		tty = strrchr(tty, '/') + 1;
- 	}
- 	/* Make sure the tty wasn't actually a directory (no basename). */
--	if (strlen(tty) == 0) {
-+	if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
- 		return NULL;
- 	}
- 	return tty;
-@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t ruserbuflen)
- 		if (pwd != NULL) {
- 			ruser = pwd->pw_name;
- 		}
-+	} else {
-+		/*
-+		 * This ruser is used by format_timestamp_name as a component
-+		 * of constructed timestamp pathname, so ".", "..", and '/'
-+		 * are disallowed to avoid potential path traversal issues.
-+		 */
-+		if (!strcmp(ruser, ".") ||
-+		    !strcmp(ruser, "..") ||
-+		    strchr(ruser, '/')) {
-+			ruser = NULL;
-+		}
- 	}
- 	if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
- 		*ruserbuf = '\0';

pkgs/os-specific/linux/pam/default.nix

@@ -1,15 +1,14 @@
 { stdenv, fetchurl, flex, cracklib }:
 
 stdenv.mkDerivation rec {
-  name = "linux-pam-1.1.8";
+  name = "linux-pam-${version}";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2;
+    url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2";
-    sha256 = "0m8ygb40l1c13nsd4hkj1yh4p1ldawhhg8pyjqj9w5kd4cxg5cf4";
+    sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd";
   };
 
-  patches = [ ./CVE-2014-2583.patch ];
-
   nativeBuildInputs = [ flex ];
 
   buildInputs = [ cracklib ];

pkgs/top-level/all-packages.nix

@@ -808,6 +808,8 @@ let
     linuxHeaders = linuxHeaders_3_14;
   };
 
+  edac-utils = callPackage ../os-specific/linux/edac-utils { };
+
   eggdrop = callPackage ../tools/networking/eggdrop { };
 
   enca = callPackage ../tools/text/enca { };
@@ -4641,6 +4643,7 @@ let
     sasl = cyrus_sasl;
     inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
     pythonProtobuf = pythonPackages.protobuf2_5;
+    perf = linuxPackages.perf;
   };
 
   mesos-dns = callPackage ../servers/dns/mesos-dns { };
@@ -5904,6 +5907,11 @@ let
 
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
 
+  geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
+    drvName = "geoip-tools";
+    geoipDatabase = geolite-legacy;
+  };
+
   geoip = callPackage ../development/libraries/geoip { };
 
   geoipjava = callPackage ../development/libraries/java/geoipjava { };
@@ -14386,27 +14394,25 @@ let
 
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
-  # Wine cannot be built in 64-bit; use a 32-bit build instead.
+  # Wine defaults to a mixed 64 / 32 build on x86_64 and to pure 32 on x86
-  wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {
+  wine = callPackage ../misc/emulators/wine {
-    bison = bison2;
+    wineRelease = config.wine.release or "stable";
+    wineBuild = config.wine.build or (if system == "x86_64-linux" then "wineWow" else "wine32");
+  };
+  wineStable = wine.override { wineRelease = "stable"; };
+  wineUnstable = wine.override { wineRelease = "unstable"; };
+
+  winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
+    inherit (gnome2) zenity;
   };
 
-  wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix {
+  ### FIXME integrate wineStaging into 64bit
-    bison = bison2;
-  });
-
-  wine = wineStable;
-
   wineStaging = callPackage_i686 ../misc/emulators/wine/staging.nix {
     wine = pkgsi686Linux.wineUnstable;
     # Patent issues
     libtxc_dxtn = pkgsi686Linux.libtxc_dxtn_s2tc;
   };
 
-  winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
-    inherit (gnome2) zenity;
-  };
-
   wmutils-core = callPackage ../tools/X11/wmutils-core { };
 
   wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };