pyrox.dev
librewolf-unwrapped: 116.0.3-1 -> 117.0.1-1
- Handle upstream removing revisions of the settings repository
- Change update script to pick the latest settings revision
- See issue #252276
+2
-2
pkgs/applications/networking/browsers/librewolf/librewolf.nix
+2
-2
pkgs/applications/networking/browsers/librewolf/librewolf.nix
···
29
sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure
30
'';
31
32
-
extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ];
33
34
-
extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ];
35
36
extraPassthru = {
37
librewolf = { inherit src extraPatches; };
+9
-5
pkgs/applications/networking/browsers/librewolf/src.json
+9
-5
pkgs/applications/networking/browsers/librewolf/src.json
···
1
{
2
-
"packageVersion": "116.0.3-1",
3
"source": {
4
-
"rev": "116.0.3-1",
5
-
"sha256": "19l5nny96p89xm8c9f5m1435sglshn7izmjnj338c8qh217zxiyq"
6
},
7
"firefox": {
8
-
"version": "116.0.3",
9
-
"sha512": "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9"
10
}
11
}
···
1
{
2
+
"packageVersion": "117.0.1-1",
3
"source": {
4
+
"rev": "117.0.1-1",
5
+
"sha256": "06j85b6v54vxj99hgrlibpsg6f8w8cqj912vz7gwyfa17pawax9z"
6
+
},
7
+
"settings": {
8
+
"rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6",
9
+
"sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb"
10
},
11
"firefox": {
12
+
"version": "117.0.1",
13
+
"sha512": "1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071"
14
}
15
}
+7
-1
pkgs/applications/networking/browsers/librewolf/src.nix
+7
-1
pkgs/applications/networking/browsers/librewolf/src.nix
···
1
+
{ lib, fetchurl, fetchFromGitLab, fetchFromGitea }:
2
let src = lib.importJSON ./src.json;
3
in
4
{
···
8
repo = "browser/source";
9
fetchSubmodules = true;
10
inherit (src.source) rev sha256;
11
+
};
12
+
settings = fetchFromGitea {
13
+
domain = "codeberg.org";
14
+
owner = "librewolf";
15
+
repo = "settings";
16
+
inherit (src.settings) rev sha256;
17
};
18
firefox = fetchurl {
19
url =
+9
pkgs/applications/networking/browsers/librewolf/update.nix
+9
pkgs/applications/networking/browsers/librewolf/update.nix
···
57
ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)
58
echo "ffHash=$ffHash"
59
60
jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson
61
jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson
62
jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson
63
jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson
64
jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson
65
''
···
57
ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)
58
echo "ffHash=$ffHash"
59
60
+
# upstream does not specify settings rev, so just get the latest. see https://github.com/NixOS/nixpkgs/issues/252276
61
+
settingsRev=$(curl 'https://codeberg.org/api/v1/repos/librewolf/settings/commits?sha=master&limit=1' | jq -r .[0].sha)
62
+
echo "settingsRev=$settingsRev"
63
+
repoUrl=https://codeberg.org/librewolf/settings
64
+
nix-prefetch-git $repoUrl --quiet --rev $settingsRev > $prefetchOut
65
+
settingsSha256=$(jq -r .sha256 < $prefetchOut)
66
+
67
jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson
68
jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson
69
jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson
70
jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson
71
jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson
72
+
jq ".settings.rev = \"$settingsRev\"" $srcJson | sponge $srcJson
73
+
jq ".settings.sha256 = \"$settingsSha256\"" $srcJson | sponge $srcJson
74
''