1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

406 commits

Author SHA1 Message Date
Vladimír Čunát 13eca6f79a Merge #11067: SmartOS updates
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Danny Wilson baf7fdcb75 SmartOS: bison: make help2man target specific dependency 2015-11-23 11:42:01 +01:00
William A. Kennington III 22bf2d0bf3 flex: 2.5.39 -> 2.6.0 2015-11-18 17:50:27 -08:00
Danny Wilson a93f883556 Fix bison build on Illumos. 2015-11-16 17:20:11 +01:00
Tobias Geerinckx-Rice 7cfa918aac lemon: init at 1.0 2015-09-18 03:46:06 +02:00
Tobias Geerinckx-Rice f4193da388 flexc++: 2.02.00 -> 2.03.00
Good-bye Sourceforge, hello (fetchFrom)GitHub. Please stay nice.
2015-09-01 03:28:19 +02:00
Tobias Geerinckx-Rice 6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Vladimír Čunát af2ab0b911 remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc)
2015-07-23 11:53:18 +02:00
Austin Seipp 8d7dd4cf53 nixpkgs: re2c 0.14.2 -> 0.14.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Rok Garbas 9e99a66c24 cygwin: make flex building on cygwin 2015-06-05 00:39:29 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Peter Simons 324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Tobias Geerinckx-Rice 897897cc30 Add flexc++ 2.02.00: C++ lexical scanner generator 2015-05-05 19:44:48 +02:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Pascal Wittmann f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Austin Seipp 5ab1096f1f nixpkgs: re2c 0.14.1 -> 0.14.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-02 16:27:52 -05:00
Austin Seipp c8d46c7374 nixpkgs: re2c 0.13.7.5 -> 0.14.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
rushmorem fa24a296be Add jshon package
Jshon is a JSON parser designed for maximum convenience within the
shell (http://kmkeen.com/jshon).
2015-02-20 10:10:43 +02:00
Ambroz Bizjak d56d92ed6b bison: Update to 3.0.4. 2015-02-05 21:26:16 +01:00
Nicolas Pouillard 383768cc85 [ragel] Fix the URL to fetch the sources for ragel 2015-01-22 14:18:01 +01:00
Stewart Mackenzie 247cc8b9ef hammer: version bump 2014-12-27 21:36:50 +08:00
Peter Simons b8d631a604 happy: drop obsolete versions 1.18.10 1.18.4, 1.18.5, 1.18.6, and 1.18.9 2014-11-08 15:50:21 +01:00
Peter Simons 57bdeaa375 alex: drop obsolete versions 2.3.1, 2.3.2, 2.3.3, 3.0.1, 3.0.2, and 3.0.5 2014-11-08 15:50:16 +01:00
Pascal Wittmann 3a0f2619ce ragel: update from 6.3 to 6.9 2014-11-07 00:31:21 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Evgeny Egorochkin 08cb717c98 add meta.branch 2014-11-03 13:09:48 +02:00
stewart 5d5fa6a484 changed version = e7aa734 2014-10-29 16:08:16 +08:00
stewart 61d7aaeea2 format changes + meta data changes to hammer package 2014-10-29 15:16:41 +08:00
stewart c98ecd1e5f added git revision to nix hammer pkg to prevent nix build breaks on hammer update 2014-10-29 13:49:10 +08:00
stewart be9f3af6c2 derp'ed the sha256 for hammer after patch landed 2014-10-29 13:35:33 +08:00
stewart d625f62e51 kickstart travis after upstream patch landed 2014-10-29 13:14:04 +08:00
stewart 23819bf0b5 A language security tool called Hammer is added 2014-10-29 11:00:55 +08:00
Austin Seipp c98592f200 re2c: 0.13.7.4 -> 0.13.7.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:08:28 -05:00
Peter Simons eab5ca0c3a haskell-Ebnf2ps: update to version 1.0.12 2014-10-06 11:21:39 +02:00
Daniel Peebles 933ac5e9f8 Use a more permanent URL for the byacc version we're using
The other one is likely to change with every new release.
2014-09-01 19:26:21 +01:00
Daniel Peebles ba13808259 Fix byacc 2014-08-31 16:01:03 -04:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Rickard Nilsson 7c06bb13be re2c: Fix license reference 2014-08-20 15:30:18 +02:00
Austin Seipp 9f5eba94d8 re2c: 0.13.6 -> 0.13.7.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:12:21 -05:00
Peter Simons e823c123a8 Don't build broken Haskell packages on Hydra.
These packages don't compile:

 - cabal-delete
 - cabal-file-th
 - categories
 - cmdtheline
 - codec-image-devil
 - concurrent-extra
 - cryptol 1.8.x
 - data-lens
 - diagrams-postscript
 - djinn
 - download
 - dstring
 - enummapset
 - git-date
 - github-backup
 - gtkglext
 - happyy-meta
 - haskeline-class
 - pakcs

These packages depend on some of the packages listed before:

 - Chart-diagrams
 - data-lens-template
 - hp2any-manager
 - purescript
 - repr

These packages fail with GHC 7.8.3 but still compile with older compilers:

 - happy: 1.18.4, 1.18.5, 1.18.6
2014-08-12 12:37:44 +02:00
Peter Simons 18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I
had added him earlier.
2014-08-09 13:49:24 +02:00
Peter Simons d9f6e54e7a Disable Hydra builds for all "old" Haskell packages.
Old means that we have a newer version in Nixpkgs already. If there is a reason
for the old package to still exist, i.e. because some other package is still
referring to it, then Hydra will still build the package as a dependency, but
we won't want to build old packages on their own right.
2014-08-09 13:49:24 +02:00
Peter Simons cee9394fb3 alex: don't build old versions of this package with a recent GHC 2014-08-09 00:39:52 +02:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Peter Simons ab00da7caf Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 17:33:52 +02:00
Peter Simons be090a6372 happy: remove obsolete versions 1.18.8, 1.18.11, 1.19.2, and 1.19.3 2014-07-14 17:33:48 +02:00
Peter Simons 15d9034477 happy: update to version 1.19.4 2014-07-14 17:33:48 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Bjørn Forsman 239d35338f antlr: add meta attributes 2014-06-22 21:59:41 +02:00
Vladimír Čunát 137eae0b55 Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
Peter Simons 208e7cae1a happy-1.19.3: patch code to build with ghc-head
https://github.com/simonmar/happy/issues/20
2014-05-03 20:22:12 +02:00
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
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons 773c5a04e4 haskell-alex: update to version 3.0.4 2013-02-20 11:35:36 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Rob Vermaas faaa1581e2 Added re2c 0.13.5 2012-12-02 00:25:01 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons 3fafdb362b bison: update to version 2.6.5
This update fixes the grub-2.0 warning issue that was worked around in commit
4f5e655b36. Consequently, that patch is no longer
needed.
2012-11-09 18:00:49 +01:00
Peter Simons 2e2a17a92a bison: drop obsolete version 1.875 2012-10-23 18:46:09 +02:00
Peter Simons b3aafc8494 bison-2.6: update to version 2.6.4 2012-10-23 18:36:26 +02:00
Peter Simons df80a705af haskell-happy: add version 1.18.10 2012-09-24 12:08:29 +02:00
Eelco Dolstra 0b900d21f4 Remove unused files 2012-09-18 11:09:18 -04:00
Peter Simons 702854cb5d haskell-Ebnf2ps: update to version 1.0.11 2012-08-31 09:10:18 +02:00
Peter Simons 705fbf2e8c bison: update to version 2.6.2 2012-08-04 13:00:44 +02:00
Peter Simons 72e07c2940 bison: add version 2.6 2012-07-22 18:54:50 +02:00
Eelco Dolstra 3bb2f92106 * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34045
2012-05-10 14:41:16 +00:00
Andres Löh 50a51c7654 Reverting some more Haskell changes, to make things complete again.
svn path=/nixpkgs/trunk/; revision=34044
2012-05-10 14:23:48 +00:00
Peter Simons c07854ace4 Updated Haskell packages.
- DSH: updated to version 0.7.8.1
 - alex: updated to versino 3.0.2
 - certificate: updated to version 1.2.2
 - language-c: updated to version 0.4.2
 - xhtml: updated to version 3000.2.1

Also, downgraded GHC 7.4.1 environment to use mtl 2.0 and transformers 2.0 to
avoid lots of build errors, i.e. with monad-par.

svn path=/nixpkgs/trunk/; revision=34042
2012-05-10 10:28:49 +00:00
Eelco Dolstra 65ddcaa3ed * Bison: use an absolute path to M4. Otherwise Bison will silently
fail (due to a SIGPIPE) if M4 isn't installed.

svn path=/nixpkgs/branches/stdenv-updates/; revision=33772
2012-04-13 12:32:51 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Peter Simons 4b3e14f5d0 Deleted deprecated packages:
haskell-containers-deepseq
  haskell-control-monad-attempt
  haskell-data-object
  haskell-data-object-yaml
  haskell-frown
  haskell-jsonEnumerator
  haskell-neither
  haskell-pool
  haskell-web-routes
  haskell-web-routes-quasi
  haskell-xml-enumerator

svn path=/nixpkgs/trunk/; revision=32538
2012-02-24 11:31:19 +00:00
Peter Simons cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Peter Simons d450c760f8 haskell-Ebnf2ps: updated to version 1.0.10
svn path=/nixpkgs/trunk/; revision=32149
2012-02-08 23:06:04 +00:00
Peter Simons 0df0d9ad9c Ebnf2ps: the package is now available from Hackage
svn path=/nixpkgs/trunk/; revision=32147
2012-02-08 22:07:42 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons 20f8c35e07 haskell-happy: added version 1.18.9
svn path=/nixpkgs/trunk/; revision=32052
2012-02-06 14:27:18 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons adc8828c96 development/tools/parsing/ebnf2ps: added initial version 1.0.8
svn path=/nixpkgs/trunk/; revision=31855
2012-01-26 14:20:06 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Peter Simons ed494478f7 haskell-happy: added version 1.18.8
svn path=/nixpkgs/trunk/; revision=30559
2011-11-25 13:44:30 +00:00
Peter Simons 368ac01473 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Michael Raskin ca92853163 Make cross-buildable
svn path=/nixpkgs/trunk/; revision=30238
2011-11-04 21:31:07 +00:00
Michael Raskin 78070477bf Given that this version is the dependency of OpenSSH, fix cross-build.
svn path=/nixpkgs/trunk/; revision=30226
2011-11-04 16:55:47 +00:00
Michael Raskin d48ca86dd9 Given that this version is the dependency of OpenSSH, fix cross-build.
svn path=/nixpkgs/trunk/; revision=30225
2011-11-04 16:54:04 +00:00
Shea Levy 024a629e27 Set the M4 env var, for some reason configure can't find it even though it's in PATH
svn path=/nixpkgs/branches/stdenv-updates/; revision=29545
2011-09-30 15:29:30 +00:00
Shea Levy 01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Lluís Batlle i Rossell 99863cb87b Making bison 2.4 and 2.5 cross build (I hope), and setting the main bison as
2.5. Let's see what builds and what not.


svn path=/nixpkgs/branches/stdenv-updates/; revision=29406
2011-09-21 06:18:23 +00:00
Lluís Batlle i Rossell 03892b3e01 Making bison 2.5 cross build.
svn path=/nixpkgs/trunk/; revision=29405
2011-09-21 06:15:15 +00:00
Peter Simons ed864ff8c3 haskell-happy: fixed build of version 1.18.4
svn path=/nixpkgs/trunk/; revision=29039
2011-09-05 19:31:42 +00:00
Peter Simons c8ae7cc8bb Updated build expressions for the current version of cabal.nix.
svn path=/nixpkgs/trunk/; revision=28772
2011-08-23 10:35:49 +00:00
Peter Simons 21b26aef25 Updated Haskell package meta sections.
svn path=/nixpkgs/trunk/; revision=28583
2011-08-15 11:27:02 +00:00
Peter Simons 3e10ee5c92 Updated Haskell expressions with the latest version of cabal2nix.
* haskell-dataenc: updated to version 0.14.0.2
 * haskell-fclabels: updated to version 1.0.1

svn path=/nixpkgs/trunk/; revision=28574
2011-08-14 22:52:05 +00:00
Peter Simons b5c57b8380 haskell-alex: updated to version 3.0.1
svn path=/nixpkgs/trunk/; revision=28551
2011-08-13 23:38:30 +00:00
Yury G. Kudryashov 570bc18a9b Add peg, http://piumarta.com/software/peg/
svn path=/nixpkgs/trunk/; revision=28456
2011-08-10 09:54:22 +00:00
Peter Simons b1ef3e6e36 Last batch of Haskell expression updates.
* haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

svn path=/nixpkgs/trunk/; revision=28449
2011-08-10 00:35:08 +00:00
Andres Löh 8fdb3c9e63 Make ghc-7.0.4 the default. Add experimental ghc-7.2.1rc1.
svn path=/nixpkgs/trunk/; revision=28163
2011-08-05 08:52:35 +00:00
Ludovic Courtès 9c2f9fd2f2 GNU Bison 2.5.
svn path=/nixpkgs/trunk/; revision=27813
2011-07-18 08:36:01 +00:00
Andres Löh 3e0ac9b040 Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Ludovic Courtès 1f2cf89914 GNU Bison 2.4.3.
svn path=/nixpkgs/trunk/; revision=23256
2010-08-19 16:55:00 +00:00
Yury G. Kudryashov e9fd810997 antlr-2: compile library
svn path=/nixpkgs/trunk/; revision=23235
2010-08-18 18:56:03 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Andres Löh 5f8328c461 Preparing for the upcoming Haskell Platform release.
svn path=/nixpkgs/trunk/; revision=22620
2010-07-17 13:23:48 +00:00
Eelco Dolstra 61cb191a5c * Bison 2.4.2.
svn path=/nixpkgs/trunk/; revision=20991
2010-04-09 12:41:48 +00:00
Andres Löh 9370225663 Haskell Platform 2010.1.0.0
svn path=/nixpkgs/trunk/; revision=20904
2010-04-01 10:56:48 +00:00
Lluís Batlle i Rossell 21b2bc74b2 The bison elf may call m4 (I saw that building binutils' gold).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18845
2009-12-08 19:42:18 +00:00
Lluís Batlle i Rossell 7ade207f6b - Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
  keep this branch properly updated from trunk. We agreed with Nicolas Pierron
  doing a massive renaming, so all current buildInputs become hostInputs (input
  as build for the host machine, in autotools terminology) , and
  then buildInputs would mean "input as for the build machine".
  By now, the specific "input as for the build machine" is specified through
  buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
  we start changing nixpkgs expressions so they distinguish the current
  buildInputs into buildInputs and buildNativeInputs, we could break even more
  nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
  to be run in the build machine. This allows, without any special rewriting,
  "fetchurl" derivations to be always results for the build machine to use
  them.
- The change above implies that, for anyone wanting to cross-compile, has to
  build the hostDrv of the wanted derivation. For example, after this commit,
  the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
  the contents of this arm.nix in r18398.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
2009-11-19 19:03:34 +00:00
Andres Löh 107d41f96c New Haskell Platform release.
svn path=/nixpkgs/trunk/; revision=15837
2009-06-03 08:44:41 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Andres Löh 12a05f1638 More Haskell Platform.
svn path=/nixpkgs/trunk/; revision=15153
2009-04-19 13:38:34 +00:00
Andres Löh b148543c3e Towards Haskell Platform support.
svn path=/nixpkgs/trunk/; revision=15148
2009-04-19 11:44:37 +00:00
Eelco Dolstra cee387e845 * Move the composition of Haskell packages out of all-packages.nix
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 12:47:11 +00:00
Eelco Dolstra 5986a4d175 * More cleanup. Updated to the latest Stratego/XT 0.17.
svn path=/nixpkgs/trunk/; revision=14610
2009-03-19 14:34:16 +00:00
Peter Simons 22e1286711 Updated ANTLR version 2 from 2.7.6 to 2.7.7.
svn path=/nixpkgs/trunk/; revision=14576
2009-03-17 15:42:54 +00:00
Peter Simons 610aac30c3 Fixed Python StringTemplate library.
Most importantly, this change required updating the ANTLR 2.x expression to
install the Python run-time library. While we're at it, we're building the
run-time library for C++ and Java, too. There is still work to be done: the
stringtemplate library doesn't find antlr.py without help yet.

svn path=/nixpkgs/trunk/; revision=14489
2009-03-10 12:01:22 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Nicolas Pierron 507ab31cbe Add ragel: A state machine compiler.
svn path=/nixpkgs/trunk/; revision=13881
2009-01-27 14:00:54 +00:00
Ludovic Courtès b942701506 GNU Bison 2.4.1.
svn path=/nixpkgs/trunk/; revision=13619
2008-12-12 12:37:29 +00:00
Eelco Dolstra f7f25d81a7 * Oops.
svn path=/nixpkgs/trunk/; revision=13301
2008-11-14 17:27:54 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Eelco Dolstra c1cbd437dc * Doh.
svn path=/nixpkgs/trunk/; revision=13297
2008-11-14 16:28:15 +00:00
Eelco Dolstra 704e51d3e2 * Reenable the check phase in Bison 2.4.
* Use the passthru attribute.

svn path=/nixpkgs/trunk/; revision=13295
2008-11-14 15:53:07 +00:00
Michael Raskin 8b06e2e228 Try producing release without running bison2.4 testsuite..
svn path=/nixpkgs/trunk/; revision=13189
2008-11-04 18:39:52 +00:00
Ludovic Courtès d7a1a64e57 GNU Bison 2.3: Fix `meta.license'.
svn path=/nixpkgs/trunk/; revision=13182
2008-11-03 18:28:13 +00:00
Ludovic Courtès c0960419b2 GNU Bison 2.3: Update `meta' attribute.
svn path=/nixpkgs/trunk/; revision=13181
2008-11-03 18:27:35 +00:00
Ludovic Courtès 8c1408bf27 GNU Bison 2.4 (2.3.x remains the default).
svn path=/nixpkgs/trunk/; revision=13180
2008-11-03 18:25:17 +00:00
Marc Weber 9e55727832 Added:
* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526
2008-08-06 20:39:01 +00:00
Eelco Dolstra aaccd6f6e2 * Fix building the Fortran compiler.
svn path=/nixpkgs/trunk/; revision=12201
2008-06-27 14:43:25 +00:00
Michael Raskin a3ea4c135b Newer flex.
svn path=/nixpkgs/trunk/; revision=11213
2008-03-20 09:50:15 +00:00
Eelco Dolstra a1bcd5d936 * No idea what this was for.
svn path=/nixpkgs/trunk/; revision=10779
2008-02-20 13:07:11 +00:00
Ludovic Courtès 3e7da32582 Flex 2.5.34.
svn path=/nixpkgs/trunk/; revision=10713
2008-02-16 19:12:55 +00:00
Sander van der Burg 067aaa8004 Added sdf2-bundle 2.4
svn path=/nixpkgs/trunk/; revision=10371
2008-01-29 09:37:15 +00:00
Andres Löh 61adeec0e5 * update alex to 2.2 and to use the generic Cabal builder
* change default version of ghc to ghc-6.8.2
* some references to ghc-6.6 and ghc-6.6.1 are left; these are
  packages that to my knowledge don't work without ghc-6.8.2 without
  some kind of work (such as upgrading to a later version or some
  patch); I'll try to perform these remaining upgrades soon ...

svn path=/nixpkgs/trunk/; revision=10253
2008-01-22 22:43:38 +00:00
Andres Löh 84e7b463f5 * converted happy and haddock to use generic Cabal builder
svn path=/nixpkgs/trunk/; revision=10252
2008-01-22 21:10:19 +00:00
Andres Löh 432c157293 * added happy-1.17
svn path=/nixpkgs/trunk/; revision=10208
2008-01-17 18:21:50 +00:00
Michael Raskin 4290be9a99 Various fixes to lessen reliance on nix.cs.uu.nl for tarballs; version bumps for unavailabel tarballs; ATI driver builds now
svn path=/nixpkgs/trunk/; revision=9952
2007-12-18 22:56:12 +00:00
Andres Löh d9b8b152d6 * added alex (lexer generator for Haskell)
svn path=/nixpkgs/trunk/; revision=9906
2007-12-11 13:38:48 +00:00
Eelco Dolstra 544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Andres Löh 4c05f557a8 * added Ralf Hinze's "frown" parser generator for Haskell
svn path=/nixpkgs/trunk/; revision=8657
2007-05-09 13:10:31 +00:00
Eelco Dolstra ef9b025dbe * Remove a bunch of unused Nix expressions.
svn path=/nixpkgs/trunk/; revision=6716
2006-10-12 15:43:01 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +00:00