1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Commit graph

457 commits

Author SHA1 Message Date
Eelco Dolstra bafc4ff59d * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Ludovic Courtès 5cd82587aa overrideDerivation: Check whether hostDrv' and buildDrv' are present.
svn path=/nixpkgs/trunk/; revision=31727
2012-01-19 22:29:26 +00:00
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
Eelco Dolstra 2202d32006 * Add stringAfter' as a synonym of fullDepEntry', with the arguments
flipped to denote what it actually does (i.e., a string fragment
  that comes *after* the named fragments).  One day we can have
  `stringBefore'.

svn path=/nixpkgs/trunk/; revision=23761
2010-09-13 15:31:06 +00:00
Nicolas Pierron 7f8037cfd7 Add additional shortcuts frequently used in NixOS.
svn path=/nixpkgs/trunk/; revision=23733
2010-09-10 18:03:16 +00:00
Eelco Dolstra df1d0752eb * Get rid of the template argument in mkOverride.
svn path=/nixpkgs/trunk/; revision=23709
2010-09-10 09:31:31 +00:00
Michael Raskin 32071d5b4d Adding a list-in-list checker for builderDefs closePropagation
svn path=/nixpkgs/branches/stdenv-updates/; revision=23608
2010-09-03 08:15:45 +00:00
Lluís Batlle i Rossell 641f956581 Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
2010-09-01 09:50:12 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Yury G. Kudryashov 9e4202d273 make makeOverridable noop for functions like a: b: c(a, b)
svn path=/nixpkgs/trunk/; revision=23262
2010-08-19 22:52:53 +00:00
Eelco Dolstra 1ac9dcd24d * Fix eval-release.nix by testing whether all attributes of a
derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
2010-08-19 12:37:10 +00:00
Eelco Dolstra 415cf4cd1c * Omit the "Defined by:" elements in the configuration.nix section of
the manual.  While it's a useful feature, it has the unfortunate
  side-effect of causing the manual to be rebuilt every time the user
  adds an option definition to any module (including
  configuration.nix), and rebuilding the manual is rather slow.

svn path=/nixpkgs/trunk/; revision=23110
2010-08-11 11:46:09 +00:00
Lluís Batlle i Rossell 8783e812b5 More changes beyond stdenv-linux for the fuloong2f platform
svn path=/nixpkgs/branches/stdenv-updates/; revision=22973
2010-08-05 18:51:12 +00:00
Sander van der Burg 1e9dc2b254 It seems that lib.zip is already taken from attributesets, therefore renaming it to zipTwoLists
svn path=/nixpkgs/trunk/; revision=22887
2010-08-02 16:48:19 +00:00
Sander van der Burg beee6e5e1d Moved 'zip' function from nixos/lib/build-vms.nix
svn path=/nixpkgs/trunk/; revision=22882
2010-08-02 16:10:01 +00:00
Eelco Dolstra fd268b4852 * Add callPackage etc.
svn path=/nixpkgs/trunk/; revision=22876
2010-08-02 13:57:57 +00:00
Eelco Dolstra acd34843f0 * Move "checker" to lib. It seems to be unused though.
svn path=/nixpkgs/trunk/; revision=22819
2010-07-30 09:24:55 +00:00
Eelco Dolstra d67aefc19d * Remove `customKernel' which is obsolete as far as I can tell.
* Remove `sumTwoArgs' since it has no remaining callers.

svn path=/nixpkgs/trunk/; revision=22797
2010-07-28 16:09:13 +00:00
Ludovic Courtès c4d05c0e3e Give Org-Mode a high priority.
svn path=/nixpkgs/trunk/; revision=22694
2010-07-22 08:59:46 +00:00
Lluís Batlle i Rossell 208dd0f5ec Adding armv5tel-linux to the linux platforms.
svn path=/nixpkgs/trunk/; revision=22591
2010-07-13 21:33:20 +00:00
Michael Raskin aadb898a0b Implementing a fix allowing deepOverride without changing dependency-tree-leaf packages
svn path=/nixpkgs/trunk/; revision=22533
2010-07-08 15:31:59 +00:00
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Michael Raskin 14eea491b8 Adding Redstore HTTP RDF/SPARQL server
svn path=/nixpkgs/trunk/; revision=22428
2010-06-29 22:18:49 +00:00
Evgeny Egorochkin ae9883bcab First commit! :P
svn path=/nixpkgs/trunk/; revision=22307
2010-06-17 10:18:13 +00:00
Marc Weber d3341315bd adding gis system grass (graphviz 3d is not supported yet)
svn path=/nixpkgs/trunk/; revision=22131
2010-06-03 15:19:59 +00:00
Eelco Dolstra bf010ace55 * Remove the mysterious `_args' attribute because it screws up the
manual generation (causes `nixos-rebuild build-vm' evaluation to
  fail in the `networking.ifaces' option).

svn path=/nixpkgs/trunk/; revision=22084
2010-06-01 14:24:16 +00:00
Eelco Dolstra 1ba3165b4e * Allow the default for option values displayed in the manual to be
overriden.  Some defaults should not be evaluated because they cause
  unnecessary evaluation or might cause evaluation errors
  (e.g. assertions).  For instance, the value of the
  `boot.kernelPackages' option is an attribute set.  Some packages in
  that set might not evaluate (e.g. AUFS2 on kernels that don't have
  the AUFS2 patch), and in any case it slows down nixos-rebuild to
  evaluate lots of packages that are not actually used in the
  configuration.

svn path=/nixpkgs/trunk/; revision=22043
2010-05-28 11:20:45 +00:00
David Guibert 6c526f1695 add myself to the maintainers list
svn path=/nixpkgs/trunk/; revision=22007
2010-05-27 19:33:16 +00:00
Marc Weber bddb72ec8a psotgis:
- support older versions (which are used by other distributions)
- give utilyt scripts nicer names
- pg_db_postgis_enable: support loading comments

svn path=/nixpkgs/trunk/; revision=21992
2010-05-26 19:01:10 +00:00
Marc Weber 32edcce80b Build a package with debugging information so that you can run it within gdb or run valgrind on it.
Example: xmessageDebug = misc.debugVersion xorg.xmessage

svn path=/nixpkgs/trunk/; revision=21945
2010-05-23 15:54:10 +00:00
Eelco Dolstra cde9d0fb13 * The old evaluator segfaults if the `outPath' attribute is missing.
Work around it for the moment.

svn path=/nixpkgs/trunk/; revision=21747
2010-05-12 13:24:09 +00:00
Marco Maggesi d4785a25dd Add myself to nixpkgs/pkgs/lib/maintainers.nix
svn path=/nixpkgs/trunk/; revision=21744
2010-05-12 12:25:23 +00:00
Eelco Dolstra 9ec34da2ee * In the generation of the `options.xml' file used to produce the
NixOS manual and  manpages, remove all derivation attributes except
  the `name' attribute.  This cuts the size of `options.xml' from 7.0
  MiB to 473 KiB, and more importantly, cuts evaluation time of the
  system derivation from 1.63s to 1.10s on my laptop (a 32%
  improvement).

svn path=/nixpkgs/trunk/; revision=21739
2010-05-12 11:07:49 +00:00
Eelco Dolstra da7e1fbea3 * Do not silently ignore broken "example" and "default" attributes
when generating the documentation.  If they're broken, they should
  be fixed.

svn path=/nixpkgs/trunk/; revision=21738
2010-05-12 09:31:46 +00:00
Eelco Dolstra 5564bd2635 * Make stack traces more consistent.
svn path=/nixpkgs/trunk/; revision=21652
2010-05-07 15:13:43 +00:00
Marc Weber ae8d4501b6 adding maybeEnv. This will replace from-env.nix in nixos and will be reused in copySystemConfiguration
svn path=/nixpkgs/trunk/; revision=21353
2010-04-27 18:44:23 +00:00
Ludovic Courtès 0e7e20042b Add the GNU Linear Programming Kit (GLPK).
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21284
2010-04-23 21:15:48 +00:00
Marc Weber 9e59164e57 adding lib function haskell's drop x elements from head of list
svn path=/nixpkgs/trunk/; revision=21141
2010-04-17 18:26:40 +00:00
Yury G. Kudryashov f26e437b72 Don't depend on X unless djview3 is requested
Also rename option name to "qt3"

svn path=/nixpkgs/trunk/; revision=20908
2010-04-01 12:34:50 +00:00
Eelco Dolstra 7dffd96978 * Allow `overrideDerivation' to work on derivations to which
`makeOverridable' has been applied (!).  Ugly.

svn path=/nixpkgs/trunk/; revision=20591
2010-03-12 00:01:56 +00:00
Ludovic Courtès 4b7ff33c26 options: Learn how to merge identical integer values.
svn path=/nixpkgs/trunk/; revision=20581
2010-03-11 22:03:49 +00:00
Ludovic Courtès 529e1900ca options: Use the built-in type predicates.
svn path=/nixpkgs/trunk/; revision=20580
2010-03-11 22:03:45 +00:00
Eelco Dolstra a3111812ad * In overrideDerivation, filter out the `type' attribute.
svn path=/nixpkgs/trunk/; revision=20487
2010-03-09 11:57:05 +00:00
Rob Vermaas 7869d22938 i am an idiot, thnx ludo for pointing out my stupidity :-)
svn path=/nixpkgs/trunk/; revision=20309
2010-03-01 14:32:23 +00:00
Rob Vermaas 4d94733de2 typo (lists in list)
svn path=/nixpkgs/trunk/; revision=20303
2010-03-01 12:49:15 +00:00
Rob Vermaas 6dbcd591ef use mesaplatforms from lib
svn path=/nixpkgs/trunk/; revision=20302
2010-03-01 12:32:40 +00:00
Sander van der Burg a777402b21 Added library general public license (LGPL 2.0). Although LGPL 2.1 is almost the same, I want to be precise
svn path=/nixpkgs/trunk/; revision=20259
2010-02-25 15:44:28 +00:00
Sander van der Burg 05245ea055 Added licenses to the lib attributeset
svn path=/nixpkgs/trunk/; revision=20249
2010-02-25 13:09:08 +00:00
Sander van der Burg 680c80e0b4 Added initial licenses attributeset to specify meta.license attributes more concisely
svn path=/nixpkgs/trunk/; revision=20248
2010-02-25 13:06:17 +00:00
Michael Raskin 89d1b7881f Update SGT puzzles and improve builderDefs processing of propagated(Native)BuildInputs after stdenv merge
svn path=/nixpkgs/trunk/; revision=20093
2010-02-18 10:29:40 +00:00
Marc Weber 4007d19700 fix vim_configurable
svn path=/nixpkgs/trunk/; revision=20084
2010-02-18 01:49:22 +00:00