diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-30 08:09:11 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-30 08:09:11 +0200 |
| commit | 20b8e4b4cfc8881fd00c400e7def97e71b800010 (patch) | |
| tree | 22dd0ae07beea66d24967817d6fb384a6b9010b5 /pkgs/os-specific | |
| parent | 69e24c044aba1c0a3dc4e70d0f988ec1f3e6fb73 (diff) | |
| parent | 9ea8535fa7e7f57f6e26c2bcf3893db4254bae68 (diff) | |
| download | nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.gz nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.bz2 nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.lz nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.xz nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.zst nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/acpi-call/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 65223a32bad6..fe8c0b65bb73 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, kernel }: +{ stdenv, fetchgit, fetchpatch, kernel }: stdenv.mkDerivation { name = "acpi-call-${kernel.version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation { sha256 = "0jl19irz9x9pxab2qp4z8c3jijv2m30zhmnzi6ygbrisqqlg4c75"; }; + patches = [ + (fetchpatch { + url = "https://github.com/mkottman/acpi_call/pull/67.patch"; + sha256 = "0z07apvdl8nvl8iwfk1sl1iidfjyx12fc0345bmp2nq1537kpbri"; + }) + ]; + hardeningDisable = [ "pic" ]; preBuild = '' diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 5447f13abc4c..2548e33bf4cf 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.27.0"; + name = "busybox-1.27.1"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1kcr0jvik0c31ls4f3li359xv7w0b60hv64fknj28bwlkdgbvpx5"; + sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 63e2e4ef493c..ef6a538af79a 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170706"; + version = "0.0.20170726"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0cvc2iv1836l6f0c3v3kqn3zqrr80i123f1cz5kilhk5c91vjqsp"; + sha256 = "1nq1h9k1kf6p28ykids5mmdq50q6zpj0ylhsf94q1hjydcmlb4fv"; }; meta = with stdenv.lib; { |