git.iko.soy/ormolu
on master help sign in
Adjust the nix expression to facilitate importing from outside
a3559a2mrkkrp
default.nix+10−8
compare with master
unifiedsplit
@@ -1,6 +1,7 @@
1+{ pkgs ? (import ./nix/nixpkgs) }:
2+
1let
3let
2− pkgs = import ./nix/nixpkgs;
4+ ormoluCompiler = "ghc864";
3− compiler = "ghc864";
4 source = pkgs.lib.sourceByRegex ./.[
5 source = pkgs.lib.sourceByRegex ./.[
5 "^.*\.md$"
6 "^.*\.md$"
6 "^app.*$"
7 "^app.*$"
@@ -9,21 +10,22 @@ let
9 "^src.*$"
10 "^src.*$"
10 "^tests.*$"
11 "^tests.*$"
11 ];
12 ];
12− haskellPackages = pkgs.haskell.packages.${compiler}.override {
13+ haskellPackages = pkgs.haskell.packages.${ormoluCompiler}.override {
13− overrides = (self: super:
14+ overrides = ormoluOverlay;
14− super // {
15− "ormolu" = super.callCabal2nix "ormolu" source { };
16− });
17 };
15 };
16+ ormoluOverlay = self: super: {
17+ "ormolu" = super.callCabal2nix "ormolu" source { };
18+ };
18 ormolize = import ./nix/ormolize {
19 ormolize = import ./nix/ormolize {
19 inherit pkgs;
20 inherit pkgs;
20 inherit haskellPackages;
21 inherit haskellPackages;
21 };
22 };
22in {
23in {
23 ormolu = haskellPackages.ormolu;
24 ormolu = haskellPackages.ormolu;
24− ormolu-shell = haskellPackages.shellFor {
25+ ormoluShell = haskellPackages.shellFor {
25 packages = ps: [ ps.ormolu ];
26 packages = ps: [ ps.ormolu ];
26 buildInputs = [ haskellPackages.cabal-install haskellPackages.ghcid ];
27 buildInputs = [ haskellPackages.cabal-install haskellPackages.ghcid ];
27 };
28 };
29+ inherit ormoluOverlay ormoluCompiler;
28 hackage = pkgs.lib.mapAttrs ormolize haskellPackages;
30 hackage = pkgs.lib.mapAttrs ormolize haskellPackages;
29}
31}
shell.nix+3−1
@@ -1 +1,3 @@
1+{ pkgs ? (import ./nix/nixpkgs) }:
2+
1−(import ./default.nix).ormolu-shell
3+(import ./default.nix { inherit pkgs; }).ormoluShell