diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-06-18 13:08:32 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-06-18 13:10:23 +0200 |
commit | 5e045da578ebeaa01e01c9907a08c2b7747ed033 (patch) | |
tree | b8122a9ba50285888e6e6958ece10a7eff0dcab6 | |
parent | 7bd160ad4869e4cd3fc95de9c1ce51c9e8da3a1e (diff) | |
download | nixpkgs-5e045da578ebeaa01e01c9907a08c2b7747ed033.tar nixpkgs-5e045da578ebeaa01e01c9907a08c2b7747ed033.tar.gz nixpkgs-5e045da578ebeaa01e01c9907a08c2b7747ed033.tar.bz2 nixpkgs-5e045da578ebeaa01e01c9907a08c2b7747ed033.tar.lz nixpkgs-5e045da578ebeaa01e01c9907a08c2b7747ed033.tar.xz nixpkgs-5e045da578ebeaa01e01c9907a08c2b7747ed033.tar.zst nixpkgs-5e045da578ebeaa01e01c9907a08c2b7747ed033.zip |
treewide: fixup evaluation of updater scripts
... broken by f3282c8 #63177. Discovered by the tarball job: https://hydra.nixos.org/build/94927223
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 4262609c66b..50eae97ae7c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -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/" diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 7f32e45f5d3..08823364479 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -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"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 3e360a28829..7fc94d43457 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -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; }; } diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index b4213c6ed94..6dc68750075 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -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; }; diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 13a5f2a2bff..557481a04a4 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -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 = { |