port (most of the) pkgs overlay to nixpkgs by-name style

default.nix

@@ -1,5 +1,5 @@
 { ... }@args:
 let
-  sane-nix-files = import ./pkgs/additional/sane-nix-files { };
+  sane-nix-files = import ./pkgs/by-name/sane-nix-files/package.nix { };
 in
   import "${sane-nix-files}/impure.nix" args

impure.nix

@@ -6,8 +6,9 @@
 # see default.nix for a wrapper around this with better purity guarantees.
 { }:
 let
-  mkPkgs = args: (import ./pkgs/additional/nixpkgs args).extend
+  mkPkgs = args: (
-    (import ./overlays/all.nix);
+    import ./pkgs/by-name/nixpkgs/package.nix args
+  ).extend (import ./overlays/all.nix);
   inherit (mkPkgs {}) lib;
 
   evalHost = { name, system, branch ? "master", variant ? null }:

pkgs/additional/firefox-extensions/default.nix

@@ -1,232 +0,0 @@
-{
-  callPackage,
-  concatTextFile,
-  fetchurl,
-  jq,
-  lib,
-  newScope,
-  nix-update-script,
-  runCommandLocal,
-  stdenv,
-  strip-nondeterminism,
-  unzip,
-  writers,
-  zip,
-}:
-let
-  wrapAddon = addon: args:
-  let
-    extid = addon.passthru.extid;
-    # merge our requirements into the derivation args
-    args' = args // {
-      passthru = addon.passthru // (args.passthru or {});
-      nativeBuildInputs = [
-        jq
-        strip-nondeterminism
-        unzip
-        zip
-      ] ++ (args.nativeBuildInputs or []);
-    };
-  in (stdenv.mkDerivation ({
-    # heavily borrows from <repo:nixos/nixpkgs:pkgs/build-support/fetchfirefoxaddon/default.nix>
-    name = "${addon.name}-wrapped";
-    unpackPhase = ''
-      echo "patching firefox addon $name into $out/${extid}.xpi"
-
-      mkdir build
-      cd build
-      # extract the XPI into the build directory
-      # it could be already wrapped, or a raw fetchurl result
-      unzip -q "${addon}/${extid}.xpi" -d . || \
-        unzip -q "${addon}" -d .
-    '';
-
-    patchPhase = ''
-      runHook prePatch
-
-      # firefox requires addons to have an id field when sideloading:
-      # - <https://extensionworkshop.com/documentation/publish/distribute-sideloading/>
-      for m in manifest.json manifest_v2.json manifest_v3.json; do
-        if test -e "$m"; then
-          NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}, "browser_specific_settings":{"gecko":{"id": "${extid}"}}}' "$m")
-          echo "$NEW_MANIFEST" > "$m"
-        fi
-      done
-
-      runHook postPatch
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      # repackage the XPI
-      mkdir "$out"
-      zip -r -q -FS "$out/${extid}.xpi" ./*
-      strip-nondeterminism "$out/${extid}.xpi"
-
-      runHook postInstall
-    '';
-  } // args')).overrideAttrs (final: upstream: {
-    passthru = (upstream.passthru or {}) // {
-      unwrapped = addon;
-      withAttrs = attrs: wrapAddon addon (args // attrs);
-      withPostPatch = postPatch: final.passthru.withAttrs { inherit postPatch; };
-      withPassthru = passthru: (wrapAddon addon args).overrideAttrs (base: {
-        passthru = base.passthru // passthru;
-      });
-      # given an addon, repackage it without some `perm`ission
-      withoutPermission = perm: final.passthru.withPostPatch ''
-        for m in manifest.json manifest_v2.json manifest_v3.json; do
-          if test -e "$m"; then
-            NEW_MANIFEST=$(jq 'del(.permissions[] | select(. == "${perm}"))' "$m")
-            echo "$NEW_MANIFEST" > "$m"
-          fi
-        done
-      '';
-    };
-  });
-
-  # fetchAddon: fetch an addon directly from the mozilla store.
-  #             prefer NOT to use this, because moz store doesn't offer versioned release access
-  #             which breaks caching/reproducibility and such.
-  #             (maybe the `latest.xpi` URL redirects to a versioned URI visible if i used curl?)
-  # fetchAddon = name: extid: hash: fetchurl {
-  #   inherit name hash;
-  #   url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi";
-  #   # extid can be found by unar'ing the above xpi, and copying browser_specific_settings.gecko.id field
-  #   passthru = { inherit extid; };
-  # };
-
-  fetchVersionedAddon = { extid, version, url, hash ? "", pname ? extid }: stdenv.mkDerivation {
-    inherit pname version;
-    src = fetchurl {
-      inherit url hash;
-    };
-    dontUnpack = true;
-    installPhase = ''
-      cp $src $out
-    '';
-
-    passthru.updateScript = nix-update-script { };
-    passthru.extid = extid;
-  };
-
-in (lib.makeScope newScope (self: with self; {
-  unwrapped = lib.recurseIntoAttrs {
-    # get names from:
-    # - ~/ref/nix-community/nur-combined/repos/rycee/pkgs/firefox-addons/generated-firefox-addons.nix
-    # `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'`
-    browserpass-extension = callPackage ./browserpass-extension { };
-    bypass-paywalls-clean = callPackage ./bypass-paywalls-clean { };
-    ctrl-shift-c-should-copy = callPackage ./ctrl-shift-c-should-copy { };
-    firefox-xdg-open = callPackage ./firefox-xdg-open { };
-    i-still-dont-care-about-cookies = callPackage ./i-still-dont-care-about-cookies { };
-    open-in-mpv = callPackage ./open-in-mpv { };
-    passff = callPackage ./passff { };
-    sidebery = callPackage ./sidebery { };
-
-    ether-metamask = fetchVersionedAddon rec {
-      extid = "webextension@metamask.io";
-      pname = "ether-metamask";
-      url = "https://github.com/MetaMask/metamask-extension/releases/download/v${version}/metamask-firefox-${version}.zip";
-      version = "12.3.1";
-      hash = "sha256-90LnNvAX+FqMEBtKh3C+CFeRgYPbXoaTV+h68ORQR8s=";
-    };
-    fx_cast = fetchVersionedAddon rec {
-      extid = "fx_cast@matt.tf";
-      pname = "fx_cast";
-      url = "https://github.com/hensm/fx_cast/releases/download/v${version}/fx_cast-${version}.xpi";
-      version = "0.3.1";
-      hash = "sha256-zaYnUJpJkRAPSCpM3S20PjMS4aeBtQGhXB2wgdlFkSQ=";
-    };
-    i2p-in-private-browsing = fetchVersionedAddon rec {
-      extid = "i2ppb@eyedeekay.github.io";
-      pname = "i2p-in-private-browsing";
-      url = "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/${version}/i2ppb@eyedeekay.github.io.xpi";
-      version = "2.6.1";
-      hash = "sha256-QFYiJo8nY+u8ODtX6M3CGyJXTHhKIpifxH73rdWP/DI=";
-    };
-    sponsorblock = fetchVersionedAddon rec {
-      extid = "sponsorBlocker@ajay.app";
-      pname = "sponsorblock";
-      url = "https://github.com/ajayyy/SponsorBlock/releases/download/${version}/FirefoxSignedInstaller.xpi";
-      version = "5.9.4";
-      hash = "sha256-tf8F0uObQOzcXPQSUDQ1PNr9fTRaQIJ7QMVdePXq9/o=";
-    };
-    ublacklist = fetchVersionedAddon rec {
-      extid = "@ublacklist";
-      pname = "ublacklist";
-      url = "https://github.com/iorate/ublacklist/releases/download/v${version}/ublacklist-v${version}-firefox.zip";
-      version = "8.9.2";
-      hash = "sha256-b+MBSeh+YC/qT88pupElPU531YyfvYe1aC1icHXfK3A=";
-    };
-    ublock-origin = fetchVersionedAddon rec {
-      extid = "uBlock0@raymondhill.net";
-      pname = "ublock-origin";
-      # N.B.: a handful of versions are released unsigned
-      # url = "https://github.com/gorhill/uBlock/releases/download/${version}/uBlock0_${version}.signed.xpi";
-      url = "https://github.com/gorhill/uBlock/releases/download/${version}/uBlock0_${version}.firefox.signed.xpi";
-      version = "1.60.1b1";
-      hash = "sha256-RsGvVAZWxTqQ+5nB3MPCrSsmNHNRrC6fmzXDjFHHRs0=";
-    };
-  };
-})).overrideScope (self: super:
-  let
-    wrapped = lib.mapAttrs (name: _value: wrapAddon self.unwrapped."${name}" {}) super.unwrapped;
-  in wrapped // {
-    browserpass-extension = wrapped.browserpass-extension.withoutPermission "notifications";
-    sponsorblock = wrapped.sponsorblock.withPostPatch ''
-      # patch sponsorblock to not show the help tab on first launch.
-      #
-      # XXX: i tried to build sponsorblock from source and patch this *before* it gets webpack'd,
-      # but web shit is absolutely cursed and building from source requires a fucking PhD
-      # (if you have one, feel free to share your nix package)
-      #
-      # NB: in source this is `alreadyInstalled: false`, but the build process hates Booleans or something
-      # TODO(2024/03/23): this is broken (replacement doesn't match). but maybe not necessary anymore?
-      substituteInPlace js/*.js \
-        --replace 'alreadyInstalled:!1' 'alreadyInstalled:!0'
-    '';
-
-    ublock-origin = wrapped.ublock-origin.withPassthru {
-      # `makeConfig` produces a .json file meant to go at
-      # ~/.mozilla/managed-storage/uBlock0@raymondhill.net.json
-      # this is not formally documented anywhere, but is referenced from a few places:
-      # - <https://github.com/gorhill/uBlock/issues/2986#issuecomment-364035002>
-      # - <https://www.reddit.com/r/uBlockOrigin/comments/16bzb11/configuring_ublock_origin_for_nix_users_just_in/>
-      # - <https://www.reddit.com/r/sysadmin/comments/8lwmbo/guide_deploying_ublock_origin_with_preset/>
-      #
-      # a large part of why i do this is to configure the filters statically,
-      # so that they don't have to be fetched on every boot.
-      makeConfig = { filterFiles }: let
-        mergedFilters = concatTextFile {
-          name = "ublock-origin-filters-merged.txt";
-          files = filterFiles;
-          destination = "/share/filters/ublock-origin-filters-merged.txt";
-        };
-        baseConfig = writers.writeJSON "uBlock0@raymondhill.net.json" {
-          name = "uBlock0@raymondhill.net";
-          description = "ignored";
-          type = "storage";
-          data = {
-            adminSettings = {
-              #^ adminSettings dictionary uses the same schema as the "backup to file" option in settings.
-              userSettings = {
-                # default settings are found: <repo:gorhill/uBlock:src/js/background.js>  (userSettingsDefault)
-                advancedUserEnabled = true;
-                autoUpdate = false;
-                # don't block page load when waiting for filter load
-                suspendUntilListsAreLoaded = false;
-              };
-              selectedFilterLists = [ "user-filters" ];
-              # there's an array version of this field too, if preferable
-              filters = "";  #< WILL BE SUBSTITUTED DURING BUILD
-            };
-          };
-        };
-      in runCommandLocal "ublock-origin-config" { nativeBuildInputs = [ jq ]; } ''
-        cat ${baseConfig} | jq 'setpath(["data", "adminSettings", "userFilters"]; $filterText)' --rawfile filterText ${mergedFilters}/share/filters/ublock-origin-filters-merged.txt > $out
-      '';
-    };
-  }
-)

pkgs/by-name/feeds/package.nix

@@ -1,13 +1,13 @@
-{ lib
+{
-, newScope
+  lib,
-, python3
+  newScope,
-, sane-data
+  sane-data,
-, static-nix-shell
+  static-nix-shell,
-, symlinkJoin
+  symlinkJoin,
-, writeShellScript
+  writeShellScript,
 }:
 
-lib.makeScope newScope (self: with self; {
+lib.recurseIntoAttrs (lib.makeScope newScope (self: with self; {
   updateWithSuper = false;  #< don't update feeds unless explicitly asked to by the user
 
   mkFeed = callPackage ./template.nix {};
@@ -46,4 +46,4 @@ lib.makeScope newScope (self: with self; {
     pkgs = [ "feedsearch-crawler" ];
     srcPath = "update.py";
   };
-})
+}))

pkgs/by-name/firefox-extensions/package.nix

@@ -0,0 +1,234 @@
+{
+  callPackage,
+  concatTextFile,
+  fetchurl,
+  jq,
+  lib,
+  newScope,
+  nix-update-script,
+  runCommandLocal,
+  stdenv,
+  strip-nondeterminism,
+  unzip,
+  writers,
+  zip,
+}:
+let
+  wrapAddon = addon: args:
+  let
+    extid = addon.passthru.extid;
+    # merge our requirements into the derivation args
+    args' = args // {
+      passthru = addon.passthru // (args.passthru or {});
+      nativeBuildInputs = [
+        jq
+        strip-nondeterminism
+        unzip
+        zip
+      ] ++ (args.nativeBuildInputs or []);
+    };
+  in (stdenv.mkDerivation ({
+    # heavily borrows from <repo:nixos/nixpkgs:pkgs/build-support/fetchfirefoxaddon/default.nix>
+    name = "${addon.name}-wrapped";
+    unpackPhase = ''
+      echo "patching firefox addon $name into $out/${extid}.xpi"
+
+      mkdir build
+      cd build
+      # extract the XPI into the build directory
+      # it could be already wrapped, or a raw fetchurl result
+      unzip -q "${addon}/${extid}.xpi" -d . || \
+        unzip -q "${addon}" -d .
+    '';
+
+    patchPhase = ''
+      runHook prePatch
+
+      # firefox requires addons to have an id field when sideloading:
+      # - <https://extensionworkshop.com/documentation/publish/distribute-sideloading/>
+      for m in manifest.json manifest_v2.json manifest_v3.json; do
+        if test -e "$m"; then
+          NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}, "browser_specific_settings":{"gecko":{"id": "${extid}"}}}' "$m")
+          echo "$NEW_MANIFEST" > "$m"
+        fi
+      done
+
+      runHook postPatch
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      # repackage the XPI
+      mkdir "$out"
+      zip -r -q -FS "$out/${extid}.xpi" ./*
+      strip-nondeterminism "$out/${extid}.xpi"
+
+      runHook postInstall
+    '';
+  } // args')).overrideAttrs (final: upstream: {
+    passthru = (upstream.passthru or {}) // {
+      unwrapped = addon;
+      withAttrs = attrs: wrapAddon addon (args // attrs);
+      withPostPatch = postPatch: final.passthru.withAttrs { inherit postPatch; };
+      withPassthru = passthru: (wrapAddon addon args).overrideAttrs (base: {
+        passthru = base.passthru // passthru;
+      });
+      # given an addon, repackage it without some `perm`ission
+      withoutPermission = perm: final.passthru.withPostPatch ''
+        for m in manifest.json manifest_v2.json manifest_v3.json; do
+          if test -e "$m"; then
+            NEW_MANIFEST=$(jq 'del(.permissions[] | select(. == "${perm}"))' "$m")
+            echo "$NEW_MANIFEST" > "$m"
+          fi
+        done
+      '';
+    };
+  });
+
+  # fetchAddon: fetch an addon directly from the mozilla store.
+  #             prefer NOT to use this, because moz store doesn't offer versioned release access
+  #             which breaks caching/reproducibility and such.
+  #             (maybe the `latest.xpi` URL redirects to a versioned URI visible if i used curl?)
+  # fetchAddon = name: extid: hash: fetchurl {
+  #   inherit name hash;
+  #   url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi";
+  #   # extid can be found by unar'ing the above xpi, and copying browser_specific_settings.gecko.id field
+  #   passthru = { inherit extid; };
+  # };
+
+  fetchVersionedAddon = { extid, version, url, hash ? "", pname ? extid }: stdenv.mkDerivation {
+    inherit pname version;
+    src = fetchurl {
+      inherit url hash;
+    };
+    dontUnpack = true;
+    installPhase = ''
+      cp $src $out
+    '';
+
+    passthru.updateScript = nix-update-script { };
+    passthru.extid = extid;
+  };
+
+  firefox-extensions = (lib.makeScope newScope (self: with self; {
+    unwrapped = lib.recurseIntoAttrs {
+      # get names from:
+      # - ~/ref/nix-community/nur-combined/repos/rycee/pkgs/firefox-addons/generated-firefox-addons.nix
+      # `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'`
+      browserpass-extension = callPackage ./browserpass-extension { };
+      bypass-paywalls-clean = callPackage ./bypass-paywalls-clean { };
+      ctrl-shift-c-should-copy = callPackage ./ctrl-shift-c-should-copy { };
+      firefox-xdg-open = callPackage ./firefox-xdg-open { };
+      i-still-dont-care-about-cookies = callPackage ./i-still-dont-care-about-cookies { };
+      open-in-mpv = callPackage ./open-in-mpv { };
+      passff = callPackage ./passff { };
+      sidebery = callPackage ./sidebery { };
+
+      ether-metamask = fetchVersionedAddon rec {
+        extid = "webextension@metamask.io";
+        pname = "ether-metamask";
+        url = "https://github.com/MetaMask/metamask-extension/releases/download/v${version}/metamask-firefox-${version}.zip";
+        version = "12.3.1";
+        hash = "sha256-90LnNvAX+FqMEBtKh3C+CFeRgYPbXoaTV+h68ORQR8s=";
+      };
+      fx_cast = fetchVersionedAddon rec {
+        extid = "fx_cast@matt.tf";
+        pname = "fx_cast";
+        url = "https://github.com/hensm/fx_cast/releases/download/v${version}/fx_cast-${version}.xpi";
+        version = "0.3.1";
+        hash = "sha256-zaYnUJpJkRAPSCpM3S20PjMS4aeBtQGhXB2wgdlFkSQ=";
+      };
+      i2p-in-private-browsing = fetchVersionedAddon rec {
+        extid = "i2ppb@eyedeekay.github.io";
+        pname = "i2p-in-private-browsing";
+        url = "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/${version}/i2ppb@eyedeekay.github.io.xpi";
+        version = "2.6.1";
+        hash = "sha256-QFYiJo8nY+u8ODtX6M3CGyJXTHhKIpifxH73rdWP/DI=";
+      };
+      sponsorblock = fetchVersionedAddon rec {
+        extid = "sponsorBlocker@ajay.app";
+        pname = "sponsorblock";
+        url = "https://github.com/ajayyy/SponsorBlock/releases/download/${version}/FirefoxSignedInstaller.xpi";
+        version = "5.9.4";
+        hash = "sha256-tf8F0uObQOzcXPQSUDQ1PNr9fTRaQIJ7QMVdePXq9/o=";
+      };
+      ublacklist = fetchVersionedAddon rec {
+        extid = "@ublacklist";
+        pname = "ublacklist";
+        url = "https://github.com/iorate/ublacklist/releases/download/v${version}/ublacklist-v${version}-firefox.zip";
+        version = "8.9.2";
+        hash = "sha256-b+MBSeh+YC/qT88pupElPU531YyfvYe1aC1icHXfK3A=";
+      };
+      ublock-origin = fetchVersionedAddon rec {
+        extid = "uBlock0@raymondhill.net";
+        pname = "ublock-origin";
+        # N.B.: a handful of versions are released unsigned
+        # url = "https://github.com/gorhill/uBlock/releases/download/${version}/uBlock0_${version}.signed.xpi";
+        url = "https://github.com/gorhill/uBlock/releases/download/${version}/uBlock0_${version}.firefox.signed.xpi";
+        version = "1.60.1b1";
+        hash = "sha256-RsGvVAZWxTqQ+5nB3MPCrSsmNHNRrC6fmzXDjFHHRs0=";
+      };
+    };
+})  ).overrideScope (self: super:
+    let
+      wrapped = lib.mapAttrs (name: _value: wrapAddon self.unwrapped."${name}" {}) super.unwrapped;
+    in wrapped // {
+      browserpass-extension = wrapped.browserpass-extension.withoutPermission "notifications";
+      sponsorblock = wrapped.sponsorblock.withPostPatch ''
+        # patch sponsorblock to not show the help tab on first launch.
+        #
+        # XXX: i tried to build sponsorblock from source and patch this *before* it gets webpack'd,
+        # but web shit is absolutely cursed and building from source requires a fucking PhD
+        # (if you have one, feel free to share your nix package)
+        #
+        # NB: in source this is `alreadyInstalled: false`, but the build process hates Booleans or something
+        # TODO(2024/03/23): this is broken (replacement doesn't match). but maybe not necessary anymore?
+        substituteInPlace js/*.js \
+          --replace 'alreadyInstalled:!1' 'alreadyInstalled:!0'
+      '';
+
+      ublock-origin = wrapped.ublock-origin.withPassthru {
+        # `makeConfig` produces a .json file meant to go at
+        # ~/.mozilla/managed-storage/uBlock0@raymondhill.net.json
+        # this is not formally documented anywhere, but is referenced from a few places:
+        # - <https://github.com/gorhill/uBlock/issues/2986#issuecomment-364035002>
+        # - <https://www.reddit.com/r/uBlockOrigin/comments/16bzb11/configuring_ublock_origin_for_nix_users_just_in/>
+        # - <https://www.reddit.com/r/sysadmin/comments/8lwmbo/guide_deploying_ublock_origin_with_preset/>
+        #
+        # a large part of why i do this is to configure the filters statically,
+        # so that they don't have to be fetched on every boot.
+        makeConfig = { filterFiles }: let
+          mergedFilters = concatTextFile {
+            name = "ublock-origin-filters-merged.txt";
+            files = filterFiles;
+            destination = "/share/filters/ublock-origin-filters-merged.txt";
+          };
+          baseConfig = writers.writeJSON "uBlock0@raymondhill.net.json" {
+            name = "uBlock0@raymondhill.net";
+            description = "ignored";
+            type = "storage";
+            data = {
+              adminSettings = {
+                #^ adminSettings dictionary uses the same schema as the "backup to file" option in settings.
+                userSettings = {
+                  # default settings are found: <repo:gorhill/uBlock:src/js/background.js>  (userSettingsDefault)
+                  advancedUserEnabled = true;
+                  autoUpdate = false;
+                  # don't block page load when waiting for filter load
+                  suspendUntilListsAreLoaded = false;
+                };
+                selectedFilterLists = [ "user-filters" ];
+                # there's an array version of this field too, if preferable
+                filters = "";  #< WILL BE SUBSTITUTED DURING BUILD
+              };
+            };
+          };
+        in runCommandLocal "ublock-origin-config" { nativeBuildInputs = [ jq ]; } ''
+          cat ${baseConfig} | jq 'setpath(["data", "adminSettings", "userFilters"]; $filterText)' --rawfile filterText ${mergedFilters}/share/filters/ublock-origin-filters-merged.txt > $out
+        '';
+      };
+    }
+  );
+in
+  lib.recurseIntoAttrs firefox-extensions

pkgs/by-name/lemmy-lemonade/package.nix

@@ -24,7 +24,7 @@ let
   ]);
 in
 stdenv.mkDerivation (final: with final; {
-  pname = "lemonade";
+  pname = "lemmy-lemonade";
   version = "2024.04.22";
 
   src = fetchFromGitHub {