Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add inputs.nixpkgs.follows to rust-overlay in flake.nix #1729

Merged
merged 2 commits into from
Mar 3, 2022

Conversation

oati
Copy link
Contributor

@oati oati commented Mar 3, 2022

Before this PR, the helix flake created two separate entries of nixpkgs in flake.lock.

This PR fixes this issue.

@the-mikedavis
Copy link
Member

It looks like this updates flake.lock...
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,

Would you mind pushing that change as well? Otherwise lgtm 👍

@oati
Copy link
Contributor Author

oati commented Mar 3, 2022

Updated!

@archseer
Copy link
Member

archseer commented Mar 3, 2022

Thanks!

@archseer archseer merged commit 0ff3e3e into helix-editor:master Mar 3, 2022
@oati oati deleted the patch-1 branch March 3, 2022 01:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants