Commit graph

7771 commits

Author SHA1 Message Date
Michael Raskin 81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Mathijs Kwik 1f4c079bc3 Re-propagate libdrm 2013-06-15 17:15:07 +04:00
Peter Simons 9ce5dec479 cosmetic 2013-06-15 13:40:59 +02:00
Peter Simons 5a1e9a9cf2 haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4 2013-06-15 13:18:51 +02:00
Peter Simons 0ec9ca98a9 haskell-shake: update to version 0.10.5 2013-06-15 12:39:16 +02:00
Peter Simons 67fc03f1e4 haskell-accelerate: update to version 0.13.0.5 2013-06-15 12:39:16 +02:00
Peter Simons 41b4c3da48 haskell-accelerate-io: update to version 0.13.0.2 2013-06-15 12:39:16 +02:00
Peter Simons ad8413ac0b haskell-accelerate-cuda: update to version 0.13.0.3 2013-06-15 12:39:16 +02:00
Peter Simons 0f25c404bc haskell-hashable: add version 1.2.0.10 2013-06-15 12:39:15 +02:00
Peter Simons c0d78bf9a6 Merge pull request #621 from errge/xtest
Add haskell/xtest
2013-06-15 03:37:39 -07:00
Peter Simons c7ee3ca11c Merge pull request #622 from errge/hit
Add hit and (it's dependency,) bytedump
2013-06-15 03:37:12 -07:00
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
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
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
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
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 03a65dbb11 haskell-ghc-vis: update to version 0.7.1 2013-06-10 11:26:50 +02:00
Peter Simons d829182009 haskell-entropy: update to version 0.2.2.1 2013-06-10 11:26:50 +02:00
Peter Simons 977aaa93f9 haskell-contravariant: update to version 0.4.1 2013-06-10 11:26:50 +02:00
Peter Simons 6a7672d511 haskell-accelerate: update to version 0.13.0.4 2013-06-10 11:26:50 +02:00
Vladimír Čunát f06f6955bd qt4: fix build via adding dependency in generated makefile
Also reorder attributes into the order in which they are run.
2013-06-10 09:35:35 +02:00
Vladimír Čunát ce50fe26cb libgsf: maintenance update, use gdk_pixbuf now 2013-06-10 09:35:35 +02:00
Mathijs Kwik 02b539ef47 add hsshellscript 2013-06-10 08:36:05 +02:00
Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Peter Simons cc6dc84603 Merge pull request #604 from iyzsong/renpy
Add Ren'Py visual novel engine
2013-06-09 02:10:21 -07:00
Peter Simons 49f1160f6d haskell-yesod: update to version 1.2.1 2013-06-09 10:47:15 +02:00
Peter Simons e09f13c188 haskell-yesod-routes: update to version 1.2.0.1 2013-06-09 10:47:15 +02:00
Peter Simons f702007252 haskell-yesod-platform: update to version 1.2.1 2013-06-09 10:47:15 +02:00
Peter Simons 1467b3bb07 haskell-yesod-persistent: update to version 1.2.1 2013-06-09 10:47:14 +02:00
Peter Simons b033cdc96e haskell-yesod-core: update to version 1.2.2 2013-06-09 10:47:14 +02:00
Peter Simons 57fbccae65 haskell-postgresql-simple: update to version 0.3.3.1 2013-06-09 10:47:14 +02:00
Peter Simons ed3ef0959c haskell-pipes-concurrency: update to version 1.2.0 2013-06-09 10:47:14 +02:00
Peter Simons bf46a57a84 haskell-monadcryptorandom: update to version 0.5.2 2013-06-09 10:47:14 +02:00
Peter Simons 827541c00b haskell-fingertree: update to version 0.1.0.0 2013-06-09 10:47:14 +02:00
Peter Simons 2535b7e5e1 haskell-classy-prelude: update to version 0.5.8 2013-06-09 10:47:14 +02:00
Peter Simons 221648a586 haskell-accelerate: update to version 0.13.0.2 2013-06-09 10:47:14 +02:00
Peter Simons 5aeffdbab3 haskell-accelerate-cuda: update to version 0.13.0.2 2013-06-09 10:47:14 +02:00
Evgeny Egorochkin dc54358ce9 Change package versions to conform to nixpkgs conventions. 2013-06-09 05:41:44 +03:00
Song Wenwu e094ccc10c glew: install libraries to $out/lib instead of $out/lib64 2013-06-09 08:33:34 +08:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Vladimír Čunát 8c4a613f3a Merge pull request #599 from jcumming/gphoto2.130607
(lib)gphoto2: update to 2.5.2
2013-06-08 08:20:28 -07:00
Michael Raskin a3187cbba2 Update libgphoto2 - fix gphotofs 2013-06-08 16:51:43 +04:00
Peter Simons c9208b9a23 haskell-bmp: update to version 1.2.5.2 2013-06-07 23:25:28 +02:00
Jack Cummings b0cef0b6b8 gphoto2-2.5.2 and libgphoto2-2.5.2 2013-06-07 10:58:39 -07:00
Domen Kozar d4a2a56f3e gnutls: use lzma version of tarball 2013-06-07 13:39:49 +02:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Eelco Dolstra 4bd57f56a1 nspr: Update to 4.10 2013-06-06 13:04:26 +02:00
Peter Simons 243a51b82d heimdal: cosmetic to make syntax highlightig happy 2013-06-06 10:48:58 +02:00
Peter Simons c65a3e198c heimdal: remove obsolete 1.3.x version 2013-06-06 10:48:58 +02:00
Christophe Raffalli 55a8c050db Added heimdal 1.5.2, keeping version 1.3.3 2013-06-06 10:48:58 +02:00
Mathijs Kwik 0bcd97bb0b popplerQt4: force linking to poppler_glib
to fix:
ldd /nix/store/...poppler-qt4-0.22.3/lib/libpoppler-qt4.so
libpoppler.so.36 => not found
2013-06-06 09:13:44 +02:00
Mathijs Kwik 7717bc1573 vaapi-intel: fix compilation 2013-06-06 09:13:43 +02:00
Mathijs Kwik c78ba70c2f mesa: propagate libraries
- fixes libreoffice -
2013-06-05 22:57:18 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Peter Simons 6cacb34fec haskell-bmp: jailbreak version 1.2.5.1 to support binary 0.7.x 2013-06-05 12:17:36 +02:00
Peter Simons 9d8dbacd99 haskell-mongoDB: update to version 1.4.0 2013-06-05 12:17:36 +02:00
Peter Simons 690cefa2b7 haskell-lifted-base: update to version 0.2.1.0 2013-06-05 12:17:36 +02:00
Peter Simons 9b79169e46 haskell-hledger: update to version 0.21.2 2013-06-05 12:17:36 +02:00
Peter Simons fb11741df6 haskell-hledger-web: update to version 0.21.2 2013-06-05 12:17:36 +02:00
Peter Simons 98d0b364be haskell-hledger-lib: update to version 0.21.2 2013-06-05 12:17:36 +02:00
Peter Simons 773fc7e9be haskell-file-embed: update to version 0.0.4.8 2013-06-05 12:17:36 +02:00
Peter Simons 0dfe09b6c9 haskell-bmp: update to version 1.2.5.1
GHC versions prior to 7.6.x cannot compile this version, so override the 'bmp'
attribute for those compilers to version 1.2.2.1 in haskell-defaults.nix.
2013-06-05 12:17:35 +02:00
Mathijs Kwik 3e0a25508c add haskell/language-java 2013-06-05 12:17:35 +02:00
Mathijs Kwik bf310f322e add haskell/libffi 2013-06-05 12:17:35 +02:00
Vladimír Čunát 0bed8c15e3 poppler: downgrade to stable, drop deps that aren't really needed 2013-06-05 09:44:11 +02:00
Vladimír Čunát 341aadaba1 kdenlive+mlt: enabling some subcomponents, parallel builds 2013-06-05 00:30:44 +02:00
Peter Simons 9d4aec76f8 Merge pull request #589 from ocharles/pipes
Add various libraries for the Haskell "pipes" ecosystem
2013-06-04 05:09:08 -07:00
Oliver Charles a4d69deca4 haskell-pipes: Add pipes-concurrency, pipes-parse and pipes-safe 2013-06-04 10:57:21 +01:00
Oliver Charles cdba8df4d5 haskell-pipes: Add pipes 3.3.0 2013-06-04 10:52:25 +01:00
Evgeny Egorochkin 13b3fa8d36 libotr3: bump to 3.2.1 2013-06-04 12:40:05 +03:00
Peter Simons 1ed5202c2c Agda: cosmetic change 2013-06-03 22:09:34 +02:00
Lluís Batlle i Rossell 3e070f105d gnutls: updating the url.
It was outdated (from times when gnutls was at gnupg repository)
2013-06-03 16:19:26 +02:00
Lluís Batlle i Rossell f004ddc7cf crypto++: adding shared object target
We only built the static library, before.
2013-06-03 14:54:14 +02:00
Lluís Batlle i Rossell 8e023d1751 gnutls: downgrading to the latest in 3.1 series
A test was failing on i686 (not on x86_64):
http://hydra.nixos.org/build/5222124/nixlog/1/tail-reload
2013-06-03 14:54:13 +02:00
Peter Simons 7b40df9c95 haskell-tls-extra: update to version 0.6.4 2013-06-03 14:12:58 +02:00
Lluís Batlle i Rossell 5324db88ec gnutls: update to 3.2.1
Required also: nettle: update to 2.7.1

I tested that wget works.
2013-06-03 12:19:02 +02:00
Peter Simons 7250514410 haskell-hledger: update to version 0.21 2013-06-02 21:31:09 +02:00
Peter Simons 7cdd298eb2 haskell-hledger-web: update to version 0.21 2013-06-02 21:31:09 +02:00
Peter Simons 71f3c07548 haskell-hledger-lib: update to version 0.21 2013-06-02 21:31:08 +02:00
Vladimír Čunát 777799eba6 libjpeg(_turbo): update, enable tests 2013-06-01 23:38:40 +02:00
Vladimír Čunát 2e36aee508 cairo: expression refactoring, build OpenGL support by default
Mesa is now only a small dependency.
2013-06-01 23:38:29 +02:00
Vladimír Čunát 14f36162d2 llvm: switch back to cmake build, so now clang builds 2013-06-01 23:36:38 +02:00
Peter Simons 081ca56cc9 haskell-yesod-platform: add version 1.2.0.1 2013-06-01 14:53:44 +02:00
Peter Simons 2bc98d2b39 haskell-stm-conduit: update to version 2.1.0 2013-06-01 14:53:44 +02:00
Peter Simons def6e9d78e haskell-stm-chans: update to version 3.0.0 2013-06-01 14:53:44 +02:00
Peter Simons bc17e069f9 haskell-shakespeare-i18n: update to version 1.0.0.3 2013-06-01 14:53:44 +02:00
Peter Simons 4a09850b0f haskell-repa: update to version 3.2.3.3 2013-06-01 14:53:44 +02:00
Peter Simons fe231c5562 haskell-repa-examples: update to version 3.2.3.2 2013-06-01 14:53:44 +02:00
bbenoist 0c6e22adba qt: make docs, demos and examples optionnaly available
As the only option before was to don't include them at all.
2013-06-01 12:51:41 +02:00
Lluís Batlle i Rossell ce88984ecc New URLs for coin3d 2013-05-31 10:25:35 +02:00
Lluís Batlle i Rossell 9b9bd3d055 libf2c: fixing hash.
The changes:

diff -r lold/arithchk.c l/arithchk.c
218a219,221
>               if (sizeof(long long) > sizeof(long)
>                && sizeof(long long) == sizeof(void*))
>                       fprintf(f, "#define LONG_LONG_POINTERS\n");
diff -r lold/README l/README
41c41
< message to netlib@netlib.bell-labs.com
---
> message to netlib@netlib.org
2013-05-31 10:25:35 +02:00
Lluís Batlle i Rossell b810381cce Ouch. I rolled back the default opencascade by error. 2013-05-30 19:26:15 +02:00
Lluís Batlle i Rossell 270f861dde Setting opencascade 6.5 to freecad for it to build. 2013-05-30 19:25:01 +02:00
Lluís Batlle i Rossell 6c4c1c4fb6 Updating opencascade to 6.6.0 2013-05-30 15:13:53 +02:00
Peter Simons 7b48b3acf6 haskell-wx-core: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:35:18 +02:00
Peter Simons 3eab69da50 haskell-distributed-process: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:44 +02:00
Peter Simons 41f9d7d83c benchpress: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:44 +02:00
Peter Simons 93eb171838 Hipmunk: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:44 +02:00
Peter Simons c009bddb19 haskell-language-c-quote: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:44 +02:00
Peter Simons ff1dbd50b8 haskell-HFuse: fix capitalization of directory name 2013-05-30 12:33:43 +02:00
Peter Simons d9c5a29897 haskell-gloss: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:43 +02:00
Peter Simons d7c578285a haskell-wx-direct: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:43 +02:00
Peter Simons 709718a307 haskell-happstack-util: drop obsolete package 2013-05-30 12:33:43 +02:00
Peter Simons 79fe788106 haskell-symbol: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:43 +02:00
Peter Simons 0d6f43f2c8 haskell-digestive-functors: jailbreak to fix the build 2013-05-30 12:33:43 +02:00
Peter Simons f902fe1f68 haskell-monad-par: drop obsolete version 0.3.4.1 2013-05-30 12:33:43 +02:00
Peter Simons 982c74a555 haskell-yesod: update to version 1.2.0.1 2013-05-30 12:33:43 +02:00
Peter Simons f60f7b0ac8 haskell-yesod-test: update to version 1.2.0 2013-05-30 12:33:43 +02:00
Peter Simons b39fb32d6e haskell-yesod-static: update to version 1.2.0 2013-05-30 12:33:43 +02:00
Peter Simons 0f2e38e54a haskell-yesod-routes: update to version 1.2.0 2013-05-30 12:33:43 +02:00
Peter Simons 4aa35f4d29 haskell-yesod-persistent: update to version 1.2.0 2013-05-30 12:33:43 +02:00
Peter Simons 830630d011 haskell-yesod-json: update to version 1.2.0 2013-05-30 12:33:42 +02:00
Peter Simons 2ba8e44f48 haskell-yesod-form: update to version 1.3.0 2013-05-30 12:33:42 +02:00
Peter Simons 6dbbd1822b haskell-yesod-default: update to version 1.2.0 2013-05-30 12:33:42 +02:00
Peter Simons c4260c58bd haskell-yesod-core: update to version 1.2.1 2013-05-30 12:33:42 +02:00
Peter Simons 9739c77391 haskell-yesod-auth: update to version 1.2.0.1 2013-05-30 12:33:42 +02:00
Peter Simons 496c7cfa62 haskell-xdot: update to version 0.2.3.1 2013-05-30 12:33:42 +02:00
Peter Simons 7c46aed8d9 haskell-warp: update to version 1.3.8.2 2013-05-30 12:33:42 +02:00
Peter Simons 5aa1b5294f haskell-wai: update to version 1.4.0.1 2013-05-30 12:33:42 +02:00
Peter Simons f12cadb586 haskell-wai-logger: update to version 0.3.1 2013-05-30 12:33:42 +02:00
Peter Simons bdd7ce87c2 haskell-wai-extra: update to version 1.3.4.2 2013-05-30 12:33:42 +02:00
Peter Simons 43c6a39ca3 haskell-tls-extra: update to version 0.6.3 2013-05-30 12:33:42 +02:00
Peter Simons 80093a4d8d haskell-stm-conduit: update to version 2.0.0 2013-05-30 12:33:42 +02:00
Peter Simons 4ca19f846b haskell-statistics: update to version 0.10.4.1 2013-05-30 12:33:42 +02:00
Peter Simons 0853a81825 haskell-postgresql-simple: update to version 0.3.3.0 2013-05-30 12:33:42 +02:00
Peter Simons c3aa81cd0e haskell-persistent: update to version 1.2.0.1 2013-05-30 12:33:42 +02:00
Peter Simons dc7f1b2df1 haskell-persistent-template: update to version 1.2.0.1 2013-05-30 12:33:41 +02:00
Peter Simons 2bd5a628dc haskell-persistent-sqlite: update to version 1.2.0 2013-05-30 12:33:41 +02:00
Peter Simons e539c38a21 haskell-persistent-postgresql: update to version 1.2.0 2013-05-30 12:33:41 +02:00
Peter Simons fc02ddca52 haskell-parseargs: update to version 0.1.3.5 2013-05-30 12:33:41 +02:00
Peter Simons a5d42ef934 haskell-network-protocol-xmpp: update to version 0.4.5 2013-05-30 12:33:41 +02:00
Peter Simons bc8e70f879 haskell-multiarg: update to version 0.16.0.0 2013-05-30 12:33:41 +02:00
Peter Simons b6b5bc2799 haskell-liblastfm: update to version 0.2.0.0 2013-05-30 12:33:41 +02:00
Peter Simons 0ed2c83e5a haskell-http-conduit: update to version 1.9.4 2013-05-30 12:33:41 +02:00
Peter Simons d7be6a93b8 haskell-hs-bibutils: update to version 5.0 2013-05-30 12:33:41 +02:00
Peter Simons bd9c8128ad haskell-gloss: update to version 1.7.8.3 2013-05-30 12:33:41 +02:00
Peter Simons 13a7b3f969 haskell-ghc-mod: update to version 2.0.3 2013-05-30 12:33:41 +02:00
Peter Simons 8c3232f925 haskell-digestive-functors: update to version 0.6.1.0 2013-05-30 12:33:41 +02:00
Peter Simons f51d2220ca haskell-digestive-functors-heist: update to version 0.7.0.0 2013-05-30 12:33:41 +02:00
Peter Simons 1309b1d8b4 haskell-crypto-pubkey: update to version 0.1.4 2013-05-30 12:33:41 +02:00
Peter Simons 172b463f5a haskell-crypto-pubkey-types: update to version 0.4.0 2013-05-30 12:33:41 +02:00
Peter Simons 836b002fd8 haskell-criterion: update to version 0.8.0.0 2013-05-30 12:33:41 +02:00
Peter Simons ac1f88bef2 haskell-conduit: update to version 1.0.6 2013-05-30 12:33:40 +02:00
Peter Simons 0b433e463b haskell-certificate: update to version 1.3.8 2013-05-30 12:33:40 +02:00
Peter Simons de182afeae haskell-asn1-types: update to version 0.2.0 2013-05-30 12:33:40 +02:00
Peter Simons 03b50b3335 haskell-monad-par: add version 0.3.4.2 2013-05-30 12:33:40 +02:00
Vladimír Čunát 4a4c9c239e poppler: minor update
Includes some thread safety fixes.
2013-05-29 23:29:57 +02:00
Vladimír Čunát 25471803e4 Merge master into x-updates 2013-05-29 23:25:26 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell 8442c7d122 libgphoto2: adding a 2.4 version, for kde 4.7 and 4.8. 2013-05-29 21:50:02 +02:00
Lluís Batlle i Rossell f54c4c99e3 tcpdmup/libpcap udpate 2013-05-29 19:23:40 +02:00
Peter Simons b1781a1876 Merge pull request #571 from vcunat/p/hs
haskell: add pop3-client and smtp-mail (by cabal2nix)
2013-05-29 02:16:20 -07:00
Shea Levy 9e01205659 Set library path properly for v8 on darwin 2013-05-28 18:38:22 -04:00
Shea Levy 2794d74506 Fix http_parser build on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Shea Levy c982e84df4 gyp: Fix on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Shea Levy fe009bcbc4 cyrus-sasl: Fix build on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Domen Kozar 637fa11b20 add pdf2htmlex and upgrade poppler 2013-05-29 00:02:26 +02:00
Vladimír Čunát 43d4e53cd2 haskell: add pop3-client and smtp-mail (by cabal2nix) 2013-05-28 11:08:43 +02:00
Shea Levy b385fea5fc Merge branch 'node-update'
This branch updates node to 0.10.8, as well as updating its
dependencies. It also updates node-packages to use the new style
generated by npm2nix (some packages may have been lost in the switch,
please check!).

Note that 0.10 had some backwards-compatability breaks with 0.8,
particularly for readable streams. Please see the official documentation
for migration help.

Note that I have not yet tested this on darwin (node.js was already
broken there), but will do so soon and fix it if it's broken.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-27 23:00:24 -04:00
Lluís Batlle i Rossell 42701dece8 Adding gnunet-svn and libgcrypt-git.
gnunet-svn can't interoperate with gnunet.
2013-05-27 23:35:34 +02:00
Lluís Batlle i Rossell 7d9acc0866 libgcrypt: update to 1.5.2. Newer is better. 2013-05-27 23:35:34 +02:00
Lluís Batlle i Rossell 296d11a0fb Updating libgpg-error (required for libgcrypt-git) 2013-05-27 23:35:34 +02:00
Vladimír Čunát d73c8ed79d Revert "Merge pull request #555 from errge/master"
This reverts commit 8f7cfc0c73, reversing
changes made to cc85ad4b1c.

The merge changed stdenv (a bit surprisingly, see #555 for details).
2013-05-27 18:29:53 +02:00
Domen Kožar 8f7cfc0c73 Merge pull request #555 from errge/master
Add ncursesw compatibility link also for includes
2013-05-27 06:51:49 -07:00
Vladimír Čunát ce456ab779 Merge pull request #556 from jcumming/x-updates.130523
update Intel Graphics Stack Release
2013-05-27 02:33:48 -07:00