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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3729eb3f228
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d95391f6a50
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 15, 2017

  1. mkDerivation: Fix errors from #27365 

    `nix-build pkgs/top-level/release.nix -A tarball` now succeeds.

`configureFlags = null` lead to a type error, and one overrideDrv
needed to be converted to to append a configureFlags list instead of
string due to the normalization.

Thanks @vcunat for alerting me to the issues---sorry I did not catch
them before merging my own PR.
    @Ericson2314
    Ericson2314 committed Jul 15, 2017
    Copy the full SHA
    aaaa470 View commit details

  2. Merge pull request #27407 from obsidiansystems/null-configure-flags 

    mkDerivation: Fix errors from #27365
    @Ericson2314
    Ericson2314 authored Jul 15, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7d95391 View commit details
Loading