Commit graph

237 commits

Author SHA1 Message Date
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
Armijn Hemel 1ff2661414 version bump
svn path=/nixpkgs/trunk/; revision=14088
2009-02-16 21:28:00 +00:00
Lluís Batlle i Rossell 18cc7f4b37 Adding comical-0.8
svn path=/nixpkgs/trunk/; revision=14016
2009-02-09 20:44:26 +00:00
Michael Raskin 97d0f21d03 Added XaoS fractal viewer
svn path=/nixpkgs/trunk/; revision=14004
2009-02-08 14:17:05 +00:00
Armijn Hemel aecd8c4415 bump to 2.6.4
svn path=/nixpkgs/trunk/; revision=13966
2009-02-02 23:01:10 +00:00
Eelco Dolstra a815367a7a * gimp 2.6.3.
svn path=/nixpkgs/trunk/; revision=13949
2009-02-02 12:40:05 +00:00
Armijn Hemel b0cc696011 version bump
svn path=/nixpkgs/trunk/; revision=13896
2009-01-28 17:14:14 +00:00
Ludovic Courtès 730fe26fa0 Inkscape: Work around libpng's unhappiness.
svn path=/nixpkgs/trunk/; revision=13873
2009-01-26 18:51:52 +00:00
Andres Löh 9d67550148 version bump to 0.8
svn path=/nixpkgs/trunk/; revision=13701
2009-01-04 17:30:03 +00:00
Marc Weber 5638574907 fixes for previous commit
svn path=/nixpkgs/trunk/; revision=13662
2008-12-20 02:15:26 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Armijn Hemel 57bad22121 2.6.1 -> 2.6.2, still python import problems
svn path=/nixpkgs/trunk/; revision=13171
2008-11-01 08:45:49 +00:00
Armijn Hemel ed9151d338 gimp 2.4 -> 2.6 + update dependencies
svn path=/nixpkgs/trunk/; revision=13039
2008-10-09 23:21:39 +00:00
Michael Raskin 530c8a4e5b Double oops
svn path=/nixpkgs/trunk/; revision=12915
2008-09-24 14:45:28 +00:00
Michael Raskin 6b97827f14 oops, recursionwas needed on an attribute set
svn path=/nixpkgs/trunk/; revision=12914
2008-09-24 14:15:35 +00:00
Michael Raskin 4b21f11fda Updated xscreensaver; removed all versions as sources are removed off site anyway..
svn path=/nixpkgs/trunk/; revision=12912
2008-09-24 13:57:16 +00:00
Eelco Dolstra 5d9dfc1e60 * Removed $installCommand, it's no longer needed since we split the
install and fixup phases.  You can just override installPhase.

svn path=/nixpkgs/trunk/; revision=12787
2008-09-02 13:51:32 +00:00
Armijn Hemel a5deaa8e07 update to 2.4.7, python problems are still there
svn path=/nixpkgs/trunk/; revision=12698
2008-08-23 08:47:14 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Michael Raskin 4577779af6 Fixed Inkscape build
svn path=/nixpkgs/trunk/; revision=12114
2008-06-16 09:09:58 +00:00
Michael Raskin db24f5948f Fresh XScreensaver (5.05)
svn path=/nixpkgs/trunk/; revision=12104
2008-06-15 17:10:42 +00:00
Armijn Hemel a65e05bbaf update to 2.4.6, python import problems are still there:
(gimp:9911): LibGimpBase-WARNING **: gimp: gimp_wire_read(): error
Traceback (most recent call last):
  File "/nix/store/41hi79yr3k46yx98yfanpxbdcdslbgql-gimp-2.4.6/lib/gimp/2.0/plug-ins/happy-valley-relief.py", line 20, in ?
    from gimpfu import *
  File "/nix/store/41hi79yr3k46yx98yfanpxbdcdslbgql-gimp-2.4.6/lib/gimp/2.0/python/gimpfu.py", line 74, in ?
    import gimp
ImportError: could not import pygtk

svn path=/nixpkgs/trunk/; revision=11942
2008-05-31 11:59:41 +00:00
Andres Löh 45f5f8a5b3 * added pqiv image viewer
svn path=/nixpkgs/trunk/; revision=11908
2008-05-27 15:05:16 +00:00
Ludovic Courtès 09f95efe18 ImageMagick: Use the `imagemagick' mirror scheme.
svn path=/nixpkgs/trunk/; revision=11843
2008-05-19 09:32:24 +00:00
Eelco Dolstra 3042994875 * ImageMagick: don't need to keep old versions I guess.
* texFunctions.simpleTexToPNG: purity (use our own ImageMagick).

svn path=/nixpkgs/trunk/; revision=11836
2008-05-16 11:26:23 +00:00
Eelco Dolstra 4bbd9bab29 * ImageMagick: code cleanup and added another source URL
(ftp.imagemagick.org seems to be down now).

svn path=/nixpkgs/trunk/; revision=11835
2008-05-16 11:05:37 +00:00
Nicolas Pierron 6cbefd2f91 Update ImageMagick version.
svn path=/nixpkgs/trunk/; revision=11831
2008-05-15 22:02:56 +00:00
Armijn Hemel 2b8ec976cf update to 2.4.5, Python ImportError still in there.
svn path=/nixpkgs/trunk/; revision=10923
2008-03-02 22:24:21 +00:00
Michael Raskin 71f8e0911a Added src to meta for builderDefs-based packages.
svn path=/nixpkgs/trunk/; revision=10913
2008-03-02 18:49:31 +00:00
Michael Raskin 5883330e2c Updated ImageMagick
svn path=/nixpkgs/trunk/; revision=10886
2008-02-28 18:53:39 +00:00
Eelco Dolstra 5ea761b23f * Merged the last of the trunk, preparing for switch...
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10847
2008-02-25 11:09:37 +00:00