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: 2d9eb216020f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 95a3c8d151b0
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 30, 2019

  1. qscintilla: Use both .so and _qt5.so suffix 

    Make sure that the both libqscintilla2_qt5.so and libqscintilla2.so are
present in `$out/lib` so all the dependant packages can find the most
appropriate library (some except the empty suffix, such as
sqlitebrowser, other expect the _qt5 suffix such as
python3Packages.qscintilla-qt5).

The mechanism would also work work for qt4 build, but it is broken at
the moment.

Also make sure python*Packages.qscintilla* are up to date
    @lsix
    lsix committed Sep 30, 2019
    Copy the full SHA
    4bf49d9 View commit details
    Browse the repository at this point in the history

  2. python3Packages.qscintilla-qt5: fix build

    @lsix
    lsix committed Sep 30, 2019
    Copy the full SHA
    edc638c View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2019

  1. qgis: 3.8.0 -> 3.8.3

    @lsix
    lsix committed Oct 2, 2019
    Copy the full SHA
    5d8ec9b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

  1. Merge pull request #68375 from lsix/qgis-3.8.2 

    qgis: 3.8.0 -> 3.8.3
    @peterhoeg
    peterhoeg committed Oct 3, 2019
    Copy the full SHA
    95a3c8d View commit details
    Browse the repository at this point in the history