diff options
author | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
commit | 203846b9de3bc67e77c93be9d111408286a17d5d (patch) | |
tree | 3306a68a635fad0de834440c25f7e1b69b1e4b10 /pkgs/os-specific | |
parent | 6539901c7f5eeb18cf5e9a493c230a912ff27f82 (diff) | |
parent | b54009fdfb7951bb5423c4fabcb28b70581b5ba8 (diff) | |
download | nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.gz nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.bz2 nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.lz nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.xz nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.zst nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fnotifystat/default.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/forkstat/default.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lightum/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/powerstat/default.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/smemstat/default.nix | 22 |
8 files changed, 104 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index ec374d9b1d31..182b8c01c391 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, musl +{ stdenv, lib, fetchurl, glibc, musl , enableStatic ? false , enableMinimal ? false , useMusl ? false @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { CONFIG_LFS y - ${stdenv.lib.optionalString enableStatic '' + ${lib.optionalString enableStatic '' CONFIG_STATIC y ''} @@ -66,10 +66,12 @@ stdenv.mkDerivation rec { EOF make oldconfig - '' + stdenv.lib.optionalString useMusl '' + '' + lib.optionalString useMusl '' makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; + buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ]; + crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 992d42e2e126..8e0f807e08e9 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2016-05-18"; + version = "2016-07-12"; # This repo is built by merging the latest versions of # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wkennington"; repo = "linux-firmware"; - rev = "19495832c6899bd811874439376d513290773c31"; - sha256 = "1700a24sfw6xa3q3r8aa5wfhydgix83m57plpfirdmc9qr4isrr0"; + rev = "cccb6a0da98372bd66787710249727ad6b0aaf72"; + sha256 = "1c7h8i37nbyy37zqhybxd3y6aqabfv4nrdkjg789w67mdnn6hka0"; }; preInstall = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://packages.debian.org/sid/firmware-linux-nonfree; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington fpletz ]; priority = 6; # give precedence to kernel firmware }; diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix new file mode 100644 index 000000000000..5708ed7c4df2 --- /dev/null +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + name = "fnotifystat-${version}"; + version = "0.01.14"; + src = fetchurl { + url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; + sha256 = "1cc3w94v8b4nfpkgr33gfzxpwaf43brqyc0fla9p70gk3hxjqzi5"; + }; + installFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + mv $out/usr/* $out + rm -r $out/usr + ''; + meta = with lib; { + description = "File activity monitoring tool"; + homepage = http://kernel.ubuntu.com/~cking/fnotifystat/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ womfoo ]; + }; +} diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix new file mode 100644 index 000000000000..3a253003e8e1 --- /dev/null +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + name = "forkstat-${version}"; + version = "0.01.13"; + src = fetchurl { + url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; + sha256 = "12dmqpv0q3x166sya93rhcj7vs4868x7y7lwfwv9l54hhirpamhq"; + }; + installFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + mv $out/usr/* $out + rm -r $out/usr + ''; + meta = with lib; { + description = "Process fork/exec/exit monitoring tool"; + homepage = http://kernel.ubuntu.com/~cking/forkstat/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ womfoo ]; + }; +} diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 0ef447ed9243..3eaf43631954 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation { systemd ]; + patchPhase = '' + substituteInPlace Makefile \ + --replace "libsystemd-login" "libsystemd" + ''; + installPhase = '' make install prefix=$out bindir=$out/bin docdir=$out/share/doc \ mandir=$out/share/man INSTALL="install -c" INSTALLDATA="install -c -m 644" diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index eda1863ec97b..f15f72ca5bc6 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0l4fs6ckvip5akfa0vbjfk34ddvcv0c84mmpj9yrcfl67qwn31z9"; + sha256 = "1mp83r1v9bcxjl7a441sm6plipj8aglhnmkxczp3jinlrnh41pw2"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix new file mode 100644 index 000000000000..9604a67ddd9a --- /dev/null +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + name = "powerstat-${version}"; + version = "0.02.10"; + src = fetchurl { + url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; + sha256 = "11n2k20h27j7m8j0l524w23xlkjhapsb3ml1qpx1si7gf0pkglcl"; + }; + installFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + mv $out/usr/* $out + rm -r $out/usr + ''; + meta = with lib; { + description = "Laptop power measuring tool"; + homepage = http://kernel.ubuntu.com/~cking/powerstat/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ womfoo ]; + }; +} diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix new file mode 100644 index 000000000000..a38c819bc6ff --- /dev/null +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + name = "smemstat-${version}"; + version = "0.01.14"; + src = fetchurl { + url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz"; + sha256 = "0qkpbg0n40d8m9jzf3ylpdp65zzs344zbjn8khha4plbwg00ijrw"; + }; + installFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + mv $out/usr/* $out + rm -r $out/usr + ''; + meta = with lib; { + description = "Memory usage monitoring tool"; + homepage = http://kernel.ubuntu.com/~cking/smemstat/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ womfoo ]; + }; +} |