diff options
| author | Ben Sima <ben@bsima.me> | 2020-10-19 17:04:16 -0400 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2020-10-19 17:04:16 -0400 |
| commit | 36021097e17ab1cfa971564cb70128d704e88f2d (patch) | |
| tree | bd68ceeadc84c99332fb4be0ed4e9a32e662e9e0 /Biz/Bild | |
| parent | a6514d11cdec3f0bdfba6929bf73cfd77a499e25 (diff) | |
Remove $ from Alpha
Diffstat (limited to 'Biz/Bild')
| -rw-r--r-- | Biz/Bild/Deps.nix | 1 | ||||
| -rw-r--r-- | Biz/Bild/Rules.nix | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix index dccbd81..a1e72ba 100644 --- a/Biz/Bild/Deps.nix +++ b/Biz/Bild/Deps.nix @@ -7,6 +7,7 @@ "bytestring" "capability" "clay" + "cmark" "config-ini" "containers" "directory" diff --git a/Biz/Bild/Rules.nix b/Biz/Bild/Rules.nix index 6afe9a0..9fea5df 100644 --- a/Biz/Bild/Rules.nix +++ b/Biz/Bild/Rules.nix @@ -36,6 +36,10 @@ let deps = lib.lists.flatten (removeNull (map (builtins.match "^-- : dep ([[:alnum:]._-]*)$") (lines content))); + + sysdeps = lib.lists.flatten (removeNull + (map (builtins.match "^-- : sys ([[:alum:]._-]*)$") + (lines content))); }; mkGhc = compiler: (deps: compiler (hp: @@ -56,7 +60,7 @@ in { in stdenv.mkDerivation { name = data.module; src = ../.; - nativeBuildInputs = [ ghc ]; + nativeBuildInputs = [ ghc ] ++ depsToPackageSet nixpkgs data.sysdeps; strictDeps = true; buildPhase = '' mkdir -p $out/bin @@ -111,6 +115,7 @@ in { "ghcjs-base" ]) + nixpkgs.cmark nixpkgs.figlet nixpkgs.hlint nixpkgs.lolcat |