diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
| commit | 3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4 (patch) | |
| tree | 04c567a4061b3adf6d1e0a898f39b67f27d37aea /pkgs/os-specific | |
| parent | 8615f026a48cbf3f1c37b30e9b70bba6af013a12 (diff) | |
| parent | a9d24cedeb3ba97a4e23ff93fadff32280ff0ab6 (diff) | |
| download | nixpkgs-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar nixpkgs-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.gz nixpkgs-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.bz2 nixpkgs-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.lz nixpkgs-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.xz nixpkgs-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.zst nixpkgs-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/btfs/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/rtl8812au/default.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 46b015cd08a..0470110fc4b 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; - rev = "e816b4718bd5c9d88a99805d19d2ad91971b2338"; - sha256 = "1mac2dwg0pzpmg0x503a8d8gx3ridi4m1qx4jk6ssvl4g9v6p7fl"; + rev = "0567010e553b290eaa50b1afaa717dd7656c82de"; + sha256 = "1x3x1v7fhcfcpffprf63sb720nxci2ap2cq92jy1xd68kmshdmwd"; }; buildInputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' autoreconf -i substituteInPlace scripts/btplay \ - --replace /usr/bin/python ${python}/bin/python + --replace "/usr/bin/env python" "${python}/bin/python" ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index dff91095549..56f660a248a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.2"; + version = "4.4.3"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09l6y0nb8yv7l16arfwhy4i5h9pkxcbd7hlbw0015n7gm4i2mzc2"; + sha256 = "1pcichd5hp3hzb3hwh5737jwqmfv4ylhw04sbby3hzmxkfqrqdqb"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 64c0c9fea5c..5a03df98346 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod."; + description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; homepage = "https://github.com/csssuf/rtl8812au"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; |