Update Nix sources; add Rosetta reminder innix-shell

fission-codes · Sep 11, 2021 · 536c05c · 536c05c
1 parent 71efd5f
commit 536c05c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/nix/sources.json b/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd6dba47199a7c249e64c1aa1fef01ee78e58481",
-        "sha256": "0a9njyymwpz9xjq7vbyz91kxv9gf1rfww0xx7rj191ahppzgwv6b",
+        "rev": "8b0b81dab17753ab344a44c04be90a61dc55badf",
+        "sha256": "0rj17jpjxjcibcd4qygpxbq79m4px6b35nqq9353pns8w7a984xx",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/fd6dba47199a7c249e64c1aa1fef01ee78e58481.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/8b0b81dab17753ab344a44c04be90a61dc55badf.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "unstable": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4",
-        "sha256": "1zbyyf2710kpjhrss7v59m1gjlriisx5nxvbhjan9vjzx7l64civ",
+        "rev": "bbbe2b35f736d039884e082ecc6d6e631e126029",
+        "sha256": "09356lp9r1wx311ak6d94bx35xnvj8cabvwqirklylql8q7f52lc",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/23d5823337f4502dfa17e192d8c53a47cabcb6b4.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/bbbe2b35f736d039884e082ecc6d6e631e126029.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/rosetta.nix b/rosetta.nix
@@ -74,5 +74,6 @@ unstable.haskell.lib.buildStackProject {
 
   shellHook = ''
     export LANG=C.UTF8
+    echo "⚠️  Remember to override the nix.shell-path in stack.yaml ⚠️ "
   '';
 }
diff --git a/stack.yaml b/stack.yaml
@@ -35,4 +35,4 @@ ghc-options:
 nix:
   enable:     true
   pure:       true
-  shell-file: shell.nix
+  shell-file: rosetta.nix