diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-14 10:36:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-14 10:36:13 +0200 |
commit | 6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9 (patch) | |
tree | 5345763c864b43c0a746fa7c1b75a5a4af86fda4 /pkgs/os-specific | |
parent | 2a4f47dd1a32daab2b6fdd5e1db249fa36918e43 (diff) | |
parent | 2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc (diff) | |
download | nixlib-6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9.tar nixlib-6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9.tar.gz nixlib-6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9.tar.bz2 nixlib-6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9.tar.lz nixlib-6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9.tar.xz nixlib-6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9.tar.zst nixlib-6525c22ef1c23ec1ccd64af46a8bb7ae449aa0c9.zip |
Merge branch 'master' into staging
Hydra: ?compare=1401528
Diffstat (limited to 'pkgs/os-specific')
12 files changed, 71 insertions, 30 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 254b4a231c22..a3d4099399b3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,6 +1,8 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: +{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }: appleDerivation { + # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 + dontUseXcbuild = true; # pkill requires special private headers that are unavailable in # NixPkgs. These ones are needed: @@ -14,7 +16,19 @@ appleDerivation { patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ - --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \ + --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib' + ''; + + buildPhase = '' + targets=$(xcodebuild -list \ + | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \ + | tail -n +2 | sed 's/^[ \t]*//' \ + | grep -v -e Desktop -e Embedded -e mklocale -e colldef) + + for i in $targets; do + xcodebuild -target $i + done ''; # temporary install phase until xcodebuild has "install" support @@ -35,10 +49,7 @@ appleDerivation { # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; - buildInputs = [ xcbuild libcxx ]; - - # temporary fix for iostream issue - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + buildInputs = [ xcbuild ncurses libutil-new ]; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index a8509d1f0095..0e8389948870 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -221,6 +221,7 @@ let libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {}; libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; + libutil-new = applePackage "libutil/new.nix" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; libunwind = applePackage "libunwind" "osx-10.11.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {}; objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 2618b4974f9f..8346ca7a9a76 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma }: +{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma, ncurses, libutil-new }: appleDerivation rec { - buildInputs = [ xcbuild zlib bzip2 lzma ]; + buildInputs = [ xcbuild zlib bzip2 lzma ncurses libutil-new ]; # some commands not working: # mtree: _simple.h not found @@ -11,14 +11,15 @@ appleDerivation rec { substituteInPlace file_cmds.xcodeproj/project.pbxproj \ --replace "FC8A8CAA14B655FD001B97AD /* PBXTargetDependency */," "" \ --replace "FC8A8C9C14B655FD001B97AD /* PBXTargetDependency */," "" \ - --replace "productName = file_cmds;" "" + --replace "productName = file_cmds;" "" \ + --replace '/usr/lib/libcurses.dylib' 'libncurses.dylib' sed -i -re "s/name = ([a-zA-Z]+);/name = \1; productName = \1;/" file_cmds.xcodeproj/project.pbxproj ''; # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install file_cmds-*/Build/Products/Release/* $out/bin/ + install file_cmds-*/Build/Products/Release/* $out/bin for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix new file mode 100644 index 000000000000..860a74f61f7f --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -0,0 +1,33 @@ +{ stdenv, appleDerivation, xcbuild }: + +# TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap +appleDerivation { + buildInputs = [ xcbuild ]; + + dontUseXcbuild = true; + + prePatch = '' + substituteInPlace tzlink.c \ + --replace '#include <xpc/xpc.h>' "" + ''; + + buildPhase = '' + xcodebuild -target util + ''; + + installPhase = '' + mkdir -p $out/lib $out/include + + cp libutil-*/Build/Products/Release/*.dylib $out/lib + cp libutil-*/Build/Products/Release/*.h $out/include + + # TODO: figure out how to get this to be right the first time around + install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 562a46d22109..b8b08430de86 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170612"; + version = "20171014"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "14x22d00zby6wsjaccyh7n8jq1mqzwpx49s85mhmaahbrfd5jwnw"; + sha256 = "15mqngwv7x2xpdsaiga33lb0s9hcrhnambcv9fp6jvgkf6604cdr"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 75c06390f755..3744c28e204f 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -97,11 +97,6 @@ ${optionalString (versionAtLeast version "4.11") '' GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin ''} -${optionalString (versionAtLeast version "4.13") '' - GCC_PLUGIN_RANDSTRUCT y # A port of the PaX randstruct plugin - GCC_PLUGIN_RANDSTRUCT_PERFORMANCE y -''} - # Disable various dangerous settings ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory PROC_KCORE n # Exposes kernel text image layout diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 043a39ec95a4..233c01309832 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.5"; + version = "4.13.6"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59"; + sha256 = "0l30vlxmp49mm743cydkvr3wfw4nmh0q71avasnksd8xmv71km27"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e9b9fb54bfc8..b820b6a917b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.53"; + version = "4.9.56"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "095k7kpzic0c2vhwnfm5vcp9j60lyf4qyx2pj9vkp68bpcrmm49j"; + sha256 = "1jnkf0ir42xkandx1lnqrxmskzwl6j46aqmzrxilddx9pkdjplhi"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index d141d7f4211c..f02a65b90a1a 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.5"; + version = "4.13.6"; revision = "a"; - sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv"; + sha256 = "1xmnnwwlnc7s5zf08rzb4zqd52iysz81y9iqdn7rdqr3c8j7pdv9"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index fb51760ec16a..304455003763 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc3"; - modDirVersion = "4.14.0-rc3"; + version = "4.14-rc4"; + modDirVersion = "4.14.0-rc4"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "049x4fpcj8d6577lhzrns7w36mj21pfr4ijw01r0l6n3w86z28b7"; + sha256 = "1n9jni7sdawhjnlpl1g3rw89ggfi8d6s088wv1h21cnmsav911ik"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index b1b230b8ba7c..6155f9ed4bf4 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tiptop-${version}"; - version = "2.3"; + version = "2.3.1"; src = fetchurl { url = "${meta.homepage}/releases/${name}.tar.gz"; - sha256 = "1jhqmcgx664ygayw471cg05bxc4ikxn35ccyiswymjhanicfj1rz"; + sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; patches = [(fetchpatch { diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c8500d89d04a..3c35bb372a2f 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 "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171001"; + version = "0.0.20171005"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "ecff9a184685b7dd2d81576eba5bd96bb59031c9e9b5eeee05d6dc298f30998e"; + sha256 = "026n0a7fln5w8s7lsxdn4fgzqxdwhqnnnfhczn36j3sipdy3nal3"; }; meta = with stdenv.lib; { |