Commit graph

709 commits

Author SHA1 Message Date
Nixpkgs Monitor 1beca24707 sxiv: update from 1.1 to 1.1.1 2013-12-07 14:39:52 +02:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor 99bf1945d1 graphicsmagick: update from 1.3.13 to 1.3.18, potentially fixes CVE-2013-4589 2013-12-04 05:44:15 +02:00
Vladimír Čunát d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Michael Raskin e8246aa3ee Merge pull request #1307 from bjornfor/pencil
pencil: new package
2013-12-01 05:32:59 -08:00
Bjørn Forsman 5443dd4c00 pencil: new package
Pencil is a GUI prototyping/mockup tool.

Homepage: http://pencil.evolus.vn/
2013-11-30 17:51:47 +01:00
Kim Simmons e18686d8a0 grafx2: Fixed install error.
My bad for not checking suggested changes.
2013-11-30 12:03:34 +01:00
Michael Raskin 1e3ed11000 Merge pull request #1262 from Zoomulator/add_grafx2
grafx2: new package
2013-11-29 09:10:37 -08:00
Kim Simmons 1009ab8d68 Edit that was left out from the last commit. 2013-11-24 16:59:23 +01:00
Cillian de Róiste 18685b7d44 MyPaint, fix impurity: add hicolor_icon_theme wrapper to ensure MyPaint can start
MyPaint fails to find its own icons and refuses to start if another
icon theme is not available on the system. Running
gtk-update-icon-cache on MyPaint's share/icons/hicolor folder did not
help, and setting the XDG_DATA_DIRS to point to MyPaint's icons also
didn't work.

https://gna.org/bugs/?18460

Thanks to Kim Simmons for reporting this and helping to debug.
2013-11-24 16:34:10 +01:00
Cillian de Róiste 7f791a6449 MyPaint: fix the mypaint script to use the correct python instead of calling env 2013-11-23 18:09:39 +01:00
Kim Simmons 1e44b59996 grafx2: Some simplification in the package file. 2013-11-23 09:44:49 +01:00
Kim Simmons d70e11672f grafx2: new package
GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance. Specialized in 256-color drawing.
2013-11-21 11:19:56 +01:00
Vladimír Čunát 85b6d28862 imagemagick: minor update 6.8.7-5 -> .7-6 2013-11-17 15:41:10 +01:00
Sergey Mironov c0df12ccf0 mirage: fix localization 2013-11-14 21:24:11 +01:00
Shea Levy 6555e31fb4 ImageMagick and asciidoc build on 64-bit darwin
Tested by @zefhemel

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-14 10:42:58 -05:00
Lluís Batlle i Rossell 868fa84e3a Adding smartdeblur (gpl3 version, ~1.27) 2013-11-12 22:12:43 +01:00
Moritz Ulrich 844b053cce ImageMagick: 6.8.7-5 & fix ghostscript/freetype errors
ghostscript and freetype were enabled but the configure script
couldn't find them. It turns out it uses pkgconfig to search for them.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 21:53:37 +01:00
Cillian de Róiste 01266013a5 gimpPlugins.gmic: upgrade from 1.3.2.0 to 1.5.7.4, fix compilation with gimp 2.8
Only the gimp plugin is built now, as the rest of the suite is quite
large and probably deserves its own package.
2013-11-10 23:35:03 +01:00
Cillian de Róiste b8bbc87ab1 gimpPlugins.fourier: upgrade from 0.3.3 to 0.4.1 and fix compilation 2013-11-10 23:35:03 +01:00
Cillian de Róiste f5e92ce8f2 gimpPlugins.texturize: fix compilation with gimp 2.8 2013-11-10 23:35:03 +01:00
Cillian de Róiste f9520337d0 gimpPlugins.ufraw: update plugin from 0.15 to 0.19.2 to build with gimp 2.8 2013-11-10 23:35:03 +01:00
Cillian de Róiste 0c555809d1 gimp: upgrade to 2.8.8
This also fixes color management support (lcms2)
2013-11-09 16:27:11 +01:00
Cillian de Róiste 1ff90228b2 xsane: add optional gimp plugin support 2013-11-09 15:03:12 +01:00
Cillian de Róiste b5bac4c7a4 sane: tidy-up, wrap expression arguments 2013-11-09 15:03:12 +01:00
Cillian de Róiste 46646feb17 sane: add support for Epson snapscan scanners
The firmware file needs to be downloaded or extracted from the windows
driver file and configured in nixpkgs.config e.g.:

sane.snapscanFirmware = /firmware/esfw41.bin;
2013-11-09 15:03:12 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Peter Simons 9eea6c64fb Merge branch 'origin/master' into stdenv-updates. 2013-10-27 10:58:24 +01:00
Jason \"Don\" O'Conal 2dfe8e7a7d gpicview: add expression 0.2.4
close #1123.
2013-10-27 06:59:41 +02:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Mathijs Kwik 1772bcebc1 inkscape: fix typo in upstream sources.
fixes stdenv-updates
2013-10-11 01:09:47 +02:00
Mathijs Kwik 296e2857f7 inkscape: remove unused patch 2013-10-11 01:09:39 +02:00
Lluís Batlle i Rossell 174503945f Updating paraview to 4.0.1. 2013-10-09 09:02:21 +02:00
Eelco Dolstra df0d362f31 Fix some more Hydra evaluation errors 2013-10-08 11:07:14 +02:00
Moritz Ulrich 7e816e9058 Openscad: Update to 2013.06 (& some coding style fixes)
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-10-01 12:37:13 +02:00
Eelco Dolstra fb8a2dafd9 imagemagick: Drop build-time dependency on Graphviz 2013-09-26 21:06:23 +02:00
Rickard Nilsson 70a5abd440 darktable: Add several missing dependencies. This makes the map and tethering modules available 2013-09-25 23:26:07 +02:00
Rickard Nilsson 5b5cdcfbac sane-backends: Need --enable-libusb_1_0 configure flag to find libusb 2013-09-25 20:15:40 +02:00
Rickard Nilsson c6b98faa34 darktable: Update to 1.2.3 2013-09-24 01:58:59 +02:00
Vladimír Čunát 6b2379f43f imagemagick: add link for $out/include/ImageMagick
For transition. Fixes calibre build, at least.
2013-09-15 18:27:08 +02:00
James Cook 39bc57f35f ImageMagick: update 6.7.5-3 -> 6.8.6-9 (close #960) 2013-09-14 16:04:34 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Song Wenwu 4124741d43 gimp_2_8: update to 2.8.6, enable xpm support 2013-07-23 21:03:29 +02:00
Evgeny Egorochkin 6d3329dc31 rapcad: fix url 2013-07-18 20:42:04 +03:00
Evgeny Egorochkin d4c52014e6 Pinta: fix url 2013-07-18 20:21:48 +03:00
Evgeny Egorochkin da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin 22e62bc467 seg3d: fix version to match tarball 2013-07-14 02:08:55 +03:00
Evgeny Egorochkin d3f53cdde4 alchemy: fix version to match tarball 2013-07-14 02:08:55 +03:00
Peter Simons ea21636320 sane-backends: update saneBackendsGit to the latest version
For some reason, SANE suddenly stopped recognizing my scanner recently:

 | $ scanimage -L
 |
 | No scanners were identified. If you were expecting something different,
 | check that the scanner is plugged in, turned on and detected by the
 | sane-find-scanner tool (if appropriate). Please read the documentation
 | which came with this software (README, FAQ, manpages).

I was able to remedy this issue by building SANE with the latest version
of the backends package from Git, by adding the following override to
~/.nixpkgs/config.nix:

 | {
 |   packageOverrides = pkgs:
 |   {
 |     saneBackends = pkgs.saneBackendsGit;
 |   };
 | }
2013-07-10 10:14:11 +02:00
Rickard Nilsson ac8eb2523b darktable: Update to 1.2.2 2013-07-02 18:38:56 +02:00
Mathijs Kwik a1febc799a whitespace cleaning 2013-07-01 07:52:15 +02:00
Mathijs Kwik 04cbaef102 keep lcms versioning in all-packages.nix 2013-07-01 07:52:13 +02:00
Mathijs Kwik 0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik 7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
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
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