ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-27 23:57:42 +03:00
Code Issues Projects Releases Wiki Activity
24,350 Commits 96 Branches 102 Tags 4.3 GiB
e6e3035dbf
Commit Graph

153 Commits

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