diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix index d4dc3b59cbc..41fac2d781d 100644 --- a/pkgs/applications/networking/browsers/chromium/source/update.nix +++ b/pkgs/applications/networking/browsers/chromium/source/update.nix @@ -5,8 +5,8 @@ let inherit system; }) lib runCommand writeText stdenv curl cacert nix; - sources = if builtins.pathExists ./sources.nix - then import ./sources.nix + sources = if builtins.pathExists ../upstream-info.nix + then import ../upstream-info.nix else {}; bucketURL = "https://commondatastorage.googleapis.com/" @@ -224,8 +224,8 @@ in rec { mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; attrLines = lib.mapAttrsToList mkAttr attrs; in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; - in writeText "chromium-new-sources.nix" '' - # This file is autogenerated from update.sh in the parent directory. + in writeText "chromium-new-upstream-info.nix" '' + # This file is autogenerated from update.sh in the same directory. ${dumpAttrs 0 newChannels} ''; } diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 14f3dc6bd9d..461d8b7dd40 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,4 +1,4 @@ #!/bin/sh -e cd "$(dirname "$0")" sp="$(nix-build -Q --no-out-link source/update.nix -A update)" -cat "$sp" > source/sources.nix +cat "$sp" > upstream-info.nix diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix similarity index 100% rename from pkgs/applications/networking/browsers/chromium/source/sources.nix rename to pkgs/applications/networking/browsers/chromium/upstream-info.nix