diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/dpdk/default.nix | 55 | ||||
-rw-r--r-- | pkgs/os-specific/linux/irqbalance/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kmscube/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/odp-dpdk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/powerstat/default.nix | 4 |
12 files changed, 58 insertions, 37 deletions
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index fd45e83c26b5..b4c4af8c2e21 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,7 +1,13 @@ -{ stdenv, kernel, fetchurl, pkgconfig, numactl }: +{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl, shared ? false }: -stdenv.mkDerivation rec { - name = "dpdk-${version}-${kernel.version}"; +let + + kver = kernel.modDirVersion or null; + + mod = kernel != null; + +in stdenv.mkDerivation rec { + name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; version = "17.11.2"; src = fetchurl { @@ -9,35 +15,50 @@ stdenv.mkDerivation rec { sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2"; }; - nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies; - buildInputs = [ numactl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ numactl ] ++ lib.optional mod kernel.moduleBuildDependencies; - RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + RTE_KERNELDIR = if mod then "${kernel.dev}/lib/modules/${kver}/build" else "/var/empty"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; # we need sse3 instructions to build NIX_CFLAGS_COMPILE = [ "-msse3" ]; - - enableParallelBuilding = true; - outputs = [ "out" "kmod" ]; - hardeningDisable = [ "pic" ]; + postPatch = '' + cat >>config/defconfig_$RTE_TARGET <<EOF +# Build static or shared libraries. +CONFIG_RTE_BUILD_SHARED_LIB=${if shared then "y" else "n"} +EOF + '' + lib.optionalString (!mod) '' + cat >>config/defconfig_$RTE_TARGET <<EOF +# Do not build kernel modules. +CONFIG_RTE_EAL_IGB_UIO=n +CONFIG_RTE_KNI_KMOD=n +EOF + ''; + configurePhase = '' make T=${RTE_TARGET} config ''; - installPhase = '' - make install-runtime DESTDIR=$out prefix= includedir=/include datadir=/ - make install-sdk DESTDIR=$out prefix= includedir=/include datadir=/ - make install-kmod DESTDIR=$kmod - ''; + installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc + + installFlags = [ + "prefix=$(out)" + ] ++ lib.optionals mod [ + "kerneldir=$(kmod)/lib/modules/${kver}" + ]; + + outputs = [ "out" ] ++ lib.optional mod "kmod"; + + enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of libraries and drivers for fast packet processing"; homepage = http://dpdk.org/; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.domenkozar ]; + maintainers = with maintainers; [ domenkozar orivej ]; }; } diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 76c10f0a06e8..439b2aff6afc 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "irqbalance-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "009777p5v72x4r58skqgaf03qv3app9b8lkxkpxq0226l0x3j4qh"; + sha256 = "05q3cdz2a5zp5s2bdz5a80y9vq7awqw9lbvyvh6vjs9a8vg80hwm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f44adb6bc946..16d597e1640d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.41"; + version = "4.14.42"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0vffv1iqcvrzvhs534czdjhj7702gr01pyn9idr8dj85kdx19wfc"; + sha256 = "00wh8ydawy6j18as28albzid88cm2aanzr8vz367jjp2k5pi00rb"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index c1df425280e0..7039c460c5c4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.9"; + version = "4.16.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12lvdnfz06r7pj5f15x39c4glhbp3sv7bdbwj4yimbp6iqwvndv0"; + sha256 = "1gnf16p4rmibcn3wn5zp4pl2zmhgk4dg6718gvdr8vcffd87ksc0"; }; } // (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 3a7dc9353f8b..15a8d63651d5 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.100"; + version = "4.9.101"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0z572csacfwn3kl3yaz4wpd7wkzabm42p2z4ysx5rq0kf4x6zfy5"; + sha256 = "005awyjylyp7di8cy269923j7wsvv74s42k7955fq0790wmx15dg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix index 8054ba0be6ac..f9af5e5f6026 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.41"; + version = "4.14.42"; revision = "a"; - sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3"; + sha256 = "09j36qhxs1z2qcxlpscg8yrif4qvm5ipbh7n6gxg58150yg9sl05"; # 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-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix index 5c65f2064b42..fea27b649f51 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.16.9"; + version = "4.16.10"; revision = "a"; - sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl"; + sha256 = "1dd9zislrlv24mnvzm2j9rfxnfp93lgf0pi48zpdglw5xpfwqm49"; # 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 691c0d7a0a97..e61e9a354dec 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.17-rc5"; - modDirVersion = "4.17.0-rc5"; + version = "4.17-rc6"; + modDirVersion = "4.17.0-rc6"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk"; + sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 27ffaca61e71..99ef7d4a5508 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; src = fetchgit { - url = git://anongit.freedesktop.org/libGLU_combined/kmscube; + url = git://anongit.freedesktop.org/mesa/kmscube; rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea"; sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca"; }; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index cf4f9df26777..ff408b6a6248 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ dpdk libconfig libpcap numactl openssl ]; - RTE_SDK = dpdk; + RTE_SDK = "${dpdk}/share/dpdk"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index c443da7df3b4..a7bb4a81510d 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { [ dpdk libpcap numactl ] ++ stdenv.lib.optionals withGtk [gtk2]; - RTE_SDK = "${dpdk}"; + RTE_SDK = "${dpdk}/share/dpdk"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; GUI = stdenv.lib.optionalString withGtk "true"; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 88151fca2f54..2d4d8f8266f7 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.15"; + version = "0.02.16"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "0m8662qv77nzbwkdpydiz87kd75cjjajgp30j6mc5padyw65bxxx"; + sha256 = "14sx37l40038sjygsnp95542fkbhhc911vd9k5rf85czmvndz29m"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' |