1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

686 commits

Author SHA1 Message Date
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát 8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Bjørn Forsman 7c3c839fb6 openscad: compile the correct version number
The default version info that is compiled into openscad is the build
date(!). Force the version to the actual release version instead.
2013-04-25 08:41:46 +02:00
Bjørn Forsman 9f04208116 openscad: add longDescription and license
longDescription is taken from openscad homepage.
2013-04-25 08:20:49 +02:00
Bjørn Forsman ee322d440c openscad: bump to 2013.01
Bump to latest release. Use tarball instead of git.
2013-04-25 08:19:55 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Rickard Nilsson 1f82083c20 darktable: Update to 1.2 2013-04-08 18:22:15 +02:00
Lluís Batlle i Rossell 79d155f874 pinta: updating it. It works now. 2013-04-08 11:53:08 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Rickard Nilsson c544639554 darktable: Add 1.2-RC1 as darktable12 2013-04-02 15:53:57 +02:00
Lluís Batlle i Rossell 3bdb2ecea4 cinepaint: making it run (missing rpath) 2013-04-02 14:29:01 +02:00
Jack Cummings 437419a124 rawtherapee-4.0.10 . Add a 'float' option to fftw, as this version of rawtherapee requires it. 2013-03-31 21:33:21 -07:00
Cillian de Róiste 0caed13c85 Merge: use Python 3.3 as the default version of Python3 2013-03-28 01:13:37 +01:00
Cillian de Róiste 043d21b69d Add OpenColorIO support to OpenImageIO and tidy up 2013-03-28 00:46:23 +01:00
Cillian de Róiste 67a1becfdc OpenImageIO Tidy Up: moved to applications/graphics
oiio includes CLI tools for manipulating graphics
2013-03-27 23:29:17 +01:00
Rickard Nilsson 608fe14130 darktable: Update to 1.1.4 2013-03-27 16:16:58 +01:00
Lluís Batlle i Rossell 70ae131f62 gimp: update from 2.8.2 to 2.8.4 2013-03-26 15:39:37 +01:00
Michael Raskin 8e5dc9b5df Fix K3D gtlglext handling 2013-03-21 13:45:12 +04:00
Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Sergey Mironov c52bd0c8d8 viewnior: Add viewnior, GTK image viewer program 2013-03-12 23:45:50 +04:00
Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Vladimír Čunát cf3ff172cd panotools: disabling tests due to strange failures 2013-03-09 13:16:41 +01:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Cillian de Róiste 43e8e7763b Add MyPaint: A graphics application for digital painters 2013-03-06 23:08:30 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát 0d6bb2b51a meshlab: fix forgotten qt47 2013-02-14 14:38:23 +01:00
Vladimír Čunát e976bcffca inkscape: bugfix update 2013-02-14 14:34:20 +01:00
Vladimír Čunát 4c4e3f0ada meshlab: fix forgotten qt47 2013-02-13 17:45:27 +01:00
Vladimír Čunát 9adcb15b9d inkscape: bugfix update 2013-02-12 23:28:32 +01:00
Vladimír Čunát 684f215b4f fix the problem of missing expat in a few packages 2013-02-11 18:34:40 +01:00
Rickard Nilsson b3cfae1acf darktable: Update to 1.1.2 2013-02-06 01:26:24 +01:00
Peter Simons 6950cf3bc4 xfig: update download location of the Debian patch files 2013-01-28 19:40:02 +01:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Lluís Batlle i Rossell d6a18fe4ae feh: update to 2.8
it hanged displaying a bmp i have, but this new 2.8 hangs too.
2013-01-22 15:08:01 +01:00
Petar Bogdanovic f5fc28837b qiv: $(PREFIX)/man -> $(PREFIX)/share/man 2013-01-21 14:06:03 -05:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra f286cc65b1 Fix bad URLs lacking a scheme 2013-01-14 18:26:46 +01:00
Petar Bogdanovic 5d1296b03f qiv: add version 2.2.4 2013-01-12 09:51:54 -05:00
Sander van der Burg 2dd59fc4cf imagemagick: disable ghostscript on darwin, to make it work 2013-01-11 18:32:45 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Vladimír Čunát afc0784322 Merge pull request #242 from vcunat/vlada/ipe-notg
Add the ipe editor.
2013-01-08 03:32:51 -08:00
Eelco Dolstra 1e9e2cb2bb samba, imagemagick: Add missing meta info 2013-01-06 22:31:16 +01:00
Vladimír Čunát 3c2091276e vlada/ipe
Adding the ipe editor.

Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
2013-01-03 16:13:55 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Rickard Nilsson 59c9f406fd darktable: Update to 1.1.1 2012-12-17 17:27:13 +01:00
Lluís Batlle i Rossell adb2fabf8d freecad: removing a patch not needed anymore 2012-12-13 15:18:40 +01:00
Michael Raskin a0ed4d2295 Updating OpenSCAD to use Eigen3 2012-12-13 16:24:05 +04:00
Lluís Batlle i Rossell 465f4f4e3e freecad: updating to git master 2012-12-13 12:38:19 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Baptist BENOIST 82bdf7c8d9 opera|dia|geany: remove the obsolete share/icons/hicolor/icon-theme.cache file
This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
It have no reasons to exist in a redistribuable package
2012-11-28 00:21:34 +01:00
Rickard Nilsson e6bd4b6865 darktable: Upgrade to 1.1 2012-11-27 14:32:22 +01:00
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
Eelco Dolstra b8b0c4e8f7 * Inkscape updated to 0.48.1.
svn path=/nixpkgs/trunk/; revision=27555
2011-06-28 13:51:55 +00:00
Karn Kallio a0fbd997b4 Update the download URL for feh, which seems to have changed.
svn path=/nixpkgs/trunk/; revision=27475
2011-06-15 14:25:50 +00:00
Lluís Batlle i Rossell 05e7655d79 Updating giv.
svn path=/nixpkgs/trunk/; revision=27466
2011-06-15 08:59:02 +00:00
Lluís Batlle i Rossell 394375f900 Updating feh
svn path=/nixpkgs/trunk/; revision=27464
2011-06-15 08:22:15 +00:00
Yury G. Kudryashov 0159787b06 ImageMagick: propagate libs in buildInputs, use .tar.xz
svn path=/nixpkgs/trunk/; revision=27372
2011-06-07 21:49:04 +00:00
Lluís Batlle i Rossell 2c3bd9a12c Updating hugin. At least it builds.
svn path=/nixpkgs/trunk/; revision=27175
2011-05-06 22:33:50 +00:00
Lluís Batlle i Rossell 05fae54809 Fixing the minidjvu installation
svn path=/nixpkgs/trunk/; revision=26959
2011-04-24 20:13:14 +00:00
Lluís Batlle i Rossell 11c0e3976e Adding minidjvu
svn path=/nixpkgs/trunk/; revision=26957
2011-04-24 20:10:43 +00:00
Lluís Batlle i Rossell 9a0a0c92c7 Adding training results files for some languages to tesseract to be able to do OCR directly.
svn path=/nixpkgs/trunk/; revision=26956
2011-04-24 20:01:19 +00:00
Lluís Batlle i Rossell 626f654602 Adding tesseract, an OCR engine I just found but never tried.
svn path=/nixpkgs/trunk/; revision=26952
2011-04-24 18:04:07 +00:00
Peter Simons 77f3a10acb ImageMagick: updated to version 6.6.9-4
svn path=/nixpkgs/trunk/; revision=26801
2011-04-12 09:32:31 +00:00
Lluís Batlle i Rossell 47221a8435 Making giv point to the proper patch file.
svn path=/nixpkgs/trunk/; revision=26723
2011-04-06 15:36:49 +00:00
Lluís Batlle i Rossell 6cfba00e1b Adding giv.
svn path=/nixpkgs/trunk/; revision=26709
2011-04-06 10:00:48 +00:00
Eelco Dolstra 3e3eac2e30 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26303
2011-03-14 18:26:46 +00:00
Lluís Batlle i Rossell e7ed35ecd8 Adding the djview firefox plugin option.
svn path=/nixpkgs/trunk/; revision=26265
2011-03-10 21:39:09 +00:00
Eelco Dolstra cc3d1e1c09 * Sync with trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26243
2011-03-10 08:48:14 +00:00
Lluís Batlle i Rossell 19d1236a52 Updating feh
svn path=/nixpkgs/trunk/; revision=26229
2011-03-09 13:37:03 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
2011-03-07 12:17:12 +00:00
Lluís Batlle i Rossell e132efaeeb Fixing the freecad build on i686-linux
svn path=/nixpkgs/trunk/; revision=26173
2011-03-06 11:00:29 +00:00
Lluís Batlle i Rossell 874af6794d Trying to get freecad work on i686-linux too.
svn path=/nixpkgs/trunk/; revision=26170
2011-03-05 22:27:55 +00:00
Lluís Batlle i Rossell 69a67fc7cf Trying to make freecad find pyqt. This required a patch to be able to use PYTHONPATH.
svn path=/nixpkgs/trunk/; revision=26169
2011-03-05 22:27:51 +00:00
Lluís Batlle i Rossell 370a89b5ad Removing the wrong pyqt references in freecad. I don't know how to make it work with pyqt still.
svn path=/nixpkgs/trunk/; revision=26154
2011-03-04 09:48:36 +00:00
Lluís Batlle i Rossell f6ea68b2ee Freecad builds, installs and runs, (although still not with PyQt for its draft workbench).
On virtualgl, it needs a variable set about the GL context set; freecad
suggests that upon failing to run in that environment.

svn path=/nixpkgs/trunk/; revision=26153
2011-03-04 09:48:33 +00:00
Lluís Batlle i Rossell a76b0fb6fa Making freecad install; it still does not find all shared objects though.
Either eigen changed the hash of the tarball, or I did not commit its latest hash.
I add boost 1.46 apart, because 1.44 does not work easily for freecad.

svn path=/nixpkgs/trunk/; revision=26151
2011-03-04 09:48:24 +00:00
Lluís Batlle i Rossell 60844f7488 Making freecad build (from svn version). It does not install still, though.
svn path=/nixpkgs/trunk/; revision=26145
2011-03-03 13:41:10 +00:00
Eelco Dolstra eb4b1e8b04 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26141
2011-03-03 12:02:50 +00:00
Lluís Batlle i Rossell d11c00e5a5 Adding xercesc, the references to coin3d and soqt, and trying to add
freecad (that still does not build).

svn path=/nixpkgs/trunk/; revision=26135
2011-03-02 17:18:30 +00:00
Eelco Dolstra 070f7debe0 * gdk-pixbuf: build gdk-pixbuf-xlib.
svn path=/nixpkgs/branches/x-updates/; revision=25961
2011-02-14 13:44:01 +00:00
Eelco Dolstra 3e3dc422ac * Allow geeqie to find exiv2 and exiftran, necessary to losslessly
rotate JPEG images.

svn path=/nixpkgs/trunk/; revision=25590
2011-01-16 16:42:08 +00:00
Eelco Dolstra 56ea89a61e * And now an actual fix.
svn path=/nixpkgs/trunk/; revision=25589
2011-01-16 16:39:06 +00:00
Eelco Dolstra dbb8c452bb * fbida: fix a segfault in exiftran.
svn path=/nixpkgs/trunk/; revision=25588
2011-01-16 16:28:08 +00:00
Ludovic Courtès 14f45d5da4 Add GNU Ocrad.
svn path=/nixpkgs/trunk/; revision=25572
2011-01-14 21:44:43 +00:00
Michael Raskin ed3ce17ce1 Adding darktable photo editor. Patch by Cillian de Róiste ( goibhniu1 )
svn path=/nixpkgs/trunk/; revision=25462
2011-01-08 21:55:33 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Russell O'Connor 83e25f83c8 Patch Inkscape to support PDF importing.
svn path=/nixpkgs/trunk/; revision=25151
2010-12-15 15:56:04 +00:00
Michael Raskin fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Ludovic Courtès 8729f86924 qtpfsgui: Use fftw3 single-precision.
Thanks to Lluís Batlle!

svn path=/nixpkgs/branches/stdenv-updates/; revision=24723
2010-11-17 10:42:53 +00:00
Michael Raskin 3bc0867f36 Update XScreenSaver
svn path=/nixpkgs/trunk/; revision=24685
2010-11-14 18:55:09 +00:00
Ludovic Courtès 10306f1b4c libpano13 2.9.17.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24680
2010-11-12 22:02:08 +00:00
Lluís Batlle i Rossell 8d1e116069 Updating paraview
svn path=/nixpkgs/trunk/; revision=24651
2010-11-10 18:13:04 +00:00
Lluís Batlle i Rossell 01b6395203 Making inkscape not install any icon cache
svn path=/nixpkgs/trunk/; revision=24650
2010-11-10 18:13:00 +00:00
Lluís Batlle i Rossell 8ed1a21f2c Updating inkscape
svn path=/nixpkgs/trunk/; revision=24646
2010-11-10 16:48:13 +00:00
Lluís Batlle i Rossell ab8ea7ab68 Updating pinta to 0.5
svn path=/nixpkgs/trunk/; revision=24615
2010-11-07 21:27:06 +00:00
Peter Simons e6bd263b4f Advance version of Imagemagick to 6.6.5-4 .
Always include the --with-frozenpaths configure flag ( independently of tetex ).
Include the --with-rsvg configure flag when librsvg is not null.

svn path=/nixpkgs/trunk/; revision=24509
2010-10-28 08:46:13 +00:00
Yury G. Kudryashov 1bda7748da Fix digikam buld
svn path=/nixpkgs/trunk/; revision=24270
2010-10-14 09:52:10 +00:00
Yury G. Kudryashov 63d252baa1 digikam: find marble widget
svn path=/nixpkgs/trunk/; revision=24235
2010-10-12 07:49:24 +00:00
Yury G. Kudryashov 6aded22a4b {digikam,kipi-plugins}-1.5.0
svn path=/nixpkgs/trunk/; revision=24225
2010-10-11 19:59:28 +00:00
Armijn Hemel 5068c4c822 update to 2.6.11, python problems still persist
svn path=/nixpkgs/trunk/; revision=24187
2010-10-08 15:38:17 +00:00
Yury G. Kudryashov 4591f1fe51 kipi-plugins: find gdk
svn path=/nixpkgs/trunk/; revision=24091
2010-10-05 17:44:17 +00:00
Yury G. Kudryashov 739f82a526 Digikam-1.4.0, move to all-packages.nix
svn path=/nixpkgs/trunk/; revision=24089
2010-10-05 17:44:05 +00:00
Yury G. Kudryashov bf340ad55a Move kipi-plugins to apps/graphics
svn path=/nixpkgs/trunk/; revision=24088
2010-10-05 17:43:57 +00:00
Yury G. Kudryashov 5422f21700 xscreensaver: move hacks to default location, use stdenv, more deps
svn path=/nixpkgs/trunk/; revision=23161
2010-08-13 14:06:23 +00:00
Eelco Dolstra 907bb1aac6 * ltrace: updated to 0.5.3.
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
2010-07-29 18:55:16 +00:00
Lluís Batlle i Rossell 5cf5a154db Updating hugin
svn path=/nixpkgs/trunk/; revision=22810
2010-07-29 14:38:46 +00:00
Eelco Dolstra ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency.
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
2010-07-29 08:21:21 +00:00
Eelco Dolstra f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Eelco Dolstra 749b8607ca * More cleanup.
svn path=/nixpkgs/trunk/; revision=22795
2010-07-28 15:35:01 +00:00
Armijn Hemel be0a49f551 update to 2.6.10, still haven't had time to dig into the gimpfu Python import problems
svn path=/nixpkgs/trunk/; revision=22731
2010-07-25 12:49:03 +00:00
Ludovic Courtès 3aee92f068 Geeqie: Use libchamplain.
svn path=/nixpkgs/trunk/; revision=22650
2010-07-18 22:47:23 +00:00
Ludovic Courtès 7da94088c8 Geeqie 1.0.
svn path=/nixpkgs/trunk/; revision=22624
2010-07-17 22:40:41 +00:00
Lluís Batlle i Rossell e2e5ae39f8 Updating meshlab (it was even not building fine from a long time ago)
svn path=/nixpkgs/trunk/; revision=22515
2010-07-07 15:10:05 +00:00
Yury G. Kudryashov a10b45e604 Don't build djview3 by default, let hydra build djview4
svn path=/nixpkgs/trunk/; revision=22474
2010-07-05 11:09:38 +00:00
Lluís Batlle i Rossell 5b4e3a5b40 Adding Wings 3D (as a side effect, update erlang, and add esdl).
svn path=/nixpkgs/trunk/; revision=22436
2010-07-01 09:08:37 +00:00
Armijn Hemel 29a38efdc8 update to 2.6.9, python import problems persist
svn path=/nixpkgs/trunk/; revision=22420
2010-06-26 12:35:35 +00:00
Lluís Batlle i Rossell 78f5f3359b Fixing the pinta build (finally!). All looks very ugly, I imagine that mainly because
I know almost nothing about Mono.
I invite others to improve it.

svn path=/nixpkgs/trunk/; revision=22387
2010-06-22 21:07:09 +00:00
Lluís Batlle i Rossell c38cae02ed pinta-related changes that should go in pair with a change I just commited related to aufs
(So, not related to pinta, but... what to do. nixpkgs has to evaluate)

svn path=/nixpkgs/trunk/; revision=22362
2010-06-21 18:14:52 +00:00
Michael Raskin c1059d8969 Fixing problems with Xscreensaver caused by using stdenv builder
svn path=/nixpkgs/trunk/; revision=22332
2010-06-18 19:33:15 +00:00
Lluís Batlle i Rossell da9e4402ee Pinta still does not build (xbuild pkgconfig problems), but mono and gtk-sharp-2 build fine.
svn path=/nixpkgs/trunk/; revision=22322
2010-06-18 08:16:21 +00:00
Michael Raskin 100ece1ac9 Update XScreensaver
svn path=/nixpkgs/trunk/; revision=22315
2010-06-17 20:28:00 +00:00
Lluís Batlle i Rossell 57c012a16c Attempt at adding 'pinta'. It still does not build due to mono problems.
Nevertheless, I updated the gnome attribute names a bit so all that
gtk-sharp-2 goes a bit beyond.

svn path=/nixpkgs/trunk/; revision=22287
2010-06-15 22:25:38 +00:00
Lluís Batlle i Rossell a9414f4260 Updatin feh.
This fixes a bug I reported: the last line or column were often not shown, scrolling or zooming.

svn path=/nixpkgs/trunk/; revision=22190
2010-06-09 08:42:30 +00:00
Lluís Batlle i Rossell e8fc7c3d9e Updating feh.
svn path=/nixpkgs/trunk/; revision=22127
2010-06-03 14:41:41 +00:00
Lluís Batlle i Rossell d7e44fd3df Updating paraview
svn path=/nixpkgs/trunk/; revision=22052
2010-05-29 12:23:42 +00:00
David Guibert b62332db76 xournal: update to 0.4.5
svn path=/nixpkgs/trunk/; revision=22022
2010-05-27 19:44:17 +00:00
Peter Simons 5139e564fa pkgs/applications/graphics/ImageMagick: added build input jasper for jpeg-2000 support
While I was at it, I also rewrote the expression to get along without
using the deprecated "args: with args;" style.

svn path=/nixpkgs/trunk/; revision=21454
2010-04-30 10:49:33 +00:00
Yury G. Kudryashov f25c68f01a Remove old kde packages
svn path=/nixpkgs/trunk/; revision=21011
2010-04-11 15:50:41 +00:00
Lluís Batlle i Rossell 40d3c2f29a Adding graphicsmagick 1.3.7 for octave imread() and alike to work.
svn path=/nixpkgs/trunk/; revision=20390
2010-03-04 16:41:14 +00:00
Lluís Batlle i Rossell ba274e578c Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.
Made octave link with graphicsmagick to get imread() working.

Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html

Next to do: add an older version of graphics magick for octave.

svn path=/nixpkgs/trunk/; revision=20389
2010-03-04 16:41:10 +00:00
Lluís Batlle i Rossell 9c75629a31 Made graphicsmagick build shared libraries (otherwise we have to care in x86_64 on PIC)
svn path=/nixpkgs/trunk/; revision=20384
2010-03-04 14:44:51 +00:00
Lluís Batlle i Rossell aa38df2611 Adding GraphicsMagick
svn path=/nixpkgs/trunk/; revision=20383
2010-03-04 14:44:47 +00:00
Lluís Batlle i Rossell c2cbd65668 Getting a better seg3d build. Now it runs from TMPDIR at least.
The installation still fails.

svn path=/nixpkgs/trunk/; revision=20382
2010-03-04 14:44:43 +00:00
Lluís Batlle i Rossell 8e0a5f75a7 I broke again the nixpkgs tarball. After this, I think I learnt how to test it before
committing.


svn path=/nixpkgs/trunk/; revision=20321
2010-03-02 07:45:22 +00:00
Lluís Batlle i Rossell cc068f0be8 Adding the itk libraries.
Adding a skeleton of the seg3d package. It builds, but libraries and rpaths are wrong.
I hope to fix it soon.

svn path=/nixpkgs/trunk/; revision=20320
2010-03-01 23:31:35 +00:00
Lluís Batlle i Rossell fbb0906d14 Fixing a sourceforge url inside meshlab.
svn path=/nixpkgs/trunk/; revision=20162
2010-02-22 08:15:34 +00:00
Michael Raskin b51a1937b6 Fix pqiv unpack step
svn path=/nixpkgs/trunk/; revision=20124
2010-02-19 09:58:37 +00:00
Marc Weber 92c42c9000 fix gimp plugins, webkit build
svn path=/nixpkgs/trunk/; revision=19988
2010-02-14 00:33:57 +00:00
Lluís Batlle i Rossell 76c8738552 Adding the GAP gimp plugin, and making nix-env recurse into the gimp plugins attribute set.
svn path=/nixpkgs/trunk/; revision=19936
2010-02-11 15:08:05 +00:00
Eelco Dolstra d8c6bb130c * Sync with the trunk one last time.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Eelco Dolstra 7eff18fa03 * Fixed xscreensaver (it couldn't find the X headers/libraries
anymore).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19694
2010-01-26 21:40:32 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell a3e4c7640f Updating meshlab.
Their build system has changed, and the source tree they distribute too, so the
dependencies changed a bit.
To get meshlab working, I update lib3ds and add levmar.

svn path=/nixpkgs/trunk/; revision=19595
2010-01-21 14:39:53 +00:00
Lluís Batlle i Rossell 8640725ca4 Updating meshlab
svn path=/nixpkgs/trunk/; revision=19592
2010-01-21 09:49:10 +00:00
Lluís Batlle i Rossell 47735a06c3 Adding rawtherapee svn r25
svn path=/nixpkgs/trunk/; revision=19500
2010-01-17 17:49:35 +00:00
Lluís Batlle i Rossell 063ef1925d Adding digikam and kipi-plugins for kde4.
svn path=/nixpkgs/trunk/; revision=19488
2010-01-16 20:13:20 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Lluís Batlle i Rossell 916e0f3840 Updating paraview.
svn path=/nixpkgs/trunk/; revision=19478
2010-01-16 11:05:17 +00:00
Michael Raskin e1604101fe Fix Dia source link
svn path=/nixpkgs/trunk/; revision=19463
2010-01-15 10:51:44 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Armijn Hemel f8106c5cf6 update to 2.6.8, python problems still persist
svn path=/nixpkgs/trunk/; revision=19235
2010-01-05 14:19:00 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel 60e4c3e9ab update to 2009.4.0
svn path=/nixpkgs/trunk/; revision=19115
2009-12-25 16:58:17 +00:00
Armijn Hemel 18455cb9bc update to 0.97, use mirror and sha256
svn path=/nixpkgs/trunk/; revision=19114
2009-12-25 16:13:58 +00:00
Lluís Batlle i Rossell bcc9c9ab1e Updated xaos to 3.5
svn path=/nixpkgs/trunk/; revision=19096
2009-12-24 17:02:44 +00:00
Lluís Batlle i Rossell 5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Lluís Batlle i Rossell a534f901bb Updating hugin.
svn path=/nixpkgs/trunk/; revision=18915
2009-12-12 18:58:40 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Lluís Batlle i Rossell f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
2009-12-10 22:19:52 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Ludovic Courtès 5d7de35976 Qtpfsgui 1.9.3.
svn path=/nixpkgs/trunk/; revision=18818
2009-12-05 15:43:07 +00:00
Lluís Batlle i Rossell 3bae8e9590 Fixing the cinepaint expression. Somehow I wrote the wrong date in fetchcvs,
when I commited it, so it has been a expression that only worked for me, I think,
because I had done the proper fetchcvs previously.

svn path=/nixpkgs/trunk/; revision=18699
2009-11-29 19:22:28 +00:00
Lluís Batlle i Rossell 32f2dda5de Fixing hugin (we now install boost without tags on library file names, and
the hugin expression still used the tag for 'multithread' in the boost library
file names).

svn path=/nixpkgs/trunk/; revision=18698
2009-11-29 19:22:22 +00:00
Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Ludovic Courtès f1f286052e Remove `unpackCmd's not needed with GNU tar format auto-detection (r18492).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18653
2009-11-26 15:50:26 +00:00
Eelco Dolstra a71971f671 * Inkscape 0.47.
svn path=/nixpkgs/trunk/; revision=18641
2009-11-26 12:39:22 +00:00
Ludovic Courtès 57fa034f8a Geeqie: Fix typos.
svn path=/nixpkgs/trunk/; revision=18615
2009-11-25 09:08:27 +00:00
Ludovic Courtès aca6f17400 Add Geeqie, a GQview fork.
svn path=/nixpkgs/trunk/; revision=18613
2009-11-25 08:58:42 +00:00
Ludovic Courtès 96d3032ea0 Fix Ufraw.
svn path=/nixpkgs/trunk/; revision=18510
2009-11-21 22:30:00 +00:00
Eelco Dolstra 7a233c1629 * GIMP updated to 2.6.7. It no longer needs libgtkhtml.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18117
2009-11-04 21:28:11 +00:00
Ludovic Courtès 2aaf37cdf9 Add UFRaw.
svn path=/nixpkgs/trunk/; revision=17881
2009-10-19 12:50:45 +00:00
Marc Weber dd3564aba9 adding ps2edit
svn path=/nixpkgs/trunk/; revision=17863
2009-10-18 04:43:53 +00:00
Marc Weber f808690b16 adding python package lxml to make scripts in inkscape work
svn path=/nixpkgs/trunk/; revision=17858
2009-10-18 04:43:40 +00:00
Lluís Batlle i Rossell 92dbfb5b9d Marking comical as maintained by me, and let hydra build it.
svn path=/nixpkgs/trunk/; revision=17652
2009-10-05 21:01:50 +00:00
Lluís Batlle i Rossell bd988d052b Stating me as maintainer of packages I maintain.
svn path=/nixpkgs/trunk/; revision=17583
2009-10-01 20:18:17 +00:00
Peter Simons 39e8418a69 xscreensaver: updated to version 5.10
Version 5.07 doesn't exist upstream anymore.

svn path=/nixpkgs/trunk/; revision=17403
2009-09-24 17:15:06 +00:00
Michael Raskin ef643cbe09 Yes, XScreenSaver doesn't work on Windows and it never will.
svn path=/nixpkgs/trunk/; revision=17212
2009-09-17 05:19:57 +00:00
Eelco Dolstra edae4e83b0 * Urgh, forgot to commit.
svn path=/nixpkgs/trunk/; revision=16948
2009-09-02 23:10:30 +00:00
Eelco Dolstra 99cd5a1679 * ImageMagick updated to 6.5.5-6.
svn path=/nixpkgs/trunk/; revision=16945
2009-09-02 22:43:08 +00:00
Marc Weber 8ff2647169 adding gutenprint (former gimp-print) and gutenprintBin. I still haven't
found the source of the binary package containing the .ppd files
Still impure but works. See comment.

svn path=/nixpkgs/trunk/; revision=16881
2009-08-27 23:32:13 +00:00
Michael Raskin 25b3fe32ad Adding myself as a maintainer of some of the packages
svn path=/nixpkgs/trunk/; revision=16572
2009-08-04 07:49:16 +00:00
Michael Raskin 890cf33ef7 Adding fbida, framebuffer image viewer
svn path=/nixpkgs/trunk/; revision=16571
2009-08-04 07:14:43 +00:00
Michael Raskin dee8937ae7 Adding Xournal - a note-taking application for stylus usage
svn path=/nixpkgs/trunk/; revision=16538
2009-08-02 21:47:10 +00:00
Ludovic Courtès ed658483e9 Hugin: Fix segfault on x86_64.
svn path=/nixpkgs/trunk/; revision=16340
2009-07-13 16:24:47 +00:00
Ludovic Courtès 3a4ba343a4 Hugin: Fix typo stealthily introduced in r15692.
svn path=/nixpkgs/trunk/; revision=16332
2009-07-12 22:00:35 +00:00
Marc Weber b241732d8c adding ufraw (a standalone tool and gimp plugin to read raw data images)
adding exposureBlend (gimp plugin)
enabling gimpPlugins again. nix-env -qa \* --out-path suceeds

svn path=/nixpkgs/trunk/; revision=16108
2009-06-30 16:14:34 +00:00
Marc Weber 349de9bafe revrting my accident only keeping rubygem updates and ruby libs
This partially reverts commit -r 16100

svn path=/nixpkgs/trunk/; revision=16107
2009-06-30 15:58:02 +00:00
Marc Weber d1e39e78f9 adding rubygems support to nix - implemented target libraries/apps: sup mail client
svn path=/nixpkgs/trunk/; revision=16100
2009-06-30 14:29:20 +00:00
Marc Weber 9dbc0bd614 adding gmic (a tool which can denoise images and much more)
svn path=/nixpkgs/trunk/; revision=16057
2009-06-26 16:52:35 +00:00
Marc Weber f4262cf010 adding some gimp plugins *joy*
svn path=/nixpkgs/trunk/; revision=15954
2009-06-14 01:30:12 +00:00
Lluís Batlle i Rossell 94d2e57c62 Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while
before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

svn path=/nixpkgs/trunk/; revision=15838
2009-06-03 09:19:19 +00:00
Lluís Batlle i Rossell 6175b1d633 Updating to the latest cinepaint. I haven't checked thoroughly the bunch of
dependencies, whether any is no more needed in the update.

svn path=/nixpkgs/trunk/; revision=15778
2009-05-28 21:57:05 +00:00
Marc Weber f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Lluís Batlle i Rossell 226d5cf608 Changing the xscreensaver expression, so nix-env operations with '*' work.
svn path=/nixpkgs/trunk/; revision=15627
2009-05-17 20:33:58 +00:00
Lluís Batlle i Rossell 6e1e2d5aba Adding muparser and meshlab.
svn path=/nixpkgs/trunk/; revision=15585
2009-05-13 10:21:29 +00:00