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

351 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 0175270bf9 * Wine 1.1.15. 
svn path=/nixpkgs/trunk/; revision=14273
 2009-02-27 12:52:55 +00:00
Eelco Dolstra 390695e73f * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
 2009-02-12 21:16:55 +00:00
Marc Weber 5778dd836d mend 
svn path=/nixpkgs/trunk/; revision=14035
 2009-02-11 16:12:14 +00:00
Marc Weber 944d6221df my-env: add some hackish support for zsh 
svn path=/nixpkgs/trunk/; revision=14034
 2009-02-11 16:12:12 +00:00
Eelco Dolstra ca5e6b9624 svn path=/nixpkgs/trunk/; revision=14033 2009-02-11 14:53:17 +00:00
Tobias Hammerschmidt b7f9c33989 version bump 
svn path=/nixpkgs/trunk/; revision=13999
 2009-02-06 20:18:08 +00:00
Eelco Dolstra f45ed4b74e * Remove obsolete comment. 
svn path=/nixpkgs/trunk/; revision=13977
 2009-02-03 22:15:02 +00:00
Eelco Dolstra c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Marc Weber 0ad62a0edb adding gitAttr 
now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816
 2009-01-20 22:15:42 +00:00
Eelco Dolstra e7a94d6fef * Ghostscript: build the CUPS filter. This allows CUPS to print to 
non-Postscript printers.

svn path=/nixpkgs/trunk/; revision=13793
 2009-01-17 13:08:51 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
 2009-01-16 10:59:27 +00:00
Eelco Dolstra 5689d7338e * Support LaTeX documents that have multiple bibliographies (using the 
multibib package).

svn path=/nixpkgs/trunk/; revision=13723
 2009-01-08 09:54:04 +00:00
Marc Weber e4a6036ca9 adding cvs zsh version because it has better hg, tg completion support 
svn path=/nixpkgs/trunk/; revision=13670
 2008-12-22 18:36:26 +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
Eelco Dolstra 9ed6e06b38 * Wine 1.1.10. 
svn path=/nixpkgs/trunk/; revision=13625
 2008-12-12 23:00:15 +00:00
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with 
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
 2008-12-10 09:59:21 +00:00
Marc Weber 90b53dcccc bleeding edge octave version (without docs) 
svn path=/nixpkgs/trunk/; revision=13561
 2008-12-02 22:55:45 +00:00
Eelco Dolstra 2ffc686b67 * Latest Wine, Thunderbird. 
svn path=/nixpkgs/trunk/; revision=13527
 2008-12-01 00:06:14 +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
Eelco Dolstra 6c107b6706 * CUPS 1.3.9. 
svn path=/nixpkgs/trunk/; revision=13217
 2008-11-07 13:36:57 +00:00
Michael Raskin 89c807afc1 Wine update 
svn path=/nixpkgs/trunk/; revision=13128
 2008-10-28 07:28:39 +00:00
Marc Weber ea22df581b added hg2git 
svn path=/nixpkgs/trunk/; revision=13096
 2008-10-18 21:08:42 +00:00
Wouter den Breejen a4cc4210b5 NTFS-3g version update (tested for compilation) 
svn path=/nixpkgs/trunk/; revision=13095
 2008-10-18 18:31:10 +00:00
Marc Weber 5a4a28e437 added cinelerra (video editing application) 
svn path=/nixpkgs/trunk/; revision=13068
 2008-10-14 14:01:50 +00:00
Marc Weber 3d90901798 update my_env. Hopefully does a better job now 
svn path=/nixpkgs/trunk/; revision=13037
 2008-10-09 22:57:20 +00:00
Ludovic Courtès 7874b9a379 TeXLive/PGF 2.00. 
svn path=/nixpkgs/trunk/; revision=13019
 2008-10-09 12:44:11 +00:00
Eelco Dolstra fe89cbbe7c * PGF 2.00 (keeping the old one so that I can still build old documents). 
svn path=/nixpkgs/trunk/; revision=12999
 2008-10-08 14:03:44 +00:00
Eelco Dolstra 74669a825c * Latest ntfs-3g. 
svn path=/nixpkgs/trunk/; revision=12871
 2008-09-17 12:52:46 +00:00
Marc Weber 8e7577363b enabling php sockets openssl and curl support 
svn path=/nixpkgs/trunk/; revision=12777
 2008-08-31 06:36:56 +00:00
Marc Weber e75a56c88e updated repo versions of ghc cabal and http package 
svn path=/nixpkgs/trunk/; revision=12682
 2008-08-21 11:07:58 +00:00
Marc Weber c4270fb9b8 moved hasktags to ghc68executables, updated url to new location 
svn path=/nixpkgs/trunk/; revision=12680
 2008-08-21 11:07:44 +00:00
Marc Weber d4cf308de6 haxml_darcs updated (it can now parse xhtml dtd) 
svn path=/nixpkgs/trunk/; revision=12678
 2008-08-21 11:07:16 +00:00
Marc Weber 9d181d621f updated nixRepositoryManager 
now you can use specify another source file for testing in a nix way

svn path=/nixpkgs/trunk/; revision=12662
 2008-08-19 13:31:52 +00:00
Marc Weber 9075ea2218 moved nix-repository-manager to add additional feature automatically updating given bleeding-edge-fetch-infos.nix 
svn path=/nixpkgs/trunk/; revision=12658
 2008-08-19 12:36:00 +00:00
Marc Weber ba6c703918 jackaudio connection kit (jackd) is back 
svn path=/nixpkgs/trunk/; revision=12649
 2008-08-18 16:03:04 +00:00
Eelco Dolstra 813c7e87f6 * Wine updated to 1.1.2. 
svn path=/nixpkgs/trunk/; revision=12638
 2008-08-15 21:54:19 +00:00
Marc Weber 468c075ecc added storable vector 
svn path=/nixpkgs/trunk/; revision=12527
 2008-08-06 21:21:54 +00:00
Marc Weber ec717200c8 ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now) 
svn path=/nixpkgs/trunk/; revision=12517
 2008-08-06 16:56:05 +00:00
Marc Weber 7608d6f063 update ghc stuff (hsp is now supported as well except hsp-xml) 
svn path=/nixpkgs/trunk/; revision=12509
 2008-08-06 11:41:17 +00:00
Marc Weber 407b3e2e0d added bleeding-edge source info file 
svn path=/nixpkgs/trunk/; revision=12469
 2008-08-03 17:05:19 +00:00
Eelco Dolstra c32f7569dc * ntfs-3g: install sbin/mount.ntfs-3g. Don't pass FUSE as 
a dependency (ntfs-3g has its own copy of FUSE).

svn path=/nixpkgs/trunk/; revision=12416
 2008-07-24 13:11:02 +00:00
Eelco Dolstra 839eb46cda * Fix installing the Ghostscript fonts. 
svn path=/nixpkgs/trunk/; revision=12408
 2008-07-23 14:40:16 +00:00
Eelco Dolstra 8734e020db * ghostscript: force the use of the -fpic flag, otherwise it doesn't 
build on x86_64-linux.

svn path=/nixpkgs/trunk/; revision=12380
 2008-07-18 14:52:20 +00:00
Ludovic Courtès 483cd039af GNU Ghostscript 8.62.0. 
In addition, install `libgs.so' and its header files, as well as the
man pages and HTML documentation.  Use the GS fonts provided at
ftp.gnu.org under the `ghostscript' directory.

svn path=/nixpkgs/trunk/; revision=12374
 2008-07-17 19:37:18 +00:00
Michael Raskin c040ab4293 Updated ntfs-3g 
svn path=/nixpkgs/trunk/; revision=12369
 2008-07-17 04:40:50 +00:00
Eelco Dolstra be77e6f99f * Wine 1.1.1. 
svn path=/nixpkgs/trunk/; revision=12352
 2008-07-13 21:42:10 +00:00
Michael Raskin e8d58c83f9 Now TeXLive builds and seems to work without /var/tmp 
svn path=/nixpkgs/trunk/; revision=12322
 2008-07-08 18:22:33 +00:00
Peter Simons 8ff43a1636 xautolock: updated to version 2.2 
svn path=/nixpkgs/trunk/; revision=12314
 2008-07-07 23:11:43 +00:00
Peter Simons 100b902bd5 Added xautolock 2.1. 
Xautolock can be used to fire up a screen saver like xautolock after a certain
period of inactivity. The tool probably doesn't belong into misc/screensavers,
but I had no better idea.

svn path=/nixpkgs/trunk/; revision=12305
 2008-07-07 11:54:25 +00:00
Michael Raskin 5245bad31a Updated texlive-extra source 
svn path=/nixpkgs/trunk/; revision=12293
 2008-07-07 05:53:21 +00:00
Wouter den Breejen a480dfbb51 Version bump 
svn path=/nixpkgs/trunk/; revision=12279
 2008-07-06 16:55:29 +00:00
Eelco Dolstra d051b20a39 * Graphviz updated to 2.20.2. Now built with fontconfig, gd and pango 
support.
* New function makeFontsConf to generate a fontconfig configuration
  file.  Moved from NixOS.
* dot2pdf: use makeFontsConf to generate a fonts.conf containing just
  the Ghostscript fonts (see NIXPKGS-29).
* dot2pdf: generate PDF directly, don't go through PS.  Note that this
  and using fontconfig changes the interpretation of "fontname"
  attributes in dot graphs.

svn path=/nixpkgs/trunk/; revision=12251
 2008-07-03 14:27:19 +00:00
Michael Raskin dcb7d72481 Wine update 
svn path=/nixpkgs/trunk/; revision=12226
 2008-07-01 03:44:26 +00:00
Eelco Dolstra aab9aee56e * Wine 1.0. ZOMG! 
svn path=/nixpkgs/trunk/; revision=12142
 2008-06-18 07:23:53 +00:00
Marc Weber 74b5040479 forgetten to appply this patch 
svn path=/nixpkgs/trunk/; revision=12098
 2008-06-15 12:00:00 +00:00
Marc Weber 51651a4ec0 put all source with tags stuff into its own file, now appends tag files to TAG_FILES env var using nix-support 
updated myEnvFun


svn path=/nixpkgs/trunk/; revision=12097
 2008-06-15 11:54:22 +00:00
Eelco Dolstra 7219a09001 * ioquake: updated to 1.34rc3. 
* rss-glx: fixed the build.
* Removed the OpenGL wrapper stuff, it's no longer needed (thanks to
  the RUNPATH you just need to put the appropriate libGL.so in the
  LD_LIBRARY_PATH). 

svn path=/nixpkgs/trunk/; revision=12093
 2008-06-14 20:55:48 +00:00
Eelco Dolstra 02f18d5743 * Wine 1.0rc4. 
svn path=/nixpkgs/trunk/; revision=12079
 2008-06-13 15:34:44 +00:00
Marc Weber 60a651413a added freestyle (non photorealistic renderer) and dependencies libQGLViewer, lib3ds 
svn path=/nixpkgs/trunk/; revision=12009
 2008-06-08 03:56:32 +00:00
Marc Weber 18d227c98d added GetOptions, tar, unix-compat ghc haskell libraries 
svn path=/nixpkgs/trunk/; revision=11940
 2008-05-30 22:37:58 +00:00
Eelco Dolstra eeb82eb2df * Wine 1.0rc2. 
svn path=/nixpkgs/trunk/; revision=11932
 2008-05-29 15:36:15 +00:00
Eelco Dolstra 80e0fbb261 * Raise the dpi. 
svn path=/nixpkgs/trunk/; revision=11854
 2008-05-20 11:57:40 +00:00
Eelco Dolstra 374ccd290b * runLaTeX: added an option to copy the collected TeX inputs to $out 
(useful when you need to send TeX sources for a paper to a third
  party).

svn path=/nixpkgs/trunk/; revision=11837
 2008-05-16 11:48:46 +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
Marc Weber 95dd111ba8 leksah doesnt build yet 
svn path=/nixpkgs/trunk/; revision=11825
 2008-05-14 09:34:08 +00:00
Marc Weber 29fb522f0a missing fetch info 
svn path=/nixpkgs/trunk/; revision=11821
 2008-05-13 13:53:02 +00:00
Marc Weber c59433ffda updated ghc stuff (added WashNGo, readded support for using local package db) 
svn path=/nixpkgs/trunk/; revision=11819
 2008-05-13 08:40:57 +00:00
Marc Weber e17c96c881 Support for profiling (all libraries) enabled by custom config 
moved flapjax to ghcExecutables
added haskelldb mysql
added ghc darcs build (left in comments)

svn path=/nixpkgs/trunk/; revision=11742
 2008-04-28 22:27:03 +00:00
Michael Raskin c9027b1cba Added ConTEXt; cyrillic seems to be fundamentally broken... 
svn path=/nixpkgs/trunk/; revision=11735
 2008-04-28 00:25:42 +00:00
Marc Weber 675af79fb8 hsql updated 
svn path=/nixpkgs/trunk/; revision=11731
 2008-04-27 21:28:00 +00:00
Tobias Hammerschmidt 3490452490 corrected site-lisp directory 
svn path=/nixpkgs/trunk/; revision=11687
 2008-04-22 20:28:25 +00:00
Tobias Hammerschmidt 4e57926353 wine 0.9.60 
svn path=/nixpkgs/trunk/; revision=11659
 2008-04-18 21:08:38 +00:00
Marc Weber 7e2bedae24 +tagsoup hxt libraries, patch for hsql to support new time library 
svn path=/nixpkgs/trunk/; revision=11651
 2008-04-17 15:27:08 +00:00
Marc Weber f6b653238c added polyparse 
svn path=/nixpkgs/trunk/; revision=11649
 2008-04-16 08:45:50 +00:00
Eelco Dolstra ec8d275ded * Commented out some stuff that breaks the Nixpkgs release (missing 
files: pg_darcsone.nix and xmonad.nix).

svn path=/nixpkgs/trunk/; revision=11607
 2008-04-12 10:18:48 +00:00
Marc Weber b9e87b09aa updated cabal version 
svn path=/nixpkgs/trunk/; revision=11576
 2008-04-11 15:39:27 +00:00
Marc Weber 05ebf87bbf missing files previous patch 
svn path=/nixpkgs/trunk/; revision=11565
 2008-04-11 10:22:52 +00:00
Marc Weber 772fd74b99 Updated my ghc stuff. 
New is the file containing executables (such as alex/ happy)
some new libraries
The wrapper no longer installs tags by default. You have to add it to your config
So I'm ready to start merging

svn path=/nixpkgs/trunk/; revision=11554
 2008-04-11 00:40:10 +00:00
Michael Raskin 44644a059f Updated TeXLive source URLs. Converted everything to mirror://debian, switched to dfsg.1.orig where orig unavailable 
svn path=/nixpkgs/trunk/; revision=11493
 2008-04-08 18:00:47 +00:00
Eelco Dolstra 76b73720da * Sometime LaTeX needs 4 passes. 
svn path=/nixpkgs/trunk/; revision=11456
 2008-04-02 15:10:49 +00:00
Tobias Hammerschmidt d333c4ee09 added xosd 
svn path=/nixpkgs/trunk/; revision=11340
 2008-03-29 00:49:26 +00:00
Tobias Hammerschmidt 402126b350 changed tex dependency of auctex from tetex to texLive 
svn path=/nixpkgs/trunk/; revision=11282
 2008-03-25 11:33:20 +00:00
Tobias Hammerschmidt 0592ed6a11 version update 
svn path=/nixpkgs/trunk/; revision=11268
 2008-03-22 20:49:15 +00:00
Michael Raskin b7ee7d1999 TeXLive. Now more configurable, and more options included. Beamer class for conference slides added. Before asking questions, look in configurations/misc/raskin.nix or in all-packages.nix . 
svn path=/nixpkgs/trunk/; revision=11257
 2008-03-22 13:04:04 +00:00
Marc Weber 1061800db4 added hsc2hs (makes interfacing C -> haskell easier) 
svn path=/nixpkgs/trunk/; revision=11248
 2008-03-21 01:24:43 +00:00
Michael Raskin f272e7780b TeXLive. Russian checked - OK 
svn path=/nixpkgs/trunk/; revision=11247
 2008-03-20 20:39:00 +00:00
Marc Weber df0825351f added wxhaskell (wx,wxcore libs) 
svn path=/nixpkgs/trunk/; revision=11246
 2008-03-20 19:29:52 +00:00
Michael Raskin 5f2bcdbdb6 Some refactorings in builderDefs. Psi is a simple showcase. TeXLive now works as far as English is concerned, and it is also updated up to newest builderDefs. 
svn path=/nixpkgs/trunk/; revision=11235
 2008-03-20 15:40:26 +00:00
Michael Raskin 9d05eb2f2c Removed glibc reference 
svn path=/nixpkgs/trunk/; revision=11219
 2008-03-20 10:22:53 +00:00
Michael Raskin 77d61d38b5 Added TeXLive; still some troubles with texmf; just not to break nix-env -qas * 
svn path=/nixpkgs/trunk/; revision=11216
 2008-03-20 09:52:08 +00:00
Tobias Hammerschmidt 1e2a4064f4 fixed references to /bin/mount and /bin/umount 
svn path=/nixpkgs/trunk/; revision=11204
 2008-03-19 13:08:11 +00:00
Tobias Hammerschmidt 597536e494 version update 
svn path=/nixpkgs/trunk/; revision=11201
 2008-03-19 12:32:44 +00:00
Tobias Hammerschmidt 572e6a28c6 version update 
svn path=/nixpkgs/trunk/; revision=11145
 2008-03-16 12:38:59 +00:00
Marc Weber eb058a54b3 updated nixRepositoryManager - now supports CVS as well 
svn path=/nixpkgs/trunk/; revision=11131
 2008-03-15 04:45:53 +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
Marc Weber 5695543482 added 2 repos and renamed ghc_68_extra to ghc68extraLibs 
svn path=/nixpkgs/trunk/; revision=11109
 2008-03-13 22:55:18 +00:00
Marc Weber 68e08a006a updated ghc pakcages (now contains gtk2hs and hdbc-postgresql) 
introduced .meta.sourceWithTags (insteod of .passthru.sourceWithTags)
hack to get back all tags :-)

svn path=/nixpkgs/trunk/; revision=11092
 2008-03-13 09:46:12 +00:00
Marc Weber be448d64fe takusen added 
svn path=/nixpkgs/trunk/; revision=11078
 2008-03-12 11:47:54 +00:00
Tobias Hammerschmidt 5693576572 wine 0.9.57 
svn path=/nixpkgs/trunk/; revision=11071
 2008-03-12 09:50:36 +00:00