mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity
70296 commits 329 branches 124 tags 6.7 GiB
Commit graph

26685 commits

Author SHA1 Message Date
Bjørn Forsman 3dec100104 qt55: apply mkspecs-libgl.patch from qt54 2015-09-28 10:39:11 +02:00
Bjørn Forsman 583845d00b qt54: add missing mesa include dir 
Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to
find <GL/gl.h>. This fixes it.

[1] http://doc.qt.io/qt-5/qtmultimediawidgets-camera-example.html
(Although since nixpkgs qtcreator still lacks 'examples', we have to
download the sources manually and use "qmake && make".)
 2015-09-28 10:39:11 +02:00
Bjørn Forsman c79fa9aeda Fix eval 
Fix breakage from 078d544005 ("libdbusmenu-qt5: build with Qt 5.5").
 2015-09-28 10:38:05 +02:00
Benjamin Saunders fce8924331 libuv: 1.6.1 -> 1.7.5 
closes #9814
 2015-09-28 01:00:50 -04:00
Andrew Kelley 3fef85b168 libsoundio: 1.0.1 -> 1.0.2 2015-09-27 18:43:30 -07:00
Thomas Tuegel cbe318d531 Merge branch 'qt-5.5' 2015-09-27 16:07:05 -05:00
Thomas Tuegel 50f76e0625 mlt-qt5: build with Qt 5.5 2015-09-27 15:09:49 -05:00
Thomas Tuegel 9e3b22d25a telepathy_qt5: build with Qt 5.5 2015-09-27 15:09:44 -05:00
Thomas Tuegel e462bdce89 openbr: build with Qt 5.5 2015-09-27 15:09:43 -05:00
Thomas Tuegel e745467726 libkeyfinder: build with Qt 5.5 2015-09-27 15:09:43 -05:00
Thomas Tuegel 569316e4fc grantlee: build with Qt 5.5 2015-09-27 15:09:42 -05:00
Thomas Tuegel dfbcab342a accounts-qt: build with Qt 5.5 2015-09-27 15:09:17 -05:00
Thomas Tuegel 4a3d7eae7e qmltermwidget: build with Qt 5.5 2015-09-27 15:08:49 -05:00
Thomas Tuegel 38461f18c3 signon: build with Qt 5.5 2015-09-27 15:08:48 -05:00
Thomas Tuegel 078d544005 libdbusmenu-qt5: build with Qt 5.5 2015-09-27 15:08:46 -05:00
Thomas Tuegel 2e0589b4ca kde414: build with kdelibs-4.14.12 
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
 2015-09-27 15:08:12 -05:00
Thomas Tuegel 32a5695f2c kf513: init at 5.13.0 2015-09-27 15:08:10 -05:00
Thomas Tuegel 943c2bf059 qca-qt5: build with Qt 5.5 2015-09-27 15:08:09 -05:00
Thomas Tuegel 60000c87ae popplerQt: build with Qt 5.5 2015-09-27 15:08:09 -05:00
Thomas Tuegel e2c25b2f60 polkitQt: build with Qt 5.5 2015-09-27 15:08:08 -05:00
Thomas Tuegel 52798834a8 phonon: build with Qt 5.5 2015-09-27 15:08:08 -05:00
Enrico Fasoli fb6403aeaa ogre: replace broken hg clone url with http url (to speed up download) 
Old package expression had two problems:

* source download link was broken
* when working, it downloaded almost 400 MB of data because it cloned
  the entire mercurial repo, via http it's only about 140 MB.

[Bjørn: extend commit message]
 2015-09-27 21:50:29 +02:00
Bjørn Forsman c8c9457190 wildmidi: 0.3.6 -> 0.3.8 
Tested with `nox-review wip --against origin/master`. No breakage.
 2015-09-27 21:29:55 +02:00
Peter Simons 5c161d43ed haskell-hpack: disable broken test suite 2015-09-27 17:06:06 +02:00
Thomas Tuegel fe49213ba6 qt55: init at 5.5.0 2015-09-27 09:46:48 -05:00
Peter Simons d15e437cff Merge pull request #10086 from lancelotsix/update_autoconf_archive 
autoconf-archive: 2015.02.24 -> 2015.09.25
 2015-09-27 15:52:54 +02:00
Luca Bruno 57d41aaed7 libgit2: add 0.21.x version as it's incompatible with the new 0.23 2015-09-27 15:27:57 +02:00
Brian McKenna 2db64534f1 oraclejdk8: Fix installation of JCE 
Oracle changed the path of the files.

Previous versions looked like:

    $ jar tf UnlimitedJCEPolicyJDK7.zip
    UnlimitedJCEPolicy/
    UnlimitedJCEPolicy/US_export_policy.jar
    UnlimitedJCEPolicy/local_policy.jar
    UnlimitedJCEPolicy/README.txt

The new version looks like:

    $ jar tf jce_policy-8.zip
    UnlimitedJCEPolicyJDK8/
    UnlimitedJCEPolicyJDK8/local_policy.jar
    UnlimitedJCEPolicyJDK8/README.txt
    UnlimitedJCEPolicyJDK8/US_export_policy.jar

A better solution is probably just to trim the directory off completely.
 2015-09-27 20:28:49 +10:00
Lancelot SIX a4158cbe94 autoconf-archive: 2015.02.24 -> 2015.09.25 
See https://lists.gnu.org/archive/html/info-gnu/2015-09/msg00007.html
for announcement
 2015-09-27 08:41:01 +00:00
Jude Taylor 01f130e577 update bundler-head SHA256 2015-09-26 23:12:59 -07:00
Arseniy Seroka 4a8e06f1f0 Merge pull request #10022 from gebner/goldendict-20150801 
goldendict: 1.0.1 -> 1.5.0.20150801
 2015-09-27 01:51:47 +03:00
Arseniy Seroka 4b1edcf5e5 Merge pull request #10079 from fazo96/mygui-fix 
mygui: 3.2.0 -> 3.2.2
 2015-09-27 01:37:14 +03:00
aszlig b34adfb71a
libcaca: Add zlib as a dependency. 
In order to load compressed figlet/toilet fonts, libcaca needs to have
support for zlib.

The motivation behind this is because I'm going to package toilet, which
comes with compressed fonts by default.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-26 21:04:15 +02:00
Enrico Fasoli b3d7d5537c mygui: 3.2.0 -> 3.2.2 2015-09-26 20:52:33 +02:00
Bjørn Forsman 3f27be8e5d dbench: move loadfiles from $out/share/ to $out/share/loadfiles/ 
Seems cleaner.

Hm, there are also loadfiles in $out/share/doc/dbench/loadfiles/
(installed by the upstream build system), but there is no iscsi/
directory in there.
 2015-09-26 15:26:17 +02:00
Jude Taylor 68e802c46b PR comments 2015-09-26 06:23:25 -07:00
Bjørn Forsman dc06278641 dbench: expression clean-up 
Whitespace, ordering, add meta attributes.
 2015-09-26 15:08:50 +02:00
Bjørn Forsman 8e7ce3de00 dbench: 20101121 -> 2013-01-01 (latest) 
This fixes the build (the old version has wrong hash now).
 2015-09-26 15:01:39 +02:00
Jude Taylor 1223210576 re-indent; make rubies overridable 2015-09-26 05:55:59 -07:00
Jude Taylor 99a66bc2f9 put all rubies in scope 2015-09-26 05:55:59 -07:00
Jude Taylor dcf933e258 move rubies into a single file 2015-09-26 05:55:59 -07:00
Luca Bruno 5aa066a942 Merge branch 'gnome-staging' into staging 2015-09-26 14:16:19 +02:00
William A. Kennington III 4f798100d8 Merge pull request #10061 from matthiasbeyer/update-libgit2 
libgit2: 0.21.2 -> 0.23.2
 2015-09-25 13:53:19 -07:00
William A. Kennington III 585e0031f5 Merge pull request #10055 from mayflower/racer-rustfmt 
Fix/Update racer and rustfmt
 2015-09-25 13:52:57 -07:00
Wout Mertens 55e8d8ea61 Merge pull request #9941 from utdemir/upgrade-nodejs-4-1 
nodejs: 0.12.7 -> 4.1.0
 2015-09-25 19:02:04 +02:00
Matthias Beyer bea75f4c78 libgit2: 0.21.2 -> 0.23.2 2015-09-25 15:47:57 +02:00
lethalman 6b096582df Merge pull request #9945 from samuelrivas/gusb-enable-vala 
gusb: refactor, enable vala
 2015-09-25 15:20:39 +02:00
lethalman 3e4bbe048a Merge pull request #10038 from pmahoney/skarnet 
Skarnet updates
 2015-09-25 15:15:53 +02:00
Luca Bruno 7d1cb980bf libarchive: fix .la file for lzo2 2015-09-25 14:06:58 +02:00
Luca Bruno 702fde3a91 libarchive: fix .la file for lzo2 2015-09-25 14:06:23 +02:00
Eelco Dolstra 2896861c7e pcre: Smaller patch for CVE-2015-3210, CVE-2015-5073 2015-09-25 11:53:19 +02:00
Eelco Dolstra 298ec05e74 Revert "pcre: Updates to fix a number of vulnerabilities" 
This reverts commit 453b986d2f. Such
large patches should not be included in the repo.
 2015-09-25 11:38:34 +02:00
Eelco Dolstra 72aa458285 Revert "pcre: Fix patch method" 
This reverts commit fb30776a77.
 2015-09-25 11:38:26 +02:00
Jude Taylor e43d3b7114 fix faulty include in libpsl 2015-09-25 02:33:30 -07:00
Jaka Hudoklin 0322596721 Merge pull request #10040 from maxxk/libmemcached-darwin 
libmemcached on darwin
 2015-09-25 11:09:23 +02:00
Luca Bruno 45b1f5858c Merge branch 'gnome' into staging 2015-09-25 10:51:50 +02:00
Luca Bruno 41fc49ed7e clutter: init 1.24.0 2015-09-25 10:48:41 +02:00
Luca Bruno bb16eb8f9d cogl: init 1.22.0 2015-09-25 10:48:41 +02:00
Luca Bruno 48ac26f512 gtk+: 3.16.6 -> 3.18.0 2015-09-25 10:48:41 +02:00
Luca Bruno 0a40884e3c pango: 1.36.8 -> 1.38.0 2015-09-25 10:48:41 +02:00
Luca Bruno 4c9b91b2a2 gdk-pixbuf: 2.31.6 -> 2.32.0 2015-09-25 10:48:40 +02:00
Luca Bruno 0688a56a49 at-spi2-atk: 2.16.0 -> 2.18.0 2015-09-25 10:48:40 +02:00
Luca Bruno 8b3e6b5f62 at-spi2-core: 2.16.0 -> 2.18.0 2015-09-25 10:48:40 +02:00
Luca Bruno 6858ca17db gobject-introspection: 1.44.0 -> 1.46.0 2015-09-25 10:48:40 +02:00
Luca Bruno 63ccbf55b2 atk: 2.16.0 -> 2.18.0 2015-09-25 10:48:40 +02:00
Luca Bruno 6bb4df642e glib: 2.44.1 -> 2.46.0 2015-09-25 10:48:39 +02:00
Luca Bruno b1f4a7ef32 webkitgtk: 2.8.5 -> 2.10.0 2015-09-25 10:48:39 +02:00
Robbin C 9e15068099 ctpp2: init at 2.8.3. 
This adds ctpp2, a high performance templating engine.
 2015-09-25 10:48:38 +02:00
Renzo Carbonara 431507d11a ghcjs packages: reflex, reflex-dom, dependent-sum_0_2_0_1, dependent-map_0_1_1_3, dependent-sum-template 2015-09-25 08:46:42 +02:00
Renzo Carbonara f546d389b6 bump ghcjs-dom 2015-09-25 08:46:41 +02:00
Peter Simons d6805a820d Drop obsolete Haskell overrides. 
These overrides are now hard-coded directly in hackage2nix.
 2015-09-25 08:46:41 +02:00
Peter Simons dacc96be28 hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs:

  - Nixpkgs: eaa43c65b3
  - Hackage: c048a402d3
  - LTS Haskell: c7012a704b
  - Stackage Nightly: a74568b554
 2015-09-25 08:46:34 +02:00
Maxim Krivchikov 8ba640d932 libmemcached: build on darwin (patch from homebrew) 2015-09-24 23:08:51 +03:00
Utku Demir fbe9201a8a Remove io.js 
Since they're merged with nodejs and nodejs is updated to 4.1
 2015-09-24 15:46:48 +00:00
Utku Demir 3733c25227 nodejs: 0.12.7 -> 4.1.0 
A big version jump after io.js merge.

dontDisableStatic flag is added since the ./configure script didn't
recognize "--disable-static" flag added by default.

New dependencies are also introduced, coming from io.js
 2015-09-24 15:46:47 +00:00
Tobias Geerinckx-Rice 1e1a54f62c libpsl: 0.10.0 -> 0.11.0 2015-09-24 13:18:38 +02:00
Robin Gloster 4ed66c9f02 rustfmt: fix build 
rustfmt now needs to have llvm in its buildInputs since rust does not bundle it
and rustfmt needs to link to it.
 2015-09-24 09:00:55 +00:00
Robin Gloster 2d3537fbf2 racer: git-2015-05-18 -> 1.0.0 2015-09-24 08:58:43 +00:00
Gabriel Ebner 07cd629184 libeb: init at 4.4.3 2015-09-24 07:45:42 +02:00
William A. Kennington III d5395b0506 Merge pull request #10024 from mayflower/update-rust 
Update rust and dependants
 2015-09-23 22:43:25 -07:00
William A. Kennington III 4086bd92a5 Merge branch 'master.upstream' into staging.upstream 2015-09-23 22:33:52 -07:00
William A. Kennington III 9c345fc97d jemalloc: 4.0.0 -> 4.0.2 2015-09-23 22:31:40 -07:00
William A. Kennington III 4856efb704 rustc: Disable system jemalloc until we can make it compatible 2015-09-23 22:31:28 -07:00
William A. Kennington III 09d336ea5e libarchive: Support lzo 2015-09-23 20:49:03 -07:00
William A. Kennington III 5856e44258 jemalloc: Fix jemalloc prefix for applications which expect ^malloc 2015-09-23 20:48:14 -07:00
Patrick Mahoney 2dc98aaec7 skalibs: 2.3.4.0 -> 2.3.7.0 2015-09-23 22:23:21 -05:00
Jude Taylor e7605dd08b add nodejs-4.1.0 2015-09-23 16:13:34 -07:00
William A. Kennington III d3f4ba9d6f Merge branch 'master.upstream' into staging.upstream 2015-09-23 14:44:21 -07:00
William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream 
This is a partial commit from staging in an attempt to make merges
smaller.
 2015-09-23 14:35:36 -07:00
Robin Gloster 760be9cf70 rustfmt: git-2015-09-05 -> git-2015-09-23 2015-09-23 21:16:16 +00:00
Robin Gloster feda2925f7 cargo: 0.3.0 -> 0.5.0 2015-09-23 21:16:16 +00:00
Robin Gloster 1aff911601 rustUnstable: 2015-09-05 -> 2015-09-23 2015-09-23 21:16:16 +00:00
William A. Kennington III de2906e670 rustc: Update both versions of the compiler 
rustc: 1.2.0 -> 1.3.0
  rustcMaster: 2015-09-05 -> 2015-09-21

This also removes the llvm bundling which reduced immediate the closure size
by ~50MB. It also tries to reduce some of the superfluous dependencies
to help reduce the number of potential rebuilds (namely removing git).
 2015-09-23 12:30:00 -07:00
Vincent Laporte 399a9da2ae camlp5: 6.12 -> 6.14 2015-09-23 19:05:02 +02:00
Arseniy Seroka d9b4d81a39 Merge pull request #10003 from gebner/qutebrowser-youtube 
qutebrowser: youtube support
 2015-09-23 18:26:04 +03:00
Peter Simons 69db836dbc configuration-hackage2nix.yaml: fix evaluation errors on Darwin 2015-09-23 17:17:45 +02:00
Renzo Carbonara 8ce1f6efcd bump ghcjs, ghcjs-boot, ghcjs-shims 2015-09-23 15:08:19 +02:00
Peter Simons 5c1afdd5f6 cabal2nix: update to version 20150922 2015-09-23 15:08:19 +02:00
Peter Simons e425766b5d hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20150922-4-g3df9130 using the following inputs:

  - Nixpkgs: 5eb46915ca
  - Hackage: 238be6f443
  - LTS Haskell: c7012a704b
  - Stackage Nightly: a46ea057c9
 2015-09-23 15:08:11 +02:00
Vladimír Čunát ff9a70266b at-spi2-*: small updates 2.16.0 -> 2.18.0 2015-09-23 14:43:50 +02:00
Vladimír Čunát cd7c494bb2 pango: feature update 1.36.8 -> 1.38.0 
Tested rebuilding the most important pango users, without any problems.
 2015-09-23 14:43:30 +02:00
Vladimír Čunát 9de8f95d4b libjpeg(-turbo): maintenance update 1.4.1 -> 1.4.2 2015-09-23 14:43:13 +02:00
Vladimír Čunát 23f75e9bb0 gdk-pixbuf: maintenance update 2.31.7 -> 2.32.0 2015-09-23 14:43:05 +02:00
Arseniy Seroka f0717273a7 Merge pull request #10013 from aespinosa/oath-toolkit-on-darwin 
oathToolkit: Support darwin
 2015-09-23 12:21:17 +03:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +02:00
William A. Kennington III 5afaef6213 libu2f-server: 0.0.0 -> 1.0.1 2015-09-22 23:25:45 -07:00
Allan Espinosa 22e57d6f26 oathToolkit: Support darwin 2015-09-23 13:26:37 +09:00
Jude Taylor 724e243159 pop 2015-09-22 16:27:51 -07:00
William A. Kennington III 283dd9fe49 wayland: 1.8.1 -> 1.9.0 2015-09-22 14:30:16 -07:00
Vladimír Čunát a921167e37 pixman: bugfix update 0.32.6 -> 0.32.8, refactor 
It's claimed to be important on i686.
http://cgit.freedesktop.org/pixman/commit/?id=8b49d4b6b460d0c92
 2015-09-22 18:46:45 +02:00
Gabriel Ebner 449b6028a6 qt5.multimedia: fix gstreamer support. 2015-09-22 18:45:45 +02:00
Eelco Dolstra e7631452e9 texinfo: Disable tests 
These appear to fail randomly:

  http://hydra.nixos.org/build/26194907/nixlog/325/raw
 2015-09-22 12:46:58 +02:00
Eelco Dolstra fbaaa9cccc swig2: Enable on Darwin 2015-09-22 11:59:39 +02:00
Vladimír Čunát 0be672ced1 kdevplatform: maintained by @ambrop72, /cc #9981. 2015-09-22 08:44:23 +02:00
Vladimír Čunát 295439bb0a kdevplatform: fix #9981 - build after svn update 
Also enableParallelBuilding.
 2015-09-22 07:59:25 +02:00
Edward Tjörnhammar 959ead8406 Merge pull request #9990 from matthiasbeyer/update-yajl 
yajl: 2.0.4 -> 2.1.0
 2015-09-22 03:36:46 +02:00
Matthias Beyer 0c45f5400d yajl: 2.0.4 -> 2.1.0 2015-09-22 01:58:19 +02:00
Jaka Hudoklin 0d32d4cd84 kibana: 4.2.0 -> 4.1.2 
Kibana needs to be downgraded, so it works with current stable elasticsearch
 2015-09-22 00:30:19 +02:00
William A. Kennington III 2a0c18835a llvm: Install utilities for use with rustc 2015-09-21 14:38:49 -07:00
William A. Kennington III 7040350f34 swig: 3.0.6 -> 3.0.7 2015-09-21 14:38:49 -07:00
Peter Simons 066481cb13 configuration-hackage2nix.yaml: update list of broken packages 2015-09-21 23:15:23 +02:00
Peter Simons ccad6ae082 This update was generated by hackage2nix v20150903-88-gd09c4dd using the following inputs: 
- Hackage: 2201da64fa
  - LTS Haskell: c7012a704b
  - Stackage Nightly: affe30844a
 2015-09-21 23:15:15 +02:00
Arseniy Seroka 7f5139a18d Merge pull request #9974 from robbinch/pkg-ctpp2 
ctpp2: init at 2.8.3.
 2015-09-21 22:29:33 +03:00
Jude Taylor 2d464f75ed give libuv real libtool 2015-09-21 12:17:29 -07:00
William A. Kennington III b49e2945f0 libqb: 0.17.1 -> 0.17.2 2015-09-21 11:49:24 -07:00
Tobias Geerinckx-Rice 1339183279 libchamplain 0.12.10 -> 0.12.11 2015-09-21 19:22:15 +02:00
Tobias Geerinckx-Rice ee7df6a566 dub: 0.9.23 -> 0.9.24 
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
 2015-09-21 19:22:14 +02:00
Eelco Dolstra 01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219 
Conflicts:
	pkgs/os-specific/linux/systemd/fixes.patch
	pkgs/os-specific/linux/upower/0.99.nix
	pkgs/top-level/all-packages.nix
 2015-09-21 12:57:30 +02:00
Luca Bruno af011439b7 urweb: add back openssl configure flags to fix build, cc @aseipp 2015-09-21 10:45:22 +02:00
William A. Kennington III 0a7176c5a1 Revert "bundlerEnv: Use released versions of bundler" 
This reverts commit 7bc8b1561e.

This breaks some ruby gems and needs to be reworked again.
 2015-09-20 22:05:29 -07:00
Robbin C 5ff9dc0ffd ctpp2: init at 2.8.3. 
This adds ctpp2, a high performance templating engine.
 2015-09-21 11:56:10 +08:00
William A. Kennington III 7bc8b1561e bundlerEnv: Use released versions of bundler 
We were using HEAD for unreleased features. These features are now in
release builds so we should go back to using those. This also means we
won't have to deal with hash mismatches for all ruby packages.
 2015-09-20 18:56:56 -07:00
Tobias Geerinckx-Rice 728199b8cf libpsl: 0.9.0 -> 0.10.0 2015-09-21 02:51:54 +02:00
William A. Kennington III 3fcbd5a829 Merge branch 'master.upstream' into staging.upstream 2015-09-20 14:54:53 -07:00
William A. Kennington III 5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
Vladimír Čunát b868ec950d mesa: maintenance update 10.6.7 -> 10.6.8 2015-09-20 15:57:33 +02:00
Vladimír Čunát c8f462b80b libdrm: update 2.4.64 -> 2.4.65 2015-09-20 10:23:39 +02:00
Vladimír Čunát a5b0136b1a gkt3: maintenance update 3.16.6 -> 3.16.7 2015-09-20 09:09:19 +02:00
Vladimír Čunát 67ad72140b harfbuzz: update 1.0.2 -> 1.0.3 2015-09-20 09:09:18 +02:00
Vladimír Čunát d77588d127 gdk_pixbuf: maintenance update 2.31.6 -> 2.31.7 2015-09-20 09:09:18 +02:00
Peter Simons 2822a45758 hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20150903-85-gaab3160 using the following inputs:

  - Hackage: d45d08e556
  - LTS Haskell: da73308b63
  - Stackage Nightly: 7d1956be84
 2015-09-20 08:16:46 +02:00
William A. Kennington III 222f5454a0 Merge pull request #9892 from benley/swig3-darwin 
swig3: re-enable darwin builds
 2015-09-19 16:30:26 -07:00
William A. Kennington III 9f3c0d9967 Merge branch 'master.upstream' into staging.post-15.06 2015-09-19 14:40:01 -07:00
William A. Kennington III 8b670fba26 Merge branch 'staging.upstream' into staging.post-15.06 2015-09-19 14:39:57 -07:00
Arseniy Seroka fcc3a87b69 Merge pull request #9944 from vbgl/ocaml-fontconfig 
ocaml-fontconfig: init at 20131103
 2015-09-19 22:57:54 +03:00
Samuel Rivas 7cfcbae958 gusb: refactor, enable vala 
This exports the vapi files to share/vala/vapi
 2015-09-19 20:05:34 +02:00
Thomas Tuegel a23b96c74d Merge pull request #9943 from ttuegel/remove-qt-5.3 
Remove Qt 5.3
 2015-09-19 11:42:20 -05:00
Thomas Tuegel 4fd58511fb hsqml: use Qt 5.4 2015-09-19 11:38:01 -05:00
Thomas Tuegel e5b124e492 qt5Full: only include derivations 2015-09-19 11:37:39 -05:00
Vincent Laporte 2fe151a8d8 ocaml-fontconfig: init at 20131103 2015-09-19 18:27:14 +02:00