Archive/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-22 11:54:30 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
28351 commits 221 branches 122 tags 7.5 GiB
Commit graph

7947 commits

Author SHA1 Message Date
Jason \"Don\" O'Conal f3c863b8e3 libsoup: fix build on darwin 
* add libintlOrEmpty to build inputs
* add -lintl to LDFLAGS
 2013-07-12 16:26:46 +02:00
Jason \"Don\" O'Conal dcc4ffdb7f libsndfile: fix build on darwin 
* build with gccApple
* add Carbon headers to include path
 2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal 3a1a7b2d6a libsamplerate: fix build on darwin 
* build with gccApple
* add Carbon include path
 2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal c449a67e01 libmikmod: fix build on darwin 
* build with gccApple
 2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal 970346e2d1 libmad: fix build on darwin 
* stop building with an i486 architecture

Conflicts:
	pkgs/development/libraries/libmad/default.nix
 2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal 7573056652 gtk++: fix build on darwin 
* add -lintl to CFLAGS
 2013-07-12 16:26:44 +02:00
Jason \"Don\" O'Conal 8c54b95273 glib: fix build on darwin 
* add libintlOrEmpty to build inputs
* add -lintl to CFLAGS
 2013-07-12 16:26:44 +02:00
Jason \"Don\" O'Conal 735555d86f ffmpeg: fix build on darwin 
* build with gccApple
* don't delete '*.a' files when building xvidcore
 2013-07-12 16:26:44 +02:00
Jason \"Don\" O'Conal 7ef50f5098 audiofile: fix build on darwin 
* disable alsaLib
* build with gccApple
 2013-07-12 16:26:43 +02:00
Evgeny Egorochkin 67b0d62aa9 attica: version bump to 0.4.2 2013-07-12 16:36:11 +03:00
Evgeny Egorochkin 5a562ccac8 Soprano: version bump to 2.9.3 2013-07-12 16:36:11 +03:00
Evgeny Egorochkin 4d29005771 Fix url 2013-07-12 02:52:20 +03:00
Peter Simons 2efe295e92 haskell-hledger-web: update to version 0.21.3 2013-07-11 01:31:48 +02:00
Peter Simons 6fde3cf455 haskell-xml-conduit: update to version 1.1.0.4 2013-07-10 10:29:23 +02:00
Peter Simons a77b49be65 haskell-shelly: update to version 1.3.0.6 2013-07-10 10:29:23 +02:00
Peter Simons 2ddb1bce74 haskell-postgresql-libpq: update to version 0.8.2.3 2013-07-10 10:29:23 +02:00
Peter Simons a7c66776cb haskell-persistent: update to version 1.2.2.0 2013-07-10 10:29:23 +02:00
Peter Simons eda01e3439 haskell-atomic-primops: update to version 0.2.2 2013-07-10 10:29:23 +02:00
Peter Simons cc121fb9fe haskell-abstract-deque: update to version 0.2.2 2013-07-10 10:29:23 +02:00
Gergely Risko b42f757d6b Build haddock for transformers-compat 2013-07-10 10:29:22 +02:00
Rickard Nilsson a49aeec10d openldap: Upgrade to 2.4.35 2013-07-10 08:49:54 +02:00
Mathijs Kwik 6e8a060bca spice: enable client 
this will split nicely once we merge multiple-outputs
 2013-07-09 07:22:45 +02:00
aszlig 1a9e99a8e4
Add new package minmay in version 1.0.0. 
This is a fork of the iksemel library, which is no longer maintained and is
highly broken in regards to TLS support (even in the release versions).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-08 14:27:43 +02:00
Peter Simons 56518d73b8 haskell-yesod-platform: update to version 1.2.2 2013-07-08 14:05:03 +02:00
Peter Simons 31d4df10dc haskell-yesod-auth: update to version 1.2.0.2 2013-07-08 14:05:03 +02:00
Peter Simons 5e867b6e80 haskell-threadmanager: update to version 0.1.7 2013-07-08 14:05:03 +02:00
Peter Simons 8976670d9d haskell-persistent: update to version 1.2.1.1 2013-07-08 14:05:02 +02:00
Peter Simons 62afa83e71 haskell-oeis: update to version 0.3.5 2013-07-08 14:05:02 +02:00
Peter Simons 68c14a66be haskell-network-conduit-tls: update to version 1.0.0.3 2013-07-08 14:05:02 +02:00
Peter Simons df2295fa5f haskell-hmatrix: update to version 0.15.0.0 2013-07-08 14:05:02 +02:00
Peter Simons 1d0fa21944 haskell-filesystem-conduit: update to version 1.0.0.1 2013-07-08 14:05:02 +02:00
Peter Simons ff42719fd7 haskell-data-binary-ieee754: update to version 0.4.4 2013-07-08 14:05:02 +02:00
Peter Simons 75e376120a haskell-conduit: update to version 1.0.7.1 2013-07-08 14:05:02 +02:00
Peter Simons 7b89bb2da4 haskell-attoparsec-conduit: update to version 1.0.1.1 2013-07-08 14:05:02 +02:00
Rok Garbas 5d3a07f57e Merge pull request #723 from lovek323/darwin-tools 
otool and setfile: cleanup
 2013-07-07 04:49:04 -07:00
Jason \"Don\" O'Conal ec9f54602e avahi: fix build on darwin 2013-07-07 13:44:06 +02:00
Jason \"Don\" O'Conal 0dd6c44183 portaudio: fix license (fix #728) 2013-07-07 13:16:00 +02:00
Jason "Don" O'Conal 525a6856f2 otool and setfile: cleanup 2013-07-07 18:58:29 +10:00
Lluís Batlle i Rossell be2dfd1b72 Updating libzrtpcpp to 2.3.4. 
I think it fixes the security threats exposed in:
http://blog.azimuthsecurity.com/2013/06/attacking-crypto-phones-weaknesses-in.html
 2013-07-06 14:34:15 +02:00
Rok Garbas 33d957b34b Merge branch 'libspotify' of git://github.com/lovek323/nixpkgs into lovek323-libspotify 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-07-06 13:51:31 +02:00
Jason \"Don\" O'Conal cd5f3dc1fa portaudio: fix build on darwin 
* remove alsaLib from build inputs
* add --build=x86_64 to configure flags
* add --without-oss to configure flags
* add --enable-static to configure flags
* add --enable-shared to configure flags
* add framework header files
* disable failed tests
* copy all headers on install
* build with gccApple
 2013-07-06 13:46:18 +02:00
Peter Simons 400d4a03b0 Update references to 'rLang' to the new name 'R'. 2013-07-04 23:41:22 +02:00
Jason \"Don\" O'Conal f5a130b6b3 newsbeuter: add expression 2013-07-04 19:17:07 +02:00
Eelco Dolstra e638620100 spice: Update to 0.12.3 2013-07-04 18:27:26 +02:00
Eelco Dolstra e3e35c1f15 spice-protocol: Update to 0.12.6 2013-07-04 18:27:26 +02:00
Vladimír Čunát 4a0952d2fa fix bad "licence" names 
Mostly what I merged from @lovek323.
Such errors can be easily checked by
  nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
 2013-07-04 18:16:34 +02:00
Peter Simons cfbae2de73 haskell-shelly: update to version 1.3.0.3 2013-07-04 17:56:12 +02:00
Peter Simons f0738b3c16 haskell-oeis: update to version 0.3.4 2013-07-04 17:56:12 +02:00
Peter Simons 3df0409cb6 liblapack: propagate the 'shared' flag to atlas 2013-07-04 13:42:47 +02:00
Jason \"Don\" O'Conal 9007e57f28 python27: compile with tkinterp on darwin 2013-07-04 13:11:25 +02:00
Jason \"Don\" O'Conal bd61c42d22 tk: fix build on darwin 2013-07-04 13:11:24 +02:00
Vladimír Čunát 01548459be Merge pull request #711 from lovek323/gnuplot 
gnuplot and others: fix build on darwin
 2013-07-04 02:17:35 -07:00
Jason "Don" O'Conal cf3364bdb6 libspotify: add darwin library 2013-07-04 19:12:26 +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
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
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 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
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
Vladimír Čunát 9404b2cc12 qt3: fix infinite recursion created by 0b17251c06 2013-06-28 08:33:43 +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
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
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
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
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
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
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
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
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