Yury G. Kudryashov
571365c5bd
Merge trunk into branches/libpng15. No conflicts.
...
svn path=/nixpkgs/branches/libpng15/; revision=30917
2011-12-15 20:14:55 +00:00
Peter Simons
9e839d0184
haskell-uu-parsinglib: updated to version 2.7.3.1
...
svn path=/nixpkgs/trunk/; revision=30913
2011-12-15 13:37:11 +00:00
Peter Simons
74c70eeeca
haskell-unordered-containers: updated to version 0.1.4.4
...
svn path=/nixpkgs/trunk/; revision=30912
2011-12-15 13:37:08 +00:00
Peter Simons
360bda540f
haskell-murmur-hash: updated to version 0.1.0.5
...
svn path=/nixpkgs/trunk/; revision=30911
2011-12-15 13:37:06 +00:00
Peter Simons
85ff75b1ef
haskell-monad-par: updated to version 0.1.0.2
...
svn path=/nixpkgs/trunk/; revision=30910
2011-12-15 13:37:03 +00:00
Peter Simons
de1140e0ef
haskell-case-insensitive: updated to version 0.4.0.1
...
svn path=/nixpkgs/trunk/; revision=30909
2011-12-15 13:37:01 +00:00
Peter Simons
9e7e3ae89c
haskell-network: updated to version 2.3.0.8
...
svn path=/nixpkgs/trunk/; revision=30908
2011-12-15 13:36:58 +00:00
Peter Simons
ba6e0edc9f
haskell-syb: updated version 3.x to 0.3.6
...
svn path=/nixpkgs/trunk/; revision=30907
2011-12-15 13:36:56 +00:00
Cillian de Roiste
02eb690bad
Upgrading CouchDB to 1.1.1 with SpiderMonkey 185
...
svn path=/nixpkgs/trunk/; revision=30905
2011-12-15 12:24:25 +00:00
Cillian de Roiste
47765274e5
Adding SpiderMonkey 185
...
svn path=/nixpkgs/trunk/; revision=30904
2011-12-15 12:13:36 +00:00
Cillian de Roiste
f9cbcf881d
Removing trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=30903
2011-12-15 12:11:54 +00:00
Yury G. Kudryashov
e1e6b10eee
poppler-0.18.2
...
I've checked that everything in `grep -rl poppler .` compiles.
svn path=/nixpkgs/trunk/; revision=30902
2011-12-15 08:34:34 +00:00
Yury G. Kudryashov
76c2e7d82f
xournal: prepare to poppler upgrade
...
svn path=/nixpkgs/trunk/; revision=30901
2011-12-15 08:01:03 +00:00
Yury G. Kudryashov
471ebaf6f8
calibre-0.8.30
...
svn path=/nixpkgs/trunk/; revision=30900
2011-12-15 06:58:27 +00:00
Yury G. Kudryashov
aaba1c0bf9
pdf2djvu-0.7.11
...
Preparing to poppler-0.18.x update
svn path=/nixpkgs/trunk/; revision=30896
2011-12-14 18:58:12 +00:00
Yury G. Kudryashov
63a5da5ef2
virtuoso-6.1.4
...
svn path=/nixpkgs/trunk/; revision=30890
2011-12-14 14:09:53 +00:00
Peter Simons
8d2d9449f7
Revert cryptsetup update to version 1.4.1.
...
The patch committed in revision 30839 causes nixos-rebuild to fail:
| building Nix...
| building the system configuration...
| these derivations will be built:
| /nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv
| /nix/store/csagx61sw5mzd4hb9lajx65ds5212331-udev-initrd.conf.drv
| /nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv
| /nix/store/k40r1l30amnbxqidbdl480xq46rqr0pa-udev-rules.drv
| /nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv
| /nix/store/wqhdw86v24z0x7fhp8xrqvw6g12lphij-extra-utils.drv
| building path(s) `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils'
| [pbuilding /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils
| `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/ld-linux-x86-64.so.2'
| `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/libc.so.6'
| [...]
| `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sh' -> `bash'
| `/nix/store/pmsabjn87gxlmkqlnj3hj502l687hw0f-module-init-tools-3.16/sbin/modprobe' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real'
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ata_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/basename...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/bash...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/blkid...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cat...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cdrom_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chmod...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chroot...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cryptsetup...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/dmsetup...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/e2fsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/edd_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/fsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/input_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ln...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/lvm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mdadm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mkdir...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mknod...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mount...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/path_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/reiserfsck...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/scsi_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sleep...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/switch_root...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/tune2fs...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevadm...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevd...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/umount...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/usb_id...
| patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/v4l_id...
| testing patched programs...
| GNU bash, version 4.1.2(1)-release (x86_64-unknown-linux-gnu)
| mount from util-linux-ng 2.18 (with libblkid support)
| umount (util-linux-ng 2.18)
| e2fsck 1.41.14 (22-Dec-2010)
| tune2fs 1.41.14 (22-Dec-2010)
| 173
| blkid from util-linux-ng 2.18 (libblkid 2.18.0, 30-Jun-2010)
| Library version: 1.02.66 (2011-08-12)
| LVM version: 2.02.87(2) (2011-08-12)
| reiserfsck 3.6.21 (2009 www.namesys.com)
|
| mdadm - v3.1.2 - 10th March 2010
| basename (GNU coreutils) 8.7
| Copyright (C) 2010 Free Software Foundation, Inc.
| License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html >.
| This is free software: you are free to change and redistribute it.
| There is NO WARRANTY, to the extent permitted by law.
|
| Written by David MacKenzie.
| module-init-tools version 3.16
| [qoutput is not allowed to refer to path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'
| cannot build derivation `/nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv': 1 dependencies couldn't be built
| cannot build derivation `/nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv': 1 dependencies couldn't be built
| cannot build derivation `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv': 1 dependencies couldn't be built
| error: build of `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv' failed
svn path=/nixpkgs/trunk/; revision=30885
2011-12-14 10:42:49 +00:00
Peter Simons
8285e96cb7
haskell-yesod-auth: updated to version 0.7.7.2
...
svn path=/nixpkgs/trunk/; revision=30884
2011-12-14 10:40:37 +00:00
Peter Simons
e72698bb83
haskell-iteratee: updated to version 0.8.7.5
...
svn path=/nixpkgs/trunk/; revision=30883
2011-12-14 10:40:35 +00:00
Peter Simons
e9f107003f
haskell-hashtables: updated to version 1.0.1.2
...
svn path=/nixpkgs/trunk/; revision=30882
2011-12-14 10:40:33 +00:00
Peter Simons
805f5f8661
haskell-attoparsec: updated to version 0.10.1.0
...
svn path=/nixpkgs/trunk/; revision=30881
2011-12-14 10:40:29 +00:00
Andres Löh
ea8d3f396e
Added zeromq and haskell-zeromq-haskell.
...
svn path=/nixpkgs/trunk/; revision=30878
2011-12-14 08:31:14 +00:00
Andres Löh
9d19e4fe06
Added haskell-mongoDB and dependencies.
...
svn path=/nixpkgs/trunk/; revision=30877
2011-12-14 07:57:52 +00:00
Michael Raskin
0e3d2e236e
Update Linux kernel to 3.1
...
svn path=/nixpkgs/trunk/; revision=30876
2011-12-14 07:27:58 +00:00
Marco Maggesi
f6689d01a3
Update fossil to version 1.21
...
svn path=/nixpkgs/trunk/; revision=30875
2011-12-13 22:19:06 +00:00
Michael Raskin
d5c702939c
Update Golly
...
svn path=/nixpkgs/trunk/; revision=30874
2011-12-13 21:00:42 +00:00
Michael Raskin
77e3784e9a
Dir-per-version SF layout seems to be more relevant now
...
svn path=/nixpkgs/trunk/; revision=30873
2011-12-13 21:00:26 +00:00
Michael Raskin
cbd660a83e
Oops, forgot to commit
...
svn path=/nixpkgs/trunk/; revision=30872
2011-12-13 18:53:40 +00:00
Ludovic Courtès
de2e9e6ab0
gnupdate: Really select `stdenv' packages when asked for it.
...
* maintainers/scripts/gnu/gnupdate (gnupdate)[selected-gnu-packages]:
Really limit to `stdenv' when ask for it.
svn path=/nixpkgs/trunk/; revision=30869
2011-12-13 16:11:02 +00:00
Ludovic Courtès
79819a5262
Wicd: Protect the password in the WPA2-TTLS template.
...
svn path=/nixpkgs/trunk/; revision=30867
2011-12-13 14:54:15 +00:00
Eelco Dolstra
9cc0637247
* Add xinetd to the channel.
...
svn path=/nixpkgs/trunk/; revision=30865
2011-12-13 12:43:11 +00:00
Michael Raskin
f9227dc459
Update BtrFS utilities to latest Git
...
svn path=/nixpkgs/trunk/; revision=30864
2011-12-13 04:30:49 +00:00
Karn Kallio
135fe9059f
ProofGeneral 4.1
...
svn path=/nixpkgs/trunk/; revision=30863
2011-12-13 01:13:46 +00:00
Alexander Tsamutali
7e82cfb7d6
Added support for Quake Live to Firefox wrapper.
...
svn path=/nixpkgs/trunk/; revision=30856
2011-12-12 17:25:51 +00:00
Peter Simons
b0834a993e
haskell-yesod-auth: updated to version 0.7.7.1
...
svn path=/nixpkgs/trunk/; revision=30849
2011-12-12 14:54:15 +00:00
Ludovic Courtès
05880a4aea
GCC 4.6.2.
...
svn path=/nixpkgs/trunk/; revision=30846
2011-12-12 08:35:37 +00:00
Shea Levy
2585174c99
Add rb-fsevent gem
...
svn path=/nixpkgs/trunk/; revision=30845
2011-12-11 22:24:15 +00:00
Shea Levy
1c3b3d70bb
Update rubygems, adding sass along the way
...
svn path=/nixpkgs/trunk/; revision=30844
2011-12-11 22:16:15 +00:00
Shea Levy
1f115a37a5
Ruby should work on all platforms
...
svn path=/nixpkgs/trunk/; revision=30842
2011-12-11 22:01:20 +00:00
Peter Simons
f06abc04c5
The EHC compiler is now called UHC.
...
svn path=/nixpkgs/trunk/; revision=30841
2011-12-11 19:54:40 +00:00
Peter Simons
9dab7db8a2
added git support to builder-defs
...
svn path=/nixpkgs/trunk/; revision=30840
2011-12-11 19:39:16 +00:00
Peter Simons
ba935dcbc0
upgraded cryptsetup
...
svn path=/nixpkgs/trunk/; revision=30839
2011-12-11 19:39:12 +00:00
Peter Simons
c561cbe8c8
upgraded mc
...
svn path=/nixpkgs/trunk/; revision=30838
2011-12-11 19:39:06 +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
957397a749
upgraded nodejs
...
svn path=/nixpkgs/trunk/; revision=30836
2011-12-11 19:38:57 +00:00
Peter Simons
80371eb91e
upgraded ehc to latest svn release
...
svn path=/nixpkgs/trunk/; revision=30835
2011-12-11 19:38:51 +00:00
Peter Simons
0d7a0a502e
spring: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion)
...
svn path=/nixpkgs/trunk/; revision=30834
2011-12-11 18:35:23 +00:00
Peter Simons
a856742950
torchat: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion)
...
svn path=/nixpkgs/trunk/; revision=30833
2011-12-11 18:35:20 +00:00
Peter Simons
ec962155bc
haskell-tagsoup: updated to version 0.12.6
...
svn path=/nixpkgs/trunk/; revision=30832
2011-12-11 18:01:13 +00:00
Peter Simons
57d245507b
haskell-smallcheck: updated to version 0.6
...
svn path=/nixpkgs/trunk/; revision=30831
2011-12-11 18:01:10 +00:00
