nix: update from ghc 8.4.3 to ghc 9.0.2

rgoulter · May 30, 2022 · 7576644 · 7576644
1 parent f5b38fe
commit 7576644
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 34 deletions.
diff --git a/default.nix b/default.nix
@@ -1,5 +1,5 @@
-{ nixpkgs ? import ./nixpkgs-with-ghc843.nix
-, compiler ? "ghc843"
+{ nixpkgs ? import <nixpkgs> {}
+, compiler ? "ghc902"
 }:
 
 nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./my-hakyll-blog.nix { }
diff --git a/example.com-shell.nix b/example.com-shell.nix
@@ -1,5 +1,5 @@
-{ nixpkgs ? import ./nixpkgs-with-ghc843.nix
-, compiler ? "ghc843"
+{ nixpkgs ? import <nixpkgs> {}
+, compiler ? "ghc902"
 }:
 
 nixpkgs.mkShell {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,23 +4,15 @@
   description = "static site generator using hakyll";
 
   inputs = {
-    # A sufficiently old version of nixpkgs such that
-    # it has ghc 8.4.3.
-    #
-    # Details found by using lazamar's nix package versions tool:
-    #   https://lazamar.co.uk/nix-versions/
-    nixpkgs = {
-      url = "github:NixOS/nixpkgs/a3962299f14944a0e9ccf8fd84bd7be524b74cd6";
-      flake = false;
-    };
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = (import nixpkgs { inherit system; }).pkgs;
-        compiler = "ghc843";
+        compiler = "ghc902";
       in rec {
         packages.my-hakyll-blog =
           pkgs.haskell.packages.${compiler}.callPackage ./my-hakyll-blog.nix { };

diff --git a/nixpkgs-with-ghc843.nix b/nixpkgs-with-ghc843.nix
diff --git a/shell.nix b/shell.nix
@@ -1,5 +1,5 @@
-{ nixpkgs ? import ./nixpkgs-with-ghc843.nix
-, compiler ? "ghc843"
+{ nixpkgs ? import <nixpkgs> {}
+, compiler ? "ghc902"
 }:
 
 (import ./default.nix { inherit nixpkgs compiler; }).env
diff --git a/stack-shell.nix b/stack-shell.nix
@@ -1,5 +1,5 @@
-{ nixpkgs ? import ./nixpkgs-with-ghc843.nix
-, compiler ? "ghc843"
+{ nixpkgs ? import <nixpkgs> {}
+, compiler ? "ghc902"
 }:
 
 nixpkgs.mkShell {

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages: []
+snapshots:
+- completed:
+    size: 504336
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/12/12.yaml
+    sha256: 11db5c37144d13fe6b56cd511050b4e6ffe988f6edb8e439c2432fc9fcdf50c3
+  original: lts-12.12