From 131acf12da0898684ffcc33457a2de1e9b5d645e Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Fri, 31 Dec 2021 13:30:27 -0500
Subject: [PATCH 1/4] First pass at a working nix flake

---
 flake.nix   | 25 +++++++++++++++++++++++++
 kitchen.nix |  8 ++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 flake.nix
 create mode 100644 kitchen.nix

diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..f67501c
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,25 @@
+{
+    description = "kitchen";
+    inputs.nixpkgs = {
+        type = "indirect";
+        id = "nixpkgs";
+    };
+    inputs.gitignore = = { url = "github:hercules-ci/gitignore.nix"; flake = false; };
+
+    inputs.flake-utils.url = "github:numtide/flake-utils";
+
+    outputs = {self, nixpkgs, flake-utils}:
+        let
+            kitchenGen = import ./kitchen.nix;
+            gitignoreSrc = pkgs.callPackage inputs.gitignore { };
+        in
+        flake-utils.lib.eachDefaultSystem (system:
+            let pkgs = import nixpkgs { inherit system; }; in
+            {
+                defaultPackage = (kitchenGen {
+                    nixpkgs = pkgs;
+                    inherit gitignoreSrc;
+                });
+            } 
+        );
+}
\ No newline at end of file
diff --git a/kitchen.nix b/kitchen.nix
new file mode 100644
index 0000000..62c1586
--- /dev/null
+++ b/kitchen.nix
@@ -0,0 +1,8 @@
+{nixpkgs, gitignoreSrc}:
+with nixpkgs;
+    rustPlatform.buildRustPackage {
+        pname = "kitchen";
+        version = "0.0.2";
+        src = gitignoreSrc.gitignoreSource ./.;
+        cargoSha256 = "sha256-DmUWZbZL8A5ht9ujx70qDvT6UC1CKiY6LtwWmKMvVhs=";
+    }
\ No newline at end of file

From f343aad16ab9d586c56f0fd3c34987c81f879b0d Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Fri, 31 Dec 2021 13:42:10 -0500
Subject: [PATCH 2/4] Fix some nix stuff

---
 flake.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index f67501c..d416096 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,14 +4,15 @@
         type = "indirect";
         id = "nixpkgs";
     };
-    inputs.gitignore = = { url = "github:hercules-ci/gitignore.nix"; flake = false; };
+    
+    inputs.gitignore = { url = "github:hercules-ci/gitignore.nix"; flake = false; };
 
     inputs.flake-utils.url = "github:numtide/flake-utils";
 
-    outputs = {self, nixpkgs, flake-utils}:
+    outputs = {self, nixpkgs, flake-utils, gitignore}:
         let
             kitchenGen = import ./kitchen.nix;
-            gitignoreSrc = pkgs.callPackage inputs.gitignore { };
+            gitignoreSrc = pkgs.callPackage gitignore { };
         in
         flake-utils.lib.eachDefaultSystem (system:
             let pkgs = import nixpkgs { inherit system; }; in

From 58ff0bb2f7707450be8dcc482ebcf32cba41e828 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Fri, 31 Dec 2021 13:45:11 -0500
Subject: [PATCH 3/4] fix bad pkgs call

---
 flake.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index d416096..799e778 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,14 +12,13 @@
     outputs = {self, nixpkgs, flake-utils, gitignore}:
         let
             kitchenGen = import ./kitchen.nix;
-            gitignoreSrc = pkgs.callPackage gitignore { };
         in
         flake-utils.lib.eachDefaultSystem (system:
             let pkgs = import nixpkgs { inherit system; }; in
             {
                 defaultPackage = (kitchenGen {
                     nixpkgs = pkgs;
-                    inherit gitignoreSrc;
+                    gitignoreSrc = pkgs.callPackage gitignore { };
                 });
             } 
         );

From 6eb795ce6bc388f1b3f9d9e42f7e5623d04b1469 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Fri, 31 Dec 2021 13:51:30 -0500
Subject: [PATCH 4/4] Cargo sha needs tweaking

---
 kitchen.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitchen.nix b/kitchen.nix
index 62c1586..58ffb04 100644
--- a/kitchen.nix
+++ b/kitchen.nix
@@ -4,5 +4,5 @@ with nixpkgs;
         pname = "kitchen";
         version = "0.0.2";
         src = gitignoreSrc.gitignoreSource ./.;
-        cargoSha256 = "sha256-DmUWZbZL8A5ht9ujx70qDvT6UC1CKiY6LtwWmKMvVhs=";
+        cargoSha256 = "sha256-aSw+BX90rmcagVOkLVEfjlqTi+dv4QVT7JPZQd3eKjA=";
     }
\ No newline at end of file