diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix index e633da31cc11..a58fb3f9303a 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix @@ -34,6 +34,9 @@ rec { patch -p1 < ${source}/$patch_name done <${source}/assets/patches.txt + sed -i 's/5bc8c9bbe8c0eabe408d9a7cd7a8e6e09eee0ead817607643882b38a36d07c91/bddacbe056ce7458663a39dc99d5bb3434099aa69cae793cf0c57d4e54f5a6a4/g' third_party/rust/glean-core/.cargo-checksum.json + sed -i 's/c20989b1aa336b0849e96ec1b2beea1eab825ffd192c2c3a636e20f830b811d0/0b43fbc5f86c6c247c5189af58be425a829c3b09018c6b26589661eec9a5ad24/g' third_party/rust/glean-core/.cargo-checksum.json + rm toolkit/components/ml/content/backends/OpenAIPipeline.mjs rm -rf toolkit/components/ml/vendor/openai diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 07577047724b..f8a454af709b 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "153.0.4-1", + "packageVersion": "154.0-2", "source": { - "rev": "153.0.4-1", - "hash": "sha256-Wa62qksr9/N768dqbTuJ7etZkTbe7QPSXQ4w7YD1xRE=" + "rev": "154.0-2", + "hash": "sha256-J7n4xjl6RO9PQD0rMWeB+0EKkZcvopY8GvkM0+WbkM4=" }, "firefox": { - "version": "153.0.4", - "hash": "sha512-kIG+7X8IeXwhKAlBac+Vr0o14gj9IrunCb+xoZ4V0VqkhPzK5xFU0q4P+VW/YpzWNMx+1rGANxrqeS2vfGif9w==" + "version": "154.0", + "hash": "sha512-p3zWZJgq3WKGgRZ+9ZOb1r8MiUqjgMymb5tfsmWUeHTR6BnUImTx3QfIQ/im3AINomjMqf8eBk/KAZ3pGvm5lg==" } } diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.nix b/pkgs/by-name/li/librewolf-unwrapped/src.nix index fd8e8a7656bc..5270c1821773 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/src.nix @@ -1,16 +1,17 @@ { lib, fetchurl, - fetchFromCodeberg, + fetchFromGitLab, }: let src = lib.importJSON ./src.json; in { inherit (src) packageVersion; - source = fetchFromCodeberg ( + source = fetchFromGitLab ( src.source // { + domain = "librewolf.dev"; owner = "librewolf"; repo = "source"; fetchSubmodules = true; diff --git a/pkgs/by-name/li/librewolf-unwrapped/update.nix b/pkgs/by-name/li/librewolf-unwrapped/update.nix index db09200e5520..d9d3e3d1cc44 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/update.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/update.nix @@ -33,7 +33,7 @@ writeScript "update-librewolf" '' } set -euo pipefail - latestTag=$(curl "https://codeberg.org/api/v1/repos/librewolf/source/tags?page=1&limit=1" | jq -r .[0].name) + latestTag=$(curl "https://librewolf.dev/api/v1/repos/librewolf/source/tags?page=1&limit=1" | jq -r .[0].name) echo "latestTag=$latestTag" srcJson=pkgs/by-name/li/librewolf-unwrapped/src.json @@ -45,7 +45,7 @@ writeScript "update-librewolf" '' fi prefetchOut=$(mktemp) - repoUrl=https://codeberg.org/librewolf/source.git + repoUrl=https://librewolf.dev/librewolf/source.git nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut srcDir=$(jq -r .path < $prefetchOut) srcHash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(jq -r .sha256 < $prefetchOut))