From a2d2d2bb12dc5b7459df0fe6df6a3f3a11176e6e Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 23 Mar 2023 20:55:45 +0100 Subject: Pass nixpkgs to emacs-overlay --- flake.lock | 56 +++++++++++++++++++++----------------------------------- flake.nix | 1 + 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 9ab7b570..ec67f388 100644 --- a/flake.lock +++ b/flake.lock @@ -24,14 +24,16 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1678439275, - "narHash": "sha256-ugErJAZB0K5Ml6Gow94e3knILog9nSXpBTVVv70r6DY=", + "lastModified": 1679595100, + "narHash": "sha256-FY2r9S3XbKdKOUXJHHNwUWc48eJtAcm2aaKD+ljPTKA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c8421fbdb7d831296ecb735c8a7f60964809c857", + "rev": "ecf16600106c319e7438803db9951eaa472d8513", "type": "github" }, "original": { @@ -63,11 +65,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678271387, - "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", + "lastModified": 1679480702, + "narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=", "owner": "nix-community", "repo": "home-manager", - "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", + "rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e", "type": "github" }, "original": { @@ -78,11 +80,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1678397099, - "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=", + "lastModified": 1679224149, + "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea", + "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59", "type": "github" }, "original": { @@ -93,27 +95,11 @@ }, "nixpkgs": { "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_2": { - "locked": { - "lastModified": 1678380223, - "narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=", + "lastModified": 1679437018, + "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e2590679d0ed2cee2736e8b80373178d085d263", + "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", "type": "github" }, "original": { @@ -129,20 +115,20 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "secrets": "secrets" } }, "secrets": { "flake": false, "locked": { - "lastModified": 1669361235, - "narHash": "sha256-FPoHoeccfiFTQZEFg5kTt3xxTHDGLiKqYyeiHfsJUv0=", + "lastModified": 1678826533, + "narHash": "sha256-LWuMr8f8AVcCuicFz8YEOA7tbZwsG/FjsAoCgE2iKaw=", "ref": "refs/heads/main", - "rev": "565513161c56d722a70234b74ef86748196682f2", - "revCount": 36, + "rev": "771ce7c0d938aa1ba2b179af83705c9325c96071", + "revCount": 39, "type": "git", - "url": "ssh://git.alanpearce.eu/nixfiles-private" + "url": "file:///Users/alan/projects/alanpearce.eu/nixfiles/private" }, "original": { "id": "secrets", diff --git a/flake.nix b/flake.nix index a9aaa10d..943aa4e7 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ home-manager.url = github:nix-community/home-manager; home-manager.inputs.nixpkgs.follows = "nixpkgs"; emacs-overlay.url = github:nix-community/emacs-overlay; + emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; secrets = { flake = false; }; -- cgit 1.4.1