Expose custom Rust registry versions #26582
Closed
+46
−44
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tilpner
force-pushed
the
rust-registry-version
branch
from
4288b35 to
9f9fc9e
Compare
Mic92
reviewed
Jun 14, 2017
pkgs/top-level/all-packages.nix
Outdated
| @@ -5770,6 +5770,8 @@ with pkgs; | |||
| inherit (darwin) apple_sdk; | |||
| }; | |||
|
|
|||
| makeRustRegistry = import ./rust-packages.nix; | |||
There was a problem hiding this comment.
I think callPackage does a little bit more then just import
There was a problem hiding this comment.
You were completely right, I fixed that
Mic92
reviewed
Jun 14, 2017
pkgs/top-level/rust-packages.nix
Outdated
| @@ -21,7 +22,7 @@ let | |||
|
|
|||
| in | |||
|
|
|||
| runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" { inherit src; } '' | |||
There was a problem hiding this comment.
might be still useful to have rev here. This could be an optional string if src is not overwritten by the user.
There was a problem hiding this comment.
Do you know why the rev was sliced to the first 8 characters here? Why not put it all in there?
There was a problem hiding this comment.
I think just to save visual space.
tilpner
force-pushed
the
rust-registry-version
branch
6 times, most recently
from
290a9a6 to
8bc15dc
Compare
This allows users to specify a custom registry src, because currently every packager would need to create an outdated Cargo.lock just to be compatible with the probably outdated rustRegistry in nixpkgs. Currently there is no easy way to convince cargo to do that, so this makes that workaround unnecessary.
tilpner
force-pushed
the
rust-registry-version
branch
from
8bc15dc to
f4d80af
Compare
Mic92
reviewed
Jun 15, 2017
pkgs/build-support/rust/default.nix
Outdated
| , ... } @ args: | ||
|
|
||
| let | ||
| lib = stdenv.lib; | ||
| rustRegistry = callPackage (path + /pkgs/top-level/rust-packages.nix) | ||
| (lib.optionalAttrs (registry != null) { src = registry; }); |
There was a problem hiding this comment.
this looks also a bit weird. I now made rustRegistry a proper package.
|
This looks good to me. Can you also take a look at it? @LnL7 |
Mic92
force-pushed
the
rust-registry-version
branch
from
e3df560 to
b42b6fd
Compare
LnL7
added
6.topic: rust
2.status: merge conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This allows users to specify a custom registry src,
because currently every packager would need to create
an outdated Cargo.lock just to be compatible with the
probably outdated rustRegistry in nixpkgs.
Currently there is no easy way to convince cargo to
do that, so this makes that workaround unnecessary.
Not tested, this is only a PR already for review purposes, don't merge just yet
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)