alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
75577 commits 217 branches 121 tags 4.5 GiB
Commit graph

939 commits

Author SHA1 Message Date
Mateusz Kowalczyk 4106631b96 sxiv: update git revision 2014-12-03 16:55:17 +00:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát e86ebdc0e3 synfigstudio: fix a strange build error 
Also enableParallelBuilding.
fonts.conf isn't supposed to be put into buildIputs, but it's still weird.
 2014-11-26 23:17:43 +01:00
Edward Tjörnhammar d177b477c1 Merge pull request #5138 from abbradar/yed 
yed: add package
 2014-11-26 22:17:48 +01:00
Nikolay Amiantov 88aa54a09f yed: add package 2014-11-27 00:15:30 +03:00
Domen Kožar 00146e3e08 shotwell: 0.18.0 -> 0.20.2, fix build 2014-11-26 22:13:07 +01:00
Igor Pashev 53fc3e178f ImageMagick: update (close #5133) 2014-11-26 21:49:11 +01:00
Vladimír Čunát b1803465d9 imagemagick: use a stable URL, reshuffle mirrors 
CC: #5133.
 2014-11-26 21:42:42 +01:00
Cillian de Róiste d250ca4e31 openimageio: update from 1.4.14 to 1.4.15 2014-11-25 15:33:22 +01:00
Cillian de Róiste 909311b650 openimageio: update from 1.4.13 to 1.4.14 2014-11-24 22:17:00 +01:00
lethalman 44628e9e90 Merge pull request #5036 from abbradar/sane-mfd-fix 
sane: fix multifunctional devices rights conflict with cups
 2014-11-19 17:29:40 +01:00
Cillian de Róiste 86fd3ad7a4 kde4.digikam: update from 3.5.0 to 4.4.0, potentially fixes CVE-2012-4514 2014-11-18 21:32:58 +01:00
Michael Raskin fb76f0fe7d Fix XSane build 2014-11-16 11:28:21 +03:00
Nikolay Amiantov 88d731925d sane: fix multifunctional devices rights conflict with cups 2014-11-16 03:44:37 +03:00
Mateusz Kowalczyk 55ec78eac4 sxiv: update revision 
Mainly to kick off Hydra again: it thinks the build is broken because we
used a SSH URL for git before.
 2014-11-15 01:54:00 +00:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra 6f53886360 imagemagick: Use --with-gcc-arch 
Without this, ImageMagick's configure script will generate code
specific to the machine building the package. This code may then fail
on other CPU types.

http://hydra.nixos.org/build/16564129
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-11-06 11:10:32 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Eelco Dolstra ebfdfdb7e4 geeqie: Disable libchamplain dependency for now 
It causes Geeqie to depend on both GTK+ 2 and 3, which is undesirable.
 2014-11-05 14:45:52 +01:00
Eelco Dolstra 4942acc0d9 geeqie: Don't use fetchgit 
Fetchgit considered harmful.
 2014-11-05 14:45:49 +01:00
Eelco Dolstra 1aafb0a700 Revert "geeqie: xxd is required as build dependency" 
This reverts commit 852f0bf2d4. Geeqie
builds fine without vim.
 2014-11-05 14:45:20 +01:00
Pascal Wittmann 852f0bf2d4 geeqie: xxd is required as build dependency 2014-11-05 13:52:58 +01:00
Mateusz Kowalczyk 6e726e1348 sxiv: use https 2014-11-05 11:33:45 +00:00
Michael Raskin 0e3a86e145 Fix GeeQie build 2014-11-04 15:12:23 +03:00
Michael Raskin a2fffba5cf Re-remove boost.lib 2014-11-04 12:19:37 +03:00
Michael Raskin dddf86ca28 Update Rapcad 2014-11-04 12:15:20 +03:00
Mateusz Kowalczyk de96fb7cc7 sxiv: update to 1.3-git and fix runtime behaviour 
The fix involves using imlib2 built with giflib instead of a libungif.
Initially I split imlib2 into two but other distros seem to build imlib2
with giflib already and everything still builds with giflib version so I
migrated imlib2 to giflib all together.

Closes #4622
 2014-11-03 23:03:51 +00:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost 
Make boost 156 the default
 2014-11-03 23:03:01 +01:00
Michael Raskin b8069e784e Update zgrviewer 2014-11-03 16:54:38 +03:00
William A. Kennington III d660565747 synfigstudio: Refactor 2014-11-02 18:58:40 -08:00
William A. Kennington III 096e002f0b geeqie: Refactor 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Cillian de Róiste 9751c9a1cc synfigstudio: update from 0.64.1 to 0.64.2 2014-11-03 00:02:48 +01:00
Mateusz Kowalczyk 7f7233b61d sxiv: use giflib 5.0 
https://github.com/muennich/sxiv/issues/180
 2014-10-22 18:42:35 +01:00
Justin Bedo cd1bacb03d Update ImageMagick version 2014-10-20 17:49:30 +11:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Domen Kožar 9ca95f700e sxiv: add missing patch 2014-10-11 18:19:58 +02:00
Domen Kožar 51ac867551 sxiv: 1.1.1 - 1.2 2014-10-11 18:06:46 +02:00
Aristid Breitkreuz 6f07399727 ufraw: update from 0.19.2 to 0.20 2014-10-08 20:23:25 +02:00
Michael Raskin d171942ed1 Update Dia 2014-10-07 16:23:27 +04:00
Pascal Wittmann e42f5edb7c ocrad: update from 0.23 to 0.24 2014-10-07 10:47:39 +02:00
Michael Raskin fdad3e5661 Geeqie release is a Git tag, apparently Gitorious gave non-deterministic archive 2014-10-04 16:38:09 +04:00
Pascal Wittmann d156824f48 geeqie: update from 1.1 to 1.2 and adopt it 2014-09-26 23:18:57 +02:00
Pascal Wittmann d1c7ac1388 Merge pull request #4281 from sztupi/openimageio-version-fix 
openimageio: using tagged version as src url instead of (moving) branch
 2014-09-26 16:09:47 +02:00
Attila Sztupak 4a9f541a86 openimageio: using tagged version as src url instead of (moving) branch 2014-09-26 11:44:02 +01:00
David Guibert 691c8393ea Merge pull request #4276 from k0ral/xournal 
xournal: 0.4.5 -> 0.4.8
 2014-09-26 09:45:31 +02:00
koral d178ce6e1e xournal: 0.4.5 -> 0.4.8 2014-09-25 23:58:53 +02:00
Pascal Wittmann d9fb16ebd7 ocrad: update from 0.21 to 0.23 and adopt it 2014-09-25 21:14:17 +02:00
Domen Kožar 6e3114a8a3 k3d: 0.8.0.2 -> 0.8.03 2014-09-23 11:33:40 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Moritz Ulrich fe3c2a56c8 New package: Solvespace. 
A parametric 2D/3D CAD application.
 2014-09-15 16:29:08 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Rob Vermaas fdfd948d96 panotools: update from 2.9.18 to 2.9.19 2014-09-11 13:34:50 +02:00
Luca Bruno 83c968fa2c Add new kgraphviewer and massif-visualizer packages 
I chose the unstable versions because the stable versions
seemed too outdated to me. They work with kde 4.12 anyway.
 2014-09-03 17:04:22 +02:00
Cillian de Róiste cc1866eacb processing: apply patch from IRC to make it work without the IDE too 2014-09-02 08:58:09 +02:00
Cillian de Róiste 622bdca26c processing: keep processing-java and patch it to make it work 2014-08-31 22:46:02 +02:00
Michael Raskin 347dd52019 Fix K3D build 2014-08-31 12:53:13 +04:00
Michael Raskin dcb38fc8aa Add missing libXmu dependency 2014-08-31 00:26:03 +04:00
Michael Raskin d593d3ac88 Fix K3D patching and cmake-configuration phases 2014-08-30 23:49:11 +04:00
Cillian de Róiste ef9c1d612d processing: add license 2014-08-30 19:54:03 +02:00
Cillian de Róiste c40a256548 Add processing: A language and IDE for electronic arts 
(cherry picked from commit 0db6387d1c3a8a8f7a9a1e111532d8acd1f794d6)
 2014-08-30 19:20:13 +02:00
Mateusz Kowalczyk 4210665c4f mcomix: update to 1.00 2014-08-30 13:48:02 +01:00
Rüdiger Sonderfeld 4d84ac77f9 gimp: Update to 2.8.14. 2014-08-27 18:46:24 +02:00
Cillian de Róiste 307924bbcc synfigstudio: fix chroot build / hydra 
The error message was:
Fontconfig error: Cannot load default config file
make[2]: *** [128x128/synfig_icon.png] Segmentation fault

(cherry picked from commit 759980c4fe9b07932f671d2e657189068d117405)

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-08-25 23:00:59 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Domen Kožar bd32f323d8 k3d: move patches into source 2014-08-23 11:46:53 +02:00
Peter Simons e910c8d6c9 Disable Hydra builds for broken Haskell packages. 
The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
 2014-08-20 20:26:57 +02:00
Mateusz Kowalczyk 03a37d5851 Add Japanese to default tesseract languages 2014-08-17 11:54:25 +01:00
Vladimír Čunát 6af1388fbd kipi_plugins: mark as broken; should come from digikam 2014-08-14 15:43:35 +02:00
Vladimír Čunát df76cbaa21 hugin, enblend-enfuse: enbaleParallelBuilding, default boost 
Also unset meta.broken.
 2014-08-12 21:17:53 +02:00
Vladimír Čunát 54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
Christoph Hrdinka f44e69a55d luminanceHDR: add version 2.4.0 
fixes #3229
 2014-08-12 10:19:35 +02:00
Michael Raskin 004be1bf51 Fix oiio build; maybe will fix blender build 2014-08-12 04:33:10 +04:00
Cillian de Róiste d597651949 inkscape: add python to the PATH, fixes #3449 2014-08-09 17:02:36 +02:00
Peter Simons 5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Christoph Hrdinka 83f78fa82d mcomix: add sqlite3 dependency 2014-08-07 08:57:02 +02:00
NOTtheMessiah 682f215084 Update default.nix 2014-08-07 01:17:01 +02:00
NOTtheMessiah 9e9e628417 Added gcolor2 2014-08-07 01:17:01 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Bjørn Forsman 5fc4ab1dfe freecad: small cleanup 
* FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency
* cmake.patch is not used anymore, remove it
* License is now only LGPLv2+ (since v0.14)
* Homepage moved to http://www.freecadweb.org/

Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014
 2014-08-03 13:26:14 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Lluís Batlle i Rossell 5e35fef0eb freecad: updating to 0.14 
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
 2014-08-01 16:56:27 +02:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Cillian de Róiste bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Vladimír Čunát df99ec18dc inkscape: enableParallelBuilding, doCheck, add meta 2014-07-18 11:56:47 +02:00
Vladimír Čunát 7e9a0b8ec2 inkscape: maintenance update 
Needed to fix build with poppler-0.26.
 2014-07-18 11:56:44 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Peter Simons f0de2bd4a1 Re-generate Haskell expressions with cabal2nix. 2014-07-16 12:10:10 +02:00
Ian-Woo Kim 02d6445409 update hoodle-types 0.2.2 -> 0.3, hoodle-builder 0.2.2.0 -> 0.3, hoodle-parser 0.2.2 -> 0.3, hoodle-render 0.3.2 -> 0.4, hoodle-core 0.13.0.0 -> 0.14, and hoodle 0.2.2.1 -> 0.3 2014-07-16 12:10:10 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Christoph Hrdinka 75518f748f hugin: update to version 2013.0.0 2014-07-12 13:18:22 +02:00
Vladimír Čunát 4b263946dd qt3, graphicsmagick137, fox, neverball: fix build 
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
 2014-07-09 21:52:04 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
Bjørn Forsman a14365b568 alchemy: add meta.longDescription 2014-06-22 21:46:34 +02:00
Michael Raskin 566ef0e31a Adding an auto-updater script for qiv and updating it to 2.3.1 2014-06-13 13:37:12 +04:00
Michael Raskin ed7b509fbf Oops. Fix the permissions on initialized persistence file for Dia 2014-06-13 01:33:18 +04:00
Michael Raskin 6b35f37005 Fix dia when run not from $PATH 2014-06-13 01:22:56 +04:00
Michael Raskin 80b701ca94 Put a correct Dia persistence file in ~/.dia unless such a file exists. Fixes #1691. 2014-06-12 15:02:49 +04:00
John Wiegley 0085a1aae3 potrace: allow building on any unix 2014-06-10 08:57:41 +00:00
Michael Raskin 26c8490ea1 Install libpotrace 2014-06-10 11:24:43 +04:00
Pascal Wittmann b40ce8a1f1 Update feh from 2.11 to 2.12. 
The relevant source code of giblib was imported into feh,
therefore giblib is no longer a dependency.
 2014-06-07 15:22:20 +02:00
Pascal Wittmann 91b2021782 feh: Set the default theme explicitly to 'feh' 
feh uses argv[0] to set the default theme, because
feh is wrapped this will be .feh-wrapper. This makes
it hard to use the configuration on multiple systems
and can be confusion. Therefore the theme is explicity
set to 'feh'.
 2014-06-07 15:18:09 +02:00
Eelco Dolstra 36f5ede37a geeqie: Fix incorrect longDescription formatting 
Note that longDescription should not be formatted as:

  longDescription =
    '' Bla bla
       bla bla
    '';

because this will cause the second line to have more preceding
whitespace. It should be:

  longDescription =
    ''
      Bla bla
      bla bla
    '';
 2014-06-03 11:47:39 +02:00
Michael Raskin 80cc011f77 Merge pull request #2617 from ttuegel/hplip 
hplip: update and fix scanning
 2014-05-27 02:31:27 -07:00
Eelco Dolstra 1e6c82825a gimp: Fix download URL 2014-05-22 12:11:52 +02:00
Vladimír Čunát 8e9ead8656 berlios.de probably shut down, replace it 
The shutdown was announced years ago, only now it stopped working.
 2014-05-18 13:30:27 +02:00
Thomas Tuegel b4c8981064 sane: add mkSaneConfig 2014-05-11 14:01:07 -05:00
cillianderoiste 885a2d9c53 Merge pull request #2410 from pSub/potrace 
Add potrace-1.11, a tool for tracing bitmaps
 2014-05-11 14:46:12 +02:00
Pascal Wittmann 8b0d0e3601 Add potrace-1.11, a tool for tracing bitmaps 2014-05-09 14:23:00 +02:00
Eelco Dolstra 46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Benjamin Podszun 313900d819 nixpkgs: Bump feh to 2.11 2014-05-08 13:15:09 +02:00
Cillian de Róiste 849f6788ac darktable: update from 1.4.1 to 1.4.2 2014-05-03 15:16:12 +02:00
Jaka Hudoklin b12b180fc2 meshlab: fix build 
Patches are from the Arch Linux package.
 2014-04-21 11:24:26 +02:00
ambrop7@gmail.com 3bab2f2fc4 FreeCAD: Fix build. 2014-04-20 16:45:00 +02:00
James Cook ee79d43e40 ImageMagick: update to 6.8.9-0 2014-04-19 11:25:01 +01:00
Luca Bruno 35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901 
Also add icons to epiphany
 2014-04-06 11:02:21 +02:00
Domen Kožar d7bd83d0ae shotwell: 0.15.1 -> 0.18 2014-03-21 18:02:15 +01:00
Vladimír Čunát 5bb0803254 fix evaluation (shotwell license) 2014-03-19 21:10:43 +01:00
Domen Kozar 902b059967 Add shotwell 1.15.1 2014-03-18 18:23:13 +01:00
Bjørn Forsman 562f937d21 openscad: bump 2013.06 -> 2014.03 
openscad now depends on glib, and it needs pkgconfig to find glib.
 2014-03-14 22:21:15 +01:00
Cillian de Róiste fcfbe753e7 Add synfig: A 2D animation program 2014-03-13 01:14:05 +01:00
James Cook 5d14048867 ImageMagick: update to 6.8.8-7 
Fixes CVE-2014-{1947,1958,2030}.
 2014-03-08 10:35:05 +01:00
Peter Simons db2776ee8a feh: update from 2.9.3 to 2.10 2014-03-03 11:10:27 +01:00
Domen Kožar 40b8b3206e fix remaining broken python packages due to refactoring 2014-02-21 23:27:06 +01:00
Cillian de Róiste 30fb0365df openimageio: update from 1.1.12 to 1.3.12 2014-02-19 22:49:21 +01:00
Sergey Mironov a629aaee72 viewnior: version bump (1.4) (close #1781) 2014-02-19 20:44:30 +01:00
Jaka Hudoklin d34f77fd1f feh: add jpeg image manipulation support 2014-02-16 14:11:32 +01:00
Cillian de Róiste e2151230ab darktable: update from 1.2.3 to 1.4.1 2014-02-15 18:49:18 +01:00
Petr Rockai d2758ce017 freecad: Fix build with current cmake. 2014-02-15 10:27:39 +01:00
Vladimír Čunát 32cd198d8f gimp: remove 2.6, because it's old and vulnerable 
CVE-2012-2763 and three others. If we really need to resurrect it,
I think I saw debian could have patches for these somewhere.

Also add linux platforms for 2.8.
 2014-02-06 19:56:28 +01:00
Song Wenwu 1c83b079d2 gimp: wrap plugins with PYTHONPATH, fix #223 2014-01-31 14:05:53 +08:00
Rickard Nilsson e28c0da32e sane-backends: Add extra source url 
It seems alioth.debian.org has some problem (login needed for download), so
I've added a pkgs.fedoraproject.org url.
 2014-01-30 12:26:11 +01:00
Petr Rockai 6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Petr Rockai cf7ee03377 photivo: Fix paths. 2014-01-25 18:08:47 +01:00
Petr Rockai 2953c39409 photivo: Update. 2014-01-25 18:08:47 +01:00
Peter Simons 4e983788cd feh: update from 2.8 to 2.9.3 2014-01-21 20:19:21 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Peter Simons b4e1774272 haskell-hoodle: re-generate with cabal2nix 2014-01-20 18:04:59 +01:00
Ian-Woo Kim 7b51e24de9 add hoodle (pen notetaking program written in haskell) to nixpkgs 2014-01-20 15:18:04 +00:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Peter Simons 2d1c8d6f60 gocr: update to version 0.50 2014-01-13 17:05:45 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Eelco Dolstra 16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Vladimír Čunát d91e03d422 k3d: fix build with newer gcc versions (-fpermissive) 2014-01-05 13:09:41 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Peter Simons 72629aa7da sane-backends-git: update to version 1.0.24.73-g6c4f6bc (i.e. current Git HEAD) 2014-01-03 12:42:48 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Ricardo M. Correia dd93ce3378 saneBackends: Update to 1.0.24 2014-01-02 15:53:07 +01:00
Vladimír Čunát 506a304181 fftw: minor update and major refactoring 
- Unify the "single" and "float" variants, which are the same thing.
- Enable threads and openmp wrapper by default (they are very small).
- Don't use sse on i686, as I'm quite sure we have no warrant for that.
  Cf. http://en.wikipedia.org/wiki/Pentium_Pro
- Disable static libs (big, no indication we need them).
- I tested most builds using fftw (they build OK).
 2014-01-01 13:05:56 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Vladimír Čunát cb639302df Merge glibc-2.18 branch into stdenv-updates 
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
 2013-12-28 18:51:23 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik a508d30c53 openimageio: hash change 2013-12-23 10:25:15 +01:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Evgeny Egorochkin c4c10e8826 ufraw: add missing lensfun dependency 2013-12-21 02:28:27 +02:00
Nixpkgs Monitor d0e950867c ufraw: update from 0.18 to 0.19.2 2013-12-21 02:28:27 +02:00
Nixpkgs Monitor 102a88e469 xsane: update from 0.998 to 0.999 2013-12-21 02:28:26 +02:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
 2013-12-18 23:21:29 +01:00
Nixpkgs Monitor 20f3c4de3d gimp: update from 2.8.8 to 2.8.10 2013-12-18 18:18:28 +02:00
Nixpkgs Monitor 6fb71755b8 cinepaint: update from 1.0 to 1.1 2013-12-18 18:18:22 +02:00
Sander van der Burg 010273bf1e Fix imagemagick compilation on darwin, because it still includes ghostscript which should not be the case 2013-12-17 11:45:07 +01:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Nixpkgs Monitor 6112fc7fff xaos: update from 3.5 to 3.6 2013-12-16 01:36:18 +02:00
Nixpkgs Monitor b92620f680 kde4.digikam: update from 3.2.0 to 3.5.0, potentially fixes CVE-2012-4514, CVE-2012-4514 2013-12-15 23:32:32 +02:00
Bjørn Forsman 4353a1a873 freecad: add matplotlib and pycollada dependencies 
When FreeCAD is started it prints that it's missing matplotlib and
pycollada:

  $ FreeCAD
  [...]
  matplotlib not found, Plot module will be disabled
  pycollada not found, collada support will be disabled.

The closure size of freecad is currently at 1.9 GiB. Adding these two
deps increase it to 2.0 GiB.

Reflow the expression function argument list.
 2013-12-14 13:00:46 +01:00
Petr Rockai 8f583cced9 photivo: Add photivo photo processor / RAW development laboratory. 2013-12-13 20:56:35 +02:00
Nixpkgs Monitor 1cedd2647f autopanosiftc: update from 2.5.0 to 2.5.1 2013-12-12 03:26:11 +02:00
Vladimír Čunát db426d4601 k3d: fix changed URL/patch 2013-12-11 12:01:46 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates 
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
 2013-12-07 14:17:16 +01:00
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