philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

318 commits

Author SHA1 Message Date
Eelco Dolstra 3e3eac2e30 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26303
 2011-03-14 18:26:46 +00:00
Lluís Batlle i Rossell e7ed35ecd8 Adding the djview firefox plugin option. 
svn path=/nixpkgs/trunk/; revision=26265
 2011-03-10 21:39:09 +00:00
Eelco Dolstra cc3d1e1c09 * Sync with trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26243
 2011-03-10 08:48:14 +00:00
Lluís Batlle i Rossell 19d1236a52 Updating feh 
svn path=/nixpkgs/trunk/; revision=26229
 2011-03-09 13:37:03 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already 
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
 2011-03-07 12:17:12 +00:00
Lluís Batlle i Rossell e132efaeeb Fixing the freecad build on i686-linux 
svn path=/nixpkgs/trunk/; revision=26173
 2011-03-06 11:00:29 +00:00
Lluís Batlle i Rossell 874af6794d Trying to get freecad work on i686-linux too. 
svn path=/nixpkgs/trunk/; revision=26170
 2011-03-05 22:27:55 +00:00
Lluís Batlle i Rossell 69a67fc7cf Trying to make freecad find pyqt. This required a patch to be able to use PYTHONPATH. 
svn path=/nixpkgs/trunk/; revision=26169
 2011-03-05 22:27:51 +00:00
Lluís Batlle i Rossell 370a89b5ad Removing the wrong pyqt references in freecad. I don't know how to make it work with pyqt still. 
svn path=/nixpkgs/trunk/; revision=26154
 2011-03-04 09:48:36 +00:00
Lluís Batlle i Rossell f6ea68b2ee Freecad builds, installs and runs, (although still not with PyQt for its draft workbench). 
On virtualgl, it needs a variable set about the GL context set; freecad
suggests that upon failing to run in that environment.

svn path=/nixpkgs/trunk/; revision=26153
 2011-03-04 09:48:33 +00:00
Lluís Batlle i Rossell a76b0fb6fa Making freecad install; it still does not find all shared objects though. 
Either eigen changed the hash of the tarball, or I did not commit its latest hash.
I add boost 1.46 apart, because 1.44 does not work easily for freecad.

svn path=/nixpkgs/trunk/; revision=26151
 2011-03-04 09:48:24 +00:00
Lluís Batlle i Rossell 60844f7488 Making freecad build (from svn version). It does not install still, though. 
svn path=/nixpkgs/trunk/; revision=26145
 2011-03-03 13:41:10 +00:00
Eelco Dolstra eb4b1e8b04 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26141
 2011-03-03 12:02:50 +00:00
Lluís Batlle i Rossell d11c00e5a5 Adding xercesc, the references to coin3d and soqt, and trying to add 
freecad (that still does not build).

svn path=/nixpkgs/trunk/; revision=26135
 2011-03-02 17:18:30 +00:00
Eelco Dolstra 070f7debe0 * gdk-pixbuf: build gdk-pixbuf-xlib. 
svn path=/nixpkgs/branches/x-updates/; revision=25961
 2011-02-14 13:44:01 +00:00
Eelco Dolstra 3e3dc422ac * Allow geeqie to find exiv2 and exiftran, necessary to losslessly 
rotate JPEG images.

svn path=/nixpkgs/trunk/; revision=25590
 2011-01-16 16:42:08 +00:00
Eelco Dolstra 56ea89a61e * And now an actual fix. 
svn path=/nixpkgs/trunk/; revision=25589
 2011-01-16 16:39:06 +00:00
Eelco Dolstra dbb8c452bb * fbida: fix a segfault in exiftran. 
svn path=/nixpkgs/trunk/; revision=25588
 2011-01-16 16:28:08 +00:00
Ludovic Courtès 14f45d5da4 Add GNU Ocrad. 
svn path=/nixpkgs/trunk/; revision=25572
 2011-01-14 21:44:43 +00:00
Michael Raskin ed3ce17ce1 Adding darktable photo editor. Patch by Cillian de Róiste ( goibhniu1 ) 
svn path=/nixpkgs/trunk/; revision=25462
 2011-01-08 21:55:33 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
 2010-12-17 20:39:58 +00:00
Russell O'Connor 83e25f83c8 Patch Inkscape to support PDF importing. 
svn path=/nixpkgs/trunk/; revision=25151
 2010-12-15 15:56:04 +00:00
Michael Raskin fb58f74d82 Updating from trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
 2010-11-17 17:03:09 +00:00
Ludovic Courtès 8729f86924 qtpfsgui: Use fftw3 single-precision. 
Thanks to Lluís Batlle!

svn path=/nixpkgs/branches/stdenv-updates/; revision=24723
 2010-11-17 10:42:53 +00:00
Michael Raskin 3bc0867f36 Update XScreenSaver 
svn path=/nixpkgs/trunk/; revision=24685
 2010-11-14 18:55:09 +00:00
Ludovic Courtès 10306f1b4c libpano13 2.9.17. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24680
 2010-11-12 22:02:08 +00:00
Lluís Batlle i Rossell 8d1e116069 Updating paraview 
svn path=/nixpkgs/trunk/; revision=24651
 2010-11-10 18:13:04 +00:00
Lluís Batlle i Rossell 01b6395203 Making inkscape not install any icon cache 
svn path=/nixpkgs/trunk/; revision=24650
 2010-11-10 18:13:00 +00:00
Lluís Batlle i Rossell 8ed1a21f2c Updating inkscape 
svn path=/nixpkgs/trunk/; revision=24646
 2010-11-10 16:48:13 +00:00
Lluís Batlle i Rossell ab8ea7ab68 Updating pinta to 0.5 
svn path=/nixpkgs/trunk/; revision=24615
 2010-11-07 21:27:06 +00:00
Peter Simons e6bd263b4f Advance version of Imagemagick to 6.6.5-4 . 
Always include the --with-frozenpaths configure flag ( independently of tetex ).
Include the --with-rsvg configure flag when librsvg is not null.

svn path=/nixpkgs/trunk/; revision=24509
 2010-10-28 08:46:13 +00:00
Yury G. Kudryashov 1bda7748da Fix digikam buld 
svn path=/nixpkgs/trunk/; revision=24270
 2010-10-14 09:52:10 +00:00
Yury G. Kudryashov 63d252baa1 digikam: find marble widget 
svn path=/nixpkgs/trunk/; revision=24235
 2010-10-12 07:49:24 +00:00
Yury G. Kudryashov 6aded22a4b {digikam,kipi-plugins}-1.5.0 
svn path=/nixpkgs/trunk/; revision=24225
 2010-10-11 19:59:28 +00:00
Armijn Hemel 5068c4c822 update to 2.6.11, python problems still persist 
svn path=/nixpkgs/trunk/; revision=24187
 2010-10-08 15:38:17 +00:00
Yury G. Kudryashov 4591f1fe51 kipi-plugins: find gdk 
svn path=/nixpkgs/trunk/; revision=24091
 2010-10-05 17:44:17 +00:00
Yury G. Kudryashov 739f82a526 Digikam-1.4.0, move to all-packages.nix 
svn path=/nixpkgs/trunk/; revision=24089
 2010-10-05 17:44:05 +00:00
Yury G. Kudryashov bf340ad55a Move kipi-plugins to apps/graphics 
svn path=/nixpkgs/trunk/; revision=24088
 2010-10-05 17:43:57 +00:00
Yury G. Kudryashov 5422f21700 xscreensaver: move hacks to default location, use stdenv, more deps 
svn path=/nixpkgs/trunk/; revision=23161
 2010-08-13 14:06:23 +00:00
Eelco Dolstra 907bb1aac6 * ltrace: updated to 0.5.3. 
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
 2010-07-29 18:55:16 +00:00
Lluís Batlle i Rossell 5cf5a154db Updating hugin 
svn path=/nixpkgs/trunk/; revision=22810
 2010-07-29 14:38:46 +00:00
Eelco Dolstra ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency. 
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
 2010-07-29 08:21:21 +00:00
Eelco Dolstra f1598a8941 * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22798
 2010-07-28 18:01:17 +00:00
Eelco Dolstra 749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Armijn Hemel be0a49f551 update to 2.6.10, still haven't had time to dig into the gimpfu Python import problems 
svn path=/nixpkgs/trunk/; revision=22731
 2010-07-25 12:49:03 +00:00
Ludovic Courtès 3aee92f068 Geeqie: Use libchamplain. 
svn path=/nixpkgs/trunk/; revision=22650
 2010-07-18 22:47:23 +00:00
Ludovic Courtès 7da94088c8 Geeqie 1.0. 
svn path=/nixpkgs/trunk/; revision=22624
 2010-07-17 22:40:41 +00:00
Lluís Batlle i Rossell e2e5ae39f8 Updating meshlab (it was even not building fine from a long time ago) 
svn path=/nixpkgs/trunk/; revision=22515
 2010-07-07 15:10:05 +00:00
Yury G. Kudryashov a10b45e604 Don't build djview3 by default, let hydra build djview4 
svn path=/nixpkgs/trunk/; revision=22474
 2010-07-05 11:09:38 +00:00
Lluís Batlle i Rossell 5b4e3a5b40 Adding Wings 3D (as a side effect, update erlang, and add esdl). 
svn path=/nixpkgs/trunk/; revision=22436
 2010-07-01 09:08:37 +00:00
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