diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/dbus-broker/default.nix | 11 | ||||
-rw-r--r-- | pkgs/os-specific/linux/google-authenticator/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.15.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/open-isns/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/spl/const.patch | 13 | ||||
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 13 |
10 files changed, 24 insertions, 51 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 4ef162e56c7..42ab0092f7d 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "criu-${version}"; - version = "3.7"; + version = "3.8"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq"; + sha256 = "0gmvbnb5wa3f4nzam7gssclfai8g5363dhp8qc7q32dcx4wxbgam"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c97f1b54622..5d0728b7e24 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -17,13 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus glib linuxHeaders systemd ]; - enableParallelBuilding = true; - - prePatch = '' - substituteInPlace meson.build \ - --replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \ - --replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')" "'$out/lib/systemd/user'" - ''; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postInstall = '' install -Dm644 ../README $out/share/doc/dbus-broker/README @@ -32,8 +27,6 @@ stdenv.mkDerivation rec { -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' ''; - checkPhase = "ninja test"; - doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 1494d9f06a8..41bdd5d12ac 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "google-authenticator-libpam-${version}"; - version = "1.03"; + version = "1.05"; src = fetchurl { url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7"; + sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index adf9dbd818c..4e086259036 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.28"; + version = "4.14.29"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0byx2824ml2ck97p66gfipnasbn9zz6rhjps61n6gprg3ac5fd07"; + sha256 = "06a6q69jwvggns5rf473nfgfwlkfyj8zs6vrjppwf8lrrrq7pxhq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index 5c4a452dd12..979e8fe05e1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.11"; + version = "4.15.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0rjzlkp24ch58vx0xljrf6l33i8xv2mal0x821kwfqp551npdxfc"; + sha256 = "0j7l907m51y05cd1sqf3sn7vx4n6c07kn7q0ndnyg6wqb7h667h3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 36cbd1581a6..c8b404c6be7 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "open-isns-${version}"; - version = "0.97"; + version = "0.98"; src = fetchFromGitHub { owner = "gonzoleeman"; repo = "open-isns"; rev = "v${version}"; - sha256 = "17aichjgkwjfp9dx1piw7dw8ddz1bgm5mk3laid2zvjks1h739k3"; + sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg"; }; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch deleted file mode 100644 index 932e8a9eb1c..00000000000 --- a/pkgs/os-specific/linux/spl/const.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c -index eb00505..6f38cef 100644 ---- a/module/spl/spl-proc.c -+++ b/module/spl/spl-proc.c -@@ -36,7 +36,7 @@ - #include <linux/uaccess.h> - #include <linux/version.h> - --#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) -+#if defined(CONSTIFY_PLUGIN) - typedef struct ctl_table __no_const spl_ctl_table; - #else - typedef struct ctl_table spl_ctl_table; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 57698b5ad45..9460ee46c0f 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -20,7 +20,7 @@ let inherit rev sha256; }; - patches = [ ./const.patch ./install_prefix.patch ]; + patches = [ ./install_prefix.patch ]; nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; @@ -61,8 +61,8 @@ in assert kernel != null; { splStable = common { - version = "0.7.6"; - sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb"; + version = "0.7.7"; + sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1e4df0d3f0e..a792283e70e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -201,18 +201,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - # The rpath to the shared systemd library is not added by meson. The - # functionality was removed by a nixpkgs patch because it would overwrite - # the existing rpath. - postFixup = '' - sharedLib=libsystemd-shared-${version}.so - for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( - patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog - ) || true - done - ''; - # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 868e354c7b5..aac1576261d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch +{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils +, perl, fetchpatch , configFile ? "all" # Userspace dependencies @@ -39,8 +40,12 @@ let patches = extraPatches; + postPatch = optionalString buildKernel '' + patchShebangs scripts + ''; + nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel kernel.moduleBuildDependencies; + ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -142,9 +147,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.6"; + version = "0.7.7"; - sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h"; + sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r"; extraPatches = [ (fetchpatch { |