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
Yury G. Kudryashov
1e74801dc4
wacomtablet-1.3.5
...
svn path=/nixpkgs/trunk/; revision=30946
2011-12-16 22:33:28 +00:00
Yury G. Kudryashov
9d43831de2
krusader-2.4.0beta1
...
svn path=/nixpkgs/trunk/; revision=30945
2011-12-16 22:33:16 +00:00
Yury G. Kudryashov
dc2af32b74
polkit-qt-1-0.103.0
...
Fixes crash https://bugs.kde.org/show_bug.cgi?id=258916
svn path=/nixpkgs/trunk/; revision=30942
2011-12-16 19:55:48 +00:00
Yury G. Kudryashov
bbc4ac6e9f
rsibreak-0.11
...
Add some metadata
svn path=/nixpkgs/trunk/; revision=30941
2011-12-16 19:55:40 +00:00
Yury G. Kudryashov
c93380381c
kdelibs: remove unused parameter
...
svn path=/nixpkgs/trunk/; revision=30939
2011-12-16 19:38:43 +00:00
Yury G. Kudryashov
eff443fdd7
yakuake-2.9.8
...
svn path=/nixpkgs/trunk/; revision=30938
2011-12-16 19:38:34 +00:00
Andres Löh
c11749dcd6
Updated the GHC HEAD snapshot.
...
svn path=/nixpkgs/trunk/; revision=30937
2011-12-16 18:11:23 +00:00
Peter Simons
c919a8ae21
popt: revert update to version 1.16
...
After revision 30933, nixos-rebuild fails, saying:
output is not allowed to refer to path `/nix/store/1q7jn20nn85hp0z66iqqf1wb53sgs81w-popt-1.16'
WTF does that mean?
svn path=/nixpkgs/trunk/; revision=30934
2011-12-16 11:57:17 +00:00
Peter Simons
21ba038044
popt: updated to version 1.16
...
svn path=/nixpkgs/trunk/; revision=30933
2011-12-16 11:44:44 +00:00
Peter Simons
bf2e8e0bcc
amarok: added missing function arguments
...
svn path=/nixpkgs/trunk/; revision=30932
2011-12-16 11:44:40 +00:00
Yury G. Kudryashov
f547c64008
Remove unused 'filelight = ...'
...
svn path=/nixpkgs/trunk/; revision=30931
2011-12-16 10:49:06 +00:00
Yury G. Kudryashov
2c3b02169f
rekonq-0.8.1
...
svn path=/nixpkgs/trunk/; revision=30930
2011-12-16 10:48:59 +00:00
Yury G. Kudryashov
0971831ddc
Reintegrate branches/drop-kde4.5
...
svn path=/nixpkgs/trunk/; revision=30928
2011-12-16 10:39:22 +00:00
Marco Maggesi
b41da3c8df
Add ocamlnat (native toplevel for OCaml)
...
svn path=/nixpkgs/trunk/; revision=30926
2011-12-16 09:35:13 +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
Marco Maggesi
ef32f76d6e
Update OUnit to version 1.1.0
...
svn path=/nixpkgs/trunk/; revision=30924
2011-12-16 09:13:47 +00:00
Marco Maggesi
9819d7b26a
Update OCaml 3.12.0 to 3.12.1
...
svn path=/nixpkgs/trunk/; revision=30923
2011-12-16 08:11:19 +00:00
Marco Maggesi
74c3fc3085
Update HOL Light to rev 114
...
svn path=/nixpkgs/trunk/; revision=30922
2011-12-16 07:44:29 +00:00
Yury G. Kudryashov
05f5c8802e
shared-desktop-ontologies-0.8.1
...
See
http://trueg.wordpress.com/2011/11/25/the-different-places-something-can-go-wrong/
svn path=/nixpkgs/trunk/; revision=30918
2011-12-15 20:16:46 +00:00
Yury G. Kudryashov
b077940b3b
svn merge https://nixos.org/repos/nix/nixpkgs/trunk
...
No conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +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
14bbbbbed2
Review dbus-lib expression
...
* Move pkgconfig to buildNativeInputs
svn path=/nixpkgs/branches/stdenv-updates/; revision=30895
2011-12-14 18:22:55 +00:00
Yury G. Kudryashov
5c507048dd
Review dbus-glib expression
...
* Move pkgconfig and gettext to buildNativeInputs
* Add deprecation warning
svn path=/nixpkgs/branches/stdenv-updates/; revision=30894
2011-12-14 18:22:48 +00:00
Yury G. Kudryashov
3103799d47
Update dbus and dbus-glib to the latest stable versions
...
Drop unstable versions
svn path=/nixpkgs/branches/stdenv-updates/; revision=30893
2011-12-14 18:22:34 +00:00
Eelco Dolstra
26046ace01
* Updated attr and acl.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30892
2011-12-14 14:43:43 +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
Yury G. Kudryashov
63a5da5ef2
virtuoso-6.1.4
...
svn path=/nixpkgs/trunk/; revision=30890
2011-12-14 14:09:53 +00:00
Eelco Dolstra
9eb4c4ddef
* GCC 4.6: drop the cloog-ppl backend, which seems obsolete.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30889
2011-12-14 14:07:23 +00:00
Eelco Dolstra
594dec7c7f
* mpc updated to 0.9.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30888
2011-12-14 14:05:22 +00:00
Eelco Dolstra
adcb6d6a13
* Cleanup.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30887
2011-12-14 13:37:17 +00:00
Eelco Dolstra
bad4ed8717
* PCRE updated to 8.21. Also enable Unicode support by default, since
...
it only increases the size of the library a little bit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30886
2011-12-14 13:36:38 +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
