-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs
base: 2ff742e970de
head repository: NixOS/nixpkgs
compare: 9f03cb856264
- 10 commits
- 6 files changed
- 1 contributor
Commits on Dec 11, 2019
-
buildRustCrate: builtins -> lib where possible
We can just use `lib` instead of `builtins` in all cases but the `hashString` case. Also changed a few lines to make use of some optional helpers from lib.
Configuration menu - View commit details
-
Copy full SHA for 0aac0e8 - Browse repository at this point
Copy the full SHA 0aac0e8View commit details -
buildRustCrate: move the color loggign & remove some runtime checks
The expression is already long and confusing enough without the color stuff sprinkled in. Moving it to a dedicated file makes sense. I switched a bit of the color support code to pure Nix since there wasn't much point in doing that in bash while we can just do it in Nix.
Configuration menu - View commit details
-
Copy full SHA for 50b2ef2 - Browse repository at this point
Copy the full SHA 50b2ef2View commit details -
buildRustCrate: use tr instead of sed (it reads a bit nicer)
I already have a few changes in here that will trigger rebuilds so I might as well do that substitution now.
Configuration menu - View commit details
-
Copy full SHA for db55d1f - Browse repository at this point
Copy the full SHA db55d1fView commit details -
buildRustCrate: document and cleanup the symbol seeding
That code had been in the derivation for a while but no explanation was given why that is needed. It might be helpful to our future selfs to document why things are done the way they are.
Configuration menu - View commit details
-
Copy full SHA for f4aeabd - Browse repository at this point
Copy the full SHA f4aeabdView commit details -
buildRustCrate: rename
makeDeps
function tomkRustcDepArgs
This should carry the function better then `makeDeps` as it isn't producing deps but the rustc arguments required to link against those.
Configuration menu - View commit details
-
Copy full SHA for d37f001 - Browse repository at this point
Copy the full SHA d37f001View commit details -
buildRustCrate: reflow the way
extraRustcOpts
is constructedThis should make it more obvious that we have three parts to it and not just one long gibberish string that makes up all of it.
Configuration menu - View commit details
-
Copy full SHA for 5ad8326 - Browse repository at this point
Copy the full SHA 5ad8326View commit details
Commits on Dec 12, 2019
-
buildRustCrate: use less bash for the build script
We can get rid of a bunch of workarounds that were in the build script before by just passing on the `crateBin` attribute. Before we converted the list of attributes to a string only to convert it back in bash during the build phase. We can do the entire looping through builds in Nix and thus need no conversion and parsing of attributes over and over again. The big part that still remains bash is the heuristic that cargo introduced and that we can't do at eval time.
Configuration menu - View commit details
-
Copy full SHA for 6ad22f5 - Browse repository at this point
Copy the full SHA 6ad22f5View commit details -
buildRustCrate: deduplicate dependency override code
The previous lines were only different in the kind of dependencies but otherwise exactly the same. It makes the entire thing a bit more readable by moving this into a function that takes care of this.
Configuration menu - View commit details
-
Copy full SHA for 3f49d7a - Browse repository at this point
Copy the full SHA 3f49d7aView commit details -
buildRustCrate: move common build functions to a dedicated file
This means we aren't rebuilding hat file for each crate we are building and the buildPhase expression is a lot easier to comprehent.
Configuration menu - View commit details
-
Copy full SHA for 2eaaf7a - Browse repository at this point
Copy the full SHA 2eaaf7aView commit details
Commits on Jan 2, 2020
-
Merge pull request #75563 from andir/cleanup-buildRustCrate
Cleanup buildRustCrate expression
Configuration menu - View commit details
-
Copy full SHA for 9f03cb8 - Browse repository at this point
Copy the full SHA 9f03cb8View commit details
There are no files selected for viewing