resholve: track API update in dependent packages

pkgs/applications/version-management/yadm/default.nix

@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , git
 , bash
@@ -27,7 +27,7 @@ to support their use in yadm.
 , yadm
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "yadm";
   version = "3.1.1";
 

pkgs/development/interpreters/bats/default.nix

@@ -1,4 +1,4 @@
-{ resholvePackage
+{ resholve
 , lib
 , stdenv
 , fetchFromGitHub
@@ -10,7 +10,7 @@
 , doInstallCheck ? true
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "bats";
   version = "1.6.0";
 

pkgs/development/libraries/bashup-events/generic.nix

@@ -1,7 +1,7 @@
 {
   # general
   lib
-, resholvePackage
+, resholve
 , bash
 , doCheck ? true
 , doInstallCheck ? true
@@ -32,7 +32,7 @@ let
     '';
 
 in
-resholvePackage rec {
+resholve.mkDerivation rec {
   # bashup.events doesn't version yet but it has two variants with
   # differing features/performance characteristics:
   # - branch master: a variant for bash 3.2+

pkgs/tools/misc/arch-install-scripts/default.nix

@@ -1,5 +1,5 @@
 { lib
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , asciidoc
 , bash
@@ -10,7 +10,7 @@
 , util-linux
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "arch-install-scripts";
   version = "24";
 
@@ -43,7 +43,7 @@ resholvePackage rec {
       # the only *required* arguments are the 3 below
 
       # Specify 1 or more $out-relative script paths. Unlike many
-      # builders, resholvePackage modifies the output files during
+      # builders, resholve.mkDerivation modifies the output files during
       # fixup (to correctly resolve in-package sourcing).
       scripts = [ "bin/arch-chroot" "bin/genfstab" "bin/pacstrap" ];
 

pkgs/tools/misc/dgoss/default.nix

@@ -1,6 +1,6 @@
 { lib
 , fetchFromGitHub
-, resholvePackage
+, resholve
 , substituteAll
 , bash
 , coreutils
@@ -8,7 +8,7 @@
 , which
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "dgoss";
   version = "0.3.16";
 

pkgs/tools/misc/shunit2/default.nix

@@ -1,5 +1,5 @@
 { lib
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , bash
 , coreutils
@@ -9,7 +9,7 @@
 , ncurses
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "shunit2";
   version = "2.1.8";
 
@@ -63,7 +63,7 @@ resholvePackage rec {
         interpreter, we can pre-test this. But if we go fiddle
         the interpreter later, I guess we _could_ break it.
         */
-        "$__SHUNIT_CMD_ECHO_ESC" = [ "'echo -e'" ];
+        "$__SHUNIT_CMD_ECHO_ESC" = [ "echo -e" ];
         "$SHUNIT_CMD_TPUT" = [ "tput" ]; # from ncurses
       };
       keep = {

pkgs/tools/typesetting/pdf2odt/default.nix

@@ -1,5 +1,5 @@
 { lib
-, resholvePackage
+, resholve
 , fetchFromGitHub
 , bc
 , coreutils
@@ -13,7 +13,7 @@
 , findutils
 }:
 
-resholvePackage rec {
+resholve.mkDerivation rec {
   pname = "pdf2odt";
   version = "20170207";
 

pkgs/top-level/aliases.nix

@@ -1040,13 +1040,10 @@ mapAliases ({
   reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
   renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12
 
-  /* 3 resholve aliases below added 2022-04-08 to ease breaking change
-  - convert to throw after 2022-07-01
-  - drop after 2022-11-30?
-  */
-  resholvePackage = builtins.trace "resholvePackage is deprecated, use resholve.mkDerivation instead" resholve.mkDerivation;
-  resholveScript = builtins.trace "resholveScript is deprecated, use resholve.writeScript instead" resholve.writeScript;
-  resholveScriptBin = builtins.trace "resholveScriptBin is deprecated, use resholve.writeScriptBin instead" resholve.writeScriptBin;
+  # 3 resholve aliases below added 2022-04-08; drop after 2022-11-30?
+  resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation";
+  resholveScript = throw "resholveScript has been renamed to resholve.writeScript";
+  resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin";
 
   residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27
   retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19