Commit Graph

19252 Commits

Author SHA1 Message Date
Eelco Dolstra
b6917d3b73 * Added Ubuntu 12.04.
svn path=/nixpkgs/trunk/; revision=34055
2012-05-11 02:04:14 +00:00
Eelco Dolstra
bcefaeea13 * Don't use the prerelease of GnuPG by default.
svn path=/nixpkgs/trunk/; revision=34054
2012-05-10 23:51:40 +00:00
Ludovic Courtès
e3ccebccec GNU libc 2.13: Skip `dont_use_system_ld_so_cache.patch' on GNU.
svn path=/nixpkgs/trunk/; revision=34053
2012-05-10 20:23:45 +00:00
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
196c30de9b * Linux 3.0.31.
svn path=/nixpkgs/trunk/; revision=34036
2012-05-09 21:49:39 +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
Ludovic Courtès
c1dd4327dc GNU Guile 2.0: Fix cross-GNU builds.
svn path=/nixpkgs/trunk/; revision=34029
2012-05-09 13:42:46 +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
5930e47068 Updated Haskell packages.
- attoparsec-conduit: updated to version 0.4.0.1
 - conduit: updated to version 0.4.2
 - network-conduit: updated to version 0.4.0.1
 - persistent-sqlite: updated to version 0.9.0.2
 - persistent: updated to version 0.9.0.4
 - semigroups: updated to version 0.8.3.1
 - wai-app-static: updated to version 1.2.0.3
 - wai-extra: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.2
 - warp: updated to version 1.2.0.2
 - xml-conduit: updated to version 0.7.0.2

svn path=/nixpkgs/trunk/; revision=34027
2012-05-09 11:25:59 +00:00
Mathijs Kwik
206c6b1bbb upgraded uhc
svn path=/nixpkgs/trunk/; revision=34026
2012-05-09 10:01:41 +00:00
Mathijs Kwik
5ff5c38cb6 bbswitch: upgraded to 0.4.2
svn path=/nixpkgs/trunk/; revision=34025
2012-05-09 10:01:38 +00:00
Mathijs Kwik
aac9492dde mplayer: enabled speex support
I enabled it by default, as ffmpeg/libav/vlc/xine all have speex enabled by
default too, so it's probably on most systems already

svn path=/nixpkgs/trunk/; revision=34024
2012-05-09 10:01:35 +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
Peter Simons
58c83ceae2 haskell-file-embed: updated to version 0.0.4.3
svn path=/nixpkgs/trunk/; revision=34016
2012-05-08 10:08:16 +00:00
Peter Simons
10e9b46ffb haskell-abstract-par: updated to version 0.3.1
svn path=/nixpkgs/trunk/; revision=34015
2012-05-08 10:08:13 +00:00
Lluís Batlle i Rossell
57397d3331 Updating libraw1394 to 2.0.8.
svn path=/nixpkgs/trunk/; revision=34014
2012-05-08 09:52:16 +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
Lluís Batlle i Rossell
9b2efc0a33 Adding support in VLC for 1394 cameras.
svn path=/nixpkgs/trunk/; revision=34012
2012-05-08 09:49:38 +00:00
Shea Levy
829e78f78f Linux 3.3.5
svn path=/nixpkgs/trunk/; revision=34011
2012-05-07 22:24:35 +00:00
Eelco Dolstra
32649ce94c * libpng 1.5.10, which includes a fix for CVE-2011-3048.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34010
2012-05-07 20:12:53 +00:00
Eelco Dolstra
b5fa2175db * Zlib updated to 1.2.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34009
2012-05-07 20:10:50 +00:00
Eelco Dolstra
356ce12cd0 * Python 2.7.3 (including various security fixes).
svn path=/nixpkgs/branches/stdenv-updates/; revision=34008
2012-05-07 20:08:10 +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
Eelco Dolstra
6c36eece34 * Remove the FreeBSD patch. It no longer applies and no longer seems needed.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34006
2012-05-07 19:56:14 +00:00
Michael Raskin
36b543a26e Fixing webserver path..
svn path=/nixpkgs/trunk/; revision=34005
2012-05-07 16:34:58 +00:00
Peter Simons
3a61a44035 Added missing meta.maintainers tags.
svn path=/nixpkgs/trunk/; revision=34004
2012-05-07 09:38:04 +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
Eelco Dolstra
d0a1fe6b90 * Revert to the OpenSSL 1.0.0 series (though a newer version) because
1.0.1 doesn't build on FreeBSD and Darwin (due to our patches).

svn path=/nixpkgs/branches/stdenv-updates/; revision=34001
2012-05-07 01:08:33 +00:00
Joachim Schiele
0d95f69b2d virtinst
svn path=/nixpkgs/trunk/; revision=34000
2012-05-07 00:17:43 +00:00
Joachim Schiele
2b126e57b2 virtinst is still missing, but i will finish this tomorrow
svn path=/nixpkgs/trunk/; revision=33999
2012-05-06 23:08:20 +00:00
Joachim Schiele
38ec761dcf nearly there, please someone check: libvirt/default.nix and see this post: http://www.redhat.com/archives/libvir-list/2007-May/msg00064.html
svn path=/nixpkgs/trunk/; revision=33998
2012-05-06 22:39:39 +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
Karn Kallio
e96679b973 Apply patch from Michel Alexandre Salim advancing mysql workbench version to 5.2.39.
svn path=/nixpkgs/trunk/; revision=33996
2012-05-06 02:59:25 +00:00
Shea Levy
4a292d3bd6 gem nix missed a lot of hashes, strange...
svn path=/nixpkgs/trunk/; revision=33995
2012-05-05 20:25:42 +00:00
Shea Levy
c21ab61f9a gem nix failed to fill in the hash for bundler
svn path=/nixpkgs/trunk/; revision=33994
2012-05-05 20:12:54 +00:00
Shea Levy
5425b06ef6 Update rubygems
svn path=/nixpkgs/trunk/; revision=33993
2012-05-05 20:09:48 +00:00
Marco Maggesi
2cef87022c Update HOL Light to r134
svn path=/nixpkgs/trunk/; revision=33992
2012-05-05 16:46:53 +00:00
Lluís Batlle i Rossell
2523c0b9d1 Updating lrzip to 0.612.
svn path=/nixpkgs/trunk/; revision=33991
2012-05-05 15:50:31 +00:00
Eelco Dolstra
0ae007e26f * OpenSSL 1.0.1b (includes security fixes).
svn path=/nixpkgs/branches/stdenv-updates/; revision=33989
2012-05-05 15:00:10 +00:00
Eelco Dolstra
69c66055b7 * OpenSSH 6.0.
svn path=/nixpkgs/trunk/; revision=33988
2012-05-05 14:42:17 +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
7a4c5e084c Updating calibre, and adding sourceforge as a backup url, suggested by roconnor.
svn path=/nixpkgs/trunk/; revision=33983
2012-05-04 19:01:51 +00:00
Rob Vermaas
49d0db04a3 update tomcat-connectors url
svn path=/nixpkgs/trunk/; revision=33982
2012-05-03 13:50:11 +00:00
Lluís Batlle i Rossell
593eeb54d0 Fixing a typo, semicolon, in the coriander expression.
svn path=/nixpkgs/trunk/; revision=33980
2012-05-03 12:07:45 +00:00
Lluís Batlle i Rossell
6209407d7a Adding the license meta for two packages I added today.
svn path=/nixpkgs/trunk/; revision=33977
2012-05-03 09:41:11 +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
Peter Simons
8b8ab3e977 Updated Haskell packages.
- reactive-banana: updated to version 0.5.0.3
 - vault: updated to version 0.2.0.0
 - wai: patched to support recent versions of the vault library

svn path=/nixpkgs/trunk/; revision=33974
2012-05-03 07:23:57 +00:00
Joachim Schiele
acbd97ed2e a new revision
svn path=/nixpkgs/trunk/; revision=33973
2012-05-02 19:42:23 +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
e0bd67afd7 git-annex: updated to version 3.20120430
svn path=/nixpkgs/trunk/; revision=33970
2012-05-02 09:25:28 +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
063b03b650 Update Julia; a few fixes get included; changes to build system
svn path=/nixpkgs/trunk/; revision=33968
2012-05-02 03:14:05 +00:00
Eelco Dolstra
be901fa8be * Add an installCheckPhase.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
2012-05-01 21:00:30 +00:00
Eelco Dolstra
40609ab6d5 * Add a hook for running a test after the RPMs have been installed.
svn path=/nixpkgs/trunk/; revision=33966
2012-05-01 20:31:01 +00:00
Eelco Dolstra
87693235b8 * Dropbox updated to 1.4.0. Patch by Michel Alexandre Salim
<michel@sylvestre.me>.

svn path=/nixpkgs/trunk/; revision=33965
2012-05-01 16:25:48 +00:00
Joachim Schiele
424c24d4fc updated to a new version
svn path=/nixpkgs/trunk/; revision=33964
2012-05-01 12:40:57 +00:00
Michael Raskin
6ed169c19d Update Clojure to 1.4.0
svn path=/nixpkgs/trunk/; revision=33963
2012-05-01 11:39:58 +00:00
Michael Raskin
304facbf3b Adding LCI lambda calculus interpreter
svn path=/nixpkgs/trunk/; revision=33962
2012-05-01 05:07:39 +00:00
Shea Levy
242e54dab6 Linux 3.3.4 (not compile tested, sorry
svn path=/nixpkgs/trunk/; revision=33956
2012-04-30 17:31: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
83f7c6988e * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=33954
2012-04-30 15:33:59 +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
0362f55a22 add missing files from previous commit
svn path=/nixpkgs/trunk/; revision=33950
2012-04-30 13:45:50 +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
Rob Vermaas
506c2ee455 Update offlineimap to 6.5.3. Patch by garbas.
svn path=/nixpkgs/trunk/; revision=33948
2012-04-30 12:47:30 +00:00
Michael Raskin
9683cada87 Update ECL
svn path=/nixpkgs/trunk/; revision=33947
2012-04-30 08:14:19 +00:00
Peter Simons
5c1b0582d2 build-support/fetchurl/mirrors.nix: add funet.fi to more mirrors
Committed on behalf of Ilja Honkonen <ilja.honkonen@helsinki.fi>.

svn path=/nixpkgs/trunk/; revision=33946
2012-04-29 18:17:50 +00:00
Peter Simons
0eac8bb084 mysql51: update location of mysql-5.1.54.tar.gz
Committed on behalf of Ilja Honkonen <ilja.honkonen@helsinki.fi>.

svn path=/nixpkgs/trunk/; revision=33945
2012-04-29 18:17:46 +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
ce7f9e1d14 Updated Haskell packages.
- crypto-api: updated to version 0.10.2
 - hashtables: updated to version 1.0.1.6
 - hjsmin: updated to version 0.1.1
 - repa: updated to version 3.1.3.3

svn path=/nixpkgs/trunk/; revision=33940
2012-04-27 13:18:36 +00:00
Eelco Dolstra
5287bbf3a8 * Don't build mysql-workbench on i686-linux since it just hangs
(http://hydra.nixos.org/build/2482930).

svn path=/nixpkgs/trunk/; revision=33939
2012-04-27 09:31:11 +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
fa276c45dd * Set preferLocalBuild on a few more trivial builders.
svn path=/nixpkgs/trunk/; revision=33935
2012-04-26 15:17:43 +00:00
Eelco Dolstra
e5fc65ed40 * writeTextFile: don't use the build hook. NixOS uses this function a
lot, and it causes a lot of unnecessary overhead on machines with
  remote building enabled.

svn path=/nixpkgs/trunk/; revision=33934
2012-04-26 15:01:41 +00:00
Eelco Dolstra
48b2a26898 * Firefox 12.0.
svn path=/nixpkgs/trunk/; revision=33931
2012-04-26 13:25:20 +00:00
Eelco Dolstra
fbd90d2103 * SQLite updated to 3.7.11.
svn path=/nixpkgs/trunk/; revision=33930
2012-04-26 13:24:58 +00:00
Peter Simons
2e44afa7bb ikiwiki: updated to version 3.20120419
svn path=/nixpkgs/trunk/; revision=33924
2012-04-26 08:09:31 +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
Lluís Batlle i Rossell
f5da2fe902 Updating calibre
svn path=/nixpkgs/trunk/; revision=33922
2012-04-25 21:31:09 +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
Lluís Batlle i Rossell
32d84a2338 Adding a mirror for the pyqt version we use; the usual upstream channel does not
have the file anymore.


svn path=/nixpkgs/trunk/; revision=33917
2012-04-25 13:56:08 +00:00
Eelco Dolstra
b222e1b61f * Updated the EC2 API tools to 1.5.3.0.
svn path=/nixpkgs/trunk/; revision=33916
2012-04-25 13:33:25 +00:00