Merged v1.1.7

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 {}'
-``
+ - Update `default.nix` (test with `make nix`)

Cargo.lock

@@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "daisycalc"
-version = "1.1.6"
+version = "1.1.7"
 dependencies = [
  "cfg-if",
  "num",

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"

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
 

default.nix

@@ -1,17 +1,17 @@
 { lib, fetchgit, rustPlatform }:
 rustPlatform.buildRustPackage rec {
 	pname = "daisy";
-	version = "1.1.6";
+	version = "1.1.7";
 	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 ];