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: 15f9bdb6489e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fda4a08d4a1d
Choose a head ref
  • 10 commits
  • 91 files changed
  • 4 contributors

Commits on Sep 22, 2019

  1. Merge branch 'master' into staging-next

    @vcunat
    vcunat committed Sep 22, 2019
    Copy the full SHA
    415b299 View commit details
    Browse the repository at this point in the history

  2. Re-Revert "Merge branch 'staging-next'" 

    This reverts commit f8a8fc6.
    @vcunat
    vcunat committed Sep 22, 2019
    Copy the full SHA
    22a2168 View commit details
    Browse the repository at this point in the history

  3. patchelf: 0.10 -> 0.9 (downgrade!) 

    This is a partial revert of #58715.  Bumping the default caused problems
described in #69213.  I tested that the vscode corruption happened even
with the 0.10 pre-release, so I'm keeping patchelfUnstable on 0.10
(patchelfUnstable shouldn't cause a large rebuild anyway)
    @vcunat
    vcunat committed Sep 22, 2019
    Copy the full SHA
    4e5b465 View commit details
    Browse the repository at this point in the history

  4. Merge #68739: openconnect: 8.04 -> 8.05 (security!) 

    (cherry picked from commit 253f714)
Forward-pick from staging to staging-next.  It's quite small rebuild,
compared to what's caused by the parent commit.
    @worldofpeace @vcunat
    worldofpeace authored and vcunat committed Sep 22, 2019
    Copy the full SHA
    76b7dd1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into staging-next

    @jtojnar
    jtojnar committed Sep 22, 2019
    Copy the full SHA
    11c2b06 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Merge branch 'master' into staging-next

    @vcunat
    vcunat committed Sep 24, 2019
    Copy the full SHA
    eab4187 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. Merge branch 'master' into staging-next 

    Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10 which
adapts #69210 to master that doesn't yet have
329a88e

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
    @veprbl
    veprbl committed Sep 25, 2019
    Copy the full SHA
    c455adc View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2019

  1. giflib: fix build on darwin by patch submitted upstream 

    It broke by the update in 3605f12.  The patch seems OK on a quick look.
    @vcunat
    vcunat committed Sep 27, 2019
    Copy the full SHA
    ab77ea0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into staging-next

    @vcunat
    vcunat committed Sep 27, 2019
    Copy the full SHA
    217cf98 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2019

  1. Merge branch 'staging-next' 

    There are several security fixes - again, as it consists mainly of the
previously reverted staging-next merge.
    @vcunat
    vcunat committed Sep 28, 2019
    Copy the full SHA
    fda4a08 View commit details
    Browse the repository at this point in the history