Commit Graph

437 Commits

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