Merge pull request #51421 from pbogdan/update-scripts-eval

nodejs.updateScript, thunderbird.updateScript: fix evaluation
This commit is contained in:
Jan Tojnar 2018-12-03 05:57:39 +01:00 committed by GitHub
commit 3008c2a620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

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

@ -101,7 +101,7 @@ in
'';
passthru.updateScript = import ./update.nix {
inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
inherit (stdenv) lib;
majorVersion = with stdenv.lib; elemAt (splitString "." version) 0;
};