Commit graph

7534 commits

Author SHA1 Message Date
Eelco Dolstra a5fb18473e openssl: Fix removal of the ssl/misc scripts
This drops the dependency of $out on Perl.
2013-06-11 12:39:32 +02:00
Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02: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
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
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
Vladimír Čunát 341aadaba1 kdenlive+mlt: enabling some subcomponents, parallel builds 2013-06-05 00:30:44 +02:00
Peter Simons 9d4aec76f8 Merge pull request #589 from ocharles/pipes
Add various libraries for the Haskell "pipes" ecosystem
2013-06-04 05:09:08 -07:00
Oliver Charles a4d69deca4 haskell-pipes: Add pipes-concurrency, pipes-parse and pipes-safe 2013-06-04 10:57:21 +01:00
Oliver Charles cdba8df4d5 haskell-pipes: Add pipes 3.3.0 2013-06-04 10:52:25 +01:00
Evgeny Egorochkin 13b3fa8d36 libotr3: bump to 3.2.1 2013-06-04 12:40:05 +03:00
Peter Simons 1ed5202c2c Agda: cosmetic change 2013-06-03 22:09:34 +02:00
Lluís Batlle i Rossell 3e070f105d gnutls: updating the url.
It was outdated (from times when gnutls was at gnupg repository)
2013-06-03 16:19:26 +02:00
Lluís Batlle i Rossell f004ddc7cf crypto++: adding shared object target
We only built the static library, before.
2013-06-03 14:54:14 +02:00
Lluís Batlle i Rossell 8e023d1751 gnutls: downgrading to the latest in 3.1 series
A test was failing on i686 (not on x86_64):
http://hydra.nixos.org/build/5222124/nixlog/1/tail-reload
2013-06-03 14:54:13 +02:00
Peter Simons 7b40df9c95 haskell-tls-extra: update to version 0.6.4 2013-06-03 14:12:58 +02:00
Lluís Batlle i Rossell 5324db88ec gnutls: update to 3.2.1
Required also: nettle: update to 2.7.1

I tested that wget works.
2013-06-03 12:19:02 +02:00
Peter Simons 7250514410 haskell-hledger: update to version 0.21 2013-06-02 21:31:09 +02:00
Peter Simons 7cdd298eb2 haskell-hledger-web: update to version 0.21 2013-06-02 21:31:09 +02:00
Peter Simons 71f3c07548 haskell-hledger-lib: update to version 0.21 2013-06-02 21:31:08 +02:00
Peter Simons 081ca56cc9 haskell-yesod-platform: add version 1.2.0.1 2013-06-01 14:53:44 +02:00
Peter Simons 2bc98d2b39 haskell-stm-conduit: update to version 2.1.0 2013-06-01 14:53:44 +02:00
Peter Simons def6e9d78e haskell-stm-chans: update to version 3.0.0 2013-06-01 14:53:44 +02:00
Peter Simons bc17e069f9 haskell-shakespeare-i18n: update to version 1.0.0.3 2013-06-01 14:53:44 +02:00
Peter Simons 4a09850b0f haskell-repa: update to version 3.2.3.3 2013-06-01 14:53:44 +02:00
Peter Simons fe231c5562 haskell-repa-examples: update to version 3.2.3.2 2013-06-01 14:53:44 +02:00
bbenoist 0c6e22adba qt: make docs, demos and examples optionnaly available
As the only option before was to don't include them at all.
2013-06-01 12:51:41 +02:00
Lluís Batlle i Rossell ce88984ecc New URLs for coin3d 2013-05-31 10:25:35 +02:00
Lluís Batlle i Rossell 9b9bd3d055 libf2c: fixing hash.
The changes:

diff -r lold/arithchk.c l/arithchk.c
218a219,221
>               if (sizeof(long long) > sizeof(long)
>                && sizeof(long long) == sizeof(void*))
>                       fprintf(f, "#define LONG_LONG_POINTERS\n");
diff -r lold/README l/README
41c41
< message to netlib@netlib.bell-labs.com
---
> message to netlib@netlib.org
2013-05-31 10:25:35 +02:00
Lluís Batlle i Rossell b810381cce Ouch. I rolled back the default opencascade by error. 2013-05-30 19:26:15 +02:00
Lluís Batlle i Rossell 270f861dde Setting opencascade 6.5 to freecad for it to build. 2013-05-30 19:25:01 +02:00
Lluís Batlle i Rossell 6c4c1c4fb6 Updating opencascade to 6.6.0 2013-05-30 15:13:53 +02:00
Peter Simons 7b48b3acf6 haskell-wx-core: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:35:18 +02:00
Peter Simons 3eab69da50 haskell-distributed-process: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:44 +02:00
Peter Simons 41f9d7d83c benchpress: jailbreak to fix build with Haskell Platform 2013.2.0.0 2013-05-30 12:33:44 +02:00