Merge pull request #2 from Dich0tomy/fix/nix-code

Fix nix code & docs
ynqa · May 28, 2024 · 84be9a2 · 84be9a2
2 parents 211824b + 115a3dd
commit 84be9a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -62,13 +62,15 @@ Fetch the source and use it, e.g. in your shell:
 
 ```nix
 let
-  pkgs = import <nixpkgs> {};
+  # At the time of writing this, pkgs need to be unstable for the package to build properly
+  # (requires Rust 1.74, stable has 1.73)
+  pkgs = import <nixpkgs-unstable> {};
 
   sig = pkgs.callPackage (pkgs.fetchFromGitHub {
     owner = "ynqa";
     repo = "sig";
-    rev = "v0.1.0";
-    hash = "sha256-KHXBeQFmuA3YO9AN5dkY/fl/z2RdbR6AqSSEGUNrxt4=";
+    rev = "<revision, e.g. master/v0.1.0/etc.>";
+    hash = ""; # Build first, put proper hash in place
   }) {};
 in
   pkgs.mkShell {

diff --git a/default.nix b/default.nix
@@ -10,9 +10,15 @@ in
     pname = "sig";
     inherit version;
 
-    src = ./.;
+    src = builtins.path {
+      path = ./.;
+      name = repo;
+    };
 
-		cargoHash = "sha256-yz/DPJJxtsHpJLpTMAYfsq9miIs48F+FeSnmkQ707uA=";
+    cargoLock = {
+      lockFile = ./Cargo.lock;
+      allowBuiltinFetchGit = true;
+    };
 
     meta = {
       description = "Interactive grep (for streaming)";