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

common-updater, firefox: fix updater for firefox

Browse Source
This commit is contained in:
taku0 2018-11-16 23:04:54 +09:00
parent fa138b55a6
commit 4bb9af228e
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -43,6 +43,7 @@ rec {
}; };
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "firefox-unwrapped"; attrPath = "firefox-unwrapped";
versionKey = "ffversion";
}; };
}; };
@ -67,6 +68,7 @@ rec {
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-52-unwrapped"; attrPath = "firefox-esr-52-unwrapped";
ffversionSuffix = "esr"; ffversionSuffix = "esr";
versionKey = "ffversion";
}; };
}; };
@ -92,6 +94,7 @@ rec {
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-60-unwrapped"; attrPath = "firefox-esr-60-unwrapped";
versionSuffix = "esr"; versionSuffix = "esr";
versionKey = "ffversion";
}; };
}; };

3
pkgs/applications/networking/browsers/firefox/update.nix
View File

@ -9,6 +9,7 @@
, attrPath , attrPath
, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
, versionSuffix ? "" , versionSuffix ? ""
, versionKey ? "version"
}: }:
writeScript "update-${attrPath}" '' writeScript "update-${attrPath}" ''
@ -28,5 +29,5 @@ writeScript "update-${attrPath}" ''
sort --version-sort | \ sort --version-sort | \
tail -n 1` tail -n 1`
update-source-version ${attrPath} "$version" update-source-version ${attrPath} "$version" "" "" ${versionKey}
'' ''

11
pkgs/common-updater/scripts/update-source-version
View File

@ -6,11 +6,16 @@ die() {
exit 1 exit 1
} }
# Usage: update-source-hash <attr> <version> [<new-source-hash>] [<new-source-url>] # Usage: update-source-hash <attr> <version> [<new-source-hash>] [<new-source-url>] [<version-key>]
attr=$1 attr=$1
newVersion=$2 newVersion=$2
newHash=$3 newHash=$3
newUrl=$4 newUrl=$4
versionKey=$5
if [ -z "$versionKey" ]; then
versionKey=version
fi
nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
if [ ! -f "$nixFile" ]; then if [ ! -f "$nixFile" ]; then
@ -50,8 +55,8 @@ fi
oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
oldUrl=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') oldUrl=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
if [ $(grep -c -E "^\s*(let\b)?\s*version\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then
pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|" pattern="/\b$versionKey\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then
pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|" pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|"
else else