Commit graph

7 commits

Author SHA1 Message Date
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Mathijs Kwik 82131d5013 clucene_core: switch to versioning scheme to make overriding easier 2013-12-23 15:48:35 +01:00
Vladimír Čunát 3c472d53aa sword: fix build with gcc47 via a patch from Gentoo 2013-03-17 12:37:39 +01:00
Piotr Pietraszkiewicz 1824f424b2 Made sword build again by tuning the configureFlags:
- to ignore warnings about unused variables
- not to build the tests (the warnings in tests looked serious at first
  glance)
Additionally disabled debug because I hit no problems at runtime so far

svn path=/nixpkgs/trunk/; revision=33243
2012-03-18 22:51:17 +00:00
Piotr Pietraszkiewicz 1916578852 made sword build against current curl (v7.22.0) by removing deprecated includes
svn path=/nixpkgs/trunk/; revision=30248
2011-11-05 22:12:18 +00:00
Piotr Pietraszkiewicz 28ab7935b7 made myself a maintainer of sword
svn path=/nixpkgs/trunk/; revision=29257
2011-09-13 20:50:39 +00:00
Piotr Pietraszkiewicz f540277f97 added the sword framework
svn path=/nixpkgs/trunk/; revision=24586
2010-11-03 20:36:36 +00:00