diff --git a/flake.lock b/flake.lock index 1549b21..f0853d5 100644 --- a/flake.lock +++ b/flake.lock @@ -43,6 +43,33 @@ "type": "github" } }, + "custom-nixpkgs": { + "inputs": { + "fenix": [ + "fenix" + ], + "nixpkgs": [ + "nixpkgs" + ], + "rust-manifest": "rust-manifest", + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1692917810, + "narHash": "sha256-yphwiZk+F221jYQHPNUGAoy/MJI3usdgtzdVG+7oKFY=", + "owner": "msfjarvis", + "repo": "custom-nixpkgs", + "rev": "3b29b3378dc3f5abb36d670ca16aa566ea17a47d", + "type": "github" + }, + "original": { + "owner": "msfjarvis", + "repo": "custom-nixpkgs", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -143,6 +170,7 @@ "inputs": { "advisory-db": "advisory-db", "crane": "crane", + "custom-nixpkgs": "custom-nixpkgs", "devshell": "devshell", "fenix": "fenix", "flake-compat": "flake-compat", @@ -168,6 +196,18 @@ "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" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index 023ed5f..bcf043c 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,11 @@ inputs.crane.inputs.flake-utils.follows = "flake-utils"; 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"; @@ -31,6 +36,7 @@ nixpkgs, advisory-db, crane, + custom-nixpkgs, devshell, fenix, flake-utils, @@ -39,7 +45,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [devshell.overlays.default]; + overlays = [custom-nixpkgs.overlays.default devshell.overlays.default]; }; rustNightly = (import fenix {inherit pkgs;}).fromToolchainFile { @@ -90,7 +96,7 @@ ]; packages = with pkgs; [ - cargo-dist + cargo-dist-unstable cargo-nextest cargo-release rustNightly