diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-03-13 17:39:11 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-03-13 17:39:11 -0400 |
| commit | 84497cabd167715cbeb5f96a5124b8ba49d32655 (patch) | |
| tree | 62c8e9b3a0c0bdaad443b14d8ec78a7428f3dcfd /pkgs/os-specific/linux | |
| parent | dc3c338e2945f068ea5115e4446621cd6c50e5ce (diff) | |
| parent | 7b33cbdbf5dea320836fae7918926322aa1c4132 (diff) | |
| download | nixlib-84497cabd167715cbeb5f96a5124b8ba49d32655.tar nixlib-84497cabd167715cbeb5f96a5124b8ba49d32655.tar.gz nixlib-84497cabd167715cbeb5f96a5124b8ba49d32655.tar.bz2 nixlib-84497cabd167715cbeb5f96a5124b8ba49d32655.tar.lz nixlib-84497cabd167715cbeb5f96a5124b8ba49d32655.tar.xz nixlib-84497cabd167715cbeb5f96a5124b8ba49d32655.tar.zst nixlib-84497cabd167715cbeb5f96a5124b8ba49d32655.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened-config.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/mptcp-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sdparm/default.nix | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e925068421d6..2c8b8de65b31 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -16,11 +16,12 @@ }: with stdenv.lib; - - with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; }; +with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); let + # configuration items have to be part of a subattrs flattenKConf = nested: mapAttrs (_: head) (zipAttrs (attrValues nested)); diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 156a4cf44234..b28ce770f7a9 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -11,7 +11,8 @@ { stdenv, version }: with stdenv.lib; -with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; }; +with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix index e5e3ee283fff..9752e63d9f94 100644 --- a/pkgs/os-specific/linux/kernel/mptcp-config.nix +++ b/pkgs/os-specific/linux/kernel/mptcp-config.nix @@ -1,5 +1,5 @@ { stdenv }: -with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; }; +with stdenv.lib.kernel; { # DRM_AMDGPU = yes; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 5517f163b3e0..e0392e442bf5 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "sdparm"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz"; - sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx"; + sha256 = "1nqjc4w2w47zavcbf5xmm53x1zbwgljaw1lpajcdi537cgy32fa8"; }; meta = with stdenv.lib; { - homepage = http://sg.danny.cz/sg/sdparm.html; + homepage = "http://sg.danny.cz/sg/sdparm.html"; description = "A utility to access SCSI device parameters"; license = licenses.bsd3; platforms = with platforms; linux; |