From 550c1db792af21f7180f4cf7b2ea1642401df003 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Fri, 20 Jan 2023 22:20:50 +0100
Subject: [PATCH] Fix evaluation from previous automatic migration

Tested with nix-env -qaf .

The res -> super changes are necessary because res points to the result
of the current overlay, but some of the packages were moved to the
previous overlay, which can be accessed with super. This is a
fundamental problem to be fixed, see https://github.com/NixOS/nixpkgs/pull/55061
and related issues

The schleuder change is necessary because the ./default.nix file
referenced ./., but there's also another package in ./bin. The tool
couldn't move the gemfiles in ./. because

The schleuder change is necessary because the tool isn't smart enough
and this is a special case of the default.nix reading gemfiles from a
./. reference and there being both schleuder in
pkgs/tools/security/schleuder and schleuder-cli in
pkgs/tools/security/schleuder/cli
---
 pkgs/top-level/all-packages.nix                    | 14 +++++++-------
 pkgs/{tools/security => unit/sc}/schleuder/Gemfile |  0
 .../security => unit/sc}/schleuder/Gemfile.lock    |  0
 .../security => unit/sc}/schleuder/gemset.nix      |  0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/{tools/security => unit/sc}/schleuder/Gemfile (100%)
 rename pkgs/{tools/security => unit/sc}/schleuder/Gemfile.lock (100%)
 rename pkgs/{tools/security => unit/sc}/schleuder/gemset.nix (100%)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba9232ded3c9f58..da4b4041d4f7eef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9939,9 +9939,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
   };
 
-  pcre16 = res.pcre.override { variant = "pcre16"; };
+  pcre16 = super.pcre.override { variant = "pcre16"; };
   # pcre32 seems unused
-  pcre-cpp = res.pcre.override { variant = "cpp"; };
+  pcre-cpp = super.pcre.override { variant = "cpp"; };
 
   inherit (callPackage ../development/libraries/physfs {
     inherit (darwin.apple_sdk.frameworks) Foundation;
@@ -12656,7 +12656,7 @@ with pkgs;
 
   espeak-classic = callPackage ../applications/audio/espeak { };
 
-  espeak = res.espeak-ng;
+  espeak = super.espeak-ng;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
@@ -12936,7 +12936,7 @@ with pkgs;
     generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
   };
 
-  firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
+  firefox-beta-bin = super.wrapFirefox firefox-beta-bin-unwrapped {
     pname = "firefox-beta-bin";
     desktopName = "Firefox Beta";
   };
@@ -12947,7 +12947,7 @@ with pkgs;
     generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix;
   };
 
-  firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
+  firefox-devedition-bin = super.wrapFirefox firefox-devedition-bin-unwrapped {
     nameSuffix = "-devedition";
     pname = "firefox-devedition-bin";
     desktopName = "Firefox DevEdition";
@@ -16818,7 +16818,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
   };
 
-  faust = res.faust2;
+  faust = super.faust2;
 
   gajim = callPackage ../applications/networking/instant-messengers/gajim {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
@@ -17150,7 +17150,7 @@ with pkgs;
   mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver;
   mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper;
 
-  samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
+  samsung-unified-linux-driver = super.samsung-unified-linux-driver_4_01_17;
 
   sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {});
 
diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/unit/sc/schleuder/Gemfile
similarity index 100%
rename from pkgs/tools/security/schleuder/Gemfile
rename to pkgs/unit/sc/schleuder/Gemfile
diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/unit/sc/schleuder/Gemfile.lock
similarity index 100%
rename from pkgs/tools/security/schleuder/Gemfile.lock
rename to pkgs/unit/sc/schleuder/Gemfile.lock
diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/unit/sc/schleuder/gemset.nix
similarity index 100%
rename from pkgs/tools/security/schleuder/gemset.nix
rename to pkgs/unit/sc/schleuder/gemset.nix