1
1
mirror of https://github.com/coot/free-category.git synced 2024-09-11 14:17:30 +03:00

nix: ghc802 build

Fix nixpkgs depending on ghc version.
This commit is contained in:
Marcin Szamotulski 2018-12-16 18:32:43 +01:00
parent 74492388fa
commit 3159b1216e
No known key found for this signature in database
GPG Key ID: 788D56E52D63FAA4
3 changed files with 9 additions and 4 deletions

View File

@ -6,7 +6,7 @@
}:
with builtins;
let
nixpkgs = import ./nix/nixpkgs.nix { };
nixpkgs = import ./nix/nixpkgs.nix { inherit compiler; };
pkgs = nixpkgs.haskell.packages;
lib = nixpkgs.haskell.lib;

View File

@ -1,8 +1,13 @@
{}:
{ compiler ? "ghc844" }:
with builtins;
let
rev = "cb95a3c1d1b6cd9da65650be269436cbe9e265fa";
rev = if compiler == "ghc802"
|| compiler == "ghc822"
|| compiler == "ghc844"
then "722fcbbb80b2142583e9266efe77992f8e32ac4c"
else "cb95a3c1d1b6cd9da65650be269436cbe9e265fa";
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
url802 = "https://github.com/NixOS/nixpkgs/archive/${rev802}.tar.gz";
config =
{ packageOverrides = super:
let self = super.pkgs;

View File

@ -7,7 +7,7 @@
with builtins;
let
default = import ./default.nix {inherit benchmarks compiler dev haddock test;};
nixpkgs = import ./nix/nixpkgs.nix {};
nixpkgs = import ./nix/nixpkgs.nix { inherit compiler; };
in
{
free-category = if nixpkgs.lib.inNixShell