Skip to content

Commit

Permalink
Fix evaluation from previous automatic migration
Browse files Browse the repository at this point in the history
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 #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
  • Loading branch information
infinisil committed Jan 24, 2023
1 parent 24ce478 commit 5727203
Show file tree
Hide file tree
Showing 22 changed files with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9928,9 +9928,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;
Expand Down Expand Up @@ -12649,7 +12649,7 @@ with pkgs;

espeak-classic = callPackage ../applications/audio/espeak { };

espeak = res.espeak-ng;
espeak = super.espeak-ng;

espeakedit = callPackage ../applications/audio/espeak/edit.nix { };

Expand Down Expand Up @@ -12929,7 +12929,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";
};
Expand All @@ -12940,7 +12940,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";
Expand Down Expand Up @@ -16815,7 +16815,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;
Expand Down Expand Up @@ -17155,7 +17155,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 {});

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 5727203

Please sign in to comment.