diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2023-02-09 06:55:18 -0500 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2023-02-09 06:55:18 -0500 |
commit | 36e4516b0880d1d2ed0ac765a3402e3c6f50310d (patch) | |
tree | e5068686e68c21a3aa428c47ee2f4428062a5913 | |
parent | fade3625441eb0382c0dec77d5d416fbf4c18ce8 (diff) |
update
-rw-r--r-- | flake.lock | 83 | ||||
-rw-r--r-- | flake.nix | 5 |
2 files changed, 49 insertions, 39 deletions
@@ -2,14 +2,17 @@ "nodes": { "agenix": { "inputs": { - "nixpkgs": "nixpkgs" + "darwin": "darwin", + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1673301561, - "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", + "lastModified": 1675176355, + "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", "owner": "ryantm", "repo": "agenix", - "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", + "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", "type": "github" }, "original": { @@ -18,17 +21,39 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1674295993, - "narHash": "sha256-OCgU01IjoZTCjjZlUnfYbMH+hFwKdgxa9YFD/RkcNyI=", + "lastModified": 1675937476, + "narHash": "sha256-DPd4/LjcaVouSTbLSnUa2oig+teH1bFGOvBIDw2MESA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "93d9799629140618a9b18930fd3e3d3d5b5fe452", + "rev": "b70f136e1c59d3733684d9bd9893d9153f810be3", "type": "github" }, "original": { @@ -54,11 +79,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1673803274, - "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", + "lastModified": 1675933606, + "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", + "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", "type": "github" }, "original": { @@ -70,11 +95,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665732960, - "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4428e23312933a196724da2df7ab78eb5e67a88e", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "type": "github" }, "original": { @@ -86,11 +111,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1674120619, - "narHash": "sha256-xLT1FQl7/jNPOEq5q/vmc3AExt1V9LtcjM+QY2+MUpA=", + "lastModified": 1675763311, + "narHash": "sha256-bz0Q2H3mxsF1CUfk26Sl9Uzi8/HFjGFD/moZHz1HebU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7705c01ef0a39c8ef532d1033bace8845a07d35", + "rev": "fab09085df1b60d6a0870c8a89ce26d5a4a708c2", "type": "github" }, "original": { @@ -102,27 +127,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1674242456, - "narHash": "sha256-yBy7rCH7EiBe9+CHZm9YB5ii5GRa+MOxeW0oDEBO8SE=", + "lastModified": 1675757258, + "narHash": "sha256-pIRer8vdsoherlRKpzfnHbMZ5TsAcvRlXHCIaHkIUbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdead16a444a3e5de7bc9b0af8e198b11bb01804", + "rev": "af96094e9b8eb162d70a84fa3b39f4b7a8b264d2", "type": "github" }, "original": { @@ -137,7 +146,7 @@ "agenix": "agenix", "emacs-overlay": "emacs-overlay", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } } @@ -4,6 +4,7 @@ inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; inputs.emacs-overlay.url = "github:nix-community/emacs-overlay"; inputs.agenix.url = "github:ryantm/agenix"; + inputs.agenix.inputs.nixpkgs.follows = "nixpkgs"; outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, emacs-overlay, agenix }: @@ -13,7 +14,7 @@ cfg = config.nixpkgs; extra-packages = final: prev: { - agenix = agenix.defaultPackage.${final.system}; + agenix = agenix.packages.${final.system}.default; }; unstable-overlay = final: prev: rec { @@ -68,7 +69,7 @@ registry-module module nixpkgs.nixosModules.notDetected - agenix.nixosModules.age + agenix.nixosModules.default ({ config, pkgs, ... }: { # Let 'nixos-version --json' know about the Git revision # of this flake. |