3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

314 commits

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