more cleanup
This commit is contained in:
parent
2c8f4cd4b1
commit
c255808595
2 changed files with 16 additions and 20 deletions
|
@ -1,4 +1,6 @@
|
||||||
{ pkgs ? import <nixpkgs> {}, self ? ./., packageName ? "chaoszone" }:
|
{ pkgs ? import <nixpkgs> {}
|
||||||
|
, self ? ./., packageName ? "chaoszone"
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
gitignore = dir: pkgs.nix-gitignore.gitignoreSource [] dir;
|
gitignore = dir: pkgs.nix-gitignore.gitignoreSource [] dir;
|
||||||
in
|
in
|
||||||
|
|
14
shell.nix
14
shell.nix
|
@ -1,15 +1,9 @@
|
||||||
{ pkgs ? import <nixpkgs> {}, chaoszone ? null}:
|
{ pkgs ? import <nixpkgs> {}
|
||||||
|
, chaoszone ? import ./default.nix { inherit pkgs; packageName = "chaoszone"; }
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
chaoszone_cz = if isNull chaoszone
|
|
||||||
then
|
|
||||||
(import ./default.nix {inherit pkgs; packageName = "chaoszone";})
|
|
||||||
else
|
|
||||||
chaoszone;
|
|
||||||
gitignore = dir: pkgs.nix-gitignore.gitignoreSource [] dir;
|
|
||||||
in
|
|
||||||
pkgs.haskellPackages.shellFor {
|
pkgs.haskellPackages.shellFor {
|
||||||
packages = p: [ chaoszone_cz ];
|
packages = p: [ chaoszone ];
|
||||||
withHoogle = true;
|
withHoogle = true;
|
||||||
buildInputs = with pkgs.haskellPackages; with pkgs; [
|
buildInputs = with pkgs.haskellPackages; with pkgs; [
|
||||||
haskell-language-server
|
haskell-language-server
|
||||||
|
|
Loading…
Reference in a new issue