From 475c8bfb7d13de76d6e0ff1c052ad95b2754d7e2 Mon Sep 17 00:00:00 2001
From: Christian Gram Kalhauge <christian@kalhauge.dk>
Date: Wed, 20 Jul 2016 14:21:53 +0200
Subject: Fix DLYD problem with haskell libraries on Darwin

This commit fixes a problem that occurs with externally linked haskell
libraries on Darwin. It does this by adding the libraries to the
--extra-lib-dirs flag and the DYLD_LIBRARY_PATH environment variable.
---
 pkgs/development/haskell-modules/generic-builder.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 72110227140b..2bcf6ee854f6 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -193,6 +193,9 @@ stdenv.mkDerivation ({
       fi
       if [ -d "$p/lib" ]; then
         configureFlags+=" --extra-lib-dirs=$p/lib"
+        if [[ ${ if stdenv.isDarwin then "yes" else "no"} = "yes" ]]; then
+          export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib;
+        fi
       fi
     done
     ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache
-- 
cgit 1.4.1


From de5a2ee03476180fef621a35d1efbdfdd4b1bb86 Mon Sep 17 00:00:00 2001
From: Christian Gram Kalhauge <christian@kalhauge.dk>
Date: Thu, 21 Jul 2016 11:39:52 +0200
Subject: Reduce computation time for non-darwin users

---
 pkgs/development/haskell-modules/generic-builder.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 2bcf6ee854f6..faca3f2dff17 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -192,10 +192,12 @@ stdenv.mkDerivation ({
         configureFlags+=" --extra-include-dirs=$p/include"
       fi
       if [ -d "$p/lib" ]; then
-        configureFlags+=" --extra-lib-dirs=$p/lib"
-        if [[ ${ if stdenv.isDarwin then "yes" else "no"} = "yes" ]]; then
-          export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib;
-        fi
+        configureFlags+=" --extra-lib-dirs=$p/lib"${
+          if stdenv.isDarwin then
+            "; export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib;"
+          else
+            ""
+        }
       fi
     done
     ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache
-- 
cgit 1.4.1


From 9bca29d4efe614e12578b8dbf1d60df94b517ab6 Mon Sep 17 00:00:00 2001
From: Christian Gram Kalhauge <christian@kalhauge.dk>
Date: Thu, 21 Jul 2016 14:23:56 +0200
Subject: Change if to optionalString

---
 pkgs/development/haskell-modules/generic-builder.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index faca3f2dff17..48467acbca66 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -193,10 +193,8 @@ stdenv.mkDerivation ({
       fi
       if [ -d "$p/lib" ]; then
         configureFlags+=" --extra-lib-dirs=$p/lib"${
-          if stdenv.isDarwin then
+          stdenv.lib.optionalString stdenv.isDarwin
             "; export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib;"
-          else
-            ""
         }
       fi
     done
-- 
cgit 1.4.1


From 1a088053586cc41c54144175769427ac787fef0f Mon Sep 17 00:00:00 2001
From: Christian Gram Kalhauge <christian@kalhauge.dk>
Date: Thu, 21 Jul 2016 14:56:45 +0200
Subject: Make the implementation clean

---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 48467acbca66..5eb4e1fac83a 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -192,9 +192,9 @@ stdenv.mkDerivation ({
         configureFlags+=" --extra-include-dirs=$p/include"
       fi
       if [ -d "$p/lib" ]; then
-        configureFlags+=" --extra-lib-dirs=$p/lib"${
-          stdenv.lib.optionalString stdenv.isDarwin
-            "; export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib;"
+        configureFlags+=" --extra-lib-dirs=$p/lib"
+        ${ stdenv.lib.optionalString stdenv.isDarwin
+            "export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib"
         }
       fi
     done
-- 
cgit 1.4.1


From f35d23b16d99087831d9f5e1fe2fb66f7816da65 Mon Sep 17 00:00:00 2001
From: Teo Klestrup Röijezon <teo@nullable.se>
Date: Thu, 25 Aug 2016 22:16:06 +0200
Subject: buildStackProject: Fix missing STACK_ROOT causing build errors

---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 09bd38ccc933..8da26d8be82f 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -28,7 +28,10 @@ stdenv.mkDerivation (args // {
 
   preferLocalBuild = true;
 
-  configurePhase = args.configurePhase or "stack setup";
+  configurePhase = args.configurePhase or ''
+    export STACK_ROOT=$NIX_BUILD_TOP/.stack
+    stack setup
+  '';
 
   buildPhase = args.buildPhase or "stack build";
 
-- 
cgit 1.4.1


From b7819e38c4a7487a0d09bdf64275a246bf29a8e2 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Fri, 26 Aug 2016 23:12:24 +0200
Subject: python3.x: Patch extra stack size on darwin

Compiling python with "-Wl,-stack_size,1000000" causes problems when
compiling for example pygobject3. pygobject3 uses "python3.x-config
--ldflags" during installation and then fails when
"-Wl,-stack_size,1000000" is present. Maybe we should investigate
removing this during the build of pyobject3, but this stack_size flag is
also not used on the popular darwin homebrew-core channel for python3.5,
so it seems safe to remove it.
---
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 1 +
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 1 +
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 1 +
 3 files changed, 3 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 2293e6d485a9..2e7d3a03141e 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation {
 
   prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
+    substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
   preConfigure = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 1b6814ea4363..69d3df32a326 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation {
 
   prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
+    substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
   preConfigure = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 2c1846442070..3a6635cd8b62 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation {
 
   prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
+    substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
   preConfigure = ''
-- 
cgit 1.4.1


From 717c76716fb839eca7cddf25a391a3a336702a04 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Fri, 26 Aug 2016 23:18:32 +0200
Subject: pygobject3: Add missing dependencies (for darwin)

The packages "which" and "ncurses" are needed for building pygobject3
(on darwin) during the checkPhase. The ncurses library is necessary only
because python3.5 is currently built using "-lncurses" and pygobject3
wants the same libraries that python3.5 was compiled with. (Because it
uses "python3.5-config --ldflags" during the build)
---
 pkgs/development/python-modules/pygobject/3.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 43882476b9d5..797d89fd4822 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
+{ stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
 
 mkPythonDerivation rec {
   major = "3.20";
@@ -10,12 +10,13 @@ mkPythonDerivation rec {
     sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari";
   };
 
-  buildInputs = [ pkgconfig glib gobjectIntrospection ];
+  buildInputs = [ pkgconfig glib gobjectIntrospection ]
+                 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
   propagatedBuildInputs = [ pycairo cairo ];
 
   meta = {
     homepage = http://live.gnome.org/PyGObject;
     description = "Python bindings for Glib";
-    platforms = lib.platforms.unix;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
-- 
cgit 1.4.1


From d12de90e1c0cece5b7a92cd66af19e12b9fb6a81 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Thu, 25 Aug 2016 19:03:15 +0200
Subject: pyqt: Fix darwin build

---
 pkgs/development/python-modules/pyqt/4.x.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 5ffbd19228cf..d3f2e37df884 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
+{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
 
 let
   version = "4.11.3";
@@ -17,9 +17,15 @@ in mkPythonDerivation {
     rm -rf "$out/nix-support"
 
     export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      export QMAKESPEC="unsupported/macx-clang-libc++" # OS X target after bootstrapping phase \
+    ''}
 
     substituteInPlace configure.py \
-      --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'"
+      --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \
+    ''}
 
     configureFlagsArray=( \
       --confirm-license --bindir $out/bin \
@@ -50,7 +56,7 @@ in mkPythonDerivation {
     description = "Python bindings for Qt";
     license = "GPL";
     homepage = http://www.riverbankcomputing.co.uk;
-    maintainers = [ lib.maintainers.sander ];
-    platforms = lib.platforms.mesaPlatforms;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
-- 
cgit 1.4.1


From d9599e22a27913cda6d18871275b95eacc5f6511 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Thu, 8 Sep 2016 21:51:10 -0400
Subject: atermjava: remove

---
 pkgs/development/libraries/java/aterm/default.nix | 14 --------------
 pkgs/top-level/all-packages.nix                   |  4 ----
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/java/aterm/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/java/aterm/default.nix b/pkgs/development/libraries/java/aterm/default.nix
deleted file mode 100644
index f643c607cbd1..000000000000
--- a/pkgs/development/libraries/java/aterm/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, jdk, sharedobjects, jjtraveler}:
-
-stdenv.mkDerivation {
-  name = "aterm-java-1.6";
-  src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/aterm-java/aterm-java-1.6.tar.gz;
-    md5 = "abf475dae2f5efca865fcdff871feb5e";
-  };
-  buildInputs = [stdenv jdk sharedobjects jjtraveler];
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5dc5b75d48a0..4bce581c1be1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9973,10 +9973,6 @@ in
 
   ### DEVELOPMENT / LIBRARIES / JAVA
 
-  atermjava = callPackage ../development/libraries/java/aterm {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
   commonsBcel = callPackage ../development/libraries/java/commons/bcel { };
 
   commonsBsf = callPackage ../development/libraries/java/commons/bsf { };
-- 
cgit 1.4.1


From 7b51c79ccdc802182ffe335ebe9309ea1d67ef64 Mon Sep 17 00:00:00 2001
From: Ruslan Babayev <ruslan@babayev.com>
Date: Sat, 10 Sep 2016 03:06:13 -0700
Subject: pktgen: 3.0.04 -> 3.0.13 (#18477)

---
 pkgs/os-specific/linux/pktgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 5154ccce1b49..b591c3b002c6 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "pktgen-${version}";
-  version = "3.0.04";
+  version = "3.0.13";
 
   src = fetchurl {
     url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz";
-    sha256 = "0vrmbpl8zaal5zjwyzlx0y3d6jydfxdmf0psdj7ic37h5yh2iv2q";
+    sha256 = "64629b454ed8dc036d5e9bb30b3ae84a0bab0142b651c72da85ab1454e9ae0d6";
   };
 
   nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
-- 
cgit 1.4.1


From 23c122d2775bdb722b4a5ac13539e6f74199b61d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Sep 2016 12:27:58 +0200
Subject: r-openssl: fix build some more

---
 pkgs/development/r-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index abf2c6bb04c4..99120a13cd05 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -279,7 +279,7 @@ let
     mwaved = [ pkgs.fftw ];
     ncdf4 = [ pkgs.netcdf ];
     nloptr = [ pkgs.nlopt ];
-    openssl = [ pkgs.openssl.dev8 ];
+    openssl = [ pkgs.openssl.dev ];
     outbreaker = [ pkgs.gsl_1 ];
     pander = [ pkgs.pandoc pkgs.which ];
     pbdMPI = [ pkgs.openmpi ];
-- 
cgit 1.4.1


From bee73d337a05403f860eed5e8ba4a8a2d480f7f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Sep 2016 13:05:59 +0200
Subject: net-snmp: cosmetic fix for syntax highlighting in Emacs

---
 pkgs/servers/monitoring/net-snmp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 4dd7fb24c916..30c0681adb7d 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    for f in $out/lib/*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
+    for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
       sed 's|-L${openssl.dev}|-L${openssl.out}|g' -i $f
     done
   '';
-- 
cgit 1.4.1


From 91674b75d3b60049dcaa4c59a8aa52b45c3d3131 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Sep 2016 17:06:42 +0200
Subject: grsecurity: 4.7.2-201608312326 -> 4.7.3-201609072139

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index bd54c5352a59..ff47e1758c74 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.7.2";
+  version = "4.7.3";
   extraMeta.branch = "4.7";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1234z4wzvrbyzql6cc8i4bq7bbbjgaxhys4fcnqzm14lavk3wjaq";
+    sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 3b5e97f9edf6..53e7196c5c37 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -100,9 +100,9 @@ rec {
   grsecurity_4_4 = throw "grsecurity stable is no longer supported";
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.7.2";
-      grrev  = "201608312326";
-      sha256 = "0nbp3lnl6gi6kklpc8wnjpz5cj9zafaw2445lan15qnyzf5zb966";
+    { kver   = "4.7.3";
+      grrev  = "201609072139";
+      sha256 = "0c70nfsa1bk07z6sivy645d9w0qkq23pwpwdm28160kfy7dampyh";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
-- 
cgit 1.4.1


From c6460fb0cbda179b83558a6e19c13a2d5f81a5ed Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 10 Sep 2016 11:25:21 -0400
Subject: melpa: Add inherit-local, bump f.el

---
 .../editors/emacs-modes/melpa-generated.nix        | 27 +++++++++++++++++++---
 pkgs/top-level/emacs-packages.nix                  | 17 --------------
 2 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 94bbcaf274e0..e1382d6d50b4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -20035,12 +20035,12 @@
     f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "f";
-        version = "20160815.1253";
+        version = "20160909.829";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "f.el";
-          rev = "4f8d3112f03e99506bab3c910fa3a29f0b8eb86b";
-          sha256 = "0gf4vh7h4sjmp74kfiwxngjpx44m88mksridfil7piapbg23z9xm";
+          rev = "e055e3dd404c8a7cc7849a0e6fd8aade714c5355";
+          sha256 = "1n9v2ackd86xbl0msnrvrfxp1qacydz9n0zjxm328jxlvj4h35rx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f";
@@ -33334,6 +33334,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inherit-local";
+        version = "20160909.755";
+        src = fetchFromGitHub {
+          owner = "shlevy";
+          repo = "inherit-local";
+          rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063";
+          sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/50751b5f9843fde00505edd281e404ec1d875713/recipes/inherit-local";
+          sha256 = "0j785xb72nk04x6jb9x5pdwp3dkalqmy208mvj4ss4fm559qfp3i";
+          name = "inherit-local";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/inherit-local";
+          license = lib.licenses.free;
+        };
+      }) {};
     init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "init-loader";
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index d2e3d2b866f9..62fb9407ee53 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -686,23 +686,6 @@ let
     };
   };
 
-  f = melpaBuild rec {
-    pname = "f";
-    version = "20151113";
-    src = fetchFromGitHub {
-      owner = "rejeep";
-      repo = "f.el";
-      rev = "e0259ee060ff9a3f12204adcc8630869080acd68";
-      sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
-    };
-    fileSpecs = [ "f.el" ];
-    packageRequires = [ dash s ];
-    meta = {
-      description = "Emacs library for working with files and directories";
-      license = gpl3Plus;
-    };
-  };
-
   find-file-in-project = melpaBuild rec {
     pname = "find-file-in-project";
     version = "3.5";
-- 
cgit 1.4.1


From 16769a6b4a013862f4979d6ef7eec8503aa14289 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Sep 2016 17:36:59 +0200
Subject: purePackages.glpk: fix build

Add gmp.dev to the include path to help glpk find gmp.h.

https://github.com/NixOS/nixpkgs/issues/18209
---
 pkgs/development/pure-modules/glpk/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index af13e8566324..452cf51e6347 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   glpkWithExtras = lib.overrideDerivation glpk (attrs: {
     propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ];
 
+    CPPFLAGS = "-I${gmp.dev}/include";
+
     preConfigure = ''
       substituteInPlace configure \
         --replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql
-- 
cgit 1.4.1


From f6c2afc42399c5f132d66121c65f5107a972b98e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 10 Sep 2016 18:58:20 +0200
Subject: julia: mark as broken for i686

---
 pkgs/development/compilers/julia/git.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 73c2cc0b30aa..09b79c59e7d2 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -174,5 +174,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    broken = stdenv.isi686;
   };
 }
-- 
cgit 1.4.1


From 3c42ff35ce9081c0890b5a2c86a080d9d43e815b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 10 Sep 2016 18:58:29 +0200
Subject: julia-git: mark as broken for i686

---
 pkgs/development/compilers/julia/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 4dfad0fae869..9d0b506efeea 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -161,5 +161,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    broken = stdenv.isi686;
   };
 }
-- 
cgit 1.4.1


From 505cee5c77e21b9e307d225c51fe4034dc80fe84 Mon Sep 17 00:00:00 2001
From: Edward Tjörnhammar <ed@cflags.cc>
Date: Sat, 10 Sep 2016 19:37:36 +0200
Subject: idea.idea-{community,ultimate}: 2016.2.3 -> 2016.2.4

---
 pkgs/applications/editors/idea/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 9f10c6f7f67a..c48e8af71456 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -156,12 +156,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2016.2.3";
+    version = "2016.2.4";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "014fddfxzc8nwhp1nz8mb9p7zwk73azvlgmzy2jd9ypfwi3dwgrs";
+      sha256 = "0hk7z402qvkaa6hkhh4wsqxki2bnai5qkd2r0ngvy8kd71svrldz";
     };
     wmClass = "jetbrains-idea-ce";
   };
@@ -192,12 +192,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2016.2.3";
+    version = "2016.2.4";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "1y8y3kav4icpsb85p5csag6f16jqg4gnvagsl5k1c793ccbl63yk";
+      sha256 = "165nchdnbyp85r2w0riv87j77lb7r492dkwrvm8q7qjnlfgznh7r";
     };
     wmClass = "jetbrains-idea";
   };
-- 
cgit 1.4.1


From 443204aa705da1b087c2eb9c784ff36899286360 Mon Sep 17 00:00:00 2001
From: Edward Tjörnhammar <ed@cflags.cc>
Date: Sat, 10 Sep 2016 19:38:28 +0200
Subject: idea.idea14-ultimate: use base32 hash

---
 pkgs/applications/editors/idea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index c48e8af71456..40972f50fe7c 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -173,7 +173,7 @@ in
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "a2259249f6e7bf14ba17b0af90a18d24d9b4670af60d24f0bb51af2f62500fc2";
+      sha256 = "1hhga1i2zbsipgq283gn19kv9n94inhr1bxh2yx19gz7yr4r49d2";
     };
     wmClass = "jetbrains-idea";
   };
-- 
cgit 1.4.1


From d8af0db284074253ccaf38113f50bc7262eda728 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Sep 2016 20:52:21 +0200
Subject: haskell-yi: remove obsolete "broken" marker

Fixes https://github.com/NixOS/nixpkgs/issues/18188.
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7000f2b3bf0f..bb799b059d37 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -948,14 +948,6 @@ self: super: {
   # tinc is a new build driver a la Stack that's not yet available from Hackage.
   tinc = self.callPackage ../tools/haskell/tinc {};
 
-  # https://github.com/NixOS/nixpkgs/issues/14967
-  yi = markBroken super.yi;
-  yi-fuzzy-open = markBroken super.yi-fuzzy-open;
-  yi-monokai = markBroken super.yi-monokai;
-  yi-snippet = markBroken super.yi-snippet;
-  yi-solarized = markBroken super.yi-solarized;
-  yi-spolsky = markBroken super.yi-spolsky;
-
   # gtk2hs-buildtools must have Cabal 1.24
   gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_0_0; };
 
-- 
cgit 1.4.1


From 7619f88eb850b4e4b2fc551665cef53839041d43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Sep 2016 20:53:28 +0200
Subject: haskell-gtk2hs-buildtools: this override does not belong into common

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bb799b059d37..d174ab28540e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -948,9 +948,6 @@ self: super: {
   # tinc is a new build driver a la Stack that's not yet available from Hackage.
   tinc = self.callPackage ../tools/haskell/tinc {};
 
-  # gtk2hs-buildtools must have Cabal 1.24
-  gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_0_0; };
-
   # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
   cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
   pango = (addBuildTool super.pango self.gtk2hs-buildtools).overrideDerivation (drv: {
-- 
cgit 1.4.1


From 04e4c495bbe2e900e4aec68f93b080f8497d18f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Sep 2016 20:59:45 +0200
Subject: haskell-configuration-common: cosmetic

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d174ab28540e..e3609c9d0bc6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -967,7 +967,6 @@ self: super: {
     sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29";
   });
 
-
   # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for
   # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config
   # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH.
@@ -977,7 +976,8 @@ self: super: {
   # us when we patch the cabal file (Link options will be recored in the ghc package registry).
   GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
 
-  # remove if a version > 0.1.0.1 ever gets released
+  # https://github.com/Philonous/hs-stun/pull/1
+  # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {
     postPatch = (drv.postPatch or "") + ''
       substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" ""
-- 
cgit 1.4.1


From 86557f9ffd6600bbac0cbccae02af6e9e0be207c Mon Sep 17 00:00:00 2001
From: Kirill Boltaev <aske@fmap.me>
Date: Sat, 10 Sep 2016 23:56:49 +0400
Subject: mpv: 0.19.0 -> 0.20.0 (#18493)

Enable vaapiSupport by default.
---
 pkgs/applications/video/mpv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 507e99665e01..ac4718d9eb2b 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -29,9 +29,9 @@
 , cacaSupport        ? true,  libcaca       ? null
 , libpngSupport      ? true,  libpng        ? null
 , youtubeSupport     ? true,  youtube-dl    ? null
+, vaapiSupport       ? true,  libva         ? null
 , vapoursynthSupport ? false, vapoursynth   ? null
 , jackaudioSupport   ? false, libjack2      ? null
-, vaapiSupport       ? false, libva         ? null
 
 # scripts you want to be loaded by default
 , scripts ? []
@@ -75,13 +75,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "14rbglrcplhkf16ik4fbcv7k27lz6h4glfayr12ylh98srmsscqa";
+    sha256 = "0zp852b505lr2gllqylg2xrc8sgw9b1xjn1c7px36hzddny15c16";
   };
 
   patchPhase = ''
-- 
cgit 1.4.1


From 51932e3d6962d4525cdc4f13e400d0c1b74a520e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Sep 2016 22:00:45 +0200
Subject: idris: clean up overrides

Closes https://github.com/NixOS/nixpkgs/pull/18309.
---
 pkgs/development/haskell-modules/configuration-common.nix   | 13 ++++++++++---
 .../haskell-modules/configuration-ghc-7.10.x.nix            |  9 ---------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e3609c9d0bc6..4a41836a5cf9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -867,9 +867,6 @@ self: super: {
   # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
   hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
 
-  # Can't find libHSidris-*.so during build.
-  idris = disableSharedExecutables super.idris;
-
   # https://github.com/fpco/stackage/issues/838
   cryptonite = dontCheck super.cryptonite;
 
@@ -987,4 +984,14 @@ self: super: {
   # https://bitbucket.org/ssaasen/spy/pull-requests/3/fsnotify-dropped-system-filepath
   spy = appendPatch super.spy ./patches/spy.patch;
 
+  idris = overrideCabal super.idris (drv: {
+    # "idris" binary cannot find Idris library otherwise while building. After
+    # installing it's completely fine though. This seems like a bug in Idris
+    # that's related to builds with shared libraries enabled. It would be great
+    # if someone who knows a thing or two about Idris could look into this.
+    preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
+    # https://github.com/idris-lang/Idris-dev/issues/2499
+    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+  });
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 7c5c9cdf3e3b..3ffce7a52ecc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -45,15 +45,6 @@ self: super: {
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; };
 
-  idris = overrideCabal super.idris (drv: {
-    # "idris" binary cannot find Idris library otherwise while building.
-    # After installing it's completely fine though. Seems like Nix-specific
-    # issue so not reported.
-    preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
-    # https://github.com/idris-lang/Idris-dev/issues/2499
-    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
-  });
-
   Extra = appendPatch super.Extra (pkgs.fetchpatch {
     url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
     sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
-- 
cgit 1.4.1


From e4b146b0417762c461c7f90f587dc82e8524f796 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Wed, 7 Sep 2016 16:40:53 -0400
Subject: haskell-hasktags: don't install the "test" binary

Closes https://github.com/NixOS/nixpkgs/pull/18403.
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4a41836a5cf9..1b02e464c3ba 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -994,4 +994,9 @@ self: super: {
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
   });
 
+  # https://github.com/MarcWeber/hasktags/issues/32
+  hasktags = overrideCabal super.hasktags (drv: {
+    postInstall = "rm $out/bin/test";
+  });
+
 }
-- 
cgit 1.4.1


From 54ff1184779419c91cb57d7a3a234a069fcdc592 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 10 Sep 2016 16:57:11 -0400
Subject: cryptol: Make Z3 available for REPL users

The Cryptol REPL has a hard dependency on Z3, but the rest of the
library uses SBV to support multiple solvers. Ensure that Z3 is
available for `pkgs.cryptol`, which is likely to be installed via
nix-env for REPL usage, but do not change pkgs.haskellPackages.cryptol,
which is likely to be used as a dependency (in Nix expressions).
---
 pkgs/top-level/all-packages.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33b1523df087..9262c8c144a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4443,7 +4443,15 @@ in
     coq = coq_8_5;
   });
 
-  cryptol = haskellPackages.cryptol;
+  # Users installing via `nix-env` will likely be using the REPL,
+  # which has a hard dependency on Z3, so make sure it is available.
+  cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: {
+    buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ];
+    installPhase = (oldAttrs.installPhase or "") + ''
+      wrapProgram $out/bin/cryptol \
+        --prefix 'PATH' ':' "${lib.getBin z3}/bin"
+    '';
+  });
 
   devpi-client = callPackage ../development/tools/devpi-client {};
 
-- 
cgit 1.4.1


From ffddcc8807df28c4a7232e4bf1e53b210e1b0276 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Sep 2016 00:21:16 +0300
Subject: vlc_npapi: Fix hash

---
 pkgs/applications/video/vlc/plugin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix
index 3a3e9162999a..bba4cdb6e363 100644
--- a/pkgs/applications/video/vlc/plugin.nix
+++ b/pkgs/applications/video/vlc/plugin.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://code.videolan.org/videolan/npapi-vlc.git";
     rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20";
-    sha256 = "18fbiy4r8rlw4fsgcxgzhi6qi9r48d0rmnp8hs994w2p94fa8kwd";
+    sha256 = "0k4s0657kv1mx1md8vj87scs0hz59xy7syqdsxb48w3w8gnfljs0";
   };
 
   preConfigure = "sh autogen.sh";
-- 
cgit 1.4.1


From 628c86c51a1321e68ec724d3feeb12aac34d3e32 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Sep 2016 01:13:49 +0300
Subject: release-lib: Remove unused allowTexliveBuilds option

This is dead code since the old monolithic TeXLive was dropped in
da421bc75f98c1b19f214a3b6b7cda07dc4c088b.
---
 pkgs/top-level/release-lib.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index b352ec0fe648..34788736edd4 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,6 +1,5 @@
 { supportedSystems
 , packageSet ? (import ../..)
-, allowTexliveBuilds ? false
 , scrubJobs ? true
 }:
 
@@ -11,7 +10,6 @@ rec {
   # Ensure that we don't build packages marked as unfree.
   allPackages = args: packageSet (args // {
     config.allowUnfree = false;
-    config.allowTexliveBuilds = allowTexliveBuilds;
     config.inHydra = true;
   });
 
-- 
cgit 1.4.1


From a49cb9dcbee0fe82a5e04ff4d90c376761fd9f18 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 11 Sep 2016 10:11:44 +0200
Subject: llvmPackages: generalize "3.9.0" string occurrences

Discussed:
https://github.com/NixOS/nixpkgs/commit/15af9082eb#commitcomment-18903919
---
 pkgs/development/compilers/llvm/3.9/clang/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.9/default.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index c6605dd656ff..e75da0e9717e 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -34,7 +34,7 @@ let
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
       ln -sv ${llvm}/lib/LLVMgold.so $out/lib
-      ln -sv ${llvm}/lib/clang/3.9.0/lib $out/lib/clang/3.9.0/
+      ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
     '';
 
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 7b9dbd93b2b7..a39f013d1a9a 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -6,7 +6,7 @@ let
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
-    url = "http://llvm.org/releases/3.9.0/${name}-${ver}.src.tar.xz";
+    url = "http://llvm.org/releases/${version}/${name}-${ver}.src.tar.xz";
     inherit sha256;
   };
 
-- 
cgit 1.4.1