diff --git a/flake.lock b/flake.lock index b69a5e7..6d3797e 100644 --- a/flake.lock +++ b/flake.lock @@ -36,33 +36,6 @@ "type": "github" } }, - "custom-nixpkgs": { - "inputs": { - "fenix": [ - "fenix" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-manifest": "rust-manifest", - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1698255782, - "narHash": "sha256-qSB5Emi37DKTubRsJo+Wov634eh2xLwfJHvkU+GNCOI=", - "owner": "msfjarvis", - "repo": "custom-nixpkgs", - "rev": "f2be310e49af33a056ce60670e84e4b48ba6d32a", - "type": "github" - }, - "original": { - "owner": "msfjarvis", - "repo": "custom-nixpkgs", - "type": "github" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -163,7 +136,6 @@ "inputs": { "advisory-db": "advisory-db", "crane": "crane", - "custom-nixpkgs": "custom-nixpkgs", "devshell": "devshell", "fenix": "fenix", "flake-compat": "flake-compat", @@ -189,18 +161,6 @@ "type": "github" } }, - "rust-manifest": { - "flake": false, - "locked": { - "narHash": "sha256-emILH39kZmz9D2cquaobdM55EakoGkUxn1sY3r1iYNg=", - "type": "file", - "url": "https://static.rust-lang.org/dist/2023-07-08/channel-rust-nightly.toml" - }, - "original": { - "type": "file", - "url": "https://static.rust-lang.org/dist/2023-07-08/channel-rust-nightly.toml" - } - }, "systems": { "locked": { "lastModified": 1687694171, diff --git a/flake.nix b/flake.nix index e190c24..f5d9dcb 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,6 @@ inputs.crane.url = "github:ipetkov/crane"; inputs.crane.inputs.nixpkgs.follows = "nixpkgs"; - inputs.custom-nixpkgs.url = "github:msfjarvis/custom-nixpkgs"; - inputs.custom-nixpkgs.inputs.nixpkgs.follows = "nixpkgs"; - inputs.custom-nixpkgs.inputs.fenix.follows = "fenix"; - inputs.custom-nixpkgs.inputs.systems.follows = "systems"; - inputs.devshell.url = "github:numtide/devshell"; inputs.devshell.inputs.nixpkgs.follows = "nixpkgs"; inputs.devshell.inputs.systems.follows = "systems"; @@ -34,7 +29,6 @@ nixpkgs, advisory-db, crane, - custom-nixpkgs, devshell, fenix, flake-utils, @@ -43,7 +37,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [custom-nixpkgs.overlays.default devshell.overlays.default]; + overlays = [devshell.overlays.default]; }; rustNightly = (import fenix {inherit pkgs;}).fromToolchainFile {