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 { }; 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/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/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 { }; in pkgs.callPackage ./default.nix {}' + test: cargo test diff --git a/default.nix b/default.nix index 57a77ab..1fd5bea 100644 --- a/default.nix +++ b/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 ];