From 7e2e4de1a42e37234cf5d5a692573a8426bec4ca Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 19 Aug 2026 17:47:51 +0200 Subject: treewide: Switch to bare unflake There was no real reason to still have `npins` around. I just kept it because of historical reasons. --- pkgs/by-name/fu/fupdate/flake.nix | 4 ++-- pkgs/by-name/lf/lf-make-map/flake.nix | 4 ++-- pkgs/by-name/mp/mpdpopm/flake.nix | 6 +++--- pkgs/by-name/no/notify-run/flake.nix | 4 ++-- pkgs/by-name/ri/river-mk-keymap/flake.nix | 4 ++-- pkgs/by-name/ts/tskm/flake.nix | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pkgs') diff --git a/pkgs/by-name/fu/fupdate/flake.nix b/pkgs/by-name/fu/fupdate/flake.nix index 22b0957f..ca4d41c8 100644 --- a/pkgs/by-name/fu/fupdate/flake.nix +++ b/pkgs/by-name/fu/fupdate/flake.nix @@ -14,9 +14,9 @@ outputs = {...}: let system = "x86_64-linux"; - sources = import ../../../../npins/full.nix {}; + sources = import ../../../../unflake.nix; - pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}"; + pkgs = sources.nixpkgs.legacyPackages."${system}"; in { devShells."${system}".default = pkgs.mkShell { packages = [ diff --git a/pkgs/by-name/lf/lf-make-map/flake.nix b/pkgs/by-name/lf/lf-make-map/flake.nix index 2d1e93a2..743103b6 100644 --- a/pkgs/by-name/lf/lf-make-map/flake.nix +++ b/pkgs/by-name/lf/lf-make-map/flake.nix @@ -14,9 +14,9 @@ outputs = {...}: let system = "x86_64-linux"; - sources = import ../../../../npins/full.nix {}; + sources = import ../../../../unflake.nix; - pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}"; + pkgs = sources.nixpkgs.legacyPackages."${system}"; in { devShells."${system}".default = pkgs.mkShell { packages = [ diff --git a/pkgs/by-name/mp/mpdpopm/flake.nix b/pkgs/by-name/mp/mpdpopm/flake.nix index d672bd1b..d2e37260 100644 --- a/pkgs/by-name/mp/mpdpopm/flake.nix +++ b/pkgs/by-name/mp/mpdpopm/flake.nix @@ -15,10 +15,10 @@ outputs = {self, ...}: let system = "x86_64-linux"; - sources = import ../../../../npins/full.nix {}; + sources = import ../../../../unflake.nix; - pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}"; - treefmt-nix = sources.loadFlake "treefmt-nix"; + pkgs = sources.nixpkgs.legacyPackages."${system}"; + inherit (sources) treefmt-nix; treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; in { diff --git a/pkgs/by-name/no/notify-run/flake.nix b/pkgs/by-name/no/notify-run/flake.nix index ea5fecb2..f8649e8f 100644 --- a/pkgs/by-name/no/notify-run/flake.nix +++ b/pkgs/by-name/no/notify-run/flake.nix @@ -15,9 +15,9 @@ outputs = {...}: let system = "x86_64-linux"; - sources = import ../../../../npins/full.nix {}; + sources = import ../../../../unflake.nix; - pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}"; + pkgs = sources.nixpkgs.legacyPackages."${system}"; in { devShells."${system}".default = pkgs.mkShell { packages = [ diff --git a/pkgs/by-name/ri/river-mk-keymap/flake.nix b/pkgs/by-name/ri/river-mk-keymap/flake.nix index d1467506..6cf70c97 100644 --- a/pkgs/by-name/ri/river-mk-keymap/flake.nix +++ b/pkgs/by-name/ri/river-mk-keymap/flake.nix @@ -16,8 +16,8 @@ outputs = {...}: let system = "x86_64-linux"; - sources = import ../../../../npins/full.nix {}; - pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}"; + sources = import ../../../../unflake.nix; + pkgs = sources.nixpkgs.legacyPackages."${system}"; nativeBuildInputs = [ pkgs.pkg-config diff --git a/pkgs/by-name/ts/tskm/flake.nix b/pkgs/by-name/ts/tskm/flake.nix index e4d22c09..a4a010ae 100644 --- a/pkgs/by-name/ts/tskm/flake.nix +++ b/pkgs/by-name/ts/tskm/flake.nix @@ -16,8 +16,8 @@ outputs = {...}: let system = "x86_64-linux"; - sources = import ../../../../npins/full.nix {}; - pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}"; + sources = import ../../../../unflake.nix; + pkgs = sources.nixpkgs.legacyPackages."${system}"; in { devShells."${system}".default = pkgs.mkShell { buildInputs = [ -- cgit v1.3.1