Commit graph

109 commits

Author SHA1 Message Date
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