1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

16938 commits

Author SHA1 Message Date
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'
 | building /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
 | output 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
Eelco Dolstra 86415488bb * libsigsegv 2.10.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30880
2011-12-14 10:35:59 +00:00
Eelco Dolstra f8f4f4af33 * gnugrep needs xz to unpack its sources.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30879
2011-12-14 10:26:44 +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
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
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 d2c923bc01 GNU grep 2.10.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30868
2011-12-13 16:09:48 +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 c044d7f56f * Forgot a few utillinuxng references.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
2011-12-13 12:57:32 +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
Eelco Dolstra 39c8bfdcc4 * New version of ‘ed’. W00t!
svn path=/nixpkgs/branches/stdenv-updates/; revision=30862
2011-12-12 23:44:49 +00:00
Eelco Dolstra 661ea8936f * ‘which’ doesn't actually depend on readline.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30861
2011-12-12 23:41:02 +00:00