Commit graph

138 commits

Author SHA1 Message Date
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +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
Marc Weber 630dcdebfc fix url thinkingrock
svn path=/nixpkgs/trunk/; revision=14063
2009-02-12 22:33:15 +00:00
Marc Weber c4c1aa0a8a added thinkingRock
svn path=/nixpkgs/trunk/; revision=13993
2009-02-06 03:14:30 +00:00
Peter Simons 6fb297513a Committing Lluís Batlle's submissions from mailing list posting
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
2009-01-12 21:12:07 +00:00
Ludovic Courtès 21443fb797 GNU gv: Properly substitute the default value of `gsInterpreter'.
svn path=/nixpkgs/trunk/; revision=13740
2009-01-12 11:12:17 +00:00
Michael Raskin 2f770f46e4 Added back old XNeur version (did not have XIM bug)
svn path=/nixpkgs/trunk/; revision=13739
2009-01-12 06:14:13 +00:00
Michael Raskin 46f022b4ce Fixed dependencies for updated Xneur
svn path=/nixpkgs/trunk/; revision=13735
2009-01-11 10:19:11 +00:00
Michael Raskin cc2e747a1b Updated XNeur
svn path=/nixpkgs/trunk/; revision=13734
2009-01-11 09:28:07 +00:00
Eelco Dolstra ed62007229 * xpdf 3.02pl2.
svn path=/nixpkgs/trunk/; revision=13716
2009-01-06 15:30:55 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Marc Weber 38cf2a4d7e added multisync - plugins are not yet shown ?
svn path=/nixpkgs/trunk/; revision=13539
2008-12-02 12:25:56 +00:00
Marc Weber 96aade5a27 hackish fix to build cdrtools again
svn path=/nixpkgs/trunk/; revision=13343
2008-11-19 21:45:43 +00:00
Michael Raskin 9e48add3e0 Try protecting FreeBSD from instntiating TinyCC
svn path=/nixpkgs/trunk/; revision=13184
2008-11-03 19:16:21 +00:00
Ludovic Courtès 4f0a7f0d40 GNU gv 3.6.6.
svn path=/nixpkgs/trunk/; revision=12927
2008-09-26 15:31:38 +00:00
Marc Weber 32e2dbf87f added wavesurfer (sound analysis tool) and its dependency snack (tcl /python sound tool library)
svn path=/nixpkgs/trunk/; revision=12904
2008-09-24 00:42:06 +00:00
Eelco Dolstra ba6845d03e * gphoto updated to 2.4.2.
svn path=/nixpkgs/trunk/; revision=12900
2008-09-22 17:06:31 +00:00
Marc Weber 1aea0c12a3 updated freemind to 0.9.0_Beta_20, purified env sto make it work for everyone a
svn path=/nixpkgs/trunk/; revision=12819
2008-09-07 21:17:49 +00:00
Nicolas Pierron 6c4a6e83b4 Move maxima close to scilab. (applications/science/math)
Requested by Michael Raskin.

svn path=/nixpkgs/trunk/; revision=12812
2008-09-05 17:21:45 +00:00
Marc Weber 9e55727832 Added:
* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526
2008-08-06 20:39:01 +00:00
Ludovic Courtès 1e63385865 Add Evince, GNOME's document viewer (PS, PDF, DVI, DjVu, TIFF, etc.).
Currently, a few theme icons provided by Evince are not found.  This is
possibly due to the lack of an `index.theme' file under `share/evince/icons',
but there's no rule to make it.

svn path=/nixpkgs/trunk/; revision=12434
2008-07-27 10:24:08 +00:00
Eelco Dolstra a2613e936a * Move dvd+rw-tools and cdrkit to tools/cd-dvd.
* Added cdrdao.

svn path=/nixpkgs/trunk/; revision=12426
2008-07-25 13:04:51 +00:00
Eelco Dolstra 8ea9bd1d83 * cdrkit 1.1.8.
svn path=/nixpkgs/trunk/; revision=12425
2008-07-25 12:32:12 +00:00
Wouter den Breejen c65a64c8c5 Added truecrypt, but it does not compile yet since it's dependency wxWidgets fails to build ...
Maybe someone wants to take a look at it.

--------------------
building wxbuild
Configuring wxWidgets library...
configure: WARNING: libSM not found; disabling session management detection
Building wxWidgets library...
building .pch/wxprec_baselib/wx/wxprec.h.gch
/nix/store/b2gmgy8y6nidjj7n34jx4sanrjdaxrw3-glibc-2.7/lib/crt1.o: In function `_start':
(.text+0x18): undefined reference to `main'
collect2: ld returned 1 exit status
make[1]: *** [.pch/wxprec_baselib/wx/wxprec.h.gch] Error 1
make: *** [wxbuild] Error 2
builder for `/nix/store/2587m38s6cjjpx7mvn85x8z65brf6nps-trueCrypt-6.0a.drv' failed with exit code 2
error: build of `/nix/store/2587m38s6cjjpx7mvn85x8z65brf6nps-trueCrypt-6.0a.drv' failed
--------------------

svn path=/nixpkgs/trunk/; revision=12388
2008-07-19 16:13:48 +00:00
Ludovic Courtès 95cf51997c GNU gv 3.6.5.
svn path=/nixpkgs/trunk/; revision=12266
2008-07-05 17:00:33 +00:00
Eelco Dolstra fecb562721 * Added k3b (a basic configuration for now, many features are not
compiled in).

svn path=/nixpkgs/trunk/; revision=12197
2008-06-26 14:38:28 +00:00
Marc Weber 106c67b9db updated blender
svn path=/nixpkgs/trunk/; revision=12180
2008-06-24 01:57:12 +00:00
Eelco Dolstra d97069da1a * Quick start section.
* Updated some packages that are referenced in that section.

svn path=/nixpkgs/trunk/; revision=12139
2008-06-17 14:19:59 +00:00
Ludovic Courtès 8b83b37ec5 GNU gv 3.6.4.
svn path=/nixpkgs/trunk/; revision=11946
2008-06-01 16:51:03 +00:00
Nicolas Pierron 6f08adf32b Install the emacs syntax highlighter for taskJuggler.
svn path=/nixpkgs/trunk/; revision=11944
2008-06-01 16:06:09 +00:00
Nicolas Pierron 77175d5dc3 Add TaskJuggler: A project management tool.
svn path=/nixpkgs/trunk/; revision=11933
2008-05-29 19:12:53 +00:00
Marc Weber bc8505609d blender compiles with physics engine now
svn path=/nixpkgs/trunk/; revision=11826
2008-05-14 13:39:20 +00:00
Tobias Hammerschmidt cfc9624c08 X11 version 1.4.2, added xmobar a minimalistic status bar written in haskell (integrates fine with xmonad)
svn path=/nixpkgs/trunk/; revision=11645
2008-04-15 20:03:25 +00:00
Eelco Dolstra 8e92a44ecf * Doh!
svn path=/nixpkgs/trunk/; revision=11511
2008-04-09 10:11:53 +00:00
Eelco Dolstra bcb90548ab * Added a description.
svn path=/nixpkgs/trunk/; revision=11509
2008-04-09 10:02:26 +00:00
Tobias Hammerschmidt 62478d6e0e lyx version update, use texLive instead of tetex
svn path=/nixpkgs/trunk/; revision=11315
2008-03-27 23:33:10 +00:00
Michael Raskin c251639ab1 Committed xneur expression by justbeingglad
svn path=/nixpkgs/trunk/; revision=11215
2008-03-20 09:51:05 +00:00
Michael Raskin 064045cfcd version updates
svn path=/nixpkgs/trunk/; revision=11142
2008-03-16 08:01:31 +00:00
Michael Raskin f87e85c2a8 Added LinuxDC++. Claimed to support newer protocol - claim is by valknut team..
svn path=/nixpkgs/trunk/; revision=11132
2008-03-15 06:11:45 +00:00
Marc Weber acf8a34a9a used bleeding edge source for synergy. Got different hash from cvs checkout.
svn path=/nixpkgs/trunk/; revision=11130
2008-03-15 04:35:29 +00:00
Eelco Dolstra 66738cc356 * fetchcvs: cleanup, use nix-store --add-fixed like fetchurl/svn.
Argument "url" renamed to "cvsRoot" (it's not a URL).

svn path=/nixpkgs/trunk/; revision=10889
2008-02-28 22:36:37 +00:00
Michael Raskin 843810c14f Fixed freemind. Does not work anyway - fails to paint itself.
svn path=/nixpkgs/trunk/; revision=10869
2008-02-27 00:01:14 +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
Tobias Hammerschmidt 1ca69f74e5 svn path=/nixpkgs/trunk/; revision=10828 2008-02-22 10:12:01 +00:00
Tobias Hammerschmidt b567be7836 Added SSL support to fetchmail, maybe its better to add an argument withSSL?
svn path=/nixpkgs/trunk/; revision=10827
2008-02-22 10:09:54 +00:00
Tobias Hammerschmidt 2dde1dfa4f fixed install phase so the linker doesn't abort with undefined reference to pow()
svn path=/nixpkgs/trunk/; revision=10826
2008-02-22 09:47:37 +00:00
Michael Raskin 8ea6496a10 -
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823
2008-02-22 03:06:12 +00:00
Tobias Hammerschmidt ad73224657 rxvt-unicode version 9.02, disabled embedded perl interpreter
svn path=/nixpkgs/trunk/; revision=10716
2008-02-17 18:40:53 +00:00
Ludovic Courtès e1f2b15c70 Add GKrellM, a graphical system monitor.
svn path=/nixpkgs/trunk/; revision=10660
2008-02-13 16:38:33 +00:00
Ludovic Courtès 59a2df56b4 Add WordNet, a lexical database for English.
svn path=/nixpkgs/trunk/; revision=10659
2008-02-13 14:26:01 +00:00