Commit graph

348 commits

Author SHA1 Message Date
Lluís Batlle i Rossell
214c1357f9 Updating feh to 2.4
svn path=/nixpkgs/trunk/; revision=32893
2012-03-08 13:45:58 +00:00
Lluís Batlle i Rossell
bb724044b6 Updating giv.
svn path=/nixpkgs/trunk/; revision=32881
2012-03-08 10:08:56 +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
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
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Yury G. Kudryashov
04d2aa443e graphicsmagick-1.3.13 builds with libpng-1.5
svn path=/nixpkgs/trunk/; revision=32523
2012-02-23 21:14:19 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Lluís Batlle i Rossell
2ce218c434 Updating Wings3D to 1.4.1
svn path=/nixpkgs/trunk/; revision=32470
2012-02-22 11:25:17 +00:00
Eelco Dolstra
e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Lluís Batlle i Rossell
fb12a6838f I remove clapack, and an unused reference I found.
Now liblapack provides a c interface too.


svn path=/nixpkgs/trunk/; revision=32466
2012-02-21 22:16:33 +00:00
Ludovic Courtès
a283887388 Xfig: Fix URL; add `meta.platforms'.
svn path=/nixpkgs/trunk/; revision=32457
2012-02-21 14:45:53 +00:00
Yury G. Kudryashov
743c7e3539 Let hydra build paraview with qt-4.7 and qt-4.8
svn path=/nixpkgs/trunk/; revision=32452
2012-02-21 12:57:23 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
aaad871c35 inkscape: a couple of upstream patches to fix FTBFS with libpng-1.5
svn path=/nixpkgs/trunk/; revision=32391
2012-02-19 09:22:24 +00:00
Yury G. Kudryashov
79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Yury G. Kudryashov
4df117c395 ufraw-0.18 (builds with libpng-1.5)
svn path=/nixpkgs/trunk/; revision=32336
2012-02-16 18:39:31 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Yury G. Kudryashov
1eed9f56e3 gimp-2.6.12
svn path=/nixpkgs/trunk/; revision=32320
2012-02-16 11:17:16 +00:00
Lluís Batlle i Rossell
4ad673b3f4 Updating paraview.
svn path=/nixpkgs/trunk/; revision=32319
2012-02-16 11:07:07 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Yury G. Kudryashov
3217e1c5c3 djview-4.8, fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32171
2012-02-10 10:13:44 +00:00
Yury G. Kudryashov
f9c551a41f hugin-2011.4.0
svn path=/nixpkgs/trunk/; revision=32170
2012-02-10 10:13:39 +00:00
Lluís Batlle i Rossell
ab93b3a032 Updating imagemagick; I think it's meant to build with the new zlib 1.2.6.
I'll let hydra try it.

I don't update this in trunk because a lot depends on this.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32166
2012-02-09 19:45:31 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov
4a5673f520 graphicsmagick: add meta.platforms
svn path=/nixpkgs/trunk/; revision=32022
2012-02-03 21:02:00 +00:00
Yury G. Kudryashov
3256c40575 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
2012-01-27 11:48:58 +00:00
Michael Raskin
393f2479f8 Fix mismatch...
svn path=/nixpkgs/trunk/; revision=31870
2012-01-26 19:39:45 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Michael Raskin
b9916f0fd9 Add K3D 3D editor
svn path=/nixpkgs/trunk/; revision=31850
2012-01-26 13:12:36 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
185a3d13aa digikam-2.5.0
svn path=/nixpkgs/trunk/; revision=31715
2012-01-19 20:28:13 +00:00
Yury G. Kudryashov
8deba0e4f8 Revert digikam change
svn path=/nixpkgs/trunk/; revision=31714
2012-01-19 20:28:09 +00:00
Yury G. Kudryashov
d38c5e7ee4 KTorrent 4.1.3, fix build with KDE 4.8
svn path=/nixpkgs/trunk/; revision=31713
2012-01-19 20:28:05 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
4a11f058e4 update darktable, apply upstream libpng-15 patch
svn path=/nixpkgs/trunk/; revision=31458
2012-01-09 17:55:31 +00:00
Yury G. Kudryashov
cd6824cb9f -kde3.kuickshow, +kde4.kuickshow
svn path=/nixpkgs/trunk/; revision=31407
2012-01-07 17:06:57 +00:00
Yury G. Kudryashov
7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Lluís Batlle i Rossell
d1807a7b9b Making fbida cross-build.
svn path=/nixpkgs/trunk/; revision=31400
2012-01-07 15:03:56 +00:00
Yury G. Kudryashov
ac911fce68 Fix XaraLX, add debian-patches.sh
svn path=/nixpkgs/trunk/; revision=31358
2012-01-06 18:13:11 +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
98e4666dcd update xfig, pull a few patches from debian
svn path=/nixpkgs/trunk/; revision=31213
2012-01-02 15:29:14 +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
7928d532a2 Fix dia.name
svn path=/nixpkgs/trunk/; revision=31204
2012-01-02 13:42:11 +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
76c2e7d82f xournal: prepare to poppler upgrade
svn path=/nixpkgs/trunk/; revision=30901
2011-12-15 08:01:03 +00:00
Lluís Batlle i Rossell
eb38ca06bf Updating giv.
svn path=/nixpkgs/trunk/; revision=30508
2011-11-21 14:47:28 +00:00
Evgeny Egorochkin
11426750a0 Revert "DigiKam: fix deps"
This commit breaks hydra evaluation for some reason, but it works locally for some reason...
This reverts commit 3ba002080ab1d8e28ca1b824de01a5156487735f.

svn path=/nixpkgs/trunk/; revision=30355
2011-11-09 14:24:14 +00:00
Evgeny Egorochkin
f8799c65fd DigiKam: fix deps
svn path=/nixpkgs/trunk/; revision=30354
2011-11-09 13:01:55 +00:00