diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
| commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
| tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/os-specific | |
| parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
| parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 684955b9067de..25078b7d753cf 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -47,7 +47,7 @@ , mkValueOverride ? null , ... -} @ args: +}: assert stdenv.isLinux; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index af3df245fe67c..880da81c42e0c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -12,7 +12,7 @@ let , rev ? "spl-${version}" , broken ? false , patches ? [] - } @ args : stdenv.mkDerivation rec { + }: stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6eac54ddf6510..45edf8945c0e5 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -24,7 +24,7 @@ let , rev ? "zfs-${version}" , isUnstable ? false , isLegacyCrypto ? false - , incompatibleKernelVersion ? null } @ args: + , incompatibleKernelVersion ? null }: if buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion then |