mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-06 23:31:34 +00:00
Code Issues Wiki Activity
27417 commits 186 branches 125 tags 8 GiB
Commit graph

7672 commits

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