From 63c7eab37db1ebfa503d42b5fd558f0410cb933e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 May 2024 01:39:07 +0200 Subject: [PATCH] style: Centralize GHC version --- default.nix | 2 +- nix/ci.nix | 2 +- nix/ghc-version.nix | 1 + nix/pkgs.nix | 2 +- nix/toc.nix | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 nix/ghc-version.nix diff --git a/default.nix b/default.nix index b793e77..0859bf3 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ { packages ? import nix/pkgs.nix { inherit compiler; }, - compiler ? "ghc964", + compiler ? import nix/ghc-version.nix, }: let diff --git a/nix/ci.nix b/nix/ci.nix index 92cbeca..5d589f7 100644 --- a/nix/ci.nix +++ b/nix/ci.nix @@ -1,6 +1,6 @@ { packages ? import ./pkgs.nix { inherit compiler; }, - compiler ? "ghc964", + compiler ? import ./ghc-version.nix, }: let diff --git a/nix/ghc-version.nix b/nix/ghc-version.nix new file mode 100644 index 0000000..636c15f --- /dev/null +++ b/nix/ghc-version.nix @@ -0,0 +1 @@ +"ghc964" diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 24042f3..24e6050 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -1,5 +1,5 @@ { - compiler ? "ghc964", + compiler ? import ./ghc-version.nix, }: let diff --git a/nix/toc.nix b/nix/toc.nix index 541a06f..9149f68 100644 --- a/nix/toc.nix +++ b/nix/toc.nix @@ -1,5 +1,5 @@ { - compiler ? "ghc964", + compiler ? import ./ghc-version.nix, }: let