Commit graph

452 commits

Author SHA1 Message Date
Domen Kozar 2c8acd9cec oiio: 1.1.8 -> 1.1.12 2013-06-23 00:11:50 +02:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Domen Kozar 808cadd390 tesseract: simplify 2013-06-12 00:50:52 +02:00
Domen Kozar 1b64fc9360 tesseract: upgrade to 3.02.02 and add some languages 2013-06-11 19:22:30 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Evgeny Egorochkin 8d167adaf4 Merge pull request #551 from MarcWeber/submit/alchemy
adding alchemy painting application
2013-06-03 15:45:12 -07:00
Lluís Batlle i Rossell 94d83c8953 digikam 3.2: fixing url 2013-05-30 18:46:30 +02:00
Lluís Batlle i Rossell 71229f8eb9 digikam: updating (2.9 for kde 4.7/8, 3.2 for kde 4.10) 2013-05-30 15:13:53 +02:00
Lluís Batlle i Rossell 14cd1be498 freecad: update to stable from February, 0.13.1830 2013-05-30 09:56:30 +02:00
Marc Weber 67d41e4424 gpl fix 2013-05-30 01:30:48 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell 4d682cc112 digikam: enable parallel building 2013-05-29 21:50:02 +02:00
Song Wenwu 325f7a6bb8 add sxiv-1.1 2013-05-24 16:21:34 +08:00
Marc Weber af4d6b73de adding alchemy painting application 2013-05-22 22:58:05 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
David Guibert 2162794b68 updating paraview to 3.98.1 2013-05-12 13:49:05 +02:00
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