diff --git a/flake.lock b/flake.lock index 333c751..056d794 100644 --- a/flake.lock +++ b/flake.lock @@ -22,22 +22,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -51,7 +35,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -85,27 +69,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -208,37 +171,6 @@ "type": "github" } }, - "git-hooks-nix": { - "inputs": { - "flake-compat": [ - "nix" - ], - "gitignore": [ - "nix" - ], - "nixpkgs": [ - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -325,49 +257,6 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1715853528, - "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", - "type": "github" - }, - "original": { - "owner": "libgit2", - "ref": "v1.8.1", - "repo": "libgit2", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", - "git-hooks-nix": "git-hooks-nix", - "libgit2": "libgit2", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1727310093, - "narHash": "sha256-O0x2Hp3+gb0JJJUXMzO3gBdyzRuFHCxn2DCQ9AMaq/4=", - "owner": "nixos", - "repo": "nix", - "rev": "a5959aa12170fc75cafc9e2416fae9aa67f91e6b", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nix", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -420,22 +309,6 @@ "type": "github" } }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1725233747, @@ -464,22 +337,6 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1727202669, @@ -531,7 +388,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": [ "flake-parts" ], @@ -607,7 +464,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" @@ -651,7 +508,6 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "iamb": "iamb", - "nix": "nix", "nix-darwin": "nix-darwin", "nix-env": "nix-env", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 54ff27e..74fed78 100644 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,6 @@ }; inputs = { - nix.url = "github:nixos/nix"; - nix.inputs.nixpkgs.follows = "nixpkgs"; - # utilities for Flake flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/nix/default.nix b/nix/default.nix index a771a28..5d149c5 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -23,7 +23,6 @@ let overlays = [ inputs.ocaml-overlay.overlays.default - inputs.nix.overlays.default ] ++ lib.attrValues self.overlays; in rec { @@ -34,7 +33,7 @@ inherit (pkgs) stdenv; } // { - package = pkgs.nix; + package = branches.stable.nix; }; pkgs = import inputs.nixpkgs { diff --git a/nix/nix.nix b/nix/nix.nix index f43b3af..f21452d 100644 --- a/nix/nix.nix +++ b/nix/nix.nix @@ -17,7 +17,6 @@ in system.flake = inputs.self; default.flake = inputs.nixpkgs; nixpkgs.flake = inputs.nixpkgs; - nix.flake = inputs.nix; nix-darwin.flake = inputs.nix-darwin; home-manager.flake = inputs.home-manager; };