Skip to content

Commit 484f4da

Browse files
Merge request #748 shell.nix: use Haskell notation, explicit attrs
2 parents ead52c1 + a277ad4 commit 484f4da

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
, executableNamesToShellComplete ? [ "hnix" ]
7777

7878

79-
# Include Hoogle into derivation
80-
, withHoogle ? true
79+
# Include Hoogle executable and DB into derivation
80+
, withHoogle ? false
8181

8282

8383
# Nix by default updates and uses locally configured nixpkgs-unstable channel

shell.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
{} @ attrs: (import ./. attrs).env
1+
attrs@{...}:
2+
let defaultAttrs = {
3+
# Defaults are put in this form deliberately. Details: #748
4+
withHoogle = true;
5+
compiler = "ghc8101";
6+
};
7+
in (import ./. (defaultAttrs // attrs)).env

0 commit comments

Comments
 (0)