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: master
Choose a base ref
...
head repository: matthewbauer/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.

Commits on Aug 7, 2018

  1. Copy the full SHA
    5c80db9 View commit details
  2. make-derivation: remove assert in name

    This assert was breaking position handling in --show-trace.
    
    See also 50148f0
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    4863416 View commit details
  3. st: fix patches passing

    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    8bbaf8b View commit details
  4. haskell: use mktemp for TMPDIR in generic-builder

    I frequently hit this in nix-shell where $TMPDIR/package.conf.d is
    reused again & again without being cleaned up. Using $(mktemp -d) here
    is much safer.
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    da90ff6 View commit details
  5. Copy the full SHA
    ed3a972 View commit details
  6. unix-tools: inherit meta from provider

    Not sure whether this is correct, but for convenience we can just use
    the provider’s meta. This is definitely true for things like license
    but not as true for description, maintainers, etc.
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    f7622c6 View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    c853291 View commit details
  8. licenses: wip redo

    adds a bunch of new attributes to the licenses.nix that can eventually
    be used to enforce copyleft, commercial usage, etc. in software licenses.
    matthewbauer committed Aug 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    4368f3e View commit details
  9. Copy the full SHA
    564001a View commit details
  10. xz: fix shared/static logic

    It doesn’t make sense to assume enableStatic implies --disable-shared.
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    8b74bb0 View commit details
  11. treewide: remove ios/android handling

    This should all be done in an overlay.
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    d644481 View commit details
  12. emacs: use closePropagation for wrapper

    This is the same function that haskell, idris, eclipse use for their
    wrappers. Although it is deprecated it is basically the closest thing
    to what we want here. Eventually I want to do closePropagation within
    make-derivation.nix but that will require some significant changes to
    how derivations are generated.
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    0ed011f View commit details
  13. Revert "licenses: wip redo"

    This reverts commit fd9620d3e4d59a07b53a6b4ffd0807ebb3b75346.
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    a0b7a68 View commit details
  14. Copy the full SHA
    960a391 View commit details
  15. treewide: fix evaluation issues

    Tested with the following:
    
    $ nix-env -qaP -f . --drv-path --out-path --argstr system x86_64-darwin
    $ nix-env -qaP -f . --drv-path --out-path --argstr system i686-linux
    $ nix-env -qaP -f . --drv-path --out-path --argstr system x86_64-linux
    $ nix-env -qaP -f . --drv-path --out-path --argstr system aarch64-linux
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    d2dfec9 View commit details
  16. make-derivation: just install all outputs

    This confuses users too much and to me seems to have very little
    benefit. Since it only effect “declarative” installation, it doesn’t
    seem helpful to not give every output available. In this case, users
    want what would normally be included in the /zlib/ package, not just
    one output.
    
    Fixes #44144
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    f0d6595 View commit details
  17. all-packages: remove else null uses

    This can lead to unexpected behavior when you try to use a package and
    it turns out not to be there. We allow else null in certain cases like
    libuuid or gettext because these are included in the default stdenv &
    should always be available.
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    871be24 View commit details
  18. dir-locals.el: update

    - add offset for sh
    - turn off hard tabs
    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    c81d56f View commit details
  19. emacs-win wip

    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    8e5c965 View commit details
  20. git: add strictDeps

    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    d74c59e View commit details
  21. Copy the full SHA
    ab8d498 View commit details
  22. ghcjs-ng: refactor

    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    6319e8b View commit details
  23. webkitgtk: rename attr

    matthewbauer committed Aug 7, 2018
    Copy the full SHA
    e9259b1 View commit details

Commits on Aug 17, 2018

  1. Copy the full SHA
    6c36f67 View commit details
Loading