1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Commit graph

19607 commits

Author SHA1 Message Date
Eelco Dolstra 3c948a1a03 * libiodbc: fix the iodbctest program, which had a broken RPATH.
svn path=/nixpkgs/trunk/; revision=34506
2012-06-13 15:26:50 +00:00
Eelco Dolstra 4f19239875 * Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of
"ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

svn path=/nixpkgs/trunk/; revision=34505
2012-06-13 14:11:52 +00:00
Peter Simons abdd4f3498 haskell-ghc-mod: updated to version 1.10.18
svn path=/nixpkgs/trunk/; revision=34498
2012-06-13 12:57:33 +00:00
Peter Simons 1de91e33f3 haskell-async: updated to version 2.0.0.0
svn path=/nixpkgs/trunk/; revision=34497
2012-06-13 12:57:29 +00:00
Lluís Batlle i Rossell c5e03fecce Updating doxygen to 1.8.1. It fixes some parsing issues in 1.8.0.
svn path=/nixpkgs/trunk/; revision=34496
2012-06-13 12:44:52 +00:00
Yury G. Kudryashov 5487fbe94a telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x)
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut.

svn path=/nixpkgs/trunk/; revision=34495
2012-06-13 07:09:23 +00:00
Yury G. Kudryashov 316222e2e1 Mass telepathy update, add telepathy-haze
svn path=/nixpkgs/trunk/; revision=34494
2012-06-13 07:09:19 +00:00
Yury G. Kudryashov 28aabd6311 kde-telepathy-0.4.0, tweak update script etc.
svn path=/nixpkgs/trunk/; revision=34493
2012-06-13 07:09:15 +00:00
Yury G. Kudryashov c6d9ead047 Add vanilla pkg-config
Some packages (e.g., telepathy) rely on the upstream way to handle
Requires.private in pkg-config.

svn path=/nixpkgs/trunk/; revision=34492
2012-06-13 07:09:10 +00:00
Yury G. Kudryashov 7ad2658f83 zanshin-0.2.1, fix advertised version
svn path=/nixpkgs/trunk/; revision=34491
2012-06-13 07:09:07 +00:00
Yury G. Kudryashov 4638c52fb6 dovecot-2.1.7
svn path=/nixpkgs/trunk/; revision=34490
2012-06-13 07:09:03 +00:00
Peter Simons ff2b57f957 Updated Haskell packages.
- BNFC-meta: updated to version 0.3.0.3
 - HUnit: added version 1.2.4.3
 - multirec: updated to version 0.7.2
 - resourcet: updated to version 0.3.2.2

svn path=/nixpkgs/trunk/; revision=34489
2012-06-13 07:08:57 +00:00
Eelco Dolstra e0b38f88db * Fortune: use a "-" instead of a "_" to separate the package name
from the version.  Otherwise "nix-env -i fortune-mod" doesn't work.
  (Reported on IRC.)

svn path=/nixpkgs/trunk/; revision=34487
2012-06-12 23:41:05 +00:00
Eelco Dolstra 4cfe058218 * Linux 3.2.20.
svn path=/nixpkgs/trunk/; revision=34486
2012-06-12 22:27:55 +00:00
Karn Kallio c89f37078d Make ProofGeneral build with Emacs 24.
svn path=/nixpkgs/trunk/; revision=34485
2012-06-12 21:51:53 +00:00
Florian Friesdorf 20db3374cf js2-mode-0-20120601
svn path=/nixpkgs/trunk/; revision=34484
2012-06-12 21:18:22 +00:00
karltk c7fb96a684 * Added coilmq and dependencies; distribute and stompclient.
svn path=/nixpkgs/trunk/; revision=34482
2012-06-12 20:16:04 +00:00
Eelco Dolstra 4c868ec330 * PHP updated to 5.3.13.
svn path=/nixpkgs/trunk/; revision=34480
2012-06-12 17:39:59 +00:00
Peter Simons 6ace4728f5 emacs-24: improved meta.description
svn path=/nixpkgs/trunk/; revision=34477
2012-06-12 12:18:12 +00:00
Peter Simons d2d77e702e haskell-cabal2nix: updated to version 1.34
svn path=/nixpkgs/trunk/; revision=34476
2012-06-12 08:42:55 +00:00
Peter Simons 7a626565df Updated Haskell packages.
- parsec: added version 3.1.3
 - xmonad-extras: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=34475
2012-06-12 08:39:32 +00:00
Lluís Batlle i Rossell fece483f5e Updating vimprobable2.
svn path=/nixpkgs/trunk/; revision=34472
2012-06-11 20:24:55 +00:00
Mathijs Kwik c0efa356fc uhc: fixed building on ghc 7.2.1+
by removing the check for the 'binary' package, which is built-in from
that version onward. This is a workaround for the problem where ghc's
built-in libraries (like containers, array, binary) don't show up in
"ghc-pkg list" output.

svn path=/nixpkgs/trunk/; revision=34471
2012-06-11 18:58:28 +00:00
Mathijs Kwik 51ec873c8d mongodb: upgraded to 2.0.6
svn path=/nixpkgs/trunk/; revision=34470
2012-06-11 17:41:14 +00:00
Mathijs Kwik 3d4ab75229 linux kernel headers: copy generated headers as well
as they are referenced from other kernel headers, this seems like the
best thing to do. Ubuntu seems to do so too.

Fixes issues with nvidia's binary driver and bbswitch on kernels > 3.3

svn path=/nixpkgs/trunk/; revision=34469
2012-06-11 17:41:11 +00:00
Mathijs Kwik 46beccef20 linux kernel aufs (needed for livecd): added to 3.4
upgraded 3.3 version to stable

svn path=/nixpkgs/trunk/; revision=34468
2012-06-11 17:41:05 +00:00
Mathijs Kwik 25b199771d google-talk-plugin: upgraded to 2.9.10.0
svn path=/nixpkgs/trunk/; revision=34467
2012-06-11 17:41:03 +00:00
Mathijs Kwik e19cc94e1a added vobcopy: nice CLI dvd ripper
svn path=/nixpkgs/trunk/; revision=34466
2012-06-11 17:40:58 +00:00
Mathijs Kwik b40092010c mkvtoolnix: upgraded to 5.6.0
svn path=/nixpkgs/trunk/; revision=34465
2012-06-11 17:40:55 +00:00
Peter Simons ac3df043d6 haskell-happstack-data: obsolete package removed
svn path=/nixpkgs/trunk/; revision=34463
2012-06-11 17:15:52 +00:00
Eelco Dolstra d63bcce038 * Added pam_ssh_agent_auth, a PAM module for authentication through
the SSH agent.

svn path=/nixpkgs/trunk/; revision=34462
2012-06-11 16:45:54 +00:00
Peter Simons e0f5d8870e Updated Emacs default version from 23.3 to 24.1.
Yay!

svn path=/nixpkgs/trunk/; revision=34461
2012-06-11 16:41:31 +00:00
Peter Simons 09321105f1 ghc: added version 7.4.2
svn path=/nixpkgs/trunk/; revision=34460
2012-06-11 16:25:45 +00:00
Peter Simons f723b4dcb4 haskell-defaults.nix: added empty 'haskellPlatform' attribute to ghcHEADPrefs
Writing generic expressions is easier if this attribute always exists.

svn path=/nixpkgs/trunk/; revision=34459
2012-06-11 15:07:33 +00:00
Peter Simons 1c9727a81c haskell-defaults.nix: explicitly set mtl version in Haskell Platform 2009.2.0.2 to fix builds with GHC 6.10.4
svn path=/nixpkgs/trunk/; revision=34458
2012-06-11 15:04:44 +00:00
Peter Simons edb10988b3 xmonad: fixed build with GHC 7.4.1
svn path=/nixpkgs/trunk/; revision=34457
2012-06-11 14:55:56 +00:00
Peter Simons a89d66337c haskell-packages.nix: updated default 'cgi' reference to the latest version
svn path=/nixpkgs/trunk/; revision=34456
2012-06-11 14:55:52 +00:00
Peter Simons 6054beaee7 haskell-Agda: patched to support modern versions of mtl
Committed on behalf of Karn Kallio.

svn path=/nixpkgs/trunk/; revision=34454
2012-06-11 10:40:10 +00:00
Florian Friesdorf 892947cd93 tesseract-3.0.1
svn path=/nixpkgs/trunk/; revision=34453
2012-06-11 10:28:28 +00:00
Florian Friesdorf 3133b57940 leptonica-1.68 needs older libpng12
no newer leptonica release available

svn path=/nixpkgs/trunk/; revision=34452
2012-06-11 10:28:25 +00:00
Florian Friesdorf a44af6bbc1 powertop-2.0
svn path=/nixpkgs/trunk/; revision=34451
2012-06-11 10:28:21 +00:00
Ludovic Courtès 22da1866a7 Qt 4.8: Disable dependency on MESA when the platform doesn't support it.
svn path=/nixpkgs/trunk/; revision=34450
2012-06-11 09:31:43 +00:00
Peter Simons cc54e3e695 all-packages.nix: removed recurseIntoAttrs from emacs24Packages
Offering the names of those packages in "nix-env -qa *" is pointless
because it's impossible to install any of those packages by name. Only
packages from emacs23Packages can be installed by name.

svn path=/nixpkgs/trunk/; revision=34449
2012-06-11 08:21:32 +00:00
Peter Simons 73ede3160b all-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=34448
2012-06-11 07:44:16 +00:00
Peter Simons b4ebc3bb42 emacs: version emacs-24.1 is out
The 24.x version is still low-prio in nixpkgs until we've figured out how to
support multiple 'emacsPackages' sets properly.

svn path=/nixpkgs/trunk/; revision=34447
2012-06-11 07:44:12 +00:00
Peter Simons 6db9c6f241 update i3status and i3lock
svn path=/nixpkgs/trunk/; revision=34446
2012-06-11 07:18:52 +00:00
Peter Simons 8b65b2e2bc afew and alot updates
svn path=/nixpkgs/trunk/; revision=34445
2012-06-11 07:18:17 +00:00
Peter Simons a7949741f6 gimp 2.8
- rename package from gimp_2_8_0 to gimp_2_8 as discussed on mailing list[1]
- remove babl_0_1_10 and gegl_0_2_0 and use them as default versions

[1] http://article.gmane.org/gmane.linux.distributions.nixos/8708

svn path=/nixpkgs/trunk/; revision=34444
2012-06-11 07:17:39 +00:00
Peter Simons 84547c5307 Fix xfontsel to find the app defaults file.
svn path=/nixpkgs/trunk/; revision=34443
2012-06-11 07:16:51 +00:00
Peter Simons 7b14de6733 Add package for vlock from Debian mirror.
This is mainly because the original upstream URL is not available anymore.

svn path=/nixpkgs/trunk/; revision=34442
2012-06-11 07:16:11 +00:00
Peter Simons 499161282e Update Django to version 1.4.
svn path=/nixpkgs/trunk/; revision=34441
2012-06-11 07:15:12 +00:00
Peter Simons 5375a3edf6 Fix installation of figlet 2.2.4.
svn path=/nixpkgs/trunk/; revision=34440
2012-06-11 07:15:10 +00:00
Peter Simons befd7e0ee8 Update figlet to version 2.2.4.
This is primarily because version 222 is no longer available at the upstream FTP
site.

svn path=/nixpkgs/trunk/; revision=34439
2012-06-11 07:15:06 +00:00
Peter Simons 3ecf94ae27 Update VirtualBox and guest additions to v4.1.16.
This includes fixes for kernels up to v3.4, so we shouldn't get build failures
with kernel 3.4 anymore.

svn path=/nixpkgs/trunk/; revision=34438
2012-06-11 07:15:03 +00:00
Peter Simons 58f3a6e25e Updated Haskell packages.
- accelerate-cuda: updated to version 0.12.1.0
 - accelerate-examples: updated to version 0.12.1.0
 - accelerate-io: updated to version 0.12.1.0
 - accelerate: updated to version 0.12.1.0
 - hakyll: updated to version 3.3.0.1
 - pandoc: updated to version 1.9.4.1
 - Vec: updated to version 0.9.9

svn path=/nixpkgs/trunk/; revision=34431
2012-06-11 07:04:40 +00:00
Karn Kallio ea102b34f6 Patch PAKCS to build with GHC 7.4.1 .
Also fix symbolic links to emacs lisp files.

svn path=/nixpkgs/trunk/; revision=34430
2012-06-11 06:05:18 +00:00
Joachim Schiele 249badd76f a minor update as the package seems to be incomplete
svn path=/nixpkgs/trunk/; revision=34428
2012-06-10 22:35:35 +00:00
Joachim Schiele 9629d66928 qt_mobility is a requirement for monav i'm going to package soon
svn path=/nixpkgs/trunk/; revision=34427
2012-06-10 21:31:06 +00:00
Lluís Batlle i Rossell 0820367a35 Adding the XFS and JFS modules to the sheevaplug kernel. They may be worth
using.


svn path=/nixpkgs/trunk/; revision=34426
2012-06-10 19:11:07 +00:00
Shea Levy 3119e4983d pv: Update source url
svn path=/nixpkgs/trunk/; revision=34425
2012-06-10 18:01:37 +00:00
Eelco Dolstra c9f95fa0c2 * net-snmp: enable Perl support.
svn path=/nixpkgs/trunk/; revision=34424
2012-06-10 17:06:35 +00:00
Lluís Batlle i Rossell 1697485678 Updating linux 3.4.1 to 3.4.2
svn path=/nixpkgs/trunk/; revision=34423
2012-06-10 15:24:28 +00:00
Lluís Batlle i Rossell 4a380e1eb1 Updating xfsprogs
svn path=/nixpkgs/trunk/; revision=34417
2012-06-10 14:41:22 +00:00
Lluís Batlle i Rossell 0f6b8dbd52 Updating pv to 1.3.1
svn path=/nixpkgs/trunk/; revision=34415
2012-06-10 10:47:16 +00:00
Karn Kallio b81add3520 Change download location for qt everywhere 4.8.2; was not found.
svn path=/nixpkgs/trunk/; revision=34414
2012-06-10 00:51:46 +00:00
Eelco Dolstra 192291eb01 * Added net-snmp.
svn path=/nixpkgs/trunk/; revision=34413
2012-06-09 23:28:07 +00:00
Lluís Batlle i Rossell 5d263987a0 Updating the sheevaplug kernel config to include btrfs and netconsole.
svn path=/nixpkgs/trunk/; revision=34412
2012-06-09 20:27:00 +00:00
Lluís Batlle i Rossell 9ebd661fb8 Updating linux 3.4 to 3.4.1
svn path=/nixpkgs/trunk/; revision=34411
2012-06-09 20:25:48 +00:00
Yury G. Kudryashov 70dbdd0e5b cups-bjnp: fix FTBFS
svn path=/nixpkgs/trunk/; revision=34410
2012-06-09 20:10:40 +00:00
Yury G. Kudryashov 94726d19e7 gutenprint-5.2.7, fix FTBFS
svn path=/nixpkgs/trunk/; revision=34409
2012-06-09 20:10:35 +00:00
Yury G. Kudryashov 29b8d20f33 Fix old typo in kdeutils/superkaramba.nix
svn path=/nixpkgs/trunk/; revision=34408
2012-06-09 13:09:59 +00:00
Yury G. Kudryashov 98a130a504 Fix some find_*
svn path=/nixpkgs/trunk/; revision=34407
2012-06-09 13:09:56 +00:00
Yury G. Kudryashov 63deb1d30a skrooge-1.3.0
svn path=/nixpkgs/trunk/; revision=34406
2012-06-09 13:09:53 +00:00
Yury G. Kudryashov baff5fc9f3 calligra-2.4.2
svn path=/nixpkgs/trunk/; revision=34405
2012-06-09 13:09:50 +00:00
Yury G. Kudryashov f6e6e4287d Add kbibtex
svn path=/nixpkgs/trunk/; revision=34404
2012-06-09 13:09:45 +00:00
Yury G. Kudryashov 3640b0c1e9 Add GiNaC
svn path=/nixpkgs/trunk/; revision=34403
2012-06-09 13:09:41 +00:00
Yury G. Kudryashov 6b6dba1bce kde-telepathy-0.3.1
Drop upstream patches already included in this version

svn path=/nixpkgs/trunk/; revision=34402
2012-06-09 13:09:37 +00:00
Yury G. Kudryashov 1629524bb2 qt-gstreamer-0.10.2
svn path=/nixpkgs/trunk/; revision=34401
2012-06-09 13:09:33 +00:00
Yury G. Kudryashov e4c0e87db0 KDE SC 4.8.4 (automatic changes)
svn path=/nixpkgs/trunk/; revision=34400
2012-06-09 13:09:29 +00:00
Yury G. Kudryashov ecc8549965 soprano-2.7.6, update patch
svn path=/nixpkgs/trunk/; revision=34399
2012-06-09 13:09:24 +00:00
Yury G. Kudryashov 70316d4e42 attica-0.4.0
svn path=/nixpkgs/trunk/; revision=34398
2012-06-09 13:09:20 +00:00
Yury G. Kudryashov 0d83120fd8 qt-4.8.2
svn path=/nixpkgs/trunk/; revision=34397
2012-06-09 13:09:16 +00:00
Yury G. Kudryashov eef17e625f pyqt-4.9.1
svn path=/nixpkgs/trunk/; revision=34396
2012-06-09 13:09:13 +00:00
Yury G. Kudryashov 888a6507e6 sip-4.13.2
svn path=/nixpkgs/trunk/; revision=34395
2012-06-09 13:09:07 +00:00
Lluís Batlle i Rossell f5cb1ecaf4 Updating the sheevaplug uboot. I've not tried it, but the old one disappeared from the server.
svn path=/nixpkgs/trunk/; revision=34394
2012-06-09 07:27:40 +00:00
Eelco Dolstra b36fce8040 * NSPR updated to 4.9.1.
svn path=/nixpkgs/trunk/; revision=34390
2012-06-08 17:41:59 +00:00
Joachim Schiele 1181658cb8 this won't compile yet as there is a python problem, probably related to what marc weber already fixed. will fix that later
svn path=/nixpkgs/trunk/; revision=34388
2012-06-08 15:57:53 +00:00
Peter Simons 330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons 87d25896c1 git-annex: updated to version 3.20120605
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +00:00
Peter Simons e55ca0628f Updated Haskell packages.
- generic-deriving: updated to version 1.2.1
 - ghc-mod: updated to version 1.10.17
 - gitit: updated to version 0.10.0.1
 - graphviz: updated to version 2999.13.0.3
 - hsemail: updated to version 1.7.2
 - split: updated to version 0.1.4.3

svn path=/nixpkgs/trunk/; revision=34384
2012-06-08 13:38:20 +00:00
Peter Simons 572b182042 all-packages.nix: removed broken 'dzen2' attribute, it refers to a non-existent file
svn path=/nixpkgs/trunk/; revision=34383
2012-06-08 13:34:43 +00:00
Eelco Dolstra dd6ab8d7bf * Linux 3.2.19.
svn path=/nixpkgs/trunk/; revision=34382
2012-06-08 13:11:38 +00:00
Joachim Schiele b6ee9fb5c0 fixed wgetpaste to make it work without having to have wget in the profile
svn path=/nixpkgs/trunk/; revision=34381
2012-06-08 12:20:41 +00:00
Arie Middelkoop 3c74283d03 Committing some outstanding modifications that I cannot make into smaller chunks anymore.
* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380
2012-06-08 10:16:46 +00:00
Andres Löh 789df7619e Updated GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=34379
2012-06-08 08:25:30 +00:00
Andres Löh acb95ca925 Removed an unnecessary (and harmful) version constraint for haskell-download-curl.
svn path=/nixpkgs/trunk/; revision=34378
2012-06-07 11:27:25 +00:00
Andres Löh 4d7e4334d9 Patching ghc-events to work with latest mtl.
svn path=/nixpkgs/trunk/; revision=34377
2012-06-07 10:58:24 +00:00
Marco Maggesi 4a5f21239f Fix build of neon on darwin
svn path=/nixpkgs/trunk/; revision=34375
2012-06-06 21:47:26 +00:00
Marco Maggesi 93f41f5ad3 Fix build of apr on darwin
svn path=/nixpkgs/trunk/; revision=34374
2012-06-06 21:44:20 +00:00
Marco Maggesi cadc02cb2b Fix build of ocaml 3.12.1 on darwin
svn path=/nixpkgs/trunk/; revision=34373
2012-06-06 20:44:11 +00:00
Cillian de Roiste 4b2c3d52de Adding optional wx (GUI) support for Erlang, which enables the graphical debugger although pman (the process manager) fails to start.
svn path=/nixpkgs/trunk/; revision=34372
2012-06-06 19:05:06 +00:00
Eelco Dolstra e9a003e3a2 * Updated systemd to 185 (which I overlooked because of the version
jump).  This contains the merged udev.

svn path=/nixpkgs/trunk/; revision=34371
2012-06-06 16:07:30 +00:00
Eelco Dolstra 36667965f9 * Updated bind to 9.7.6-P1, which includes a fix for CVE-2012-1667.
svn path=/nixpkgs/trunk/; revision=34370
2012-06-06 15:51:48 +00:00
Eelco Dolstra f677edf57f * Firefox 13.0. It's not stable yet though - it seems to hang the
first time a Flash control is loaded, with the following message on
  stderr:

    /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: symbol lookup error: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: undefined symbol: malloc_message

  Need to investigate where malloc_message is defined.

svn path=/nixpkgs/trunk/; revision=34368
2012-06-06 14:35:56 +00:00
Michael Raskin 43bc3880f6 Process relative URLs
svn path=/nixpkgs/trunk/; revision=34367
2012-06-06 13:26:48 +00:00
Peter Simons 36d30b8279 Updated Haskell packages.
- cereal: updated to version 0.3.5.2
 - leksah-server: updated to version 0.12.1.1
 - repa-algorithms: updated to version 3.2.1.1
 - repa-examples: updated to version 3.2.1.1
 - repa-io: updated to version 3.2.1.1
 - repa: updated to version 3.2.1.1
 - RepLib: updated to version 0.5.3
 - unbound: updated to version 0.4.1

svn path=/nixpkgs/trunk/; revision=34366
2012-06-06 08:08:25 +00:00
Lluís Batlle i Rossell 0332f87a0b Adding windows jom; it does not build for me still, but it's close to it.
I think it's better to share it though. I wrote a comment about the expression
not building.


svn path=/nixpkgs/trunk/; revision=34365
2012-06-05 21:24:27 +00:00
Lluís Batlle i Rossell 430b055516 Adding crossAttrs to cross-build qt with mingw32 and mingw64
svn path=/nixpkgs/trunk/; revision=34364
2012-06-05 21:21:21 +00:00
Cillian de Roiste da4c1e38fd Removed patch, no longer necessary
svn path=/nixpkgs/trunk/; revision=34363
2012-06-05 17:50:22 +00:00
Cillian de Roiste 1067f51f92 Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency
svn path=/nixpkgs/trunk/; revision=34362
2012-06-05 16:52:11 +00:00
Eelco Dolstra 73a1d5e27f * PostgreSQL updates.
svn path=/nixpkgs/trunk/; revision=34361
2012-06-05 15:24:16 +00:00
Ludovic Courtès 797fafd808 hwloc: Disable tests on Cygwin.
svn path=/nixpkgs/trunk/; revision=34359
2012-06-05 12:29:03 +00:00
Arie Middelkoop 7fd5e26ede Revert on kosmikus' request.
svn path=/nixpkgs/trunk/; revision=34358
2012-06-05 09:33:40 +00:00
Arie Middelkoop 3370d1284e Some explicit dependencies so that xmobar works with the latest haskellPlatform/stable ghc:
xmobar -> mtl-version1
mtl-version1 -> transformers-version2
where version1 and version2 are different from the default, which is needed because their
respective cabal files require that.

svn path=/nixpkgs/trunk/; revision=34357
2012-06-05 09:12:45 +00:00
Peter Simons 7d15ad90b9 Updated Haskell packages.
- http-conduit: updated to version 1.4.1.8
 - leksah-server: updated to version 0.12.1.0
 - leksah: updated to version 0.12.1.0
 - ltk: updated to version 0.12.1.0
 - yaml: updated to version 0.7.0.3

svn path=/nixpkgs/trunk/; revision=34356
2012-06-05 08:31:42 +00:00
Andres Löh cfdf9cafaa Setting GHC default version to 7.4.1, default platform to 2012.2.0.0.
svn path=/nixpkgs/trunk/; revision=34355
2012-06-05 08:09:10 +00:00
Andres Löh 8cf7f46ea0 Patching xmobar-0.15 to accept mtl-2.1.
svn path=/nixpkgs/trunk/; revision=34354
2012-06-05 08:09:06 +00:00
Cillian de Roiste 27bef25b17 Applying the patch from Rok Garbas to add GIMP 2.8.0
svn path=/nixpkgs/trunk/; revision=34352
2012-06-04 17:38:47 +00:00
Eelco Dolstra 104bd01e1d * Git 1.7.10.4.
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
Eelco Dolstra ce10ebebac * Subversion 1.7.5.
svn path=/nixpkgs/trunk/; revision=34348
2012-06-04 15:40:25 +00:00
Peter Simons f0b9f401ae haskell-defaults.nix: switched ghc-7.5 pre-release to 'future' configuration
svn path=/nixpkgs/trunk/; revision=34343
2012-06-04 09:46:26 +00:00
Peter Simons a92f3fac24 haskell-packages.nix: oops, fixed typo committed earlier
svn path=/nixpkgs/trunk/; revision=34342
2012-06-04 09:46:23 +00:00
Peter Simons 2e8c5de358 haskell-defaults.nix: updated mtl1 to the latest 1.x version (and override that choice in older compilers if necessary)
svn path=/nixpkgs/trunk/; revision=34341
2012-06-04 09:46:20 +00:00
Peter Simons c63096c9a9 haskell-filestore: disable Haddock phase to fix build with GHC 7.0.4
svn path=/nixpkgs/trunk/; revision=34340
2012-06-04 09:46:16 +00:00
Peter Simons 1495e5ac1e haskell-packages.nix: build xmobar with STM 2.3
This is the default in HP 2012.2.0.0, but GHC 7.0.4 still uses an older version.

svn path=/nixpkgs/trunk/; revision=34339
2012-06-04 09:24:22 +00:00
Peter Simons 9a59fdb416 haskell-packages.nix: added 'haskellPlatformArgs_future' configuration that has the latest version of the network library
svn path=/nixpkgs/trunk/; revision=34338
2012-06-04 09:24:18 +00:00
Peter Simons 4fdbd75e4f Updated Haskell packages.
- ghc-mod: updated to version 1.10.16
 - network: added version 2.3.0.14
 - pandoc: updated to version 1.9.4
 - xmobar: updated to version 0.15

svn path=/nixpkgs/trunk/; revision=34337
2012-06-04 09:24:14 +00:00
Rickard Nilsson 0d719146a2 Moved obnam from pythonPackages to pkgs.
svn path=/nixpkgs/trunk/; revision=34336
2012-06-04 05:02:31 +00:00
Eelco Dolstra 887c89cc33 * Include the Git shortrev in the version number.
* Less verbose output in the tarball job.

svn path=/nixpkgs/trunk/; revision=34335
2012-06-04 04:12:17 +00:00
Eelco Dolstra 1d828ffaab * systemd: use units in /etc rather than $out/etc. Also fix
references to mount/umount.

svn path=/nixpkgs/trunk/; revision=34332
2012-06-04 03:21:12 +00:00
Rickard Nilsson ca5dfc9634 obnam 1.0
obnam is a backup program with support for deduplication, compression and encryption. See http://liw.fi/obnam/.

svn path=/nixpkgs/trunk/; revision=34331
2012-06-03 22:11:09 +00:00
Peter Simons f3649161ec haskell-cabal2nix: updated to version 1.33
svn path=/nixpkgs/trunk/; revision=34329
2012-06-03 18:57:30 +00:00
Peter Simons b89f433951 haskell-reactive-banana-wx: re-generated expression with the latest version of Cabal2Nix
The package won't compile when 'buildExamples' is enabled. First of all,
it depends on an ancient version of the 'executable-path' library. That
problem can be remedied by adding

  patchPhase = ''
    sed -i -e 's|executable-path == 0.0.\*|executable-path|' reactive-banana-wx.cabal
  '';

..., but even then it won't build because the Cabal file doesn't declare
all dependencies properly. Both GHC 7.0.4 and 7.4.1 fail complaining
about the absence of Prelude.

svn path=/nixpkgs/trunk/; revision=34328
2012-06-03 18:52:43 +00:00
Peter Simons 678c30c050 xmobar: re-generated expression with the latest version of Cabal2Nix
This change enables wireless support unconditionally.

svn path=/nixpkgs/trunk/; revision=34327
2012-06-03 18:52:38 +00:00
Peter Simons 53d7bcb206 haskell-packages.nix: cosmetic, no functional change
Re-ordered entries in haskellPlatformArgs_2012_2_0_0 to match the order
in the Cabal file. This makes it easier to compare the package list side
by side.

svn path=/nixpkgs/trunk/; revision=34326
2012-06-03 18:26:15 +00:00
Peter Simons 1a024eabbc haskell-packages.nix: Haskell Platform version 2012.2.0.0 is out.
Renamed 'haskellPlatformArgs_future' to 'haskellPlatformArgs_2012_2_0_0'.

svn path=/nixpkgs/trunk/; revision=34325
2012-06-03 18:26:12 +00:00
Peter Simons 7ea86fc8a2 Updated Haskell packages.
- hlint: updated to version 1.8.29
 - hscolour: updated to version 1.20.2
 - random-fu: updated to version 0.2.3.0

svn path=/nixpkgs/trunk/; revision=34324
2012-06-03 18:26:09 +00:00
Cillian de Roiste b5d937ce33 Updating the bitcoin client to 0.6.2
svn path=/nixpkgs/trunk/; revision=34323
2012-06-02 18:00:39 +00:00
Lluís Batlle i Rossell 3ed5283c2d argh. I forgot to increase the btar version number to 1.0.1.
svn path=/nixpkgs/trunk/; revision=34322
2012-06-02 17:58:46 +00:00
Lluís Batlle i Rossell a25d4ef702 Updating btar again - failed release.
svn path=/nixpkgs/trunk/; revision=34321
2012-06-02 17:57:31 +00:00
Lluís Batlle i Rossell 0ed3babd16 Updating btar.
svn path=/nixpkgs/trunk/; revision=34320
2012-06-02 16:39:58 +00:00
Cillian de Roiste 2d85463e7d Applying patch from Rok Garbas to update weechat to 0.3.7, also taking the opportunity to tidy up the style a bit.
svn path=/nixpkgs/trunk/; revision=34318
2012-06-01 22:04:08 +00:00
Rob Vermaas 0cbfd8ff04 * update hashes for debian queeze
svn path=/nixpkgs/trunk/; revision=34316
2012-06-01 17:53:53 +00:00
Ludovic Courtès ad17bee255 hwloc: Fix typo.
svn path=/nixpkgs/trunk/; revision=34315
2012-06-01 13:06:35 +00:00
Andres Löh 23f81c74c9 Provide a shortcut for the current Haskell Platform version.
svn path=/nixpkgs/trunk/; revision=34314
2012-06-01 12:27:20 +00:00
Marco Maggesi 6cf6d40534 Update OCaml sqlite3
svn path=/nixpkgs/trunk/; revision=34312
2012-06-01 09:42:29 +00:00
Marco Maggesi de6b7ac64e Update download link for pcre-ocaml
svn path=/nixpkgs/trunk/; revision=34311
2012-06-01 06:08:29 +00:00
Marco Maggesi 7fda94a082 Upstream hash change
svn path=/nixpkgs/trunk/; revision=34310
2012-05-31 21:26:12 +00:00
Eelco Dolstra 45c8db6065 * Remove duplicate python- prefix.
svn path=/nixpkgs/trunk/; revision=34308
2012-05-31 19:22:20 +00:00
Ludovic Courtès 6bba2234c4 hwloc: Add -L' for numactl in libhwloc.la'.
svn path=/nixpkgs/trunk/; revision=34306
2012-05-31 16:45:37 +00:00