treewide: remove redundant rec
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
assert sdlSupport -> (SDL != null);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
|
||||
pname = "8086tiny";
|
||||
version = "1.25";
|
||||
|
||||
@@ -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}";
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "virt-top";
|
||||
version = "2017-11-18-unstable";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user