public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove redundant rec

Browse Source
This commit is contained in:
volth
2019-08-28 11:07:32 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/docker/default.nix
+5 -5
View File
@@ -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}";