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
2989ce0cac
* Merged the stdenv branch. Yay!
...
svn path=/nixpkgs/trunk/; revision=32821
2012-03-06 11:36:22 +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
9c2c4e3af3
svn merge --reintegrate ^/nixpkgs/branches/libpng15
...
svn path=/nixpkgs/trunk/; revision=32759
2012-03-04 11:06:51 +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