diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-13 21:18:24 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-13 21:18:24 -0400 |
| commit | cebda2ffd0a1216f26585746b14f06467af69cfd (patch) | |
| tree | f561f39f9e5bbe352bcfe9976b63f5be4bd61ce4 /pkgs/os-specific | |
| parent | f5c84020ce02b2c52b4dbdae3a63978c670e9acf (diff) | |
| parent | 3e3a9e661d7ef83f9dfc26d948a12f8ee1334f6d (diff) | |
| download | nixlib-cebda2ffd0a1216f26585746b14f06467af69cfd.tar nixlib-cebda2ffd0a1216f26585746b14f06467af69cfd.tar.gz nixlib-cebda2ffd0a1216f26585746b14f06467af69cfd.tar.bz2 nixlib-cebda2ffd0a1216f26585746b14f06467af69cfd.tar.lz nixlib-cebda2ffd0a1216f26585746b14f06467af69cfd.tar.xz nixlib-cebda2ffd0a1216f26585746b14f06467af69cfd.tar.zst nixlib-cebda2ffd0a1216f26585746b14f06467af69cfd.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -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/zfs/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ecef71fd604f..999952dba699 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.136"; + version = "4.4.137"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0svb6qbhc376jk26r67qssh7lradx63s60qlm1q2kd4xjhxyj5a3"; + sha256 = "01hjnwfrx0fr9zbd6qcqfxsp0xm34ai7k49i7ndxwcrhzdipkl9i"; }; } // (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 bcc4aad7fccb..d9b821b8f15f 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.107"; + version = "4.9.108"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lya48grdgjjbzw8x5kvvblanfas23dcmchysnhwv5p0rq7g9rrw"; + sha256 = "0ha0bvjfxz6nx3nrcrpciqlrphy318xi04lv4k7jr5hpialjpzkk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 232d647e1220..c44d64b8fa81 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -77,7 +77,7 @@ let substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" substituteInPlace ./etc/systemd/system/zfs-share.service.in \ - --replace "@bindir@/rm " "${coreutils}/bin/rm " + --replace "/bin/rm " "${coreutils}/bin/rm " for f in ./udev/rules.d/* do |