From c4461bbe1ceeaacca183847655672244e6d3d5f5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Nov 2024 15:28:52 +0100
Subject: [PATCH] singularity-tools: remove deprecated shellScript and mkLayer

Scheduled for 25.05.
---
 .../singularity-tools/default.nix             | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index f85e9745d782..9423a4e32cf3 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -22,38 +22,6 @@ let
   defaultSingularity = singularity;
 in
 lib.makeExtensible (final: {
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.11 branch-off.
-  shellScript =
-    lib.warn
-      "`singularity-tools.shellScript` is deprecated. Use `writeScript`, `writeShellScripts` or `writers.writeBash` instead."
-      (
-        name: text:
-        writeScript name ''
-          #!${runtimeShell}
-          set -e
-          ${text}
-        ''
-      );
-
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.11 branch-off.
-  mkLayer =
-    lib.warn
-      "`singularity-tools.mkLayer` is deprecated, as it is no longer used to implement `singularity-tools.buildImages`."
-      (
-        {
-          name,
-          contents ? [ ],
-          # May be "apptainer" instead of "singularity"
-          projectName ? (singularity.projectName or "singularity"),
-        }:
-        runCommand "${projectName}-layer-${name}" { inherit contents; } ''
-          mkdir $out
-          for f in $contents ; do
-            cp -ra $f $out/
-          done
-        ''
-      );
-
   buildImage =
     {
       name,