Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7bd160ad4869
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e045da578eb
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Jun 18, 2019

  1. treewide: fixup evaluation of updater scripts

    ... broken by f3282c8 #63177.  Discovered by the tarball job:
    https://hydra.nixos.org/build/94927223
    vcunat committed Jun 18, 2019
    Copy the full SHA
    5e045da View commit details
Original file line number Diff line number Diff line change
@@ -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/"
Original file line number Diff line number Diff line change
@@ -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";
Original file line number Diff line number Diff line change
@@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/web/nodejs/nodejs.nix
Original file line number Diff line number Diff line change
@@ -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;
};
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/tp_smapi/default.nix
Original file line number Diff line number Diff line change
@@ -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 = {