From cd1074d30f22b753ca4c5dd891ff30d1dee0a4bb Mon Sep 17 00:00:00 2001
From: rm-dr <96270320+rm-dr@users.noreply.github.com>
Date: Sun, 15 Oct 2023 11:36:53 -0700
Subject: [PATCH 1/3] Updated build docs

---
 CONTRIBUTING.MD | 6 +-----
 Makefile        | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD
index e8314d3..af18df8 100644
--- a/CONTRIBUTING.MD
+++ b/CONTRIBUTING.MD
@@ -29,8 +29,4 @@ What to do
  - `cargo publish`
  - Update web demo & pull server (`make docker`)
  - Update aur package
-
-Test `default.nix` with
-``sh
-nix-build -E 'let pkgs = import <nixpkgs> { }; in pkgs.callPackage ./default.nix {}'
-``
\ No newline at end of file
+ - Update `default.nix` (test with `make nix`)
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 10188e0..37be58f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 release:
 	cargo build --release
 
+nix:
+	nix-build -E 'let pkgs = import <nixpkgs> { }; in pkgs.callPackage ./default.nix {}'
+
 test:
 	cargo test
 

From 42555e0df78d50d4bc427da5976278547af7b363 Mon Sep 17 00:00:00 2001
From: rm-dr <96270320+rm-dr@users.noreply.github.com>
Date: Sun, 15 Oct 2023 11:37:02 -0700
Subject: [PATCH 2/3] Updated default.nix

---
 default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 57a77ab..24bc750 100644
--- a/default.nix
+++ b/default.nix
@@ -4,14 +4,14 @@ rustPlatform.buildRustPackage rec {
 	version = "1.1.6";
 	cargoLock.lockFile = src + /Cargo.lock;
 
-	src = fetchgit {
+	src = builtins.fetchGit {
 		url = "https://github.com/rm-dr/daisy.git";
-		rev = "v${version}";
-		sha256 = "";
+		ref = "refs/tags/v${version}";
+		#rev = ""; Ideally, we'd have a hash here, but that would make git history messy.
 	};
 
 	meta = with lib; {
-		description = "A pretty command-line scientific calculator";
+		description = "A general-purpose scientific calculator";
 		homepage = "https://github.com/rm-dr/daisy";
 		#license = licenses.GPL;
 		maintainers = [ maintainers.tailhook ];

From bc1716eefd06cb11ebcdb6c98973c69ff34a204e Mon Sep 17 00:00:00 2001
From: rm-dr <96270320+rm-dr@users.noreply.github.com>
Date: Sun, 15 Oct 2023 11:37:51 -0700
Subject: [PATCH 3/3] Version bump

---
 Cargo.lock  | 2 +-
 Cargo.toml  | 2 +-
 default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f47fe92..2407763 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "daisycalc"
-version = "1.1.6"
+version = "1.1.7"
 dependencies = [
  "cfg-if",
  "num",
diff --git a/Cargo.toml b/Cargo.toml
index 4cdde82..2cdd545 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "daisycalc"
-version = "1.1.6"
+version = "1.1.7"
 edition = "2021"
 build = "buildscript/main.rs"
 license = "GPL-3.0-only"
diff --git a/default.nix b/default.nix
index 24bc750..1fd5bea 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchgit, rustPlatform }:
 rustPlatform.buildRustPackage rec {
 	pname = "daisy";
-	version = "1.1.6";
+	version = "1.1.7";
 	cargoLock.lockFile = src + /Cargo.lock;
 
 	src = builtins.fetchGit {