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

This commit is contained in:
Tuomas Tynkkynen 2017-10-22 18:16:17 +03:00
commit ac2acca7d9
7 changed files with 14 additions and 19 deletions

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnu-efi-${version}";
version = "3.0.5";
version = "3.0.6";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx";
sha256 = "149cyadpn2jm4zxfn1qmpm520iqssp9p07d650rs5ghgv015jl91";
};
buildInputs = [ pciutils ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libbsd-${version}";
version = "0.8.5";
version = "0.8.6";
src = fetchurl {
url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
sha256 = "0a2vq0xdhs3yyj91b0612f19fakg7a9xlqy2f993128kyhjd0ivn";
sha256 = "11wnkzims5grprvhb1ssmq9pc2lcgh2r2rk8gwgz36ply6fvyzs6";
};
# darwin changes configure.ac which means we need to regenerate

View file

@ -6,11 +6,11 @@
assert enablePython -> python != null;
stdenv.mkDerivation rec {
name = "audit-2.7.7";
name = "audit-2.8.1";
src = fetchurl {
url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
sha256 = "1vvqw5xgirap0jdmajw7l3pq563aycvy3hlqvj3k2cac8i4jbqlq";
sha256 = "0v1vng43fjsh158zb5k5d81ngn4p4jmj1247m27pk0bfzy9dxv0v";
};
outputs = [ "bin" "dev" "out" "man" ];

View file

@ -2,7 +2,7 @@
, thin-provisioning-tools, enable_dmeventd ? false }:
let
version = "2.02.173";
version = "2.02.175";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
sha256 = "0r4dx87z7ggxmxligdzz43chgfrwn9lyj7vaz63z97h0gs61dfff";
sha256 = "0n95cc2b0jb0fh2pd9jyg9ww7lyzpia9n9sryw9f4aq8dpna7dsd";
};
configureFlags = [

View file

@ -5,23 +5,18 @@ let
version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.30";
patchVersion = "";
patchVersion = "2";
fstrimPatch = fetchpatch {
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543";
sha256 = "1wj0fj3iwaimr6p8wxg6l2i1hjyrfgcwcxziyxqz8acxba7k6zxh";
};
in stdenv.mkDerivation rec {
name = "util-linux-${version}";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
sha256 = "13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262";
sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv";
};
patches = [
./rtcwake-search-PATH-for-shutdown.patch
fstrimPatch
];
outputs = [ "bin" "dev" "out" "man" ];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
stdenv.mkDerivation rec {
name = "e2fsprogs-1.43.4";
name = "e2fsprogs-1.43.7";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d";
sha256 = "1i51w5l45zhz3i98k92xbbvkqklvjrvw3zvqky3gk9cdmqp5y0w7";
};
outputs = [ "bin" "dev" "out" "man" "info" ];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, lessSecure ? false }:
stdenv.mkDerivation rec {
name = "less-487";
name = "less-520";
src = fetchurl {
url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
sha256 = "01i7n6jaxwmww3pasy3hg38zc6x7jw0w05mqqvh6caqbrdaq9p7k";
sha256 = "12wh0j07971j53v7irfcv0vkb7wpi7f83jll4mwjy92wc27fm2bv";
};
configureFlags = [ "--sysconfdir=/etc" ] # Look for sysless in /etc.