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: 21531d353b2b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 97c05bda5266
Choose a head ref
  • 7 commits
  • 4 files changed
  • 4 contributors

Commits on Jan 26, 2019

  1. adoptopenjdk-bin: 11.0.1 -> 11.0.2 (hotspot aarch64-linux, x86_64-mac)

    @taku0
    taku0 committed Jan 26, 2019
    Copy the full SHA
    25eabb7 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. adoptopenjdk-bin: 11.0.1 -> 11.0.2 (openj9 x86_64-darwin)

    @taku0
    taku0 committed Jan 31, 2019
    Copy the full SHA
    8050d59 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2019

  1. skrooge: remove QtWebKit dependency 

    Remove QtWebkit dependency introduced in
a1b8fe8

It is no longer needed after upstream fix
https://cgit.kde.org/skrooge.git/commit/?id=cb8b56fa729d5f6ee4652e79de354721f4742ee7
    @alapshin @veprbl
    alapshin authored and veprbl committed Feb 17, 2019
    Copy the full SHA
    b94bdd8 View commit details
    Browse the repository at this point in the history

  2. Merge #54576: adoptopenjdk-bin: 11.0.1 -> 11.0.2 

    Includes security fixes.
    @vcunat
    vcunat committed Feb 17, 2019
    Copy the full SHA
    94b518f View commit details
    Browse the repository at this point in the history

  3. Revert "darwin.architecture: fix sandbox build" 

    Moving changes to staging, this is a mass-rebuild.

This reverts commit e79278e.
    @LnL7
    LnL7 committed Feb 17, 2019
    Copy the full SHA
    f84aef1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into staging-next

    @LnL7
    LnL7 committed Feb 17, 2019
    Copy the full SHA
    cbb03f5 View commit details
    Browse the repository at this point in the history

  5. darwin.architecture: fix sandbox build 

    Re-applies bad2db3.

This reverts commit f84aef1.
    @LnL7
    LnL7 committed Feb 17, 2019
    Copy the full SHA
    97c05bd View commit details
    Browse the repository at this point in the history