public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: fixup evaluation of updater scripts

Browse Source 
... 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -191,7 +191,7 @@ stdenv.mkDerivation {
# update with: # update with:
# $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
passthru.updateScript = import ./update.nix { 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 = baseUrl =
if channel == "devedition" if channel == "devedition"
then "http://archive.mozilla.org/pub/devedition/releases/" then "http://archive.mozilla.org/pub/devedition/releases/"

2
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -160,7 +160,7 @@ stdenv.mkDerivation {
''; '';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { 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"; baseName = "thunderbird";
channel = "release"; channel = "release";
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -201,6 +201,6 @@ in stdenv.mkDerivation rec {
passthru.updateScript = import ./../../browsers/firefox/update.nix { passthru.updateScript = import ./../../browsers/firefox/update.nix {
attrPath = "thunderbird"; attrPath = "thunderbird";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; 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;
}; };
} }

2
pkgs/development/web/nodejs/nodejs.nix
View File

@ -114,7 +114,7 @@ in
''; '';
passthru.updateScript = import ./update.nix { 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 (stdenv) lib;
inherit majorVersion; inherit majorVersion;
}; };

2
pkgs/os-specific/linux/tp_smapi/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = import ./update.nix { 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 = { meta = {