1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Commit graph

3245 commits

Author SHA1 Message Date
Robin Gloster 46ead28a58
gnome3.gexiv2: 0.10.4 -> 0.10.6 2017-07-18 00:05:50 +02:00
Vladimír Čunát efe66e221f
evince: patch CVE-2017-1000083 + minor changes
This removes help for now but fixes #27388.
The minor update might be related to the patch so it's included.
2017-07-15 10:07:45 +02:00
Domen Kožar 0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.

http://hydra.nixos.org/eval/1375094
2017-07-14 11:55:41 +02:00
Robin Gloster d518096abc
gnome3.gnome_control_center: remove unused variable
This broke the evaluation.
2017-07-13 15:50:48 +02:00
Stefan Lau 2b4bc03969 gnome-online-accounts: wrap with wrapGAppsHook 2017-07-13 15:05:07 +02:00
Stefan Lau 8ff35d6adf gnome-control-center: wrap with wrapGAppsHook 2017-07-13 15:05:07 +02:00
Jörg Thalheim 451b23beb2 Merge pull request #27297 from jtojnar/fix/ghex
ghex: init at 3.18.3
2017-07-11 18:43:10 +01:00
Jan Tojnar bf60fbe2e1
ghex: init at 3.18.3 2017-07-11 10:05:06 +02:00
John Ericson 3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Emanuele Peruffo 240b632026 gnomeExtensions.topicons-plus: init at v20 (#27116)
TopIcons extension for Gnome 3
2017-07-04 17:56:06 +01:00
gnidorah 7f13a3f5b8 maxx: init at 1.0.0 2017-07-04 13:42:53 +03:00
Emanuele Peruffo 0b1c8793fc gnomeExtensions.caffeine: init at revision unstable-2017-06-21 (#26901)
Caffeine extension for Gnome 3
2017-07-03 08:35:31 +01:00
romildo c5ff68b3c2 lumina: 1.2.0-p1 -> 1.3.0
- Update to version 1.3.0

- Remove dependency on `oxygen-icons5`, as Lumina desktop now distributes
it’s own "material-design-[light/dark]" icon themes and uses them as the
default icon sets.
2017-06-29 08:13:09 -03:00
Aristid Breitkreuz fe2e3cea51 gnome-control-center: add missing dependency on cracklib 2017-06-28 21:43:15 +02:00
Frederik Rietdijk 8a62a9b064 Merge pull request #26125 from volth/webkitgtk-naming
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
2017-06-28 13:54:38 +02:00
Thomas Tuegel 074bccb43b
plasma5: 5.10.2 -> 5.10.3
This is a scheduled bugfix release. Several fixes are related to integrating
Plasma 5.10 and Qt 5.9, particularly a serious bug in KWin.
2017-06-27 06:58:34 -05:00
Bjørn Forsman 6916f24e84 treewide: enableParallelBuild -> enableParallelBuilding 2017-06-24 22:22:48 +02:00
Thomas Tuegel 69438a397f
khotkeys: fix intermittant parallel build failure 2017-06-24 15:18:58 -05:00
Thomas Tuegel 0d1a1a4954
plasma-workspace: no propagatedBuildInputs
Only libraries may have propagatedBuildInputs.
2017-06-23 09:55:04 -05:00
Thomas Tuegel 0030c66103
kdeFrameworks, plasma5: fix setup hooks
The setup hooks for many kdeFrameworks and plasma5 packages were erroneously
running before $outputDev was set. This lead to .dev outputs being propagated
into the user environment.
2017-06-22 17:46:44 -05:00
Robin Gloster 15f6dcb668
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-20 11:24:39 +02:00
Franz Pletz 76de6e4f39
libcroco: 0.6.11 -> 0.6.12 2017-06-20 07:47:52 +02:00
Peter Hoeg 9193bcb6b4 kde-applications: 17.04.1 -> 17.04.2
use https as the remote server expects it
2017-06-19 19:26:52 +08:00
Peter Hoeg 359aff876c plasma-workspace: requires libXtst 2017-06-19 10:37:39 +08:00
Peter Hoeg f151daaa67 plasma: 5.9.5 -> 5.10.2 2017-06-19 10:37:39 +08:00
Thomas Tuegel d9094c087e
libkscreen: use QLatin1String instead of QStringLiteral
QStringLiteral stores strings in UTF-16 format, preventing Nix from detecting
dependencies.
2017-06-18 08:44:46 -05:00
Thomas Tuegel 8538d75734
plasma5: fixup inputs and outputs 2017-06-18 08:44:45 -05:00
Thomas Tuegel 7f95d4834f
kwin: pass path to Xwayland through preprocessor macro 2017-06-18 08:44:45 -05:00
Thomas Tuegel a4be1a68f8
plasma-desktop: pass path to hwclock through preprocessor macro 2017-06-18 08:44:45 -05:00
Thomas Tuegel faf0d3e91d
kdeFrameworks: fixup inputs and outputs
- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.
2017-06-18 08:44:45 -05:00
Thomas Tuegel 30ff56a20f
breeze-gtk: patch builder to find GTK2 pixmap engine
This does not seem to be strictly necessary, but it also cannot hurt.
2017-06-18 08:44:43 -05:00
Thomas Tuegel da942ea23f
breeze-gtk: bump GTK3 version 2017-06-18 08:44:43 -05:00
Thomas Tuegel 078c88a7a7
startkde: use absolute paths to required programs
The dependency on socat is removed because kwallet setup is deferred to kwallet-pam.
2017-06-18 08:44:43 -05:00
Thomas Tuegel b9ae0c7185
kwallet-pam: set path to socat 2017-06-18 08:44:43 -05:00
Thomas Tuegel c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel be7b7d908f
Remove kdeWrapper 2017-06-18 08:43:39 -05:00
Thomas Tuegel eaa644a5af
plasma5: rename plasmaPackage to mkDerivation 2017-06-18 08:42:20 -05:00
Thomas Tuegel 7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation 2017-06-18 08:42:19 -05:00
Thomas Tuegel 210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel 3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
armijnhemel 73744e700c atril: init at 1.19.0 (#25765) 2017-06-18 11:39:59 +02:00
Vladimír Čunát 5ad7d3106e
kde4.kdepimlibs: fixup build by using older cmake
I have no idea why, but apparently the last cmake update caused:
  kdepimlibs-4.14.3/akonadi/tests/../pastehelper.cpp:343:27:
    fatal error: pastehelper.moc: No such file or directory
2017-06-13 14:27:44 +02:00
volth 26abdb81c8 xfce4-dockbarx-plugin: fix unwrapped python scripts 2017-06-10 10:44:23 +01:00
Jörg Thalheim cea91a426b Merge pull request #26401 from volth/xfce4-namebar-plugin
xfce4_namebar_plugin: init at 0.3.1
2017-06-10 10:40:56 +01:00
romildo 11623c5fca lxappearance: add variant for Gtk+-3
lxappearance supports both Gtk+-2 and Gtk+-3. The current `lxappearance'
package continues to be for Gtk+-2. Add `lxappearance-gtk3' for Gtk+-3.

A patch is needed in order to look for themes in system data dirs with
Gtk+-3.
2017-06-09 18:05:09 -03:00
Volth 9edfc2b02b xfce4_namebar_plugin: init at 0.3.1 2017-06-05 13:50:22 +00:00
Vincent Laporte e6b5a7e627 gnome-backgrounds: build on all unices 2017-06-05 05:46:44 +00:00
Robin Gloster c1359ce04b
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-02 15:39:25 +02:00
Volth b7ccf27229 rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2 2017-05-26 13:43:25 +00:00
Volth 3de90b259c webkitgtk: 2.14.11 -> 2.16.3 2017-05-26 16:20:54 +03:00
Joachim F 9f187a6919 Merge pull request #26071 from romildo/upd.enlightenment
enlightenment: 0.21.7 -> 0.21.8
2017-05-24 22:25:13 +01:00
José Romildo Malaquias ce248ef4ce efl: 1.19.0 -> 1.19.1 (#26027) 2017-05-24 22:24:55 +01:00
romildo b4dad912b0 enlightenment: 0.21.7 -> 0.21.8 2017-05-24 17:01:45 -03:00
Robin Gloster cb00af4a2c
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-05-23 11:50:02 +02:00
ryneeverett 34bdf451c3 lxpanel: init at 0.9.3
[Bjørn: break overlong lines.]
2017-05-20 15:41:09 +02:00
Robin Gloster da9adb8fab
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-05-20 14:55:44 +02:00
Jörg Thalheim 33e10b8334 Merge pull request #25864 from pbogdan/nixos-master
xfce4-volumed-pulse: 0.2.0 -> 0.2.2.
2017-05-20 10:43:52 +01:00
Stefan Lau a3696aa090 networkmanager_fortisslvpn: init at 1.2.4 2017-05-19 19:18:30 +02:00
Bjørn Forsman 0eff1d9f2a vino: use wrapGAppsHook
Fixes this:

  .vino-server-wr[8931]: Using the 'memory' GSettings backend. \
  Your settings will not be saved or shared with other applications.

Still, the screen sharing settings under "gnome-control-center sharing"
does not seem to be persisted (except the enabling/disabling sharing
flag itself). Making changes and then re-opening gnome-control-center
shows the default screen sharing settings. Sigh.
2017-05-18 08:22:14 +02:00
Bjørn Forsman 94c47b0884 vino: add missing gsettings schema
Fixes this:

  $ ./result/libexec/vino-server
  ...
  (vino-server:13915): GLib-GIO-ERROR **: Settings schema 'org.gnome.Vino' is not installed
2017-05-17 15:23:11 +02:00
Piotr Bogdan a19efc1e30 xfce4-volumed-pulse: 0.2.0 -> 0.2.2. 2017-05-17 14:05:24 +01:00
Frederik Rietdijk ef4442e827 Python: replace requests2 with requests tree-wide
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
2017-05-07 12:56:09 +02:00
Vladimír Čunát d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
2017-05-02 14:00:45 +02:00
Jörg Thalheim 59c699e9b9 Merge pull request #25331 from volth/xfce4-screenshooter-glib-networking
xfce4-screenshooter: add glib_networking dependency
2017-05-01 23:42:28 +02:00
Jörg Thalheim f3eb5950a2
xfce4-screenshooter: use wrapGAppsHook instead of makeWrapper 2017-05-01 23:41:11 +02:00
romildo 3745208084 econnman: wrap libcurl.so in LD_LIBRARY_PATH 2017-05-01 18:35:48 -03:00
romildo 30e086d349 rage: wrap libcurl.so in LD_LIBRARY_PATH 2017-05-01 18:35:34 -03:00
romildo 627724d386 ephoto: wrap libcurl.so in LD_LIBRARY_PATH 2017-05-01 18:35:16 -03:00
romildo eef6df55f1 terminology: wrap libcurl.so in LD_LIBRARY_PATH 2017-05-01 18:34:53 -03:00
Jörg Thalheim cb186efb64 Merge pull request #25359 from pbogdan/aisleriot-fix-build-failure
gnome3.aisleriot: fix build failure.
2017-05-01 20:39:36 +02:00
Michael Raskin a53fb88d33 Merge pull request #25170 from emanueleperuffo/dash-to-dock
gnomeExtensions.dash-to-dock: init at version v57
2017-05-01 16:44:37 +02:00
Michael Raskin a7455d7f5c Merge pull request #24283 from dyrnade/chrome-gnome-shell
native host connector for gnome extensions: init at 7d99523e90805cb65027cc2f5f1191a957dcf276
2017-05-01 01:19:29 +02:00
Piotr Bogdan b9447df879 gnome3.aisleriot: fix build failure.
Fixes #25313.
2017-04-30 19:48:41 +01:00
Thomas Tuegel 4e0d21edd1 Merge pull request #25285 from ttuegel/qt--fix-plugin-paths
Qt: purify plugin paths, unify Linux and Darwin builders
2017-04-30 07:33:50 -05:00
Michael Raskin cd9ebdaa18 Merge pull request #25334 from volth/xfce4-dockbarx-plugin
xfce4-dockbarx-plugin: init at 0.5
2017-04-30 12:20:02 +02:00
Vladimír Čunát 7ee05dff30
Merge: efl: 1.18.x -> 1.19.0 (close #25095)
I used a setupHook instead of patching expressions for individual
reverse dependencies (four were broken).
2017-04-30 11:36:36 +02:00
Vladimír Čunát 18a7f7d4a5
efl: set $HOME for reverse dependencies 2017-04-30 11:35:59 +02:00
Vladimír Čunát aa044dd105
efl: wrap the first line
It was >400 chars long!
2017-04-30 11:35:30 +02:00
Volth f17a0fcdba xfce4-dockbarx-plugin: init at 0.5 2017-04-29 22:15:40 +00:00
Michael Weiss 8c9b60a830 pykde4: Remove kde4.pykde4
This package is broken since 0a3b7f994e
(python-sip: 4.18.1 -> 4.19.1). Removing it seems reasonable since we're
dropping KDE4 anyway.

Fixes #24548.
2017-04-29 23:10:07 +02:00
Volth 82a1c372af xfce4-screenshooter: add glib_networking dependency 2017-04-29 20:31:57 +00:00
Dan Peebles 90b9719f4f treewide: fix the remaining issues with meta attributes 2017-04-29 04:24:34 +00:00
Thomas Tuegel 951b6b8a7f
plasma-workspace: 5.9.5 -> 5.9.5.1 2017-04-28 06:27:19 -05:00
Thomas Tuegel c4c614c232
libkscreen: hardcode backends path
libkscreen provides all available kscreen backends, so there is no reason to
search the environment for plugins.
2017-04-28 05:49:33 -05:00
Thomas Tuegel a53f129c45
kwin: install service type aliases for broken packages
Some package(s) refer to kwin service types by the wrong names. I would prefer
to patch those packages, but I cannot find them!
2017-04-28 05:49:33 -05:00
Thomas Tuegel e6c76af480
plasma5: 5.9.4 -> 5.9.5 2017-04-27 11:20:22 -05:00
Emanuele Peruffo c1bc3012bb gnomeExtensions.dash-to-dock: refactor
Using makeFlags instead of patching Makefile
2017-04-24 14:48:36 +02:00
Emanuele Peruffo 8211903825 gnomeExtensions.dash-to-dock: init at version v57
I needed this extensions and wanted to share it with everyone.
I also created the new group called pkgs.gnomeExtensions.
2017-04-24 11:19:52 +02:00
Daiderd Jordan 80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors
Add Darwin as platform to various "broken" packages that actually build
2017-04-24 08:14:21 +02:00
Matthew Bauer 6d9ca46317
vte: supports darwin 2017-04-23 18:08:20 -05:00
Matthew Bauer e75fde66e9
dconf: supports darwin 2017-04-23 18:08:19 -05:00
romildo 2f481960cf ephoto: init at 1.0 2017-04-22 03:06:12 +03:00
romildo 1141264c3a efl: 1.18.4 -> 1.19.0 2017-04-21 14:55:03 -03:00
José Romildo Malaquias af1621a232 xfce4-whiskermenu-plugin: 1.6.2 -> 1.7.2 (#25084) 2017-04-21 14:16:25 +01:00
Jörg Thalheim 6231781930 Merge pull request #24992 from romildo/upd.mate
mate-themes: 3.22.7 -> 3.22.10, mate-icon-theme: 1.18.0 -> 1.18.1
2017-04-18 22:09:01 +02:00
romildo 245cf6fa0e mate-themes: 3.22.7 -> 3.22.10 2017-04-18 06:43:13 -03:00
romildo ad95a04fa5 mate-icon-theme: 1.18.0 -> 1.18.1 2017-04-18 06:42:01 -03:00
Hamish Mackenzie 89b89d1071 defaultIconTheme: Enable darwin support 2017-04-18 09:43:03 +12:00
Jörg Thalheim ea16d72bf3
gitg: 3.22.0 -> 3.23.90 2017-04-16 14:23:27 +02:00
Jörg Thalheim 65c99b7d6a
libgit2-glib: 0.24.4 -> 0.25.0
partially addresses #24807
2017-04-16 14:23:21 +02:00
Vladimír Čunát 2090aa4f65
Merge: fixup a bad merge
For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:11:17 +02:00
Vladimír Čunát 24444513fb
Merge branch 'staging' 2017-04-14 10:32:13 +02:00
Thomas Tuegel c9ba39116c Merge pull request #24816 from benley/plasma-nm
plasma-nm: Fix cipher discovery by setting path to openvpn
2017-04-13 08:16:57 -05:00
Hamish Mackenzie 5dfe0f7ee6 gtksourceview: fix version 3 on macOS
Add darwin to the list of supported platforms for gtksourceview.
2017-04-10 23:17:16 -07:00
Benjamin Staffin 7c75940c5e
plasma-nm: enable parallel building
This thing takes a long time to build.
2017-04-10 23:48:28 -04:00
Benjamin Staffin 5db1fe64c0
plasma-nm: patch in the correct path to openvpn executable
Fixes #24808
2017-04-10 23:48:26 -04:00
Gabriel Ebner 443dc395c5 gnome3.gnome_settings_daemon: use wrapGAppsHook
This fixes the "Using the 'memory' GSettings backend." error if
gnome-settings-daemon is used separately from gnome.
2017-04-09 10:00:12 +02:00
Volth bb833702aa xfwm4-themes: init at 4.10.0 2017-04-05 22:10:03 +00:00
Jörg Thalheim 9fc14f23b8
gnome-keyring: use wrapGAppsHook 2017-04-04 16:53:53 +02:00
Jörg Thalheim fccce068c3
baobab: remove superflous gsettings_desktop_schemas 2017-04-04 16:13:05 +02:00
Jörg Thalheim c34db6e419 Merge pull request #24414 from jensbin/corebird
corebird: 1.3.3 -> 1.4.2
2017-04-03 17:09:35 +02:00
dyrnade f1ec6b99c9 native host connector for gnome extensions 2017-03-30 22:49:09 +03:00
romildo 1f9e7f3aa7 gworkspace: 0.9.3 -> 0.9.4 2017-03-30 14:41:14 -03:00
romildo 8765d1edda gnustep.back: add runtime dependency on libXmu
Fix the failure of running applications like GWorkspace, which depends
on 'back'. It fails with a message similar to the one below:

Error (objc-load):/nix/store/fpxksxkl26qd5a7ay52mzv5qbj8di6b5-gnustep-back-0.25.0/lib/GNUstep/Bundles/libgnustep-back-025.bundle/./libgnustep-back-025: undefined symbol: XmuLookupStandardColormap
2017-03-30 14:37:25 -03:00
Joachim F 17132839c1 Merge pull request #24397 from romildo/upd.mate
mate: update packages to version 1.18.0
2017-03-30 13:29:47 +01:00
Jörg Thalheim 04223369e3
gspell: 1.0.3 -> 1.2.1
also enable vala bindings
2017-03-30 11:02:21 +02:00
Franz Pletz 0018cd5a2d
libvirt packages: fix & clean up dependencies 2017-03-28 19:45:01 +02:00
Pascal Wittmann f870fbc8ae Merge pull request #24362 from romildo/fix.lxqt
lxqt-panel: fix for `explicit` (a C++11 keyword) being used as variable
2017-03-28 17:41:02 +02:00
romildo 7bc9e508ba caja: init at 1.18.0 2017-03-28 08:44:28 -03:00
romildo d9672293c2 mate-terminal: 1.17.0 -> 1.18.0 2017-03-27 23:26:24 -03:00
romildo 8844d9b866 mate-desktop: 1.17.2 -> 1.18.0 2017-03-27 23:25:49 -03:00
romildo 55acc8708b mate-themes: 3.22.3 -> 3.22.7 2017-03-27 23:25:11 -03:00
romildo 23f373d724 mate-icon-theme-faenza: 1.16.0 -> 1.18.0 2017-03-27 23:23:30 -03:00
romildo a5c34e5689 mate-icon-theme: 1.17.0 -> 1.18.0 2017-03-27 23:22:40 -03:00
romildo d466d90623 mate-common: 1.17.0 -> 1.18.0 2017-03-27 23:22:00 -03:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
romildo e2ad762394 lxqt-panel: fix for explicit (a C++11 keyword) being used as variable
It is needed to override "explicit" as this is a C++ keyword. But it
is used as variable name in xkb.h. This is causing a failure in C++
compile time.  Similar bug here:
https://bugs.freedesktop.org/show_bug.cgi?id=74080

Workaround from
ec62109e0f.
2017-03-26 16:17:42 -03:00
Nikolay Amiantov a381ee89cd zenity: fix for non-GNOME 3 2017-03-25 14:40:17 +03:00
Robin Gloster bb5d0f3ded
gdm: the patch is still necessary 2017-03-25 12:13:45 +01:00
Nikolay Amiantov f45cf10f6e Merge pull request #24133 from abbradar/gtk3-qt
Fix GTK dependencies in wrappers
2017-03-24 01:49:41 +03:00
Thomas Tuegel edf32f90e6
plasma5: 5.9.3 -> 5.9.4 2017-03-22 20:51:03 -05:00
Nikolay Amiantov f13517433d dconf: split outputs 2017-03-22 20:14:49 +03:00
Thomas Tuegel 403b87f0d5
plasma-workspace: do not propagate non-KDE inputs 2017-03-22 07:46:41 -05:00
Robin Gloster 242031a34e
mutter: fix on i686-linux 2017-03-21 23:50:27 +01:00
Eelco Dolstra 3ab897c6cf
gconf: Use a dev output
This reduces the closure size of gconf from 225 to 63 MiB.
2017-03-20 17:30:59 +01:00
Michael Raskin cd6b1b253e Merge pull request #23749 from butterflya/patch-2
evolution: Enable openldap support
2017-03-18 19:24:24 +01:00
Vladimír Čunát 742b120ddc
Merge branch 'master' into staging
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
Daiderd Jordan 6f226a8725 Merge pull request #23954 from jbaum98/pdfpc-darwin
pdfpc, libgee_0_8: Add darwin support
2017-03-17 07:59:41 +01:00
Jake Waksbaum e022cc6541
gnome3.libgee: Add for Darwin 2017-03-16 18:13:42 -04:00
butterflya ba126daace Merge branch 'master' into patch-2 2017-03-16 23:05:04 +01:00
Jörg Thalheim f940d9f1fc Merge pull request #23747 from butterflya/patch-1
evolution: Delete invalid option
2017-03-16 21:50:14 +01:00
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
José Romildo Malaquias 16023ef598 enlightenment: 0.21.5 -> 0.21.7 (#23791) 2017-03-12 15:48:14 +01:00
butterflya ee160d08eb Enable openldap support 2017-03-11 15:25:05 +01:00
butterflya 2262855d9c Delete invalid option
The removed configureFlags entry is not a documented option according to `configure --help`.
2017-03-11 15:03:48 +01:00
Thomas Tuegel 985f54f5fc Merge pull request #23588 from romildo/fix.lxqt
lxqt: fix qtsvg attribute
2017-03-10 09:54:56 -06:00
Thomas Tuegel e3cb24d1e0 Merge pull request #23503 from ttuegel/fontconfig
Generalize Fontconfig options
2017-03-09 19:29:28 -06:00
Vladimír Čunát ed4a79c65e
Merge branch 'master' into staging
... to fix an evaluation problem in dogecoin.
2017-03-09 23:14:19 +01:00
Tuomas Tynkkynen 8dce538640 gtkglextmm: Mark as broken
No release since 2010. Build broken. Sounds like a library, but no
users. GNOME 2 stuff.

http://hydra.nixos.org/build/49554500/nixlog/3
2017-03-08 20:15:36 +02:00
Vladimír Čunát b86b7c04a3
Merge branch 'master' into staging 2017-03-07 21:59:32 +01:00