6b73283 · ormolu · git.iko.soy

.circleci/config.yml+1−1

compare with master

unifiedsplit

@@ -31,7 +31,7 @@ jobs:

31 command: nix-build

32 - run:

33 name: Generate Haddocks

34− command: nix-build --attr doc

34+ command: nix-build --attr ormolu.doc

35 - store_artifacts:

36 path: result-doc/share/doc

37 destination: haddock

.gitignore+1

@@ -26,3 +26,4 @@ cabal.sandbox.config

26dist-*/

27dist/

28stack.yaml

29+result*

default.nix+19−24

@@ -1,24 +1,19 @@

1+let

1−let pkgs = import ./nix/nixpkgs;

2+ pkgs = import ./nix/nixpkgs;

3+ gitignoreSource = import ./nix/gitignore { inherit (pkgs) lib; };

2− compiler = "ghc864";

4+ compiler = "ghc864";

3− sourceRegex = [

5+ source = gitignoreSource ./.;

4− "^app.*$"

5− "^data.*$"

6− "^ormolu.cabal$"

7− "^src.*$"

8− "^tests.*$"

9− "^.*\.md$"

10− ];

11− haskellPackages = pkgs.haskell.packages.${compiler}.override

6+ haskellPackages = pkgs.haskell.packages.${compiler}.override {

12− { overrides = (self: super:

7+ overrides = (self: super:

13− super //

8+ super // {

14− { "ormolu" = super.callCabal2nix "ormolu" (pkgs.lib.sourceByRegex ./. sourceRegex) {};

9+ "ormolu" = super.callCabal2nix "ormolu" source { };

15− });

10+ });

16− };

11+ };

17−in if pkgs.lib.inNixShell

12+in {

13+ ormolu = haskellPackages.ormolu;

18− then haskellPackages.shellFor

14+ ormolu-shell = haskellPackages.shellFor {

19− { packages = (ps: [ ps.ormolu ]);

15+ packages = ps: [ ps.ormolu ];

20− buildInputs = [

21− pkgs.cabal-install

16+ buildInputs = [ pkgs.cabal-install ];

22− ];

17+ };

23− }

18+}

24− else haskellPackages.ormolu

19+

nix/gitignore/default.nixnew file+8

@@ -0,0 +1,8 @@

1+{ lib }:

2+

3+let

4+ rev = "ec5dd0536a5e4c3a99c797b86180f7261197c124";

5+ sha256 = "0k2r8y21rn4kr5dmddd3906x0733fs3bb8hzfpabkdav3wcy3klv";

6+ url = "https://github.com/hercules-ci/gitignore/archive/${rev}.tar.gz";

7+ nixGitIgnore = builtins.fetchTarball { inherit url sha256; };

8+in (import nixGitIgnore { inherit lib; }).gitignoreSource

nix/nixpkgs/default.nix+6−4

@@ -1,8 +1,10 @@

1let

2− rev = "f52505fac8c82716872a616c501ad9eff188f97f";

2+ rev = "454eea84a757ca5f733c4ec0f234eba2281c74eb";

3− sha256 = "0q2m2qhyga9yq29yz90ywgjbn9hdahs7i8wwlq7b55rdbyiwa5dy";

3+ sha256 = "1k9jbix4w43brqlfmvwy218pf5fbmzsnc08shaww9qfdl1rdlaxy";

4− pkgs = import (builtins.fetchTarball {

4+ nixpkgs = builtins.fetchTarball {

5 url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";

6 inherit sha256;

7+ };

7− }) { config.allowUnfree = true; };

8+ pkgs = import nixpkgs { config.allowUnfree = true; };

8in pkgs

9in pkgs

10+

shell.nixnew file+1

@@ -0,0 +1 @@

1+(import ./default.nix).ormolu-shell