diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-10 15:51:20 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-10 15:51:20 +0200 |
commit | f8701caafc26f2df17ab44fd4a2511c1dc11f9bf (patch) | |
tree | a63c326409d7795cbb5dd310eb0b882b86724449 /pkgs/os-specific | |
parent | 99afb5d4c73265793680360d67bc3b16b0062610 (diff) | |
parent | 2698bb461fe36069a0bcfeec52d7c99eb476b134 (diff) | |
download | nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.gz nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.bz2 nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.lz nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.xz nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.zst nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.zip |
Merge master into staging
Diffstat (limited to 'pkgs/os-specific')
19 files changed, 77 insertions, 37 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix index a866c9414d52..2d5520b9bf9c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix @@ -1,7 +1,8 @@ -{ appleDerivation, xcbuild, IOKit }: +{ appleDerivation, xcbuildHook, IOKit }: appleDerivation { - buildInputs = [ xcbuild IOKit ]; + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ IOKit ]; xcbuildFlags = "-target caffeinate"; installPhase = '' install -D Products/Deployment/caffeinate $out/bin/caffeinate diff --git a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix index 1cb85b1e9884..6e9003350780 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix @@ -1,8 +1,9 @@ -{ stdenv, appleDerivation, xcbuild, gnumake, Security +{ stdenv, appleDerivation, xcbuildHook, gnumake, Security , libsecurity_utilities, libsecurity_cdsa_utilities }: appleDerivation { - buildInputs = [ xcbuild libsecurity_utilities libsecurity_cdsa_utilities ]; + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities ]; DSTROOT = "$out"; 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 dcfb4aefe1f5..fda7cd85e4f7 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 @@ -2,7 +2,6 @@ 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: @@ -49,7 +48,8 @@ appleDerivation { # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; - buildInputs = [ xcbuild ncurses libutil-new ]; + nativeBuildInputs = [ xcbuild ]; + buildInputs = [ ncurses libutil-new ]; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index b52ec3306dc4..596ca25d70a4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild }: +{ stdenv, appleDerivation, fetchurl, xcbuildHook }: appleDerivation rec { - buildInputs = [ xcbuild ]; + nativeBuildInputs = [ xcbuildHook ]; # These PBXcp calls should be patched in xcbuild to allow them to # automatically be prefixed. diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index 1f35e3008b3b..a572d46ceab5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, appleDerivation, xcbuild }: +{ stdenv, fetchurl, appleDerivation, xcbuildHook }: appleDerivation rec { - buildInputs = [ xcbuild ]; + nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' substituteInPlace rpcgen/rpc_main.c \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index aba2472af602..b947267ab14d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,7 +1,9 @@ -{ stdenv, appleDerivation, xcbuild, lib, hostPlatform, Libc, xnu, libutil-new }: +{ stdenv, appleDerivation, xcbuildHook +, lib, hostPlatform, Libc, xnu, libutil-new }: appleDerivation { - buildInputs = [ xcbuild libutil-new ]; + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ libutil-new ]; NIX_CFLAGS_COMPILE = "-I."; NIX_LDFLAGS = "-lutil"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix index dd193f2c07dc..f8636403ed54 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix @@ -1,7 +1,9 @@ -{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling, stdenv }: +{ appleDerivation, xcbuildHook, CoreSymbolication +, xnu, bison, flex, darling, stdenv }: appleDerivation { - buildInputs = [ xcbuild CoreSymbolication xnu bison flex darling ]; + nativeBuildInputs = [ xcbuildHook flex bison ]; + buildInputs = [ CoreSymbolication darling ]; NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers"; NIX_LDFLAGS = "-L./Products/Release"; xcbuildFlags = "-target dtrace"; 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 47a587966b44..a19e0736336d 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,8 @@ -{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma, ncurses, libutil-new }: +{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil-new }: appleDerivation rec { - buildInputs = [ xcbuild zlib bzip2 lzma ncurses libutil-new ]; + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ zlib bzip2 lzma ncurses libutil-new ]; # some commands not working: # mtree: _simple.h not found diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix index 7facea2b8936..0115ce537e27 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -1,8 +1,8 @@ -{ stdenv, appleDerivation, xcbuild }: +{ stdenv, appleDerivation, xcbuildHook }: # TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap appleDerivation { - buildInputs = [ xcbuild ]; + nativeBuildInputs = [ xcbuildHook ]; prePatch = '' substituteInPlace tzlink.c \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 23777c941576..dccc83a70bff 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,7 +1,9 @@ -{ stdenv, appleDerivation, xcbuild, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: +{ stdenv, appleDerivation, xcbuildHook +, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation rec { - buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ]; + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ]; NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix index 1a0208ef3a08..d5bc3483c389 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix @@ -1,9 +1,10 @@ -{ appleDerivation, xcbuild, Security +{ appleDerivation, xcbuildHook, Security , libsecurity_codesigning, libsecurity_utilities, libsecurity_cdsa_utilities , xnu, osx_private_sdk, pcsclite}: appleDerivation { - buildInputs = [ xcbuild Security libsecurity_utilities + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ Security libsecurity_utilities libsecurity_cdsa_utilities libsecurity_codesigning pcsclite ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 8ce916feb38a..bec05ef85757 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appleDerivation, xcbuild }: +{ stdenv, appleDerivation, xcbuildHook }: appleDerivation rec { - buildInputs = [ xcbuild ]; + nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' # NOTE: these hashes must be recalculated for each version change diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 196276b0b273..08df235ed8c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,7 +1,8 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, bzip2, zlib, lzma }: +{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { - buildInputs = [ xcbuild ncurses bzip2 zlib lzma ]; + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ ncurses bzip2 zlib lzma ]; # patches to use ncursees # disables md5 diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix index 4ddec2a30c90..3513cb2e172c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix @@ -1,7 +1,8 @@ -{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new, lib}: +{xcbuildHook, appleDerivation, apple_sdk, ncurses, libutil-new, lib}: appleDerivation { - buildInputs = [ xcbuild apple_sdk.frameworks.IOKit ncurses libutil-new ]; + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ apple_sdk.frameworks.IOKit ncurses libutil-new ]; NIX_LDFLAGS = "-lutil"; installPhase = '' install -D Products/Release/libtop.a $out/lib/libtop.a diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix index b3790b8c87c3..510c7154f2bc 100644 --- a/pkgs/os-specific/darwin/insert_dylib/default.nix +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xcbuild }: +{ stdenv, fetchFromGitHub, xcbuildHook }: stdenv.mkDerivation { name = "insert_dylib-2016.08.28"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; }; - buildInputs = [ xcbuild ]; + nativeBuildInputs = [ xcbuildHook ]; installPhase = '' prog=$(find . -type f -name insert_dylib) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 4a64154b585d..e1da0a449c5b 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, devicemapper, json_c, openssl, libuuid, pkgconfig, popt +{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt , enablePython ? false, python2 ? null }: assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-2.0.2"; + name = "cryptsetup-2.0.3"; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; - sha256 = "15wyjfgcqjf0wy5gxnmjj8aah33csv5v6n1hv9c8sxdzygbhb0ag"; + sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d"; }; + patches = [ + # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated. + (fetchpatch { + url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch"; + sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m"; + }) + ]; + NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 100ac73d8812..548c66e87e63 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -230,7 +230,7 @@ let }; usb = { - USB_DEBUG = option no; + USB_DEBUG = option (whenOlder "4.18" no); USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling }; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4af7647a1a5c..cc82e146abd1 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc3"; - modDirVersion = "4.18.0-rc3"; + version = "4.18-rc4"; + modDirVersion = "4.18.0-rc4"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1kr9bhvcdp792micjmhl2hwhs5iid1srb4ia8hm4cpy1lnzdgrih"; + sha256 = "1nhl82ygz7sm6njnb9qg9k4jp0gr1cv2wxpayrpc4ab21xb6b5mj"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 69495e5fc439..e0826aaa9d48 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -59,4 +59,24 @@ rec { }; }; + # https://github.com/NixOS/nixpkgs/issues/42755 + xen-netfront_fix_mismatched_rtnl_unlock = rec { + name = "xen-netfront_fix_mismatched_rtnl_unlock"; + patch = fetchpatch { + name = name + ".patch"; + url = https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch; + sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8"; + }; + }; + + # https://github.com/NixOS/nixpkgs/issues/42755 + xen-netfront_update_features_after_registering_netdev = rec { + name = "xen-netfront_update_features_after_registering_netdev"; + patch = fetchpatch { + name = name + ".patch"; + url = https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch; + sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; + }; + }; + } |