From a42f134bf89f6223bbae488ba62297d962e0b3d6 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Wed, 30 Oct 2024 20:21:31 -0500 Subject: [PATCH] move helix.drv to central nixpkgs Signed-off-by: jolheiser --- flake.lock | 42 +++++++++++++++++++++++++++++++++++++++--- flake.nix | 3 ++- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 99e6f6e..071e2ef 100644 --- a/flake.lock +++ b/flake.lock @@ -410,6 +410,7 @@ "helix": { "inputs": { "nixpkgs": [ + "jolheiser", "nixpkgs" ] }, @@ -447,6 +448,24 @@ "type": "github" } }, + "jolheiser": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1730336659, + "narHash": "sha256-DYQUprBce8sXdBj7Ub1h/52GnGvxiXelvucVTcTXE8I=", + "ref": "refs/heads/main", + "rev": "69856a465c69e5b456ef652f0f5f17a12b9d8c02", + "revCount": 3, + "type": "git", + "url": "https://git.jolheiser.com/nixpkgs.git" + }, + "original": { + "type": "git", + "url": "https://git.jolheiser.com/nixpkgs.git" + } + }, "nixos-hardware": { "locked": { "lastModified": 1728269138, @@ -512,6 +531,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -527,7 +562,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1725432240, "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", @@ -598,8 +633,9 @@ "gomodinit": "gomodinit", "helix": "helix", "home-manager": "home-manager", + "jolheiser": "jolheiser", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur", "resume": "resume", "spectre": "spectre", @@ -798,7 +834,7 @@ "tclip": { "inputs": { "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "utils": [ "flake-utils" ] diff --git a/flake.nix b/flake.nix index 0298d1f..c8f141a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + jolheiser.url = "git+https://git.jolheiser.com/nixpkgs.git"; flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers home-manager = { @@ -21,7 +22,7 @@ nur.url = "github:nix-community/NUR"; helix = { url = "git+https://git.jolheiser.com/helix.drv.git"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "jolheiser/nixpkgs"; }; website = { url = "git+https://git.jolheiser.com/jolheiser.com.git";