Merge remote-tracking branch 'upstream/master' into HEAD

26 files changed, 148 insertions, 48 deletions

diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
index d3c4bf19a65b..eda895d726a0 100644
--- a/pkgs/development/compilers/asn1c/default.nix
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "asn1c-${version}";
-  version = "0.9.27";
+  version = "0.9.28";
 
   src = fetchurl {
     url = "http://lionet.info/soft/asn1c-${version}.tar.gz";
-    sha256 = "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2";
+    sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0";
   };
 
   outputs = [ "out" "doc" "man" ];
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3f4274441baa..b54a5b72235d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -229,6 +229,7 @@ self: super: {
   pocket-dns = dontCheck super.pocket-dns;
   postgresql-simple = dontCheck super.postgresql-simple;
   postgrest = dontCheck super.postgrest;
+  postgrest-ws = dontCheck super.postgrest-ws;
   snowball = dontCheck super.snowball;
   sophia = dontCheck super.sophia;
   test-sandbox = dontCheck super.test-sandbox;
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix
new file mode 100644
index 000000000000..882b3258b7de
--- /dev/null
+++ b/pkgs/development/libraries/libscrypt/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "libscrypt-${version}";
+  version = "1.21";
+
+  src = fetchFromGitHub {
+    owner = "technion";
+    repo = "libscrypt";
+    rev = "v${version}";
+    sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng";
+  };
+
+  buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
+
+  installFlags = [ "PREFIX=$(out)" ];
+  installTargets = if stdenv.isDarwin then "install-osx" else "install";
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Shared library that implements scrypt() functionality";
+    homepage = "https://lolware.net/2014/04/29/libscrypt.html";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ davidak ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index d92674e59ef8..0d0563eb5ddf 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "libtoxcore-${version}";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner  = "TokTok";
     repo   = "c-toxcore";
     rev    = "v${version}";
-    sha256 = "11lqq825id174xdjxm0cy5dbyvmdy841hjy9q3l51yiya9f82d5b";
+    sha256 = "08vdq3j60wn62lj2z9f3f47hibns93rvaqx5xc5bm3nglk70q7kk";
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 4bd89df1581a..96dbc094b55c 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   name = "mapnik-${version}";
-  version = "3.0.12";
+  version = "3.0.13";
 
   src = fetchzip {
     # this one contains all git submodules and is cheaper than fetchgit
     url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
-    sha256 = "02w360fxk0pfkk0zbwc134jq7rkkib58scs5k67j8np6fx6gag6i";
+    sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065";
   };
 
   # a distinct dev output makes python-mapnik fail
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index c17c224415db..87e5e44b7dae 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
     sha256 = "051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3";
   };
 
-  buildInputs = [ cmake ]
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = []
     ++ optional alsaSupport alsaLib
     ++ optional pulseSupport libpulseaudio
     ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index e461ce858cfd..145ebdec8e5d 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, libuuid, zlib }:
+{ stdenv, fetchurl, autoreconfHook
+, libuuid, zlib }:
 
 let
   generic = version: sha256: stdenv.mkDerivation rec {
     name = "xapian-${version}";
+    passthru = { inherit version; };
 
     src = fetchurl {
       url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
@@ -12,17 +14,20 @@ let
     outputs = [ "out" "doc" ];
 
     buildInputs = [ libuuid zlib ];
+    nativeBuildInputs = [ autoreconfHook ];
 
-    meta = {
+    doCheck = true;
+
+    meta = with stdenv.lib; {
       description = "Search engine library";
       homepage = http://xapian.org/;
-      license = stdenv.lib.licenses.gpl2Plus;
-      maintainers = [ stdenv.lib.maintainers.chaoflow ];
-      platforms = stdenv.lib.platforms.unix;
+      license = licenses.gpl2Plus;
+      maintainers = with maintainers; [ chaoflow ];
+      platforms = platforms.unix;
     };
   };
 in {
-  # used by xapian-ruby
+  # xapian-ruby needs 1.2.22 as of 2017-05-06
   xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
-  xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
+  xapian_1_4_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6";
 }
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 7c64c2e90d4e..2923bfc1fc68 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -2,14 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "xapian-omega-${version}";
-  version = (builtins.parseDrvName xapian.name).version;
+  inherit (xapian) version;
 
   src = fetchurl {
     url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
-    sha256 = "07s341m1csk4v7mc44mqrzc1nxpnmdkji9k1cirbx6q0nlshdz0h";
+    sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l";
   };
 
-  buildInputs = [ pkgconfig xapian perl pcre zlib libmagic ];
+  buildInputs = [ xapian perl pcre zlib libmagic ];
+  nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "Indexer and CGI search front-end built on Xapian library";
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index 59f66f36d876..57431c2c2c25 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -6,7 +6,7 @@
 , sh
 , coverage
 , docopt
-, requests2
+, requests
 , git
 }:
 
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     coverage
     docopt
-    requests2
+    requests
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
index 12c9aac4c23d..84c7b5ff38b5 100644
--- a/pkgs/development/python-modules/docker.nix
+++ b/pkgs/development/python-modules/docker.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchurl
-, six, requests2, websocket_client
+, six, requests, websocket_client
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     six
-    requests2
+    requests
     websocket_client
     ipaddress
     backports_ssl_match_hostname
diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
index c21b69e1643e..9af95f72598f 100644
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonApplication, fetchurl, pythonOlder
 , mock, pytest, nose
 , pyyaml, backports_ssl_match_hostname, colorama, docopt
-, dockerpty, docker, ipaddress, jsonschema, requests2
+, dockerpty, docker, ipaddress, jsonschema, requests
 , six, texttable, websocket_client, cached-property
 , enum34, functools32
 }:
@@ -19,7 +19,7 @@ buildPythonApplication rec {
   buildInputs = [ mock pytest nose ];
   propagatedBuildInputs = [
     pyyaml backports_ssl_match_hostname colorama dockerpty docker
-    ipaddress jsonschema requests2 six texttable websocket_client
+    ipaddress jsonschema requests six texttable websocket_client
     docopt cached-property
   ] ++
     stdenv.lib.optional (pythonOlder "3.4") enum34 ++
diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index 011c86652902..b25039cc71e8 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -17,7 +17,7 @@
 , decorator
 , pathlib2
 , pickleshare
-, requests2
+, requests
 , simplegeneric
 , traitlets
 , prompt_toolkit
@@ -45,7 +45,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
-    simplegeneric traitlets requests2 pathlib2 pexpect
+    simplegeneric traitlets requests pathlib2 pexpect
   ] ++ lib.optionals stdenv.isDarwin [ appnope ];
 
   LC_ALL="en_US.UTF-8";
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
new file mode 100644
index 000000000000..132f5edf518d
--- /dev/null
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, stdenv
+, lib
+, pythonOlder
+, requests
+, enum34
+}:
+
+buildPythonPackage rec {
+  name    = "${pname}-${version}";
+  pname   = "libsoundtouch";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner  = "CharlesBlonde";
+    repo   = "libsoundtouch";
+    rev    = "7c8f943298bcae5f0c25ad7be7469de51373cdbd";
+    sha256 = "1a9mdy09n4bjx6nang7wfn2nq87dg2s18px4yqsj53mn5kjf44n0";
+  };
+
+  postPatch = lib.optionalString (! (pythonOlder "3.4")) ''
+    substituteInPlace setup.py --replace "'enum34>=1.1.6'" ""
+  '';
+
+  propagatedBuildInputs = [ requests enum34 ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Bose Soundtouch Python library";
+    homepage    = https://github.com/CharlesBlonde/libsoundtouch;
+    license     = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/python-modules/ltc_scrypt/default.nix b/pkgs/development/python-modules/ltc_scrypt/default.nix
new file mode 100644
index 000000000000..273571c66e1f
--- /dev/null
+++ b/pkgs/development/python-modules/ltc_scrypt/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "ltc_scrypt";
+  version = "1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1h90hh3iw4i7zs7jgskdjlk8gi97b3v2zqsxdfwdvhrrnhpvv856";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Bindings for scrypt proof of work used by Litecoin";
+    homepage = https://pypi.python.org/pypi/ltc_scrypt;
+    maintainers = with maintainers; [ asymmetric ];
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 0fa94854640b..3a24c5566bf0 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -15,7 +15,7 @@
 , nbconvert
 , ipykernel
 , terminado
-, requests2
+, requests
 , pexpect
 }:
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   buildInputs = [nose glibcLocales]  ++ lib.optionals isPy27 [mock];
 
   propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core
-    jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect ];
+    jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ];
 
   checkPhase = ''
     nosetests -v
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 3c2e78ac1f1f..6e5627a58ca8 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -4,7 +4,7 @@
 , decorator
 , nbformat
 , pytz
-, requests2
+, requests
 , six
 }:
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     decorator
     nbformat
     pytz
-    requests2
+    requests
     six
   ];
 
diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix
index 0abf54f03fe1..87c0c3db264f 100644
--- a/pkgs/development/python-modules/pyrax.nix
+++ b/pkgs/development/python-modules/pyrax.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring,
+{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
   rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
 buildPythonPackage rec {
   name = "pyrax-1.9.8";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     '';
 
   disabled = isPy3k;
-  propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ];
+  propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ];
 
   LC_ALL = "en_US.UTF-8";
   buildInputs = [ pytest glibcLocales ];
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index a31c9ba35bbe..34a2bf7e31cb 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -6,7 +6,7 @@
 , decorator
 , httpbin
 , six
-, requests2
+, requests
 }:
 
 buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   '';
 
   buildInputs = [ pytest ];
-  propagatedBuildInputs = [ flask decorator httpbin six requests2 ];
+  propagatedBuildInputs = [ flask decorator httpbin six requests ];
 
   meta = {
     description = "Easily test your HTTP library against a local copy of httpbin.org";
diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient.nix
index 0eaed7e36fd9..144b61c9b9a5 100644
--- a/pkgs/development/python-modules/rackspace-novaclient.nix
+++ b/pkgs/development/python-modules/rackspace-novaclient.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchurl, isPy3k, requests2, novaclient, six, lib }:
+{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }:
 let
 os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
   name = "os_virtual_interfacesv2_python_novaclient_ext-0.20";
@@ -129,7 +129,7 @@ buildPythonPackage rec {
 
   disabled = isPy3k;
   propagatedBuildInputs = [
-    requests2
+    requests
     novaclient
     six
     # extensions
diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
index a353ebd39d9b..62ecf134b49e 100644
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchurl
-, oauthlib, requests2 }:
+, oauthlib, requests }:
 
 buildPythonPackage rec {
   version = "0.7.0";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   doCheck = false;        # Internet tests fail when building in chroot
-  propagatedBuildInputs = [ oauthlib requests2 ];
+  propagatedBuildInputs = [ oauthlib requests ];
 
   meta = with stdenv.lib; {
     description = "OAuthlib authentication support for Requests";
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 37f9e3324c7e..14a2ac9cb92d 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2,
+{ stdenv, fetchurl, buildPythonPackage, service-identity, requests,
   six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx,
   openssl, pyopenssl }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     service-identity
-    requests2
+    requests
     twisted
     incremental
     sphinx
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 850affb06108..94960e1b74da 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ futures requests2 six tqdm ];
+  propagatedBuildInputs = with pythonPackages; [ futures requests six tqdm ];
 
   checkPhase = ''
     python test_b2_command_line.py test
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 417e492f7d0b..69cc2db3ff28 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    requests2 fasteners pyyaml pyjwt colorama patch
+    requests fasteners pyyaml pyjwt colorama patch
     bottle pluginbase six distro pylint node-semver
   ];
 
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 483905f5f2e4..355dad4c03e2 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "coursier-${version}";
-  version = "1.0.0-RC1";
+  version = "1.0.0-RC2";
 
   src = fetchurl {
     url = "https://github.com/coursier/coursier/raw/v${version}/coursier";
-    sha256 = "0dxwhqp7m7nmal8wn4chlmyvhdh6v3ja0nfz9x952kacf2vpnqw3";
+    sha256 = "0w97s1dzfl3gyqa293k8n4hpsrqc10va1lc7jhb05208rsz1hf2m";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index f2db32c5eec8..fc2651b91574 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
 
 let
-  version = "1.6.2";
+  version = "1.6.6";
   name = "electron-${version}";
 
   meta = with stdenv.lib; {
@@ -17,7 +17,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-      sha256 = "1dhyr8zkisnhjzk2v2zi8zp0jqg0v3g095xa430af6i1rm0qhs13";
+      sha256 = "1k6y1wcsb2z9h8wdj5f1z1fprvc3bvsj4rfx58if7q74qiq3q102";
       name = "${name}.zip";
     };
 
@@ -45,7 +45,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "11jfh4xvdrpda5ni08kl6wcg67ww9viagszk8gi00z0rlczrsbkf";
+      sha256 = "1hp42iy32lymh9d5zp4vr51qjrr83wjxmbws0c16yw7zchq7fr64";
       name = "${name}.zip";
     };
 
diff --git a/pkgs/development/tools/haskell/intero-nix-shim/default.nix b/pkgs/development/tools/haskell/intero-nix-shim/default.nix
index 4e9e3381ab03..7e82518c9b6b 100644
--- a/pkgs/development/tools/haskell/intero-nix-shim/default.nix
+++ b/pkgs/development/tools/haskell/intero-nix-shim/default.nix
@@ -1,5 +1,6 @@
-{ mkDerivation, base, directory, filepath, optparse-applicative
-, posix-escape, split, stdenv, unix, fetchFromGitHub
+{ mkDerivation, base, cabal-install, directory, fetchFromGitHub
+, filepath, intero, optparse-applicative, posix-escape, split
+, stdenv, unix
 }:
 mkDerivation {
   pname = "intero-nix-shim";
@@ -16,6 +17,11 @@ mkDerivation {
     base directory filepath optparse-applicative posix-escape split
     unix
   ];
+  postInstall = ''
+    mkdir -p $out/libexec
+    ln -s ${cabal-install}/bin/cabal  $out/libexec
+    ln -s ${intero       }/bin/intero $out/libexec
+  '';
   homepage = "https://github.com/michalrus/intero-nix-shim";
   license = stdenv.lib.licenses.asl20;
 }