From 8af1c1425e9c48eb62d963665ec0ca497642add4 Mon Sep 17 00:00:00 2001 From: Jamie Bertram Date: Mon, 17 Apr 2023 08:04:40 -0400 Subject: [PATCH] Remove tag from mkStandardOCI --- flake.nix | 3 +++ nix/cells/marlowe-playground/devshells.nix | 2 +- nix/cells/marlowe-playground/library/default.nix | 2 -- nix/cells/marlowe-playground/oci-images.nix | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 3ae0a5742..24bb0b556 100644 --- a/flake.nix +++ b/flake.nix @@ -120,6 +120,9 @@ # harvest the ciJobs cell block from the automation cell. hydraJobs = inputs.std.harvest inputs.self [ "automation" "ciJobs" ]; + + # harvest the oci-images cell block from the marlowe-playground cell. + oci-images = inputs.std.harvest inputs.self [ "marlowe-playground" "oci-images" ]; } { # harvest the scripts cell block from the marlowe-playground cell. diff --git a/nix/cells/marlowe-playground/devshells.nix b/nix/cells/marlowe-playground/devshells.nix index 7d1149c94..acad25fd3 100644 --- a/nix/cells/marlowe-playground/devshells.nix +++ b/nix/cells/marlowe-playground/devshells.nix @@ -7,7 +7,7 @@ let shell = inputs.std.lib.dev.mkShell { name = "marlowe-playground-shell"; - imports = [ haskell-devshell ]; + imports = [ haskell-devshell inputs.std.std.devshellProfiles.default ]; commands = [ { diff --git a/nix/cells/marlowe-playground/library/default.nix b/nix/cells/marlowe-playground/library/default.nix index eadf764e7..b60080498 100644 --- a/nix/cells/marlowe-playground/library/default.nix +++ b/nix/cells/marlowe-playground/library/default.nix @@ -6,8 +6,6 @@ ghc-compiler-nix-name = import ./ghc-compiler-nix-name.nix block; - ghc-with-marlowe = import ./ghc-with-marlowe.nix block; - ghc = import ./ghc.nix block; haskell-language-server-project = import ./haskell-language-server-project.nix block; diff --git a/nix/cells/marlowe-playground/oci-images.nix b/nix/cells/marlowe-playground/oci-images.nix index c294482f9..37c31296f 100644 --- a/nix/cells/marlowe-playground/oci-images.nix +++ b/nix/cells/marlowe-playground/oci-images.nix @@ -8,7 +8,6 @@ let mkImage = { name, description }: mkStandardOCI { inherit name; - tag = "latest"; operable = operables.${name}; uid = "0"; gid = "0";