on master help sign in
Adjust the nix expression to facilitate importing from outside
commita3559a2a0750553eed0af83d35e2d52238f5fc00 authormrkkrp <mark.karpov@tweag.io> dateFri 16 Aug 2019, 12:02 (7 years ago) parent367f7b8
2 files changed+13−9
default.nix+10−8 shell.nix+3−1
default.nix+10−8
@@ -1,6 +1,7 @@
1+{ pkgs ? (import ./nix/nixpkgs) }:
2+
13let
2− pkgs = import ./nix/nixpkgs;
3− compiler = "ghc864";
4+ ormoluCompiler = "ghc864";
45 source = pkgs.lib.sourceByRegex ./.[
56 "^.*\.md$"
67 "^app.*$"
@@ -9,21 +10,22 @@ let
910 "^src.*$"
1011 "^tests.*$"
1112 ];
12− haskellPackages = pkgs.haskell.packages.${compiler}.override {
13− overrides = (self: super:
14− super // {
15− "ormolu" = super.callCabal2nix "ormolu" source { };
16− });
13+ haskellPackages = pkgs.haskell.packages.${ormoluCompiler}.override {
14+ overrides = ormoluOverlay;
1715 };
16+ ormoluOverlay = self: super: {
17+ "ormolu" = super.callCabal2nix "ormolu" source { };
18+ };
1819 ormolize = import ./nix/ormolize {
1920 inherit pkgs;
2021 inherit haskellPackages;
2122 };
2223in {
2324 ormolu = haskellPackages.ormolu;
24− ormolu-shell = haskellPackages.shellFor {
25+ ormoluShell = haskellPackages.shellFor {
2526 packages = ps: [ ps.ormolu ];
2627 buildInputs = [ haskellPackages.cabal-install haskellPackages.ghcid ];
2728 };
29+ inherit ormoluOverlay ormoluCompiler;
2830 hackage = pkgs.lib.mapAttrs ormolize haskellPackages;
2931}
shell.nix+3−1
@@ -1 +1,3 @@
1−(import ./default.nix).ormolu-shell
1+{ pkgs ? (import ./nix/nixpkgs) }:
2+
3+(import ./default.nix { inherit pkgs; }).ormoluShell