Commit graph

431 commits

Author SHA1 Message Date
Peter Simons a814d0bc90 SANE: switch snapshot version of the backends to git (and general cleanup) 2012-11-26 16:18:05 +01:00
Peter Simons 0a6914a1ff gocr: fix path to 'wish' in gocr.tcl 2012-11-23 22:22:52 +01:00
Peter Simons 6287f78dcf gocr: update to version 0.49 2012-11-23 22:18:36 +01:00
Michael Raskin 070f38d48d Update pqiv 2012-10-18 00:34:09 +04:00
Peter Simons 6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
Rickard Nilsson 5dbe17f315 darktable: Update to version 1.0.5 2012-10-09 22:53:38 +02:00
Eelco Dolstra 54aea93a84 inkscape: Update to 0.48.3.1
http://hydra.nixos.org/build/3151653
2012-10-09 12:10:45 -04:00
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Lluís Batlle i Rossell cd1a5cd784 gimp: updating from 2.8.0 to 2.8.2 2012-09-21 18:02:45 +02:00
Eelco Dolstra 75ec7a07c2 geeqie: Update to 1.1 2012-09-13 17:15:58 -04:00
Michael Raskin 3f887534be Meshlib: update to 1.3.2, it now builds and runs 2012-08-30 10:18:24 +04:00
Michael Raskin 098b0c6a1d Rapcad: add
Rapcad is a tool similar to OpenSCAD but with a richer language.
2012-08-27 15:41:49 +04:00
Sergey Mironov 222b6e21a5 gimp: revert broken gimp-2.6 dependencies 2012-08-23 03:09:19 +04:00
Shea Levy 3c6a778b02 dia: Fix build with glib-2.32.4 2012-07-15 11:01:27 -04:00
Shea Levy 1a0baad6b2 Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh 2012-07-15 03:32:50 -04:00
Lluís Batlle i Rossell dcdea9d2b8 cinepaint: updating, and making it build
I wrote a little patch for the cmake files, or it
didn't install.

I also used the NIX_LDFLAGS trick; they are not doing proper linking somehow.
2012-07-02 22:27:18 +02:00
Lluís Batlle i Rossell 6389fcdbde rawtherapee: updating it. It fixes its build. 2012-07-02 20:10:10 +02:00
Peter Simons 7c76847d5b mirage: add version 0.9.5.2
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 17:13:35 +02:00
Peter Simons 36e345d052 mcomix: added version 0.98
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 17:13:35 +02:00
Lluís Batlle i Rossell 7de1a6a074 Updating digikam to 2.6.0. It builds.
svn path=/nixpkgs/trunk/; revision=34564
2012-06-19 17:42:08 +00:00
Florian Friesdorf 892947cd93 tesseract-3.0.1
svn path=/nixpkgs/trunk/; revision=34453
2012-06-11 10:28:28 +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
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
Michael Raskin f5211427b4 Adding zgrviewer
svn path=/nixpkgs/trunk/; revision=34166
2012-05-18 09:32:02 +00:00
Rob Vermaas d4913759da Update darktable to version 1.0.
svn path=/nixpkgs/trunk/; revision=33688
2012-04-09 17:56:38 +00:00
Peter Simons 8beb891d52 xscreensaver: updated to version 5.15 (and moved to pkgs/misc/screensavers hierarchy)
svn path=/nixpkgs/trunk/; revision=33655
2012-04-06 19:30:30 +00:00
Yury G. Kudryashov a6ef1ee30a Add champlain support to geeqie
This commit reverts 33187 and changes libchamplain arg to libchamplain_0_6.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33292
2012-03-20 11:16:10 +00:00
Yury G. Kudryashov 23dbae430f Disable libchamplain support in geeqie
It depends on old libchamplain which fails to build with newer glib.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33187
2012-03-17 13:30:36 +00:00
Yury G. Kudryashov bd17f891dd +1 patch (from Gentoo)
svn path=/nixpkgs/trunk/; revision=33094
2012-03-14 23:34:30 +00:00
Yury G. Kudryashov 003b24ac45 Trying to fix k3d build
svn path=/nixpkgs/trunk/; revision=33089
2012-03-14 21:57:43 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
2012-03-14 21:57:32 +00:00
Lluís Batlle i Rossell bed87f75ca Updating paraview.
svn path=/nixpkgs/trunk/; revision=33086
2012-03-14 21:50:17 +00:00
Yury G. Kudryashov f105c2353b Pass libgnome_keyring, not gnome_keyring
svn path=/nixpkgs/trunk/; revision=33082
2012-03-14 19:35:55 +00:00
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
Cillian de Roiste d91165c368 Updating Inkscape to 0.48.2
svn path=/nixpkgs/trunk/; revision=29971
2011-10-22 00:01:26 +00:00
Eelco Dolstra 5e51aadc10 * Fix evaluation errors.
svn path=/nixpkgs/trunk/; revision=29955
2011-10-21 14:43:18 +00:00
Lluís Batlle i Rossell ce2bceeeac Updating feh.
svn path=/nixpkgs/trunk/; revision=29798
2011-10-12 21:25:05 +00:00
Yury G. Kudryashov 87b968e858 Use fetchurl_gnome in dia
+small style changes (though almost all string changed)

svn path=/nixpkgs/trunk/; revision=29389
2011-09-20 06:31:37 +00:00
Yury G. Kudryashov d6c9400fbc s/popplerData/poppler_data/ in xournal
svn path=/nixpkgs/trunk/; revision=29344
2011-09-19 10:03:25 +00:00
Yury G. Kudryashov fa506acf29 comical: build with wxGTK28
svn path=/nixpkgs/trunk/; revision=29339
2011-09-19 05:16:32 +00:00
Ludovic Courtès db867607cb Add GimpLensfun.
svn path=/nixpkgs/trunk/; revision=28997
2011-09-03 17:31:10 +00:00
Yury G. Kudryashov 597412252a Wrap kde-related packages in kdePackagesFor
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
2011-08-26 13:49:23 +00:00
David Guibert c716ac66e0 add jbrout, a photo manager using IPTC keywords/EXIF
svn path=/nixpkgs/trunk/; revision=28759
2011-08-22 20:26:11 +00:00
Yury G. Kudryashov d67ed200d2 Upgrade kipi-plugins to 1.9.0
svn path=/nixpkgs/trunk/; revision=28674
2011-08-19 09:27:44 +00:00
David Guibert 364a74843a update paraview to 3.10.1
<patch description>

Signed-off-by: David Guibert <david.guibert@gmail.com>

svn path=/nixpkgs/trunk/; revision=28618
2011-08-16 18:17:26 +00:00
Lluís Batlle i Rossell 5a177910ad Fixing a bug in 'giv'. Reported upstream already.
svn path=/nixpkgs/trunk/; revision=28504
2011-08-12 08:31:48 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
2011-07-31 19:44:58 +00:00
Cillian de Roiste 1d22700866 Removing exif patch, no longer needed
svn path=/nixpkgs/trunk/; revision=28017
2011-07-31 10:50:06 +00:00
Cillian de Roiste 53b9044b19 Updating darktable to 0.9.1
svn path=/nixpkgs/trunk/; revision=28016
2011-07-31 10:49:19 +00:00
Eelco Dolstra 8099c514f9 * Xscreensaver updated to 5.14.
svn path=/nixpkgs/branches/kde-4.7/; revision=28003
2011-07-29 16:04:44 +00:00
Sander van der Burg 5693872dc1 Bumped feh to version 1.14.2 as the previous one does not exist anymore
svn path=/nixpkgs/trunk/; revision=27800
2011-07-15 15:10:22 +00:00