Commit graph

1909 commits

Author SHA1 Message Date
Domen Kožar 7cc31b6b49 fix eval 2015-04-02 22:30:28 +02:00
Thomas Tuegel c0d5cd0ff9 poppler: fix build of Qt 4 and Qt 5 wrappers
The autoconf build system for poppler does not support building the
wrappers separately, so this slightly enlarges the size of closures. To
compensate, the command-line utilities have been separated into their
own package.
2015-04-02 09:51:44 -05:00
Arseniy Seroka d32e1215b6 Merge pull request #7111 from spwhitt/libcroco
libcroco: Enable building on Darwin
2015-04-01 00:34:07 +03:00
Nikolay Amiantov dda963caf1 gtksourceview: propagate gtk3 2015-03-31 22:04:43 +02:00
Spencer Whitt 7a0fae2162 libcroco: Enable building on Darwin 2015-03-31 12:37:26 -04:00
Karn Kallio 3661c7a842 kde-4.14 smokegen: prevent cmake from removing rpath on install
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-30 13:37:16 +02:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Karn Kallio b09a6573a0 indilib version advance; older sources no longer available 2015-03-29 15:29:01 -05:00
Karn Kallio 52a6c8496b complete removal of obsolete kdelibs derivation 2015-03-28 17:20:25 -05:00
Thomas Tuegel 77fb55d1f0 plasma52: update to plasma-5.2.2 2015-03-24 17:16:02 -05:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Kirill Elagin 370e40aef5 startkde: Fix kdostartupconfig5 path 2015-03-21 18:56:59 -05:00
Kirill Elagin 29808a11b6 startkde: Qt 5.4 is here 2015-03-21 18:56:49 -05:00
Thomas Tuegel c918f57ebb kde4: remove obsolete kdelibs derivation 2015-03-21 18:54:29 -05:00
Thomas Tuegel 2c4c712a70 kde4: use kdelibs from kdeApps_stable
Upstream is releasing bugfixes to kdelibs only through KDE Applications
releases, so this is the correct way to get updates until we discontinue
KDE 4. This also ensures that kdeApps and kde4 are using the same
version of kdelibs; different versions appear to be causing integration issues.
2015-03-21 18:46:54 -05:00
Gabriel Ebner 9a971364ac Patch gnome-control-center not to override VPN plugin paths.
The network-manager vpn plugin configuration files contain the correct
absolute paths to the plugin libraries in the store; however upstream
(unsuccessfully) tries to find them in a predefined path.
2015-03-16 13:21:23 +01:00
Vladimír Čunát 208d1f24db xfce: more update fallout
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
2015-03-12 23:02:15 +01:00
Domen Kožar 9567ba4601 xfce: 4.10 -> 4.12 (close #6610) 2015-03-12 23:02:15 +01:00
Luca Bruno aae9e49cbc Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
Vladimír Čunát 0619c852cb automake: use 1.14.* as the default
I see 1.15 has been released recently,
but that's probably too new to be the default.
2015-03-09 15:55:21 +01:00
Thomas Strobel f431f73964 Update: Enlightenment + EFL
EFL: 1.12.3 -> 1.13.1
Enlightenment: 1.19.3 -> 1.19.4
2015-03-03 11:29:12 +01:00
Marius Bakke aff4066293 terminology: update to 0.8.0 2015-02-27 14:36:54 +00:00
Thomas Tuegel c6ead8477d plasma52: update to 5.2.1 2015-02-24 20:22:45 -06:00
Thomas Tuegel 8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Thomas Tuegel 69ff7ab541 remove plasma-5.1 2015-02-21 11:39:18 -06:00
Vladimír Čunát 54b4e92574 kwin-5.2: fix build by upstream patch
CC: @ttuegel.
2015-02-14 14:18:11 +01:00
Luca Bruno f7b26bf98f gnome3: Set XCURSOR_PATH. Closes #6191 2015-02-11 11:48:51 +00:00
Thomas Strobel 7f9eaf0eff e19: updates (close #6003)
EFL: 1.12.2 -> 1.12.3
Enlightenment: 0.19.2 -> 0.19.3
2015-02-04 22:20:31 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Thomas Tuegel aa308252ac kf56, plasma52: use ordinary stdenv 2015-01-28 08:40:27 -06:00
Thomas Tuegel a47cfb4ac6 add plasma-5.2 2015-01-27 22:16:31 -06:00
Thomas Tuegel c6f1c75472 kdeApps: update to 14.12.1 2015-01-26 21:01:06 -06:00
Thomas Tuegel 726b80bc87 startkde: don't split script between NixOS module and package 2015-01-26 21:01:06 -06:00
Thomas Tuegel 95d23beb8d startkde: explain presence of entire script 2015-01-26 21:01:05 -06:00
Thomas Tuegel 5a52ddb243 kf5, plasma5, kdeApps: add documentation for maintainers 2015-01-26 21:00:39 -06:00
Thomas Tuegel 62bfe75d42 add plasma-5.1.2 2015-01-26 20:59:52 -06:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Domen Kožar 0ff4b2e040 Merge pull request #5816 from AndersonTorres/xfce
Adding some plugins to XFCE4
2015-01-18 10:32:32 +01:00
Evgeny Egorochkin e92c942d1d KDE4: correctly propagate user env packages 2015-01-18 08:10:25 +02:00
Evgeny Egorochkin 5c496422e6 kde4: fix silent missing kde-workspace dependencies needed for kfontinst and kfontview 2015-01-18 07:13:53 +02:00
AndersonTorres 5d853f7dca Adding some plugins to XFCE4
Here is a list:
Battery      (1.0.5)
Clipman      (1.2.6)
Cpufreq      (1.0.0)
Cpugraph     (1.0.5)
Datetime     (0.6.2)
Dict         (0.3.0)
Embed        (1.4.1)
Eyes         (4.4.3)
Fsguard      (1.0.1)
Genmon       (3.4.0)
Netload      (1.2.4)
Notes        (1.7.7)
Systemload   (1.1.2)
Verve        (1.0.0)
Xkb          (0.5.6)
2015-01-17 21:53:23 -02:00
Eric Seidel 88eae46455 rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
Matej Cotman d4635ce968 rage: fix video for gstreamer engine 2015-01-13 14:59:53 +01:00
Matej Cotman d9e7464edf enlightenment: import dialog fix 2015-01-10 04:20:57 +01:00
Luca Bruno ff6f1555b1 gnome-shell: add missing sqlite needed by libcamel 2015-01-08 12:34:12 +01:00
Luca Bruno 54897da6dc gnome-control-center: fix kerberos -> krb5 2015-01-08 12:34:11 +01:00
Luca Bruno 97b4154762 evolution: fix missing sqlite dependency due to libcamel 2015-01-08 12:34:11 +01:00
Luca Bruno 412819cbcb yelp: fix build missing sqlite dependency 2015-01-08 11:03:31 +01:00
Luca Bruno 8a6d0fdea1 geary: fix build missing sqlite dependency 2015-01-08 11:00:42 +01:00
Luca Bruno 13e3a723f9 evolution-data-server: fix build missing sqlite dependency 2015-01-08 10:50:28 +01:00
William A. Kennington III afeef240dc kerberos: Use default kerberos instead of krb5 2014-12-30 00:05:12 -08:00
Vladimír Čunát 40397be737 e19: enableParallelBuilding of some larger components
Some parts build too long, it seems to me, so I sped them up.
2014-12-28 11:40:01 +01:00
Matej Cotman 812e2734a5 efl: fix build 2014-12-28 06:09:59 +01:00
Vladimír Čunát 3c050d00a5 upower: use newer version by default
Tested on KDE4, fixed with xfce, and was used with GNOME before.
CC @lethalman.

I did not test e19, as it won't build, probably due to #5392 @shlevy.
CC maintainer @matejc.

Also removed a forgotten unused patch.
2014-12-27 22:46:46 +01:00
Vladimír Čunát ca80e416dd xfce4-session: support newer upower by an Arch patch
Tested.
2014-12-27 22:46:46 +01:00
Vladimír Čunát 600534513c xfce4-task-manager: update (features and bugfixes) 2014-12-25 11:30:04 +01:00
Evgeny Egorochkin b6e68d24ea KDE4: update 4.14.1 to 4.14.3 2014-12-24 03:40:20 +02:00
Vincent Laporte 81a2b58c39 nixpkgs: remove redundant attribute sip
Because:

 1. It is a mere alias of `pythonPackages.sip`
 2. It is usually not needed since propagated by `pyqt4`
 3. It makes it easy to have a packages depend on two different versions
 of sip
2014-12-23 19:37:21 +01:00
Thomas Strobel 5c620a998d Update: Enlightenment: 0.19.1 -> 0.19.2 2014-12-22 10:04:15 +01:00
Matej Cotman 6616979638 rage: add enlightenment's own video/audio player 2014-12-19 15:52:21 +01:00
Matej Cotman dbe7fe2735 e19: fix - not showing keyboard layouts - issue 2014-12-17 15:44:59 +01:00
Matej Cotman c1bf0837a1 e19: update enlightenment core libraries 2014-12-17 15:44:32 +01:00
Eelco Dolstra 0e8373143e kdepimlibs: Get rid of a dependency on boost.dev 2014-12-15 17:54:06 +01:00
Luca Bruno e3b84d8dfc Some fixes to the polari irc client 2014-12-12 15:24:23 +01:00
Damien Cassou bc789064d8 Package for the Polari IRC app
This commit includes a patch to telepathy's derivation, written by
Lethalman. This patch makes public the Telepathy's dependency to
dbus_glib. This patch will become problematic with the next pkgconfig
upgrade but this upgrade should make the patch irrelevant. See these 2
links for more information:
- https://bugs.freedesktop.org/show_bug.cgi?id=15199
- https://bugzilla.redhat.com/show_bug.cgi?id=436773

Modified by Luca Bruno:
- Moved telepathy_idle to propagatedUserEnvPkgs
- Added myself to maintainers
- Enable parallel building
2014-12-12 15:12:19 +01:00
Vladimír Čunát 15b9626a3d kde: fix CVE-2014-8600 by upstream patches
https://www.kde.org/info/security/advisory-20141113-1.txt
I couldn't find kio-extras, so I hope we don't have it disguised somewhere.
2014-12-10 19:38:50 +01:00
Domen Kožar abae51655d xfdesktop: 4.10.2 -> 4.10.3 2014-12-09 11:29:16 +01:00
Domen Kožar 4e611fb21a xfce4.xfce4-power-manager: 1.3.0 -> 1.3.2 2014-12-09 11:29:15 +01:00
Luca Bruno 5a999ca446 tracker, gnome-music: drop LD_LIBRARY_PATH 2014-12-08 20:27:22 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Bjørn Forsman 289ec3b5aa html-tidy: align attrname with pkgname
htmlTidy => html-tidy. Keep copy of old attribute for backward
compatibility.
2014-12-06 17:01:05 +01:00
Evgeny Egorochkin 4672aadce2 KDE4: fix kdepim build 2014-12-04 10:22:27 +02:00
Jos van den Oever f12e2d1e66 Update gnumeric
goffice is also updated. goffice is maintained by the gnumeric people
and released in sync with gnumeric. gnumeric 1.12.x corresponds to
goffice 0.10.x.
2014-12-03 09:12:39 +01:00
William A. Kennington III 5825d82e5f boost: Pin packages to 1.56 2014-11-30 05:31:02 -08:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Matej Cotman 084fb3a0d3 e18: remove old desktop manager 2014-11-26 21:44:23 +01:00
Matej Cotman 959946a5af e17: remove old desktop manager 2014-11-26 21:44:23 +01:00
Vladimír Čunát b4aba8c577 evince-3.12: maintenance update 2014-11-25 00:05:12 +01:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
aszlig 764f428ede
libgnomecups: Add CUPS >= 1.6 compatibility patch.
Patch is from Gentoo at:

http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch

Fixes the following Hydra build failure:

http://hydra.cryp.to/build/250133/nixlog/5/raw

Thanks to @peti for the notification.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-23 18:20:09 +01:00
Thomas Tuegel dfaa39db41 polkit-qt-1: Qt 5 support
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The
attributes are also renamed to differentiate the Qt 4 and Qt 5
branches. The prior naming scheme differentiated between polkit-qt-1 and
polkit-qt, but we no longer package the latter.
2014-11-20 11:10:39 -06:00
Mateusz Kowalczyk d3568f277c e17.terminology: update from 0.5.1 to 0.7.0 2014-11-17 18:11:03 +00:00
Mateusz Kowalczyk 9b14ab9f6a e17.eina: update from 1.7.5 to 1.7.10 2014-11-17 18:10:49 +00:00
Luca Bruno 0a34445d74 Document the fact that GNOME 3.12 must use clutter 1.18 2014-11-17 15:15:19 +01:00
Luca Bruno 24ad1612b4 Revert "clutter: update 1.18 -> 1.20. Shouldn't break anything"
This reverts commit 5e14c86b80.

Overlooked an experimental API that breaks mutter in GNOME 3.12.
2014-11-17 15:10:56 +01:00
Luca Bruno 5e14c86b80 clutter: update 1.18 -> 1.20. Shouldn't break anything 2014-11-17 15:05:50 +01:00
Luca Bruno e8adc8b5ec Drop GNOME 3.10 2014-11-14 22:46:37 +01:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Nikolay Amiantov aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Mateusz Kowalczyk cd2cd41c96 ristretto: wrap icon theme 2014-11-03 20:02:41 +00:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
cillianderoiste 919ed14477 Merge pull request #4627 from abbradar/xfce-mixer
xfce4-mixer: add pulseaudio support
2014-10-31 15:08:42 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
koral d95bb47970 termite: fixed shebangs 2014-10-31 08:31:45 +01:00
koral f53ba30c87 Upgraded termite to v8, and its dependency vte to v0.38.0 2014-10-29 12:32:29 +01:00
Luca Bruno 34f681dcf8 Revert "vte: update pkg and patch"
This reverts commit 383075e009.
2014-10-28 21:46:56 +01:00
Luca Bruno 9fd1807279 Revert "vte: fix chroot build"
This reverts commit c17427597e.
2014-10-28 21:46:48 +01:00
Domen Kožar ca1d7dea55 fix scrollkeeper build 2014-10-28 11:36:44 +01:00
lethalman db376cac59 Merge pull request #4695 from DamienCassou/gnome-pomodoro-0.10.3
New version of gnome-shell-pomodoro
2014-10-28 09:53:39 +01:00
wmertens 114a775254 Merge pull request #4544 from k0ral/webkitgtk
webkitgtk: 2.4.6 -> 2.6.1
2014-10-28 09:36:02 +01:00
Damien Cassou 672b913487 New version of gnome-shell-pomodoro 2014-10-26 14:07:26 +01:00
Aristid Breitkreuz c17427597e vte: fix chroot build 2014-10-25 16:45:00 +02:00
Arseniy Seroka 383075e009 vte: update pkg and patch 2014-10-25 16:45:00 +02:00
Aristid Breitkreuz 42aa2e25ec gvfs: lightWeight -> !gnomeSupport 2014-10-25 16:17:39 +02:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Nikolay Amiantov d771822d5f xfce4-mixer: add pulseaudio support 2014-10-23 16:22:43 +04:00
Nikolay Amiantov 333ccae68f xfce: add config into scope 2014-10-23 16:15:55 +04:00
Vladimír Čunát c9de1ea49e xfce4-panel: synchronize gst plugins with xfce4-mixer 2014-10-23 14:08:33 +02:00
Vladimír Čunát 72ad248606 xfce4-panel: fix the mixer applet (fixes #4563) 2014-10-23 13:44:05 +02:00
Shea Levy 8d67b707c7 libgit2-glib: Buidl broke with libgit2 + libssh2 2014-10-22 19:19:57 -04:00
Domen Kožar efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Thomas Strobel 46596d6354 Upgrade: Enlightenment E19: 0.19.0 -> 0.19.1 2014-10-19 14:58:04 +02:00
koral f24f7010b7 webkitgtk: 2.4.6 -> 2.6.1 2014-10-19 11:45:20 +02:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Damien Cassou 9166e29645 Update gnome pomodoro using fetchFromGitHub 2014-10-13 11:02:56 +02:00
Damien Cassou 73b428afc8 gnome-pomodoro: use fetchgit to be more stable 2014-10-13 10:56:59 +02:00
Pascal Wittmann b168a8c118 Merge pull request #4457 from DamienCassou/gpaste-3.12.3.1
gpaste 3.12.3 -> 3.12.3.1
2014-10-10 15:39:55 +02:00
Damien Cassou 45ad3e09fd gpaste 3.12.3 -> 3.12.3.1 2014-10-10 12:55:56 +02:00
Georges Dubus a172b4b1f8 Merge pull request #4436 from madjar/kde414
Switch to kde 4.14 and remove 4.12
2014-10-09 17:42:19 +02:00
Georges Dubus 0295a6c483 Removed kde 4.12 2014-10-09 12:05:56 +02:00
Oliver Hunt 6f64a7cf43 Added granite
Added meta details, changed hash to sha256, and added versions for granite

Changed name to use versions

Fixed license

Yet another typo fix

Added myself as maintainer and fixed typo

Fixed maintainers

Added pantheon terminal

woops
2014-10-09 01:55:27 +02:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
AndersonTorres 5c6170a848 XFCE battery plugin: new package
Closes #4386
2014-10-05 17:18:37 +01:00
wmertens 6320c4a980 kde-workspace: Use automatic version (close #4383)
See https://github.com/NixOS/nixpkgs/pull/4265#discussion_r18430068

This should work but I didn't test it 😁
2014-10-05 17:05:40 +02:00
Luca Bruno e707530751 giflib: add back the 5.0 version
Should fix tracker and may be used to fix
other packages after commit 61f8cee.

Untested as it takes too much time to recompile
everything these days.
2014-10-02 01:41:35 +02:00
Vladimír Čunát 85fba5fdbd kde-4.14: fix kactivities download
It was not released with 4.14.
http://osdir.com/ml/kde-commits/2014-07/msg02039.html
2014-09-27 18:16:26 +02:00
Vladimír Čunát 4bcae6dc96 merge #4265: add KDE 4.14.1 2014-09-27 18:15:00 +02:00
lethalman 9e7619b09b Merge pull request #4292 from DamienCassou/gpaste-3.12.3
gpaste 3.12.2 -> 3.12.3
2014-09-27 12:32:11 +02:00
Damien Cassou f160705eb2 gpaste 3.12.2 -> 3.12.3 2014-09-27 12:24:12 +02:00
ambrop7@gmail.com 0e8e45f3ab kde-4.14: Make it all build. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 446a3d7806 kde-4.14: Adjust fixed output hashes. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 91a41170e4 kde-4.14: Initial porting.
Nix evaulation succeeds (but probably not building everything).
2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 35d5888ca6 kde-4.14: Fix source for module subdirectory packages. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 1d8a197cba kde: Some tweaks to kde-manifest.sh
- Allow packages with different versions than $release (kde-workspace)
- Extra checks

This is a copy of 41faadbcce
but for 4.14.
2014-09-24 23:48:38 +02:00
ambrop7@gmail.com 8fef5ed675 kde: Copy 4.12 to 4.14 as a base" 2014-09-24 23:48:38 +02:00
William A. Kennington III 514784dcd0 kde412: Add boost libs to kdepim 2014-09-22 11:34:53 -07:00
Peter Simons e81b9f4bd8 Merge pull request #4085 from wkennington/master.boost
Boost Updates
2014-09-22 13:53:34 +02:00
lethalman 4cc00a1f2b Merge pull request #4169 from DamienCassou/gnome-shell-pomodoro
gnome-shell-pomodoro for gnome 3.12 package
2014-09-22 09:47:34 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Damien Cassou 49ddf2827b gnome-shell-pomodoro for gnome 3.12 package 2014-09-19 18:38:33 +02:00
koral 2a56f3d3f3 Added termite package and updated vte to be compatible. 2014-09-18 23:29:58 +02:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Thomas Strobel 1613d6cca6 Add package: Enlightenment E19!
Wayland desktop shell is not enabled, yet.
2014-09-15 23:34:28 +02:00
Luca Bruno d4b49aa25f Fix gnome3_10 namespace 2014-09-15 01:38:06 +02:00
Vladimír Čunát d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
lethalman d2bf37f183 Merge pull request #4010 from madjar/master
kde4: added the security patch for CVE-2014-5033 to nixpkgs because it is not available upstream
2014-09-10 10:10:36 +02:00
Eelco Dolstra 4ae3e32e82 Merge pull request #4012 from ibeex/master
added darwin as supported platform for meld
2014-09-09 15:35:58 +02:00
Ivan Brkanac 841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Georges Dubus 7c0e0849af kde4: added the security patch for CVE-2014-5033 to nixpkgs because it is not available upstream 2014-09-09 13:54:42 +02:00
Eelco Dolstra 88822dc23c Merge branch 'p/orig-modular-stdenv' of github.com:vcunat/nixpkgs into staging 2014-09-08 22:32:11 +02:00
Luca Bruno e4e39f26ba Change default from gnome 3.10 to gnome 3.12 2014-09-08 18:35:45 +02:00
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Luca Bruno 7d6a27a780 evolution: fix build 2014-09-05 12:46:16 +02:00
Michael Raskin a3b9bf6c87 Merge pull request #3653 from iyzsong/nixos/xfce4-mixer
nixos: don't set variables for gstreamer-0.10 (fix #3652)
2014-09-04 20:54:57 +04:00
Luca Bruno 1d0c2faf6b totem: drop upstream patch after update 2014-09-03 10:02:41 +02:00
Luca Bruno e23504c0b2 evolution-data-server: update from 3.12.2 to 3.12.5 2014-09-03 10:02:41 +02:00
Luca Bruno 268a5618f4 Merge branch 'gnome3' 2014-09-02 12:59:47 +02:00
Luca Bruno 17e96cd1a3 vte: update from 0.36.2 to 0.36.3 2014-09-02 12:57:10 +02:00
Luca Bruno 12018a0df9 gnome3_12.tracker: update from 1.0.1 to 1.0.3, potentially fixes CVE-2012-2671, CVE-2012-6109 2014-09-02 12:56:07 +02:00
Luca Bruno f02ab3f9c4 gnome3_12.totem: update from 3.12.1 to 3.12.2 2014-09-02 12:56:01 +02:00
Luca Bruno 70991e666e gnome3_12.gtksourceview: update from 3.12.2 to 3.12.3 2014-09-02 12:55:54 +02:00
Luca Bruno 7cb6d4cd87 gnome3_12.grilo-plugins: update from 0.2.12 to 0.2.13 2014-09-02 12:55:46 +02:00
Luca Bruno 4426b5aca7 grilo: update from 0.2.10 to 0.2.11 2014-09-02 12:55:33 +02:00
Luca Bruno b00b560dba gnome3_12.gnome-user-docs: update from 3.12.1 to 3.12.2 2014-09-02 12:54:38 +02:00
Luca Bruno ac7f0a8cf2 gnome3_12.gnome-music: update from 3.12.2 to 3.12.2.1 2014-09-02 12:54:30 +02:00
Luca Bruno 95dffc12e8 gnome3_12.gnome-calculator: update from 3.12.1 to 3.12.3 2014-09-02 12:54:22 +02:00
Luca Bruno f08c327ab2 gnome3_12.gedit: update from 3.12.1 to 3.12.2 2014-09-02 12:54:14 +02:00
Luca Bruno f3bc1dc263 gnome3_12.geary: update from 0.6.0 to 0.6.2 2014-09-02 12:54:08 +02:00
Luca Bruno de51a490f5 gnome3_12.folks: update from 0.9.6 to 0.9.8 2014-09-02 12:54:01 +02:00
Luca Bruno 64746e1f24 gnome3_12.evolution: update from 3.12.2 to 3.12.5 2014-09-02 12:53:49 +02:00
Luca Bruno df6d65ad55 gnome3_12.empathy: update from 3.12.2 to 3.12.5 2014-09-02 12:53:41 +02:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Luca Bruno 463585a5ec gnome-tweak-tool: update 3.10.1 -> 3.12.0 2014-09-02 11:24:49 +02:00
Luca Bruno eaeee57483 gnome-tweak-tool: update 3.10.1 -> 3.12.0 2014-09-02 11:20:26 +02:00
Damien Cassou 9a26b38ad3 Make sure gnome-python has gnomevfs binding 2014-08-30 15:56:22 +02:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Domen Kožar 39320b0fa3 gnome3.gitg: fix build by updating it to unstable 2014-08-28 20:53:01 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra c77fde7810 yelp: Fix description 2014-08-24 15:25:27 +02:00
Domen Kožar e93eb33058 gtkglext: cleanup 2014-08-23 11:46:54 +02:00
Vladimír Čunát 91db3f6b45 kde4: security patch for CVE-2014-5033 2014-08-21 15:13:18 +02:00
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Vladimír Čunát 90874bfc44 gdm-3.12: disable parallel building
Reason:
gdm-client-glue.h:7:0: error: unterminated #ifndef
http://hydra.nixos.org/build/13488683
2014-08-19 18:36:06 +02:00
宋文武 8f1623b38b xfce4-mixer: use wrapper to set GST_PLUGIN_SYSTEM_PATH 2014-08-19 09:57:30 +08:00
Luca Bruno 36bef2b267 gobject-introspection: refer to shlibs with absolute paths in typelibs
After this, LD_LIBRARY_PATH should not be required anymore.
The patch has been applied only for .la files, so there may
be some other cases missing.
2014-08-14 23:16:51 +02:00
Luca Bruno dfbc9ff781 gpaste: new package
Clipboard management system with GNOME3 integration

https://github.com/Keruspe/GPaste
2014-08-14 21:16:42 +02:00
Luca Bruno 1a29fcae69 gdm: Add very experimental display manager 2014-08-12 11:23:42 +02:00
Luca Bruno 3962ec068f gnome-shell: find icons inside gdm 2014-08-12 11:23:11 +02:00
Luca Bruno 2e5c13d398 vino: fix missing remote-desktop icon 2014-08-12 11:23:11 +02:00
Luca Bruno 47c1261939 dconf: update to 0.20.0 due to gdm requiring dconf compile 2014-08-12 11:23:10 +02:00
Eelco Dolstra e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Vladimír Čunát 1b169722a3 Merge branch 'x-updates'
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
Luca Bruno 7a4a132085 Revert "gnome-shell: enable parallel building"
This reverts commit 9ec0a105d3.

Conflicts:
	pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
2014-08-03 09:56:16 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Vladimír Čunát ace3d4685d xfce4-appfinder: update 4.9.4 -> 4.10.1
(cherry picked from commit 8aa892489e)
2014-07-31 16:30:04 +02:00
Vladimír Čunát bc8abb2242 libxfce4util: minor update 4.10.0 -> 4.10.1
(cherry picked from commit 5c72dac548)
2014-07-31 16:30:04 +02:00
Vladimír Čunát 880fb28ecd xfce4-power-manager: update to 1.3.0, supporting upower-0.99
(cherry picked from commit 2027dcc4f9)
2014-07-31 16:30:04 +02:00
Sven Keidel 6a7d82d000 added meta information 2014-07-31 00:49:14 +02:00
Sven Keidel 2d31046a40 gtkpod: bump to 2.1.4 2014-07-31 00:41:17 +02:00
Evgeny Egorochkin f7ef36428d libzapojit: fix broken src url 2014-07-29 13:42:45 +03:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Matej Cotman 5b97751a8f fix e18 cpufreq module: set setuid to freqset 2014-07-25 12:49:31 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát 644c9eb6f7 Revert "Merge #3054: add kde 4.13.2"
This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e, reversing
changes made to 07a09fbe63.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
2014-07-22 17:48:14 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Vladimír Čunát 4cbf520bfe e18.enlightenment: fix build by adding bzip2
I'm lazy to find how exatly the need propagated in x-updates.
2014-07-21 15:06:44 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Matej Cotman 1afb26fb17 e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Luca Bruno 3871005b7c gtksourceview 3.12: hard code data dirs to nix store path 2014-07-13 16:32:41 +02:00
Luca Bruno 0b82b95322 gnome-shell 3.12: fix at_spi2_core argument 2014-07-12 20:45:20 +02:00
lethalman 38c2901741 Merge pull request #3253 from bjornfor/gnome-boxes
Add Gnome Boxes (access remote or virtual systems)
2014-07-12 14:56:41 +02:00
Bjørn Forsman b8bd3c166e gnome-boxes: new package
gnome-boxes is a simple GNOME 3 application to access remote or virtual
systems.

Tested by creating a Ubuntu 14.04 VM from ISO image and playing around
with it. I cannot seem to get keyboard input to the VM. Mouse works
though.
2014-07-12 14:49:43 +02:00
Luca Bruno 88d9224f6d caribou 3.12: fix at_spi2_core argument 2014-07-12 11:20:21 +02:00
Luca Bruno 6aa0a5d9d3 libvte: fix .la file to include the libpath for ncurses
Without this patch, the .la file only added -lncurses without
specifying the nix store path, forcing the propagation
of ncurses as build input.

Also enable parallel building and add myself to the maintainers.
2014-07-10 23:13:54 +02:00
Luca Bruno da9b510996 Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset 2014-07-10 11:39:16 +02:00
Vladimír Čunát 5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Luca Bruno eedda21104 file-roller: fix icons 2014-07-09 22:12:06 +02:00
Vladimír Čunát 7be0fc2e51 xfce4-xkb-plugin: maintenance update 2014-07-07 19:03:48 +02:00
Luca Bruno 1b7d5ff469 empathy: fix icons 2014-07-06 11:31:09 +02:00
Luca Bruno 1c1747be0d Add gnome shell extensions plugin for browsers 2014-07-05 21:16:31 +02:00
Luca Bruno 55dc58d7d0 evolution-data-server: wrap all libexec executables 2014-07-05 19:52:39 +02:00
Luca Bruno 9ec0a105d3 gnome-shell: enable parallel building 2014-07-05 19:52:38 +02:00
Luca Bruno 5dc9730a63 gnome-music 3.12: add totem-pl-parser to dependencies 2014-07-05 13:52:29 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Vladimír Čunát 6a77d5fd3e Merge #3054: add kde 4.13.2 2014-06-30 21:26:49 +02:00
Wout Mertens 8e7fded9c9 vte: store patch in repo, source offline 2014-06-30 16:10:50 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
John Wiegley 4304487003 libcroco: weaken platform requirement for building on darwin 2014-06-25 11:14:35 -07:00
Bjørn Forsman 76672dd9e3 accountsservice: be consistent in naming (always two 's')
The package is (correctly) named 'accountsservice' (with two 's'), but
the attribute and expression path lacked one 's'. Fix it.
2014-06-22 21:32:16 +02:00
Wout Mertens f34e801dd1 kde: Make kde4_next desktop compile 2014-06-22 19:35:31 +02:00
Peter Simons ca9f7f47ec libgnome: add libogg some more 2014-06-20 18:51:32 +02:00
Peter Simons 9c1a803019 libgnome: fix build by adding missing libogg 2014-06-20 18:40:14 +02:00
Wout Mertens 8dcf70f918 kde: Some tweaks to kde-manifest.sh
- Allow packages with different versions than $release (kde-workspace)
- Extra checks
2014-06-19 19:50:38 +02:00
Wout Mertens 8fe3bd5aa4 kde: Copy 4.12 to 4.13 as a base 2014-06-19 15:27:00 +02:00
Vladimír Čunát 8aa892489e xfce4-appfinder: update 4.9.4 -> 4.10.1 2014-06-17 09:02:38 +02:00
Vladimír Čunát 5c72dac548 libxfce4util: minor update 4.10.0 -> 4.10.1 2014-06-17 09:02:38 +02:00
Vladimír Čunát 2027dcc4f9 xfce4-power-manager: update to 1.3.0, supporting upower-0.99 2014-06-17 09:02:38 +02:00
Kosyrev Serge c022486b5f e17.terminology: 0.4.0 -> 0.5.1 2014-06-15 09:26:01 +04:00
Bjørn Forsman 9e46a0d748 gvfs: add more supported protocols in gnome 3.10. Closes #2880
This change has been successfully tested on gnome 3.12 (thanks
@lethalman!). Now bring it to gnome 3.10, which currently is the default
gnome3 version in NixOS.

I've build and run tested it (success: smb:// protocol now work in
Nautilus).
2014-06-11 23:10:40 +02:00
Luca Bruno 9265a61453 gvfs: add more supported protocols in gnome 3.12. Closes #2880 2014-06-10 12:25:31 +02:00
Luca Bruno 4a2936e74d nautilus-sendto: add to gnome 3.10 2014-05-29 12:38:50 +02:00
Luca Bruno a7d6947343 gnome-terminal 3.12: enable nautilus extension 2014-05-28 18:16:54 +02:00
Luca Bruno a013d00448 nautilus-sendto: new package
Integrates Evolution and Pidgin into the Nautilus file manager
2014-05-28 17:27:48 +02:00
Luca Bruno bf6ddc6285 nautilus 3.12: find extensions 2014-05-28 17:27:48 +02:00
Rob Vermaas 625b8f310f Merge pull request #2748 from ttuegel/ark
ark: wrap for zipinfo
2014-05-28 08:41:29 +02:00
Luca Bruno 6b21186742 gnome 3.12: make remote desktop sharing work 2014-05-26 17:18:04 +02:00
Thomas Tuegel 71522f1ec2 ark: wrap for zipinfo 2014-05-25 15:25:34 -05:00
Luca Bruno 3514ad8b98 geary: new package
Mail client for GNOME 3

https://wiki.gnome.org/Apps/Geary
2014-05-23 15:24:32 +02:00
Luca Bruno 48e969d776 Fix gnome3 evaluation due to missing glib_networking 2014-05-22 11:17:00 +02:00
Luca Bruno 7a1e2d5a39 evolution 3.12: fix wrapping binaries 2014-05-21 13:40:35 +02:00
Luca Bruno cecd439827 epiphany 3.12: fix wrapping binaries 2014-05-21 13:40:35 +02:00
Luca Bruno 7d0d2e3166 gnome-documents 3.12: fix wrapping binaries 2014-05-21 13:40:35 +02:00
Luca Bruno 09ab3bb6f7 gnome-photos 3.12: fix wrapping binaries 2014-05-21 13:40:35 +02:00
Luca Bruno 6e13cc82df Override glib_networking with gnome 3.12 scope 2014-05-21 13:40:35 +02:00
Luca Bruno 90eb94d7e8 Override gvfs with gnome 3.12 scope 2014-05-21 13:40:35 +02:00
Luca Bruno 265351051e Override networkmanager GUI packages with gnome 3.12 scope 2014-05-21 13:40:34 +02:00
Luca Bruno fdd56d5504 seahorse: add 3.12.2 version 2014-05-20 18:11:31 +02:00
Luca Bruno 7985c6036d gcr: enable vala bindings 2014-05-20 18:11:31 +02:00
Luca Bruno b8de31aa4b gnome-clocks: add 3.12.0 version 2014-05-20 17:15:18 +02:00
Luca Bruno eb8ab149ac gedit: add 3.12.1 version 2014-05-20 17:14:38 +02:00
Luca Bruno b3f1412374 file-roller: add 3.12.2 version 2014-05-20 17:14:00 +02:00
Luca Bruno 84cafa5c5d Fix infinite recursion in gnome3.gnome3... 2014-05-20 16:02:54 +02:00
Luca Bruno 23ccdd979a gnome-terminal: disable migration from gconf to gsettings 2014-05-20 13:41:41 +02:00
Luca Bruno 6a62b890b3 gnome-photos: add 3.12.1 version 2014-05-20 13:41:40 +02:00
Luca Bruno c334a85073 gfbgraph: 0.2 -> 0.2.2 2014-05-20 13:41:40 +02:00
Luca Bruno bf280dbbed gnome 3.12: compile clutter-gtk and clutter-gst with clutter 1.18 2014-05-20 13:41:40 +02:00
Luca Bruno 6c0e43d249 Add clutter 1.18 2014-05-20 13:41:40 +02:00
Luca Bruno 9032bcd1dc gnome-documents: add 3.12.1 version 2014-05-20 13:41:40 +02:00
Luca Bruno c4ccc4afbc bijiben: add 3.12.2 version 2014-05-20 13:41:40 +02:00
Luca Bruno 8204625598 evolution: add 3.12.2 version 2014-05-20 13:41:40 +02:00
Luca Bruno 3b39718eba Add cogl 1.18 2014-05-20 13:41:40 +02:00
Luca Bruno df95a8cc2f upower: add 0.99 version for gnome 3.12 2014-05-20 13:41:39 +02:00
Luca Bruno 819b5841c6 gnome-music: add 3.12.2 version 2014-05-20 13:41:39 +02:00
Luca Bruno 5de85d27ab vte: 0.35.90 -> 0.36.2 2014-05-20 13:41:39 +02:00
Luca Bruno 02934df3ee libzapojit: use gnome mirror 2014-05-20 13:41:39 +02:00
Luca Bruno 5637f0fbcd gnome-keyring: add 3.12.2 version 2014-05-20 13:41:39 +02:00
Luca Bruno 28bc9ddfb0 zenity: add 3.12.1 version 2014-05-20 13:41:39 +02:00
Luca Bruno 18bfa30a30 sushi: add 3.12.0 version 2014-05-20 13:41:39 +02:00
Luca Bruno 824a88d6d8 dconf: add 0.20.0 version 2014-05-20 13:41:38 +02:00
Luca Bruno c2d4a3ffc1 nautilus: add 3.12.2 version and add tracker support 2014-05-20 13:41:38 +02:00
Luca Bruno 3de0ba8a3e vino: add 3.12.0 version 2014-05-20 13:41:38 +02:00
Luca Bruno 2246827de1 at-spi2-atk: add 2.12.1 version 2014-05-20 13:41:38 +02:00
Luca Bruno e2879bdc63 epiphany: add 3.12.1 version and cleanup expr 2014-05-20 13:41:38 +02:00
Luca Bruno d38e915e22 yelp-xsl: add 3.12.0 version 2014-05-20 13:41:38 +02:00
Luca Bruno 9157babb2e yelp-tools: add 3.12.1 version 2014-05-20 13:41:38 +02:00
Luca Bruno a343b9e380 gjs: add 1.40.1 version 2014-05-20 13:41:38 +02:00
Luca Bruno d29c41e692 geocode-glib: add 3.12.2 version 2014-05-20 13:41:38 +02:00