Commit graph

332 commits

Author SHA1 Message Date
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster eabef9420a
re2c: 0.14.3 -> 0.16 2016-08-25 16:07:40 +00:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Joachim Fasting 2f56af5f1a
ragel: set meta.platforms 2016-06-23 00:55:54 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Tobias Geerinckx-Rice fe9c463622
lemon: 1.0 -> 1.69 2016-04-29 21:42:35 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Tobias Geerinckx-Rice 994c9b7487
flexcpp: 2.04.00 -> 2.05.00 2016-04-14 02:37:53 +02:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Joachim Fasting a8556bd5d7 flexcpp: patch all shebangs & fix installation
Using the original build recipe would result in an output
without the actual flexcpp binary.
2016-03-18 22:12:03 +01:00
Joachim Fasting dd177e62e3 flexcpp: 2.03.00 -> 2.04.00 2016-03-18 02:19:42 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Peter Simons 17d1cd2efa Merge pull request #11898 from aboseley/flex-cross-notests
flex: disable tests when cross compiling
2016-03-02 21:13:40 +01:00
Robin Gloster 402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Pascal Wittmann 72161f6810 ragel: use new texlive infrastructure 2016-02-15 18:34:55 +01:00
Pascal Wittmann 6d6f331109 ragel: 6.9 -> 7.0.0.6 2016-02-15 18:34:55 +01:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Adam Boseley e3068d7309 flex: disable tests when cross compiling
When cross compiling we can't run the test executables
on the build machine
2015-12-23 21:05:32 +10:00
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