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: 6712e0111a7c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 03fa6965ad77
Choose a head ref
  • 17 commits
  • 23 files changed
  • 6 contributors

Commits on Sep 12, 2017

  1. kerberos: store state in /var/lib instead of $out/var

    @Mic92
    Mic92 committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    0016d92 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2017

  1. python.pkgs.wheel: 0.29.0 -> 0.30.0

    @FRidh
    FRidh committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    88367b1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into HEAD

    @FRidh
    FRidh committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    720e88b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into staging

    @dezgeg
    dezgeg committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    41458f7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #29272 from Mic92/kerberos 

    kerberos: store state in /var/lib instead of $out/var
    @Mic92
    Mic92 committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    392a014 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2017

  1. treewide: Do not limit hardenging because gcc 4.9 in bootstrap 

    Bootstrap tools has since been bumped
    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    e5567ba View commit details
    Browse the repository at this point in the history

  2. Merge pull request #29349 from Ericson2314/harden-bootstrap 

    treewide: Do not limit hardenging because gcc 4.9 in bootstrap
    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    d94c7f5 View commit details
    Browse the repository at this point in the history

  3. autoreconfHook: Simplify by avoiding findInputs 

    `findInputs` is a stdenv/setup helper we should strive not to call
elsewhere. Using normal deps is more idiomatic anyways.
    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    d242978 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #29381 from obsidiansystems/autoreconf-hook 

    autoreconfHook: Simplify by avoiding `findInputs`
    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    1245217 View commit details
    Browse the repository at this point in the history

  5. yabar: pkg-config should be a native build input

    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    1055c43 View commit details
    Browse the repository at this point in the history

  6. Merge commit 'bf7b5215001ca5adb283dfd68facc914fce96c49' into staging 

    This is part of master
    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    3655e7e View commit details
    Browse the repository at this point in the history

  7. linux-headers: Remove dead old version 

    This sat around unused for who knows how long
    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    fb5d7b2 View commit details
    Browse the repository at this point in the history

  8. linux-headers 4.4: Remove arch fallback code 

    @dezgeg was right: The `platform` field of a linux platorm is already
manadatory---if not specified it is inferred, and all such inferences
include a `kernelArch` field. Therefore linux packages can indeed rely
on it being defined.
    @Ericson2314
    Ericson2314 committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    81680d4 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2017

  1. Merge commit on master into staging 

    Doing this surgically so a future PR has a readable diff.
    @Ericson2314
    Ericson2314 committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    3befba5 View commit details
    Browse the repository at this point in the history

  2. Merge another master commit into staging 

    Again, this is for sake of chained PRs having readable diffs
    @Ericson2314
    Ericson2314 committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    fd988f8 View commit details
    Browse the repository at this point in the history

  3. Revert "Merge commit on master into staging" 

    This was reverted on master in
3510197, and so needs to be reverted
here too.

This reverts commit 3befba5, reversing
changes made to 3655e7e.
    @Ericson2314
    Ericson2314 committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    a31365d View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2017

  1. Merge remote-tracking branch 'upstream/master' into HEAD

    @FRidh
    FRidh committed Sep 16, 2017
    6 Configuration menu
    Copy the full SHA
    03fa696 View commit details
    Browse the repository at this point in the history