Commit graph

330 commits

Author SHA1 Message Date
Eelco Dolstra d78a404063 * Removed some assertions that rely on pointer equality. (It's kind
of unfortunate that consitency checks like "httpd.apr == apr" don't
  really work.  Perhaps equality tests on derivations should just
  compare the drvPath or outPath attributes.)

svn path=/nixpkgs/trunk/; revision=15569
2009-05-12 12:50:07 +00:00
Michael Raskin d8e3181425 Update URLs for TeXLive
svn path=/nixpkgs/trunk/; revision=15544
2009-05-10 23:26:19 +00:00
Marc Weber 90344f9e1e use svn sources for ctgas.
The last release has a bug. I got "no end of file expected" while tagging

svn path=/nixpkgs/trunk/; revision=15501
2009-05-07 18:28:19 +00:00
Eelco Dolstra f0e8c6aaef * Updated dblatex.
svn path=/nixpkgs/trunk/; revision=15495
2009-05-07 13:18:35 +00:00
Eelco Dolstra b5e67e699b * CUPS 1.3.10.
svn path=/nixpkgs/trunk/; revision=15472
2009-05-06 14:05:32 +00:00
Marc Weber 94a01668a1 cleaned up and fixed autofs v5
svn path=/nixpkgs/trunk/; revision=15419
2009-05-01 05:42:32 +00:00
Eelco Dolstra 2d1bcbeacf * Electric Sheep, a screensaver.
svn path=/nixpkgs/trunk/; revision=15415
2009-04-30 17:41:19 +00:00
Marc Weber cd9c9a2431 fix broken myEnv
svn path=/nixpkgs/trunk/; revision=15382
2009-04-28 16:52:36 +00:00
Ludovic Courtès 2dc368f084 GNU Ghostscript 8.64.0.
svn path=/nixpkgs/trunk/; revision=15334
2009-04-27 10:19:59 +00:00
Marc Weber 829e0da0e5 topgit update
there is now a tg push command pushing branch and its base optionally
including all dependency

svn path=/nixpkgs/trunk/; revision=15328
2009-04-27 01:18:07 +00:00
Eelco Dolstra 5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Lluís Batlle i Rossell 1e8fff0915 Updating Wine.
svn path=/nixpkgs/trunk/; revision=15308
2009-04-25 16:22:08 +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
Eelco Dolstra 6e32a4cea8 svn path=/nixpkgs/branches/stdenv-updates/; revision=15273 2009-04-23 12:46:14 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Sander van der Burg 883eb4371c Fixed dosbox expression
svn path=/nixpkgs/branches/stdenv-updates/; revision=15220
2009-04-21 18:30:54 +00:00
Lluís Batlle i Rossell 98f6f77709 Adding a folding-at-home client.
svn path=/nixpkgs/trunk/; revision=15122
2009-04-17 20:36:54 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Eelco Dolstra 7ae8544b4c * ntfs-3g updated to 2009.4.4. The old version has disappeared
anyway.

svn path=/nixpkgs/trunk/; revision=14915
2009-04-07 16:03:30 +00:00
Eelco Dolstra d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Marc Weber 5af6ba01fd doh (forgotten to update name)
svn path=/nixpkgs/trunk/; revision=14782
2009-03-30 14:21:18 +00:00
Marc Weber 0be7534b0f maven-2 version bump to 2.1.0
svn path=/nixpkgs/trunk/; revision=14781
2009-03-30 14:20:05 +00:00
Marc Weber 27db9f1dfd updated synergy cvs source
svn path=/nixpkgs/trunk/; revision=14772
2009-03-30 10:32:44 +00:00
Eelco Dolstra 58ae185001 * Latest ntfs-3g, FUSE.
svn path=/nixpkgs/trunk/; revision=14696
2009-03-25 10:55:40 +00:00
Eelco Dolstra f3815e7ad5 * Fixed ntfsprogs.
svn path=/nixpkgs/trunk/; revision=14695
2009-03-25 10:55:28 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra 808f12e369 * Dosbox 0.72.
svn path=/nixpkgs/trunk/; revision=14556
2009-03-16 12:22:47 +00:00
Eelco Dolstra 2ae9a1c947 * Doh.
svn path=/nixpkgs/trunk/; revision=14498
2009-03-10 20:04:08 +00:00
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