about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-13 21:52:01 +0000
committervolth <volth@volth.com>2019-08-28 11:07:32 +0000
commit08f68313a47a2093dc0f408a706b2c125bc59c95 (patch)
treebb48188c0bf9fac152c038426146df518ef8c562 /pkgs/applications/virtualization
parent5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff)
downloadnixlib-08f68313a47a2093dc0f408a706b2c125bc59c95.tar
nixlib-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.gz
nixlib-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.bz2
nixlib-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.lz
nixlib-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.xz
nixlib-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.zst
nixlib-08f68313a47a2093dc0f408a706b2c125bc59c95.zip
treewide: remove redundant rec
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/8086tiny/default.nix2
-rw-r--r--pkgs/applications/virtualization/docker/default.nix10
-rw-r--r--pkgs/applications/virtualization/nvidia-docker/default.nix2
-rw-r--r--pkgs/applications/virtualization/virt-top/default.nix2
-rw-r--r--pkgs/applications/virtualization/xen/xsa-patches.nix2
5 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 6e61ef098f35..e16fcb84b055 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -4,7 +4,7 @@
 
 assert sdlSupport -> (SDL != null);
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
   pname = "8086tiny";
   version = "1.25";
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index a1125f25e816..72b885b79e7d 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -15,7 +15,7 @@ rec {
       , tiniRev, tiniSha256
     } :
   let
-    docker-runc = runc.overrideAttrs (oldAttrs: rec {
+    docker-runc = runc.overrideAttrs (oldAttrs: {
       name = "docker-runc-${version}";
       inherit version;
       src = fetchFromGitHub {
@@ -28,7 +28,7 @@ rec {
       patches = [];
     });
 
-    docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
+    docker-containerd = containerd.overrideAttrs (oldAttrs: {
       name = "docker-containerd-${version}";
       inherit version;
       src = fetchFromGitHub {
@@ -41,7 +41,7 @@ rec {
       hardeningDisable = [ "fortify" ];
     });
 
-    docker-tini = tini.overrideAttrs  (oldAttrs: rec {
+    docker-tini = tini.overrideAttrs  (oldAttrs: {
       name = "docker-init-${version}";
       inherit version;
       src = fetchFromGitHub {
@@ -60,7 +60,7 @@ rec {
       ];
     });
   in
-    stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) rec {
+    stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) {
 
     inherit docker-runc docker-containerd docker-proxy docker-tini;
 
@@ -70,7 +70,7 @@ rec {
       ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
       ++ optional (libseccomp != null) "seccomp";
 
-   }) // rec {
+   }) // {
     inherit version rev;
 
     name = "docker-${version}";
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
index b58a5108ebad..e11ca04f6b36 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -24,7 +24,7 @@ with lib; let
     sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
   };
 
-  nvidia-container-runtime-hook = buildGoPackage rec {
+  nvidia-container-runtime-hook = buildGoPackage {
     pname = "nvidia-container-runtime-hook";
     version = "1.4.0";
 
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 382ebba3c57e..9fc167f5e9de 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, ocamlPackages, autoreconfHook }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "virt-top";
   version = "2017-11-18-unstable";
 
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index 727546b69fb0..de692820d8f7 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -5,7 +5,7 @@ let
     url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
     inherit sha256;
   });
-in rec {
+in {
   # 4.5
   XSA_190 = (xsaPatch {
     name = "190-4.5";