ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-06 09:12:35 +03:00
Code Issues Projects Releases Wiki Activity
64,168 Commits 96 Branches 102 Tags 4.5 GiB
0860826795
Commit Graph

246 Commits

Author SHA1 Message Date
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