From 217af89c1955ded313b94e97389863e77c356b02 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 15 Oct 2025 16:33:57 +0100 Subject: [PATCH] Test out #450602 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Override `keymap-drawer` input to the `draw` package. Flake lock file updates: • Added input 'nixpkgs-pr': 'github:nixos/nixpkgs/56d4cd679b0f1159d01f5d9b866ebdd23869bb9f?narHash=sha256-wAZKxLTvGIOzO%2BFOVpaJCdWX%2BYQzA%2BgIIunczHLPDbQ%3D' (2025-10-15) --- flake.lock | 19 ++++++++++++++++++- flake.nix | 1 + packages/flake-module.nix | 7 ++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index b4c3ddc..f7ee874 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,28 @@ "type": "github" } }, + "nixpkgs-pr": { + "locked": { + "lastModified": 1760541192, + "narHash": "sha256-wAZKxLTvGIOzO+FOVpaJCdWX+YQzA+gIIunczHLPDbQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "56d4cd679b0f1159d01f5d9b866ebdd23869bb9f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "pull/450602/merge", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", "glove80-zmk": "glove80-zmk", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-pr": "nixpkgs-pr" } } }, diff --git a/flake.nix b/flake.nix index 239ac42..d47c832 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-pr.url = "github:nixos/nixpkgs?ref=pull/450602/merge"; glove80-zmk = { url = "github:moergo-sc/zmk"; flake = false; diff --git a/packages/flake-module.nix b/packages/flake-module.nix index 93077e3..3836022 100644 --- a/packages/flake-module.nix +++ b/packages/flake-module.nix @@ -20,7 +20,7 @@ let in { perSystem = - { pkgs, ... }: + { pkgs, inputs', ... }: { packages = lib.pipe ./. [ readDir @@ -29,6 +29,11 @@ in (filterAttrs (name: pkg: hasSuffix ".nix" (toString pkg))) (filterAttrs (name: lib.pathIsRegularFile)) (mapAttrs' (name: pkg: lib.nameValuePair (removeSuffix ".nix" name) (pkgs.callPackage pkg { }))) + (packages: packages // { + draw = packages.draw.override { + keymap-drawer = inputs'.nixpkgs-pr.legacyPackages.keymap-drawer; + }; + }) ]; }; }