public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source
This commit is contained in:
Matthew Bauer
2018-08-21 15:41:53 -05:00
parent 9c35796ee3 28e51c7cea
commit 379fc894de
351 changed files with 5483 additions and 2969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/bcc/default.nix
View File

@@ -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";

1
pkgs/os-specific/linux/fuse/common.nix
View File

@@ -81,6 +81,7 @@ in stdenv.mkDerivation rec {
inherit (src.meta) homepage;
description = "Kernel module and library that allows filesystems to be implemented in user space";
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl21 ];
maintainers = [ maintainers.primeos ];
};
}

7
pkgs/os-specific/linux/fxload/default.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation {
name = "fxload-2002_04_11";
src = fetchurl {
url = mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz;
sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m";
@@ -27,9 +27,10 @@ stdenv.mkDerivation {
mkdir -p $out/share/usb
'';
meta = {
meta = with stdenv.lib; {
homepage = http://linux-hotplug.sourceforge.net/?selected=usb;
description = "Tool to upload firmware to Cypress EZ-USB microcontrollers";
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

48
pkgs/os-specific/linux/iputils/default.nix
View File

@@ -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 ];
};
}

2
pkgs/os-specific/linux/kernel/hardened-config.nix
View File

@@ -22,7 +22,7 @@ ${optionalString (versionAtLeast version "4.10") ''
BUG_ON_DATA_CORRUPTION y
''}
${optionalString (stdenv.platform.kernelArch == "x86_64") ''
${optionalString (stdenv.hostPlatform.platform.kernelArch == "x86_64") ''
DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory
# Reduce attack surface by disabling various emulations

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@@ -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 {}))

4
pkgs/os-specific/linux/kernel/linux-4.17.nix
View File

@@ -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 {}))

4
pkgs/os-specific/linux/kernel/linux-4.18.nix
View File

@@ -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 {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -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 {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@@ -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 {}))

5
pkgs/os-specific/linux/lsscsi/default.nix
View File

@@ -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;
};
}

7
pkgs/os-specific/linux/lvm2/default.nix
View File

@@ -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/";
};

4
pkgs/os-specific/linux/mcelog/default.nix
View File

@@ -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 = ''

5
pkgs/os-specific/linux/mdadm/default.nix
View File

@@ -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;
};
}

5
pkgs/os-specific/linux/mingetty/default.nix
View File

@@ -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;
};
}

6
pkgs/os-specific/linux/mmc-utils/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "mmc-utils-${version}";
version = "2015-11-18";
version = "2018-03-27";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git";
rev = "44f94b925894577f9ffcf2c418dd013a5e582648";
sha256 = "0hkdzc71pdnscbpdpgwljcchiyancarldjyd0w609sy18bky833x";
rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d";
sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn";
};
makeFlags = "CC=${stdenv.cc.targetPrefix}cc";

10
pkgs/os-specific/linux/nss_ldap/default.nix
View File

@@ -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;
};
}

4
pkgs/os-specific/linux/psmisc/default.nix
View File

@@ -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];

2
pkgs/os-specific/linux/rtl8723bs/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ nukeReferences ];
makeFlags = concatStringsSep " " [
"ARCH=${stdenv.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
"ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us.
];

7
pkgs/os-specific/linux/shadow/default.nix
View File

@@ -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 = {

7
pkgs/os-specific/linux/systemd/default.nix
View File

@@ -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 ];
};
}