From 5cbbdf2a081cb976e53cba37bdfcbd715684f120 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 22 Jan 2024 12:46:25 +0100 Subject: [PATCH] feat(patches): Update nix-patches --- hive.nix | 13 ++++--------- npins/sources.json | 6 +++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/hive.nix b/hive.nix index 6f5434f..badb3b3 100644 --- a/hive.nix +++ b/hive.nix @@ -4,6 +4,8 @@ let lib = import (sources.nix-lib + "/src/trivial.nix"); + patch = import sources.nix-patches { patchFile = ./patches; }; + mkNode = node: { name, nodes, pkgs, ... }: { # Import the base configuration for each node @@ -30,16 +32,9 @@ let }; mkNixpkgs = node: - let - version = "nixos-${metadata.nodes.${node}.nixpkgs}"; - pkgs = import sources.${version} { }; - in pkgs.applyPatches { - name = "${version}-patched"; + patch.mkNixpkgsSrc rec { src = sources.${version}; - patches = (import sources.nix-patches { - inherit pkgs; - patchFile = ./patches; - }).mkPatches version; + version = "nixos-${metadata.nodes.${node}.nixpkgs}"; }; mkNixpkgs' = node: import (mkNixpkgs node) { }; diff --git a/npins/sources.json b/npins/sources.json index ff2fa21..3ea4094 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -119,10 +119,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "v0.2.0", - "revision": "6d47298262bd256b02281281ecf58bbf15ed21ba", + "version": "v0.3.0", + "revision": "040fb5155c9199d3e6338bd8722a122b0bb7b93d", "url": null, - "hash": "14w7w327m8rf7yrjflqvbnmwx04l36n7j0nca5ilpvzrr8f2gg6l" + "hash": "1bm2m067ipwnr9hi9d3v0z42357vn1gmgn6kk6r1r75w5zhfqy1f" }, "nixos-23.11": { "type": "Channel",