nixpkgs/pkgs
Bjørn Forsman be40296afe qmmp: 1.1.10 -> 1.2.0
Fixes build failure since recent merge of staging branch:

$ nix-build -A qmmp
[...]
AutoMoc error
-------------
Included moc files with the same name will be generated from different sources.
Consider to
 - not include the "moc_<NAME>.cpp" file
 - add a directory prefix to a "<NAME>.moc" include (e.g "sub/<NAME>.moc")
 - rename the source file(s)
Include conflicts
-----------------
"moc_hotkeymanager.cpp" included in
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_win.cpp"
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_x11.cpp"
would be generated from
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h"
 - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h"

make[2]: *** [src/plugins/General/hotkey/CMakeFiles/hotkey_autogen.dir/build.make:58: src/plugins/General/hotkey/CMakeFiles/hotkey_autogen] Error 1
2018-02-03 21:26:41 +01:00
..
applications qmmp: 1.1.10 -> 1.2.0 2018-02-03 21:26:41 +01:00
build-support Merge pull request #33980 from thefloweringash/cargo-vendor-carnix 2018-02-03 10:28:57 +00:00
common-updater update-source-version: Name part of name can contain dashes 2017-12-26 20:02:01 +02:00
data Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
desktops Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
development doxygen: 1.8.11 -> 1.8.14 2018-02-03 20:02:42 +01:00
games minetest: 0.4.15 -> 0.4.16 2018-01-28 18:52:25 +01:00
misc cups-filters: 1.16.0 -> 1.20.0 2018-02-03 00:07:11 +01:00
os-specific Merge pull request #34555 from womfoo/bump/fnotify-fork-power-smem-stat 2018-02-03 12:17:54 +00:00
servers Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-03 09:48:42 +01:00
shells elvish: 0.10 -> 0.11 2018-01-31 23:32:49 +01:00
stdenv unpackPhase: Handle sources starting with a hyphen 2018-01-24 21:58:57 -08:00
test sierra-shared-test: fix build 2018-01-05 23:20:55 +01:00
tools ditaa: 0.9 -> 0.11 (adds --svg support) 2018-02-03 21:00:17 +01:00
top-level Merge pull request #30068 from mpickering/osm2xmap 2018-02-03 13:58:35 -05:00