swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-27 15:40:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
117273 commits 5 branches 0 tags 31 GiB
Commit graph

23037 commits

Author SHA1 Message Date
Jörg Thalheim 3170d8608d gdbm: add symlinks for compatibility 
some tools check this location to distinguish between gdbm and ndbm
 2017-09-19 12:27:15 +01:00
Tuomas Tynkkynen bc850cfed5 qt4: Add aarch64 patch 2017-09-19 10:59:11 +03:00
Jörg Thalheim 11efdaf404 Merge pull request #29522 from aneeshusa/libevent-make-openssl-dependency-optional 
libevent: Make OpenSSL dependency optional
 2017-09-19 08:48:34 +01:00
Kranium Gikos Mendoza caa79ba50c xmlsec: enable deprecated headers required by lasso 2017-09-18 23:07:43 +02:00
Franz Pletz 0653abc07a
gd: 2.2.4 -> 2.2.5 for multiple CVEs 
Fixes:
  * CVE-2017-6362
  * CVE-2017-7890
 2017-09-18 22:45:30 +02:00
Daiderd Jordan 69bf06ad6c
gperftools: fix darwin build 2017-09-18 22:20:57 +02:00
Aneesh Agrawal 42a8ac1b71 libevent: Make OpenSSL dependency optional 2017-09-18 09:21:54 -07:00
Franz Pletz 0e550fd51c
cdo: 1.7.2 -> 1.9.0 2017-09-18 17:24:08 +02:00
Mathias Schreck f4b207438d libuv: 1.13.1 -> 1.14.1 2017-09-18 13:50:56 +02:00
AndersonTorres 3dc65ee2e8 tcllib: 1.15 -> 1.18 2017-09-18 04:05:50 +02:00
Vladimír Čunát f6763a4561
Merge #29431: libxml2: 2.9.4 -> 2.9.5 2017-09-17 10:35:39 +02:00
Michael Raskin 02f439d062 cppunit: 1.14.0 2017-09-17 09:58:34 +02:00
Michael Raskin 44db65d61c xmlsec: 1.2.23 -> 1.2.25; enable nss (for LO) 2017-09-17 09:58:34 +02:00
Frederik Rietdijk 4db4476536 Merge pull request #29465 from FRidh/aspell 
aspellWithDicts: use a single env
 2017-09-17 09:29:47 +02:00
Vladimír Čunát 222e18698a
gtkmm3: maintenance 3.22.0 -> 3.22.2 2017-09-16 23:05:55 +02:00
Eelco Dolstra afc0218ecd blender: Fix CUDA support 
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.
 2017-09-16 22:45:22 +02:00
Eelco Dolstra 63f3b35204 opencollada: 1.3 -> 1.6.59 2017-09-16 22:44:39 +02:00
Frederik Rietdijk 91f7042aa0 aspellWithDicts: use a single env 
In c0cf19608f the function
`aspellWithDicts` was introduced, that allows to build a derivation
consisting of aspell and specified dictionaries. In
96457d26dd a fix was included to properly
find the dictionaries.

Issue #29429 describes that, while the current method works for the
aspell binary, it does not in case of the API.

This commit rewrites the wrapper into a single derivation, create a
single tree of symbolic references to both the binary and the
dictionaries so that its possible to find the dictionaries with the API.
Furthermore, the binary is wrapped so it can still find the dictionaries
as well.
 2017-09-16 13:06:26 +02:00
Frederik Rietdijk 03fa6965ad Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-16 12:34:32 +02:00
Joachim F 2d3886262e Merge pull request #29439 from oxij/pkgs/notmuch-gmime-3 
gmime3: init; notmuch: use gmime3
 2017-09-16 10:15:55 +00:00
Jan Malakhovski 04e97f9868 gmime: expose versions 2017-09-16 09:20:05 +00:00
Servilio Afre Puentes 9785fc73a0 gmime: init at 3.0.1, leave 2.6.23 as is 
This needs to be added as a separate package because API changed in 3.0, see:

https://mail.gnome.org/archives/gmime-devel-list/2017-April/msg00002.html
https://developer.gnome.org/gmime/3.0/gmime-changes-3-0.html
3fd646c955/PORTING
 2017-09-16 09:20:05 +00:00
Tuomas Tynkkynen 65445212df libffi: Add aarch64 patch 
This fixes pythonPackages.cffi test suite failure.
 2017-09-15 23:55:50 +03:00
Cray Elliott 990ea8789d zandronum: 2.1.2 -> 3.0 
remove sqlite-amalgamation and put it internal to the zandronum folder,
as it is only used by zandronum. Patches needed to avoid build impurities
and to get the correct protocol version to connect to public servers.

remove zandronum_bin as it is no longer needed
 2017-09-15 11:26:11 -07:00
Orivej Desh 604ca93182 libxml2: 2.9.4 -> 2.9.5 2017-09-15 17:28:31 +00:00
Cray Elliott 739b4091cf ffmpeg, ffmpeg-full: 3.3.3 -> 3.3.4 2017-09-14 15:06:47 -07:00
Vladimír Čunát 2a732252df
Merge #29352: gtk+: 3.22.19 -> 3.22.21 2017-09-14 17:30:41 +02:00
Thomas Tuegel 3b94239c8a
kdeFrameworks: 5.37 -> 5.38.1 
This reverts commit e468ef5119.

KDE Frameworks is updated to 5.38.1, bypassing a serious bug in 5.38.0.
 2017-09-14 09:30:19 -05:00
John Ericson e5567bae2d treewide: Do not limit hardenging because gcc 4.9 in bootstrap 
Bootstrap tools has since been bumped
 2017-09-14 10:27:13 -04:00
Jörg Thalheim 610eac1773 Merge pull request #29370 from mguentner/urltypofixes 
fix src.url typos
 2017-09-14 13:34:55 +01:00
Maximilian Güntner ec7b09ecd0
fix src.url typos 2017-09-14 13:54:14 +02:00
Vincent Laporte 2f70241e21 gtk+: 3.22.19 -> 3.22.21 2017-09-14 06:03:12 +00:00
Jörg Thalheim 392a014ff2 Merge pull request #29272 from Mic92/kerberos 
kerberos: store state in /var/lib instead of $out/var
 2017-09-13 23:24:26 +01:00
Vladimír Čunát efeef044be
appstream-glib: more RPATH fixes #29326 
Fix in 6a17c5a46c wasn't enough.
 2017-09-13 22:41:35 +02:00
Thomas Tuegel e468ef5119 Revert "kdeFrameworks: 5.37 -> 5.38" 2017-09-13 11:57:15 -05:00
John Ericson 8fccaa284d Merge pull request #29282 from obsidiansystems/soext 
lib, treewide: Add `*Platform.extensions` and use it where possible
 2017-09-13 11:20:06 -04:00
John Ericson 5aec3f96a2 treewide: Use *Platform.extensions 2017-09-13 11:16:10 -04:00
Thomas Tuegel 54f2db5d4e Merge pull request #29277 from bkchr/kde_frameworks_5_38 
kdeFrameworks: 5.37 -> 5.38
 2017-09-13 08:57:29 -05:00
Frederik Rietdijk 7aa2e6b590 Merge pull request #29263 from jyp/jyp-rename-maintainer 
make my maintainer handle match my github username
 2017-09-13 09:40:21 +02:00
Daiderd Jordan 4d7c3b2f5f
kyotocabinet: fix darwin build 2017-09-12 22:13:58 +02:00
Vladimír Čunát 422adc3063
Merge branch 'staging' 
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
 2017-09-12 19:17:52 +02:00
Bastian Köcher d80064c4f8 kdeFrameworks: 5.37 -> 5.38 2017-09-12 16:50:44 +02:00
Jörg Thalheim 0016d925e4 kerberos: store state in /var/lib instead of $out/var 2017-09-12 14:30:18 +01:00
Jean-Philippe Bernardy 1ba197f225 make my maintainer handle match my github username 2017-09-12 15:17:18 +02:00
Joachim Fasting e2ddc7ffd2
libffcall: 1.10 -> 2.0 
Thanks to Bruno Haible for a notifying me of this.
 2017-09-12 15:08:38 +02:00
Tuomas Tynkkynen 817c20c7ee chromaprint: Disable on Darwin 
Last successful build 2015-09-20 08:03:33

https://hydra.nixos.org/build/60589826
 2017-09-12 14:58:46 +03:00
Tuomas Tynkkynen ab62b7e9b9 Revert "libgcrypt: Add pre-ARMv7 patch" 
This reverts commit 1cfe9539f9.

No longer needed after the upgrade in 095af3e63b.
 2017-09-12 12:23:53 +03:00
rnhmjoj a7eb2e01bc
vapoursynth-mvtools: 17 -> 19 2017-09-12 04:37:19 +02:00
rnhmjoj 3f9661588b
vapoursynth: R36 -> R38 2017-09-12 04:13:31 +02:00
Daiderd Jordan 2509b629d7
jbigkit: fix substituteInPlace 2017-09-12 00:17:11 +02:00
Frederik Rietdijk 628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
Jörg Thalheim c3887f0253 Merge pull request #29159 from timor/coin3d-sbhashentry-fix 
coin3d: include fix for newer compilers
 2017-09-11 21:32:14 +01:00
Aristid Breitkreuz f6e4c4e6c9 blitz++: mark as broken 2017-09-11 20:14:24 +02:00
Tuomas Tynkkynen 886837f479 make-fonts-cache.nix: Don't build-depend on unnecessary outputs of fontconfig 2017-09-11 19:22:01 +03:00
Bjørn Forsman 421949e436 gsoap: 2.8.49 -> 2.8.53 2017-09-11 17:24:33 +02:00
Daiderd Jordan b310053c01
fox-1.6: add missing frameworks 2017-09-10 17:07:56 +02:00
Aristid Breitkreuz 4592a6d744 v8: fix 5.4 build 2017-09-10 12:36:27 +02:00
Aristid Breitkreuz 450685e46d v8: remove unused old versions 2017-09-10 12:02:45 +02:00
Frederik Rietdijk dab3272f47 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-10 08:56:39 +02:00
Shea Levy 6a17c5a46c libappstream-glib: Properly set rpath 2017-09-09 17:20:03 -07:00
timor cf32537210 coin3d: include fix for newer compilers 
This manifests as a segfault in any applications that use the library.
 2017-09-09 20:29:52 +02:00
Daiderd Jordan 6058539272
re2: fix dylib library id 2017-09-09 15:10:03 +02:00
Nikolay Amiantov 0d558049cf protobufc: add missed file 2017-09-09 15:18:24 +03:00
zraexy 635c48de8f kdb: init at 3.0.2 2017-09-08 23:38:19 -08:00
zraexy b3bbfd9fc4 kreport: init at 3.0.2 2017-09-08 23:33:41 -08:00
zraexy 35954ae8ba kproperty: init at 3.0.2 2017-09-08 23:31:47 -08:00
Frederik Rietdijk 6589ee83c2 Merge pull request #29134 from abbradar/protobuf 
Update protobuf and remove old versions
 2017-09-09 09:27:10 +02:00
Vladimír Čunát 9d6ac8eada
mesa: maintenance 17.1.8 -> 17.1.9 2017-09-09 07:54:46 +02:00
Vincent Laporte 6e009edc41 aften: init at 0.0.8 
Aften is an audio encoder which generates compressed audio streams based on
ATSC A/52 specification. This type of audio is also known as AC-3 or Dolby®
Digital and is one of the audio codecs used in DVD-Video content.

Homepage: http://aften.sourceforge.net/
 2017-09-09 05:58:09 +02:00
Nikolay Amiantov 1f2a18d916 protobuf: remove old versions 
This leaves only protobuf3_1 which is the last version with libprotobuf2.

Also fix several packages to build with the latest protobuf.
 2017-09-09 05:54:43 +03:00
Frederik Rietdijk febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Nikolay Amiantov 4bdcb220c9 protobufc: 1.1 -> 1.3 2017-09-08 21:23:42 +03:00
Nikolay Amiantov 6f7b62e038 protobuf: default to 3.4 2017-09-08 03:40:56 +03:00
Nikolay Amiantov 721aba33b4 protobuf3_4: init at 3.4.0 2017-09-08 03:40:56 +03:00
Anderson Torres 936dca89df Merge pull request #28969 from disassembler/xiphos 
xiphos: 4.0.3 -> 4.0.6
 2017-09-07 17:11:45 -03:00
Jörg Thalheim 56ccd27dee Merge pull request #29073 from Mic92/mongodb/2.4.8 
mfi-controller: remove
 2017-09-07 20:31:19 +01:00
Nikolay Amiantov eb6a8c3f52 dlib: 19.4 -> 19.6 2017-09-07 17:04:29 +03:00
Eelco Dolstra ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper" 
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
 2017-09-07 12:51:21 +02:00
Jörg Thalheim 9ee5727459 v8: remove 3.14.5.10 
was only used by mongodb248
 2017-09-07 10:20:22 +01:00
Frederik Rietdijk d38ee5b46c Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-07 09:29:44 +02:00
Jean-Philippe Bernardy d51bd36646 cudnn: add 6.0 2017-09-07 09:28:03 +02:00
Jean-Philippe Bernardy 2489a0aca7 protobuf: add 3.3 2017-09-07 09:28:03 +02:00
Vladimír Čunát 0c660ad42f
Merge #28906: glibc: 2.25 -> 2.25-49 (upstream patches) 2017-09-07 08:19:40 +02:00
Daiderd Jordan 51eafbe028
ucl: only pass -stc=c90 when using gcc 
Also remove -fPIC, it's included in the hardening flags by default.
 2017-09-06 21:45:38 +02:00
Frederik Rietdijk 38dc9a870f Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 14:01:25 +02:00
Michael Raskin 6f740953e6 silgraphite: drop graphite1 (which had version 2.x) 2017-09-06 13:46:16 +02:00
John Ericson 40e917d35d Merge pull request #29023 from obsidiansystems/deps-reorg 
misc pkgs: Reorganize dependencies ahead of #26805
 2017-09-05 18:10:32 -04:00
Samuel Leathers 402e6ac089
libfpx: fix build with gcc6 2017-09-05 21:29:10 +02:00
Franz Pletz fea02e30f1
ncurses: 6.0-20170729 -> 6.0-20170902 
Fixes issues with xterm terminfo.
 2017-09-05 20:14:15 +02:00
Franz Pletz bbeeee220a
Merge remote-tracking branch 'origin/master' into staging 2017-09-05 20:14:08 +02:00
Jörg Thalheim 2df594e044 Merge pull request #28971 from disassembler/libctemplate 
libctemplate: remove 2.2
 2017-09-05 16:44:17 +01:00
John Ericson 252b36a28d misc pkgs: Recategorize some dependencies 2017-09-05 11:37:10 -04:00
Samuel Leathers 4151e2f579 herqq: 1.0.0 -> 2.1.0 2017-09-05 15:15:48 +02:00
Laure Tavard bf491f8794 cdo: init at 1.7.2 (#22496) 2017-09-05 13:40:20 +01:00
Franz Pletz 85cffcfce0
ffmpeg_2_8: 2.8.11 -> 2.8.13 2017-09-05 14:24:59 +02:00
Franz Pletz b1e9eff33e
libav_12: 12 -> 12.1 2017-09-05 14:24:59 +02:00
Franz Pletz 3352cfc597
capnproto: 0.6.0 -> 0.6.1 2017-09-05 14:24:59 +02:00
Franz Pletz 0c08a18f19
avro-cpp: 1.8.1 -> 1.8.2 2017-09-05 14:24:58 +02:00
Peter Hoeg a147306cc3 Merge pull request #28828 from peterhoeg/u/kt5 
ktorrent: 5.0.1 -> 5.1.0
 2017-09-05 18:40:16 +08:00
Peter Hoeg 82e0b910e7 libktorrent: 2.0.1 -> 2.1 2017-09-05 18:26:43 +08:00
Frederik Rietdijk d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Piotr Bogdan fc391e7ecd mps: 1.115.0 -> 1.116.0 
1.115.0 doesn't build with gcc6
 2017-09-04 20:14:57 +03:00
Samuel Leathers 896f0daa1a libctemplate: remove 2.2 2017-09-04 09:14:57 -04:00
Samuel Leathers e11c7399a0 webkitgtk-2.17: init at 2.17.91 2017-09-04 08:25:08 -04:00
Michael Raskin 8f154c139a Merge pull request #28949 from pbogdan/allegro-fix-build 
allegro: fix sandboxed build with nixUnstable
 2017-09-04 07:39:37 +02:00
Alexander V. Nikolaev a830aa3af0 qt5: Cleanup temporary Qt root on nix-shell exit 2017-09-04 03:59:38 +03:00
Piotr Bogdan e22a77217d allegro: fix sandboxed build with nixUnstable 
In Nix 1.12 sandboxed builds are performed in /build/ directory which conflicts
with the regex in docs/CMakeLists.txt, and generated documentation ends up in
wrong directory -> https://hydra.nixos.org/build/53914969/nixlog/1 -> CTRL-F
abi.txt
 2017-09-03 19:32:35 +01:00
Orivej Desh 7803d69b78 nixos: update glibc locales link 2017-09-03 18:00:35 +00:00
jamtrott c8c0cd4d6c petsc: init at 3.7.6 (#28368) 
* petsc: init at 3.7.6

* petsc: use configureFlagsArray

* petsc: Remove unneeded binaries
 2017-09-03 17:11:16 +01:00
John Ericson 0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper 
Binutils-wrapper: Init by refactoring out of cc-wrapper
 2017-09-03 10:37:27 -04:00
Vladimír Čunát 3980abe191
gkt3: maintenance 3.22.18 -> 3.22.19 2017-09-03 10:53:27 +02:00
Vladimír Čunát daa12ab7b9
pango: maintenance 1.40.9 -> 1.40.11 2017-09-03 10:53:26 +02:00
Vladimír Čunát 6d2d7d5f46
mesa: maintenance 17.1.7 -> 17.1.8 2017-09-03 10:53:26 +02:00
Vladimír Čunát 7ed1e526c9
Merge #28899: gnutls: 3.5.14 -> 3.5.15 2017-09-03 10:51:43 +02:00
Vladimír Čunát 37242d98de
Merge branch 'master' into staging 2017-09-03 10:51:11 +02:00
Vladimír Čunát 53998f5036
treewide: purge explicit usage of gcc6 
It's now the default. /cc #19456
This makes a real build simplification, because in our current
bootstrapping+aliases, `gcc6` attribute is not the default compiler
but a derivation *built by* the default compiler.

nix-exec didn't build before this commit already
 2017-09-03 09:57:20 +02:00
Vladimír Čunát 825c08e368
Merge: nghttp2: 1.20.0 -> 1.24.0 (#28376) 
Also --enable-app and use a $bin output.
 2017-09-03 09:47:09 +02:00
Vincent Laporte 4ee717d2d3 libvirt: fix build on darwin 2017-09-03 07:24:49 +00:00
Shea Levy 35f89413e2 fwupd: bump 2017-09-02 20:00:20 -04:00
Kranium Gikos Mendoza 776d149c76 opal: fix gcc6 build 2017-09-03 04:05:57 +10:00
Kranium Gikos Mendoza 377b42a8ad ptlib: use fetchpatch 2017-09-03 04:05:57 +10:00
Kranium Gikos Mendoza 32d4a3dec8 ptlib: fix gcc6 build 2017-09-03 03:51:44 +10:00
Tim Steinbach 5c66a4e221
gnutls: 3.5.14 -> 3.5.15 2017-09-02 13:18:47 -04:00
Vladimír Čunát bdfc989bba
glibc: remove a fixup; not needed since glibc-2.22 2017-09-02 17:22:37 +02:00
Vladimír Čunát 0f91a1dbd7
glibc: remove patch with blowfish support 2017-09-02 17:22:37 +02:00
Vladimír Čunát 51cf42ad0d
glibc: 2.25 -> 2.25-49 
Various fixes within, e.g. mutexes deadlocking sometimes.
https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=f7057710f14d6c
 2017-09-02 17:22:36 +02:00
Joachim Fasting b3f9b0d0cc
libgcrypt: fix typo in meta.description 2017-09-02 15:56:51 +02:00
Frederik Rietdijk d0dab8a330 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
John Ericson 3f30cffa55 misc pkgs: Use $NIX_BINUTILS for when needed 
Certain files are now only there instead of $NIX_CC (some are in both)
 2017-09-01 11:44:55 -04:00
Frank cb61e27e9e profanity support for unix 2017-08-31 21:29:26 +02:00
Jörg Thalheim 038302633e Merge pull request #28794 from afrepues/gmime-update-metadata 
gmime: updated home and description
 2017-08-31 16:57:05 +01:00
Servilio Afre Puentes ddaa696a4e gmime: updated home and description 
GMime home has moved to Github as the list of commits clearly shows,
i.e.:

  b5cbc68a67

The description is updated as well to be closer to the one used there
and over at gnome.org.
 2017-08-31 10:42:30 -04:00
Lancelot SIX 095af3e63b libgcrypt: 1.8.0 -> 1.8.1 
Fixes CVE-2017-0379

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00014.html
for release announcement
 2017-08-31 16:38:02 +02:00
Maximilian Bosch f5dd3b71e8
luaffi: init at 2013-11-08 2017-08-31 11:55:57 +02:00
John Ericson 22cd889a28 Merge pull request #28766 from obsidiansystems/gettext 
gettext: libiconv should be a buildInput
 2017-08-30 17:11:35 -04:00
John Ericson 2cc7f1a731 gettext: libiconv should be a buildInput 2017-08-30 16:49:52 -04:00
Franz Pletz 6f2fffef77
mbedtls: 2.5.1 -> 2.6.0 for CVE-2017-14032 
https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2017-02
 2017-08-30 22:36:11 +02:00
Samuel Leathers ed6bd02a9d sword: fix build with gcc6 2017-08-30 21:54:50 +02:00
Frederik Rietdijk 6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Matthew Robbetts e82cb3dfa4 openldap: Fix build with LibreSSL. 2017-08-30 19:39:11 +02:00
Samuel Leathers 078abc31aa xbase: gcc6/gcc7 patches 2017-08-30 12:32:45 -04:00
Jörg Thalheim 823fb278d3 Merge pull request #28226 from casey/ncurses-tic 
ncurses: put tic binary in bin
 2017-08-30 14:19:44 +01:00
Franz Pletz da988970b2 Merge pull request #28696 from jtojnar/rm-farsight 
farsight2: remove
 2017-08-30 01:56:26 +02:00
Antoine Eiche 88dcd4d514 libipfix: init at 110209 2017-08-30 01:41:40 +02:00
Piotr Bogdan 5172dfd2d1 swc: remove setuid from install script 2017-08-30 01:07:43 +02:00
Jörg Thalheim 1160be027b Merge pull request #28711 from danielfullmer/irrlicht-1.8.4 
irrlicht: 1.8-svn-5104 -> 1.8.4
 2017-08-29 22:44:48 +01:00
Daniel Fullmer 4bf9622749 irrlicht: 1.8-svn-5104 -> 1.8.4 2017-08-29 15:25:40 -04:00
Daniel Fullmer 1c44981d19 irrlicht3843: Removed unused derivation 
supertuxcart includes its own version of irrlicht so this is no longer
needed.
 2017-08-29 15:04:46 -04:00
Thomas Tuegel 9952a89d24 Merge pull request #28699 from ttuegel/prison 
prison: mark broken with Qt < 5.7
 2017-08-29 13:03:11 -05:00
Thomas Tuegel a233cb19df
prison: mark broken with Qt < 5.7 2017-08-29 13:01:08 -05:00