Commit graph

6739 commits

Author SHA1 Message Date
Joachim Schiele 2a6579bdb6 virtinst installs now. still most tools don't work and virt-manager still has problems with finding libvirt.
svn path=/nixpkgs/trunk/; revision=34052
2012-05-10 19:29:54 +00:00
Eelco Dolstra 203b85334a * Merge the stdenv branch.
svn path=/nixpkgs/trunk/; revision=34051
2012-05-10 15:16:27 +00: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
Andres Löh 2720636b7b Reverted changes to the Haskell package defaults.
The current versions are the ones being proposed for the
new Haskell Platform. If they cause problems with other
packages, those packages should be fixed, not the defaults.

svn path=/nixpkgs/trunk/; revision=34043
2012-05-10 10:38:52 +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 bf2d945a02 * Disable some failing builds on specific platforms.
svn path=/nixpkgs/trunk/; revision=34033
2012-05-09 21:10:12 +00:00
Andres Löh 40274ca75c Adapted the ghc-7.4.1 package version defaults to upcoming Platform release.
svn path=/nixpkgs/trunk/; revision=34032
2012-05-09 17:21:37 +00:00
Andres Löh 262c2a45b0 Changing the way haskellPackagesFun is invoked.
This is supposed to make it easier to create locally modified
version preferences in Haskell package sets, by using override
on the extraPrefs attribute.

svn path=/nixpkgs/trunk/; revision=34031
2012-05-09 16:20:01 +00:00
Andres Löh aa6e1f4586 Added haskell-mpi and dependencies.
svn path=/nixpkgs/trunk/; revision=34030
2012-05-09 16:19:52 +00:00
Eelco Dolstra 24594b0fb3 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
2012-05-09 11:49:52 +00:00
Peter Simons 1cdbd5add0 numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen
The patch broke the build of matplotlib.

svn path=/nixpkgs/trunk/; revision=34023
2012-05-09 07:22:18 +00:00
Lluís Batlle i Rossell b713e291a4 The jujuutils are meant for a recent kernel, more recent than our linuxHeaders.
Therefore I add recent linuxHeaders for it.

It's quite a hack to build it mixed with 2.6.35 headers and 3.3.5, but it builds at least.


svn path=/nixpkgs/trunk/; revision=34021
2012-05-08 16:38:21 +00:00
Lluís Batlle i Rossell 671857995d Adding jujuutils.
svn path=/nixpkgs/trunk/; revision=34020
2012-05-08 15:31:21 +00:00
Russell O'Connor 812ced356f Updating cssutils.
svn path=/nixpkgs/trunk/; revision=34017
2012-05-08 11:36:04 +00:00
Lluís Batlle i Rossell 97abdd38a5 Adding the Allied Technologies libdc1394 variant and the cc1394 viewer.
svn path=/nixpkgs/trunk/; revision=34013
2012-05-08 09:50:58 +00:00
Eelco Dolstra ab55de20c1 * GMP 5.0.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34007
2012-05-07 20:03:12 +00:00
Peter Simons acc5a88cdd Updated Haskell packages.
- abstract-deque: added version 0.1.5
 - abstract-par: added version 0.3
 - bits-atomic: added version 0.1.3
 - blaze-builder-conduit: updated to version 0.4.0.2
 - IORefCAS: added version 0.2
 - MemoTrie: updated to version 0.4.12
 - monad-par: added version 0.3
 - monad-par-extras: added version 0.3
 - repa: updated to version 3.1.4.2
 - texmath: updated to version 0.6.0.6

svn path=/nixpkgs/trunk/; revision=34003
2012-05-07 09:36:49 +00:00
Eelco Dolstra 08b6b9fa3a * Cygwin: provide a Perl setup hook so that Perl dependencies work
properly.

svn path=/nixpkgs/trunk/; revision=34002
2012-05-07 02:06:29 +00:00
Joachim Schiele 0d95f69b2d virtinst
svn path=/nixpkgs/trunk/; revision=34000
2012-05-07 00:17:43 +00:00
Joachim Schiele f6c6bdda81 virt-manager is not working yet, but as we are not using git yet, i use this to cooperate with viric ;-)
svn path=/nixpkgs/trunk/; revision=33997
2012-05-06 19:25:01 +00:00
Shea Levy 497a4afe72 We no longer need the bootstub config patch
svn path=/nixpkgs/trunk/; revision=33987
2012-05-05 14:26:20 +00:00
Lluís Batlle i Rossell f9526cd7f1 Adding coriander. I don't know how to make its gconf thing work, so it shows a
warning at gui start.


svn path=/nixpkgs/trunk/; revision=33976
2012-05-03 09:38:36 +00:00
Lluís Batlle i Rossell b30b5a192e Adding libdc1394
svn path=/nixpkgs/trunk/; revision=33975
2012-05-03 07:38:58 +00:00
Eelco Dolstra 4520bb84f7 * Make mercurialFull available in the channel.
svn path=/nixpkgs/trunk/; revision=33972
2012-05-02 14:34:09 +00:00
Eelco Dolstra 5bdea119d4 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
2012-05-02 13:19:07 +00:00
Peter Simons dec4675e86 Updated Haskell packages.
- cpu: added version 0.1.0
 - cryptocipher: updated to version 0.3.1
 - fclabels: updated to version 1.1.3
 - hamlet: updated to version 1.0.1.2
 - highlighting-kate: updated to version 0.5.0.6
 - lifted-base: updated to version 0.1.1
 - monad-control: updated to version 0.3.1.3
 - reactive-banana: updated to version 0.5.0.2
 - test-framework-quickcheck2: updated to version 0.2.12.2
 - test-framework-quickcheck: updated to version 0.2.8.1

svn path=/nixpkgs/trunk/; revision=33969
2012-05-02 09:25:23 +00:00
Michael Raskin 304facbf3b Adding LCI lambda calculus interpreter
svn path=/nixpkgs/trunk/; revision=33962
2012-05-01 05:07:39 +00:00
Eelco Dolstra 930185a408 * Make Firefox 12 the default.
svn path=/nixpkgs/trunk/; revision=33955
2012-04-30 15:34:55 +00:00
Eelco Dolstra 6b1b79c172 * Fix license attributes.
svn path=/nixpkgs/trunk/; revision=33953
2012-04-30 15:24:21 +00:00
Rob Vermaas 97cac0a58c Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas)
svn path=/nixpkgs/trunk/; revision=33952
2012-04-30 14:34:57 +00:00
Rob Vermaas 0823167b43 Revert my previous 2 commits.
svn path=/nixpkgs/trunk/; revision=33951
2012-04-30 14:28:08 +00:00
Rob Vermaas 191d2e4be6 Adding i3wm, file 5.11, python packages. Patch by garbas.
svn path=/nixpkgs/trunk/; revision=33949
2012-04-30 13:30:47 +00:00
Shea Levy 23506543a4 Add minecraft
Patch by Carles Pagès, minor modification (adding in version number, updating
sha256) by me

svn path=/nixpkgs/trunk/; revision=33944
2012-04-29 14:09:58 +00:00
Peter Simons 6c37520d2a numpy: fixed build (patch by Konrad Hinsen)
svn path=/nixpkgs/trunk/; revision=33941
2012-04-28 14:14:16 +00:00
Peter Simons 27de563164 Updated Python 3.x.
- updated to version 3.2.3
 - fixed version numbers in setup-hook.sh
 - sort input variable list alphabetically
 - tk support needs x11 support as well
 - deleted obsolete version 3.1

Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.

svn path=/nixpkgs/trunk/; revision=33937
2012-04-27 08:20:46 +00:00
Eelco Dolstra 48b2a26898 * Firefox 12.0.
svn path=/nixpkgs/trunk/; revision=33931
2012-04-26 13:25:20 +00:00
Peter Simons 9ed244d86c Updated Haskell packages.
- language-javascript: updated to version 0.5.4
 - syb: updated to version 0.3.6.1
 - yesod: updated to version 1.0.1.5
 - zlib-enum: updated to version 0.2.2.1

svn path=/nixpkgs/trunk/; revision=33923
2012-04-26 08:01:34 +00:00
Ludovic Courtès 95d60d6938 nixUnstable: Use Apple-GCC on Darwin.
svn path=/nixpkgs/trunk/; revision=33920
2012-04-25 14:25:34 +00:00
Ludovic Courtès 75f636067e GNU Emacs 23: Use Apple-GCC on Darwin.
svn path=/nixpkgs/trunk/; revision=33919
2012-04-25 14:21:41 +00:00
Peter Simons 3117cc72fb Updated Haskell packages.
- clientsession: updated to version 0.7.5
 - gloss: updated to version 1.7.4.1
 - haskeline: enable terminfo support and patch to support mtl >= 2.1
 - HaskellForMaths: updated to version 0.4.5
 - HsOpenSSL: updated to version 0.10.3.1
 - language-javascript: updated to version 0.5.3
 - mtl: added version 2.1.1
 - network: updated to version 2.3.0.13
 - repa-algorithms: updated to version 3.1.3.1
 - repa-examples: updated to version 3.1.3.1
 - repa-io: updated to version 3.1.3.1
 - repa: updated to version 3.1.3.2
 - resourcet: updated to version 0.3.2.1
 - RSA: updated to version 1.2.1.0
 - yesod-auth: updated to version 1.0.2
 - yesod-form: updated to version 1.0.0.3
 - yesod: updated to version 1.0.1.3
 - zlib-enum: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=33913
2012-04-25 10:12:44 +00:00
Ludovic Courtès 7e70f890c4 Darwin: Change noSysDirs' to false' by default.
svn path=/nixpkgs/trunk/; revision=33911
2012-04-24 16:14:44 +00:00
Ludovic Courtès daaa950c31 GNU Emacs 22: Use Apple-GCC.
svn path=/nixpkgs/trunk/; revision=33901
2012-04-24 08:49:35 +00:00
Ludovic Courtès d4f26f65d9 GNU Readline 6.x: Build with Apple-GCC on Darwin.
svn path=/nixpkgs/trunk/; revision=33899
2012-04-23 23:04:05 +00:00
Ludovic Courtès daf8c7fced allStdenvs: Propagate `system'.
svn path=/nixpkgs/trunk/; revision=33898
2012-04-23 22:31:39 +00:00
Ludovic Courtès 6a85ec6abe GFortran: Use GFortran 4.6 on Darwin.
svn path=/nixpkgs/trunk/; revision=33895
2012-04-23 15:47:41 +00:00
Ludovic Courtès 29bc53265d Darwin: Use GCC 4.6 in `stdenvNix'.
svn path=/nixpkgs/trunk/; revision=33894
2012-04-23 15:47:37 +00:00
Ludovic Courtès 04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Peter Simons f1135ba545 Updated Haskell packages.
- alternative-io: updated to version 0.0.1
 - blaze-markup: added version 0.5.1.0
 - crypto-conduit: updated to version 0.3.2
 - cryptohash: updated to version 0.7.5
 - darcs: updated to version 2.8.0
 - filestore: updated to version 0.4.2
 - Graphalyze: cosmetic change
 - hamlet: updated to version 1.0.1.1
 - happstack-hamlet: updated to version 7.0.1
 - happstack-server: updated to version 7.0.1
 - HFuse: updated to version 0.2.4.1
 - Hipmunk: updated to version 5.2.0.8
 - language-javascript: updated to version 0.5.2
 - libmpd: updated to version 0.8.0
 - lifted-base: updated to version 0.1.0.4
 - monad-control: updated to version 0.3.1.2
 - persistent: updated to version 0.9.0.3
 - regex-compat: use latest version when building with GHC 7.4.1
 - skein: updated to version 0.1.0.7
 - snap-core: updated to version 0.8.1
 - snap-server: updated to version 0.8.1.1
 - tls: updated to version 0.9.5
 - vty: updated to version 4.7.0.12
 - wai-app-static: updated to version 1.2.0.2
 - yesod-core: updated to version 1.0.1.1

svn path=/nixpkgs/trunk/; revision=33889
2012-04-23 09:34:01 +00:00
Shea Levy 50a0b839af Linux 3.3.3
This incorporates the btrfs fix, so remove that patch. Also, I will test
that this builds after committing, and fix it if it fails

svn path=/nixpkgs/trunk/; revision=33885
2012-04-23 00:12:47 +00:00