Commit graph

385 commits

Author SHA1 Message Date
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
Ludovic Courtès c800565c73 Make Inkscape properly depend on Python, which is needed for some features.
svn path=/nixpkgs/trunk/; revision=10836
2008-02-22 16:24:58 +00:00
Eelco Dolstra e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
2008-02-20 23:02:41 +00:00
Ludovic Courtès 93c4507257 Add ImageMagick mirrors, suggested by Nicolas Pierron.
svn path=/nixpkgs/trunk/; revision=10717
2008-02-17 19:02:56 +00:00
Ludovic Courtès 59ff810f83 Update ImageMagick since the previous source tarball is no longer available (!).
svn path=/nixpkgs/trunk/; revision=10646
2008-02-12 15:50:55 +00:00
Yury G. Kudryashov e748c42115 ImageMagick: version updated
svn path=/nixpkgs/branches/stdenv-updates/; revision=10616
2008-02-10 17:42:16 +00:00
Yury G. Kudryashov 591ae36522 2.4.3 -> 2.4.4, still Python warnings
svn path=/nixpkgs/branches/stdenv-updates/; revision=10578
2008-02-10 17:36:51 +00:00
Michael Raskin 4df190c703 Various fixes and updates to build that all.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10568
2008-02-10 16:44:43 +00:00
Armijn Hemel 7468189bd3 2.4.3 -> 2.4.4, still Python warnings
svn path=/nixpkgs/trunk/; revision=10484
2008-02-03 16:04:08 +00:00
Yury G. Kudryashov e7ada570fc inkscape: nix-expr review, version corrected
svn path=/nixpkgs/branches/stdenv-updates/; revision=10476
2008-02-03 13:17:59 +00:00
Yury G. Kudryashov 0facf68545 ImageMagick: 6.3.8-2
svn path=/nixpkgs/branches/stdenv-updates/; revision=10462
2008-02-02 20:41:20 +00:00
Yury G. Kudryashov 98a81beaac meta.homepage added to several packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=10431
2008-01-31 10:41:45 +00:00
Yury G. Kudryashov fbfab88e04 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10429
2008-01-31 10:41:04 +00:00
Yury G. Kudryashov 81aac8d84d meta.homepage added to several packages
svn path=/nixpkgs/trunk/; revision=10417
2008-01-30 19:49:42 +00:00
Yury G. Kudryashov 5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Yury G. Kudryashov 16dbde8987 Typo in xscreensaver corrected (introduced by merge)
svn path=/nixpkgs/branches/stdenv-updates/; revision=10292
2008-01-25 13:23:06 +00:00
Yury G. Kudryashov da57804fff Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
2008-01-23 18:11:03 +00:00
Michael Raskin bc46eaf404 Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs
svn path=/nixpkgs/trunk/; revision=10214
2008-01-18 12:36:56 +00:00
Eelco Dolstra a5e0e39cdb * makeWrapper: option --run <CMD> to run a command from the wrapper.
This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213
2008-01-18 11:28:41 +00:00
Yury G. Kudryashov a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Michael Raskin 000226696b Added libtool for ImageMagick
svn path=/nixpkgs/trunk/; revision=10089
2008-01-07 14:11:58 +00:00
Armijn Hemel 0966b36824 update
svn path=/nixpkgs/trunk/; revision=10088
2008-01-07 13:49:25 +00:00
Armijn Hemel 877052cb20 2.4.0 -> 2.4.3
Notable errors:

* python errors are still there
* missing libgnomebreakpad.so (part of bug-buddy)

svn path=/nixpkgs/trunk/; revision=9990
2007-12-31 16:46:26 +00:00
Yury G. Kudryashov d23f0bf7e9 merging trunk...
svn path=/nixpkgs/branches/stdenv-updates/; revision=9895
2007-12-08 15:21:03 +00:00
Yury G. Kudryashov 3896cd4a28 * Get rid of the `(import (__toPath ((toString
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.


svn path=/nixpkgs/branches/stdenv-updates/; revision=9886
2007-12-08 01:09:00 +00:00
Yury G. Kudryashov 356c077ecf Added XScreensaver; also changed version-stub.nix (now it does sumArgs itself, and requires builderDefs to be used) and added a merge of composing-builder and declarative flag processing.
svn path=/nixpkgs/branches/stdenv-updates/; revision=9880
2007-12-08 01:07:13 +00:00
Marc Weber fb437cf98d exrviewer added (needs ctl openexr openexr_ctl)
fltk update
ilmbase updated
ndiswrapper does compile but has to be integrated into the kernel somehow

svn path=/nixpkgs/trunk/; revision=9863
2007-12-05 21:25:47 +00:00
Marc Weber 800634501b forgotten to commit this new default.nix
svn path=/nixpkgs/trunk/; revision=9855
2007-12-04 12:53:37 +00:00
Eelco Dolstra c54b75c959 * Get rid of the `(import (__toPath ((toString
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.

svn path=/nixpkgs/trunk/; revision=9792
2007-11-26 13:24:56 +00:00
Michael Raskin 2b5369552c Added XScreensaver; also changed version-stub.nix (now it does sumArgs itself, and requires builderDefs to be used) and added a merge of composing-builder and declarative flag processing.
svn path=/nixpkgs/trunk/; revision=9776
2007-11-22 20:26:00 +00:00
Yury G. Kudryashov 0cd729c415 Added djview4
svn path=/nixpkgs/trunk/; revision=9642
2007-11-11 16:52:29 +00:00
Michael Raskin 61f4326752 Added possibility to enable SVG in ImageMagick, updated pidgin-latex, added missed xorgserver xkb patch.
svn path=/nixpkgs/trunk/; revision=9623
2007-11-11 07:54:45 +00:00
Michael Raskin 43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant)
svn path=/nixpkgs/trunk/; revision=9613
2007-11-09 13:54:02 +00:00
Marc Weber 3f38e45fa4 update inkscape to version 0.45 (I was no longer able to get 0.43)
svn path=/nixpkgs/trunk/; revision=9554
2007-10-29 22:15:02 +00:00
Armijn Hemel 14d5909a2f 2.4.0, still suffering from the pygtk bugs (see bugs.cs.uu.nl for a full report)
svn path=/nixpkgs/trunk/; revision=9524
2007-10-25 23:14:28 +00:00
Eelco Dolstra ea9667ab18 * Fixed some more URLs.
svn path=/nixpkgs/trunk/; revision=9294
2007-09-11 11:15:37 +00:00
Eelco Dolstra 1adacdf150 * Make screenshots work in the Gimp, add it to the channel.
svn path=/nixpkgs/trunk/; revision=9229
2007-08-31 13:14:20 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Armijn Hemel cf9bc5c79c update to 2.4.0-rc1. Does not fix NIXPKGS-54
svn path=/nixpkgs/trunk/; revision=9151
2007-08-18 01:20:34 +00:00
Armijn Hemel fcd736f20b add PythonMagick 0.7
svn path=/nixpkgs/trunk/; revision=9078
2007-08-09 01:11:51 +00:00
Armijn Hemel 9ca1e31d3e 6.3.5-0 -> 6.3.5-5
svn path=/nixpkgs/trunk/; revision=9076
2007-08-09 00:14:14 +00:00
Michael Raskin 1253a722f5 Updated ImageMagick version. Old version seems to be unavailable, and earlier had a checksum change.
svn path=/nixpkgs/trunk/; revision=8956
2007-07-07 13:34:39 +00:00
Michael Raskin 67ae8e3d38 Added ImageMagick
svn path=/nixpkgs/trunk/; revision=8939
2007-07-01 22:31:24 +00:00
Michael Raskin d80093f2ff Added version suffixes.
svn path=/nixpkgs/trunk/; revision=8921
2007-06-26 12:13:17 +00:00
Michael Raskin 42f841bcab Added some descriptions.
svn path=/nixpkgs/trunk/; revision=8920
2007-06-26 11:49:45 +00:00
Michael Raskin 02d12c9ff6 Added Dia.
svn path=/nixpkgs/trunk/; revision=8903
2007-06-20 12:20:39 +00:00
Armijn Hemel ceb097cd01 partial fix for linking problems
svn path=/nixpkgs/trunk/; revision=8696
2007-05-14 22:49:45 +00:00
Armijn Hemel 6c64b29d2a cleanups, problems not fixed yet
svn path=/nixpkgs/trunk/; revision=8693
2007-05-14 18:25:18 +00:00
Armijn Hemel 1a879a423a update to newer version, still has rpath problems
svn path=/nixpkgs/trunk/; revision=8692
2007-05-14 16:59:15 +00:00
Armijn Hemel 6b6a304af8 clean up for gimp and other packages
svn path=/nixpkgs/trunk/; revision=8678
2007-05-14 00:05:34 +00:00
Armijn Hemel 2560ded6e2 2.3.16
svn path=/nixpkgs/trunk/; revision=8671
2007-05-13 22:34:58 +00:00
Eelco Dolstra e9178614a9 * Added feh to set the root image.
* Compiz extra plugins.

svn path=/nixpkgs/trunk/; revision=8178
2007-03-05 13:44:27 +00:00
Eelco Dolstra d54d18fa8b * Gqview 2.1.5.
svn path=/nixpkgs/trunk/; revision=7529
2007-01-01 19:15:51 +00:00
Eelco Dolstra 5d72829c18 * Doh.
svn path=/nixpkgs/trunk/; revision=7505
2006-12-27 20:40:25 +00:00
Eelco Dolstra bbe62e266b * Remove references to dontMakeInstall.
svn path=/nixpkgs/trunk/; revision=7500
2006-12-27 18:24:26 +00:00
Eelco Dolstra 3691639db1 * By popular demand: xfig.
svn path=/nixpkgs/trunk/; revision=7278
2006-12-08 01:17:21 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +00:00
Martin Bravenboer deeadfc6f5 Tried to add kuickshow (a pretty fast image viewer that used to be
distributed by default in KDE).

Unfortunately it doesn't work, because of some strange problems with
mime types. But well, it compiles. The libraries are useful anyway:

- arts (kde)
- imlib (gnome)
- libungif (aka libgif)


svn path=/nixpkgs/trunk/; revision=6111
2006-08-13 09:46:54 +00:00
Armijn Hemel 9ae0ce91c4 new version, also needs gettext as another requirement
svn path=/nixpkgs/trunk/; revision=5690
2006-07-11 23:28:29 +00:00
Armijn Hemel c7e4a07c07 add the XaraLX Xtreme SVG application
svn path=/nixpkgs/trunk/; revision=5584
2006-07-04 23:41:11 +00:00
Armijn Hemel 87613a856a gimp dev version 1.3.4 updated to 1.3.9
svn path=/nixpkgs/trunk/; revision=5581
2006-07-04 20:26:50 +00:00
Eelco Dolstra 1a570c63f7 * Inkscape 0.43.
svn path=/nixpkgs/trunk/; revision=5497
2006-06-23 11:21:19 +00:00
Eelco Dolstra 9f898a586b * Copy even more files (in particular from losser.st-lab.cs.uu.nl,
can't assume that it will live forever).

svn path=/nixpkgs/trunk/; revision=4624
2006-01-30 16:11:00 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Armijn Hemel 84008ec181 GIMP Python plugins also needs pygtk. TODO: factor these out, so we can also
build and run without Python

svn path=/nixpkgs/trunk/; revision=4603
2006-01-26 20:09:23 +00:00
Armijn Hemel ef4dedff3a add undocumented dependency (python) and upgrade to new version
svn path=/nixpkgs/trunk/; revision=4598
2006-01-26 18:45:50 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra b018b48647 * GQView 2.1.1.
svn path=/nixpkgs/trunk/; revision=4088
2005-10-14 11:41:16 +00:00
Rob Vermaas ed24d488e3 gimp-2.3.0
svn path=/nixpkgs/trunk/; revision=3807
2005-09-11 22:38:47 +00:00
Martin Bravenboer 560f307623 Added libraries:
- gtkmm: C++ bindings for gtk
  - glibmm: C++ bindings for glib
  - libsigc++ (C++)

Added applications:
  - Batik: SVG rasterizer (and more)
  - Inkscape: vector graphics drawing application

Upgraded:
  - boehm-gc


svn path=/nixpkgs/trunk/; revision=3792
2005-09-07 14:57:30 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra 7775caaa35 * Evacuate tarballs.
svn path=/nixpkgs/trunk/; revision=2527
2005-04-11 13:09:01 +00:00
Eelco Dolstra b13b00afe2 * Gqview 2.0.0.
svn path=/nixpkgs/trunk/; revision=2432
2005-03-18 09:59:41 +00:00
Eelco Dolstra f6e91bc9c9 * Merge r2396.
svn path=/nixpkgs/trunk/; revision=2397
2005-03-14 09:22:26 +00:00
Eelco Dolstra df2a7e5168 * F-spot: work properly if an incompatible Mono is in the PATH.
svn path=/nixpkgs/trunk/; revision=2392
2005-03-13 20:43:04 +00:00
Eelco Dolstra a04773c876 * Added f-spot.
svn path=/nixpkgs/trunk/; revision=2380
2005-03-11 12:00:28 +00:00
Eelco Dolstra e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra f39229bac9 * Gqview updated to 1.4.5.
svn path=/nixpkgs/trunk/; revision=1975
2004-12-30 17:38:54 +00:00
Eelco Dolstra 454e5eb904 * Gqview updated to 1.4.4.
svn path=/nixpkgs/trunk/; revision=1466
2004-09-19 16:37:14 +00:00
Eelco Dolstra 3f9a589d53 * More updates.
svn path=/nixpkgs/trunk/; revision=1068
2004-06-21 17:00:00 +00:00
Eelco Dolstra 776554d9e1 * Fixed and/or updated some more components. The number of explicit
builders is dropping steadily.

svn path=/nixpkgs/trunk/; revision=900
2004-04-01 19:11:59 +00:00
Eelco Dolstra 12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra 2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing
broke.

svn path=/nixpkgs/trunk/; revision=870
2004-03-29 10:25:25 +00:00
Eelco Dolstra 9a4afa3f94 * Fix undefined variables.
svn path=/nixpkgs/trunk/; revision=744
2004-02-03 14:44:48 +00:00
Eelco Dolstra 026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Eelco Dolstra 48c3faca51 * Renamed pkgs-ng to pkgs.
svn path=/nixpkgs/trunk/; revision=502
2003-11-14 09:59:13 +00:00