mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
23041 commits 312 branches 124 tags 6.5 GiB
Commit graph

1208 commits

Author SHA1 Message Date
Peter Simons 25fe5d43fe Updated Haskell packages. 
- MemoTrie: updated to version 0.4.11
 - X11: updated to version 1.6.0
 - derive: updated to version 2.5.8
 - gloss: updated to version 1.7.1.1
 - haskell-src-exts: updated to version 1.13.0
 - haskell-src-meta: updated to version 0.5.1.2
 - hlint: updated to version 1.8.28

svn path=/nixpkgs/trunk/; revision=33528
 2012-04-01 19:51:53 +00:00
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk 
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
 2012-03-31 20:01:40 +00:00
Michael Raskin 19320cf6cc Updating autogen - builds now 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33485
 2012-03-30 07:32:54 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk. 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
 2012-03-28 15:42:42 +00:00
Peter Simons db8f709430 Updated Haskell packages. 
- derp: updated to version 0.1.6
 - happstack-server: updated to version 6.6.5
 - hlint: updated to version 1.8.26

svn path=/nixpkgs/trunk/; revision=33453
 2012-03-28 13:49:20 +00:00
Peter Simons d44e55866a Updated Haskell packages. 
- cabal2nix: updated to version 1.30
 - cmdargs: updated to version 0.9.5
 - derive: updated to version 2.5.6
 - hlint: updated to version 1.8.25
 - io-choice: added version 0.0.1

svn path=/nixpkgs/trunk/; revision=33411
 2012-03-25 19:33:53 +00:00
Peter Simons 6b0f1dab5c Updated Haskell packages. 
- LambdaHack: updated to version 0.2.1
 - OpenAL: updated to version 1.4.0.1
 - cabal2nix: updated to version 1.29
 - unbound: updated to version 0.4.0.1

svn path=/nixpkgs/trunk/; revision=33394
 2012-03-24 10:21:48 +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
Yury G. Kudryashov 3d0b778848 Move gnome-doc-utils and gtk-doc to top-level 
Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
 2012-03-19 04:36:41 +00:00
Peter Simons fe3ac7658b haskell-alex-meta: updated to version 0.3.0.2 
svn path=/nixpkgs/trunk/; revision=33102
 2012-03-15 10:43:20 +00:00
Peter Simons b68db0ea2d haskell-BNFC-meta: updated to version 0.3 
svn path=/nixpkgs/trunk/; revision=33101
 2012-03-15 10:43:16 +00:00
Peter Simons e49110e221 scons: updated to version 2.1.0 
svn path=/nixpkgs/trunk/; revision=33030
 2012-03-13 08:29:18 +00:00
Eelco Dolstra 891dd9121b * Undo accidental commit. 
svn path=/nixpkgs/trunk/; revision=33021
 2012-03-12 15:34:00 +00:00
Eelco Dolstra 29df27f469 * Fix some Hydra dependencies that broke due to the Perl upgrade. 
svn path=/nixpkgs/trunk/; revision=33020
 2012-03-12 15:31:14 +00:00
Peter Simons dd90a8b709 haskell-cabal2nix: updated to version 1.28 
svn path=/nixpkgs/trunk/; revision=33016
 2012-03-12 14:15:14 +00:00
Peter Simons c86a90c4e9 Updating Haskell packages. 
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
 2012-03-12 14:06:18 +00:00
Yury G. Kudryashov 2a074000be patch and fixCmakeFiles do not commute 
svn path=/nixpkgs/trunk/; revision=32876
 2012-03-08 07:59:56 +00:00
Lluís Batlle i Rossell 02ac39aef8 Setting myself as maintainer for xsane and cdecl, and telling hydra to build them. 
svn path=/nixpkgs/trunk/; revision=32868
 2012-03-07 22:20:23 +00:00
Lluís Batlle i Rossell f1f834f260 Adding patches for cdecl to build. I picked them from: 
http://gentoo-overlays.zugaina.org/gentoo/portage/dev-util/cdecl/files/


svn path=/nixpkgs/trunk/; revision=32866
 2012-03-07 22:12:12 +00:00
Yury G. Kudryashov 614d81046c Remove cmake_2_8_7: default is already 2.8.7 
svn path=/nixpkgs/trunk/; revision=32827
 2012-03-06 14:35:30 +00:00
Yury G. Kudryashov b7642bfdfb svn merge ^/nixpkgs/trunk 
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
 2012-03-05 21:01:47 +00:00
Peter Simons 05d92999a0 Updated haskell packages. 
- HDBC-postgresql updated to version 2.3.2.1
 - HsOpenSSL updated to version 0.10.1.3
 - hledger-web updated to version 0.17.1
 - persistent updated to version 0.8.0.2
 - xml-conduit updated to version 0.5.3.1
 - haddock: added version 2.10.0

svn path=/nixpkgs/trunk/; revision=32799
 2012-03-05 11:58:21 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Lluís Batlle i Rossell b479679b94 Fixing typos in the oprofile expression 
svn path=/nixpkgs/trunk/; revision=32752
 2012-03-03 12:15:58 +00:00
Lluís Batlle i Rossell 5a568ee185 Updating oprofile 
svn path=/nixpkgs/trunk/; revision=32751
 2012-03-03 11:30:44 +00:00
Ludovic Courtès d8849a045e lcov: Fix build on FreeBSD. 
svn path=/nixpkgs/trunk/; revision=32746
 2012-03-02 15:57:36 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Eelco Dolstra 55ce36faee * Updated Leiningen to 1.7.0 (contributed by Phil Hagelberg; added a 
call to patchShebangs to fix the reference to /bin/bash).

svn path=/nixpkgs/trunk/; revision=32698
 2012-02-29 14:35:34 +00:00
Ludovic Courtès 026f6e7697 Doxygen: Reinstate version 1.7. 
svn path=/nixpkgs/trunk/; revision=32672
 2012-02-28 10:08:21 +00:00
Peter Simons de9ebc460c Added meta.maintainers section. 
svn path=/nixpkgs/trunk/; revision=32669
 2012-02-28 00:10:09 +00:00
Peter Simons b2356973fe haskell-haskdogs: wrapper around hasktags that fetches sources for dependencies from hackage 
svn path=/nixpkgs/trunk/; revision=32667
 2012-02-28 00:10:02 +00:00
Peter Simons be0acc8bc1 hasktags: ctags/etags for haskell sources 
svn path=/nixpkgs/trunk/; revision=32665
 2012-02-28 00:09:56 +00:00
Lluís Batlle i Rossell 49cb081019 Updating doxygen to 1.8.0 
svn path=/nixpkgs/trunk/; revision=32619
 2012-02-27 16:45:35 +00:00
Michael Raskin 4ff245c5de Add fresh cmake 
svn path=/nixpkgs/trunk/; revision=32611
 2012-02-27 06:22:47 +00:00
Lluís Batlle i Rossell 183d05a0d7 Setting the cmake build type Release in its setup-hook, for all cmake 
projects to be built in Release by default.

Some packages were not getting optimisation flags, like rigsofrods.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32574
 2012-02-26 11:27:45 +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
Lluís Batlle i Rossell 675e16f805 Fixing jam for i686-linux. That should allow building trigger rally. 
svn path=/nixpkgs/trunk/; revision=32557
 2012-02-25 16:47:21 +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
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00
Yury G. Kudryashov 166e87319c Fix cmake-2.6.4 build (add xmlrpc-c) 
svn path=/nixpkgs/trunk/; revision=32505
 2012-02-23 11:27:47 +00:00
Yury G. Kudryashov 417124626b Add cmake-2.6.4 
This is the minimum version required for KDE-4, so I need it to ensure that my
cmake code works with cmake-2.6.4.

svn path=/nixpkgs/trunk/; revision=32504
 2012-02-23 11:27:43 +00:00
Peter Simons 0258bf1ef1 premake: fixed meta.license field 
svn path=/nixpkgs/trunk/; revision=32492
 2012-02-22 21:14:53 +00:00
Peter Simons 444b195a3d new package: premake -- lua based build configuration tool 
this is version 3, while 4 already exists.
But I only need this tool for 'aacskeys', which doesn't work with 4

svn path=/nixpkgs/trunk/; revision=32490
 2012-02-22 20:29:42 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
 2012-02-21 23:29:21 +00:00
Peter Simons 9cc0657c86 haskell-hlint: updated to version 1.8.24 
svn path=/nixpkgs/trunk/; revision=32422
 2012-02-20 10:45:02 +00:00
Eelco Dolstra a50d32e4db * Fix oprofile. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32402
 2012-02-19 17:03:38 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Eelco Dolstra b23126fcc3 * Include the kernel version in kernel-specific packages so that they 
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
 2012-02-17 14:32:28 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
 2012-02-17 13:43:31 +00:00
Arie Middelkoop f8b1a1db26 Coccinelle: wrapper for 'spatch.opt'. 
There was already a wrapper for spatch, but not for the optimized version 'spatch.opt'.
Actually, for coccinelle in nixpkgs, I'd propose to only provide the optimized version of
spatch, as it makes no difference for the end user.

svn path=/nixpkgs/trunk/; revision=32341
 2012-02-16 23:55:46 +00:00
Peter Simons 255dc2478d haskell-cabal2nix: updated to version 1.27 
svn path=/nixpkgs/trunk/; revision=32332
 2012-02-16 17:48:28 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +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 ca1912036b cppcheck: added version 1.53 
svn path=/nixpkgs/trunk/; revision=32302
 2012-02-15 16:07:45 +00:00
Peter Simons c5d870f1d8 sparse: updated to version 0.4.4 
svn path=/nixpkgs/trunk/; revision=32301
 2012-02-15 16:07:38 +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
Peter Simons 844d950d13 haskell-cabal2nix: updated to version 1.26 
svn path=/nixpkgs/trunk/; revision=32291
 2012-02-14 16:59:04 +00:00
Peter Simons 3c63b41aa4 haskell-tar: added version 0.4.0.0 
svn path=/nixpkgs/trunk/; revision=32277
 2012-02-14 16:58:27 +00:00
Yury G. Kudryashov f7886ac78b svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
 2012-02-13 19:47:36 +00:00
Peter Simons d53d97ad5e haskell-HaRe: updated to version 0.6.0.2 
svn path=/nixpkgs/trunk/; revision=32238
 2012-02-13 09:01:46 +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
Peter Simons 6789ec0c84 haskell-cpphs: updated to version 1.13.3 
svn path=/nixpkgs/trunk/; revision=32107
 2012-02-07 10:34:43 +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 31298a29ae haskell-hlint: updated to version 1.8.23 
svn path=/nixpkgs/trunk/; revision=32069
 2012-02-06 14:28:02 +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
Peter Simons dbafd99a0a Moved python debugger into development/tools hierarchy. 
svn path=/nixpkgs/trunk/; revision=32027
 2012-02-04 09:30:53 +00:00
Peter Simons 868d8c2d9c haskell-cabal2nix: updated to version 1.25 
svn path=/nixpkgs/trunk/; revision=32021
 2012-02-03 21:00:32 +00:00
Ludovic Courtès 7dc9366796 GNU help2man: Wrap the program to have a correct $PERL5LIB. 
svn path=/nixpkgs/trunk/; revision=31948
 2012-01-31 15:50:51 +00:00
Ludovic Courtès 27100c36c4 GNU help2man 1.40.5. 
svn path=/nixpkgs/trunk/; revision=31947
 2012-01-31 15:31:23 +00:00
Peter Simons b2bbcc7d5f haskell-cabal-ghci: updated to version 0.2.1 
svn path=/nixpkgs/trunk/; revision=31932
 2012-01-30 10:52:13 +00:00
Peter Simons 086e9a090b haskell-cabal2nix: updated to version 1.24 
svn path=/nixpkgs/trunk/; revision=31921
 2012-01-29 16:24:14 +00:00
Yury G. Kudryashov 71c28d0e33 Use meta.platforms 
svn path=/nixpkgs/trunk/; revision=31909
 2012-01-28 14:39:56 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
 2012-01-27 16:43:39 +00:00
Lluís Batlle i Rossell 29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be 
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
 2012-01-27 15:11:17 +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 d9de74edd6 haskell-hlint: updated to version 1.8.21 
svn path=/nixpkgs/trunk/; revision=31862
 2012-01-26 14:20:27 +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
Peter Simons db98fa936b astyle: added initial version 2.02.1 
svn path=/nixpkgs/trunk/; revision=31835
 2012-01-25 13:52:18 +00:00
Arie Middelkoop 3226f48b17 coccinelle: comment update in nix expr.. 
svn path=/nixpkgs/trunk/; revision=31828
 2012-01-24 22:08:17 +00:00
Peter Simons c7dc7f5e87 haskell-tar: updated to version 0.3.2.0 
svn path=/nixpkgs/trunk/; revision=31823
 2012-01-24 15:06:39 +00:00
Eelco Dolstra 1e886749b5 * Don't replace /opt if it's followed by something other than 
whitespace or a /, otherwise strings such as /foo/opticaldrive.c
  will be broken.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31793
 2012-01-23 13:16:51 +00:00
Lluís Batlle i Rossell 3b4528fd7c Reverting the pkgconfig update. Eelco says it does not work. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31755
 2012-01-21 09:05:43 +00:00
Lluís Batlle i Rossell 9ed137c45b Picking in pkgconfig the latest config.guess, as it does not know 
mips64el-linux 3.2.0.

svn path=/nixpkgs/trunk/; revision=31754
 2012-01-21 01:29:17 +00:00
Lluís Batlle i Rossell 8ea631310b Making the ccacheWrapper a bit nicer. More flexible, specifically. 
svn path=/nixpkgs/trunk/; revision=31753
 2012-01-21 01:29:06 +00:00
Lluís Batlle i Rossell f5ddd22576 Updating pkgconfig. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31752
 2012-01-21 00:47:03 +00:00
Lluís Batlle i Rossell 4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's 
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
 2012-01-21 00:34:51 +00:00
Lluís Batlle i Rossell 2f2ce81046 Modifying the all-packages stdenv changer, so it allows having a global stdenv 
wrapper.

This will fail for crossStdenv, but it allows a wrapper that uses ccache for
example. That's so described in all-packages.nix around 'ccache'.


svn path=/nixpkgs/trunk/; revision=31747
 2012-01-21 00:25:30 +00:00
Eelco Dolstra 28780d27d1 * cmake: don't use replace-literal. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31736
 2012-01-20 15:10:28 +00:00
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +00:00
Yury G. Kudryashov d0c8b530e9 leiningen: added package version 1.6.2 
svn path=/nixpkgs/trunk/; revision=31716
 2012-01-19 20:34:59 +00:00
Eelco Dolstra 26affd7238 * Doh! 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31699
 2012-01-19 15:02:47 +00:00
Eelco Dolstra 0e353fdd5a * Don't use substite() here, because the bash binary in the bootstrap 
tools (4.1.2) seems to have performance problems doing pattern
  substitutions on large strings (it takes several minutes on
  binutils' Makefile.in).  Bash 4.2 seems to be fine.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31698
 2012-01-19 14:55:12 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Ludovic Courtès 300372af20 GNU Automake 1.11.2. 
svn path=/nixpkgs/trunk/; revision=31667
 2012-01-18 20:52:12 +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 48ee2523da * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
 2012-01-18 15:53:12 +00:00
Peter Simons 5bcd4dd4dd haskell-threadscope: updated to version 0.2.1 
svn path=/nixpkgs/trunk/; revision=31592
 2012-01-16 11:47:59 +00:00
Arie Middelkoop c87285c255 Updated the coccinelle package to the latest release (1.0.0-RC9). 
Added additional ocaml modules which are needed for coccinelle.

svn path=/nixpkgs/trunk/; revision=31579
 2012-01-16 10:20:13 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk 
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
 2012-01-08 16:01:12 +00:00
Yury G. Kudryashov a7f52f0fd0 xxdiff-4.0 beta (Qt4-based) 
svn path=/nixpkgs/trunk/; revision=31422
 2012-01-07 20:23:35 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix 
svn path=/nixpkgs/trunk/; revision=31406
 2012-01-07 17:06:49 +00:00
Lluís Batlle i Rossell 54aa31cca3 Updating the cross-build of elfutils so the perf for 2.6.37 builds too. (again, nanonote) 
svn path=/nixpkgs/trunk/; revision=31378
 2012-01-06 21:10:19 +00:00
Yury G. Kudryashov 9d03e96caa Add itstool 
svn path=/nixpkgs/trunk/; revision=31372
 2012-01-06 20:09:39 +00:00
Lluís Batlle i Rossell cae619da08 Updating elfutils/perf to cross-build. I tested this for the nanonote. 
I add newt, checking that it cross-builds too.

I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.


svn path=/nixpkgs/trunk/; revision=31353
 2012-01-06 16:45:14 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk 
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
 2012-01-06 01:07:45 +00:00
Yury G. Kudryashov b00d19d775 elfutils-0.152, pass zlib, bzip2 and xz 
svn path=/nixpkgs/trunk/; revision=31323
 2012-01-05 23:15:48 +00:00
Yury G. Kudryashov d15e2f70d9 Add swig-2.x 
svn path=/nixpkgs/trunk/; revision=31320
 2012-01-05 23:15:24 +00:00
Yury G. Kudryashov 29d613ba0e Add a warning to cmake/default.nix 
svn path=/nixpkgs/trunk/; revision=31248
 2012-01-03 18:00:02 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk 
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
 2012-01-03 17:25:24 +00:00
Eelco Dolstra 5386b47ead * Revert. Cmake is still broken on i686-linux. 
svn path=/nixpkgs/trunk/; revision=31244
 2012-01-03 17:22:11 +00:00
Yury G. Kudryashov 71c6de7338 cmake-2.8.7 
svn path=/nixpkgs/trunk/; revision=31241
 2012-01-03 16:38:53 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
 2012-01-02 14:12:40 +00:00
Peter Simons 8755735a06 haskell-cabal2nix: updated to version 1.23 
svn path=/nixpkgs/trunk/; revision=31077
 2011-12-25 16:18:34 +00:00
Yury G. Kudryashov f77741e018 merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
 2011-12-25 05:47:23 +00:00
Peter Simons f0fccbb3f0 haskell-uuagc: updated to version 0.9.40.2 
svn path=/nixpkgs/trunk/; revision=31040
 2011-12-22 12:19:28 +00:00
Peter Simons 1a316e3ef2 haskell-uuagc-cabal: updated to version 1.0.2.0 
svn path=/nixpkgs/trunk/; revision=31039
 2011-12-22 12:19:24 +00:00
Peter Simons ee7bedf20c haskell-uuagc-bootstrap: updated to version 0.9.40.2 
svn path=/nixpkgs/trunk/; revision=31038
 2011-12-22 12:19:18 +00:00
Eelco Dolstra ff2f4827b4 * Test xz in stdenv. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30983
 2011-12-20 13:05:51 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk 
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
 2011-12-16 22:57:21 +00:00
Marco Maggesi 82fabd6262 Update ocaml-findlib to version 1.2.7 
svn path=/nixpkgs/trunk/; revision=30925
 2011-12-16 09:22:31 +00:00
Eelco Dolstra cfde88976b * Streamline the stdenv bootstrap and resulting closure by removing 
some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
  Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
 2011-12-14 14:31:56 +00:00
Shea Levy cffad35505 The GPL issue does not apply to this version of binutils 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30871
 2011-12-13 18:13:45 +00:00
Eelco Dolstra 7bbb1ad569 * Revert to binutils 2.21.1. Binutils 2.22 changes the default 
handling of dynamic libraries from --copy-dt-needed-entries to
  --no-copy-dt-needed-entries, which breaks stuff (e.g. GCC, see
  http://hydra.nixos.org/build/1608471).  So stick with 2.21.1 for
  now.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30870
 2011-12-13 16:47:29 +00:00
Eelco Dolstra 8c23cd086f * binutils 2.22. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30855
 2011-12-12 17:14:59 +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 a9d9b9714e stay at older uuagc for now, newer breaks UHC 
svn path=/nixpkgs/trunk/; revision=30837
 2011-12-11 19:39:00 +00:00
Peter Simons 257a8deddd haskell-cabal2nix: updated to version 1.21 
svn path=/nixpkgs/trunk/; revision=30825
 2011-12-10 22:30:56 +00:00
Peter Simons b76db1c8ac haskell-SourceGraph: added version 0.7.0.1 
svn path=/nixpkgs/trunk/; revision=30813
 2011-12-09 18:07:29 +00:00
Ludovic Courtès d5951bfac1 LCOV: Add `meta.platforms'. 
svn path=/nixpkgs/trunk/; revision=30775
 2011-12-06 14:12:43 +00:00
Peter Simons 2d0b27df9d haskell-uuagc: updated to version 0.9.39.3 
svn path=/nixpkgs/trunk/; revision=30765
 2011-12-05 19:27:47 +00:00
Peter Simons c39d60bc0e haskell-uuagc-cabal: updated to version 1.0.0.10 
svn path=/nixpkgs/trunk/; revision=30760
 2011-12-05 16:22:59 +00:00
Peter Simons 0ebf4b42a1 haskell-uuagc-bootstrap: updated to version 0.9.39.3.0 
svn path=/nixpkgs/trunk/; revision=30759
 2011-12-05 16:22:56 +00:00
Peter Simons a392cab4d1 haskell-cabal2nix: updated to version 1.20 
svn path=/nixpkgs/trunk/; revision=30758
 2011-12-05 16:22:54 +00:00
Lluís Batlle i Rossell 8d746d0fd5 Updating valgrind 
svn path=/nixpkgs/trunk/; revision=30723
 2011-12-04 00:25:58 +00:00
Peter Simons fff3298d75 haskell-hlint: updated to version 1.8.20 
svn path=/nixpkgs/trunk/; revision=30624
 2011-11-29 15:32:52 +00:00
Peter Simons 5876576633 haskell-hlint: updated to version 1.8.19 
svn path=/nixpkgs/trunk/; revision=30608
 2011-11-28 18:12:33 +00:00
Marco Maggesi 8d4b5bcd0c Upgrade camlp5 to version 6.02.3-1 (contributed by Russell O'Connor). 
Keep the old version 5.15 to allow a smooth migration.


svn path=/nixpkgs/trunk/; revision=30575
 2011-11-26 19:39:14 +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 7779b6245e haskell-cabal2nix: updated to version 1.19 
svn path=/nixpkgs/trunk/; revision=30518
 2011-11-21 18:09:38 +00:00
Eelco Dolstra 5abed12234 * i386-sunos -> i686-solaris. 
svn path=/nixpkgs/trunk/; revision=30507
 2011-11-21 14:11:04 +00:00
Ludovic Courtès ef41b48dcb GDB: Check for `stdenv.system == "i686-gnu"'. 
Reported by Shea Levy, thanks!

svn path=/nixpkgs/trunk/; revision=30484
 2011-11-19 20:37:44 +00:00
Ludovic Courtès a148b889f1 GDB: Allow cross-compilation for GNU. 
svn path=/nixpkgs/trunk/; revision=30481
 2011-11-19 18:28:10 +00:00
Shea Levy 2be3b97cba Use the patchelf-0.6 release for patchelf06 in trunk 
svn path=/nixpkgs/trunk/; revision=30359
 2011-11-09 18:17:18 +00:00
Peter Simons 368ac01473 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
 2011-11-08 10:18:35 +00:00
Eelco Dolstra 91ab98ce09 * Update patchelf. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30312
 2011-11-08 01:30:02 +00:00
Eelco Dolstra 0880b96a3d * Apply the zlib/cmake updates from the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30309
 2011-11-07 22:54:45 +00:00
Eelco Dolstra bb889c3605 * Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake 
to build).  These are more appropriate to the stdenv branch.  I'll
  apply them there.

svn path=/nixpkgs/trunk/; revision=30308
 2011-11-07 22:05:46 +00:00
David Guibert 29bdb369ab update cmake 
svn path=/nixpkgs/trunk/; revision=30278
 2011-11-06 20:03:00 +00:00
Peter Simons c03581c2be haskell-hlint: updated to version 1.8.18 
svn path=/nixpkgs/trunk/; revision=30273
 2011-11-06 18:36:45 +00:00
Michael Raskin ca92853163 Make cross-buildable 
svn path=/nixpkgs/trunk/; revision=30238
 2011-11-04 21:31:07 +00:00
Peter Simons 0812835108 haskell-uuagc-cabal: updated to version 1.0.0.9 
svn path=/nixpkgs/trunk/; revision=30228
 2011-11-04 16:57:39 +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
Peter Simons 69488d688d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
 2011-11-02 10:28:32 +00:00
David Guibert 752e53e95d lsof 2.84 -> 2.85 
svn path=/nixpkgs/trunk/; revision=30167
 2011-11-01 17:07:07 +00:00
Ludovic Courtès bba5ca07e1 GNU cflow 1.4. 
svn path=/nixpkgs/trunk/; revision=30123
 2011-10-30 00:01:33 +00:00
Ludovic Courtès 461f4d0c4e GNU gengetopt 2.22.5. 
svn path=/nixpkgs/trunk/; revision=30120
 2011-10-30 00:01:20 +00:00
Ludovic Courtès 89df6c6c35 GNU GLOBAL 6.1. 
svn path=/nixpkgs/trunk/; revision=30119
 2011-10-30 00:01:15 +00:00
Ludovic Courtès b2d282b491 GNU Libtool 2.4.2. 
svn path=/nixpkgs/trunk/; revision=30111
 2011-10-30 00:00:29 +00:00
Peter Simons dfd063cf12 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
 2011-10-26 09:15:25 +00:00
Lluís Batlle i Rossell 706b80c282 I wrote bad my attempt at -static-libgcc. Retrying. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30024
 2011-10-25 18:52:32 +00:00
Lluís Batlle i Rossell 3fa51ac56a Trying to disable the references to the bootstrap-tools libgcc 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30022
 2011-10-25 18:35:17 +00:00
Peter Simons 7784111b49 haskell-cabal2nix: updated to version 1.18 
svn path=/nixpkgs/trunk/; revision=29917
 2011-10-19 19:54:59 +00:00
Ludovic Courtès 383baf8794 GNU M4: Have a test work around flaws in newer Linux versions. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29856
 2011-10-15 23:25:12 +00:00
Peter Simons 8dfef0f4a0 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
 2011-10-14 22:06:50 +00:00
Peter Simons b27823bfac haskell-cpphs: updated to version 1.13.2 
svn path=/nixpkgs/trunk/; revision=29844
 2011-10-14 17:26:38 +00:00
Lluís Batlle i Rossell dbdfb3d11c Adding cbrowser. Have cscope on the path to use it (which you should already 
have, because otherwise how would you have created the database for cbrowser?)

svn path=/nixpkgs/trunk/; revision=29831
 2011-10-14 07:47:20 +00:00
Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk. 
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
 2011-10-06 09:37:22 +00:00
Ludovic Courtès 37776f1568 Valgrind: Add myself as maintainer. 
svn path=/nixpkgs/trunk/; revision=29657
 2011-10-05 10:52:16 +00:00
Ludovic Courtès 631c013a13 Valgrind: Remove unnecessary dependency on Autoconf and Automake. 
svn path=/nixpkgs/trunk/; revision=29656
 2011-10-05 10:52:11 +00:00
Ludovic Courtès ba677f861f Valgrind: Fix Darwin builds. 
svn path=/nixpkgs/trunk/; revision=29655
 2011-10-05 10:52:05 +00:00
Peter Simons a38b628246 haskell-haddock: updated to version 2.9.4 
svn path=/nixpkgs/trunk/; revision=29635
 2011-10-04 14:58:28 +00:00
Russell O'Connor 8c40562197 New package for CamlIDL 1.05 
svn path=/nixpkgs/trunk/; revision=29619
 2011-10-04 01:40:45 +00:00
Ludovic Courtès eff71744ea GNU Binutils: Fix URL. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29605
 2011-10-03 19:11:09 +00:00
Peter Simons 4d2b6a350b haskell-cabal-ghci: updated to version 0.2.0 
svn path=/nixpkgs/trunk/; revision=29598
 2011-10-03 09:01:42 +00:00
Ludovic Courtès 18962bfe66 GNU M4 1.4.16. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29588
 2011-10-02 20:35:49 +00:00
Peter Simons 8df74ef75a haskell-hlint: updated to version 1.8.17 
svn path=/nixpkgs/trunk/; revision=29580
 2011-10-02 20:27:55 +00:00
Peter Simons ec549646da haskell-haddock: added version 2.9.3 
svn path=/nixpkgs/trunk/; revision=29572
 2011-10-02 20:27:20 +00:00
Peter Simons 3277d89fcf haddock-2.4.2: added 'happy' build input 
svn path=/nixpkgs/trunk/; revision=29571
 2011-10-02 20:13:54 +00:00
Peter Simons 5328a95a3c haddock-2.4.2: added 'alex' build input 
svn path=/nixpkgs/trunk/; revision=29570
 2011-10-02 20:12:07 +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
Peter Simons e460e459bf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29531
 2011-09-28 19:26:00 +00:00
Peter Simons 4cdafb258c haskell-hlint: updated to version 1.8.16 
svn path=/nixpkgs/trunk/; revision=29530
 2011-09-28 16:48:17 +00:00
Peter Simons 07a5a121fb synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
 2011-09-28 14:48:34 +00:00
Peter Simons d8b628d123 haskell-cpphs: updated to version 1.13.1 
svn path=/nixpkgs/trunk/; revision=29503
 2011-09-26 19:30:36 +00:00
Peter Simons acb52d79bf haskell-cpphs: revert update to version 1.13 
The new version doesn't compile. I've reported the problem upstream.

svn path=/nixpkgs/trunk/; revision=29501
 2011-09-26 16:33:15 +00:00
Peter Simons 8f8d3f1747 haskell-cpphs: updated to version 1.13 
svn path=/nixpkgs/trunk/; revision=29500
 2011-09-26 16:18:09 +00:00
Ludovic Courtès b7d32054da GNU Automake: Add TODO. 
svn path=/nixpkgs/trunk/; revision=29494
 2011-09-26 12:07:21 +00:00
Yury G. Kudryashov e496b86594 Remove kde3.kcachegrind 
Use kde4.kcachegrind instead.

svn path=/nixpkgs/trunk/; revision=29484
 2011-09-25 22:56:48 +00:00
Peter Simons 0ad122f4e6 sync with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29468
 2011-09-24 08:04:47 +00:00
Peter Simons 0a5f021abd haskell-uuagc-cabal: updated to version 1.0.0.7 
svn path=/nixpkgs/trunk/; revision=29466
 2011-09-24 07:27:07 +00:00
Shea Levy 01df54f5cc Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
 2011-09-23 16:58:45 +00:00
Peter Simons aecdd27b42 haskell-happy-meta: updated to version 0.2.0.3 
svn path=/nixpkgs/trunk/; revision=29443
 2011-09-22 15:25:52 +00:00
Peter Simons a407341c8c haskell-alex-meta: updated to version 0.2.0.2 
svn path=/nixpkgs/trunk/; revision=29442
 2011-09-22 15:25:45 +00:00
Peter Simons b57a4c5e17 haskell-BNFC-meta: updated to version 0.2.2 
svn path=/nixpkgs/trunk/; revision=29441
 2011-09-22 15:25:36 +00:00
Lluís Batlle i Rossell 53cecc13b4 Fixing strace build inputs for cross building. 
svn path=/nixpkgs/trunk/; revision=29407
 2011-09-21 06:59:09 +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