From c51f4417ec557cc0fe1215e18ed1b48db755f279 Mon Sep 17 00:00:00 2001
From: maydayv7 <maydayv7@gmail.com>
Date: Mon, 27 Dec 2021 16:17:35 +0530
Subject: [PATCH 1/2] fix(nix-flakes): Make `extraContents` extensible

---
 images/nix-flakes/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/images/nix-flakes/default.nix b/images/nix-flakes/default.nix
index 767c613..d1e09b9 100644
--- a/images/nix-flakes/default.nix
+++ b/images/nix-flakes/default.nix
@@ -1,6 +1,7 @@
 { docker-nixpkgs
 , nixFlakes
 , writeTextFile
+, extraContents ? [ ]
 }:
 docker-nixpkgs.nix.override {
   nix = nixFlakes;
@@ -12,5 +13,5 @@ docker-nixpkgs.nix.override {
         experimental-features = nix-command flakes
       '';
     })
-  ];
+  ] ++ extraContents;
 }

From 32575d2810cc2f4fff6fcb77e7026a00d6e7e661 Mon Sep 17 00:00:00 2001
From: maydayv7 <maydayv7@gmail.com>
Date: Mon, 27 Dec 2021 16:17:50 +0530
Subject: [PATCH 2/2] fix(cachix-flakes): Enable Nix experimental-features

---
 images/cachix-flakes/default.nix | 12 ++++++++----
 images/cachix/default.nix        |  2 --
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/images/cachix-flakes/default.nix b/images/cachix-flakes/default.nix
index c82f1d1..d4d7543 100644
--- a/images/cachix-flakes/default.nix
+++ b/images/cachix-flakes/default.nix
@@ -1,6 +1,10 @@
 { docker-nixpkgs
-, nixFlakes
+, cachix
 }:
-docker-nixpkgs.cachix.override {
-  nix = nixFlakes;
-}
+(docker-nixpkgs.nix-flakes.override {
+  extraContents = [ cachix ];
+}).overrideAttrs (prev: {
+  meta = (prev.meta or { }) // {
+    description = "Nix and Cachix image";
+  };
+})
diff --git a/images/cachix/default.nix b/images/cachix/default.nix
index 59fcdee..bfcfbd4 100644
--- a/images/cachix/default.nix
+++ b/images/cachix/default.nix
@@ -1,9 +1,7 @@
 { docker-nixpkgs
 , cachix
-, nix
 }:
 (docker-nixpkgs.nix.override {
-  nix = nix;
   extraContents = [ cachix ];
 }).overrideAttrs (prev: {
   meta = (prev.meta or { }) // {