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: 1bb22952ce3a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 773fe1fefa36
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 2, 2018

  1. Revert "libsForQt5.qscintilla: 2.9.4 -> 2.10.3" 

    This reverts commit 8ee6a03.
    @Ma27
    Ma27 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    f5e2cfc View commit details
    Browse the repository at this point in the history

  2. libsForQt5.qscintilla: don't apply darwin patch on non-darwin systems

    @Ma27
    Ma27 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    be153f6 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2018

  1. Merge pull request #39860 from Ma27/fix-qscintilla 

    qscintilla: revert bump to fix the build
    @peterhoeg
    peterhoeg committed May 3, 2018
    Configuration menu
    Copy the full SHA
    773fe1f View commit details
    Browse the repository at this point in the history