From 782800e2a93bce6eba01f8a0c1de65f90e70911d Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 24 Dec 2024 07:20:31 +1000
Subject: [PATCH] nixpkgs-update: use tools from $PATH
---
flake.lock | 10 ++++------
flake.nix | 3 +--
hosts/build02/nixpkgs-update.nix | 5 +++++
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/flake.lock b/flake.lock
index 5097383..07a45a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -251,23 +251,21 @@
"empty"
],
"nixpkgs": "nixpkgs_2",
- "runtimeDeps": [
- "nixpkgs"
- ],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
- "lastModified": 1734559477,
- "narHash": "sha256-Jwvow0ri+ZgCdP6jpNQVjxub14Pxs1kyjvDV3BbvNzE=",
+ "lastModified": 1736218503,
+ "narHash": "sha256-X88+dZu7WALRh+2F6YLltROJthpOmluOYsJTyNtFIRQ=",
"owner": "nix-community",
"repo": "nixpkgs-update",
- "rev": "7f089591e8f595011323c8a7370b195fa3dfe0b7",
+ "rev": "450b814004c86a7880a95d6a0e40ab8260c9367f",
"type": "github"
},
"original": {
"owner": "nix-community",
+ "ref": "infra",
"repo": "nixpkgs-update",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 2285264..8c0faca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,9 +34,8 @@
nixpkgs-update-github-releases.flake = false;
nixpkgs-update-github-releases.url = "github:nix-community/nixpkgs-update-github-releases";
nixpkgs-update.inputs.mmdoc.follows = "empty";
- nixpkgs-update.inputs.runtimeDeps.follows = "nixpkgs";
nixpkgs-update.inputs.treefmt-nix.follows = "treefmt-nix";
- nixpkgs-update.url = "github:nix-community/nixpkgs-update";
+ nixpkgs-update.url = "github:nix-community/nixpkgs-update/infra";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
nur-update.inputs.nixpkgs.follows = "nixpkgs";
nur-update.url = "github:nix-community/nur-update";
diff --git a/hosts/build02/nixpkgs-update.nix b/hosts/build02/nixpkgs-update.nix
index 914cdab..eb0ef8d 100644
--- a/hosts/build02/nixpkgs-update.nix
+++ b/hosts/build02/nixpkgs-update.nix
@@ -21,6 +21,11 @@ let
cachix
apacheHttpd # for rotatelogs, used by worker script
socat # used by worker script
+
+ coreutils
+ gist
+ nixpkgs-review
+ tree
];
mkWorker = name: {