treewide: fixup evaluation of updater scripts

... broken by f3282c8 #63177.  Discovered by the tarball job:
https://hydra.nixos.org/build/94927223
This commit is contained in:
Vladimír Čunát 2019-06-18 13:08:32 +02:00
parent 7bd160ad48
commit 5e045da578
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
5 changed files with 5 additions and 5 deletions

View file

@ -191,7 +191,7 @@ stdenv.mkDerivation {
# update with:
# $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
passthru.updateScript = import ./update.nix {
inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
baseUrl =
if channel == "devedition"
then "http://archive.mozilla.org/pub/devedition/releases/"

View file

@ -160,7 +160,7 @@ stdenv.mkDerivation {
'';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
inherit name writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
baseName = "thunderbird";
channel = "release";
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";

View file

@ -201,6 +201,6 @@ in stdenv.mkDerivation rec {
passthru.updateScript = import ./../../browsers/firefox/update.nix {
attrPath = "thunderbird";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell;
inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell;
};
}

View file

@ -114,7 +114,7 @@ in
'';
passthru.updateScript = import ./update.nix {
inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell;
inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell;
inherit (stdenv) lib;
inherit majorVersion;
};

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = import ./update.nix {
inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts runtimeShell;
inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts runtimeShell;
};
meta = {