summary refs log tree commit diff
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2022-01-07 15:22:19 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2022-01-08 11:44:32 +1000
commitb4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7 (patch)
treef7444ec7840e8b09f157fc51e8b4c6a33890e5f6
parent5e53a3dd200a9ab07699bffecb0d044a6389ab14 (diff)
downloadnixpkgs-b4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7.tar
nixpkgs-b4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7.tar.gz
nixpkgs-b4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7.tar.bz2
nixpkgs-b4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7.tar.lz
nixpkgs-b4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7.tar.xz
nixpkgs-b4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7.tar.zst
nixpkgs-b4ee6e0b5dbc68aa5eb81ba50babb1c4b7eab5a7.zip
etcd: version the default `etcd`
easier to override
-rw-r--r--pkgs/servers/etcd/3.3.nix (renamed from pkgs/servers/etcd/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/3.3.nix
index 4dbe6932972..4dbe6932972 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/3.3.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a5c607d9cd..2cfaab8fe07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20935,7 +20935,8 @@ with pkgs;
     gn = gn1924;
   };
 
-  etcd = callPackage ../servers/etcd { };
+  etcd = etcd_3_3;
+  etcd_3_3 = callPackage ../servers/etcd/3.3.nix { };
   etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };