Vladimír Čunát
8a0931c5c3
pcre: minor update 8.32 -> 8.33
2013-06-30 09:00:11 +02:00
Vladimír Čunát
666c12f645
mpfr: only use 3.1.2 and drop 3.1.1
...
I tried some packages, all seem to compile fine.
2013-06-30 08:59:29 +02:00
Vladimír Čunát
11e380a937
gmp5: minor update 5.1.1 -> 5.1.2 and file rename
2013-06-30 08:59:29 +02:00
Vladimír Čunát
99b83b397f
attr: minor update 2.4.46 -> 2.4.47
2013-06-30 08:59:29 +02:00
Vladimír Čunát
4844171645
acl: minor update 2.2.51 -> 2.2.52
2013-06-30 08:59:29 +02:00
Vladimír Čunát
842420c3e1
Merge branch 'master' into stdenv-updates
...
Conflicts (relatively simple):
pkgs/development/interpreters/python/2.7/default.nix
pkgs/development/libraries/dbus/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02: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
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
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
ab7d7333be
dbus: attempt to fix build on FreeBSD and Darwin
...
Also build it there.
2013-06-18 17:52:09 +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
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
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
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
Peter Simons
12b29fadcb
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-17 10:14: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
Christophe Raffalli
c205449003
upgraded freeglut to 2.8.1 (menu are broken in 2.8.0)
2013-06-16 22:33:41 +02: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
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