Add -iog-full flavor (with R and Postgres)

input-output-hk · Mar 19, 2024 · 3983ad1 · 3983ad1
1 parent 2f4fa7f
commit 3983ad1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/dynamic.nix b/dynamic.nix
@@ -1,5 +1,5 @@
 # define a development shell for dynamically linked applications (default)
-{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true }:
+{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOGFull ? false, withIOG ? (withIOGFull || true) }:
 let tool-version-map = import ./tool-map.nix;
     tool = tool-name: pkgs.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
     cabal-install = pkgs.haskell-nix.nix-tools-unchecked.exes.cabal;
@@ -101,6 +101,6 @@ pkgs.mkShell {
             jq
             yq-go
         ]
-        ++ map pkgs.lib.getDev (with pkgs; [ libblst libsodium-vrf secp256k1 R_4_1_3 postgresql icu ]))
+        ++ map pkgs.lib.getDev (with pkgs; [ libblst libsodium-vrf secp256k1 icu ] ++ pkgs.lib.optional (withIOGFull) [ R_4_1_3 postgresql ]))
     ;
 }
diff --git a/flake.nix b/flake.nix
@@ -133,6 +133,14 @@
                   pkgs.lib.nameValuePair "${short-name}-minimal-iog" (
                     import ./dynamic.nix (args // { withHLS = false; withHlint = false; withIOG = true; })
                   )) (compilers pkgs)
+              // pkgs.lib.mapAttrs' (short-name: args:
+                  pkgs.lib.nameValuePair "${short-name}-iog-full" (
+                    import ./dynamic.nix (args // { withIOGFull = true; })
+                  )) (compilers pkgs)
+              // pkgs.lib.mapAttrs' (short-name: args:
+                    pkgs.lib.nameValuePair "${short-name}-minimal-iog-full" (
+                    import ./dynamic.nix (args // { withHLS = false; withIOG = false; withIOGFull = true; })
+                  )) (compilers pkgs)
               // pkgs.lib.mapAttrs' (short-name: args:
                   pkgs.lib.nameValuePair "${short-name}-static-iog" (
                     import ./static.nix (args // { withIOG = true; })