diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-12-22 11:28:56 +0100 |
commit | 2e03ae274d36e695e4db63fb0a6b71346621b6af (patch) | |
tree | 84af1a7ec323e1ce2865661756da1cca2b6ef07b /pkgs/os-specific | |
parent | 41f55691a96ca4f37a87c8659884edf19b2c8446 (diff) | |
parent | 0c1382085b2969ce38359bcb28fc5dfe67cca7eb (diff) | |
download | nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.gz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.bz2 nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.lz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.xz nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.tar.zst nixlib-2e03ae274d36e695e4db63fb0a6b71346621b6af.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/default.nix | 26 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/multipath-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 4 |
6 files changed, 14 insertions, 29 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 7a85790c57e6..1148fe5c4a16 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,42 +1,29 @@ -{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }: +{ stdenv, fetchurl, xar, gzip, cpio, pkgs }: let - # TODO: make this available to other packages and generalize the unpacking a bit - # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d - unpbzx = fetchurl { - url = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py"; - sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc"; - }; - # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { - version = "10.11"; + version = "10.9"; name = "MacOS_SDK-${version}"; - # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.11-1.sucatalog, which we found by: - # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version - # 2. In the resulting file, search for a file called DevSDK ending in .pkg - # 3. ??? - # 4. Profit src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/61/58/031-85396/fsu2775ydsciy13wycm3zngxrjcp0eqsl2/DevSDK_OSX1011.pkg"; - sha256 = "182yh8li653pjrzgk7s2dvsqm7vwkk6ry8n31qqs8c0xr67yrqgl"; + url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg"; + sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; }; - buildInputs = [ xar xz cpio python ]; + buildInputs = [ xar gzip cpio ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; unpackPhase = '' xar -x -f $src - python ${unpbzx} Payload ''; installPhase = '' start="$(pwd)" mkdir -p $out cd $out - cat $start/Payload.*.xz | xz -d | cpio -idm + cat $start/Payload | gzip -d | cpio -idm mv usr/* . rmdir usr @@ -127,7 +114,6 @@ let popd >/dev/null } - linkFramework "${name}.framework" ''; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index cc99de258b23..3ecb35114220 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -52,7 +52,6 @@ with frameworks; with libs; { GSS = []; GameController = []; GameKit = [ Foundation ]; - Hypervisor = []; ICADevices = [ Carbon CF IOBluetooth ]; IMServicePlugIn = []; IOBluetoothUI = [ IOBluetooth ]; @@ -117,6 +116,4 @@ with frameworks; with libs; { OpenDirectory = []; Quartz = [ QuickLook QTKit ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; - - vmnet = []; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 72fbe15b02dd..95ca51a972e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.68"; + version = "3.12.69"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0k4kwxmm6vj840k4v6iyswsajaxsb5g9vrc7mzr4grflfbjrgh14"; + sha256 = "1pzghmj0j2shms4n3knryigy73qssskd6awbgk6mmyg42wypbcmm"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 4a18f2e498b9..727126de388d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.44"; + version = "3.18.45"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1cjdh9w2q164r53k06vv6nhxwjzm69nha5wndp8r1hjywjwcqqan"; + sha256 = "1qwvqrlzpf57zvh57dsdk4c4swgbasf2ab75vcn2py8l7jl6rxf0"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index f60ece0fceca..0e0178e8845b 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ' libmultipath/defaults.h sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \ kpartx/Makefile libmpathpersist/Makefile + sed -i -e "s,GZIP = .*, GZIP = gzip -9n -c," \ + Makefile.inc ''; nativeBuildInputs = [ gzip ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e1b17f8f9fcd..b164530938e6 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; let name = "wireguard-${version}"; - version = "0.0.20161209"; + version = "0.0.20161218"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "11n8dq8a8w0qj8xg5np9w02kmk14hn5hphv2h4bjw9hs8yxvkaya"; + sha256 = "d805035d3e99768e69d8cdeb8fb5250a59b994ce127fceb71a078582c30f5597"; }; meta = with stdenv.lib; { |