Commit graph

405 commits

Author SHA1 Message Date
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Ludovic Courtès 08439eb00a overrideDerivation: Override hostDrv' and buildDrv' too.
svn path=/nixpkgs/trunk/; revision=31706
2012-01-19 16:44:17 +00:00
Peter Simons cd22d76a8e maintainers: added myself for upcoming packages
svn path=/nixpkgs/trunk/; revision=31652
2012-01-18 20:32:31 +00:00
Eelco Dolstra f6db0ed1e0 * Mesa only builds on Linux.
svn path=/nixpkgs/trunk/; revision=31640
2012-01-18 18:45:00 +00:00
Yury G. Kudryashov 394fd28e4e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Eelco Dolstra 7fcf771c2a * Handle the attributes added by the multiple outputs branch.
svn path=/nixpkgs/trunk/; revision=31278
2012-01-04 15:06:21 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Shea Levy a87be0fb2c Add mornfall as a maintainer
svn path=/nixpkgs/trunk/; revision=30719
2011-12-03 22:05:21 +00:00
Peter Simons 368ac01473 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Lluís Batlle i Rossell adc111e85f Changing my email address, to one I prefer.
svn path=/nixpkgs/trunk/; revision=30286
2011-11-06 21:38:34 +00:00
Eelco Dolstra efe6fddd59 * Indentation.
svn path=/nixpkgs/trunk/; revision=30193
2011-11-02 17:13:24 +00:00
Peter Simons 69488d688d synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
2011-11-02 10:28:32 +00:00
Eelco Dolstra bcffafa65a * Whitespace.
svn path=/nixpkgs/trunk/; revision=30044
2011-10-26 17:58:53 +00:00
Peter Simons 8dfef0f4a0 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
2011-10-14 22:06:50 +00:00
Marco Maggesi 39df2ce05e Add yaml - Yet Another JSON Library
svn path=/nixpkgs/trunk/; revision=29837
2011-10-14 14:00:50 +00:00
Marco Maggesi 843ed0c339 Update OpenAFS client to version 1.6.0. Also enable Hydra build.
svn path=/nixpkgs/trunk/; revision=29819
2011-10-13 12:37:15 +00:00
Shea Levy 01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Piotr Pietraszkiewicz 45014dce17 added myself to the maintainers list
svn path=/nixpkgs/trunk/; revision=29255
2011-09-13 20:46:41 +00:00
Eelco Dolstra d7b4b63f4d * Allow literal examples to be included in the manual.
svn path=/nixpkgs/trunk/; revision=29024
2011-09-05 10:14:24 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Rob Vermaas e6e11e4b04 added concatImapStrings function
svn path=/nixpkgs/trunk/; revision=28673
2011-08-19 02:42:34 +00:00
Peter Simons c13f967ed5 Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
Peter Simons aeebf42fe6 pkgs/lib/platforms.nix: added 'haskellPlatforms', a list of all platforms on which a Haskell compiler is available
svn path=/nixpkgs/trunk/; revision=27791
2011-07-14 21:54:49 +00:00
Eelco Dolstra 18f98ec5a2 * Disable the trace message "not an attrSet" because it shows up in
nix-env output.

svn path=/nixpkgs/trunk/; revision=27610
2011-07-05 13:55:41 +00:00
Nicolas Pierron 6cb018fe90 Add a new type to handle list and attribute sets.
List elements are attributed a unique name.

svn path=/nixpkgs/trunk/; revision=27449
2011-06-14 02:41:13 +00:00
Joachim Schiele d27a2ef6cf - added myself as maintainer
- added a new package: keepassx (which was reviewed on the nix-dev ml)

svn path=/nixpkgs/trunk/; revision=27401
2011-06-09 07:48:54 +00:00
Nicolas Pierron 02677481ae modules (moduleClosure): use imap instead of map to produce uniq keys for
the genericClosure.

svn path=/nixpkgs/trunk/; revision=27014
2011-04-27 18:41:37 +00:00
Nicolas Pierron 85d3fd3e3c lists: Add imap function to iterate over a list with the index of each
element.

svn path=/nixpkgs/trunk/; revision=27013
2011-04-27 18:41:34 +00:00
Nicolas Pierron 781770eaa9 fix zipListsWith function: use it-self for the recursion.
svn path=/nixpkgs/trunk/; revision=27012
2011-04-27 18:41:31 +00:00
Nicolas Pierron 3770ac23aa Fix type name of attribute sets.
svn path=/nixpkgs/trunk/; revision=27011
2011-04-27 18:41:27 +00:00
Nicolas Pierron 11472a0501 Add mkAssert.
svn path=/nixpkgs/trunk/; revision=26600
2011-03-30 11:18:10 +00:00
Andres Löh 2d379d294e Changed my email address.
svn path=/nixpkgs/trunk/; revision=26339
2011-03-16 08:14:54 +00:00
Yury G. Kudryashov 3e71355377 Add two 'remove' functions
svn path=/nixpkgs/branches/stdenv-updates/; revision=26311
2011-03-15 09:24:47 +00:00
Lluís Batlle i Rossell 1573081b61 Adding gptfdisk (patch by Shea Levy).
I add him in the maintainers list.
I changed slightly the indentation of the expressions.


svn path=/nixpkgs/trunk/; revision=26304
2011-03-14 21:13:35 +00:00
Florian Friesdorf f4dc1b73f2 added myself to list of maintainers
svn path=/nixpkgs/trunk/; revision=25929
2011-02-13 01:34:44 +00:00
Cillian de Roiste afcc2cf6ab Adding myself to the maintainers list
svn path=/nixpkgs/trunk/; revision=25720
2011-01-29 23:16:35 +00:00
Yury G. Kudryashov e76aee9d2f Make it possible to call 'callPackage function'
svn path=/nixpkgs/trunk/; revision=25657
2011-01-21 08:25:06 +00:00
Eelco Dolstra 5488651792 * Utility function for computing a Perl 5 search path.
svn path=/nixpkgs/trunk/; revision=25425
2011-01-05 12:54:37 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Tobias Hammerschmidt 4c9fe18b8a broadcom wireless driver - patch by Vladimír Čunát
svn path=/nixpkgs/trunk/; revision=25044
2010-12-09 19:05:19 +00:00
Tobias Hammerschmidt b8941c934a added myself to maintainers
svn path=/nixpkgs/trunk/; revision=24883
2010-11-26 19:16:31 +00:00
Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Lluís Batlle i Rossell 4018d18e96 Committing patch adding verilog from Antonio Vargas Gonzalez
From his original, I adapted some spacing, and removed the release.nix reference
(superfluous having set meta.platforms)

svn path=/nixpkgs/trunk/; revision=24860
2010-11-25 22:01:14 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Eelco Dolstra 798a6bb103 * Typo.
svn path=/nixpkgs/trunk/; revision=24288
2010-10-14 13:55:08 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Russell O'Connor 5763650f45 adding roconnor to maintainers.
svn path=/nixpkgs/trunk/; revision=24039
2010-10-04 01:22:27 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Evgeny Egorochkin 1ba4551be7 Added Karn Kallio to maintainer list
svn path=/nixpkgs/trunk/; revision=23982
2010-09-28 09:33:49 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00