cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
27786 commits 1 branch 0 tags 3.7 GiB
Commit graph

11254 commits

Author SHA1 Message Date
aszlig
e0ea957d64
php53: Don't use bundled version of libgd. 
This fixes a copy & paste error I made in 486e918, which resulted in PHP being
built with the bundled version of GD instead of the one we have in nixpkgs.

Thanks to @peti for noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:54 +02:00
Shea Levy
97b95d60d8 Chromedriver: update to 2.0 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-20 09:21:25 -04:00
Peter Simons
8c2b28b4a6 haskell-mongoDB: update to version 1.4.1 2013-06-20 12:37:54 +02:00
Peter Simons
b2b6c81d4c haskell-ghc-heap-view: update to version 0.5.1 2013-06-20 12:37:54 +02:00
Peter Simons
513d717d47 Merge pull request #654 from lovek323/sup 
sup: update to latest version
 2013-06-20 03:09:46 -07:00
Jason "Don" O'Conal
a7746e3585 php53: restore nix gd version 2013-06-20 19:58:00 +10:00
Jason "Don" O'Conal
6ae1241934 php53: add optional pcntl flag 2013-06-20 17:42:09 +10:00
Domen Kožar
a80642ccbf Merge pull request #656 from offlinehacker/amdappsdk_fix 
amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully
 2013-06-19 23:57:51 -07:00
Evgeny Egorochkin
7ddbfaed8e Merge pull request #652 from lovek323/guile 
guile: remove gcc_s dep, skip check on darwin
 2013-06-19 19:30:45 -07:00
Jaka Hudoklin
d16f175934 amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully 2013-06-20 02:22:18 +00:00
Jason "Don" O'Conal
cf2b5daa15 sup: update to latest version 2013-06-20 10:09:15 +10:00
Jason "Don" O'Conal
438034483a guile: remove gcc_s dep, skip check on darwin 2013-06-20 09:11:04 +10:00
Lluís Batlle i Rossell
5f28fb15af Note about the source of previous build fix in glext85 2013-06-19 17:38:38 +02:00
Lluís Batlle i Rossell
d4aa6099bd Fixing vaapi-vdpau build with newer mesa. 2013-06-19 17:33:44 +02:00
Peter Simons
962e2aede8 haskell-postgresql-simple: update to version 0.3.3.2 2013-06-19 10:42:43 +02:00
Peter Simons
c7097891e0 haskell-persistent-template: update to version 1.2.0.2 2013-06-19 10:42:43 +02:00
Peter Simons
f14d6839b1 haskell-hakyll: update to version 4.3.1.0 2013-06-19 10:42:43 +02:00
Peter Simons
5e5b04d00a haskell-JuicyPixels: update to version 3.1 2013-06-19 10:42:43 +02:00
Peter Simons
7154e32f65 Dropped obsolete Haskell packages primitive-0.4.1, vector-0.9.1, and vector-0.10. 2013-06-19 10:42:42 +02:00
Vladimír Čunát
4255b343e8 pango, gtk3: non-Linux attempts to fix 2013-06-19 09:00:06 +02:00
Evgeny Egorochkin
6b4eaf71fe Merge pull request #636 from craff/glsurf 
Glsurf (3D drawing of implicit surfaces and curves)
 2013-06-18 22:34:08 -07:00
Jason "Don" O'Conal
ed3a63b5d7 php53: fix on darwin 
* add libssh2 to build inputs (configure fails without this)
* link with stdc++
* add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this
  environment variable
* add libiconv to build inputs
* fix --with-iconv configure flag (was --with-iconv-dir which is not a valid
  flag)
 2013-06-19 14:15:55 +10:00
Christophe Raffalli
101aad1467 camlimages ... still wasn't ok. Now better. 2013-06-19 04:39:55 +02:00
Evgeny Egorochkin
f5f76e6446 ocamlPackages.deriving: fix version 2013-06-19 03:20:00 +03:00
Evgeny Egorochkin
ec349e58b7 Merge pull request #647 from ocharles/vector-0.9.1 
haskellPackages: vector-0.9.1 fix 'primitive' dependency
 2013-06-18 17:18:11 -07:00
Marc Weber
d25d1e4d24 ocaml adding deriving 2013-06-19 03:07:27 +03:00
Marc Weber
ccb2e9a832 Adding multiple versions of sbt. Probably you want to use the latest(default). 2013-06-19 02:45:40 +03:00
Oliver Charles
81b564b52e haskellPackages: vector-0.9.1 fix 'primitive' dependency 2013-06-19 00:28:30 +01:00
Vladimír Čunát
e366dc565a Fix the hash changes accidentally caused in 98436616 
Moreover I'm not sure It's legal to add *lists inside* buildInputs.
 2013-06-18 23:59:23 +02:00
Vladimír Čunát
1f81984293 non-Linux: more adjustments 
Also reordered stuff in all-packages.nix.
 2013-06-18 23:59:23 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Vladimír Čunát
3cba755596 qt48: minimize default dependencies on non-Linux 2013-06-18 22:03:35 +02:00
Sander van der Burg
98436616a5 Replaced ad-hoc gettext buildinput by libintlOrEmpty 2013-06-18 22:01:40 +02:00
Vladimír Čunát
92ecf99373 qt48, gstreamer: attempt to fix on non-Linux 2013-06-18 18:34:25 +02:00
Vladimír Čunát
3adf8e6429 vala, libusb1, deps of libjpeg: attempt to fix on non-Linux 2013-06-18 17:52:09 +02:00
Vladimír Čunát
ab7d7333be dbus: attempt to fix build on FreeBSD and Darwin 
Also build it there.
 2013-06-18 17:52:09 +02:00
Sander van der Burg
aeaaa0a7e7 libv8 still broken in chroots, but this scons patch script fixes it 2013-06-18 17:14:17 +02:00
Vladimír Čunát
a8f153267c qt48: security fix for CVE-2013-0254 
Taken from Gentoo.
 2013-06-18 13:57:15 +02:00
Sander van der Burg
1d4c7f50ec libv8 ruby gem has hardcoded reference to /usr/bin/env, so that it won't build in a chroot -> fix this 2013-06-18 13:05:43 +02:00
Vladimír Čunát
53fa11cfc9 poppler: attempt to fix missing libiconv on non-Linux 2013-06-18 12:53:19 +02:00
Sander van der Burg
23f43527e1 harfbuzz needs libintl on non glibc platforms 2013-06-18 10:36:28 +02:00
Jason \"Don\" O'Conal
85bfa943f7 glib: fix on darwin (merge #644) 
* include Foundation.h header
* add myself to maintainers
* build with gccApple

@vcunat: minor refactoring.
 2013-06-18 08:17:36 +02:00
Jason "Don" O'Conal
02eef5b0f4 ruby-1.9: disable tk when compiling on darwin 2013-06-18 13:59:00 +10:00
Vladimír Čunát
6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Vladimír Čunát
afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Vladimír Čunát
0b875c8706 Merge pull request #635 from lovek323/ruby 
ruby19: fix on darwin
 2013-06-17 10:39:06 -07:00
Jason \"Don\" O'Conal
8ce7550a9f cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
Lluís Batlle i Rossell
2c71506929 nlopt: build octave plugins 2013-06-17 12:47:45 +02:00
Vladimír Čunát
cba6d9b11a qt48: I give up, switching off parallel building 
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
 2013-06-17 10:06:23 +02:00
Peter Simons
41a0ef966b haskell-Chart: use the homepage URL specified in the cabal file 2013-06-17 09:57:37 +02:00
Gergely Risko
7a602e5f86 Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk 2013-06-17 09:53:28 +02:00
Jaka Hudoklin
a826c359c2 Add amdadl-sdk: amd display library sdk, usefull for ati gpu statistics 2013-06-16 21:39:54 +00:00
Jaka Hudoklin
4817f34f2b Add amdapp-sdk: accelerated parallel processing sdk with OpenCL support 2013-06-16 21:39:43 +00:00
Christophe Raffalli
ce2efd0b5b fixed dependencies of camlimages 2013-06-16 22:33:44 +02:00
Christophe Raffalli
c205449003 upgraded freeglut to 2.8.1 (menu are broken in 2.8.0) 2013-06-16 22:33:41 +02:00
Christophe Raffalli
27bf590d3c upgraded ocaml-mysql to 1.1.1 2013-06-16 22:33:38 +02:00
Christophe Raffalli
fc36c19834 Added OCaml gmp bindings mlgmp 2013-06-16 22:33:33 +02:00
Jason "Don" O'Conal
cfab5a8ecf ruby19: fix on darwin 
* seems to require readline even when cursesSupport is not enabled
 2013-06-16 21:39:09 +10:00
Vladimír Čunát
c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates 
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
 2013-06-16 10:13:51 +02:00
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
43822c1a36 haskell-cabal2nix: update to version 1.52 2013-06-15 13:40:59 +02: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
Peter Simons
fc165c0db9 Merge pull request #626 from lovek323/sup 
sup: add required gems and separate dependencies
 2013-06-15 03:26:10 -07:00
aszlig
486e918215
php: Fix support for JPEG and PNG over GD. 
Set an explicit path to the location of libjpeg for version 5.4 and an explicit
path to libjpeg _and_ libpng for version 5.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:35 +02: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
Jason "Don" O'Conal
d0d9470519 sup: add required gems and separate dependencies 2013-06-14 18:06:14 +10: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
ed51d54610 Merge pull request #606 from fignuts/master 
Add keepass password manager and update mono DLLMap.
 2013-06-13 05:42:53 -07:00
Michael Raskin
27bbff463f Merge pull request #601 from craff/ocaml/upgrade_and_new 
Ocaml/upgrade and new
 2013-06-13 05:41:59 -07: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
Sander van der Burg
e5c7533b6c titaniumsdk: Bump to version 3.1.1 2013-06-13 13:58:32 +02:00
Vladimír Čunát
84262c18e3 pygtk: propagate gtk (fixes solfege build) 2013-06-13 13:02:24 +02: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
Peter Simons
7b3ebfe8c5 haskell-haddock: add version 2.13.2.1 2013-06-13 10:43:35 +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
Evgeny Egorochkin
dbcfef8c41 Ruby 1.9: update and reenable parallel build, since there's a chance it was fixed. 2013-06-11 00:59:26 +03:00
Evgeny Egorochkin
24b1c74b7c Ruby 1.8: update 2013-06-11 00:10:34 +03:00
Evgeny Egorochkin
b93ac14bf6 Ruby 1.9 parallel build sometimes fails due to races. 2013-06-10 23:34:06 +03:00
Rok Garbas
fd5e631e7d Plone: fix for 4.1 2013-06-10 20:59:58 +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
Andrew Morsillo
e1bd332758 Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass). 2013-06-09 23:17:09 +02: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
504ae3f3a8 haskell-hlint: update to version 1.8.46 2013-06-09 10:47:15 +02: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
Song Wenwu
d4c6b5924d add Ren'Py 6.15.5 
Ren'Py is a visual novel engine that helps you use words,
images, and sounds to tell stories with the computer.
This is just the minimal launcher.
 2013-06-09 12:45:56 +08:00
Song Wenwu
2ff588bb5d pygame: update to 1.9.1 
Enable PNG and JPEG support
Use pygame-v4l patch from AUR
 2013-06-09 12:12:15 +08: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
Christophe Raffalli
356983074e Forgotten to add wanr.patch for omake. 2013-06-07 21:58:19 +02:00
Christophe Raffalli
270d929089 New ocaml packages: 
- ocaml-cairo
- camlimages
- dypgen
- patoline
 2013-06-07 21:40:38 +02:00
Christophe Raffalli
43faad8063 Upgraded ocamlnet to 3.6.3. Also enabled mot functionality of ocamlnet like nethttp 2013-06-07 21:40:38 +02:00
Christophe Raffalli
5765e186d2 upgraded ocaml/sqlite3 to 2.0.4 2013-06-07 21:40:37 +02:00
Christophe Raffalli
87e1089498 Upgraded omake to 0.9.8.6_rc1. kept the previous version as default because this is a rc1. 
This is necessary to compile the latest camlimages
 2013-06-07 21:40:37 +02:00
Christophe Raffalli
b3fa714f1f upgraded lablgtk to version 2.16 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli
59877bd1ad upgraded camlzip to version 1.05 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli
af7fd67e43 upgraded ocaml/cryptokit to 1.7 2013-06-07 21:40:37 +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
Michael Raskin
eb946b4795 Luarocks: new package 2013-06-07 14:05:13 +04:00
Michael Raskin
2baaaebf57 Luarocks: new package 2013-06-07 14:04:15 +04:00
Domen Kozar
4213b4aacb fix eval 2013-06-07 11:18:33 +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
Mathijs Kwik
b5ba5959cf fix node packages with binary (native) extensions 2013-06-06 22:38:24 +02:00
Evgeny Egorochkin
bc409a6e00 Merge pull request #593 from bjornfor/saleae-logic 
saleae-logic: new package
 2013-06-06 04:44:44 -07: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
35d3e38d54 add idris wrapper 2013-06-05 23:36:20 +02:00
Mathijs Kwik
3f9723e02e add idris wrapper 2013-06-05 23:30:38 +02:00
Mathijs Kwik
c78ba70c2f mesa: propagate libraries 
- fixes libreoffice -
 2013-06-05 22:57:18 +02:00
Peter Simons
f37e7a92cf gnulib: update to version v0.0-7952-g439b0e9 2013-06-05 22:16:24 +02:00
Bjørn Forsman
f425048875 saleae-logic: new package 
Add Saleae Logic - analyzer software for Saleae logic analyzators.

Also, add a small LD_PRELOAD library that is needed to make it work from
a read-only installation directory.
 2013-06-05 21:56:50 +02:00
Domen Kozar
1a1d8dfc69 Python: 2.7.4 -> 2.7.5 2013-06-05 21:07:46 +02:00
Zef Hemel
69cf3dede6 Bump to 0.10.10 2013-06-05 20:39:07 +02:00
Shea Levy
8247806090 buildNodePackage: Move dependency symlinks out of the top-level node_modules directory 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-05 12:25:41 -04: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
97935a981e haskell-cabal2nix: update to version 1.51 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
Peter Simons
f165b58b7b cabal2nix: add myself as a maintainer 2013-06-05 12:17:35 +02:00
Mathijs Kwik
187670c7da add haskell/idris 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
Eelco Dolstra
94dfd4bdf9 php: Get rid of unnecessary runtime dependencies like gettext 2013-06-04 14:57:37 +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
Michael Raskin
f0276491f9 ECL update 2013-06-04 11:30:32 +04:00
Michael Raskin
0cc921120a SBCL update 2013-06-04 11:30:26 +04:00
Michael Raskin
d82d86eb64 ECL update 2013-06-04 11:29:34 +04:00
Michael Raskin
40a250fc6f SBCL update 2013-06-04 11:10:06 +04:00
Mathijs Kwik
079ea60624 neoload: upgrade to 4.1.3 2013-06-04 07:50:59 +02:00
Evgeny Egorochkin
b41d8029c9 Merge pull request #581 from bbenoist/phpftp 
php-5.4: Reintroduce the ftpSupport build option
 2013-06-03 15:40:43 -07: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
Eelco Dolstra
f1c42a8331 Module::Pluggable: Update to 4.8 2013-06-02 23:33:27 +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
e8b8efa471 haskell-cabal2nix: update to version 1.50 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
22194538d7 qtcreator: Update to 2.7.1 and improvements (merge #579) 
- Qt is now directly overriden in QtCreator's definition.
- qt48Full can be used in a development environment to enable access to
docs demos and examples.

NOTE: It may be required to remove older configuration files located in
~/.config/QtProject and at ~/.config/Trolltech.conf to reconfigure
qtcreator with the correct paths. I have found /nix/store/... paths in the
following files:
$HOME/.config/QtProject/qtcreator/toolchains.xml
$HOME/.config/QtProject/qtcreator/qtversion.xml
$HOME/.config/QtProject/qtcreator/helpcollection.qhc

At the first launch, be sure to check your qtcreator's configuration by
selecting Tools->Options. The most important parts are the Kits and
QtVersion tabs located in the Build & Run section.
 2013-06-01 12:53:17 +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
bbenoist
23fb448242 php-5.4: Reintroduce the ftpSupport build option 
The ftpSupport build option I added on the 5.3 version of PHP was not
present in the version 5.4 because it was not yet merged when I wrote my
commit.
 2013-06-01 01:16:36 +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
Evgeny Egorochkin
7f6af6a43b Merge pull request #577 from wizeman/setuptools 
setuptools: Fix download link (the old one was returning 404)
 2013-05-31 00:37:12 -07:00
Ricardo M. Correia
96b01e999f setuptools: Fix download link (the old one was returning 404) 2013-05-31 01:09:44 +00: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
36aaa263d3 cabal2ghci: 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