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: 1a7c6e6f918c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 56c4063ce6b7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Oct 22, 2019

  1. qscintilla: Fix qt4 build 

    (cherry picked from commit eb1cd0d)
    @lsix @das-g
    lsix authored and das-g committed Oct 22, 2019
    Copy the full SHA
    f64135e View commit details
    Browse the repository at this point in the history

  2. qscintilla: fix qt4-fix patch header 

    after backporting from master to release-19.09
    @das-g
    das-g committed Oct 22, 2019
    Copy the full SHA
    9967d27 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #71646 from das-g/release-19.09_fix-qscintilla-qt4 

    qscintilla: Fix qt4 build
    @peterhoeg
    peterhoeg committed Oct 22, 2019
    Copy the full SHA
    c30a7d7 View commit details
    Browse the repository at this point in the history

  4. texmaker: use qt5 mkDerivation 

    (cherry picked from commit adf8119)
    @cruegge @markuskowa
    cruegge authored and markuskowa committed Oct 22, 2019
    Copy the full SHA
    56c4063 View commit details
    Browse the repository at this point in the history