diff options
Diffstat (limited to 'pkgs/by-name/ro/rollup/patches2/0004-rename')
| -rw-r--r-- | pkgs/by-name/ro/rollup/patches2/0004-rename | 278 |
1 files changed, 278 insertions, 0 deletions
diff --git a/pkgs/by-name/ro/rollup/patches2/0004-rename b/pkgs/by-name/ro/rollup/patches2/0004-rename new file mode 100644 index 00000000..9f275376 --- /dev/null +++ b/pkgs/by-name/ro/rollup/patches2/0004-rename @@ -0,0 +1,278 @@ +From 4e606441932dfac2c99d12ed2fa2413c45d1dec6 Mon Sep 17 00:00:00 2001 +From: Benedikt Peetz <benedikt.peetz@b-peetz.de> +Date: Mon, 2 Nov 2026 19:53:17 +0100 +Subject: [PATCH 4/7] pkgs/*: Use a `stable`/`unstable` marker in the filename + +--- + .../aumo/{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.stable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../lock/{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../mpp/{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.stable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../sw/{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../{package.nix => package.unstable.nix} | 0 + .../tskm/{package.nix => package.unstable.nix} | 0 + .../yt/{package.nix => package.unstable.nix} | 0 + pkgs/default.nix | 18 +++++++++++------- + 40 files changed, 11 insertions(+), 7 deletions(-) + rename pkgs/by-name/au/aumo/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/ba/battery/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/be/beetsExtraPlugins/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/br/brightness/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/co/con2pdf/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/ct/ctpv-64-types/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/di/direnv-patched/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/fd/fd_list/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/fe/fetchmail-common-name/{package.nix => package.stable.nix} (100%) + rename pkgs/by-name/fi/fish-mk-maps/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/fi/fish-patched/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/fu/fupdate-flake/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/fu/fupdate-sys/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/fu/fupdate/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/gi/git-cgit/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/gi/git-cm/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/gi/git-edit-index/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/hi/hibernate/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/i3/i3bar-river-patched/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/lf/lf-make-map/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/lo/lock/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/mp/mpdpopm/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/mp/mpp-beetrm/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/mp/mpp-lyrics/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/mp/mpp-searchadd/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/mp/mpp/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/no/notify-run/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/qu/qutebrowser-patched/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/ri/river-mk-keymap/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/sc/screenshot_persistent/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/sc/screenshot_temporary/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/st/stalwart-mail-patched/{package.nix => package.stable.nix} (100%) + rename pkgs/by-name/st/stamp/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/sw/sw/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/sy/systemd-toggle/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/ta/tails-iso/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/tr/tree-sitter-yts/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/ts/tskm/{package.nix => package.unstable.nix} (100%) + rename pkgs/by-name/yt/yt/{package.nix => package.unstable.nix} (100%) + +diff --git a/pkgs/by-name/au/aumo/package.nix b/pkgs/by-name/au/aumo/package.unstable.nix +similarity index 100% +rename from pkgs/by-name/au/aumo/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/ba/battery/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/be/beetsExtraPlugins/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/br/brightness/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/co/con2pdf/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/ct/ctpv-64-types/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/di/direnv-patched/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/fd/fd_list/package.nix +rename to pkgs/by-name/fd/fd_list/package.unstable.nix +diff --git a/pkgs/by-name/fe/fetchmail-common-name/package.nix b/pkgs/by-name/fe/fetchmail-common-name/package.stable.nix +similarity index 100% +rename from pkgs/by-name/fe/fetchmail-common-name/package.nix +rename to pkgs/by-name/fe/fetchmail-common-name/package.stable.nix +diff --git a/pkgs/by-name/fi/fish-mk-maps/package.nix b/pkgs/by-name/fi/fish-mk-maps/package.unstable.nix +similarity index 100% +rename from pkgs/by-name/fi/fish-mk-maps/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/fi/fish-patched/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/fu/fupdate-flake/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/fu/fupdate-sys/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/fu/fupdate/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/gi/git-cgit/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/gi/git-cm/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/gi/git-edit-index/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/hi/hibernate/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/i3/i3bar-river-patched/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/lf/lf-make-map/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/lo/lock/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/mp/mpdpopm/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/mp/mpp-beetrm/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/mp/mpp-lyrics/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/mp/mpp-searchadd/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/mp/mpp/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/no/notify-run/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/qu/qutebrowser-patched/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/ri/river-mk-keymap/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/sc/screenshot_persistent/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/sc/screenshot_temporary/package.nix +rename to pkgs/by-name/sc/screenshot_temporary/package.unstable.nix +diff --git a/pkgs/by-name/st/stalwart-mail-patched/package.nix b/pkgs/by-name/st/stalwart-mail-patched/package.stable.nix +similarity index 100% +rename from pkgs/by-name/st/stalwart-mail-patched/package.nix +rename to pkgs/by-name/st/stalwart-mail-patched/package.stable.nix +diff --git a/pkgs/by-name/st/stamp/package.nix b/pkgs/by-name/st/stamp/package.unstable.nix +similarity index 100% +rename from pkgs/by-name/st/stamp/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/sw/sw/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/sy/systemd-toggle/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/ta/tails-iso/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/tr/tree-sitter-yts/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/ts/tskm/package.nix +rename to 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 +similarity index 100% +rename from pkgs/by-name/yt/yt/package.nix +rename to 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 +-- +2.55.0 + |