From 0b09bc5bd2d2a1e46c50e133959d8bd03194093c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 15 Jul 2023 10:39:08 +1000
Subject: [PATCH] flake: rename darwin input to nix-darwin
sometimes using anything other than `darwin` for this input could cause problems but this has been fixed upstream
---
flake.lock | 42 +++++++++++++++++++++---------------------
flake.nix | 6 +++---
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/flake.lock b/flake.lock
index 88ce75e..bc4067a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
{
"nodes": {
- "darwin": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1689188243,
- "narHash": "sha256-v3EDlWWLBQ+LIRWZ03jd8bnvHLyNae6iaqd03rbYhwo=",
- "owner": "LnL7",
- "repo": "nix-darwin",
- "rev": "2ad716c2786dabf8f458ae1e7d343775d3acc65c",
- "type": "github"
- },
- "original": {
- "owner": "LnL7",
- "repo": "nix-darwin",
- "type": "github"
- }
- },
"disko": {
"inputs": {
"nixpkgs": [
@@ -84,6 +64,26 @@
"type": "github"
}
},
+ "nix-darwin": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1689281837,
+ "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=",
+ "owner": "LnL7",
+ "repo": "nix-darwin",
+ "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "LnL7",
+ "repo": "nix-darwin",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1689179735,
@@ -171,10 +171,10 @@
},
"root": {
"inputs": {
- "darwin": "darwin",
"disko": "disko",
"flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects",
+ "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs",
"nixpkgs-update": "nixpkgs-update",
"nixpkgs-update-github-releases": "nixpkgs-update-github-releases",
diff --git a/flake.nix b/flake.nix
index 619829d..d965cf2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,8 +14,8 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
- darwin.url = "github:LnL7/nix-darwin";
- darwin.inputs.nixpkgs.follows = "nixpkgs";
+ nix-darwin.url = "github:LnL7/nix-darwin";
+ nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.inputs.nixpkgs-stable.follows = "";
@@ -152,7 +152,7 @@
};
flake.lib.darwinSystem = args:
- inputs.darwin.lib.darwinSystem ({ specialArgs = { inherit inputs; }; } // args);
+ inputs.nix-darwin.lib.darwinSystem ({ specialArgs = { inherit inputs; }; } // args);
flake.lib.nixosSystem = args:
inputs.nixpkgs.lib.nixosSystem ({ specialArgs = { inherit inputs; }; } // args);
};