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

chromium: Rename sources.nix to upstream-info.nix 

The "sources.nix" also contains information about where to get binary
packages, so calling it "upstream-info.nix" fits better in terms of
naming.

Also, we're moving it away from the sources dir, because the latter will
soon vanish.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2016-03-20 16:48:54 +01:00
parent d6b11ed722
commit 2d9a604907
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/chromium/source/update.nix
View File

@ -5,8 +5,8 @@ let
inherit system; inherit system;
}) lib runCommand writeText stdenv curl cacert nix; }) lib runCommand writeText stdenv curl cacert nix;
sources = if builtins.pathExists ./sources.nix sources = if builtins.pathExists ../upstream-info.nix
then import ./sources.nix then import ../upstream-info.nix
else {}; else {};
bucketURL = "https://commondatastorage.googleapis.com/" bucketURL = "https://commondatastorage.googleapis.com/"
@ -224,8 +224,8 @@ in rec {
mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n";
attrLines = lib.mapAttrsToList mkAttr attrs; attrLines = lib.mapAttrsToList mkAttr attrs;
in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}";
in writeText "chromium-new-sources.nix" '' in writeText "chromium-new-upstream-info.nix" ''
# This file is autogenerated from update.sh in the parent directory. # This file is autogenerated from update.sh in the same directory.
${dumpAttrs 0 newChannels} ${dumpAttrs 0 newChannels}
''; '';
} }

2
pkgs/applications/networking/browsers/chromium/update.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh -e #!/bin/sh -e
cd "$(dirname "$0")" cd "$(dirname "$0")"
sp="$(nix-build -Q --no-out-link source/update.nix -A update)" sp="$(nix-build -Q --no-out-link source/update.nix -A update)"
cat "$sp" > source/sources.nix cat "$sp" > upstream-info.nix

0
pkgs/applications/networking/browsers/chromium/source/sources.nix → pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File