Updated shell.nix

Merge branch 'dev' of github.com:rm-dr/daisy into dev
Updated TODO
2023-09-21 20:52:35 -07:00 · 2023-09-21 20:47:39 -07:00 · 2023-09-21 19:54:37 -07:00 · 2023-09-21 19:52:48 -07:00 · 2023-09-21 19:50:52 -07:00 · 2023-09-21 19:37:34 -07:00
2 changed files with 14 additions and 2 deletions
--- a/TODO.md
+++ b/TODO.md
@ -6,6 +6,7 @@
 - push
 - merge
 - git tag -a v1.0.0 -m "Version 1.0.0" on merge commit
+ - delete branch?
 - cargo publish
 - Update packages
 - Build wasm & push changes
--- a/shell.nix
+++ b/shell.nix
@ -1,11 +1,22 @@
+{ nixpkgs ? import <nixpkgs> { }}:
 let
- pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/f155f0cf4ea43c4e3c8918d2d327d44777b6cad4.tar.gz") {};
+  # If you set hash to an empty string, you'll get
+  # an error with the correct hash.
+  pinnedPkgs = nixpkgs.fetchFromGitHub {
+    owner  = "NixOS";
+    repo   = "nixpkgs";
+    rev    = "4ecab3273592f27479a583fb6d975d4aba3486fe";
+    sha256 = "btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=";
+  };
+  pkgs = import pinnedPkgs {};
+
 in pkgs.mkShell {
  buildInputs = with pkgs; [
    cargo
    rustc
    rustfmt
-    m4
+    rust-analyzer
+    wasm-pack
   ];
 }
Author	SHA1	Message	Date
mark	32463ad6aa	Updated shell.nix	2023-09-21 20:52:35 -07:00
mark	413c34c440	Merge branch 'dev' of github.com:rm-dr/daisy into dev	2023-09-21 20:47:39 -07:00
Mark	a1d190b06e	Updated TODO	2023-09-21 19:54:37 -07:00
Mark	178708a4ac	Updated TODO	2023-09-21 19:52:48 -07:00
Mark	5bb8e2c4ce	Merge 1.0.2 (#7 ) * Fixed page scrolling * Updated TODO * Fixed a link * Minor edits * Version bump	2023-09-21 19:50:52 -07:00
Mark	798c9ceae9	Merge pull request #6 from rm-dr/dev Merge v1.1.1	2023-09-21 19:37:34 -07:00
Mark	bab305e11d	Merge pull request #4 from rm-dr/dev Merge 1.1.0	2023-09-20 11:19:34 -07:00
Mark	a6c3ffa68d	Merge v1.0.1	2023-08-17 10:30:26 -07:00