ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity
27,933 Commits 96 Branches 102 Tags 4.5 GiB
aeef361b0d
Commit Graph

11318 Commits

Author SHA1 Message Date
Jason "Don" O'Conal
2a21046f24 otool & setFile: only allow on darwin 2013-07-04 19:01:47 +10:00
Jason "Don" O'Conal
c2901da1b8 setFile: add expression 2013-07-04 08:50:37 +10:00
Jason "Don" O'Conal
3babc55ae2 wxGTK29: fix build on darwin 
* use clang to compile
* add configure flags to enable building for 64-bit
* add setFile to build inputs
 2013-07-04 08:50:15 +10:00
Jason "Don" O'Conal
67e5eb909b llvm: fix build on darwin 
* add DYLD_LIBRARY_PATH
* don't build with shared libs
 2013-07-04 08:48:55 +10:00
Peter Simons
9e98650f8d boost: generalize the header-only expression 
The 'header-only-wrapper' expression can now wrap any version of boost
that's passed to it as an argument.
 2013-07-03 21:38:34 +02:00
Peter Simons
ea04555518 boost-headers: update to version 1.54.0 2013-07-03 21:26:31 +02:00
Peter Simons
cb31653acb boost: add version 1.54.0 2013-07-03 18:55:51 +02:00
Peter Simons
b3a3f0f521 haskell-yaml: update to version 0.8.3 2013-07-03 18:48:11 +02:00
Peter Simons
d31b934ad2 haskell-shelly: update to version 1.3.0.2 2013-07-03 18:48:11 +02:00
Peter Simons
4d8327877c haskell-shakespeare-css: update to version 1.0.6.1 2013-07-03 18:48:11 +02:00
Peter Simons
d36c915686 haskell-oeis: update to version 0.3.3 2013-07-03 18:48:11 +02:00
Jason "Don" O'Conal
3e14bb6fdf gst-plugins-base: fix build on darwin 
* remove alsaLib and cdparanoia from build inputs
* add cairo to build inputs
 2013-07-04 00:25:53 +10:00
Jason "Don" O'Conal
216d47be0c gobject-introspection: fix build on darwin 
* add otool expression (add otool to build inputs)
* add libintlOrEmpty to build inputs
 2013-07-03 22:03:48 +10:00
Jason "Don" O'Conal
84f5d870f3 glib: remove unnecessary restrictions on darwin 2013-07-03 22:03:47 +10:00
Jason "Don" O'Conal
3b54af72b1 cracklib: fix build on darwin 
* add libintlOrEmpty to build inputs
 2013-07-03 22:03:47 +10:00
Jason "Don" O'Conal
bdf5a5c20e liboil: fix build on darwin 
* force --build=x86_64
 2013-07-03 19:57:38 +10:00
Rok Garbas
e84ba407f9 plone: adding collective_recipe_filestorage package 2013-07-03 04:44:01 +02:00
Rok Garbas
7816aa4ada plone: adding collective_recipe_template package 2013-07-03 04:26:27 +02:00
Rok Garbas
52dd19be1b plone: plone_recipe_varnish updated to 1.3dev to support varnish >= 3 2013-07-03 02:47:14 +02:00
Rok Garbas
79ec396f6f plone: z3c.form downgraded to 3.0 2013-07-03 02:32:01 +02:00
Rok Garbas
c590a5b4c3 plone: updating 4.3.0 to 4.3.1, minor renaming of nix files 2013-07-03 00:21:22 +02:00
Rickard Nilsson
070ddf8367 New package: Twitter Bootstrap 2.3.2, a front-end framework for web development. 2013-07-01 16:14:52 +02:00
Rickard Nilsson
00df29c471 New package: lessc, version 1.4.0 
Compiles LESS to CSS
 2013-07-01 15:39:39 +02:00
Rickard Nilsson
cb534f1baa New package: Google Closure compiler version 20130603. 
A JavaScript optimizing compiler.
 2013-07-01 14:52:57 +02:00
Peter Simons
8e95d2564d haskell-time: bring back version 1.1.2.4 to un-break Haskell Platform 2009.2.0.2 2013-07-01 12:16:38 +02:00
Peter Simons
d9a71f35c8 haskell-oeis: the test suite depends on network access 2013-07-01 12:11:06 +02:00
Peter Simons
8bb29fb94a haskell-http-attoparsec: add version 0.1.0 2013-07-01 12:11:05 +02:00
Peter Simons
2ece8f76f5 haskell-warp-tls: add version 1.4.1.3 2013-07-01 12:11:05 +02:00
Peter Simons
b8a44d7289 haskell-byteable: add version 0.1.1 2013-07-01 12:11:05 +02:00
Peter Simons
df12e039e3 haskell-keter: update to version 0.4.0 2013-07-01 12:11:05 +02:00
Peter Simons
6b58b32ad8 haskell-hlint: update to version 1.8.47 2013-07-01 12:11:05 +02:00
Peter Simons
66a0b56567 haskell-zeromq3-haskell: update to version 0.4 2013-07-01 12:11:05 +02:00
Peter Simons
028dd8b25e haskell-yesod: update to version 1.2.1.1 2013-07-01 12:11:05 +02:00
Peter Simons
9e6de5d8c7 haskell-yesod-form: update to version 1.3.0.1 2013-07-01 12:11:05 +02:00
Peter Simons
928af0cb55 haskell-yesod-core: update to version 1.2.3 2013-07-01 12:11:05 +02:00
Peter Simons
4c3f84b572 haskell-yesod-bin: update to version 1.2.1 2013-07-01 12:11:05 +02:00
Peter Simons
aa4d6ca07d haskell-xss-sanitize: update to version 0.3.4 2013-07-01 12:11:05 +02:00
Peter Simons
3c5de343a2 haskell-warp: update to version 1.3.9 2013-07-01 12:11:05 +02:00
Peter Simons
e0470dcdff haskell-wai-test: update to version 1.3.1.1 2013-07-01 12:11:05 +02:00
Peter Simons
66e80948bb haskell-void: update to version 0.6.1 2013-07-01 12:11:05 +02:00
Peter Simons
435eab8d23 haskell-unix-time: update to version 0.1.9 2013-07-01 12:11:04 +02:00
Peter Simons
edc1b8d14a haskell-threadmanager: update to version 0.1.6 2013-07-01 12:11:04 +02:00
Peter Simons
2af75c20c7 haskell-tagged: update to version 0.6.1 2013-07-01 12:11:04 +02:00
Peter Simons
643455fcea haskell-smallcheck: update to version 1.0.4 2013-07-01 12:11:04 +02:00
Peter Simons
b7e4259ac5 haskell-shelly: update to version 1.3.0.1 2013-07-01 12:11:04 +02:00
Peter Simons
ec8723e71a haskell-shake: update to version 0.10.6 2013-07-01 12:11:04 +02:00
Peter Simons
7a5c803932 haskell-semigroupoids: update to version 3.0.3 2013-07-01 12:11:04 +02:00
Peter Simons
d71ce2786d haskell-profunctor-extras: update to version 3.3.1 2013-07-01 12:11:04 +02:00
Peter Simons
15a1283937 haskell-persistent: update to version 1.2.1 2013-07-01 12:11:04 +02:00
Peter Simons
f35d36ed00 haskell-persistent-sqlite: update to version 1.2.1 2013-07-01 12:11:04 +02:00
Peter Simons
be17d7d06c haskell-persistent-postgresql: update to version 1.2.1 2013-07-01 12:11:04 +02:00
Peter Simons
88034ca819 haskell-oeis: update to version 0.3.2 2013-07-01 12:11:03 +02:00
Peter Simons
42c3918056 haskell-mime-mail: update to version 0.4.2 2013-07-01 12:11:03 +02:00
Peter Simons
265e043cff haskell-io-choice: update to version 0.0.5 2013-07-01 12:11:03 +02:00
Peter Simons
469ec818b7 haskell-http-reverse-proxy: update to version 0.2.0 2013-07-01 12:11:03 +02:00
Peter Simons
585ee36fb9 haskell-http-conduit: update to version 1.9.4.1 2013-07-01 12:11:03 +02:00
Peter Simons
e3f3271812 haskell-hspec: update to version 1.6.1 2013-07-01 12:11:03 +02:00
Peter Simons
e6535b526a haskell-hspec-meta: update to version 1.6.1 2013-07-01 12:11:03 +02:00
Peter Simons
f3ee0ca904 haskell-hledger: update to version 0.21.3 2013-07-01 12:11:03 +02:00
Peter Simons
54fb831ad7 haskell-hledger-lib: update to version 0.21.3 2013-07-01 12:11:03 +02:00
Peter Simons
2838565f9a haskell-highlighting-kate: update to version 0.5.4 2013-07-01 12:11:03 +02:00
Peter Simons
717a181d0d haskell-gloss: update to version 1.7.8.4 2013-07-01 12:11:02 +02:00
Peter Simons
3b29e271dd haskell-file-embed: update to version 0.0.4.9 2013-07-01 12:11:02 +02:00
Peter Simons
932df79a85 haskell-errors: update to version 1.4.2 2013-07-01 12:11:02 +02:00
Peter Simons
de20da33c3 haskell-either: update to version 3.4.1 2013-07-01 12:11:02 +02:00
Peter Simons
4b40122b69 haskell-dimensional: update to version 0.12 2013-07-01 12:11:02 +02:00
Peter Simons
2c33e25eed haskell-cryptohash: update to version 0.9.1 2013-07-01 12:11:02 +02:00
Peter Simons
3af166f42b haskell-constraints: update to version 0.3.3 2013-07-01 12:11:02 +02:00
Peter Simons
2cb552f2dc haskell-conduit: update to version 1.0.7 2013-07-01 12:11:02 +02:00
Peter Simons
3e5b4ccd9a haskell-comonads-fd: update to version 3.0.2 2013-07-01 12:11:02 +02:00
Peter Simons
d83f8248c3 haskell-comonad: update to version 3.0.3 2013-07-01 12:11:02 +02:00
Peter Simons
126dd12da2 haskell-comonad-transformers: update to version 3.0.3 2013-07-01 12:11:01 +02:00
Peter Simons
6e07719f4c haskell-cmdargs: update to version 0.10.4 2013-07-01 12:11:01 +02:00
Peter Simons
ee53871062 haskell-authenticate-oauth: update to version 1.4.0.7 2013-07-01 12:11:01 +02:00
Peter Simons
cf0fba67dc haskell-acid-state: update to version 0.11.3 2013-07-01 12:11:01 +02:00
Peter Simons
b0b9f1fd5c haskell-time: update to version 1.4.1 2013-07-01 12:11:01 +02:00
Gergely Risko
64cbe2d6ee Update hflags to 0.2 2013-07-01 11:40:38 +02:00
Mathijs Kwik
04cbaef102 keep lcms versioning in all-packages.nix 2013-07-01 07:52:13 +02:00
Michael Raskin
6d42b3b1dc srtp: fix URL 2013-06-30 12:09:42 +04:00
Jason "Don" O'Conal
1ebaebbd93 php-xdebug: update to latest version 2013-06-30 02:51:20 +02:00
Lluís Batlle i Rossell
169c8ce3f7 Linphone 3.6.1 
Lots of updates and new/old libs to get the latest linphone

It segfaults on running.
 2013-06-29 16:59:08 +02:00
Domen Kožar
26e9afaa28 Merge pull request #658 from aristidb/master 
Pulseaudio 4.0 (and sbc 1.1)
 2013-06-29 07:57:18 -07:00
Lluís Batlle i Rossell
7c74edc9bc sipwitch: update to 1.6.1 to fix build 2013-06-29 15:30:05 +02:00
Lluís Batlle i Rossell
748a0f607b Updating siproxd to 0.8.1, and libosip. 2013-06-29 15:14:02 +02:00
Bjørn Forsman
b02b7bd162 sqlite: set meta.platforms so that Hydra will build it 
I'm sure that sqlite works on more platforms than linux, but I cannot
verify that myself (I only have linux). So I'll leave it up to the users
of other platforms to expand this as needed.
 2013-06-29 13:36:08 +02:00
Domen Kožar
f33ebf88b9 Merge pull request #650 from lovek323/php53 
php53: fix on darwin
 2013-06-29 03:53:26 -07:00
Vladimír Čunát
9404b2cc12 qt3: fix infinite recursion created by 0b17251c06 2013-06-28 08:33:43 +02:00
Karn Kallio
b394ffc3ad racket: fix build broken by new libpng version and advance version to 5.3.5 2013-06-28 07:29:51 +02:00
Mathijs Kwik
f7b3032da7 ffmpeg-1.x: passthrough vdpauSupport 2013-06-27 21:35:22 +02:00
Mathijs Kwik
e78b013fe3 libpng: merge apng expression (keep patch disabled by default) 
I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
 2013-06-27 21:35:21 +02:00
Mathijs Kwik
0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik
7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Eelco Dolstra
989c58eb29 Process /etc/fonts/conf.d before upstream fonts/conf.d 
Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
 2013-06-27 13:31:35 +02:00
Lluís Batlle i Rossell
5ff3d84137 Adding sflphone. 
Merge branch 'sflphone'
 2013-06-27 00:10:13 +02:00
Lluís Batlle i Rossell
d3e7649eee Update ucommon to 6.0.5. 
The hope that newer means better.
 2013-06-26 23:47:34 +02:00
Lluís Batlle i Rossell
c77f6a0c2f As libccrtp propagates ucommon, it's not needed in libzrtpcpp. 2013-06-26 23:47:09 +02:00
Lluís Batlle i Rossell
3d8cd48c58 Making ccrtp propagate its build time requirement, ucommon. 2013-06-26 23:46:47 +02:00
Moritz Ulrich
978fa98933 avrdude: Add libusb to enable USB support 2013-06-25 22:19:31 +02:00
Evgeny Egorochkin
9dc3599960 Merge pull request #676 from errge/master 
Add regex-tdfa-text
 2013-06-25 05:17:34 -07:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Gergely Risko
9b2a657f42 Add regex-tdfa-text 2013-06-25 13:01:41 +02:00
Rickard Nilsson
0dbb2fdcfe sbt: Remove duplicate package 2013-06-25 12:32:28 +02:00
Rickard Nilsson
8496b31e34 sbt: Use recommended java options 2013-06-25 12:31:44 +02:00
Evgeny Egorochkin
0889bbe88f Patch binutils to produce more deterministic output 2013-06-25 11:15:45 +03:00
aszlig
5228e569e8
gpgme: Update to latest upstream version 1.4.1. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-24 10:33:16 +02:00
Bjørn Forsman
860161dcb7 remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6 
This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
 2013-06-22 21:09:43 +02:00
Aristid Breitkreuz
ad06d4df18 update pulseaudio to 4.0 and sbc to 1.1 2013-06-22 17:25:47 +02:00
Peter Simons
933f77f10d Merge pull request #662 from rnons/yesod-bin 
yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin.
 2013-06-22 05:09:35 -07:00
Evgeny Egorochkin
09e6ae577b Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by 
building argparse, compiling from cli, compiling using py_compile.
 2013-06-22 09:45:01 +03:00
Domen Kozar
dbe9bf7e59 networkmanagerapplet: 0.9.8.0 -> 0.9.8.2 
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
 2013-06-21 19:59:20 +02:00
Evgeny Egorochkin
76fbbb73c6 Make most of Ruby Gem builds repeatable 2013-06-21 18:22:07 +03:00
rnons
f84119331c yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin. 2013-06-21 22:55:37 +08:00
aszlig
f974573a5e
iksemel: Add new package with version 1.4. 
This library is used by Zabbix in order to send XMPP alerts/notifications.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:55 +02:00
aszlig
1709571b3f
ninja: Update to v1.3.4 and drop unzip dependency. 
Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).

The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:55 +02:00
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