diff options
author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2019-08-28 11:07:32 +0000 |
commit | 08f68313a47a2093dc0f408a706b2c125bc59c95 (patch) | |
tree | bb48188c0bf9fac152c038426146df518ef8c562 /pkgs/os-specific/linux | |
parent | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff) | |
download | nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.gz nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.bz2 nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.lz nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.xz nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.zst nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.zip |
treewide: remove redundant rec
Diffstat (limited to 'pkgs/os-specific/linux')
43 files changed, 47 insertions, 47 deletions
diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 2f5c392c173..fee8d1e7a42 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -1,6 +1,6 @@ { stdenv, kernel, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "anbox-modules"; version = "2019-07-13-" + kernel.version; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index d7d25e69664..456872cdbd4 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,7 +2,7 @@ let base = "batman-adv-2019.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${base}-${kernel.version}"; src = fetchurl { diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 205d788da6e..7ce2fea6924 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -26,7 +26,7 @@ let "upgrade/beegfs_mirror_md/build" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "beegfs"; inherit version; diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix index ac444c28d75..c54e3e38e9b 100644 --- a/pkgs/os-specific/linux/bpftool/default.nix +++ b/pkgs/os-specific/linux/bpftool/default.nix @@ -3,7 +3,7 @@ , linuxPackages_latest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bpftool"; inherit (linuxPackages_latest.kernel) version src; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 0149398bfa3..7f16ecb9e6d 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "can-isotp"; version = "20180629"; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 7913c703b5b..6e26ef4bbce 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "can-utils"; # There are no releases (source archives or git tags), so use the date of the # latest commit in git master as version number. diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index cd1400b41fc..77fa7fe3b1b 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "devmem2-2004-08-05"; src = fetchurl { diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index 5896262ac21..a880f699b69 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "directvnc"; version = "0.7.7.2015-04-16"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index defb45d7a86..c8fc633f8bd 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: let s = # Generated upstream information - rec { + { baseName="fbterm"; version="1.7.0"; name="fbterm-1.7.0"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 26ed2020635..e9ee91a2de7 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; version = "2018-08-20"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 321ce8ffc06..1ea2b5e4e3d 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raspberrypi-tools"; version = "2018-10-03"; diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 0abd458aa8f..bf3d2ef8d6d 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flashbench"; version = "2012-06-06"; diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 09774016ef2..a6c5a6593d1 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (kernel) version src; pname = "freefall"; diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix index 0325461763a..ea1051c5f05 100644 --- a/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpu-switch-unstable"; version = "2017-04-28"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix index 53924a782df..893eb4fdd99 100644 --- a/pkgs/os-specific/linux/hdapsd/default.nix +++ b/pkgs/os-specific/linux/hdapsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let version = "20141203"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "hdapsd-"+version; src = fetchurl { diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index d2319fdcf5c..3d759001d01 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -2,7 +2,7 @@ let version = "2.0"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "hibernate"; inherit version; src = fetchurl { diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 36ca1eb16b4..a209f1ab4bb 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python, kernel, makeWrapper, writeText }: let - daemons = stdenv.mkDerivation rec { + daemons = stdenv.mkDerivation { pname = "hyperv-daemons-bin"; inherit (kernel) src version; @@ -54,7 +54,7 @@ let WantedBy=hyperv-daemons.target ''; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "hyperv-daemons"; inherit (kernel) version; diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix index e6e89811894..b3d5fe1b63c 100644 --- a/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/pkgs/os-specific/linux/kbd/keymaps.nix @@ -18,7 +18,7 @@ ''; }; - neo = stdenv.mkDerivation rec { + neo = stdenv.mkDerivation { pname = "neo"; version = "2476"; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 33efad8c912..1b4700a2e39 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -4,7 +4,7 @@ let modDirVersion = "4.14.98"; tag = "1.20190215"; in -lib.overrideDerivation (buildLinux (args // rec { +lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; inherit modDirVersion; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 4516af19a4e..0b2ed76a4b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: -buildLinux (args // rec { +buildLinux (args // { version = "5.1.2019.08.21"; modDirVersion = "5.1.0"; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e941cd4ea41..fef542812b3 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,6 +1,6 @@ { fetchpatch }: -rec { +{ bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -23,7 +23,7 @@ rec { cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - tag_hardened = rec { + tag_hardened = { name = "tag-hardened"; patch = ./tag-hardened.patch; }; @@ -58,7 +58,7 @@ rec { }; }; - export_kernel_fpu_functions = rec { + export_kernel_fpu_functions = { name = "export_kernel_fpu_functions"; patch = ./export_kernel_fpu_functions.patch; }; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index f738b9f6da5..12463c736a6 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kmscube-2018-06-17"; src = fetchgit { diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix index 28027fd4510..96c60f6ea56 100644 --- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ledger-udev-rules"; version = "unstable-2019-02-13"; diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix index 9aa1698b766..369f412fbfc 100644 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -3,7 +3,7 @@ # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "logitech-udev-rules"; inherit (solaar) version; diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index b2d1ca4791a..63155e66678 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -12,7 +12,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lsiutils"; inherit version; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 0a6fc3c977c..7c72c8a2dbf 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, kernel, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mba6x_bl-2016-12-08"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 34f19db524c..1a24ae3b9a2 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,6 +1,6 @@ { stdenv, firmwareLinuxNonfree, libarchive }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "amd-ucode-${firmwareLinuxNonfree.version}"; src = firmwareLinuxNonfree; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 0edf322cce5..6b67401b9b2 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , glib, readline, pcre, systemd, udev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "miraclecast"; version = "1.0-20190403"; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index a7f0a332beb..e0b87f2010a 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mmc-utils"; version = "2018-03-27"; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index cfe79d4c0b7..4f8a0b68664 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -2,7 +2,7 @@ nvidia_x11: sha256: { stdenv, fetchFromGitHub, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nvidia-persistenced"; inherit (nvidia_x11) version; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 1867c1a133a..101f61f3020 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -40,7 +40,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nvidia-settings"; inherit (nvidia_x11) version; inherit src; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 62aa18fa643..044f75cbd6f 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -2,7 +2,7 @@ , bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pipework"; version = "2017-08-22"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index b1afbfea0de..710eba642cb 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rewritefs"; version = "2017-08-14"; diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index db362613d37..ef13e5ded02 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -5,7 +5,7 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "syscall_limiter"; version = "2017-01-23"; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 8965b5da4f4..8631ddf01d0 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "syslinux-2015-11-09"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 45f4d60e4e3..ea82d92f17a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,7 +15,7 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "242"; pname = "systemd"; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index e6571b46ee0..567dcd1068c 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "trace-cmd"; version = "2.8.3"; diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 8e49af77139..b73de3193d2 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: -mkDerivation rec { +mkDerivation { pname = "kernelshark"; version = "0.9.8"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 14458356a79..1836748d5fc 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -12,7 +12,7 @@ , useSystemd ? true, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "upower"; version = "0.99.10"; diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 497b5c19166..1bb92d7dce1 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel, udev, autoconf, automake, libtool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "usbip-${kernel.name}"; src = kernel.src; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index 19f59d00680..cfb93684f3b 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.3.0"; pname = "uvcdynctrl"; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 570eb4ca4ef..c2dca669616 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -3,7 +3,7 @@ # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wireguard"; inherit (wireguard-tools) src version; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 03e11d1a8ed..1b9b5a3ba51 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -30,7 +30,7 @@ let Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' - else stdenv.mkDerivation rec { + else stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; src = fetchFromGitHub { @@ -163,7 +163,7 @@ in { ]; }; - zfsUnstable = common rec { + zfsUnstable = common { # comment/uncomment if breaking kernel versions are known # incompatibleKernelVersion = "4.19"; |