Commit Graph
43498 Commits
Author SHA1 Message Date
Jason "Don" O'Conal dc0c630e54 gtk2: fix compilation on darwin
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
2013-06-13 18:10:53 +10:00
Vladimír Čunát e931f3b935 libgcrypt: attempt to fix i686-freebsd builds, #616
It would probably be better to get newer "as" from somewhere, but I
don't see how.
2013-06-13 10:00:04 +02:00
Jason "Don" O'Conal 930b88c2a9 cairo: add correct include path for pixman.h 2013-06-13 16:47:29 +10:00
Jason "Don" O'Conal d884c2b639 gdk-pixbuf: add libintlOrEmpty to build inputs 2013-06-13 16:36:47 +10:00
Peter Simons 71439b3e96 Merge pull request #610 from lovek323/sup
Add sup expression
2013-06-12 23:33:19 -07:00
Jason "Don" O'Conal 7e52e251e8 atk: add libintlOrEmpty as build input 2013-06-13 16:30:27 +10:00
Peter Simons 128166a1f0 Merge pull request #613 from errge/hflags
Add hflags
2013-06-12 23:30:04 -07:00
Peter Simons 740c2bdf47 Merge pull request #615 from lovek323/ghostscript
ghostscript: add libiconvOrEmpty to build inputs
2013-06-12 23:28:44 -07:00
Jason "Don" O'Conal b31db11a69 ghostscript: add libiconvOrEmpty to build inputs 2013-06-13 15:52:55 +10:00
Jason "Don" O'Conal 6f50a9d4f0 sup: use libiconvOrEmpty instead of plain old libiconv 2013-06-13 14:21:20 +10:00
Jason "Don" O'Conal b62aa175a2 gnupg: use libiconvOrEmpty instead of libiconv (not required for glibc platforms) 2013-06-13 14:17:27 +10:00
Jason "Don" O'Conal 150a6a7063 Rename ruby gpgme gem to ruby-gpgme 2013-06-13 14:14:44 +10:00
aszlig 3bf1210635 zabbix-server: Swap order of database population.
Starting with Zabbix 2.0 the order of data imports is important[*] and will lead
to errors if not done in the right order. Zabbix 1.8 works fine with the swapped
order as well, so this change shouldn't affect any pre-2.0 users.

[*] https://www.zabbix.com/documentation/2.0/manual/appendix/install/db_scripts

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-13 03:34:29 +02:00
aszlig 62d5282602 zabbix-server: Make it easier to use peer auth.
Quoting from the manual about DBHost:

```
In case of MySQL localhost or empty string results in using a socket. In case of
PostgreSQL only empty string results in attempt to use socket.
```
https://www.zabbix.com/documentation/2.0/manual/appendix/config/zabbix_server

With this commit we should avoid some race conditions in systemd, because if the
host is set to "", there is no condition that postgresql has to be started prior
to the Zabbix server.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-13 03:34:28 +02:00
Jason "Don" O'Conal a5e65e66b1 sup: separate dependencies
create separate expressions for gems requiring native extensions to be
built:

* gpgme
* ncursesw_sup
* xapian_full_alaveteli
2013-06-13 10:45:51 +10:00
Jason "Don" O'Conal ee00c7aa4e Add gpgme build input for sup 2013-06-13 10:45:42 +10:00
Jason "Don" O'Conal 593228f18d Compile libusb with gccApple on darwin 2013-06-13 10:42:38 +10:00
Jason "Don" O'Conal 4fe22e28cb Add sup expression 2013-06-13 10:42:30 +10:00
aszlig a5c6a36466 apache-httpd/zabbix: Set max_input_time.
At least the Zabbix 2.x web installer requires max_input_time to be set to 300
seconds. As it doesn't hurt to set it for the 1.x versions, I'm including it
here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-13 02:31:35 +02:00
aszlig 8990470951 apache-httpd/zabbix: Allow custom configFile.
If option is left by its default value, behaviour is the same as before, using
the configuration file created by the web interface.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-13 02:28:23 +02:00
aszlig bf28d5c109 zabbix-server: Add PID file to systemd config.
This is to avoid (in some cases) constant restarting of the Zabbix server, which
causes odds bugs and crashes in the exit handler (if it's too early during
startup).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-13 01:56:09 +02:00
Lluís Batlle i Rossell 4970ec637e Adding psmouse-alps, a touchpad kernel driver.
Some laptops use these new touchpads, and this driver is
supposed to provide proper support for them.
2013-06-12 22:55:58 +02:00
Lluís Batlle i Rossell ce9f40f5a7 gnunet-svn: updating to latest 2013-06-12 22:55:58 +02:00
Lluís Batlle i Rossell f2256276af irssi_otr: update to latest master 2013-06-12 22:55:57 +02:00
Gergely Risko c51077b222 Add hflags 2013-06-12 21:25:53 +02:00
Eelco Dolstra 6dbb6f78bb subversion: Update to 1.7.10
CVE-2013-1968, CVE-2013-2088, CVE-2013-2112.
2013-06-12 15:56:40 +02:00
Eelco Dolstra 7cf23a740d Update the default binary cache URL to cache.nixos.org 2013-06-12 14:23:33 +02:00
Lluís Batlle i Rossell ceea8a18fc weechat: update to 0.4.1 2013-06-12 14:19:00 +02:00
Alexander Foremny bb53645b0f Add Elm and elm-server 2013-06-12 13:27:22 +02:00
Song Wenwu 92ba0a0913 gtk+: enable NLS support (merge #611)
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
2013-06-12 10:18:38 +02:00
Peter Simons acc6039e2c haskell-iteratee: jailbreak to fix build with recent versions of ListLike 2013-06-12 08:45:34 +02:00
Peter Simons 70b10b6267 haskell-snap-core: update to version 0.9.4.0 2013-06-12 08:45:34 +02:00
Peter Simons 0e169b92ec haskell-persistent: update to version 1.2.0.2 2013-06-12 08:45:34 +02:00
Peter Simons a7c884eb18 haskell-acid-state: update to version 0.10.0 2013-06-12 08:45:34 +02:00
Peter Simons fd1291e985 haskell-ListLike: update to version 4.0.0 2013-06-12 08:45:34 +02:00
Peter Simons 97f45745bd haskell-Agda: update to version 2.3.2.1 2013-06-12 08:45:33 +02:00
Domen Kozar 808cadd390 tesseract: simplify 2013-06-12 00:50:52 +02:00
Domen Kozar 1b64fc9360 tesseract: upgrade to 3.02.02 and add some languages 2013-06-11 19:22:30 +02:00
Vladimír Čunát 6b433019fa libvpx: update
Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
2013-06-11 18:03:48 +02:00
Eelco Dolstra 4b0d6a0759 nscd: Restart if /etc/hosts changes 2013-06-11 16:15:24 +02:00
Vladimír Čunát f724a5314b flac: update, enable tests
Fix includes in VLC.
Tried a few other programs using it, seems fine.
2013-06-11 15:48:42 +02:00
Sander van der Burg 6fff888ae8 nijs: bump to 0.0.8 2013-06-11 15:09:10 +02:00
Mathijs Kwik c1bec6fb5b firefox-21: use more system libraries
Conflicts:
	pkgs/applications/networking/browsers/firefox/21.0.nix
2013-06-11 14:05:15 +02:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin 55249de924 Update Julia to today's revision 2013-06-11 15:44:56 +04:00
Peter Simons 1db5bd4aa9 haskell-hsdns: update to version 1.6.1 2013-06-11 13:14:28 +02:00
Peter Simons a2680cdc48 groff: explicitly disable X11 support in configure to avoid impure builds
Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
2013-06-11 12:14:49 +02:00
Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates.
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
Eelco Dolstra b3f04718cf Use stable Nix by default 2013-06-11 12:10:58 +02:00
Eelco Dolstra eaf98cf26e nixUnstable: Update to 1.5.3pre3134_5c06e52 2013-06-11 12:08:37 +02:00