diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:33 +0200 |
commit | 153a19df05133657dd3025812a544f8961c41b12 (patch) | |
tree | 9974b86334e11ffa884610dd0999a62b78e0ee96 /pkgs/os-specific/linux | |
parent | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (diff) | |
parent | 6755ab8b3442d6149e4bae5e142d516a506f6e45 (diff) | |
download | nixlib-153a19df05133657dd3025812a544f8961c41b12.tar nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.gz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.bz2 nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.lz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.xz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.zst nixlib-153a19df05133657dd3025812a544f8961c41b12.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/bcc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 48 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.17.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lsscsi/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mcelog/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mdadm/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mingetty/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nss_ldap/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/psmisc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/shadow/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 7 |
16 files changed, 74 insertions, 52 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 2796fed17dc6..a02127ab7989 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,14 +4,14 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.6.0"; + version = "0.6.1"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "1fk2kvbdvm87rkha2cigz2qhhlrni4g0dcnmiiyya79y85ahfvga"; + sha256 = "1rfqjbq8ah8zrsnpbx0h5irq3h2snncfvi4pvaxl7574kciprjxj"; }; format = "other"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3430797666eb..557bc2f186f3 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,33 +1,45 @@ -{ stdenv, fetchurl -, sysfsutils, openssl -, libcap, opensp, docbook_sgml_dtd_31 -, libidn, nettle -, SGMLSpm, libgcrypt }: +{ stdenv, fetchFromGitHub, fetchpatch +, libxslt, docbook_xsl, docbook_xml_dtd_44 +, sysfsutils, openssl, libcap, libgcrypt, nettle, libidn2 +}: let - time = "20161105"; + time = "20180629"; in stdenv.mkDerivation rec { name = "iputils-${time}"; - src = fetchurl { - url = "https://github.com/iputils/iputils/archive/s${time}.tar.gz"; - sha256 = "12mdmh4qbf5610csaw3rkzhpzf6djndi4jsl4gyr8wni0cphj4zq"; + src = fetchFromGitHub { + owner = "iputils"; + repo = "iputils"; + rev = "s${time}"; + sha256 = "19rpl48pjgmyqlm4h7sml5gy7yg4cxciadxcs24q1zj40c05jls0"; }; + patches = [ + (fetchpatch { + name = "dont-hardcode-the-location-of-xsltproc.patch"; + url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch"; + sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx"; + }) + ]; + prePatch = '' - sed -e s/sgmlspl/sgmlspl.pl/ \ - -e s/nsgmls/onsgmls/ \ - -i doc/Makefile + substituteInPlace doc/custom-man.xsl \ + --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" + for xmlFile in doc/*.xml; do + substituteInPlace $xmlFile \ + --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" + done ''; # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111 makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no"; - depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ]; + nativeBuildInputs = [ libxslt.bin ]; buildInputs = [ sysfsutils openssl libcap libgcrypt nettle - ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; + ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn2; # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure... buildFlags = "man all" + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) " ninfod"; @@ -35,21 +47,23 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -p ping tracepath clockdiff arping rdisc rarpd $out/bin/ + cp -p arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6 $out/bin/ if [ -x ninfod/ninfod ]; then cp -p ninfod/ninfod $out/bin fi mkdir -p $out/share/man/man8 + cd doc cp -p \ - doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/rarpd.8 doc/tracepath.8 doc/ninfod.8 \ + arping.8 clockdiff.8 ninfod.8 pg3.8 ping.8 rarpd.8 rdisc.8 tftpd.8 tracepath.8 traceroute6.8 \ $out/share/man/man8 ''; meta = with stdenv.lib; { homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; + license = with licenses; [ gpl2Plus bsd3 ]; # TODO: AS-IS, SUN MICROSYSTEMS license platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann ]; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0bfd3d0ac34c..f32af5169534 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.63"; + version = "4.14.65"; # 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 = "1ly6pjvlfrlrclfnl98ghwal25z58lppnj6gj7x1m1mswzq54bnd"; + sha256 = "1v55nmg1x9ygisgf0pjd3lygvjin3i6ld24anl6nggmrdd00r60j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 7d29f9f805fc..ffce27178b6c 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.15"; + version = "4.17.17"; # 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 = "0yg0hh1ld3d5cd4ll7f48p769wda2a1ap8fmnnsfsazidka5vf75"; + sha256 = "1g525zi7x3j7niqasrm8jwalf391p6pwa17zmr0iibal6xf3di1x"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 691ab096e8ae..b69d994f3b57 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.1"; + version = "4.18.3"; # 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 = "0hps1h8rs1cc8385m69754vwbjmwasr7bfv9f9nsv8fmx73aspvj"; + sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0516c947e8c7..4b2f3bf6c380 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.148"; + version = "4.4.150"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "10yrqizwkawbs332rl3fmr3cpwcl2j0mik4md7isg5xlkc00zc8r"; + sha256 = "1xdfq11pa4ayi89vynbddq5k47f01szc04lbl5aaxpnch982jj8g"; }; } // (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 add40aaa8159..a8e059e99509 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.120"; + version = "4.9.122"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14gx6gqahz74vaw8jd0wkxn0w05i7cyfgi24ld2q3p2yhq3gannp"; + sha256 = "0v7qdkdlgpv83v4lzm59jgaxy1l7dzkqjr3fcahqrnrcdf3r0vx4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 96b84c00a5f0..aba907039aca 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { substituteInPlace Makefile.in --replace /usr "$out" ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a24024112c95..096eefe8a68f 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -78,11 +78,12 @@ stdenv.mkDerivation { cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators ''; - meta = { + meta = with stdenv.lib; { homepage = http://sourceware.org/lvm2/; description = "Tools to support Logical Volume Management (LVM) on Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = platforms.linux; + license = with licenses; [ gpl2 bsd2 lgpl21 ]; + maintainers = with maintainers; [raskin]; inherit version; downloadPage = "ftp://sources.redhat.com/pub/lvm2/"; }; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index e5ee5e202944..642653259c34 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "159"; + version = "160"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1w8y4igxi48r2d9s6g9fm1bgmsga94gfz6x0xaln6rhvbgi318xg"; + sha256 = "1m985wvdykl3003967lp1i7707qhwdj3h13cl8g1afjaip9ccd48"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index b6fdae75bac2..6de666630bb3 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation rec { -e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile ''; - meta = { + meta = with stdenv.lib; { description = "Programs for managing RAID arrays under Linux"; homepage = http://neil.brown.name/blog/mdadm; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index d36544453323..a29a03734242 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation { makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mingetty; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 70cbae88d695..ef0bdc4f1266 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl, openldap, perl}: - + stdenv.mkDerivation { name = "nss_ldap-265"; - + src = fetchurl { url = http://www.padl.com/download/nss_ldap-265.tar.gz; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; @@ -29,7 +29,9 @@ stdenv.mkDerivation { buildInputs = [ openldap perl ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "LDAP module for the Solaris Nameservice Switch (NSS)"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 1eec10860f72..c7b71d4e5018 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "psmisc-23.1"; + name = "psmisc-23.2"; src = fetchurl { url = "mirror://sourceforge/psmisc/${name}.tar.xz"; - sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f"; + sha256 = "0s1kjhrik0wzqbm7hv4gkhywhjrwhp9ajw0ad05fwharikk6ah49"; }; buildInputs = [ncurses]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 25ba60b58eea..885ea3421f65 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -81,10 +81,11 @@ stdenv.mkDerivation rec { mv $out/bin/su $su/bin ''; - meta = { - homepage = http://pkg-shadow.alioth.debian.org/; + meta = with stdenv.lib; { + homepage = https://github.com/shadow-maint; description = "Suite containing authentication-related tools such as passwd and su"; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 015aabbacfe6..912ba5b5e0ef 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -198,10 +198,11 @@ in stdenv.mkDerivation rec { # runtime; otherwise we can't and we need to reboot. passthru.interfaceVersion = 2; - meta = { + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/systemd; description = "A system and service manager for Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } |