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: 32ab45b8d0ef
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fccbb5daf3f7
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 26, 2019

  1. qscintilla: 2.9.4 -> 2.11.2 

    We strip the library suffix as we don't need it and it confuses various
downstream consumers.

Also replace calls to sed with substituteInPlace as the latter will complain in
case it doesn't perform a substitution.
    @peterhoeg
    peterhoeg committed Aug 26, 2019
    Copy the full SHA
    76ad279 View commit details
    Browse the repository at this point in the history

  2. sqlitebrowser: do not use vendored qscintilla

    @peterhoeg
    peterhoeg committed Aug 26, 2019
    Copy the full SHA
    96f5d79 View commit details
    Browse the repository at this point in the history

  3. sqlitebrowser: build on darwin too

    @peterhoeg
    peterhoeg committed Aug 26, 2019
    Copy the full SHA
    ffbf1db View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2019

  1. Merge pull request #56034 from peterhoeg/u/sqlite 

    qscintilla: 2.9.4 -> 2.11.2 and sqlitebrowser: 3.11.2
    @ttuegel
    ttuegel committed Sep 28, 2019
    Copy the full SHA
    fccbb5d View commit details
    Browse the repository at this point in the history