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/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 ++++++++++++++++++++ 6 files changed, 117 insertions(+), 117 deletions(-) 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 (limited to 'pkgs/by-name/fu') 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"; + }; +}) -- cgit v1.3.1