summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErin Kim2022-03-03 01:45:45 +0000
committerGitHub2022-03-03 01:45:45 +0000
commit0ff3e3ea38120474772052ca649d9989405b4ce5 (patch)
treef4cc950a3eaf60059a3a144e0386b77eb68d3a99
parentc0b86afdc8cff912625ad9d4d8006423dc918359 (diff)
Add `inputs.nixpkgs.follows` to `rust-overlay` in `flake.nix` (#1729)
* add `inputs.nixpkgs.follows` to `rust-overlay` * Update flake.lock
-rw-r--r--flake.lock20
-rw-r--r--flake.nix5
2 files changed, 7 insertions, 18 deletions
diff --git a/flake.lock b/flake.lock
index 94e443e3..5286fb50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,22 +70,6 @@
"type": "github"
}
},
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1637453606,
- "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"root": {
"inputs": {
"nixCargoIntegration": "nixCargoIntegration",
@@ -96,7 +80,9 @@
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": [
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1642128126,
diff --git a/flake.nix b/flake.nix
index 660207ed..dcfeff63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,10 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- rust-overlay.url = "github:oxalica/rust-overlay";
+ rust-overlay = {
+ url = "github:oxalica/rust-overlay";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
nixCargoIntegration = {
url = "github:yusdacra/nix-cargo-integration";
inputs.nixpkgs.follows = "nixpkgs";