From 8aafab9b49739f7bcd226a45b36ef94b6d02887b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 4 Aug 2018 16:21:21 +0200 Subject: upower: add license see issue #43716 --- pkgs/os-specific/linux/upower/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c4af0bec9a2..629f61bf5b1 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } -- cgit 1.4.1 From 8d87f1a842947e9604c0f7a333d8f1a7a456a716 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 4 Aug 2018 16:22:42 +0200 Subject: untie: add license see issue #43716 --- pkgs/os-specific/linux/untie/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 91443eeced5..739bd447192 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "A tool to run processes untied from some of the namespaces"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { -- cgit 1.4.1 From 9fe17c6ff3252425ce1f276f91c32fdae8b64203 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 4 Aug 2018 16:52:03 +0200 Subject: sysvinit: add license see issue #43716 --- pkgs/os-specific/linux/sysvinit/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index b516cfe65ed..0ccf318dfb2 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } -- cgit 1.4.1 From eaf7debad65eeef7ec1da374e46698a470bc72ac Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 4 Aug 2018 16:58:14 +0200 Subject: statifier: add license see issue #43716 --- pkgs/os-specific/linux/statifier/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 67df9dd2f11..376ae47ffbe 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -19,5 +19,6 @@ multiStdenv.mkDerivation { meta = with multiStdenv.lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; + license = licenses.gpl2; }; } -- cgit 1.4.1 From d5ca0166b64581b0634277033ae3743d3b09841e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 4 Aug 2018 18:32:01 +0200 Subject: smem: add license see issue #43716 --- pkgs/os-specific/linux/smem/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index a07eec431c3..ede8d425f12 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl2Plus; }; } -- cgit 1.4.1 From 89da937013e595b93e92256198a03e73dc531b00 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 5 Aug 2018 16:31:42 +0200 Subject: dmraid: add license see issue #43716 --- pkgs/os-specific/linux/dmraid/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index a6f6365ae63..129ccb30456 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } -- cgit 1.4.1 From f6b1f03f34d55871bbf8bb5dbb5531abf8dfe78d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 6 Aug 2018 12:15:43 +0200 Subject: psmisc: add license see issue #43716 --- pkgs/os-specific/linux/psmisc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 358fa700382..1eec10860f7 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://psmisc.sourceforge.net/; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } -- cgit 1.4.1 From 28905e828ae5c12a3b0fb97072a7ca7dcbdea67a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 8 Aug 2018 21:18:16 +0200 Subject: libcap: add license see issue #43716 --- pkgs/os-specific/linux/libcap/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 8248a628f0a..a7e8894ccfe 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd3; }; } -- cgit 1.4.1 From 5f9a441b814b9901612af91e522f199203dbfd55 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 9 Aug 2018 14:47:49 -0400 Subject: linux: 4.4.136 -> 4.4.147 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 60a4d5a76ed..60113959665 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.146"; + version = "4.4.147"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xbxw6yvbjam0xj8j44h730dpf5v94pcf9j7iivcmasgjp61120z"; + sha256 = "06mcilxd5qi8snycb5bhy52icbbwfl056xwmra66yknmpycyad67"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 2ded176416f83e5c67631cc1fc787480bae27b8d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 9 Aug 2018 14:48:03 -0400 Subject: linux: 4.9.118 -> 4.9.119 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 1863aadf8f1..d29855a093e 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.118"; + version = "4.9.119"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0myx79rmxgjbr87r815vybmbg6iqgd3nycildrpwsh301kj8kxvx"; + sha256 = "0d8bwsma9j7dhgymcfbchr8k3503w5vp3p18mfqv81x6l40pzqa9"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From fbed5d48ae55d53d2ec4383ae871f0b2a9ce438e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 9 Aug 2018 14:48:14 -0400 Subject: linux: 4.14.61 -> 4.14.62 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 9c9957d2193..400574a3144 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.61"; + version = "4.14.62"; # 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 = "1s3h3js073h4ww2dryip91d2lvmgv439ly2vya9x7rvilwhwa3hd"; + sha256 = "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjji"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 86e62fcd49a659567a0f90a93c17b65e10f8a6ec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 9 Aug 2018 14:48:39 -0400 Subject: linux: 4.17.13 -> 4.17.14 --- pkgs/os-specific/linux/kernel/linux-4.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index b98cf98904e..fda3b77c0a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.13"; + version = "4.17.14"; # 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 = "0x1zas3jwvhjkifh20cwpd2g0glgr8m7h8lqng7awrd116xkw2w2"; + sha256 = "1bxsiishhw6ichifqglkbcmgc0518ih396yi23clvrsfyj6h6in8"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From e554935f51460ebda710683a7186afd92a8f2a2f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 9 Aug 2018 21:04:08 +0200 Subject: trinity: 2017-02-13 -> 2018-06-08, fix build, clean up Fix for old breakage was in https://github.com/kernelslacker/trinity/commit/c93bb184ce996c4d77eefbae2ab0bf74f396ec45 --- pkgs/os-specific/linux/trinity/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 46b09dce437..54d9a9bafe9 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "trinity-${version}"; - version = "1.8-git-2017-02-13"; + version = "1.8-git-2018-06-08"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "2989c11ce77bc7bec23da62987e2c3a0dd8a83c9"; - sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq"; + rev = "1b2d43cb383cef86a05acb2df046ce5e9b17a7fe"; + sha256 = "0dsq10vmd6ii1dnpaqhizk9p8mbd6mwgpmi13b11dxwxpcvbhlar"; }; # Fails on 32-bit otherwise - NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=int-to-pointer-cast" + "-Wno-error=pointer-to-int-cast" + "-Wno-error=incompatible-pointer-types" + ]; postPatch = '' patchShebangs ./configure @@ -21,11 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installPhase = "make DESTDIR=$out install"; + makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { description = "A Linux System call fuzz tester"; - homepage = http://codemonkey.org.uk/projects/trinity/; + homepage = https://codemonkey.org.uk/projects/trinity/; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; -- cgit 1.4.1 From da746730a893db3bc0da7f0c67510642d1fe786c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 9 Aug 2018 21:25:11 +0200 Subject: sysvtools: fix build mountpoint from utillinux is now preferred See http://git.savannah.nongnu.org/cgit/sysvinit.git/commit/?id=3cb95c83714161a18f140814eece9345aebb42c0 --- pkgs/os-specific/linux/sysvinit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index b516cfe65ed..e03d293b0e3 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { rm -rf $out/include rm -rf $out/share/man/man5 rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') - rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1} + rm $out/bin/wall $out/share/man/man1/wall.1 ''; meta = { -- cgit 1.4.1 From fdbc1aee391c93e409b2e5bada414165363696d8 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 9 Aug 2018 21:44:00 +0200 Subject: syscall_limiter: fix build Originally broken through using multiple outputs for libseccomp in 8d490ca9934d0c01e1e9ade455657e54e2e843c0 --- pkgs/os-specific/linux/syscall_limiter/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index a5c69e1d876..c7543aee933 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "syscall_limiter-${version}"; - version = "20170123"; + version = "2017-01-23"; src = fetchFromGitHub { owner = "vi"; @@ -16,11 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0z5arj1kq1xczgrbw1b8m9kicbv3vs9bd32wvgfr4r6ndingsp5m"; }; - configurePhase = ""; - - buildPhase = '' - make CC="gcc -I${libseccomp}/include -L${libseccomp}/lib" - ''; + buildInputs = [ libseccomp ]; installPhase = '' mkdir -p $out/bin -- cgit 1.4.1 From 99f4e548c49e3dfc3d1c7f4996c1d72da2623f00 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Thu, 9 Aug 2018 21:51:57 +0200 Subject: hwdata: 0.313 -> 0.314 (#44826) --- pkgs/os-specific/linux/hwdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index d249bc9b1c6..fae928dca4c 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.313"; + version = "0.314"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "1mmqiy4ams14mdiakz60dm07wfan343hisiiz0dwvh685mjxap8h"; + sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; }; preConfigure = "patchShebangs ./configure"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0lz8pykpfw6aqkpdaqdc3jnny1iqgsqnc0wm61784xxml7zqfdvx"; + outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; meta = { homepage = https://github.com/vcrhonek/hwdata; -- cgit 1.4.1 From ff59cee9afa439c6caaa9a29b08c2e95ff866752 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 10 Aug 2018 08:18:22 +0200 Subject: sysdig: 0.21.0 -> 0.22.1 --- pkgs/os-specific/linux/sysdig/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index cdb1910d9c0..9eec7c13a41 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}: +{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils}: with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0dakxv2pkbsivavz09fwvav4dla7qzklnv45zb7x306gankkjgi1"; + sha256 = "1wbvpsalm2ccwh8xz6fa4gqviilvjd8lnwvdryixhsdsf7j8w0j0"; }; buildInputs = [ - cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc + cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc elfutils ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; -- cgit 1.4.1 From a5690aa936bfdb0483bdff80772fa3d8ebc4cf2a Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Fri, 10 Aug 2018 12:19:50 +0200 Subject: sysdig: disable aarch64 --- pkgs/os-specific/linux/sysdig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 9eec7c13a41..9b0f3ff767c 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = licenses.gpl2; maintainers = [maintainers.raskin]; - platforms = platforms.linux ++ platforms.darwin; + platforms = ["x86_64-linux"] ++ platforms.darwin; downloadPage = "https://github.com/draios/sysdig/releases"; }; } -- cgit 1.4.1