Peter Simons
c9192f5ed5
Merge pull request #624 from errge/template-default
...
Add template-default
2013-06-15 03:36:42 -07:00
Peter Simons
4399352078
Merge pull request #625 from errge/vector
...
Add vectorThUnbox
2013-06-15 03:34:13 -07:00
Mathijs Kwik
4d19da7e99
gtk-2: remove unneeded argument
2013-06-14 13:49:35 +02:00
Eelco Dolstra
672ae93687
jquery-ui: Update to 1.10.3
...
Also add a symlink jquery.js (jquery.min.js is gone).
2013-06-14 13:38:37 +02:00
Gergely Risko
fab2610bcf
Add vectorThUnbox
2013-06-14 13:09:11 +02:00
Gergely Risko
4d49435cf6
Add template-default
2013-06-14 13:04:40 +02:00
Gergely Risko
89f28c9923
Add hit and (it's dependency,) bytedump
2013-06-14 11:57:24 +02:00
Gergely Risko
efb46727cb
Add haskell/xtest
2013-06-14 11:35:52 +02:00
Michael Raskin
7093dd2c70
Some fixes
2013-06-14 07:46:33 +04:00
Michael Raskin
1a41887398
Fix a missing option declaration after merge
2013-06-14 00:11:34 +04:00
Michael Raskin
605c5a55a8
Merge branch 'x-updates-failed-merge-2013-06-13' into x-updates
2013-06-14 00:10:35 +04:00
Vladimír Čunát
94d8de2b99
dbus: fix build on non-Linux platforms
...
We do not want systemd there.
This should fix the tarball job systemd assertion problems.
2013-06-13 21:02:00 +02:00
Vladimír Čunát
84bf7818a4
dbus: minor update, fixing DOS CVE-2013-2168
...
I tried building some X apps, all seems fine.
2013-06-13 20:57:41 +02:00
Vladimír Čunát
fa6caedfea
qt48: hopefully a version that works for all possibilities
...
All builds were OK on my 8-thread testing machine, but it's probably too
little parallelism to show these problems.
2013-06-13 19:18:34 +02:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin
c7536d2fa6
Merge pull request #617 from lovek323/vim_configurable
...
Get vim_configurable compiling on darwin
2013-06-13 05:41:12 -07:00
Vladimír Čunát
34f152e0d3
qt48: hopefully a good fix for parallel builds, finally
...
It caused rare failures, mainly for Qt for creator build.
2013-06-13 13:02:23 +02:00
Eelco Dolstra
edff23e591
apr: Split into multiple outputs
...
This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
2013-06-13 11:32:55 +02:00
Peter Simons
21e1ec9079
haskell-hakyll: update to version 4.3.0.0
2013-06-13 10:43:40 +02:00
Peter Simons
01c57234db
haskell-concurrent-extra: update to version 0.7.0.6
2013-06-13 10:43:40 +02:00
Jason "Don" O'Conal
8232b0eef1
pango: add correct cairo include path
2013-06-13 18:11:36 +10:00
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
Jason "Don" O'Conal
150a6a7063
Rename ruby gpgme gem to ruby-gpgme
2013-06-13 14:14:44 +10: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
Gergely Risko
c51077b222
Add hflags
2013-06-12 21:25:53 +02:00
Eelco Dolstra
2cfeca153c
openssl, cups: Fix stripping libraries
2013-06-12 16:10:54 +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
Eelco Dolstra
d8231a66eb
glibc: Split into multiple outputs
...
This reduces the size of closures a lot by getting rid of Glibc's
header files, static libraries and utilities. For instance, the
closure of GNU Hello went from 41 MiB to 22 MiB.
TODO: We may want to merge back in parts of Glibc that we previously
split off (such as the info files).
2013-06-11 18:47:17 +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
baba3cbb0a
Remove tabs
2013-06-11 15:50:21 +02:00
Eelco Dolstra
afebababac
pcre: Split into multiple outputs
2013-06-11 15:28:30 +02:00
Eelco Dolstra
2c9fa33521
openssl: Split header files from the libraries
2013-06-11 14:28:49 +02:00
Michael Raskin
1a45886454
Merge branch 'master' into x-updates
2013-06-11 15:46:10 +04:00
Eelco Dolstra
cb3fc2c902
libjpeg, jasper: Split into multiple outputs
2013-06-11 13:45:35 +02: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
Eelco Dolstra
a5fb18473e
openssl: Fix removal of the ssl/misc scripts
...
This drops the dependency of $out on Perl.
2013-06-11 12:39:32 +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