diff options
author | William Carroll <wpcarro@gmail.com> | 2020-08-18T11·00+0100 |
---|---|---|
committer | William Carroll <wpcarro@gmail.com> | 2020-08-20T10·26+0100 |
commit | 0c71fc9d1d49daa914c0f56f4f9201d40415d9b4 (patch) | |
tree | 3c8a4b894065e64111c20d06026b63db17259c65 /haskell-file | |
parent | 51ec9e0d88b15276ec0891f932f6b572d6450809 (diff) |
Drop support for dir-locals.nix, <nixpkgs>, etc.
In the spirit of Marie Kondo, I'm tidying up! TL;DR: - Prefer .envrc `use_nix` and delete all dir-locals.nix files - Remove ~all references to <nixpkgs>, <unstable>, <depot> and prefer referencing each with briefcase.third_party.{pkgs,unstable,depot} - Delete nixBufferFromShell function since I was only using that in dir-locals.nix files
Diffstat (limited to 'haskell-file')
-rw-r--r-- | haskell-file/.envrc | 2 | ||||
-rw-r--r-- | haskell-file/shell.nix | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/haskell-file/.envrc b/haskell-file/.envrc new file mode 100644 index 000000000000..a4a62da526d3 --- /dev/null +++ b/haskell-file/.envrc @@ -0,0 +1,2 @@ +source_up +use_nix diff --git a/haskell-file/shell.nix b/haskell-file/shell.nix index f2621d6eac5a..4d5b412a0884 100644 --- a/haskell-file/shell.nix +++ b/haskell-file/shell.nix @@ -1,9 +1,5 @@ -with import <nixpkgs> {}; - -stdenv.mkDerivation { - name = "f-hs"; - buildInputs = [ - (pkgs.haskellPackages.ghcWithPackages (pkgs: [ - ])) - ]; +let + briefcase = import <briefcase> {}; +in briefcase.buildHaskell.shell { + deps = hpkgs: []; } |