-
-
Notifications
You must be signed in to change notification settings - Fork 104
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: b38c28399172
head repository: NixOS/nixpkgs-channels
compare: ec29bb50bf45
Commits on Nov 21, 2019
-
Configuration menu - View commit details
-
Copy full SHA for f4a4557 - Browse repository at this point
Copy the full SHA f4a4557View commit details -
Configuration menu - View commit details
-
Copy full SHA for af02713 - Browse repository at this point
Copy the full SHA af02713View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2a717b3 - Browse repository at this point
Copy the full SHA 2a717b3View commit details -
Configuration menu - View commit details
-
Copy full SHA for d29879d - Browse repository at this point
Copy the full SHA d29879dView commit details
Commits on Nov 25, 2019
-
stdenv: Introduce hasCC attribute
Before, we'd always use `cc = null`, and check for that. The problem is this breaks for cross compilation to platforms that don't support a C compiler. It's a very subtle issue. One might think there is no problem because we have `stdenvNoCC`, and presumably one would only build derivations that use that. The problem is that one still wants to use tools at build-time that are themselves built with a C compiler, and those are gotten via "splicing". The runtime version of those deps will explode, but the build time / `buildPackages` versions of those deps will be fine, and splicing attempts to work this by using `builtins.tryEval` to filter out any broken "higher priority" packages (runtime is the default and highest priority) so that both `foo` and `foo.nativeDrv` works. However, `tryEval` only catches certain evaluation failures (e.g. exceptions), and not arbitrary failures (such as `cc.attr` when `cc` is null). This means `tryEval` fails to let us use our build time deps, and everything comes apart. The right solution is, as usually, to get rid of splicing. Or, baring that, to make it so `foo` never works and one has to explicitly do `foo.*`. But that is a much larger change, and certaily one unsuitable to be backported to stable. Given that, we instead make an exception-throwing `cc` attribute, and create a `hasCC` attribute for those derivations which wish to condtionally use a C compiler: instead of doing `stdenv.cc or null == null` or something similar, one does `stdenv.hasCC`. This allows quering without "tripping" the exception, while also allowing `tryEval` to work. No platform without a C compiler is yet wired up by default. That will be done in a following commit.
Configuration menu - View commit details
-
Copy full SHA for 63bd851 - Browse repository at this point
Copy the full SHA 63bd851View commit details -
Add support for cross compiling to
js-ghcjs
This platform doesn't have a C compiler, and so relies and the changes in the previous commit to work.
Configuration menu - View commit details
-
Copy full SHA for c739c42 - Browse repository at this point
Copy the full SHA c739c42View commit details -
haskell genenric-builder: Make the C compiler optional
This is GHCJS, and perhaps other obscure targets.
Configuration menu - View commit details
-
Copy full SHA for ea9a2c5 - Browse repository at this point
Copy the full SHA ea9a2c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6bc456c - Browse repository at this point
Copy the full SHA 6bc456cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 765d260 - Browse repository at this point
Copy the full SHA 765d260View commit details -
Configuration menu - View commit details
-
Copy full SHA for 80524db - Browse repository at this point
Copy the full SHA 80524dbView commit details
Commits on Nov 26, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 8737963 - Browse repository at this point
Copy the full SHA 8737963View commit details -
Merge remote-tracking branch 'obsidian/ghcjs-cross-without-cc-19.09' …
…into ghcjs-cross-without-cc
Configuration menu - View commit details
-
Copy full SHA for c4508df - Browse repository at this point
Copy the full SHA c4508dfView commit details
Commits on Dec 2, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 305f286 - Browse repository at this point
Copy the full SHA 305f286View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6274424 - Browse repository at this point
Copy the full SHA 6274424View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2a3d2c1 - Browse repository at this point
Copy the full SHA 2a3d2c1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 918ed06 - Browse repository at this point
Copy the full SHA 918ed06View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9cff83f - Browse repository at this point
Copy the full SHA 9cff83fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9a01f62 - Browse repository at this point
Copy the full SHA 9a01f62View commit details -
Configuration menu - View commit details
-
Copy full SHA for 598e4ec - Browse repository at this point
Copy the full SHA 598e4ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5cda2de - Browse repository at this point
Copy the full SHA 5cda2deView commit details
Commits on Dec 5, 2019
-
Configuration menu - View commit details
-
Copy full SHA for c431073 - Browse repository at this point
Copy the full SHA c431073View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6e7d5a7 - Browse repository at this point
Copy the full SHA 6e7d5a7View commit details -
Configuration menu - View commit details
-
Copy full SHA for dd6e506 - Browse repository at this point
Copy the full SHA dd6e506View commit details -
lib/modules: file -> _file for a more idempotent unifyModuleSyntax
This will be useful for doing more complicated module evaluations
Configuration menu - View commit details
-
Copy full SHA for aa61342 - Browse repository at this point
Copy the full SHA aa61342View commit details -
lib/modules: Make unifyModuleSyntax fully idempotent
Because why not
Configuration menu - View commit details
-
Copy full SHA for 3cc77ce - Browse repository at this point
Copy the full SHA 3cc77ceView commit details
Commits on Dec 8, 2019
-
Configuration menu - View commit details
-
Copy full SHA for e21ad3a - Browse repository at this point
Copy the full SHA e21ad3aView commit details -
Configuration menu - View commit details
-
Copy full SHA for bfb42cd - Browse repository at this point
Copy the full SHA bfb42cdView commit details -
Configuration menu - View commit details
-
Copy full SHA for ab1c848 - Browse repository at this point
Copy the full SHA ab1c848View commit details -
Configuration menu - View commit details
-
Copy full SHA for fcba6a0 - Browse repository at this point
Copy the full SHA fcba6a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c57848 - Browse repository at this point
Copy the full SHA 1c57848View commit details
Commits on Dec 10, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 08541e2 - Browse repository at this point
Copy the full SHA 08541e2View commit details
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 -
Configuration menu - View commit details
-
Copy full SHA for 11b52e4 - Browse repository at this point
Copy the full SHA 11b52e4View commit details
Commits on Dec 13, 2019
-
Configuration menu - View commit details
-
Copy full SHA for df0ff77 - Browse repository at this point
Copy the full SHA df0ff77View commit details
Commits on Dec 14, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 1094113 - Browse repository at this point
Copy the full SHA 1094113View commit details -
farstream: remove python2 dependency
It was never used in the recent history.
Configuration menu - View commit details
-
Copy full SHA for 9c18e1f - Browse repository at this point
Copy the full SHA 9c18e1fView commit details -
Configuration menu - View commit details
-
Copy full SHA for f78ac78 - Browse repository at this point
Copy the full SHA f78ac78View commit details -
Configuration menu - View commit details
-
Copy full SHA for 03423da - Browse repository at this point
Copy the full SHA 03423daView commit details -
* format with nixpkgs-fmt * drop unneeded dependencies * gnome-doc-utils → yelp-tools since 3.6.0 * intltool → gettext since 3.16.2 * move build-time deps to nativeBuildInputs * add metadata
Configuration menu - View commit details
-
Copy full SHA for 54a75e9 - Browse repository at this point
Copy the full SHA 54a75e9View commit details -
Configuration menu - View commit details
-
Copy full SHA for d58a42a - Browse repository at this point
Copy the full SHA d58a42aView commit details
Commits on Dec 15, 2019
-
Configuration menu - View commit details
-
Copy full SHA for eb1d315 - Browse repository at this point
Copy the full SHA eb1d315View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3a8d826 - Browse repository at this point
Copy the full SHA 3a8d826View commit details
There are no files selected for viewing