1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Commit graph

18363 commits

Author SHA1 Message Date
Eelco Dolstra 38615a16e9 * Fix the checkinstall build on Glibc 2.13.
svn path=/nixpkgs/trunk/; revision=32831
2012-03-06 19:06:33 +00:00
Eelco Dolstra 5e4c7aa8f3 * This substitution causes bash to hang. Urgh. Bash's pattern
substitutions aren't very reliable.

svn path=/nixpkgs/trunk/; revision=32830
2012-03-06 18:49:44 +00:00
Peter Simons 0be4183bd5 cups: updated to version 1.5.2
svn path=/nixpkgs/trunk/; revision=32829
2012-03-06 16:02:04 +00:00
Yury G. Kudryashov 3fa0cbb011 zlib_latest == zlib, so remove zlib/latest.nix
svn path=/nixpkgs/trunk/; revision=32828
2012-03-06 14:35:37 +00:00
Yury G. Kudryashov 614d81046c Remove cmake_2_8_7: default is already 2.8.7
svn path=/nixpkgs/trunk/; revision=32827
2012-03-06 14:35:30 +00:00
Eelco Dolstra b49ee92aa9 * Fix building libgdiplus with libpng15.
svn path=/nixpkgs/trunk/; revision=32826
2012-03-06 13:49:37 +00:00
Yury G. Kudryashov ce5a0fdf68 rekonq-0.9.0-1
svn path=/nixpkgs/trunk/; revision=32825
2012-03-06 13:08:46 +00:00
Eelco Dolstra 8778f0b368 * Change the priority of trunk builds back.
svn path=/nixpkgs/trunk/; revision=32823
2012-03-06 12:21:33 +00:00
Michael Raskin ef3a71007a Forgotten part of xsane: Use libpng specified, not the one propagated
svn path=/nixpkgs/trunk/; revision=32822
2012-03-06 12:21:09 +00:00
Eelco Dolstra 3c56e571af * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Peter Simons 88d14c0e29 git-annex: updated to version 3.20120230
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.

svn path=/nixpkgs/trunk/; revision=32819
2012-03-06 11:24:20 +00:00
Peter Simons 10ec4c4a6a all-packages.nix: xsane doesn't depend on libpng
svn path=/nixpkgs/trunk/; revision=32818
2012-03-06 11:05:50 +00:00
Peter Simons 453a3a7d39 haskell-xss-sanitize: updated to version 0.3.1.1
svn path=/nixpkgs/trunk/; revision=32817
2012-03-06 11:05:48 +00:00
Peter Simons ae52511779 haskell-clientsession: updated to version 0.7.4.2
svn path=/nixpkgs/trunk/; revision=32816
2012-03-06 11:05:45 +00:00
Peter Simons 4adb9195bc haskell-base64-bytestring: updated to version 0.1.1.1
svn path=/nixpkgs/trunk/; revision=32815
2012-03-06 11:05:42 +00:00
Michael Raskin 20c29256cf xsane needs libpng12..
svn path=/nixpkgs/trunk/; revision=32813
2012-03-06 10:18:28 +00:00
Eelco Dolstra 17fe5f329a * man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads
the first file that exists, so this is necessary to allow the
  builtin config to be overriden.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32812
2012-03-06 10:14:00 +00:00
Eelco Dolstra b57e0d8829 * man: Work around a bug in substituteInPlace. It loses the final
newline, and man requires every line in man.conf to be terminated by
  a newline.  We should fix the bug eventually though.
* man updated to 1.6g.  

svn path=/nixpkgs/branches/stdenv-updates/; revision=32811
2012-03-06 10:10:56 +00:00
Michael Raskin fd9fedc32a XaoS wants libpng12
svn path=/nixpkgs/trunk/; revision=32809
2012-03-06 09:28:08 +00:00
Peter Simons 1f847aa4c5 haskell-Crypto: fix build on GHC 7.4.1
http://anonscm.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-crypto;a=filediff;h=20120213034652-b2814-0019a3f92e453e9be86166d6c1f1bc0dad6e4d12.gz;f=patches/class-constraints.diff

svn path=/nixpkgs/trunk/; revision=32808
2012-03-05 23:32:24 +00:00
Lluís Batlle i Rossell dbe98be6a1 Updating btar
svn path=/nixpkgs/trunk/; revision=32807
2012-03-05 21:23:22 +00:00
Yury G. Kudryashov b7642bfdfb svn merge ^/nixpkgs/trunk
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
2012-03-05 21:01:47 +00:00
Yury G. Kudryashov 296eff8fbd Pass pkgconfig to kdeplasma-addons
svn path=/nixpkgs/trunk/; revision=32805
2012-03-05 20:59:19 +00:00
Yury G. Kudryashov 3b39886275 Oops, fix evaluation
Forgotten to pass pkgconfig to kdeplasma-addons

svn path=/nixpkgs/trunk/; revision=32804
2012-03-05 20:59:15 +00:00
Yury G. Kudryashov 55adb6c2f7 kdeplasma-addons depends on libdbusmenu-qt
svn path=/nixpkgs/trunk/; revision=32803
2012-03-05 20:51:25 +00:00
Yury G. Kudryashov 4767246246 kdeplasma-addons needs pkg-config to find some dependencies
svn path=/nixpkgs/trunk/; revision=32802
2012-03-05 20:51:18 +00:00
Peter Simons 6343fc34ec haskell-system-fileio: updated to version 0.3.7
svn path=/nixpkgs/trunk/; revision=32801
2012-03-05 17:52:30 +00:00
Peter Simons d5b26ac52f haskell-happstack-server: updated to version 6.6.4
svn path=/nixpkgs/trunk/; revision=32800
2012-03-05 17:52:24 +00:00
Peter Simons 05d92999a0 Updated haskell packages.
- HDBC-postgresql updated to version 2.3.2.1
 - HsOpenSSL updated to version 0.10.1.3
 - hledger-web updated to version 0.17.1
 - persistent updated to version 0.8.0.2
 - xml-conduit updated to version 0.5.3.1
 - haddock: added version 2.10.0

svn path=/nixpkgs/trunk/; revision=32799
2012-03-05 11:58:21 +00:00
Yury G. Kudryashov edb8aaed92 exiv2-0.22
svn path=/nixpkgs/trunk/; revision=32796
2012-03-05 10:27:47 +00:00
Yury G. Kudryashov 8d784d0d1b libexif-0.6.20
svn path=/nixpkgs/trunk/; revision=32795
2012-03-05 10:27:44 +00:00
Yury G. Kudryashov a28ca7b07f Remove unused patch no-po.patch
It is not used since rev 9722

svn path=/nixpkgs/trunk/; revision=32794
2012-03-05 10:27:40 +00:00
Yury G. Kudryashov f99db36748 Remove unused patch
Ncurses does not reference this patch since r32728.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32793
2012-03-05 10:00:57 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Ludovic Courtès e657e2c455 transfig: Keep using libpng 1.2.
svn path=/nixpkgs/trunk/; revision=32791
2012-03-05 09:40:36 +00:00
Yury G. Kudryashov 7760d844ba soprano-2.7.5
svn path=/nixpkgs/trunk/; revision=32790
2012-03-05 05:10:10 +00:00
Mathijs Kwik b247fa9c2c chromium: depend on libpng12
svn path=/nixpkgs/trunk/; revision=32789
2012-03-04 22:47:52 +00:00
Eelco Dolstra c1b59aa71d * Firefox 10.0.2.
svn path=/nixpkgs/trunk/; revision=32776
2012-03-04 16:34:01 +00:00
Eelco Dolstra 962b01f686 * Remove unnecessary copy on sed.
svn path=/nixpkgs/trunk/; revision=32773
2012-03-04 15:52:41 +00:00
Eelco Dolstra 27809f0ec4 * No longer needed.
svn path=/nixpkgs/trunk/; revision=32772
2012-03-04 15:50:03 +00:00
Mathijs Kwik 0f81c6363f gogoclient: added to release
svn path=/nixpkgs/trunk/; revision=32761
2012-03-04 12:28:50 +00:00
Mathijs Kwik a92fe14103 upgraded nodejs to 0.6.11
svn path=/nixpkgs/trunk/; revision=32760
2012-03-04 12:28:45 +00:00
Yury G. Kudryashov d4ffc7332c Merge trunk right before reintegrating
svn path=/nixpkgs/branches/libpng15/; revision=32758
2012-03-04 09:09:21 +00:00
Yury G. Kudryashov d982e10f34 fbida-2.09 (builds with libpng-1.5)
Cherry-pick r32756 from trunk

svn path=/nixpkgs/branches/libpng15/; revision=32757
2012-03-04 08:56:42 +00:00
Yury G. Kudryashov b0d12859fc fbida-2.09 (builds with libpng-1.5)
svn path=/nixpkgs/trunk/; revision=32756
2012-03-04 08:53:46 +00:00
Shea Levy 62a2b075e4 Update rubygems
svn path=/nixpkgs/trunk/; revision=32755
2012-03-03 17:32:11 +00:00
Ludovic Courtès 90d1e1bb83 Add UNFS3, a user-space NFSv3 server.
svn path=/nixpkgs/trunk/; revision=32753
2012-03-03 16:06:27 +00:00
Lluís Batlle i Rossell b479679b94 Fixing typos in the oprofile expression
svn path=/nixpkgs/trunk/; revision=32752
2012-03-03 12:15:58 +00:00
Lluís Batlle i Rossell 5a568ee185 Updating oprofile
svn path=/nixpkgs/trunk/; revision=32751
2012-03-03 11:30:44 +00:00
Lluís Batlle i Rossell 53e80e5316 Adding a manpage for tar, using help2man
svn path=/nixpkgs/trunk/; revision=32749
2012-03-03 09:52:55 +00:00
Ludovic Courtès d8849a045e lcov: Fix build on FreeBSD.
svn path=/nixpkgs/trunk/; revision=32746
2012-03-02 15:57:36 +00:00
Eelco Dolstra 000051b196 * VirtualBox: drop the unnecessary dependency on HAL.
svn path=/nixpkgs/trunk/; revision=32745
2012-03-02 14:54:14 +00:00
Eelco Dolstra 15e5aead3d * Upstart 1.4. Of particular interest is the "log" stanza to redirect
a job's stdout/stderr to a file, and "setuid" / "setgid" to execute
  a job as a different user/group.

svn path=/nixpkgs/trunk/; revision=32744
2012-03-02 14:46:58 +00:00
Lluís Batlle i Rossell 55fb51c2d1 Updating opencascade to 6.5.2.
I had to bring an older ftgl in.


svn path=/nixpkgs/trunk/; revision=32742
2012-03-02 13:47:37 +00:00
Eelco Dolstra a88fdf8ef7 * Oops.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32737
2012-03-02 09:35:51 +00:00
Peter Simons 6975b032b1 haskell-persistent-template: updated to version 0.8.1.2
svn path=/nixpkgs/trunk/; revision=32736
2012-03-02 08:46:43 +00:00
Peter Simons dc74dd0cb0 haskell-math-functions: updated to version 0.1.1.1
svn path=/nixpkgs/trunk/; revision=32735
2012-03-02 08:46:38 +00:00
Eelco Dolstra a753c4a170 * GCC 4.6.3 and 4.5.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32734
2012-03-01 23:15:21 +00:00
Joachim Schiele 3fc8538884 soon to come version of spring (not live yet but at least it builds compared to the former version in nixos)
svn path=/nixpkgs/trunk/; revision=32733
2012-03-01 23:14:14 +00:00
Ludovic Courtès bb08271aa6 SMBFS: Disable byte-range locking in Samba's TDB.
svn path=/nixpkgs/trunk/; revision=32732
2012-03-01 23:07:56 +00:00
Eelco Dolstra 11d1104a88 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Lluís Batlle i Rossell f20a947a5d Updating lzop
svn path=/nixpkgs/trunk/; revision=32730
2012-03-01 22:03:34 +00:00
Ludovic Courtès a55fac1a87 util-linux: Use `--disable-partx' when cross-building for GNU.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32729
2012-03-01 21:48:29 +00:00
Ludovic Courtès 0b6223cff2 GNU Ncurses: Remove patch that no longer applies.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32728
2012-03-01 21:48:25 +00:00
Eelco Dolstra 148e234aab * Fix broken symlink.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32727
2012-03-01 21:40:46 +00:00
Ludovic Courtès 8ab088c668 libchop 0.5.2.
svn path=/nixpkgs/trunk/; revision=32726
2012-03-01 21:39:43 +00:00
Peter Simons 87f8280cc9 haskell-yesod: updated to version 0.10.1.3
svn path=/nixpkgs/trunk/; revision=32725
2012-03-01 20:19:46 +00:00
Eelco Dolstra 6a5ea980ab * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=32724
2012-03-01 20:18:33 +00:00
Ludovic Courtès edfddd88b7 zlib: Add SourceForge mirror.
svn path=/nixpkgs/trunk/; revision=32721
2012-03-01 15:11:30 +00:00
Yury G. Kudryashov 1ef47d19ce udisks: avoid autoreconf
svn path=/nixpkgs/branches/stdenv-updates/; revision=32720
2012-03-01 15:09:53 +00:00
Yury G. Kudryashov 84fb9ca331 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32719
2012-03-01 15:05:27 +00:00
Eelco Dolstra a75ccf7dca * Don't set the nscd restart action here.
svn path=/nixpkgs/trunk/; revision=32717
2012-03-01 14:45:27 +00:00
Yury G. Kudryashov 92f1b06907 This is sha256, not md5
svn path=/nixpkgs/branches/stdenv-updates/; revision=32715
2012-03-01 07:19:01 +00:00
Yury G. Kudryashov 5a39444e76 Fix wrong merge
svn path=/nixpkgs/branches/stdenv-updates/; revision=32714
2012-03-01 07:16:34 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Peter Simons 57b612cb05 vpnc: added patch to fix the 'Error: either "to" is duplicate, or "ipid" is a garbage' bug
Further details are at:

  http://www.rz.uni-konstanz.de/activekb/questions/250/VPNC+unter+Ubuntu+11.10+%22Error%3A+either+%22to%22+is+duplicate%2C+or+%22ipid%22+is+a+garbage.%22

svn path=/nixpkgs/trunk/; revision=32712
2012-02-29 22:50:33 +00:00
Peter Simons 41b3f46f78 haskell-yesod: updated to version 0.10.1.1
svn path=/nixpkgs/trunk/; revision=32710
2012-02-29 20:38:33 +00:00
Peter Simons 49a9e39593 haskell-gitit: updated to version 0.9
svn path=/nixpkgs/trunk/; revision=32709
2012-02-29 19:24:49 +00:00
Peter Simons d18d66bd5f haskell-filestore: updated to version 0.4.1
svn path=/nixpkgs/trunk/; revision=32708
2012-02-29 19:24:47 +00:00
Peter Simons 81e6c12bb3 haskell-IfElse: added version 0.85
svn path=/nixpkgs/trunk/; revision=32707
2012-02-29 19:24:44 +00:00
Peter Simons a631f6de6a haskell-utility-ht: updated to version 0.0.8
svn path=/nixpkgs/trunk/; revision=32706
2012-02-29 17:30:52 +00:00
Peter Simons 4fc8cd9777 haskell-testpack: updated to version 2.1.2
svn path=/nixpkgs/trunk/; revision=32705
2012-02-29 17:30:49 +00:00
Peter Simons 3c88baeec8 haskell-convertible: updated to version 1.0.11.1
svn path=/nixpkgs/trunk/; revision=32704
2012-02-29 17:30:47 +00:00
Peter Simons 31dc88f597 haskell-clientsession: updated to version 0.7.4.1
svn path=/nixpkgs/trunk/; revision=32703
2012-02-29 17:30:44 +00:00
Peter Simons 43153fa269 haskell-authenticate: updated to version 1.0.0.1
svn path=/nixpkgs/trunk/; revision=32702
2012-02-29 17:30:42 +00:00
Peter Simons 708e6f487d haskell-HSH: updated to version 2.0.4
svn path=/nixpkgs/trunk/; revision=32701
2012-02-29 17:30:39 +00:00
Peter Simons 5f4c5c106a haskell-stm: updated to version 2.3
svn path=/nixpkgs/trunk/; revision=32700
2012-02-29 17:24:31 +00:00
Peter Simons ad4b594cce haskell-hxt: updated to version 9.2.2
svn path=/nixpkgs/trunk/; revision=32699
2012-02-29 17:24:27 +00:00
Eelco Dolstra 55ce36faee * Updated Leiningen to 1.7.0 (contributed by Phil Hagelberg; added a
call to patchShebangs to fix the reference to /bin/bash).

svn path=/nixpkgs/trunk/; revision=32698
2012-02-29 14:35:34 +00:00
Evgeny Egorochkin 287f1f0f65 spring-lobby: bump version to 0.139
svn path=/nixpkgs/trunk/; revision=32697
2012-02-29 14:29:49 +00:00
Evgeny Egorochkin 6e5a378f48 Vidalia: version bump
svn path=/nixpkgs/trunk/; revision=32696
2012-02-29 13:30:14 +00:00
Evgeny Egorochkin cf8d3fa4b9 Apparmor: packaged
svn path=/nixpkgs/trunk/; revision=32695
2012-02-29 13:30:10 +00:00
Evgeny Egorochkin bf667c9389 Vidalia: packaged
svn path=/nixpkgs/trunk/; revision=32694
2012-02-29 13:30:06 +00:00
Evgeny Egorochkin 0def4140f6 network-manager-applet: version bump
svn path=/nixpkgs/trunk/; revision=32693
2012-02-29 13:30:04 +00:00
Evgeny Egorochkin b01a720d65 TOR: version bump
svn path=/nixpkgs/trunk/; revision=32692
2012-02-29 13:30:01 +00:00
Evgeny Egorochkin cff68ececb network-manager: version bump
svn path=/nixpkgs/trunk/; revision=32691
2012-02-29 13:29:59 +00:00
Arie Middelkoop 298f4df4af Changed 'myEnvFun' to in addition put a script in 'bin' so that you can run '. load-<name>-env' to load your environment.
svn path=/nixpkgs/trunk/; revision=32690
2012-02-29 12:55:51 +00:00
Arie Middelkoop 45120513fb Cosmetic changes to newsreaders/kwooty and dropbox expressions.
svn path=/nixpkgs/trunk/; revision=32689
2012-02-29 12:54:35 +00:00
Arie Middelkoop 6e8c9ea906 ocaml-mode for emacs.
There seem to exist multiple (very old) versions.
I'm taking the one shipped with the ocaml compiler, which is hopefully the "most appropriate".

svn path=/nixpkgs/trunk/; revision=32688
2012-02-29 12:53:13 +00:00
Arie Middelkoop d9f5e277a5 OCamlMakefile update.
svn path=/nixpkgs/trunk/; revision=32687
2012-02-29 12:51:06 +00:00