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