Commit Graph

478 Commits

Author SHA1 Message Date
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