NixOS · Sep 5, 2018 · Sep 5, 2018
Showing with 13 additions and 11 deletions.

+9 −6 pkgs/development/haskell-modules/lib.nix

+2 −2 pkgs/development/haskell-modules/make-package-set.nix

+2 −3 pkgs/os-specific/linux/wireguard/default.nix
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
@@ -292,15 +292,18 @@ rec {
   overrideSrc = drv: { src, version ? drv.version }:
     overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
 
-  # Extract the haskell build inputs of a haskell package.
-  # This is useful to build environments for developing on that
-  # package.
-  getHaskellBuildInputs = p:
+  # Get all of the build inputs of a haskell package, divided by category.
+  getBuildInputs = p:
     (overrideCabal p (args: {
       passthru = (args.passthru or {}) // {
-        _getHaskellBuildInputs = (extractBuildInputs p.compiler args).haskellBuildInputs;
+        _getBuildInputs = extractBuildInputs p.compiler args;
       };
-    }))._getHaskellBuildInputs;
+    }))._getBuildInputs;
+
+  # Extract the haskell build inputs of a haskell package.
+  # This is useful to build environments for developing on that
+  # package.
+  getHaskellBuildInputs = p: (getBuildInputs p).haskellBuildInputs;
 
   # Under normal evaluation, simply return the original package. Under
   # nix-shell evaluation, return a nix-shell optimized environment.

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
@@ -38,7 +38,7 @@ let
   inherit (stdenv) buildPlatform hostPlatform;
 
   inherit (stdenv.lib) fix' extends makeOverridable;
-  inherit (haskellLib) overrideCabal getHaskellBuildInputs;
+  inherit (haskellLib) overrideCabal getBuildInputs;
 
   mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
     inherit stdenv;
@@ -228,7 +228,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     shellFor = { packages, withHoogle ? false, ... } @ args:
       let
         selected = packages self;
-        packageInputs = builtins.map getHaskellBuildInputs selected;
+        packageInputs = builtins.map getBuildInputs selected;
         haskellInputs =
           builtins.filter
             (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
@@ -5,12 +5,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 
 let
   name = "wireguard-${version}";
-
-  version = "0.0.20180519";
+  version = "0.0.20180904";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0qn4w4h19g3wyi67p4kcymcy5099rif9hk4anfdhfzizdh0b6il8";
+    sha256 = "1w9qzvrsivc3k18hl1fv513in4gi1m0my26hlb6vfzaak5rav3m3";
   };
 
   meta = with stdenv.lib; {