From e318dfcb3da1f19f3c7838ff71500d66b9c2a74a Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Fri, 14 Jun 2024 14:04:46 -0700
Subject: [PATCH] drop oci image outputs

We don't support this anyway. OCI images will be needed for testing with
Complement, but there are a bunch of other special requirements that has
so these oci image outputs won't be very useful for that anyway.
---
 flake.nix                      |  9 ---------
 nix/pkgs/oci-image/default.nix | 25 -------------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 nix/pkgs/oci-image/default.nix

diff --git a/flake.nix b/flake.nix
index 1d45525b..51c50679 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,8 +21,6 @@
 
         inherit inputs;
 
-        oci-image = self.callPackage ./nix/pkgs/oci-image {};
-
         # Return a new scope with overrides applied to the 'default' package
         overrideDefaultPackage = args: self.overrideScope (final: prev: {
           default = prev.default.override args;
@@ -50,7 +48,6 @@
       {
         packages = {
           default = (mkScope pkgs).default;
-          oci-image = (mkScope pkgs).oci-image;
         }
         //
         builtins.listToAttrs
@@ -73,12 +70,6 @@
                     name = binaryName;
                     value = (mkScope pkgsCrossStatic).default;
                   }
-
-                  # An output for an OCI image based on that binary
-                  {
-                    name = "oci-image-${crossSystem}";
-                    value = (mkScope pkgsCrossStatic).oci-image;
-                  }
                 ]
               )
               [
diff --git a/nix/pkgs/oci-image/default.nix b/nix/pkgs/oci-image/default.nix
deleted file mode 100644
index 8b359ce4..00000000
--- a/nix/pkgs/oci-image/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# Keep sorted
-{ default
-, dockerTools
-, lib
-, tini
-}:
-
-dockerTools.buildImage {
-  name = default.pname;
-  tag = "next";
-  copyToRoot = [
-    dockerTools.caCertificates
-  ];
-  config = {
-    # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
-    # are handled as expected
-    Entrypoint = [
-      "${lib.getExe' tini "tini"}"
-      "--"
-    ];
-    Cmd = [
-      "${lib.getExe default}"
-    ];
-  };
-}