From b845b1136b4f9141dbe649bc8ebb0728ee68ec6f Mon Sep 17 00:00:00 2001 From: willemml Date: Tue, 21 Feb 2023 15:31:24 -0800 Subject: [PATCH] Update nix, add flake-utils. --- flake.lock | 42 +++++++++++++++++++++++++++++------------- flake.nix | 3 ++- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 5e9ec19..984ab5b 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -43,11 +58,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674928308, - "narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=", + "lastModified": 1677013990, + "narHash": "sha256-HwAnE5MHsyLiRJp50KfDFPiiOZXI0Ts8hXpIh6yBilE=", "owner": "nix-community", "repo": "home-manager", - "rev": "08a778d80308353f4f65c9dcd3790b5da02d6306", + "rev": "564b82b3542026e7fb5d0da16c56ae3e40e5c9dd", "type": "github" }, "original": { @@ -58,7 +73,7 @@ }, "mach-nix": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", "pypi-deps-db": "pypi-deps-db" }, @@ -96,11 +111,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676300157, - "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", + "lastModified": 1643805626, + "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", + "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", "type": "github" }, "original": { @@ -111,11 +126,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1675454231, - "narHash": "sha256-5rgcWq1nFWlbR3NsLqY7i/7358uhkSeMQJ/LEHk3BWA=", + "lastModified": 1676973346, + "narHash": "sha256-rft8oGMocTAhUVqG3LW6I8K/Fo9ICGmNjRqaWTJwav0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06999209d7a0043d4372e38f57cffae00223d592", + "rev": "d0d55259081f0b97c828f38559cad899d351cad1", "type": "github" }, "original": { @@ -127,11 +142,11 @@ }, "nur": { "locked": { - "lastModified": 1675544542, - "narHash": "sha256-Csl1i+q7YHIE8uHEaDeZ4DuSk4dwDM1DMriIwsIc69s=", + "lastModified": 1677012355, + "narHash": "sha256-ccE3BQPMA0R5fR3jJRX/CUa4FmcLSoK5RvUreTpT/HY=", "owner": "nix-community", "repo": "NUR", - "rev": "acb6e79bd96112f46b0be1627f147df660f93dcc", + "rev": "6f8988a961627ad6a591095d0a360d51dc8098d8", "type": "github" }, "original": { @@ -159,6 +174,7 @@ "root": { "inputs": { "darwin": "darwin", + "flake-utils": "flake-utils", "home-manager": "home-manager", "mach-nix": "mach-nix", "nixos-apple-silicon": "nixos-apple-silicon", diff --git a/flake.nix b/flake.nix index e333f15..0bbd01a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; darwin.url = "github:lnl7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon"; @@ -12,7 +13,7 @@ nur.url = "github:nix-community/NUR"; }; - outputs = inputs@{ self, darwin, home-manager, mach-nix, nixos-apple-silicon, nixpkgs, nur, ... }: + outputs = inputs@{ self, darwin, flake-utils, home-manager, mach-nix, nixos-apple-silicon, nixpkgs, nur, ... }: let pkgsfunc = ({ system, overlays ? [ ] }: import nixpkgs {