more cleanup

This commit is contained in:
nek0 2023-12-16 06:42:53 +01:00
parent 2c8f4cd4b1
commit c255808595
2 changed files with 16 additions and 20 deletions

View file

@ -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

View file

@ -1,15 +1,9 @@
{ pkgs ? import <nixpkgs> {}, chaoszone ? null}: { pkgs ? import <nixpkgs> {}
, chaoszone ? import ./default.nix { inherit pkgs; packageName = "chaoszone"; }
}:
let pkgs.haskellPackages.shellFor {
chaoszone_cz = if isNull chaoszone packages = p: [ chaoszone ];
then
(import ./default.nix {inherit pkgs; packageName = "chaoszone";})
else
chaoszone;
gitignore = dir: pkgs.nix-gitignore.gitignoreSource [] dir;
in
pkgs.haskellPackages.shellFor {
packages = p: [ chaoszone_cz ];
withHoogle = true; withHoogle = true;
buildInputs = with pkgs.haskellPackages; with pkgs; [ buildInputs = with pkgs.haskellPackages; with pkgs; [
haskell-language-server haskell-language-server
@ -17,4 +11,4 @@ in
cabal-install cabal-install
vim vim
]; ];
} }