alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
27205 commits 217 branches 121 tags 4.5 GiB
Commit graph

11007 commits

Author SHA1 Message Date
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
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