Commit Graph

268 Commits

Author SHA1 Message Date
Armijn Hemel
29a38efdc8 update to 2.6.9, python import problems persist
svn path=/nixpkgs/trunk/; revision=22420
2010-06-26 12:35:35 +00:00
Lluís Batlle i Rossell
78f5f3359b Fixing the pinta build (finally!). All looks very ugly, I imagine that mainly because
I know almost nothing about Mono.
I invite others to improve it.

svn path=/nixpkgs/trunk/; revision=22387
2010-06-22 21:07:09 +00:00
Lluís Batlle i Rossell
c38cae02ed pinta-related changes that should go in pair with a change I just commited related to aufs
(So, not related to pinta, but... what to do. nixpkgs has to evaluate)

svn path=/nixpkgs/trunk/; revision=22362
2010-06-21 18:14:52 +00:00
Michael Raskin
c1059d8969 Fixing problems with Xscreensaver caused by using stdenv builder
svn path=/nixpkgs/trunk/; revision=22332
2010-06-18 19:33:15 +00:00
Lluís Batlle i Rossell
da9e4402ee Pinta still does not build (xbuild pkgconfig problems), but mono and gtk-sharp-2 build fine.
svn path=/nixpkgs/trunk/; revision=22322
2010-06-18 08:16:21 +00:00
Michael Raskin
100ece1ac9 Update XScreensaver
svn path=/nixpkgs/trunk/; revision=22315
2010-06-17 20:28:00 +00:00
Lluís Batlle i Rossell
57c012a16c Attempt at adding 'pinta'. It still does not build due to mono problems.
Nevertheless, I updated the gnome attribute names a bit so all that
gtk-sharp-2 goes a bit beyond.

svn path=/nixpkgs/trunk/; revision=22287
2010-06-15 22:25:38 +00:00
Lluís Batlle i Rossell
a9414f4260 Updatin feh.
This fixes a bug I reported: the last line or column were often not shown, scrolling or zooming.

svn path=/nixpkgs/trunk/; revision=22190
2010-06-09 08:42:30 +00:00
Lluís Batlle i Rossell
e8fc7c3d9e Updating feh.
svn path=/nixpkgs/trunk/; revision=22127
2010-06-03 14:41:41 +00:00
Lluís Batlle i Rossell
d7e44fd3df Updating paraview
svn path=/nixpkgs/trunk/; revision=22052
2010-05-29 12:23:42 +00:00
David Guibert
b62332db76 xournal: update to 0.4.5
svn path=/nixpkgs/trunk/; revision=22022
2010-05-27 19:44:17 +00:00
Peter Simons
5139e564fa pkgs/applications/graphics/ImageMagick: added build input jasper for jpeg-2000 support
While I was at it, I also rewrote the expression to get along without
using the deprecated "args: with args;" style.

svn path=/nixpkgs/trunk/; revision=21454
2010-04-30 10:49:33 +00:00
Yury G. Kudryashov
f25c68f01a Remove old kde packages
svn path=/nixpkgs/trunk/; revision=21011
2010-04-11 15:50:41 +00:00
Lluís Batlle i Rossell
40d3c2f29a Adding graphicsmagick 1.3.7 for octave imread() and alike to work.
svn path=/nixpkgs/trunk/; revision=20390
2010-03-04 16:41:14 +00:00
Lluís Batlle i Rossell
ba274e578c Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.
Made octave link with graphicsmagick to get imread() working.

Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html

Next to do: add an older version of graphics magick for octave.

svn path=/nixpkgs/trunk/; revision=20389
2010-03-04 16:41:10 +00:00
Lluís Batlle i Rossell
9c75629a31 Made graphicsmagick build shared libraries (otherwise we have to care in x86_64 on PIC)
svn path=/nixpkgs/trunk/; revision=20384
2010-03-04 14:44:51 +00:00
Lluís Batlle i Rossell
aa38df2611 Adding GraphicsMagick
svn path=/nixpkgs/trunk/; revision=20383
2010-03-04 14:44:47 +00:00
Lluís Batlle i Rossell
c2cbd65668 Getting a better seg3d build. Now it runs from TMPDIR at least.
The installation still fails.

svn path=/nixpkgs/trunk/; revision=20382
2010-03-04 14:44:43 +00:00
Lluís Batlle i Rossell
8e0a5f75a7 I broke again the nixpkgs tarball. After this, I think I learnt how to test it before
committing.


svn path=/nixpkgs/trunk/; revision=20321
2010-03-02 07:45:22 +00:00
Lluís Batlle i Rossell
cc068f0be8 Adding the itk libraries.
Adding a skeleton of the seg3d package. It builds, but libraries and rpaths are wrong.
I hope to fix it soon.

svn path=/nixpkgs/trunk/; revision=20320
2010-03-01 23:31:35 +00:00
Lluís Batlle i Rossell
fbb0906d14 Fixing a sourceforge url inside meshlab.
svn path=/nixpkgs/trunk/; revision=20162
2010-02-22 08:15:34 +00:00
Michael Raskin
b51a1937b6 Fix pqiv unpack step
svn path=/nixpkgs/trunk/; revision=20124
2010-02-19 09:58:37 +00:00
Marc Weber
92c42c9000 fix gimp plugins, webkit build
svn path=/nixpkgs/trunk/; revision=19988
2010-02-14 00:33:57 +00:00
Lluís Batlle i Rossell
76c8738552 Adding the GAP gimp plugin, and making nix-env recurse into the gimp plugins attribute set.
svn path=/nixpkgs/trunk/; revision=19936
2010-02-11 15:08:05 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Eelco Dolstra
7eff18fa03 * Fixed xscreensaver (it couldn't find the X headers/libraries
anymore).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19694
2010-01-26 21:40:32 +00:00
Lluís Batlle i Rossell
bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell
a3e4c7640f Updating meshlab.
Their build system has changed, and the source tree they distribute too, so the
dependencies changed a bit.
To get meshlab working, I update lib3ds and add levmar.

svn path=/nixpkgs/trunk/; revision=19595
2010-01-21 14:39:53 +00:00
Lluís Batlle i Rossell
8640725ca4 Updating meshlab
svn path=/nixpkgs/trunk/; revision=19592
2010-01-21 09:49:10 +00:00
Lluís Batlle i Rossell
47735a06c3 Adding rawtherapee svn r25
svn path=/nixpkgs/trunk/; revision=19500
2010-01-17 17:49:35 +00:00
Lluís Batlle i Rossell
063ef1925d Adding digikam and kipi-plugins for kde4.
svn path=/nixpkgs/trunk/; revision=19488
2010-01-16 20:13:20 +00:00
Lluís Batlle i Rossell
70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Lluís Batlle i Rossell
916e0f3840 Updating paraview.
svn path=/nixpkgs/trunk/; revision=19478
2010-01-16 11:05:17 +00:00
Michael Raskin
e1604101fe Fix Dia source link
svn path=/nixpkgs/trunk/; revision=19463
2010-01-15 10:51:44 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Armijn Hemel
f8106c5cf6 update to 2.6.8, python problems still persist
svn path=/nixpkgs/trunk/; revision=19235
2010-01-05 14:19:00 +00:00
Lluís Batlle i Rossell
d864771e26 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel
60e4c3e9ab update to 2009.4.0
svn path=/nixpkgs/trunk/; revision=19115
2009-12-25 16:58:17 +00:00
Armijn Hemel
18455cb9bc update to 0.97, use mirror and sha256
svn path=/nixpkgs/trunk/; revision=19114
2009-12-25 16:13:58 +00:00
Lluís Batlle i Rossell
bcc9c9ab1e Updated xaos to 3.5
svn path=/nixpkgs/trunk/; revision=19096
2009-12-24 17:02:44 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Lluís Batlle i Rossell
a534f901bb Updating hugin.
svn path=/nixpkgs/trunk/; revision=18915
2009-12-12 18:58:40 +00:00
Lluís Batlle i Rossell
dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Lluís Batlle i Rossell
f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
2009-12-10 22:19:52 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Ludovic Courtès
5d7de35976 Qtpfsgui 1.9.3.
svn path=/nixpkgs/trunk/; revision=18818
2009-12-05 15:43:07 +00:00
Lluís Batlle i Rossell
3bae8e9590 Fixing the cinepaint expression. Somehow I wrote the wrong date in fetchcvs,
when I commited it, so it has been a expression that only worked for me, I think,
because I had done the proper fetchcvs previously.

svn path=/nixpkgs/trunk/; revision=18699
2009-11-29 19:22:28 +00:00
Lluís Batlle i Rossell
32f2dda5de Fixing hugin (we now install boost without tags on library file names, and
the hugin expression still used the tag for 'multithread' in the boost library
file names).

svn path=/nixpkgs/trunk/; revision=18698
2009-11-29 19:22:22 +00:00
Lluís Batlle i Rossell
a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Ludovic Courtès
f1f286052e Remove `unpackCmd's not needed with GNU tar format auto-detection (r18492).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18653
2009-11-26 15:50:26 +00:00
Eelco Dolstra
a71971f671 * Inkscape 0.47.
svn path=/nixpkgs/trunk/; revision=18641
2009-11-26 12:39:22 +00:00
Ludovic Courtès
57fa034f8a Geeqie: Fix typos.
svn path=/nixpkgs/trunk/; revision=18615
2009-11-25 09:08:27 +00:00
Ludovic Courtès
aca6f17400 Add Geeqie, a GQview fork.
svn path=/nixpkgs/trunk/; revision=18613
2009-11-25 08:58:42 +00:00
Ludovic Courtès
96d3032ea0 Fix Ufraw.
svn path=/nixpkgs/trunk/; revision=18510
2009-11-21 22:30:00 +00:00
Eelco Dolstra
7a233c1629 * GIMP updated to 2.6.7. It no longer needs libgtkhtml.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18117
2009-11-04 21:28:11 +00:00
Ludovic Courtès
2aaf37cdf9 Add UFRaw.
svn path=/nixpkgs/trunk/; revision=17881
2009-10-19 12:50:45 +00:00
Marc Weber
dd3564aba9 adding ps2edit
svn path=/nixpkgs/trunk/; revision=17863
2009-10-18 04:43:53 +00:00
Marc Weber
f808690b16 adding python package lxml to make scripts in inkscape work
svn path=/nixpkgs/trunk/; revision=17858
2009-10-18 04:43:40 +00:00
Lluís Batlle i Rossell
92dbfb5b9d Marking comical as maintained by me, and let hydra build it.
svn path=/nixpkgs/trunk/; revision=17652
2009-10-05 21:01:50 +00:00
Lluís Batlle i Rossell
bd988d052b Stating me as maintainer of packages I maintain.
svn path=/nixpkgs/trunk/; revision=17583
2009-10-01 20:18:17 +00:00
Peter Simons
39e8418a69 xscreensaver: updated to version 5.10
Version 5.07 doesn't exist upstream anymore.

svn path=/nixpkgs/trunk/; revision=17403
2009-09-24 17:15:06 +00:00
Michael Raskin
ef643cbe09 Yes, XScreenSaver doesn't work on Windows and it never will.
svn path=/nixpkgs/trunk/; revision=17212
2009-09-17 05:19:57 +00:00
Eelco Dolstra
edae4e83b0 * Urgh, forgot to commit.
svn path=/nixpkgs/trunk/; revision=16948
2009-09-02 23:10:30 +00:00
Eelco Dolstra
99cd5a1679 * ImageMagick updated to 6.5.5-6.
svn path=/nixpkgs/trunk/; revision=16945
2009-09-02 22:43:08 +00:00
Marc Weber
8ff2647169 adding gutenprint (former gimp-print) and gutenprintBin. I still haven't
found the source of the binary package containing the .ppd files
Still impure but works. See comment.

svn path=/nixpkgs/trunk/; revision=16881
2009-08-27 23:32:13 +00:00
Michael Raskin
25b3fe32ad Adding myself as a maintainer of some of the packages
svn path=/nixpkgs/trunk/; revision=16572
2009-08-04 07:49:16 +00:00
Michael Raskin
890cf33ef7 Adding fbida, framebuffer image viewer
svn path=/nixpkgs/trunk/; revision=16571
2009-08-04 07:14:43 +00:00
Michael Raskin
dee8937ae7 Adding Xournal - a note-taking application for stylus usage
svn path=/nixpkgs/trunk/; revision=16538
2009-08-02 21:47:10 +00:00
Ludovic Courtès
ed658483e9 Hugin: Fix segfault on x86_64.
svn path=/nixpkgs/trunk/; revision=16340
2009-07-13 16:24:47 +00:00
Ludovic Courtès
3a4ba343a4 Hugin: Fix typo stealthily introduced in r15692.
svn path=/nixpkgs/trunk/; revision=16332
2009-07-12 22:00:35 +00:00
Marc Weber
b241732d8c adding ufraw (a standalone tool and gimp plugin to read raw data images)
adding exposureBlend (gimp plugin)
enabling gimpPlugins again. nix-env -qa \* --out-path suceeds

svn path=/nixpkgs/trunk/; revision=16108
2009-06-30 16:14:34 +00:00
Marc Weber
349de9bafe revrting my accident only keeping rubygem updates and ruby libs
This partially reverts commit -r 16100

svn path=/nixpkgs/trunk/; revision=16107
2009-06-30 15:58:02 +00:00
Marc Weber
d1e39e78f9 adding rubygems support to nix - implemented target libraries/apps: sup mail client
svn path=/nixpkgs/trunk/; revision=16100
2009-06-30 14:29:20 +00:00
Marc Weber
9dbc0bd614 adding gmic (a tool which can denoise images and much more)
svn path=/nixpkgs/trunk/; revision=16057
2009-06-26 16:52:35 +00:00
Marc Weber
f4262cf010 adding some gimp plugins *joy*
svn path=/nixpkgs/trunk/; revision=15954
2009-06-14 01:30:12 +00:00
Lluís Batlle i Rossell
94d2e57c62 Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while
before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

svn path=/nixpkgs/trunk/; revision=15838
2009-06-03 09:19:19 +00:00
Lluís Batlle i Rossell
6175b1d633 Updating to the latest cinepaint. I haven't checked thoroughly the bunch of
dependencies, whether any is no more needed in the update.

svn path=/nixpkgs/trunk/; revision=15778
2009-05-28 21:57:05 +00:00
Marc Weber
f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Lluís Batlle i Rossell
226d5cf608 Changing the xscreensaver expression, so nix-env operations with '*' work.
svn path=/nixpkgs/trunk/; revision=15627
2009-05-17 20:33:58 +00:00
Lluís Batlle i Rossell
6e1e2d5aba Adding muparser and meshlab.
svn path=/nixpkgs/trunk/; revision=15585
2009-05-13 10:21:29 +00:00
Eelco Dolstra
5abb878393 svn path=/nixpkgs/trunk/; revision=15552 2009-05-11 15:22:22 +00:00
Michael Raskin
607b018dbb Fix XFig installation
svn path=/nixpkgs/trunk/; revision=15526
2009-05-10 10:43:18 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Sander van der Burg
205d181222 Fixed inkscape compilation on glibc 2.9
svn path=/nixpkgs/branches/stdenv-updates/; revision=15168
2009-04-20 11:18:53 +00:00
Lluís Batlle i Rossell
813a3b6c6d Adding freepv, without its mozilla plug-in.
svn path=/nixpkgs/trunk/; revision=14954
2009-04-08 20:05:59 +00:00
Lluís Batlle i Rossell
2c3aaf09d1 Adding autopano-sift-C, a C implementation of autopano-sift, made by the hugin people.
svn path=/nixpkgs/trunk/; revision=14916
2009-04-07 19:15:53 +00:00
Lluís Batlle i Rossell
613cc80e1d Adding sha256 hash to panotools, and improving its description.
svn path=/nixpkgs/trunk/; revision=14900
2009-04-06 09:34:28 +00:00
Lluís Batlle i Rossell
dab0ce81ac Fixing the hugin build, and its meta information, with help of civodul.
svn path=/nixpkgs/trunk/; revision=14899
2009-04-06 09:19:51 +00:00
Ludovic Courtès
61a559cf97 Hugin: Fix `meta.license'.
svn path=/nixpkgs/trunk/; revision=14898
2009-04-06 08:26:13 +00:00
Lluís Batlle i Rossell
c36012783f Fixing licenses for the last packages I added.
svn path=/nixpkgs/trunk/; revision=14895
2009-04-05 21:41:47 +00:00
Lluís Batlle i Rossell
2dd00f1a57 Adding enblend-fuse, libxmi and hugin. Maybe hugin doesn't run well enough still.
svn path=/nixpkgs/trunk/; revision=14894
2009-04-05 21:41:38 +00:00
Lluís Batlle i Rossell
7f9d11782e Adding panotools.
svn path=/nixpkgs/trunk/; revision=14893
2009-04-05 21:41:24 +00:00
Lluís Batlle i Rossell
0b76035b66 Adding qtpfsgui and pfstools. Updating fftw because the src URL didn't work anymore.
svn path=/nixpkgs/trunk/; revision=14892
2009-04-05 21:41:13 +00:00
Lluís Batlle i Rossell
19ac94dee3 Adding cinepaint 0.22.1 and as a dependency, also fltk 1.1.9
svn path=/nixpkgs/trunk/; revision=14841
2009-04-02 15:20:19 +00:00
Lluís Batlle i Rossell
0edebf5d84 Adding paraview.
svn path=/nixpkgs/trunk/; revision=14794
2009-03-30 20:06:31 +00:00
Lluís Batlle i Rossell
c29118795a Adding gwenview.
svn path=/nixpkgs/trunk/; revision=14761
2009-03-29 20:32:53 +00:00
Armijn Hemel
19eaf90e36 update to 2.6.6
svn path=/nixpkgs/trunk/; revision=14636
2009-03-20 21:11:37 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00