Skip to content

Commit 110392e

Browse files
Damien BiasottoDamien Biasotto
authored andcommitted
Use GHC 8.10.7 for basic M1 support
1 parent 3dd94fa commit 110392e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7e9b0dff974c89e070da1ad85713ff3c20b0ca97.tar.gz") {}, compiler ? "ghc8104" }:
1+
{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2.tar.gz") {}, compiler ? "ghc8107" }:
22
pkgs.pkgs.haskell.packages.${compiler}.callPackage ./haskellings.nix { }

haskellings.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
}:
55
mkDerivation {
66
pname = "haskellings";
7-
version = "0.9.0.0";
7+
version = "0.9.1.0";
88
src = ./.;
99
isLibrary = true;
1010
isExecutable = true;

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: haskellings
2-
version: 0.9.0.0
2+
version: 0.9.1.0
33
github: "MondayMorningHaskell/haskellings"
44
license: BSD3
55
author: "James Bowen"

shell.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7e9b0dff974c89e070da1ad85713ff3c20b0ca97.tar.gz") {}, compiler ? "ghc8104" }:
1+
{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2.tar.gz") {}, compiler ? "ghc8107" }:
22

33
pkgs.mkShell {
4-
buildInputs = with pkgs; [
5-
haskell.compiler.ghc8104
4+
buildInputs = with pkgs; [
5+
haskell.compiler.ghc8107
66
which
77
(import ./default.nix { inherit pkgs compiler; })
88
];
99

1010
shellHook = ''
1111
__GHCPATH=$(echo $(which ghc))
12-
echo "ghc_path: $__GHCPATH" > config.yaml
12+
echo "ghc_path: $__GHCPATH" > config.yaml
1313
'';
1414
}

src/Haskellings/Constants.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ import System.Environment
3636
-- | The GHC version currently used by Haskellings. We use this
3737
-- to locate the appropriate GHC executable.
3838
ghcVersion :: String
39-
ghcVersion = "ghc-8.10.4"
39+
ghcVersion = "ghc-8.10.7"
4040

4141
-- | The version number, isolated from any prefix. Also helps in
4242
-- finding certain directories.
4343
ghcVersionNumber :: String
44-
ghcVersionNumber = "8.10.4"
44+
ghcVersionNumber = "8.10.7"
4545

4646
-- | The current Haskellings program version.
4747
haskellingsVersion :: String
48-
haskellingsVersion = "0.9.0.0"
48+
haskellingsVersion = "0.9.1.0"
4949

5050
-- | The project root directory name. We need to find the project root
5151
-- in order to locate the exercises.

0 commit comments

Comments
 (0)