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: 3252c48c2997
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6bc58a943856
Choose a head ref
  • 19 commits
  • 19 files changed
  • 10 contributors

Commits on Sep 25, 2018

  1. Copy the full SHA
    715e0a4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #47361 from obsidiansystems/python-format

    python-*: Format `pythonPackages` bindings for 18.09
    Ericson2314 committed Sep 25, 2018
    Copy the full SHA
    1d542e7 View commit details
    Browse the repository at this point in the history
  3. tdesktop: support opening urls under wayland

    (cherry picked from commit e79ccc1)
    gnidorah authored and Mic92 committed Sep 25, 2018
    Copy the full SHA
    f221052 View commit details
    Browse the repository at this point in the history
  4. podofo: fix library linkage on Darwin (#47214)

    * podofo: fix library linkage on Darwin
    
    Because the library is not yet installed when the tools are build, it does not contain its final store path as its install name. Linking the tools picks up this incorrect install name and needs to be fixed after installing.
    
    (cherry picked from commit 4b1ffa0)
    mroi authored and LnL7 committed Sep 25, 2018
    Copy the full SHA
    0253b1e View commit details
    Browse the repository at this point in the history
  5. dvtm: refactor (fix on darwin) (#47103)

    (cherry picked from commit 4eebe20)
    luke-clifton authored and LnL7 committed Sep 25, 2018
    Copy the full SHA
    b018ccc View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    21c2437 View commit details
    Browse the repository at this point in the history
  7. abduco: refactor (compile on darwin) (#47124)

    (cherry picked from commit 3d8f6b6)
    luke-clifton authored and LnL7 committed Sep 25, 2018
    Copy the full SHA
    67e53e0 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #47363 from obsidiansystems/ghc-sphinx

    ghc: Sphinx is a build-time dependency
    Ericson2314 committed Sep 25, 2018
    Copy the full SHA
    372d0cc View commit details
    Browse the repository at this point in the history
  9. qboot: 20150603 -> 2017033, fix build (#47364)

    Switch back to original upstream project which is more recent
    than the fork we used.
    
    (cherry picked from commit 4ad424f)
    xeji committed Sep 25, 2018
    Copy the full SHA
    391bf82 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2018

  1. linux_testing_bcachefs: 4.18.2018.08.31 -> 4.18.2018.09.21

    (cherry picked from commit d98b080)
    Madouura authored and xeji committed Sep 26, 2018
    Copy the full SHA
    0b70148 View commit details
    Browse the repository at this point in the history
  2. stdenv: partial revert of f2bb59e

    /cc @Ericson2314
    
    PR was #46857
    
    This line broke MacOS cross compilation. paxctl cannot be built on
    macOS. Maybe it can be fixed, but no reason to break things
    unnecessarily.
    
    Regardless, you definitely need to be more careful about backporting.
    I think it’s fine to move fast and break things on master but
    with release-18.09 we should be more careful. Something like more
    automated testing for cross compilation would also be
    helpful (hopefully even making it block).
    matthewbauer committed Sep 26, 2018
    4
    Copy the full SHA
    f9c4075 View commit details
    Browse the repository at this point in the history
  3. postgresql: give postgres user a shell

    (cherry picked from commit 82feb4b)
    Signed-off-by: Domen Kožar <domen@dev.si>
    domenkozar committed Sep 26, 2018
    Copy the full SHA
    29660a2 View commit details
    Browse the repository at this point in the history
  4. linux: 4.4.157 -> 4.4.158

    (cherry picked from commit 656ca22)
    NeQuissimus committed Sep 26, 2018
    Copy the full SHA
    a4cedc0 View commit details
    Browse the repository at this point in the history
  5. linux: 4.9.128 -> 4.9.129

    (cherry picked from commit 8e4d980)
    NeQuissimus committed Sep 26, 2018
    Copy the full SHA
    1c7a432 View commit details
    Browse the repository at this point in the history
  6. linux: 4.14.71 -> 4.14.72

    (cherry picked from commit 61452c8)
    NeQuissimus committed Sep 26, 2018
    Copy the full SHA
    74680cf View commit details
    Browse the repository at this point in the history
  7. linux: 4.18.9 -> 4.18.10

    (cherry picked from commit 24c31d4)
    NeQuissimus committed Sep 26, 2018
    Copy the full SHA
    a3b7cd1 View commit details
    Browse the repository at this point in the history
  8. stdenv: partial revert of f2bb59e

    /cc @Ericson2314
    
    PR was #46857
    
    This line broke MacOS cross compilation. paxctl cannot be built on
    macOS. Maybe it can be fixed, but no reason to break things
    unnecessarily.
    
    Regardless, you definitely need to be more careful about backporting.
    I think it’s fine to move fast and break things on master but
    with release-18.09 we should be more careful. Something like more
    automated testing for cross compilation would also be
    helpful (hopefully even making it block).
    
    (cherry picked from commit f9c4075)
    matthewbauer authored and Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    607063f View commit details
    Browse the repository at this point in the history
  9. Merge commit '607063f61be3b19a2da054776b360d9c5b03038a' into release-…

    …18.09
    
    This gets the partial revert on the common ancestor of master and
    release-18.09, easier further devlopment.
    Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    e06de91 View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    6bc58a9 View commit details
    Browse the repository at this point in the history