Skip to content

Commit cb1b15d

Browse files
committed
Add -iog-full flavor (with R and Postgres)
1 parent 2f4fa7f commit cb1b15d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

dynamic.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# define a development shell for dynamically linked applications (default)
2-
{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true }:
2+
{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true, withIOGFull ? false }:
33
let tool-version-map = import ./tool-map.nix;
44
tool = tool-name: pkgs.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
55
cabal-install = pkgs.haskell-nix.nix-tools-unchecked.exes.cabal;
@@ -101,6 +101,6 @@ pkgs.mkShell {
101101
jq
102102
yq-go
103103
]
104-
++ map pkgs.lib.getDev (with pkgs; [ libblst libsodium-vrf secp256k1 R_4_1_3 postgresql icu ]))
104+
++ map pkgs.lib.getDev (with pkgs; [ libblst libsodium-vrf secp256k1 icu ] ++ pkgs.lib.optional (withIOGFull) [ R_4_1_3 postgresql ]))
105105
;
106106
}

flake.nix

+8
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,14 @@
133133
pkgs.lib.nameValuePair "${short-name}-minimal-iog" (
134134
import ./dynamic.nix (args // { withHLS = false; withHlint = false; withIOG = true; })
135135
)) (compilers pkgs)
136+
// pkgs.lib.mapAttrs' (short-name: args:
137+
pkgs.lib.nameValuePair "${short-name}-iog-full" (
138+
import ./dynamic.nix (args // { withIOGFull = true; })
139+
)) (compilers pkgs)
140+
// pkgs.lib.mapAttrs' (short-name: args:
141+
pkgs.lib.nameValuePair "${short-name}-minimal-iog-full" (
142+
import ./dynamic.nix (args // { withHLS = false; withIOG = false; withIOGFull = true; })
143+
)) (compilers pkgs)
136144
// pkgs.lib.mapAttrs' (short-name: args:
137145
pkgs.lib.nameValuePair "${short-name}-static-iog" (
138146
import ./static.nix (args // { withIOG = true; })

0 commit comments

Comments
 (0)