pkgs/*: Use a `stable`/`unstable` marker in the filename

38 files changed, 11 insertions, 7 deletions

diff --git a/pkgs/by-name/au/aumo/package.nix b/pkgs/by-name/au/aumo/package.unstable.nix
index c3c2f3ca..c3c2f3ca 100644
--- a/pkgs/by-name/au/aumo/package.nix
+++ b/pkgs/by-name/au/aumo/package.unstable.nix
diff --git a/pkgs/by-name/ba/battery/package.nix b/pkgs/by-name/ba/battery/package.unstable.nix
index 560ec59b..560ec59b 100644
--- a/pkgs/by-name/ba/battery/package.nix
+++ b/pkgs/by-name/ba/battery/package.unstable.nix
diff --git a/pkgs/by-name/be/beetsExtraPlugins/package.nix b/pkgs/by-name/be/beetsExtraPlugins/package.unstable.nix
index b310715b..b310715b 100644
--- a/pkgs/by-name/be/beetsExtraPlugins/package.nix
+++ b/pkgs/by-name/be/beetsExtraPlugins/package.unstable.nix
diff --git a/pkgs/by-name/br/brightness/package.nix b/pkgs/by-name/br/brightness/package.unstable.nix
index f3797d43..f3797d43 100644
--- a/pkgs/by-name/br/brightness/package.nix
+++ b/pkgs/by-name/br/brightness/package.unstable.nix
diff --git a/pkgs/by-name/co/con2pdf/package.nix b/pkgs/by-name/co/con2pdf/package.unstable.nix
index 11d45ab5..11d45ab5 100644
--- a/pkgs/by-name/co/con2pdf/package.nix
+++ b/pkgs/by-name/co/con2pdf/package.unstable.nix
diff --git a/pkgs/by-name/ct/ctpv-64-types/package.nix b/pkgs/by-name/ct/ctpv-64-types/package.unstable.nix
index 087e1d28..087e1d28 100644
--- a/pkgs/by-name/ct/ctpv-64-types/package.nix
+++ b/pkgs/by-name/ct/ctpv-64-types/package.unstable.nix
diff --git a/pkgs/by-name/di/direnv-patched/package.nix b/pkgs/by-name/di/direnv-patched/package.unstable.nix
index 073be614..073be614 100644
--- a/pkgs/by-name/di/direnv-patched/package.nix
+++ b/pkgs/by-name/di/direnv-patched/package.unstable.nix
diff --git a/pkgs/by-name/fd/fd_list/package.nix b/pkgs/by-name/fd/fd_list/package.unstable.nix
index 34129b10..34129b10 100644
--- a/pkgs/by-name/fd/fd_list/package.nix
+++ b/pkgs/by-name/fd/fd_list/package.unstable.nix
diff --git a/pkgs/by-name/fi/fish-mk-maps/package.nix b/pkgs/by-name/fi/fish-mk-maps/package.unstable.nix
index 7048f41e..7048f41e 100644
--- a/pkgs/by-name/fi/fish-mk-maps/package.nix
+++ b/pkgs/by-name/fi/fish-mk-maps/package.unstable.nix
diff --git a/pkgs/by-name/fi/fish-patched/package.nix b/pkgs/by-name/fi/fish-patched/package.unstable.nix
index cb45af99..cb45af99 100644
--- a/pkgs/by-name/fi/fish-patched/package.nix
+++ b/pkgs/by-name/fi/fish-patched/package.unstable.nix
diff --git a/pkgs/by-name/fu/fupdate-flake/package.nix b/pkgs/by-name/fu/fupdate-flake/package.unstable.nix
index 4e21cd23..4e21cd23 100644
--- a/pkgs/by-name/fu/fupdate-flake/package.nix
+++ b/pkgs/by-name/fu/fupdate-flake/package.unstable.nix
diff --git a/pkgs/by-name/fu/fupdate-sys/package.nix b/pkgs/by-name/fu/fupdate-sys/package.unstable.nix
index 9a48e32d..9a48e32d 100644
--- a/pkgs/by-name/fu/fupdate-sys/package.nix
+++ b/pkgs/by-name/fu/fupdate-sys/package.unstable.nix
diff --git a/pkgs/by-name/fu/fupdate/package.nix b/pkgs/by-name/fu/fupdate/package.unstable.nix
index 86eccaf7..86eccaf7 100644
--- a/pkgs/by-name/fu/fupdate/package.nix
+++ b/pkgs/by-name/fu/fupdate/package.unstable.nix
diff --git a/pkgs/by-name/gi/git-cgit/package.nix b/pkgs/by-name/gi/git-cgit/package.unstable.nix
index b64c5e84..b64c5e84 100644
--- a/pkgs/by-name/gi/git-cgit/package.nix
+++ b/pkgs/by-name/gi/git-cgit/package.unstable.nix
diff --git a/pkgs/by-name/gi/git-cm/package.nix b/pkgs/by-name/gi/git-cm/package.unstable.nix
index f124ce90..f124ce90 100644
--- a/pkgs/by-name/gi/git-cm/package.nix
+++ b/pkgs/by-name/gi/git-cm/package.unstable.nix
diff --git a/pkgs/by-name/gi/git-edit-index/package.nix b/pkgs/by-name/gi/git-edit-index/package.unstable.nix
index 5e855b49..5e855b49 100644
--- a/pkgs/by-name/gi/git-edit-index/package.nix
+++ b/pkgs/by-name/gi/git-edit-index/package.unstable.nix
diff --git a/pkgs/by-name/hi/hibernate/package.nix b/pkgs/by-name/hi/hibernate/package.unstable.nix
index c2e8c0b6..c2e8c0b6 100644
--- a/pkgs/by-name/hi/hibernate/package.nix
+++ b/pkgs/by-name/hi/hibernate/package.unstable.nix
diff --git a/pkgs/by-name/i3/i3bar-river-patched/package.nix b/pkgs/by-name/i3/i3bar-river-patched/package.unstable.nix
index 26f11ab3..26f11ab3 100644
--- a/pkgs/by-name/i3/i3bar-river-patched/package.nix
+++ b/pkgs/by-name/i3/i3bar-river-patched/package.unstable.nix
diff --git a/pkgs/by-name/lf/lf-make-map/package.nix b/pkgs/by-name/lf/lf-make-map/package.unstable.nix
index 8f77c843..8f77c843 100644
--- a/pkgs/by-name/lf/lf-make-map/package.nix
+++ b/pkgs/by-name/lf/lf-make-map/package.unstable.nix
diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.unstable.nix
index 572ebb0b..572ebb0b 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.unstable.nix
diff --git a/pkgs/by-name/mp/mpdpopm/package.nix b/pkgs/by-name/mp/mpdpopm/package.unstable.nix
index 7048f41e..7048f41e 100644
--- a/pkgs/by-name/mp/mpdpopm/package.nix
+++ b/pkgs/by-name/mp/mpdpopm/package.unstable.nix
diff --git a/pkgs/by-name/mp/mpp-beetrm/package.nix b/pkgs/by-name/mp/mpp-beetrm/package.unstable.nix
index 00672838..00672838 100644
--- a/pkgs/by-name/mp/mpp-beetrm/package.nix
+++ b/pkgs/by-name/mp/mpp-beetrm/package.unstable.nix
diff --git a/pkgs/by-name/mp/mpp-lyrics/package.nix b/pkgs/by-name/mp/mpp-lyrics/package.unstable.nix
index 0b6d8993..0b6d8993 100644
--- a/pkgs/by-name/mp/mpp-lyrics/package.nix
+++ b/pkgs/by-name/mp/mpp-lyrics/package.unstable.nix
diff --git a/pkgs/by-name/mp/mpp-searchadd/package.nix b/pkgs/by-name/mp/mpp-searchadd/package.unstable.nix
index 91ff05e9..91ff05e9 100644
--- a/pkgs/by-name/mp/mpp-searchadd/package.nix
+++ b/pkgs/by-name/mp/mpp-searchadd/package.unstable.nix
diff --git a/pkgs/by-name/mp/mpp/package.nix b/pkgs/by-name/mp/mpp/package.unstable.nix
index fe08ba46..fe08ba46 100644
--- a/pkgs/by-name/mp/mpp/package.nix
+++ b/pkgs/by-name/mp/mpp/package.unstable.nix
diff --git a/pkgs/by-name/no/notify-run/package.nix b/pkgs/by-name/no/notify-run/package.unstable.nix
index 1f9337be..1f9337be 100644
--- a/pkgs/by-name/no/notify-run/package.nix
+++ b/pkgs/by-name/no/notify-run/package.unstable.nix
diff --git a/pkgs/by-name/qu/qutebrowser-patched/package.nix b/pkgs/by-name/qu/qutebrowser-patched/package.unstable.nix
index bf4fab1d..bf4fab1d 100644
--- a/pkgs/by-name/qu/qutebrowser-patched/package.nix
+++ b/pkgs/by-name/qu/qutebrowser-patched/package.unstable.nix
diff --git a/pkgs/by-name/ri/river-mk-keymap/package.nix b/pkgs/by-name/ri/river-mk-keymap/package.unstable.nix
index bb3dc285..bb3dc285 100644
--- a/pkgs/by-name/ri/river-mk-keymap/package.nix
+++ b/pkgs/by-name/ri/river-mk-keymap/package.unstable.nix
diff --git a/pkgs/by-name/sc/screenshot_persistent/package.nix b/pkgs/by-name/sc/screenshot_persistent/package.unstable.nix
index 34054b0f..34054b0f 100644
--- a/pkgs/by-name/sc/screenshot_persistent/package.nix
+++ b/pkgs/by-name/sc/screenshot_persistent/package.unstable.nix
diff --git a/pkgs/by-name/sc/screenshot_temporary/package.nix b/pkgs/by-name/sc/screenshot_temporary/package.unstable.nix
index 49bbeeb7..49bbeeb7 100644
--- a/pkgs/by-name/sc/screenshot_temporary/package.nix
+++ b/pkgs/by-name/sc/screenshot_temporary/package.unstable.nix
diff --git a/pkgs/by-name/st/stamp/package.nix b/pkgs/by-name/st/stamp/package.unstable.nix
index 871d531c..871d531c 100644
--- a/pkgs/by-name/st/stamp/package.nix
+++ b/pkgs/by-name/st/stamp/package.unstable.nix
diff --git a/pkgs/by-name/sw/sw/package.nix b/pkgs/by-name/sw/sw/package.unstable.nix
index dea7e16c..dea7e16c 100644
--- a/pkgs/by-name/sw/sw/package.nix
+++ b/pkgs/by-name/sw/sw/package.unstable.nix
diff --git a/pkgs/by-name/sy/systemd-toggle/package.nix b/pkgs/by-name/sy/systemd-toggle/package.unstable.nix
index 04ed576f..04ed576f 100644
--- a/pkgs/by-name/sy/systemd-toggle/package.nix
+++ b/pkgs/by-name/sy/systemd-toggle/package.unstable.nix
diff --git a/pkgs/by-name/ta/tails-iso/package.nix b/pkgs/by-name/ta/tails-iso/package.unstable.nix
index a29bff54..a29bff54 100644
--- a/pkgs/by-name/ta/tails-iso/package.nix
+++ b/pkgs/by-name/ta/tails-iso/package.unstable.nix
diff --git a/pkgs/by-name/tr/tree-sitter-yts/package.nix b/pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix
index eef65714..eef65714 100644
--- a/pkgs/by-name/tr/tree-sitter-yts/package.nix
+++ b/pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix
diff --git a/pkgs/by-name/ts/tskm/package.nix b/pkgs/by-name/ts/tskm/package.unstable.nix
index ad10865f..ad10865f 100644
--- a/pkgs/by-name/ts/tskm/package.nix
+++ b/pkgs/by-name/ts/tskm/package.unstable.nix
diff --git a/pkgs/by-name/yt/yt/package.nix b/pkgs/by-name/yt/yt/package.unstable.nix
index 41234e19..41234e19 100644
--- a/pkgs/by-name/yt/yt/package.nix
+++ b/pkgs/by-name/yt/yt/package.unstable.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4fdb94fe..bc7d70e7 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,16 +6,20 @@
   inherit (unstable_pkgs) lib;
 
   mergePkgs = pkgs: lib.callPackageWith (extra_lib.warnMerge pkgs in_tree_pkgs "the ./pkgs/by-name set");
-  callPackageStable = lib.callPackageWith (mergePkgs stable_pkgs);
-  callPackageUnstable = lib.callPackageWith (mergePkgs unstable_pkgs);
+  callPackageStable = mergePkgs stable_pkgs;
+  callPackageUnstable = mergePkgs unstable_pkgs;
 
   in_tree_pkgs = extra_lib.mkByName {
     baseDirectory = ./by-name;
-    fileName = "package.nix";
-    finalizeFunction = name: value:
-      if value.stable
-      then callPackageStable value.pkg {}
-      else callPackageUnstable value.pkg {};
+    fileRegex = "package.(stable|unstable).nix";
+    finalizeFunction = name: pkgPathList: let
+      # When specifying a regex `mkByName` returns a list of candidates.
+      # But we know, that there can only be one.
+      pkgPath = builtins.head pkgPathList;
+    in
+      if (builtins.match "(stable)" (builtins.baseNameOf pkgPath)) == ["stable"]
+      then callPackageStable pkgPath {}
+      else callPackageUnstable pkgPath {};
   };
 in
   in_tree_pkgs