From 639a6d21d53878ea823f1c89ca8f70d2b36601b6 Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 17 Jan 2022 12:12:25 +0100 Subject: [PATCH] rewrite nix files --- default.nix | 11 ----------- shell.nix | 8 ++++++-- 2 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 default.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index bfe2391..0000000 --- a/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs ? import (import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz)) -, haskellCompiler ? "ghc865" -}: - pkgs.haskell-nix.cabalProject { - src = pkgs.haskell-nix.haskellLib.cleanGit { src = ./.; }; - ghc = pkgs.buildPackages.pkgs.haskell-nix.compiler.${haskellCompiler}; - modules = [ - { packages."fail".components."library".doHaddock = false; - } - ]; - } diff --git a/shell.nix b/shell.nix index 32a1811..45327df 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,8 @@ +{ pkgs ? import {}}: + let - hsPkgs = import ./default.nix {}; + chaoszone_cz = + pkgs.haskellPackages.callCabal2nix "chaoszone_cz" (gitignore ./.) {}; + gitignore = dir: pkgs.nix-gitignore.gitignoreSource [] dir; in - hsPkgs.chaoszone.components.all + chaoszone_cz.env