diff --git a/default.nix b/default.nix index a02e909..e4b60bb 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,5 @@ -{ nixpkgs ? import ./nixpkgs-with-ghc843.nix -, compiler ? "ghc843" +{ nixpkgs ? import {} +, compiler ? "ghc902" }: nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./my-hakyll-blog.nix { } diff --git a/example.com-shell.nix b/example.com-shell.nix index 09fcf14..e647701 100644 --- a/example.com-shell.nix +++ b/example.com-shell.nix @@ -1,5 +1,5 @@ -{ nixpkgs ? import ./nixpkgs-with-ghc843.nix -, compiler ? "ghc843" +{ nixpkgs ? import {} +, compiler ? "ghc902" }: nixpkgs.mkShell { diff --git a/flake.lock b/flake.lock index d7f57a7..4710924 100644 --- a/flake.lock +++ b/flake.lock @@ -16,19 +16,18 @@ } }, "nixpkgs": { - "flake": false, "locked": { - "lastModified": 1539028341, - "narHash": "sha256-2b+2tvSyuzLYe5zGJ0r9ailbp2NQLwvwpkOWqej5+wc=", + "lastModified": 1653738054, + "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3962299f14944a0e9ccf8fd84bd7be524b74cd6", + "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "a3962299f14944a0e9ccf8fd84bd7be524b74cd6", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 33818f4..fbbe25b 100644 --- a/flake.nix +++ b/flake.nix @@ -4,15 +4,7 @@ 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"; }; @@ -20,7 +12,7 @@ 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 deleted file mode 100644 index bfc33cd..0000000 --- a/nixpkgs-with-ghc843.nix +++ /dev/null @@ -1,11 +0,0 @@ -# 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/ -import (builtins.fetchGit { - name = "nixpkgs-with-ghc-8_4_3-a396"; - url = "https://github.com/NixOS/nixpkgs/"; - ref = "refs/heads/nixpkgs-unstable"; - rev = "a3962299f14944a0e9ccf8fd84bd7be524b74cd6"; -}) {} diff --git a/shell.nix b/shell.nix index 28e415b..6bf03ab 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,5 @@ -{ nixpkgs ? import ./nixpkgs-with-ghc843.nix -, compiler ? "ghc843" +{ nixpkgs ? import {} +, compiler ? "ghc902" }: (import ./default.nix { inherit nixpkgs compiler; }).env diff --git a/stack-shell.nix b/stack-shell.nix index 3e29151..11e1c3c 100644 --- a/stack-shell.nix +++ b/stack-shell.nix @@ -1,5 +1,5 @@ -{ nixpkgs ? import ./nixpkgs-with-ghc843.nix -, compiler ? "ghc843" +{ nixpkgs ? import {} +, compiler ? "ghc902" }: nixpkgs.mkShell { diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000..75bb9d2 --- /dev/null +++ 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