Commit Graph

203 Commits

Author SHA1 Message Date
John Wiegley
bc08fa99f1 Fix flex for building on darwin systems 2014-04-15 05:04:27 -05:00
Peter Simons
f741be954c Offer consistently named attributes for the two available flex versions. 2014-04-11 10:06:18 +02:00
Aristid Breitkreuz
5d12cbf1c2 add back old version of flex for grub2 2014-04-09 20:42:08 +02:00
Peter Simons
44e8fe67d0 flex: update from 2.5.35 to 2.5.39 2014-04-09 12:41:10 +02:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Peter Simons
f0740ac2bc happy: add version 1.19.3 2014-01-20 18:28:02 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Eelco Dolstra
6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Peter Simons
ed3ca23cb1 happy-1.19.2: remove import of "Data.Monoid (<>)" from Setup.lhs to fix build with GHC 7.2.2
This patch works around <https://github.com/simonmar/happy/issues/16>.
2014-01-11 12:03:41 +01:00
Eelco Dolstra
dfc62c9084 bison: Don't run the tests
All this accomplishes is to make bison depend on flex, which in turn
depends on bison.  (So as a result, during the stdenv bootstrap, bison
gets built 6 (!) times.)
2014-01-07 14:25:42 +01:00
Eelco Dolstra
320498d529 flex: Clean up expression 2014-01-07 14:24:59 +01:00
Eelco Dolstra
b13b146150 jikespg: Cleanup 2014-01-03 11:56:41 +01:00
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
cf9cc60a8d bison: use gz tarball, early stdenv does not have xz 2013-12-23 10:25:17 +01:00
Nixpkgs Monitor
fe6522309e bison3: update from 3.0 to 3.0.2 2013-12-18 18:18:19 +02:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor
904ee6d5d2 re2c: update from 0.13.5 to 0.13.6 2013-12-14 00:41:47 +02:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons
64feb74f44 happy: update to version 1.19.2 2013-12-03 22:23:19 +01:00
Peter Simons
07ce265406 alex: update to version 3.1.3 2013-12-03 22:23:19 +01:00
Peter Simons
b20b8b9844 happy: update to version 1.19.1 2013-11-26 21:09:18 +01:00
Peter Simons
09c50d6f9c alex: update to version 3.1.2 2013-11-26 21:09:17 +01:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
54124516de haskell-happy: add version 1.19.0 2013-09-18 17:17:31 +02:00
Peter Simons
5bc2f6ce02 haskell-alex: add version 3.1.0 2013-09-18 17:17:31 +02:00
Peter Simons
b962caede7 bison-3.x: fix build for good this time
- Bison 3.x no longer compiles without Perl.

 - Don't try to run the test suite unless flex is available.
2013-09-15 22:05:16 +02:00
Peter Simons
24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Peter Simons
a1cca8226a happy: add version 1.18.11 2013-09-11 19:58:34 +02:00
Peter Simons
445aa49c71 bison: prefer the tar.gz variant of the sources
Apparently, the bootstrapping stdenv cannot unpack xz-compressed tarfiles.
2013-09-11 10:55:23 +02:00
Peter Simons
6451264e63 Drop obsolete versions of flex: we only used the latest one, 2.5.35. 2013-09-09 10:39:56 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Peter Simons
aa0df547a8 bison-3.x: fix test suite by adding flex as a build input 2013-09-08 21:12:34 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Peter Simons
41126666a6 bison: add version 3.0 2013-08-03 10:39:07 +02:00
Peter Simons
728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Peter Simons
3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages.
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
2013-05-11 00:36:59 +02:00
Shea Levy
6b78544add binutils: enable gold by default
This doesn't change the default but makes gold available to packages
that might want to use it.

Required switching to the gzipped tarball for bison, as xz isn't
available in the early bootstrap.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 19:38:46 -04:00
Peter Simons
2b56b020c7 alex, happy: fix build for gcc 4.8.0
Alex and happy use CPP to generate some internal template files, but the code
is unprepared for the output from CPP 4.8.0, which generates LINE pragmas that
contain more information than they thought it would.
2013-04-20 18:15:57 +02:00
Peter Simons
0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Danny Wilson
d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Peter Simons
f21539578e haskell-alex: update to version 3.0.5 2013-03-11 11:26:15 +01:00
Peter Simons
e45d55964b alex: update to version 3.0.5 2013-03-11 11:26:14 +01:00
Danny Wilson
5dcc019dc0 Update bison to 2.7 2013-02-28 20:04:05 +01:00
Peter Simons
024f036ecd alex: disable 'doCheck' to avoid compilation errors
The test-suite stanza is incomplete.
2013-02-24 22:22:02 +01:00