diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-08 12:14:07 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-08 12:14:07 +0100 |
| commit | 50a9d51a09e558bf017b4ac9bb9b602657ee10b2 (patch) | |
| tree | 4602bb02adf834b159e39717c5f6b31525eeda89 /pkgs/top-level/all-packages.nix | |
| parent | 2e6032ff75526ff6f0c2f743bb73ca6ebd4bb7f0 (diff) | |
| parent | 30d031b5d8d05422586043c3f105f4d9110e4f59 (diff) | |
| download | nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.gz nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.bz2 nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.lz nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.xz nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.tar.zst nixlib-50a9d51a09e558bf017b4ac9bb9b602657ee10b2.zip | |
Merge commit '30d031b5d8d05422586043c3f105f4d9110e4f59' into HEAD
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1d94b556b8e..2945974d8b1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1727,7 +1727,7 @@ with pkgs; curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; - http2Support = !stdenv.isDarwin; + http2Support = true; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; @@ -13208,7 +13208,7 @@ with pkgs; # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; - buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {}); keyutils = callPackage ../os-specific/linux/keyutils { }; |