Commit Graph

3218 Commits

Author SHA1 Message Date
Yury G. Kudryashov
900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Yury G. Kudryashov
5a0de50cf5 Add kde4.basket
svn path=/nixpkgs/trunk/; revision=31334
2012-01-06 00:55:30 +00:00
Yury G. Kudryashov
80d21cb05b Fix djvulibre compilation
Also remove djview3. Use djview4 instead.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31307
2012-01-05 09:54:46 +00:00
Lluís Batlle i Rossell
b1ba53e50d Adding vimprobable2. Patch by Alexander Forenmy.
svn path=/nixpkgs/trunk/; revision=31303
2012-01-04 22:12:43 +00:00
Lluís Batlle i Rossell
d0321537d9 Updating dwm to 6.0.
svn path=/nixpkgs/trunk/; revision=31301
2012-01-04 22:05:26 +00:00
Yury G. Kudryashov
394fd28e4e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Michael Raskin
07de46c2fa Update E prover
svn path=/nixpkgs/trunk/; revision=31269
2012-01-04 10:31:49 +00:00
Yury G. Kudryashov
3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Karn Kallio
ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Lluís Batlle i Rossell
d028c7e00d Adding a preliminary package for librecad. It fails to install still.
svn path=/nixpkgs/trunk/; revision=31255
2012-01-03 21:14:14 +00:00
Florian Friesdorf
5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf
f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf
195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Lluís Batlle i Rossell
e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Yury G. Kudryashov
2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Eelco Dolstra
ab13fb0c34 * Firefox updated to 9.0.1.
svn path=/nixpkgs/trunk/; revision=31236
2012-01-03 15:18:03 +00:00
Yury G. Kudryashov
e785aae6e8 Fix most packages depending on fltk
I failed to build cinepaint

svn path=/nixpkgs/trunk/; revision=31224
2012-01-03 10:32:56 +00:00
Yury G. Kudryashov
995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Yury G. Kudryashov
98e4666dcd update xfig, pull a few patches from debian
svn path=/nixpkgs/trunk/; revision=31213
2012-01-02 15:29:14 +00:00
Peter Simons
38f6d36e91 git-annex: updated to version 3.20111231
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Peter Simons
b21a827d2a ikiwiki: updated to version 3.20111229
svn path=/nixpkgs/trunk/; revision=31210
2012-01-02 14:51:20 +00:00
Yury G. Kudryashov
cb2202e499 libpano13-2.9.18
svn path=/nixpkgs/trunk/; revision=31209
2012-01-02 14:25:03 +00:00
Yury G. Kudryashov
ae88794123 dia-0.97.2
svn path=/nixpkgs/trunk/; revision=31208
2012-01-02 14:13:03 +00:00
Yury G. Kudryashov
08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Yury G. Kudryashov
7928d532a2 Fix dia.name
svn path=/nixpkgs/trunk/; revision=31204
2012-01-02 13:42:11 +00:00
Yury G. Kudryashov
097b7635af Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
2012-01-02 10:42:36 +00:00
Florian Friesdorf
90dda8a07f adjusted awesome to generated names of xcbutil-*
svn path=/nixpkgs/trunk/; revision=31186
2011-12-31 06:14:31 +00:00
Florian Friesdorf
8dd443c8df awesome-3.4.11 - ru manpages disabled because of build failure
svn path=/nixpkgs/trunk/; revision=31173
2011-12-31 04:06:02 +00:00
Lluís Batlle i Rossell
3e9953290a THe stable task warrior has a licence GPLv2+, not MIT.
svn path=/nixpkgs/trunk/; revision=31152
2011-12-29 22:28:22 +00:00
Lluís Batlle i Rossell
7d4e6bbec9 Adding task warrior unstable.
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell
99e6a23f03 Adding task warrior, stable.
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Eelco Dolstra
bf55fb9192 * Fixed Calibre (it was referring to "python2", which doesn't exist)
and updated it to 0.8.32.

svn path=/nixpkgs/trunk/; revision=31140
2011-12-29 16:22:46 +00:00
Marco Maggesi
fd64bc5289 Oops!
svn path=/nixpkgs/trunk/; revision=31126
2011-12-28 12:49:29 +00:00
Marco Maggesi
ff3b0ed420 Update HOL Light to r116
svn path=/nixpkgs/trunk/; revision=31125
2011-12-28 12:45:59 +00:00
Peter Simons
1d7bc50e9a emacs-modes/magit: updated to 1.1.0.0
svn path=/nixpkgs/trunk/; revision=31106
2011-12-26 20:24:59 +00:00
Lluís Batlle i Rossell
94a638d119 Updating digikam.
Now at least digikam now passes the configure stage. I've still not finished building it though.


svn path=/nixpkgs/trunk/; revision=31080
2011-12-25 22:54:32 +00:00
Yury G. Kudryashov
f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Peter Simons
c7bed207d8 maxima: updated to version 5.26.0
svn path=/nixpkgs/trunk/; revision=31042
2011-12-22 12:30:19 +00:00
Michael Raskin
64290dbd96 Try updating veracity
svn path=/nixpkgs/trunk/; revision=30990
2011-12-20 21:37:23 +00:00
Eelco Dolstra
63c643d072 * Firefox 9.0.
svn path=/nixpkgs/trunk/; revision=30985
2011-12-20 14:51:26 +00:00
Lluís Batlle i Rossell
25bf67915d Updating kicad.
svn path=/nixpkgs/trunk/; revision=30953
2011-12-18 14:49:39 +00:00
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
bbc4ac6e9f rsibreak-0.11
Add some metadata

svn path=/nixpkgs/trunk/; revision=30941
2011-12-16 19:55:40 +00:00
Yury G. Kudryashov
eff443fdd7 yakuake-2.9.8
svn path=/nixpkgs/trunk/; revision=30938
2011-12-16 19:38:34 +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
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
74c3fc3085 Update HOL Light to rev 114
svn path=/nixpkgs/trunk/; revision=30922
2011-12-16 07:44:29 +00:00