diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-24 10:44:50 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-24 10:44:50 +0100 |
commit | c1792242ef5ee4f9550c029231bf6e5956078b51 (patch) | |
tree | efa090a6bab24eb332c7141b12b23142a64e114e /pkgs/os-specific | |
parent | 28cdb6e841b9098517c2a7957454437387ca887d (diff) | |
parent | e41154d1abcbcd1b9a0f542e590c63a210ea4266 (diff) | |
download | nixlib-c1792242ef5ee4f9550c029231bf6e5956078b51.tar nixlib-c1792242ef5ee4f9550c029231bf6e5956078b51.tar.gz nixlib-c1792242ef5ee4f9550c029231bf6e5956078b51.tar.bz2 nixlib-c1792242ef5ee4f9550c029231bf6e5956078b51.tar.lz nixlib-c1792242ef5ee4f9550c029231bf6e5956078b51.tar.xz nixlib-c1792242ef5ee4f9550c029231bf6e5956078b51.tar.zst nixlib-c1792242ef5ee4f9550c029231bf6e5956078b51.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/iwd/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 15 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 4 |
7 files changed, 24 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 762b46bb5526..a7a78be6a10b 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { python3Packages.pygobject3 ]; - enableParallelBuilding = true; + # Enable when it works again + enableParallelBuilding = false; configureFlags = [ "--with-dbus-datadir=$(out)/etc/" diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f9e693b9c7ae..69ce2fe71c6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.82"; + version = "4.14.83"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1b8x77kf3q7nf2h3s9vnn0hzi45srxxin7f9rvg70vd7yvka5457"; + sha256 = "081zxc7ikcn1hy22pw5af0dql9pq24h2anfgnykc83jfjbg2h5vh"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 7c78311f2064..13e4a56f4712 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.3"; + version = "4.19.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0834k2lsflp6mgxv1vs1gr4fykg5z0hd4sbbrw3z7zfhsh95fg0y"; + sha256 = "1aj7zwrjwrjb3m3nfccykmcvhrrjsk1zchc5g4f63xd1pc35d3x3"; }; } // (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 077ebbf27aa8..35fd90b61602 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, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.138"; + version = "4.9.140"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dr1mf7i1mwy780048gkhvy283j8331xwgrs2x5qal0xc1114c4j"; + sha256 = "0hzrha3rh90jwxjmrh4npd0q56pf512nmb8i2p484k9cikssx27q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 20ecdb5b5773..1a89ff57491c 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,19 +1,22 @@ -{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils}: +{ stdenv, fetchFromGitHub, cmake, kernel +, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb +}: with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.23.1"; + version = "0.24.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0q52yfag97n6cvrnzgx7inx11zdg7bgwkvqn2idsg9874fd2wkzh"; + sha256 = "04y6cqi2j0qpr5bgxyn6zz9f33v5v4lmkcl21c3sg5hmpjwibg3w"; }; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ - cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc elfutils + zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -51,9 +54,11 @@ stdenv.mkDerivation rec { meta = { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; - license = licenses.gpl2; + license = with licenses; [ asl20 gpl2 mit ]; maintainers = [maintainers.raskin]; platforms = ["x86_64-linux"] ++ platforms.darwin; + broken = kernel != null && (versionOlder kernel.version "4.14" || versionAtLeast kernel.version "4.20"); + homepage = "https://sysdig.com/opensource/"; downloadPage = "https://github.com/draios/sysdig/releases"; }; } diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 8f9a565ecc77..e103de3e1b71 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, kernel, wireguard-tools }: +{ stdenv, kernel, wireguard-tools, perl }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS = ["-Wno-error=cpp"]; - nativeBuildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies; buildPhase = "make module"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 3b19b7bff544..733da0d8989e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { ''); preBuild = '' + for manpage in wpa_supplicant/doc/docbook/wpa_supplicant.conf* ; do + substituteInPlace "$manpage" --replace /usr/share/doc $out/share/doc + done cd wpa_supplicant cp -v defconfig .config echo "$extraConfig" >> .config @@ -132,6 +135,7 @@ stdenv.mkDerivation rec { cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d cp -v "systemd/"*.service $out/etc/systemd/system rm $out/share/man/man8/wpa_priv.8 + install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example ''; meta = with stdenv.lib; { |