Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: f10bc3c630b5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2bb5cc2874c8
Choose a head ref
  • 8 commits
  • 15 files changed
  • 3 contributors

Commits on Apr 13, 2019

  1. wafHook: let derivations use an existing waf in a non-standard location

    this is necessary for talloc
    
    (cherry picked from commit f075de5)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    2f8b886 View commit details
    Browse the repository at this point in the history
  2. wafHook: ignore --disable-static and such options

    These options are forcefully added by pkgsStatic but are not understood
    by waf.
    
    (cherry picked from commit f23a215)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    17fb45d View commit details
    Browse the repository at this point in the history
  3. wafHook: ignore configurePlatforms

    waf does support --build and --host, but the only effect of these
    options is an error message telling to use --cross-compile instead.
    So we ignore these flags.
    
    (cherry picked from commit 1001d00)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    c5bfc48 View commit details
    Browse the repository at this point in the history
  4. wafHook: cross compilation support

    for this to work, wafHook must be in nativeBuildInputs.
    
    (cherry picked from commit 3d60a00)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    ca5148a View commit details
    Browse the repository at this point in the history
  5. talloc, tdb: fix cross-compilation after wafHook improvements

    (cherry picked from commit cbd9409)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    25ec19f View commit details
    Browse the repository at this point in the history
  6. proot: fix cross compilation

    (cherry picked from commit 52566c3)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    05fa593 View commit details
    Browse the repository at this point in the history
  7. waf: use wafConfigureFlags for waf flags

    This avoids the potential conflict between autoconf flags and the waf
    flags. There is some overlap between the two but waf errors when it
    doesn’t recognize the flag.
    
    (cherry picked from commit a79a8f2)
    matthewbauer authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    c90e7a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. Merge pull request #59407 from veprbl/pr/static-proot_backport_staging

    [19.03] Static proot, wafHook cross compilation
    veprbl committed Apr 15, 2019
    Copy the full SHA
    2bb5cc2 View commit details
    Browse the repository at this point in the history