diff --git a/ci/OWNERS b/ci/OWNERS index 4e8cc28e50fe..8a52e846aafd 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -247,7 +247,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo /pkgs/applications/networking/browsers/firefox/update.nix /pkgs/applications/networking/browsers/firefox/packages/firefox.nix @mweinelt /pkgs/applications/networking/browsers/firefox/packages/firefox-esr-*.nix @mweinelt -/pkgs/applications/networking/browsers/librewolf @squalus @DominicWrege @fpletz /pkgs/applications/networking/browsers/chromium @emilylange @networkException /nixos/tests/chromium.nix @emilylange @networkException diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/librewolf.nix rename to pkgs/by-name/li/librewolf-unwrapped/librewolf.nix diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix similarity index 95% rename from pkgs/applications/networking/browsers/librewolf/default.nix rename to pkgs/by-name/li/librewolf-unwrapped/package.nix index ccb39de0dc8d..e8ca16d5a5c1 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix @@ -29,7 +29,6 @@ in description = "Fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf.net/"; maintainers = with lib.maintainers; [ - # Also update ci/OWNERS entry when changing maintainers squalus dwrege fpletz diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/src.json rename to pkgs/by-name/li/librewolf-unwrapped/src.json diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/by-name/li/librewolf-unwrapped/src.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/src.nix rename to pkgs/by-name/li/librewolf-unwrapped/src.nix diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/by-name/li/librewolf-unwrapped/update.nix similarity index 97% rename from pkgs/applications/networking/browsers/librewolf/update.nix rename to pkgs/by-name/li/librewolf-unwrapped/update.nix index 8833c2bcf1db..db09200e5520 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/update.nix @@ -36,7 +36,7 @@ writeScript "update-librewolf" '' latestTag=$(curl "https://codeberg.org/api/v1/repos/librewolf/source/tags?page=1&limit=1" | jq -r .[0].name) echo "latestTag=$latestTag" - srcJson=pkgs/applications/networking/browsers/librewolf/src.json + srcJson=pkgs/by-name/li/librewolf-unwrapped/src.json localRev=$(jq -r .source.rev < $srcJson) echo "localRev=$localRev" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78cc0f997b23..8331bd8c39bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10011,16 +10011,6 @@ with pkgs; pname = "firefox-bin"; }; - librewolf-unwrapped = import ../applications/networking/browsers/librewolf { - inherit - stdenv - lib - callPackage - buildMozillaMach - nixosTests - ; - }; - librewolf = wrapFirefox librewolf-unwrapped { inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; libName = "librewolf";