From 5ca82ffa08af81f36ec998e7f49f53af7496a93a Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Mon, 2 Nov 2026 19:53:17 +0100 Subject: pkgs/*: Use a `stable`/`unstable` marker in the filename --- pkgs/by-name/au/aumo/package.nix | 34 ------ pkgs/by-name/au/aumo/package.unstable.nix | 34 ++++++ pkgs/by-name/ba/battery/package.nix | 20 ---- pkgs/by-name/ba/battery/package.unstable.nix | 20 ++++ pkgs/by-name/be/beetsExtraPlugins/package.nix | 12 -- .../be/beetsExtraPlugins/package.unstable.nix | 12 ++ pkgs/by-name/br/brightness/package.nix | 29 ----- pkgs/by-name/br/brightness/package.unstable.nix | 29 +++++ pkgs/by-name/co/con2pdf/package.nix | 43 ------- pkgs/by-name/co/con2pdf/package.unstable.nix | 43 +++++++ pkgs/by-name/ct/ctpv-64-types/package.nix | 24 ---- pkgs/by-name/ct/ctpv-64-types/package.unstable.nix | 24 ++++ pkgs/by-name/di/direnv-patched/package.nix | 28 ----- .../by-name/di/direnv-patched/package.unstable.nix | 28 +++++ pkgs/by-name/fd/fd_list/package.nix | 28 ----- pkgs/by-name/fd/fd_list/package.unstable.nix | 28 +++++ pkgs/by-name/fi/fish-mk-maps/package.nix | 29 ----- pkgs/by-name/fi/fish-mk-maps/package.unstable.nix | 29 +++++ pkgs/by-name/fi/fish-patched/package.nix | 38 ------- pkgs/by-name/fi/fish-patched/package.unstable.nix | 38 +++++++ pkgs/by-name/fu/fupdate-flake/package.nix | 31 ----- pkgs/by-name/fu/fupdate-flake/package.unstable.nix | 31 +++++ pkgs/by-name/fu/fupdate-sys/package.nix | 45 -------- pkgs/by-name/fu/fupdate-sys/package.unstable.nix | 45 ++++++++ pkgs/by-name/fu/fupdate/package.nix | 41 ------- pkgs/by-name/fu/fupdate/package.unstable.nix | 41 +++++++ pkgs/by-name/gi/git-cgit/package.nix | 28 ----- pkgs/by-name/gi/git-cgit/package.unstable.nix | 28 +++++ pkgs/by-name/gi/git-cm/package.nix | 27 ----- pkgs/by-name/gi/git-cm/package.unstable.nix | 27 +++++ pkgs/by-name/gi/git-edit-index/package.nix | 29 ----- .../by-name/gi/git-edit-index/package.unstable.nix | 29 +++++ pkgs/by-name/hi/hibernate/package.nix | 23 ---- pkgs/by-name/hi/hibernate/package.unstable.nix | 23 ++++ pkgs/by-name/i3/i3bar-river-patched/package.nix | 54 --------- .../i3/i3bar-river-patched/package.unstable.nix | 54 +++++++++ pkgs/by-name/lf/lf-make-map/package.nix | 23 ---- pkgs/by-name/lf/lf-make-map/package.unstable.nix | 23 ++++ pkgs/by-name/lo/lock/package.nix | 25 ---- pkgs/by-name/lo/lock/package.unstable.nix | 25 ++++ pkgs/by-name/mp/mpdpopm/package.nix | 29 ----- pkgs/by-name/mp/mpdpopm/package.unstable.nix | 29 +++++ pkgs/by-name/mp/mpp-beetrm/package.nix | 25 ---- pkgs/by-name/mp/mpp-beetrm/package.unstable.nix | 25 ++++ pkgs/by-name/mp/mpp-lyrics/package.nix | 31 ----- pkgs/by-name/mp/mpp-lyrics/package.unstable.nix | 31 +++++ pkgs/by-name/mp/mpp-searchadd/package.nix | 25 ---- pkgs/by-name/mp/mpp-searchadd/package.unstable.nix | 25 ++++ pkgs/by-name/mp/mpp/package.nix | 90 --------------- pkgs/by-name/mp/mpp/package.unstable.nix | 90 +++++++++++++++ pkgs/by-name/no/notify-run/package.nix | 41 ------- pkgs/by-name/no/notify-run/package.unstable.nix | 41 +++++++ pkgs/by-name/qu/qutebrowser-patched/package.nix | 26 ----- .../qu/qutebrowser-patched/package.unstable.nix | 26 +++++ pkgs/by-name/ri/river-mk-keymap/package.nix | 39 ------- .../ri/river-mk-keymap/package.unstable.nix | 39 +++++++ pkgs/by-name/sc/screenshot_persistent/package.nix | 33 ------ .../sc/screenshot_persistent/package.unstable.nix | 33 ++++++ pkgs/by-name/sc/screenshot_temporary/package.nix | 26 ----- .../sc/screenshot_temporary/package.unstable.nix | 26 +++++ pkgs/by-name/st/stamp/package.nix | 29 ----- pkgs/by-name/st/stamp/package.unstable.nix | 29 +++++ pkgs/by-name/sw/sw/package.nix | 25 ---- pkgs/by-name/sw/sw/package.unstable.nix | 25 ++++ pkgs/by-name/sy/systemd-toggle/package.nix | 23 ---- .../by-name/sy/systemd-toggle/package.unstable.nix | 23 ++++ pkgs/by-name/ta/tails-iso/package.nix | 87 -------------- pkgs/by-name/ta/tails-iso/package.unstable.nix | 87 ++++++++++++++ pkgs/by-name/tr/tree-sitter-yts/package.nix | 23 ---- .../tr/tree-sitter-yts/package.unstable.nix | 23 ++++ pkgs/by-name/ts/tskm/package.nix | 56 --------- pkgs/by-name/ts/tskm/package.unstable.nix | 56 +++++++++ pkgs/by-name/yt/yt/package.nix | 126 --------------------- pkgs/by-name/yt/yt/package.unstable.nix | 126 +++++++++++++++++++++ pkgs/default.nix | 18 +-- 75 files changed, 1356 insertions(+), 1352 deletions(-) delete mode 100644 pkgs/by-name/au/aumo/package.nix create mode 100644 pkgs/by-name/au/aumo/package.unstable.nix delete mode 100644 pkgs/by-name/ba/battery/package.nix create mode 100644 pkgs/by-name/ba/battery/package.unstable.nix delete mode 100644 pkgs/by-name/be/beetsExtraPlugins/package.nix create mode 100644 pkgs/by-name/be/beetsExtraPlugins/package.unstable.nix delete mode 100644 pkgs/by-name/br/brightness/package.nix create mode 100644 pkgs/by-name/br/brightness/package.unstable.nix delete mode 100644 pkgs/by-name/co/con2pdf/package.nix create mode 100644 pkgs/by-name/co/con2pdf/package.unstable.nix delete mode 100644 pkgs/by-name/ct/ctpv-64-types/package.nix create mode 100644 pkgs/by-name/ct/ctpv-64-types/package.unstable.nix delete mode 100644 pkgs/by-name/di/direnv-patched/package.nix create mode 100644 pkgs/by-name/di/direnv-patched/package.unstable.nix delete mode 100644 pkgs/by-name/fd/fd_list/package.nix create mode 100644 pkgs/by-name/fd/fd_list/package.unstable.nix delete mode 100644 pkgs/by-name/fi/fish-mk-maps/package.nix create mode 100644 pkgs/by-name/fi/fish-mk-maps/package.unstable.nix delete mode 100644 pkgs/by-name/fi/fish-patched/package.nix create mode 100644 pkgs/by-name/fi/fish-patched/package.unstable.nix delete mode 100644 pkgs/by-name/fu/fupdate-flake/package.nix create mode 100644 pkgs/by-name/fu/fupdate-flake/package.unstable.nix delete mode 100644 pkgs/by-name/fu/fupdate-sys/package.nix create mode 100644 pkgs/by-name/fu/fupdate-sys/package.unstable.nix delete mode 100644 pkgs/by-name/fu/fupdate/package.nix create mode 100644 pkgs/by-name/fu/fupdate/package.unstable.nix delete mode 100644 pkgs/by-name/gi/git-cgit/package.nix create mode 100644 pkgs/by-name/gi/git-cgit/package.unstable.nix delete mode 100644 pkgs/by-name/gi/git-cm/package.nix create mode 100644 pkgs/by-name/gi/git-cm/package.unstable.nix delete mode 100644 pkgs/by-name/gi/git-edit-index/package.nix create mode 100644 pkgs/by-name/gi/git-edit-index/package.unstable.nix delete mode 100644 pkgs/by-name/hi/hibernate/package.nix create mode 100644 pkgs/by-name/hi/hibernate/package.unstable.nix delete mode 100644 pkgs/by-name/i3/i3bar-river-patched/package.nix create mode 100644 pkgs/by-name/i3/i3bar-river-patched/package.unstable.nix delete mode 100644 pkgs/by-name/lf/lf-make-map/package.nix create mode 100644 pkgs/by-name/lf/lf-make-map/package.unstable.nix delete mode 100644 pkgs/by-name/lo/lock/package.nix create mode 100644 pkgs/by-name/lo/lock/package.unstable.nix delete mode 100644 pkgs/by-name/mp/mpdpopm/package.nix create mode 100644 pkgs/by-name/mp/mpdpopm/package.unstable.nix delete mode 100644 pkgs/by-name/mp/mpp-beetrm/package.nix create mode 100644 pkgs/by-name/mp/mpp-beetrm/package.unstable.nix delete mode 100644 pkgs/by-name/mp/mpp-lyrics/package.nix create mode 100644 pkgs/by-name/mp/mpp-lyrics/package.unstable.nix delete mode 100644 pkgs/by-name/mp/mpp-searchadd/package.nix create mode 100644 pkgs/by-name/mp/mpp-searchadd/package.unstable.nix delete mode 100644 pkgs/by-name/mp/mpp/package.nix create mode 100644 pkgs/by-name/mp/mpp/package.unstable.nix delete mode 100644 pkgs/by-name/no/notify-run/package.nix create mode 100644 pkgs/by-name/no/notify-run/package.unstable.nix delete mode 100644 pkgs/by-name/qu/qutebrowser-patched/package.nix create mode 100644 pkgs/by-name/qu/qutebrowser-patched/package.unstable.nix delete mode 100644 pkgs/by-name/ri/river-mk-keymap/package.nix create mode 100644 pkgs/by-name/ri/river-mk-keymap/package.unstable.nix delete mode 100644 pkgs/by-name/sc/screenshot_persistent/package.nix create mode 100644 pkgs/by-name/sc/screenshot_persistent/package.unstable.nix delete mode 100644 pkgs/by-name/sc/screenshot_temporary/package.nix create mode 100644 pkgs/by-name/sc/screenshot_temporary/package.unstable.nix delete mode 100644 pkgs/by-name/st/stamp/package.nix create mode 100644 pkgs/by-name/st/stamp/package.unstable.nix delete mode 100644 pkgs/by-name/sw/sw/package.nix create mode 100644 pkgs/by-name/sw/sw/package.unstable.nix delete mode 100644 pkgs/by-name/sy/systemd-toggle/package.nix create mode 100644 pkgs/by-name/sy/systemd-toggle/package.unstable.nix delete mode 100644 pkgs/by-name/ta/tails-iso/package.nix create mode 100644 pkgs/by-name/ta/tails-iso/package.unstable.nix delete mode 100644 pkgs/by-name/tr/tree-sitter-yts/package.nix create mode 100644 pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix delete mode 100644 pkgs/by-name/ts/tskm/package.nix create mode 100644 pkgs/by-name/ts/tskm/package.unstable.nix delete mode 100644 pkgs/by-name/yt/yt/package.nix create mode 100644 pkgs/by-name/yt/yt/package.unstable.nix diff --git a/pkgs/by-name/au/aumo/package.nix b/pkgs/by-name/au/aumo/package.nix deleted file mode 100644 index c3c2f3ca..00000000 --- a/pkgs/by-name/au/aumo/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - fd, - udisks, - rofi, - jq, - gnugrep, - util-linux, - gnused, -}: -writeShellApplication { - name = "aumo"; - text = builtins.readFile ./aumo.sh; - inheritPath = false; - runtimeInputs = [ - udisks - fd - rofi - jq - gnugrep - util-linux # for findmnt - gnused - ]; -} diff --git a/pkgs/by-name/au/aumo/package.unstable.nix b/pkgs/by-name/au/aumo/package.unstable.nix new file mode 100644 index 00000000..c3c2f3ca --- /dev/null +++ b/pkgs/by-name/au/aumo/package.unstable.nix @@ -0,0 +1,34 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + fd, + udisks, + rofi, + jq, + gnugrep, + util-linux, + gnused, +}: +writeShellApplication { + name = "aumo"; + text = builtins.readFile ./aumo.sh; + inheritPath = false; + runtimeInputs = [ + udisks + fd + rofi + jq + gnugrep + util-linux # for findmnt + gnused + ]; +} diff --git a/pkgs/by-name/ba/battery/package.nix b/pkgs/by-name/ba/battery/package.nix deleted file mode 100644 index 560ec59b..00000000 --- a/pkgs/by-name/ba/battery/package.nix +++ /dev/null @@ -1,20 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - coreutils, -}: -writeShellApplication { - name = "battery"; - text = builtins.readFile ./battery.sh; - inheritPath = false; - runtimeInputs = [coreutils]; -} diff --git a/pkgs/by-name/ba/battery/package.unstable.nix b/pkgs/by-name/ba/battery/package.unstable.nix new file mode 100644 index 00000000..560ec59b --- /dev/null +++ b/pkgs/by-name/ba/battery/package.unstable.nix @@ -0,0 +1,20 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + coreutils, +}: +writeShellApplication { + name = "battery"; + text = builtins.readFile ./battery.sh; + inheritPath = false; + runtimeInputs = [coreutils]; +} diff --git a/pkgs/by-name/be/beetsExtraPlugins/package.nix b/pkgs/by-name/be/beetsExtraPlugins/package.nix deleted file mode 100644 index b310715b..00000000 --- a/pkgs/by-name/be/beetsExtraPlugins/package.nix +++ /dev/null @@ -1,12 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{...}: { - # xtractor = pkgs.callPackage ./xtractor.nix {beets = pkgs.beetsPackages.beets-minimal;}; -} diff --git a/pkgs/by-name/be/beetsExtraPlugins/package.unstable.nix b/pkgs/by-name/be/beetsExtraPlugins/package.unstable.nix new file mode 100644 index 00000000..b310715b --- /dev/null +++ b/pkgs/by-name/be/beetsExtraPlugins/package.unstable.nix @@ -0,0 +1,12 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{...}: { + # xtractor = pkgs.callPackage ./xtractor.nix {beets = pkgs.beetsPackages.beets-minimal;}; +} diff --git a/pkgs/by-name/br/brightness/package.nix b/pkgs/by-name/br/brightness/package.nix deleted file mode 100644 index f3797d43..00000000 --- a/pkgs/by-name/br/brightness/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Arguments - backlightName ? "intel_backlight", # nixosConfig.soispha.laptop.backlight - # Dependencies - gawk, - coreutils, -}: -writeShellApplication { - name = "brightness"; - text = builtins.readFile ./brightness.sh; - inheritPath = false; - - runtimeEnv = {BACKLIGHT_NAME = backlightName;}; - - runtimeInputs = [ - gawk - coreutils - ]; -} diff --git a/pkgs/by-name/br/brightness/package.unstable.nix b/pkgs/by-name/br/brightness/package.unstable.nix new file mode 100644 index 00000000..f3797d43 --- /dev/null +++ b/pkgs/by-name/br/brightness/package.unstable.nix @@ -0,0 +1,29 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Arguments + backlightName ? "intel_backlight", # nixosConfig.soispha.laptop.backlight + # Dependencies + gawk, + coreutils, +}: +writeShellApplication { + name = "brightness"; + text = builtins.readFile ./brightness.sh; + inheritPath = false; + + runtimeEnv = {BACKLIGHT_NAME = backlightName;}; + + runtimeInputs = [ + gawk + coreutils + ]; +} diff --git a/pkgs/by-name/co/con2pdf/package.nix b/pkgs/by-name/co/con2pdf/package.nix deleted file mode 100644 index 11d45ab5..00000000 --- a/pkgs/by-name/co/con2pdf/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - writeText, - # Dependencies - sane-backends, - imagemagick, - coreutils, - fd, -}: -writeShellApplication { - name = "con2pdf"; - text = builtins.readFile ./con2pdf.sh; - inheritPath = false; - - runtimeInputs = [ - sane-backends - imagemagick - coreutils - fd - ]; - - runtimeEnv = { - DEVICE_FUNCTION = - # This is here, because escaping the whole function, to use it in the shell script - # directly just isn't possible - writeText "DEVICE_FUNCTION" - /* - bash - */ - '' - scanimage -L | awk 'BEGIN { FS = "`" } { gsub(/'.*/, "", $2); print $2 }' - ''; - }; -} diff --git a/pkgs/by-name/co/con2pdf/package.unstable.nix b/pkgs/by-name/co/con2pdf/package.unstable.nix new file mode 100644 index 00000000..11d45ab5 --- /dev/null +++ b/pkgs/by-name/co/con2pdf/package.unstable.nix @@ -0,0 +1,43 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + writeText, + # Dependencies + sane-backends, + imagemagick, + coreutils, + fd, +}: +writeShellApplication { + name = "con2pdf"; + text = builtins.readFile ./con2pdf.sh; + inheritPath = false; + + runtimeInputs = [ + sane-backends + imagemagick + coreutils + fd + ]; + + runtimeEnv = { + DEVICE_FUNCTION = + # This is here, because escaping the whole function, to use it in the shell script + # directly just isn't possible + writeText "DEVICE_FUNCTION" + /* + bash + */ + '' + scanimage -L | awk 'BEGIN { FS = "`" } { gsub(/'.*/, "", $2); print $2 }' + ''; + }; +} diff --git a/pkgs/by-name/ct/ctpv-64-types/package.nix b/pkgs/by-name/ct/ctpv-64-types/package.nix deleted file mode 100644 index 087e1d28..00000000 --- a/pkgs/by-name/ct/ctpv-64-types/package.nix +++ /dev/null @@ -1,24 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ctpv}: -ctpv.overrideAttrs (finalAttrs: previousAttrs: { - pname = previousAttrs.pname + "-64-types"; - patches = - (previousAttrs.patches or []) - ++ [ - ./allow-up-to-64-types.patch - ]; - - preFixup = '' - wrapProgram $out/bin/ctpv --set PATH ""; - ''; - - meta.mainProgram = "ctpv"; -}) diff --git a/pkgs/by-name/ct/ctpv-64-types/package.unstable.nix b/pkgs/by-name/ct/ctpv-64-types/package.unstable.nix new file mode 100644 index 00000000..087e1d28 --- /dev/null +++ b/pkgs/by-name/ct/ctpv-64-types/package.unstable.nix @@ -0,0 +1,24 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ctpv}: +ctpv.overrideAttrs (finalAttrs: previousAttrs: { + pname = previousAttrs.pname + "-64-types"; + patches = + (previousAttrs.patches or []) + ++ [ + ./allow-up-to-64-types.patch + ]; + + preFixup = '' + wrapProgram $out/bin/ctpv --set PATH ""; + ''; + + meta.mainProgram = "ctpv"; +}) diff --git a/pkgs/by-name/di/direnv-patched/package.nix b/pkgs/by-name/di/direnv-patched/package.nix deleted file mode 100644 index 073be614..00000000 --- a/pkgs/by-name/di/direnv-patched/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{direnv}: -direnv.overrideAttrs (final: prev: { - pname = "${prev.pname}-patched"; - - buildPhase = - '' - runHook preBuild - '' - + prev.buildPhase - + '' - runHook postBuild - ''; - - installPhase = - '' - runHook preInstall - '' - + prev.installPhase - + '' - runHook postInstall - ''; - - patches = - (prev.patches or []) - ++ [ - ./0001-rc-Also-consider-.nenvrc-files.patch - ]; -}) diff --git a/pkgs/by-name/di/direnv-patched/package.unstable.nix b/pkgs/by-name/di/direnv-patched/package.unstable.nix new file mode 100644 index 00000000..073be614 --- /dev/null +++ b/pkgs/by-name/di/direnv-patched/package.unstable.nix @@ -0,0 +1,28 @@ +{direnv}: +direnv.overrideAttrs (final: prev: { + pname = "${prev.pname}-patched"; + + buildPhase = + '' + runHook preBuild + '' + + prev.buildPhase + + '' + runHook postBuild + ''; + + installPhase = + '' + runHook preInstall + '' + + prev.installPhase + + '' + runHook postInstall + ''; + + patches = + (prev.patches or []) + ++ [ + ./0001-rc-Also-consider-.nenvrc-files.patch + ]; +}) diff --git a/pkgs/by-name/fd/fd_list/package.nix b/pkgs/by-name/fd/fd_list/package.nix deleted file mode 100644 index 34129b10..00000000 --- a/pkgs/by-name/fd/fd_list/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - findutils, - gawk, - coreutils, - procps, -}: -writeShellApplication { - name = "fd_list"; - text = builtins.readFile ./fd_list.sh; - - inheritPath = false; - runtimeInputs = [ - findutils - gawk - coreutils - procps - ]; -} diff --git a/pkgs/by-name/fd/fd_list/package.unstable.nix b/pkgs/by-name/fd/fd_list/package.unstable.nix new file mode 100644 index 00000000..34129b10 --- /dev/null +++ b/pkgs/by-name/fd/fd_list/package.unstable.nix @@ -0,0 +1,28 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + findutils, + gawk, + coreutils, + procps, +}: +writeShellApplication { + name = "fd_list"; + text = builtins.readFile ./fd_list.sh; + + inheritPath = false; + runtimeInputs = [ + findutils + gawk + coreutils + procps + ]; +} diff --git a/pkgs/by-name/fi/fish-mk-maps/package.nix b/pkgs/by-name/fi/fish-mk-maps/package.nix deleted file mode 100644 index 7048f41e..00000000 --- a/pkgs/by-name/fi/fish-mk-maps/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - rustPlatform, - lib, -}: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "mpdpopm"; - version = "0.1.0"; - - buildInputs = []; - nativeBuildInputs = []; - - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - meta = { - mainProgram = "mpdpopm"; - }; -}) diff --git a/pkgs/by-name/fi/fish-mk-maps/package.unstable.nix b/pkgs/by-name/fi/fish-mk-maps/package.unstable.nix new file mode 100644 index 00000000..7048f41e --- /dev/null +++ b/pkgs/by-name/fi/fish-mk-maps/package.unstable.nix @@ -0,0 +1,29 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + rustPlatform, + lib, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mpdpopm"; + version = "0.1.0"; + + buildInputs = []; + nativeBuildInputs = []; + + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + meta = { + mainProgram = "mpdpopm"; + }; +}) diff --git a/pkgs/by-name/fi/fish-patched/package.nix b/pkgs/by-name/fi/fish-patched/package.nix deleted file mode 100644 index cb45af99..00000000 --- a/pkgs/by-name/fi/fish-patched/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - fish, - rustPlatform, -}: let - loadedRustPlatform = { - inherit (rustPlatform) cargoSetupHook; - fetchCargoVendor = loadedFetchCargoVendor; - }; - - loadedFetchCargoVendor = prev: - rustPlatform.importCargoLock - { - lockFile = ./Cargo.lock; - allowBuiltinFetchGit = true; - }; -in - (fish.override { - rustPlatform = loadedRustPlatform; - }).overrideAttrs (prev: { - pname = "${prev.pname}-patched"; - - postPatch = - (prev.postPatch or "") - + '' - rm Cargo.lock - cat ${./Cargo.lock} > Cargo.lock - ''; - - doCheck = false; - - patches = - (prev.patches or []) - ++ ( - builtins.map (name: ./patches + "/${name}") - (builtins.attrNames - (builtins.readDir ./patches)) - ); - }) diff --git a/pkgs/by-name/fi/fish-patched/package.unstable.nix b/pkgs/by-name/fi/fish-patched/package.unstable.nix new file mode 100644 index 00000000..cb45af99 --- /dev/null +++ b/pkgs/by-name/fi/fish-patched/package.unstable.nix @@ -0,0 +1,38 @@ +{ + fish, + rustPlatform, +}: let + loadedRustPlatform = { + inherit (rustPlatform) cargoSetupHook; + fetchCargoVendor = loadedFetchCargoVendor; + }; + + loadedFetchCargoVendor = prev: + rustPlatform.importCargoLock + { + lockFile = ./Cargo.lock; + allowBuiltinFetchGit = true; + }; +in + (fish.override { + rustPlatform = loadedRustPlatform; + }).overrideAttrs (prev: { + pname = "${prev.pname}-patched"; + + postPatch = + (prev.postPatch or "") + + '' + rm Cargo.lock + cat ${./Cargo.lock} > Cargo.lock + ''; + + doCheck = false; + + patches = + (prev.patches or []) + ++ ( + builtins.map (name: ./patches + "/${name}") + (builtins.attrNames + (builtins.readDir ./patches)) + ); + }) diff --git a/pkgs/by-name/fu/fupdate-flake/package.nix b/pkgs/by-name/fu/fupdate-flake/package.nix deleted file mode 100644 index 4e21cd23..00000000 --- a/pkgs/by-name/fu/fupdate-flake/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - coreutils, - fd, - gnugrep, - git, -}: -writeShellApplication { - name = "fupdate-flake"; - text = builtins.readFile ./fupdate-flake.sh; - - # The `update.sh` script might actually want to keep the path. - inheritPath = true; - - runtimeInputs = [ - coreutils - fd - gnugrep - git - ]; -} diff --git a/pkgs/by-name/fu/fupdate-flake/package.unstable.nix b/pkgs/by-name/fu/fupdate-flake/package.unstable.nix new file mode 100644 index 00000000..4e21cd23 --- /dev/null +++ b/pkgs/by-name/fu/fupdate-flake/package.unstable.nix @@ -0,0 +1,31 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + coreutils, + fd, + gnugrep, + git, +}: +writeShellApplication { + name = "fupdate-flake"; + text = builtins.readFile ./fupdate-flake.sh; + + # The `update.sh` script might actually want to keep the path. + inheritPath = true; + + runtimeInputs = [ + coreutils + fd + gnugrep + git + ]; +} diff --git a/pkgs/by-name/fu/fupdate-sys/package.nix b/pkgs/by-name/fu/fupdate-sys/package.nix deleted file mode 100644 index 9a48e32d..00000000 --- a/pkgs/by-name/fu/fupdate-sys/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - git, - nixos-rebuild-ng, - sudo, - openssh, - coreutils, - mktemp, - gnugrep, - gnused, - systemd, - lixPackageSets, - jq, -}: let - nixos-rebuild-without-nix = nixos-rebuild-ng.override { - nix = lixPackageSets.latest.lix; - }; -in - writeShellApplication { - name = "fupdate-sys"; - text = builtins.readFile ./fupdate-sys.sh; - inheritPath = false; - runtimeInputs = [ - git - nixos-rebuild-without-nix - sudo - openssh - coreutils - mktemp - gnugrep - gnused - systemd - jq - ]; - } diff --git a/pkgs/by-name/fu/fupdate-sys/package.unstable.nix b/pkgs/by-name/fu/fupdate-sys/package.unstable.nix new file mode 100644 index 00000000..9a48e32d --- /dev/null +++ b/pkgs/by-name/fu/fupdate-sys/package.unstable.nix @@ -0,0 +1,45 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + git, + nixos-rebuild-ng, + sudo, + openssh, + coreutils, + mktemp, + gnugrep, + gnused, + systemd, + lixPackageSets, + jq, +}: let + nixos-rebuild-without-nix = nixos-rebuild-ng.override { + nix = lixPackageSets.latest.lix; + }; +in + writeShellApplication { + name = "fupdate-sys"; + text = builtins.readFile ./fupdate-sys.sh; + inheritPath = false; + runtimeInputs = [ + git + nixos-rebuild-without-nix + sudo + openssh + coreutils + mktemp + gnugrep + gnused + systemd + jq + ]; + } diff --git a/pkgs/by-name/fu/fupdate/package.nix b/pkgs/by-name/fu/fupdate/package.nix deleted file mode 100644 index 86eccaf7..00000000 --- a/pkgs/by-name/fu/fupdate/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - rustPlatform, - installShellFiles, - makeWrapper, -}: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "fupdate"; - version = "0.1.0"; - - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - buildInputs = []; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; - - postInstall = '' - installShellCompletion --cmd fupdate \ - --bash <(COMPLETE=bash $out/bin/fupdate) \ - --fish <(COMPLETE=fish $out/bin/fupdate) \ - --zsh <(COMPLETE=zsh $out/bin/fupdate) - ''; - - meta = { - mainProgram = "fupdate"; - }; -}) diff --git a/pkgs/by-name/fu/fupdate/package.unstable.nix b/pkgs/by-name/fu/fupdate/package.unstable.nix new file mode 100644 index 00000000..86eccaf7 --- /dev/null +++ b/pkgs/by-name/fu/fupdate/package.unstable.nix @@ -0,0 +1,41 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + rustPlatform, + installShellFiles, + makeWrapper, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "fupdate"; + version = "0.1.0"; + + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + buildInputs = []; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + postInstall = '' + installShellCompletion --cmd fupdate \ + --bash <(COMPLETE=bash $out/bin/fupdate) \ + --fish <(COMPLETE=fish $out/bin/fupdate) \ + --zsh <(COMPLETE=zsh $out/bin/fupdate) + ''; + + meta = { + mainProgram = "fupdate"; + }; +}) diff --git a/pkgs/by-name/gi/git-cgit/package.nix b/pkgs/by-name/gi/git-cgit/package.nix deleted file mode 100644 index b64c5e84..00000000 --- a/pkgs/by-name/gi/git-cgit/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - coreutils, - git, - openssh, -}: -writeShellApplication { - name = "git-cgit"; - text = builtins.readFile ./git-cgit.sh; - - inheritPath = false; - - runtimeInputs = [ - coreutils - git - openssh - ]; -} diff --git a/pkgs/by-name/gi/git-cgit/package.unstable.nix b/pkgs/by-name/gi/git-cgit/package.unstable.nix new file mode 100644 index 00000000..b64c5e84 --- /dev/null +++ b/pkgs/by-name/gi/git-cgit/package.unstable.nix @@ -0,0 +1,28 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + coreutils, + git, + openssh, +}: +writeShellApplication { + name = "git-cgit"; + text = builtins.readFile ./git-cgit.sh; + + inheritPath = false; + + runtimeInputs = [ + coreutils + git + openssh + ]; +} diff --git a/pkgs/by-name/gi/git-cm/package.nix b/pkgs/by-name/gi/git-cm/package.nix deleted file mode 100644 index f124ce90..00000000 --- a/pkgs/by-name/gi/git-cm/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - git, - gnused, -}: -writeShellApplication { - name = "git-cm"; - text = builtins.readFile ./git-cm.sh; - - # We need access to the $EDITOR - inheritPath = true; - - runtimeInputs = [ - git - gnused - ]; -} diff --git a/pkgs/by-name/gi/git-cm/package.unstable.nix b/pkgs/by-name/gi/git-cm/package.unstable.nix new file mode 100644 index 00000000..f124ce90 --- /dev/null +++ b/pkgs/by-name/gi/git-cm/package.unstable.nix @@ -0,0 +1,27 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + git, + gnused, +}: +writeShellApplication { + name = "git-cm"; + text = builtins.readFile ./git-cm.sh; + + # We need access to the $EDITOR + inheritPath = true; + + runtimeInputs = [ + git + gnused + ]; +} diff --git a/pkgs/by-name/gi/git-edit-index/package.nix b/pkgs/by-name/gi/git-edit-index/package.nix deleted file mode 100644 index 5e855b49..00000000 --- a/pkgs/by-name/gi/git-edit-index/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - coreutils, - git, - gnused, -}: -writeShellApplication { - name = "git-edit-index"; - text = builtins.readFile ./git-edit-index.sh; - - # `git-edit-index` starts neovim, wich might want to shell out from - inheritPath = true; - - runtimeInputs = [ - coreutils - git - gnused - ]; -} diff --git a/pkgs/by-name/gi/git-edit-index/package.unstable.nix b/pkgs/by-name/gi/git-edit-index/package.unstable.nix new file mode 100644 index 00000000..5e855b49 --- /dev/null +++ b/pkgs/by-name/gi/git-edit-index/package.unstable.nix @@ -0,0 +1,29 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + coreutils, + git, + gnused, +}: +writeShellApplication { + name = "git-edit-index"; + text = builtins.readFile ./git-edit-index.sh; + + # `git-edit-index` starts neovim, wich might want to shell out from + inheritPath = true; + + runtimeInputs = [ + coreutils + git + gnused + ]; +} diff --git a/pkgs/by-name/hi/hibernate/package.nix b/pkgs/by-name/hi/hibernate/package.nix deleted file mode 100644 index c2e8c0b6..00000000 --- a/pkgs/by-name/hi/hibernate/package.nix +++ /dev/null @@ -1,23 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - systemd, - taskwarrior3, -}: -writeShellApplication { - name = "hibernate"; - text = builtins.readFile ./hibernate.sh; - inheritPath = false; - runtimeInputs = [ - systemd - taskwarrior3 - ]; -} diff --git a/pkgs/by-name/hi/hibernate/package.unstable.nix b/pkgs/by-name/hi/hibernate/package.unstable.nix new file mode 100644 index 00000000..c2e8c0b6 --- /dev/null +++ b/pkgs/by-name/hi/hibernate/package.unstable.nix @@ -0,0 +1,23 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + systemd, + taskwarrior3, +}: +writeShellApplication { + name = "hibernate"; + text = builtins.readFile ./hibernate.sh; + inheritPath = false; + runtimeInputs = [ + systemd + taskwarrior3 + ]; +} diff --git a/pkgs/by-name/i3/i3bar-river-patched/package.nix b/pkgs/by-name/i3/i3bar-river-patched/package.nix deleted file mode 100644 index 26f11ab3..00000000 --- a/pkgs/by-name/i3/i3bar-river-patched/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - lib, - fetchFromGitHub, - rustPlatform, - pkg-config, - pango, -}: -rustPlatform.buildRustPackage { - pname = "i3bar-river-patched"; - version = "1.1.0-unstable-2025-05-20"; - - src = fetchFromGitHub { - owner = "bpeetz"; - repo = "i3bar-river"; - rev = "d460a9a283426e9474a0034a146d09816e92f571"; - hash = "sha256-E04b2FzEhOX5NyE/VpEGdg27Sg+1+lSSRZbGyX6PXrk="; - }; - - cargoHash = "sha256-jIB4XH67FmtPxAatHkuW8v5mNgr/KsyriaBNZ5t2dLo="; - - cargoPatches = [ - # TODO(@bpeetz): Open an issues, whether something like that could be up-streamed. <2025-05-20> - ./0001-feat-crate-bar-Put-the-leftmost-block-in-the-middle-.patch - ]; - - # Remove the WMs that I don't use. - buildNoDefaultFeatures = true; - buildFeatures = [ - # "hyprland" - # "niri" - "river" - ]; - - nativeBuildInputs = [pkg-config]; - buildInputs = [pango]; - - meta = with lib; { - description = "Port of i3bar for river"; - homepage = "https://github.com/MaxVerevkin/i3bar-river"; - license = licenses.gpl3Only; - maintainers = with maintainers; [nicegamer7]; - mainProgram = "i3bar-river"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/i3/i3bar-river-patched/package.unstable.nix b/pkgs/by-name/i3/i3bar-river-patched/package.unstable.nix new file mode 100644 index 00000000..26f11ab3 --- /dev/null +++ b/pkgs/by-name/i3/i3bar-river-patched/package.unstable.nix @@ -0,0 +1,54 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + pango, +}: +rustPlatform.buildRustPackage { + pname = "i3bar-river-patched"; + version = "1.1.0-unstable-2025-05-20"; + + src = fetchFromGitHub { + owner = "bpeetz"; + repo = "i3bar-river"; + rev = "d460a9a283426e9474a0034a146d09816e92f571"; + hash = "sha256-E04b2FzEhOX5NyE/VpEGdg27Sg+1+lSSRZbGyX6PXrk="; + }; + + cargoHash = "sha256-jIB4XH67FmtPxAatHkuW8v5mNgr/KsyriaBNZ5t2dLo="; + + cargoPatches = [ + # TODO(@bpeetz): Open an issues, whether something like that could be up-streamed. <2025-05-20> + ./0001-feat-crate-bar-Put-the-leftmost-block-in-the-middle-.patch + ]; + + # Remove the WMs that I don't use. + buildNoDefaultFeatures = true; + buildFeatures = [ + # "hyprland" + # "niri" + "river" + ]; + + nativeBuildInputs = [pkg-config]; + buildInputs = [pango]; + + meta = with lib; { + description = "Port of i3bar for river"; + homepage = "https://github.com/MaxVerevkin/i3bar-river"; + license = licenses.gpl3Only; + maintainers = with maintainers; [nicegamer7]; + mainProgram = "i3bar-river"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/lf/lf-make-map/package.nix b/pkgs/by-name/lf/lf-make-map/package.nix deleted file mode 100644 index 8f77c843..00000000 --- a/pkgs/by-name/lf/lf-make-map/package.nix +++ /dev/null @@ -1,23 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{rustPlatform}: -rustPlatform.buildRustPackage { - pname = "lf-make-map"; - version = "0.1.0"; - - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - meta = { - mainProgram = "lf-make-map"; - }; -} diff --git a/pkgs/by-name/lf/lf-make-map/package.unstable.nix b/pkgs/by-name/lf/lf-make-map/package.unstable.nix new file mode 100644 index 00000000..8f77c843 --- /dev/null +++ b/pkgs/by-name/lf/lf-make-map/package.unstable.nix @@ -0,0 +1,23 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{rustPlatform}: +rustPlatform.buildRustPackage { + pname = "lf-make-map"; + version = "0.1.0"; + + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + meta = { + mainProgram = "lf-make-map"; + }; +} diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix deleted file mode 100644 index 572ebb0b..00000000 --- a/pkgs/by-name/lo/lock/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - taskwarrior3, - swaylock, -}: -writeShellApplication { - name = "lock"; - text = builtins.readFile ./lock.sh; - runtimeInputs = [ - taskwarrior3 - swaylock - ]; - meta = { - mainProgram = "lock"; - }; -} diff --git a/pkgs/by-name/lo/lock/package.unstable.nix b/pkgs/by-name/lo/lock/package.unstable.nix new file mode 100644 index 00000000..572ebb0b --- /dev/null +++ b/pkgs/by-name/lo/lock/package.unstable.nix @@ -0,0 +1,25 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + taskwarrior3, + swaylock, +}: +writeShellApplication { + name = "lock"; + text = builtins.readFile ./lock.sh; + runtimeInputs = [ + taskwarrior3 + swaylock + ]; + meta = { + mainProgram = "lock"; + }; +} diff --git a/pkgs/by-name/mp/mpdpopm/package.nix b/pkgs/by-name/mp/mpdpopm/package.nix deleted file mode 100644 index 7048f41e..00000000 --- a/pkgs/by-name/mp/mpdpopm/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - rustPlatform, - lib, -}: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "mpdpopm"; - version = "0.1.0"; - - buildInputs = []; - nativeBuildInputs = []; - - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - meta = { - mainProgram = "mpdpopm"; - }; -}) diff --git a/pkgs/by-name/mp/mpdpopm/package.unstable.nix b/pkgs/by-name/mp/mpdpopm/package.unstable.nix new file mode 100644 index 00000000..7048f41e --- /dev/null +++ b/pkgs/by-name/mp/mpdpopm/package.unstable.nix @@ -0,0 +1,29 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + rustPlatform, + lib, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mpdpopm"; + version = "0.1.0"; + + buildInputs = []; + nativeBuildInputs = []; + + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + meta = { + mainProgram = "mpdpopm"; + }; +}) diff --git a/pkgs/by-name/mp/mpp-beetrm/package.nix b/pkgs/by-name/mp/mpp-beetrm/package.nix deleted file mode 100644 index 00672838..00000000 --- a/pkgs/by-name/mp/mpp-beetrm/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - mpc, - beets, -}: -writeShellApplication { - name = "mpp-beetrm"; - text = builtins.readFile ./mpp-beetrm.sh; - inheritPath = false; - - runtimeInputs = [ - mpc - beets - ]; -} diff --git a/pkgs/by-name/mp/mpp-beetrm/package.unstable.nix b/pkgs/by-name/mp/mpp-beetrm/package.unstable.nix new file mode 100644 index 00000000..00672838 --- /dev/null +++ b/pkgs/by-name/mp/mpp-beetrm/package.unstable.nix @@ -0,0 +1,25 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + mpc, + beets, +}: +writeShellApplication { + name = "mpp-beetrm"; + text = builtins.readFile ./mpp-beetrm.sh; + inheritPath = false; + + runtimeInputs = [ + mpc + beets + ]; +} diff --git a/pkgs/by-name/mp/mpp-lyrics/package.nix b/pkgs/by-name/mp/mpp-lyrics/package.nix deleted file mode 100644 index 0b6d8993..00000000 --- a/pkgs/by-name/mp/mpp-lyrics/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - exiftool, - mpc, - jq, - less, - locale, # dependency of less -}: -writeShellApplication { - name = "mpp-lyrics"; - text = builtins.readFile ./mpp-lyrics.sh; - inheritPath = false; - - runtimeInputs = [ - exiftool - mpc - jq - less - locale # dependency of less - ]; -} diff --git a/pkgs/by-name/mp/mpp-lyrics/package.unstable.nix b/pkgs/by-name/mp/mpp-lyrics/package.unstable.nix new file mode 100644 index 00000000..0b6d8993 --- /dev/null +++ b/pkgs/by-name/mp/mpp-lyrics/package.unstable.nix @@ -0,0 +1,31 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + exiftool, + mpc, + jq, + less, + locale, # dependency of less +}: +writeShellApplication { + name = "mpp-lyrics"; + text = builtins.readFile ./mpp-lyrics.sh; + inheritPath = false; + + runtimeInputs = [ + exiftool + mpc + jq + less + locale # dependency of less + ]; +} diff --git a/pkgs/by-name/mp/mpp-searchadd/package.nix b/pkgs/by-name/mp/mpp-searchadd/package.nix deleted file mode 100644 index 91ff05e9..00000000 --- a/pkgs/by-name/mp/mpp-searchadd/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies. - mpc, - beets, -}: -writeShellApplication { - name = "mpp-searchadd"; - text = builtins.readFile ./mpp-searchadd.sh; - inheritPath = false; - - runtimeInputs = [ - mpc - beets - ]; -} diff --git a/pkgs/by-name/mp/mpp-searchadd/package.unstable.nix b/pkgs/by-name/mp/mpp-searchadd/package.unstable.nix new file mode 100644 index 00000000..91ff05e9 --- /dev/null +++ b/pkgs/by-name/mp/mpp-searchadd/package.unstable.nix @@ -0,0 +1,25 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies. + mpc, + beets, +}: +writeShellApplication { + name = "mpp-searchadd"; + text = builtins.readFile ./mpp-searchadd.sh; + inheritPath = false; + + runtimeInputs = [ + mpc + beets + ]; +} diff --git a/pkgs/by-name/mp/mpp/package.nix b/pkgs/by-name/mp/mpp/package.nix deleted file mode 100644 index fe08ba46..00000000 --- a/pkgs/by-name/mp/mpp/package.nix +++ /dev/null @@ -1,90 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - symlinkJoin, - stdenv, - # Dependencies - mpc, - mpp-searchadd, - mpp-lyrics, - mpp-beetrm, - mpdpopm, - # Build dependencies - fd, - zsh, -}: let - script = writeShellApplication { - name = "mpp"; - text = builtins.readFile ./mpp.sh; - inheritPath = false; - - runtimeInputs = [ - mpc - mpp-searchadd - mpp-lyrics - mpp-beetrm - mpdpopm - ]; - }; - - mpcShare = stdenv.mkDerivation { - name = "mpp-only-share"; - nativeBuildInputs = [fd]; - strictDeps = true; - - src = mpc; - - buildPhase = '' - fixMpc() { - file_path="$1" - - new_file_path="$(echo "$file_path" | sed "s|mpc|mpp|g")" - - echo "Fixing '$file_path' -> '$new_file_path'.." - - [ -f "$file_path"] && mkdir --parents "$(dirname "$new_file_path")" - - mv "$file_path" "$new_file_path" - } - - # Copy the zsh bundled `mpc` completions to `mpp` - # TODO: Also add completions for the new subcommands <2024-11-17> - mkdir --parents share/zsh/site-functions; - cp "${zsh}/share/zsh/${zsh.version}/functions/_mpc" "share/zsh/site-functions" - - # Replace all reverences to `mpc`. First all files - fd "mpc" "." --hidden --type file | while read -r file_path; do - fixMpc "$file_path" - done - # Then their possible parent directories. - fd "mpc" "." --hidden --type directory | while read -r file_path; do - fixMpc "$file_path" - done - # Now patch all reverences to `mpc` away - fd "." --hidden --type file | while read -r file_path; do - sed --in-place 's/mpc/mpp/g' "$file_path" - done - - # TODO(@bpeetz): Also change this in man-pages. <2025-05-20> - ''; - - installPhase = '' - mkdir "$out"; - cp --recursive ./share "$out/share"; - ''; - }; -in - symlinkJoin { - name = "mpp"; - paths = [script mpcShare]; - - inherit (script) meta; - } diff --git a/pkgs/by-name/mp/mpp/package.unstable.nix b/pkgs/by-name/mp/mpp/package.unstable.nix new file mode 100644 index 00000000..fe08ba46 --- /dev/null +++ b/pkgs/by-name/mp/mpp/package.unstable.nix @@ -0,0 +1,90 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + symlinkJoin, + stdenv, + # Dependencies + mpc, + mpp-searchadd, + mpp-lyrics, + mpp-beetrm, + mpdpopm, + # Build dependencies + fd, + zsh, +}: let + script = writeShellApplication { + name = "mpp"; + text = builtins.readFile ./mpp.sh; + inheritPath = false; + + runtimeInputs = [ + mpc + mpp-searchadd + mpp-lyrics + mpp-beetrm + mpdpopm + ]; + }; + + mpcShare = stdenv.mkDerivation { + name = "mpp-only-share"; + nativeBuildInputs = [fd]; + strictDeps = true; + + src = mpc; + + buildPhase = '' + fixMpc() { + file_path="$1" + + new_file_path="$(echo "$file_path" | sed "s|mpc|mpp|g")" + + echo "Fixing '$file_path' -> '$new_file_path'.." + + [ -f "$file_path"] && mkdir --parents "$(dirname "$new_file_path")" + + mv "$file_path" "$new_file_path" + } + + # Copy the zsh bundled `mpc` completions to `mpp` + # TODO: Also add completions for the new subcommands <2024-11-17> + mkdir --parents share/zsh/site-functions; + cp "${zsh}/share/zsh/${zsh.version}/functions/_mpc" "share/zsh/site-functions" + + # Replace all reverences to `mpc`. First all files + fd "mpc" "." --hidden --type file | while read -r file_path; do + fixMpc "$file_path" + done + # Then their possible parent directories. + fd "mpc" "." --hidden --type directory | while read -r file_path; do + fixMpc "$file_path" + done + # Now patch all reverences to `mpc` away + fd "." --hidden --type file | while read -r file_path; do + sed --in-place 's/mpc/mpp/g' "$file_path" + done + + # TODO(@bpeetz): Also change this in man-pages. <2025-05-20> + ''; + + installPhase = '' + mkdir "$out"; + cp --recursive ./share "$out/share"; + ''; + }; +in + symlinkJoin { + name = "mpp"; + paths = [script mpcShare]; + + inherit (script) meta; + } diff --git a/pkgs/by-name/no/notify-run/package.nix b/pkgs/by-name/no/notify-run/package.nix deleted file mode 100644 index 1f9337be..00000000 --- a/pkgs/by-name/no/notify-run/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - rustPlatform, - lib, - libnotify, - makeWrapper, -}: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "notify-run"; - version = "0.1.0"; - - buildInputs = [ - libnotify - ]; - nativeBuildInputs = [ - makeWrapper - ]; - - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postInstall = '' - # NOTE: We cannot clear the path, because we need access to the programs to start. <2025-12-03> - wrapProgram $out/bin/notify-run \ - --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} - ''; - - meta = { - mainProgram = "notify-run"; - }; -}) diff --git a/pkgs/by-name/no/notify-run/package.unstable.nix b/pkgs/by-name/no/notify-run/package.unstable.nix new file mode 100644 index 00000000..1f9337be --- /dev/null +++ b/pkgs/by-name/no/notify-run/package.unstable.nix @@ -0,0 +1,41 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + rustPlatform, + lib, + libnotify, + makeWrapper, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "notify-run"; + version = "0.1.0"; + + buildInputs = [ + libnotify + ]; + nativeBuildInputs = [ + makeWrapper + ]; + + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postInstall = '' + # NOTE: We cannot clear the path, because we need access to the programs to start. <2025-12-03> + wrapProgram $out/bin/notify-run \ + --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} + ''; + + meta = { + mainProgram = "notify-run"; + }; +}) diff --git a/pkgs/by-name/qu/qutebrowser-patched/package.nix b/pkgs/by-name/qu/qutebrowser-patched/package.nix deleted file mode 100644 index bf4fab1d..00000000 --- a/pkgs/by-name/qu/qutebrowser-patched/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - qutebrowser, - python3, -}: let - python3NoSpeech = python3.override { - packageOverrides = self: super: { - # NOTE: The re-compile is not worth the space saving <2026-07-01> - # pyqt6 = super.pyqt6.override {withSpeech = false;}; - }; - }; - # NOTE: It's just not feasible to re-compile a webengine. <2026-05-29> - # qt6PackagesNoFfmpeg = qt6Packages.overrideScope ( - # _: prev: { - # qtwebengine = prev.qtwebengine.override { - # ffmpeg = ffmpeg-headless; - # }; - # } - # ); -in - (qutebrowser.overrideAttrs (final: prev: { - pname = "${prev.pname}-patched"; - - patches = (prev.patches or []) ++ [./0001-fix-standardpaths-Continue-to-work-with-xdg-while-ba.patch]; - })).override { - python3 = python3NoSpeech; - } diff --git a/pkgs/by-name/qu/qutebrowser-patched/package.unstable.nix b/pkgs/by-name/qu/qutebrowser-patched/package.unstable.nix new file mode 100644 index 00000000..bf4fab1d --- /dev/null +++ b/pkgs/by-name/qu/qutebrowser-patched/package.unstable.nix @@ -0,0 +1,26 @@ +{ + qutebrowser, + python3, +}: let + python3NoSpeech = python3.override { + packageOverrides = self: super: { + # NOTE: The re-compile is not worth the space saving <2026-07-01> + # pyqt6 = super.pyqt6.override {withSpeech = false;}; + }; + }; + # NOTE: It's just not feasible to re-compile a webengine. <2026-05-29> + # qt6PackagesNoFfmpeg = qt6Packages.overrideScope ( + # _: prev: { + # qtwebengine = prev.qtwebengine.override { + # ffmpeg = ffmpeg-headless; + # }; + # } + # ); +in + (qutebrowser.overrideAttrs (final: prev: { + pname = "${prev.pname}-patched"; + + patches = (prev.patches or []) ++ [./0001-fix-standardpaths-Continue-to-work-with-xdg-while-ba.patch]; + })).override { + python3 = python3NoSpeech; + } diff --git a/pkgs/by-name/ri/river-mk-keymap/package.nix b/pkgs/by-name/ri/river-mk-keymap/package.nix deleted file mode 100644 index bb3dc285..00000000 --- a/pkgs/by-name/ri/river-mk-keymap/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - rustPlatform, - pkg-config, - wayland, - libxkbcommon, - fontconfig, -}: -rustPlatform.buildRustPackage { - pname = "river-mk-keymap"; - version = "0.1.0"; - - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - wayland - libxkbcommon - fontconfig - ]; - - meta = { - mainProgram = "river-mk-keymap"; - }; -} diff --git a/pkgs/by-name/ri/river-mk-keymap/package.unstable.nix b/pkgs/by-name/ri/river-mk-keymap/package.unstable.nix new file mode 100644 index 00000000..bb3dc285 --- /dev/null +++ b/pkgs/by-name/ri/river-mk-keymap/package.unstable.nix @@ -0,0 +1,39 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + rustPlatform, + pkg-config, + wayland, + libxkbcommon, + fontconfig, +}: +rustPlatform.buildRustPackage { + pname = "river-mk-keymap"; + version = "0.1.0"; + + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + wayland + libxkbcommon + fontconfig + ]; + + meta = { + mainProgram = "river-mk-keymap"; + }; +} diff --git a/pkgs/by-name/sc/screenshot_persistent/package.nix b/pkgs/by-name/sc/screenshot_persistent/package.nix deleted file mode 100644 index 34054b0f..00000000 --- a/pkgs/by-name/sc/screenshot_persistent/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - grim, - slurp, - alacritty, - rofi, - libnotify, - lf, # TODO: add llp -}: -writeShellApplication { - name = "screenshot_persistent"; - text = builtins.readFile ./screenshot_persistent.sh; - runtimeInputs = [ - grim - slurp - alacritty - rofi - libnotify - lf # TODO: add llp - ]; - meta = { - mainProgram = "screenshot_persistent"; - }; -} diff --git a/pkgs/by-name/sc/screenshot_persistent/package.unstable.nix b/pkgs/by-name/sc/screenshot_persistent/package.unstable.nix new file mode 100644 index 00000000..34054b0f --- /dev/null +++ b/pkgs/by-name/sc/screenshot_persistent/package.unstable.nix @@ -0,0 +1,33 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + grim, + slurp, + alacritty, + rofi, + libnotify, + lf, # TODO: add llp +}: +writeShellApplication { + name = "screenshot_persistent"; + text = builtins.readFile ./screenshot_persistent.sh; + runtimeInputs = [ + grim + slurp + alacritty + rofi + libnotify + lf # TODO: add llp + ]; + meta = { + mainProgram = "screenshot_persistent"; + }; +} diff --git a/pkgs/by-name/sc/screenshot_temporary/package.nix b/pkgs/by-name/sc/screenshot_temporary/package.nix deleted file mode 100644 index 49bbeeb7..00000000 --- a/pkgs/by-name/sc/screenshot_temporary/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - grim, - slurp, - wl-clipboard, -}: -writeShellApplication { - name = "screenshot_temporary"; - text = builtins.readFile ./screenshot_temporary.sh; - inheritPath = false; - runtimeInputs = [ - grim - slurp - wl-clipboard - ]; -} diff --git a/pkgs/by-name/sc/screenshot_temporary/package.unstable.nix b/pkgs/by-name/sc/screenshot_temporary/package.unstable.nix new file mode 100644 index 00000000..49bbeeb7 --- /dev/null +++ b/pkgs/by-name/sc/screenshot_temporary/package.unstable.nix @@ -0,0 +1,26 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + grim, + slurp, + wl-clipboard, +}: +writeShellApplication { + name = "screenshot_temporary"; + text = builtins.readFile ./screenshot_temporary.sh; + inheritPath = false; + runtimeInputs = [ + grim + slurp + wl-clipboard + ]; +} diff --git a/pkgs/by-name/st/stamp/package.nix b/pkgs/by-name/st/stamp/package.nix deleted file mode 100644 index 871d531c..00000000 --- a/pkgs/by-name/st/stamp/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - coreutils, - fd, - git, - reuse, -}: -writeShellApplication { - name = "stamp"; - text = builtins.readFile ./stamp.sh; - inheritPath = false; - - runtimeInputs = [ - coreutils - fd - git - reuse - ]; -} diff --git a/pkgs/by-name/st/stamp/package.unstable.nix b/pkgs/by-name/st/stamp/package.unstable.nix new file mode 100644 index 00000000..871d531c --- /dev/null +++ b/pkgs/by-name/st/stamp/package.unstable.nix @@ -0,0 +1,29 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + coreutils, + fd, + git, + reuse, +}: +writeShellApplication { + name = "stamp"; + text = builtins.readFile ./stamp.sh; + inheritPath = false; + + runtimeInputs = [ + coreutils + fd + git + reuse + ]; +} diff --git a/pkgs/by-name/sw/sw/package.nix b/pkgs/by-name/sw/sw/package.nix deleted file mode 100644 index dea7e16c..00000000 --- a/pkgs/by-name/sw/sw/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - # Dependencies - river-classic, -}: -writeShellApplication { - name = "sw"; - text = builtins.readFile ./sw.sh; - - # We need to inherit the path, so that we can spawn stuff in a swallowed mode. - inheritPath = true; - - runtimeInputs = [ - river-classic - ]; -} diff --git a/pkgs/by-name/sw/sw/package.unstable.nix b/pkgs/by-name/sw/sw/package.unstable.nix new file mode 100644 index 00000000..dea7e16c --- /dev/null +++ b/pkgs/by-name/sw/sw/package.unstable.nix @@ -0,0 +1,25 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + # Dependencies + river-classic, +}: +writeShellApplication { + name = "sw"; + text = builtins.readFile ./sw.sh; + + # We need to inherit the path, so that we can spawn stuff in a swallowed mode. + inheritPath = true; + + runtimeInputs = [ + river-classic + ]; +} diff --git a/pkgs/by-name/sy/systemd-toggle/package.nix b/pkgs/by-name/sy/systemd-toggle/package.nix deleted file mode 100644 index 04ed576f..00000000 --- a/pkgs/by-name/sy/systemd-toggle/package.nix +++ /dev/null @@ -1,23 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - writeShellApplication, - systemd, -}: -writeShellApplication { - name = "systemd-toggle"; - text = builtins.readFile ./systemd-toggle.sh; - runtimeInputs = [ - systemd - ]; - meta = { - mainProgram = "systemd-toggle"; - }; -} diff --git a/pkgs/by-name/sy/systemd-toggle/package.unstable.nix b/pkgs/by-name/sy/systemd-toggle/package.unstable.nix new file mode 100644 index 00000000..04ed576f --- /dev/null +++ b/pkgs/by-name/sy/systemd-toggle/package.unstable.nix @@ -0,0 +1,23 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + writeShellApplication, + systemd, +}: +writeShellApplication { + name = "systemd-toggle"; + text = builtins.readFile ./systemd-toggle.sh; + runtimeInputs = [ + systemd + ]; + meta = { + mainProgram = "systemd-toggle"; + }; +} diff --git a/pkgs/by-name/ta/tails-iso/package.nix b/pkgs/by-name/ta/tails-iso/package.nix deleted file mode 100644 index a29bff54..00000000 --- a/pkgs/by-name/ta/tails-iso/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - stdenv, - fetchurl, - sequoia-sq, - libarchive, # for bsdtar -}: let - files = builtins.fromJSON (builtins.readFile (./files.json)); - - checked_iso = stdenv.mkDerivation (finalAttrs: { - pname = "raw-tails-iso"; - version = "amd64-${files.version}"; - - srcs = [ - (fetchurl { - url = "https://tails.net/torrents/files/tails-${finalAttrs.version}.iso.sig"; - hash = files.files."iso.sig"; - }) - (fetchurl { - url = "https://download.tails.net/tails/stable/tails-${finalAttrs.version}/tails-${finalAttrs.version}.iso"; - hash = files.files."iso"; - }) - (fetchurl { - url = "https://tails.net/tails-signing.key"; - hash = "sha256-wfGbXs4S2FYvtAMTotikG7asR96k2U27u8YGq2ahyjc="; - }) - ]; - - dontUnpack = true; - - nativeBuildInputs = [ - sequoia-sq - ]; - - buildPhase = '' - for src in $srcs; do - cp --recursive "$src" "$(stripHash "$src")" - done - - sq verify \ - --signer-file=tails-signing.key \ - --signature-file=tails-${finalAttrs.version}.iso.sig \ - tails-${finalAttrs.version}.iso - ''; - - installPhase = '' - cp tails-${finalAttrs.version}.iso "$out"; - ''; - }); -in - stdenv.mkDerivation { - pname = "tails-iso-package"; - inherit (checked_iso) version; - - src = ./.; - - dontUnpack = true; - - nativeBuildInputs = [ - libarchive - ]; - - buildPhase = '' - mkdir iso - ''; - - passthru = { - inherit (files) version; - }; - - installPhase = '' - mkdir --parents "$out/live/" - echo 1 > "$out/tails.iso" - echo 2 > "$out/live/vmlinuz-linux" - echo 3 > "$out/live/initrd.img" - - chmod --recursive -x $out/tails.iso $out/live/* - ''; - } diff --git a/pkgs/by-name/ta/tails-iso/package.unstable.nix b/pkgs/by-name/ta/tails-iso/package.unstable.nix new file mode 100644 index 00000000..a29bff54 --- /dev/null +++ b/pkgs/by-name/ta/tails-iso/package.unstable.nix @@ -0,0 +1,87 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + stdenv, + fetchurl, + sequoia-sq, + libarchive, # for bsdtar +}: let + files = builtins.fromJSON (builtins.readFile (./files.json)); + + checked_iso = stdenv.mkDerivation (finalAttrs: { + pname = "raw-tails-iso"; + version = "amd64-${files.version}"; + + srcs = [ + (fetchurl { + url = "https://tails.net/torrents/files/tails-${finalAttrs.version}.iso.sig"; + hash = files.files."iso.sig"; + }) + (fetchurl { + url = "https://download.tails.net/tails/stable/tails-${finalAttrs.version}/tails-${finalAttrs.version}.iso"; + hash = files.files."iso"; + }) + (fetchurl { + url = "https://tails.net/tails-signing.key"; + hash = "sha256-wfGbXs4S2FYvtAMTotikG7asR96k2U27u8YGq2ahyjc="; + }) + ]; + + dontUnpack = true; + + nativeBuildInputs = [ + sequoia-sq + ]; + + buildPhase = '' + for src in $srcs; do + cp --recursive "$src" "$(stripHash "$src")" + done + + sq verify \ + --signer-file=tails-signing.key \ + --signature-file=tails-${finalAttrs.version}.iso.sig \ + tails-${finalAttrs.version}.iso + ''; + + installPhase = '' + cp tails-${finalAttrs.version}.iso "$out"; + ''; + }); +in + stdenv.mkDerivation { + pname = "tails-iso-package"; + inherit (checked_iso) version; + + src = ./.; + + dontUnpack = true; + + nativeBuildInputs = [ + libarchive + ]; + + buildPhase = '' + mkdir iso + ''; + + passthru = { + inherit (files) version; + }; + + installPhase = '' + mkdir --parents "$out/live/" + echo 1 > "$out/tails.iso" + echo 2 > "$out/live/vmlinuz-linux" + echo 3 > "$out/live/initrd.img" + + chmod --recursive -x $out/tails.iso $out/live/* + ''; + } diff --git a/pkgs/by-name/tr/tree-sitter-yts/package.nix b/pkgs/by-name/tr/tree-sitter-yts/package.nix deleted file mode 100644 index eef65714..00000000 --- a/pkgs/by-name/tr/tree-sitter-yts/package.nix +++ /dev/null @@ -1,23 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -# taken from nixpgks: pkgs/development/tools/parsing/tree-sitter/grammar.nix -{ - yt, - stdenv, - nodejs, - tree-sitter, -}: -tree-sitter.buildGrammar { - language = "yts"; - version = "0.0.1+rev=0bb9a60"; - - inherit (yt) src; - sourceRoot = "yt/tree-sitter-yts"; -} diff --git a/pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix b/pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix new file mode 100644 index 00000000..eef65714 --- /dev/null +++ b/pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix @@ -0,0 +1,23 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +# taken from nixpgks: pkgs/development/tools/parsing/tree-sitter/grammar.nix +{ + yt, + stdenv, + nodejs, + tree-sitter, +}: +tree-sitter.buildGrammar { + language = "yts"; + version = "0.0.1+rev=0bb9a60"; + + inherit (yt) src; + sourceRoot = "yt/tree-sitter-yts"; +} diff --git a/pkgs/by-name/ts/tskm/package.nix b/pkgs/by-name/ts/tskm/package.nix deleted file mode 100644 index ad10865f..00000000 --- a/pkgs/by-name/ts/tskm/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - rustPlatform, - installShellFiles, - makeWrapper, - lib, - # Dependencies - taskwarrior3, - git, - rofi, - sqlite, -}: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "tskm"; - version = "0.1.0"; - - src = ./.; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - buildInputs = [ - taskwarrior3 - git - rofi - sqlite - ]; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; - - postInstall = '' - installShellCompletion --cmd tskm \ - --bash <(COMPLETE=bash $out/bin/tskm) \ - --fish <(COMPLETE=fish $out/bin/tskm) \ - --zsh <(COMPLETE=zsh $out/bin/tskm) - - # NOTE: We cannot clear the path, because we need access to the $EDITOR. <2025-04-04> - wrapProgram $out/bin/tskm \ - --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} - ''; - - meta = { - mainProgram = "tskm"; - }; -}) diff --git a/pkgs/by-name/ts/tskm/package.unstable.nix b/pkgs/by-name/ts/tskm/package.unstable.nix new file mode 100644 index 00000000..ad10865f --- /dev/null +++ b/pkgs/by-name/ts/tskm/package.unstable.nix @@ -0,0 +1,56 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + rustPlatform, + installShellFiles, + makeWrapper, + lib, + # Dependencies + taskwarrior3, + git, + rofi, + sqlite, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tskm"; + version = "0.1.0"; + + src = ./.; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + buildInputs = [ + taskwarrior3 + git + rofi + sqlite + ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + postInstall = '' + installShellCompletion --cmd tskm \ + --bash <(COMPLETE=bash $out/bin/tskm) \ + --fish <(COMPLETE=fish $out/bin/tskm) \ + --zsh <(COMPLETE=zsh $out/bin/tskm) + + # NOTE: We cannot clear the path, because we need access to the $EDITOR. <2025-04-04> + wrapProgram $out/bin/tskm \ + --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} + ''; + + meta = { + mainProgram = "tskm"; + }; +}) diff --git a/pkgs/by-name/yt/yt/package.nix b/pkgs/by-name/yt/yt/package.nix deleted file mode 100644 index 41234e19..00000000 --- a/pkgs/by-name/yt/yt/package.nix +++ /dev/null @@ -1,126 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - lib, - rustPlatform, - installShellFiles, - fetchgit, - gitUpdater, - # buildInputs - mpv-unwrapped, - ffmpeg-headless, - openssl, - libffi, - zlib, - curl, - deno, - # NativeBuildInputs - python3, - makeWrapper, - llvmPackages_latest, - glibc, - mold, - sqlite, - fd, - pkg-config, - SDL2, -}: let - version = "1.9.0"; - python = python3.withPackages (ps: [ps.yt-dlp]); - - mpv = mpv-unwrapped.override {ffmpeg = ffmpeg-headless;}; -in - rustPlatform.buildRustPackage (finalAttrs: { - inherit version; - pname = "yt"; - - src = fetchgit { - url = "https://git.foss-syndicate.org/bpeetz/clients/yt"; - tag = "v${version}"; - hash = "sha256-/Isgqe7Hda/1kwYY+ciQH/NBAcWvM92vDxWZ9svlQAM="; - }; - - cargoHash = "sha256-U0alYK9mhz6esVf0mad9o7Ra6tRaL9HKCOftyOg34HE="; - - buildInputs = [ - mpv.dev - ffmpeg-headless - openssl - libffi - zlib - curl.dev - python - deno - ]; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - sqlite - fd - pkg-config - mold - ]; - - checkInputs = [ - # Needed for the tests in `libmpv2` - SDL2 - ]; - - passthru.updateScript = gitUpdater {rev-prefix = "v";}; - - env = let - clang_version = - lib.versions.major - llvmPackages_latest.clang-unwrapped.version; - in { - # Needed for the compile time sqlite checks. - DATABASE_URL = "sqlite://database.sqlx"; - - # Required by yt_dlp - FFMPEG_LOCATION = "${lib.getExe ffmpeg-headless}"; - - # Tell pyo3 which python to use. - PYO3_PYTHON = lib.getExe python; - - # Needed for the libmpv2. - C_INCLUDE_PATH = "${glibc.dev}/include"; - LIBCLANG_INCLUDE_PATH = "${llvmPackages_latest.clang-unwrapped.lib}/lib/clang/${clang_version}/include"; - LIBCLANG_PATH = "${llvmPackages_latest.clang-unwrapped.lib}/lib/libclang.so"; - }; - - doCheck = true; - checkFlags = [ - # All of these tests try to connect to the internet to download test data. - "--skip=select::base::test_base" - "--skip=select::file::test_file" - "--skip=select::options::test_options" - "--skip=subscriptions::import_export::test_import_export" - "--skip=subscriptions::naming_subscriptions::test_naming_subscriptions" - "--skip=videos::downloading::test_downloading" - ]; - - prePatch = '' - # Generate the sqlite db, so that we can run the comp-time sqlite checks. - bash ./scripts/mkdb.sh - ''; - - postInstall = '' - installShellCompletion --cmd yt \ - --bash <(COMPLETE=bash $out/bin/yt) \ - --fish <(COMPLETE=fish $out/bin/yt) \ - --zsh <(COMPLETE=zsh $out/bin/yt) - - # NOTE: We cannot clear the path, because we need access to the $EDITOR. <2025-04-04> - wrapProgram $out/bin/yt \ - --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} \ - --set YTDLP_NO_PLUGINS 1 - ''; - }) diff --git a/pkgs/by-name/yt/yt/package.unstable.nix b/pkgs/by-name/yt/yt/package.unstable.nix new file mode 100644 index 00000000..41234e19 --- /dev/null +++ b/pkgs/by-name/yt/yt/package.unstable.nix @@ -0,0 +1,126 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + lib, + rustPlatform, + installShellFiles, + fetchgit, + gitUpdater, + # buildInputs + mpv-unwrapped, + ffmpeg-headless, + openssl, + libffi, + zlib, + curl, + deno, + # NativeBuildInputs + python3, + makeWrapper, + llvmPackages_latest, + glibc, + mold, + sqlite, + fd, + pkg-config, + SDL2, +}: let + version = "1.9.0"; + python = python3.withPackages (ps: [ps.yt-dlp]); + + mpv = mpv-unwrapped.override {ffmpeg = ffmpeg-headless;}; +in + rustPlatform.buildRustPackage (finalAttrs: { + inherit version; + pname = "yt"; + + src = fetchgit { + url = "https://git.foss-syndicate.org/bpeetz/clients/yt"; + tag = "v${version}"; + hash = "sha256-/Isgqe7Hda/1kwYY+ciQH/NBAcWvM92vDxWZ9svlQAM="; + }; + + cargoHash = "sha256-U0alYK9mhz6esVf0mad9o7Ra6tRaL9HKCOftyOg34HE="; + + buildInputs = [ + mpv.dev + ffmpeg-headless + openssl + libffi + zlib + curl.dev + python + deno + ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + sqlite + fd + pkg-config + mold + ]; + + checkInputs = [ + # Needed for the tests in `libmpv2` + SDL2 + ]; + + passthru.updateScript = gitUpdater {rev-prefix = "v";}; + + env = let + clang_version = + lib.versions.major + llvmPackages_latest.clang-unwrapped.version; + in { + # Needed for the compile time sqlite checks. + DATABASE_URL = "sqlite://database.sqlx"; + + # Required by yt_dlp + FFMPEG_LOCATION = "${lib.getExe ffmpeg-headless}"; + + # Tell pyo3 which python to use. + PYO3_PYTHON = lib.getExe python; + + # Needed for the libmpv2. + C_INCLUDE_PATH = "${glibc.dev}/include"; + LIBCLANG_INCLUDE_PATH = "${llvmPackages_latest.clang-unwrapped.lib}/lib/clang/${clang_version}/include"; + LIBCLANG_PATH = "${llvmPackages_latest.clang-unwrapped.lib}/lib/libclang.so"; + }; + + doCheck = true; + checkFlags = [ + # All of these tests try to connect to the internet to download test data. + "--skip=select::base::test_base" + "--skip=select::file::test_file" + "--skip=select::options::test_options" + "--skip=subscriptions::import_export::test_import_export" + "--skip=subscriptions::naming_subscriptions::test_naming_subscriptions" + "--skip=videos::downloading::test_downloading" + ]; + + prePatch = '' + # Generate the sqlite db, so that we can run the comp-time sqlite checks. + bash ./scripts/mkdb.sh + ''; + + postInstall = '' + installShellCompletion --cmd yt \ + --bash <(COMPLETE=bash $out/bin/yt) \ + --fish <(COMPLETE=fish $out/bin/yt) \ + --zsh <(COMPLETE=zsh $out/bin/yt) + + # NOTE: We cannot clear the path, because we need access to the $EDITOR. <2025-04-04> + wrapProgram $out/bin/yt \ + --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs} \ + --set YTDLP_NO_PLUGINS 1 + ''; + }) 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 -- cgit v1.3.1