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

Commits on Jan 13, 2019

  1. qt511.qtdeclarative: fix CMake qmlcachegen path 

    This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.

(cherry picked from commit 4b76c46)
    @schmittlauch
    schmittlauch committed Jan 13, 2019
    Copy the full SHA
    efbf00b View commit details
    Browse the repository at this point in the history

  2. ktouch: init at 18.08.0 

    packaging the `ktouch` touch typing tutor. Due to Qt impurities, it
needs to be installed in a profile to find it runtime dependencies.

(cherry picked from commit e93bd1d)
    @schmittlauch
    schmittlauch committed Jan 13, 2019
    Copy the full SHA
    61f0e7f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-18.09' into ktouch-backport

    @schmittlauch
    schmittlauch committed Jan 13, 2019
    Copy the full SHA
    8ccb60b View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2019

  1. Merge pull request #53887 from schmittlauch/ktouch-backport 

    ktouch backport: init at 18.08.0
    @Mic92
    Mic92 committed Jan 16, 2019
    Copy the full SHA
    55aaf71 View commit details
    Browse the repository at this point in the history