Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 6c2f097e92fc
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 108021d6e1e7
Choose a head ref
  • 6 commits
  • 3 files changed
  • 3 contributors

Commits on Nov 4, 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.
    
    (cherry picked from commit 76ad279)
    peterhoeg authored and jonringer committed Nov 4, 2019
    Copy the full SHA
    653c9e2 View commit details
    Browse the repository at this point in the history
  2. 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
    
    (cherry picked from commit 4bf49d9)
    lsix authored and jonringer committed Nov 4, 2019
    Copy the full SHA
    3589326 View commit details
    Browse the repository at this point in the history
  3. pythonPackages.qscintilla-qt5: fix build

    (cherry picked from commit b27bdf4)
    bene1618 authored and jonringer committed Nov 4, 2019
    Copy the full SHA
    60cef0a View commit details
    Browse the repository at this point in the history
  4. python3Packages.qscintilla-qt5: fix build

    (cherry picked from commit edc638c)
    lsix authored and jonringer committed Nov 4, 2019
    Copy the full SHA
    0293f22 View commit details
    Browse the repository at this point in the history
  5. qgis: 3.8.0 -> 3.8.3

    (cherry picked from commit 5d8ec9b)
    lsix authored and jonringer committed Nov 4, 2019
    Copy the full SHA
    9f25272 View commit details
    Browse the repository at this point in the history
  6. qgis: 3.8.3 -> 3.10.0

    lsix authored and jonringer committed Nov 4, 2019
    Copy the full SHA
    108021d View commit details
    Browse the repository at this point in the history