JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,711 Commits 1 Branch 0 Tags 12 GiB
5d10c4f9b9
Commit Graph

334 Commits

Author SHA1 Message Date
Eelco Dolstra
11c3e92738 * Bring back Emacs 22 by request from Ludovic. 
svn path=/nixpkgs/trunk/; revision=18529
 2009-11-22 16:29:15 +00:00
Lluís Batlle i Rossell
e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
 2009-11-19 19:09:10 +00:00
Eelco Dolstra
81c5c44ddb * Move makeOverridable out of all-packages.nix. 
svn path=/nixpkgs/trunk/; revision=18469
 2009-11-19 17:30:21 +00:00
Nicolas Pierron
56ed820f84 Add systems.nix give more control over the increasing list of supported 
systems.  This is not yet used because it has to be integrated with the
current system.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18468
 2009-11-19 17:19:39 +00:00
Eelco Dolstra
519e7870b6 * Move `modifyDerivation' from build-support/vm to lib and rename it 
to `overrideDerivation'.

svn path=/nixpkgs/trunk/; revision=18466
 2009-11-19 16:43:58 +00:00
Eelco Dolstra
aa392c3aa7 * Move functions like `runCommand' out of all-packages.nix and into 
build-support/.

svn path=/nixpkgs/trunk/; revision=18465
 2009-11-19 16:07:47 +00:00
Eelco Dolstra
aed79cca1a * Another unused function. 
svn path=/nixpkgs/trunk/; revision=18391
 2009-11-17 15:36:48 +00:00
Eelco Dolstra
a56509c0db * Remove some more unused functions. 
svn path=/nixpkgs/trunk/; revision=18390
 2009-11-17 15:31:48 +00:00
Eelco Dolstra
802fa4ba0b * Remove sumArgs and its few remaining uses. Idem for composedArgs. 
svn path=/nixpkgs/trunk/; revision=18388
 2009-11-17 15:26:22 +00:00
Nicolas Pierron
da1311b893 * Add the Go Programming Language compiler. 
svn path=/nixpkgs/trunk/; revision=18348
 2009-11-14 20:14:28 +00:00
Nicolas Pierron
7482474aef * Improve showVal: handle integer and strings. 
svn path=/nixpkgs/trunk/; revision=18346
 2009-11-14 20:14:15 +00:00
Nicolas Pierron
d791b830aa * Fix typo and clarify why you should not use "mkFixStrictness" on top of 
plain list or attribute set.

svn path=/nixpkgs/trunk/; revision=18260
 2009-11-07 16:24:11 +00:00
Nicolas Pierron
b901c0e808 * Add an awful hack to bypass the strictness of isType operators for 
option definitions.

svn path=/nixpkgs/trunk/; revision=18259
 2009-11-07 16:09:04 +00:00
Nicolas Pierron
8b47086b85 * Change the check function to accept sub-modules with arguments in 
option definitions.

svn path=/nixpkgs/trunk/; revision=18252
 2009-11-07 12:15:39 +00:00
Nicolas Pierron
bb077b253f * Add a function to sort a list. 
* Add a new property to order NixOS definitions without creating
  dependencies between snippets.
* Add mkHeader & mkFooter properties (special case of mkOrder).

svn path=/nixpkgs/trunk/; revision=18242
 2009-11-07 01:59:55 +00:00
Nicolas Pierron
88f113d032 * Add a function to replace "pkgs.checker". The function checkModule does a 
traversal of all definitions and also check definitions contained inside
  sub-modules.

svn path=/nixpkgs/trunk/; revision=18241
 2009-11-07 01:59:50 +00:00
Nicolas Pierron
233d72e4fb * Add "_args" to all sub-module configurations result. This attribute 
enable argument introspection outside of the scope of each sub-module.

svn path=/nixpkgs/trunk/; revision=18240
 2009-11-07 01:59:45 +00:00
Nicolas Pierron
10d74af2f6 * Add a type to handle environment variables with the usual string 
separator ":".

svn path=/nixpkgs/trunk/; revision=18239
 2009-11-07 01:58:56 +00:00
Nicolas Pierron
09bed4bffc * Report file locations in the stack-trace when multiple option 
declarations cannot be merged.

svn path=/nixpkgs/trunk/; revision=18149
 2009-11-05 16:36:03 +00:00
Nicolas Pierron
d8bbae877a * Add a type for read-only options. Options which are only declared 
are used when a module produces read-only data for other modules.

svn path=/nixpkgs/trunk/; revision=18148
 2009-11-05 15:39:45 +00:00
Nicolas Pierron
5684506470 * Add isDefined to each options. This will clean-up NixOS introspection. 
svn path=/nixpkgs/trunk/; revision=18147
 2009-11-05 15:39:39 +00:00
Eelco Dolstra
374bb28dd8 * The libx86 package refers to platforms.netbsd, so add it. 
svn path=/nixpkgs/trunk/; revision=17987
 2009-10-28 12:25:06 +00:00
Eelco Dolstra
a565a82e4e svn path=/nixpkgs/trunk/; revision=17934 2009-10-23 07:34:56 +00:00
Michael Raskin
a9a462f13d Try to add missing flip function for NixOS 
svn path=/nixpkgs/trunk/; revision=17933
 2009-10-23 07:00:15 +00:00
Nicolas Pierron
b15cbb639e Refactor a bit to add names to intermediate computations. Add a cross 
temporary result to fetch information from the evaluation to make them
available inside the option declaration.

Add: isNotDefined flag inside the option.

svn path=/nixpkgs/trunk/; revision=17766
 2009-10-12 17:51:21 +00:00
Nicolas Pierron
81694a7f54 * modules.nix: use catAttrs function instead of hand made code. 
svn path=/nixpkgs/trunk/; revision=17760
 2009-10-12 15:50:59 +00:00
Nicolas Pierron
19648abc05 Revert previous commit because this is implicit. Fix property evaluation 
error which arose when one module define a value with "mkDefaultValue"
and another module define its value with "mkIf <false>".

svn path=/nixpkgs/trunk/; revision=17759
 2009-10-12 15:16:22 +00:00
Nicolas Pierron
e82843144c do not delay mkOverride on options which are does not have sub modules. 
svn path=/nixpkgs/trunk/; revision=17758
 2009-10-12 15:07:31 +00:00
Nicolas Pierron
03eab95618 Only allow properties with a onGlobalEval function to go through specific 
types.

svn path=/nixpkgs/trunk/; revision=17756
 2009-10-12 13:37:00 +00:00
Nicolas Pierron
926f20a1ee Revert "* Revert the last two commits ..." (rev 17738) & Fix. 
svn path=/nixpkgs/trunk/; revision=17740
 2009-10-09 23:03:24 +00:00
Eelco Dolstra
037a777b7d * Enable builds on OpenBSD. 
svn path=/nixpkgs/trunk/; revision=17739
 2009-10-09 19:42:59 +00:00
Eelco Dolstra
24b50e92ee * Revert the last two commits since they break every job in the 
buildfarm ("undefined variable `delayPropertiesTemplate'").

svn path=/nixpkgs/trunk/; revision=17738
 2009-10-09 19:34:28 +00:00
Nicolas Pierron
d11481e9bf Add mkOverrideTemplate (currently the same as mkOverride). 
svn path=/nixpkgs/trunk/; revision=17737
 2009-10-09 18:11:36 +00:00
Nicolas Pierron
bb16a7f08d Replace a counter intuitive behaviour of module evaluations. 
- types.nix:
Introduce a new flag named "delayProperties" which define either that
properties should be evaluated (when false) or that they should be delaied
through the type structure.

- properties.nix:
Generalized the delayProperties function to make it work with the iter
functions of option types.

- modules.nix:
Replace evalProperties by a condition based on the value of the
"delayProperties" flag of the option type.  If the flag does not exists or
if it is false, then the system behaves as always.  Otherwise it delays
the properties from the current value to each values contained inside it.

svn path=/nixpkgs/trunk/; revision=17736
 2009-10-09 18:11:30 +00:00
Nicolas Pierron
fd0396037a extract function unifyOptionModule from moduleMerge. This function is 
used to convert option sets, provided inside option declarations, to a
module.

svn path=/nixpkgs/trunk/; revision=17735
 2009-10-09 18:11:24 +00:00
Marc Weber
0e6c476d60 fix some typos in comments 
svn path=/nixpkgs/trunk/; revision=17708
 2009-10-08 00:54:26 +00:00
Nicolas Pierron
e528b920bb Add the reverseList function. 
svn path=/nixpkgs/trunk/; revision=17676
 2009-10-06 13:36:46 +00:00
Nicolas Pierron
088e6995a2 Improve the efficiency of stringToCharacters. 
svn path=/nixpkgs/trunk/; revision=17671
 2009-10-06 09:21:58 +00:00
Nicolas Pierron
915fa6a08f introduce the stringAsChars ans replaceChars functions. 
svn path=/nixpkgs/trunk/; revision=17670
 2009-10-06 09:21:52 +00:00
Nicolas Pierron
bbb4ce1dd7 Extract the path done inside the iteration process of the option type and 
give it as argument to each sub-module.

With the type "types.attrsOf types.optionSet", you will obtain the name of
the attribute in which the sub-modules are contained.

svn path=/nixpkgs/trunk/; revision=17669
 2009-10-06 09:21:46 +00:00
Nicolas Pierron
1f68748a8b Add removePrefix function. 
svn path=/nixpkgs/trunk/; revision=17667
 2009-10-06 09:21:39 +00:00
Nicolas Pierron
c3d328ca48 Fix sub-module argument manipulation: Avoid using an empty set to check 
the type of the module.

svn path=/nixpkgs/trunk/; revision=17666
 2009-10-06 09:21:17 +00:00
Nicolas Pierron
ba09982edb Fix merge function of types. 
svn path=/nixpkgs/trunk/; revision=17649
 2009-10-05 18:10:42 +00:00
Nicolas Pierron
3872882e93 Fix collect example. 
svn path=/nixpkgs/trunk/; revision=17510
 2009-09-29 15:34:19 +00:00
Nicolas Pierron
00127bef3f Move zip & zipWithNames from misc.nix to attrsets.nix and rename them to 
zipAttrs*.

Add recursiveUpdate functions based on zipAttrs.

svn path=/nixpkgs/trunk/; revision=17506
 2009-09-29 14:57:00 +00:00
Nicolas Pierron
4c43afbaf6 export definitions to be used in conjunctions with extraConfigs. With such 
method, properties evaluated at the evaluation time are still on the values
which makes this interresting to use in conjunction with extraConfigs.
The extraConfigs values are merged with the other values and then the
properties gets evaluated.

Thus, we can keep properties like mkOverride with this method.

svn path=/nixpkgs/trunk/; revision=17482
 2009-09-28 18:22:55 +00:00
Nicolas Pierron
33d43ac18b Add extraConfigs attribute inside options. This attribute is used to 
insert definitions from an external location.  As opposed to other
defintions, these definitions are always embedded into a list which allow
to add multiple definitions with one module.

!!! This feature _should not_ be used as a new mean to define options.

svn path=/nixpkgs/trunk/; revision=17481
 2009-09-28 18:22:49 +00:00
Nicolas Pierron
b3b40ebf79 Add setAttrByPath: 
- used to defined an attribute with its path as a list of attribute names.

svn path=/nixpkgs/trunk/; revision=17480
 2009-09-28 18:22:44 +00:00
Nicolas Pierron
7ff2778cc6 Add splitString: 
splitString "." "foo.bar.baz"  returns  ["foo" "bar" "baz"]

svn path=/nixpkgs/trunk/; revision=17479
 2009-09-28 18:22:37 +00:00
Nicolas Pierron
b0f639844a the tryEval builtin does not have a strict evaluation. Add the toXML 
builtin to force the evaluation of the configuration value.  Thus the
success flag returned by tryEval corespond to the success of the
whole evaluation.

svn path=/nixpkgs/trunk/; revision=17478
 2009-09-28 18:22:31 +00:00
Nicolas Pierron
fad1b41fe4 externals argumental are now taking precedence over the result of 
moduleMerge because we may need to alter the result of the configuration
before using it inside other options.

svn path=/nixpkgs/trunk/; revision=17477
 2009-09-28 18:22:24 +00:00
Nicolas Pierron
e6399964cb Add the zipLists and zipListsWith functions. 
svn path=/nixpkgs/trunk/; revision=17476
 2009-09-28 18:22:14 +00:00
Nicolas Pierron
13f467fc84 Remove values coming from the original sources because this may cause the evaluation of unsafe code. 
Instead add the computed value under tryEval to catch bad evaluations.

svn path=/nixpkgs/trunk/; revision=17453
 2009-09-26 23:01:35 +00:00
Marc Weber
15afc2fa04 fix mergeAttrsWithFunc (also merge in names which are only in the snd attrs) 
svn path=/nixpkgs/trunk/; revision=17406
 2009-09-24 18:22:33 +00:00
Eelco Dolstra
b7a90c11d3 * selectMaintained (renamed): don't use meta.maintainer, just use 
meta.platforms.
* Valgrind *should* work on Darwin now, except that our GCC doesn't
  recognise the -arch flag.

svn path=/nixpkgs/trunk/; revision=17372
 2009-09-23 19:45:02 +00:00
Eelco Dolstra
12395c36a9 * Typos. 
svn path=/nixpkgs/trunk/; revision=17348
 2009-09-22 09:26:18 +00:00
Marc Weber
88e66ae7f4 rename mapRecordFlatten to mapAttrsFlatten 
svn path=/nixpkgs/trunk/; revision=17315
 2009-09-20 21:54:20 +00:00
Nicolas Pierron
dc8f469349 Fix the merge function of the "attrsOf" type: handle multiple of the same 
attribute name.

svn path=/nixpkgs/trunk/; revision=17297
 2009-09-20 10:29:06 +00:00
Lluís Batlle i Rossell
8515a7fa68 Adding me as a maintainer, with a pair of packages. 
svn path=/nixpkgs/trunk/; revision=17295
 2009-09-20 09:37:55 +00:00
Nicolas Pierron
6041b78fa4 Report bad default values which would have cause a build failure if they 
were used to build a NixOS system.

svn path=/nixpkgs/trunk/; revision=17286
 2009-09-19 22:10:11 +00:00
Nicolas Pierron
5f138aebde Fix: Use the check function defined in the option declaration if it exists. 
svn path=/nixpkgs/trunk/; revision=17277
 2009-09-19 16:49:31 +00:00
Eelco Dolstra
1885909e93 * More typos. 
svn path=/nixpkgs/trunk/; revision=17257
 2009-09-18 15:18:23 +00:00
Nicolas Pierron
c6267a8c9d Add declarations and definitions to options. This allow you to retrieve 
the location of the definition with the defined value.

Filter the source location for the documentation.

svn path=/nixpkgs/trunk/; revision=17253
 2009-09-18 15:10:11 +00:00
Nicolas Pierron
e07f5d2a2c Add location to declared sub-modules. 
svn path=/nixpkgs/trunk/; revision=17252
 2009-09-18 15:10:05 +00:00
Michael Raskin
a9dc68b1ea Specify some obvious platform sets 
svn path=/nixpkgs/trunk/; revision=17205
 2009-09-16 15:12:24 +00:00
Eelco Dolstra
d7d80e8fdc * Typos. 
svn path=/nixpkgs/trunk/; revision=17182
 2009-09-16 11:37:07 +00:00
Nicolas Pierron
0c16b00cbd Replace the traversal of modules: 
- Remove handleOptionSets which used option declarations & definitions
in the same set.
- Add a traversal of modules where "config" and "options" are traverse at
the same time.

This allow to have accruate error messages with the incriminated files
playing a role in the error.

This system add a new restriction compare to the previous system:
- A module with no structure (option definitions & option declarations
& require) should not contain any option declarations.  If such module
exists you must convert it to the following form:

{ imports = <content of the require attribute>;
  options = <set of option declarations>;
  config = <set of option definitions>;
}

svn path=/nixpkgs/trunk/; revision=17163
 2009-09-15 13:36:30 +00:00
Nicolas Pierron
37ce2ca949 Handles cases where developers ""cannot"" put their initial modules in 
other files.

Imports of imported attribute set are not working anymore because this
feature is hard to maintain and because this a potential source of error.

Imports are only accepted inside named modules where the system has some
control over mutual inclusion.

svn path=/nixpkgs/trunk/; revision=17144
 2009-09-15 00:21:39 +00:00
Michael Raskin
b98b622ef0 Fix NixOS evaluation. As I understand, configuration gets added to the list of modules as an attrSet (not as a file name). Just add a trivial check to passthrough such modules. 
svn path=/nixpkgs/trunk/; revision=17116
 2009-09-14 20:10:41 +00:00
Nicolas Pierron
1557cfd0c6 split moduleClosure in two parts: 
* unifyModuleSyntax: handle all kind of module syntax to convert them into
  a module which has the following form:

  {
    imports = [ <paths> ];
    options = <attribute set of options declarations>;
    config = <attribute set (with properties) of option definitions>;
  }

  This function assume that there is at most one imported attribute set which
  correspond to option declarations.

* moduleClosure: handle a list of module's paths which are converted with
  the previous function to do the closure of the imports with the function
  lazyGenericClosure (which does the same as builtins.genericClosure except
  that it doesn't evaluate the content of modules).  The "key" and "paths"
  attributes are left to be used as debug information in futur
  implementation(s).

svn path=/nixpkgs/trunk/; revision=17108
 2009-09-14 13:19:00 +00:00
Ludovic Courtès
b7fa5f13c9 Add gnu' as an alias for linux'. 
The rationale is that usually applications don't care about the kernel
but rather about the C library, tool chain, and standard utilities,
which are GNU, not Linux.

svn path=/nixpkgs/trunk/; revision=17069
 2009-09-12 18:46:04 +00:00
Marc Weber
60aa746f6b removing dropPath. It's used once and in that case it behaves like 
builtins.dropPath

svn path=/nixpkgs/trunk/; revision=17018
 2009-09-10 16:57:26 +00:00
Eelco Dolstra
5b7f46ea43 * A utility function `optionalAttrs', similar to optional and 
optionalString but for attribute sets.

svn path=/nixpkgs/trunk/; revision=17002
 2009-09-10 10:52:51 +00:00
Michael Raskin
a1ea759dd9 Adding libev - an even loop library remotely similar to libevent 
svn path=/nixpkgs/trunk/; revision=16877
 2009-08-27 07:17:57 +00:00
Eelco Dolstra
921de5b511 * Remove the warning, it's rather annoying. 
svn path=/nixpkgs/trunk/; revision=16862
 2009-08-26 14:13:05 +00:00
Michael Raskin
9e928bb1e9 Adding eProver to buildfarm via maintanership 
svn path=/nixpkgs/trunk/; revision=16854
 2009-08-25 08:28:08 +00:00
Marc Weber
3235c889b9 fix of warning. It should be correct now 
svn path=/nixpkgs/trunk/; revision=16813
 2009-08-22 18:13:56 +00:00
Marc Weber
9c49ad9f70 trace warning when using attrs for textClosureList 
svn path=/nixpkgs/trunk/; revision=16810
 2009-08-22 09:35:59 +00:00
Marc Weber
e7dc062579 adding xapian and xapian-bindings 
svn path=/nixpkgs/trunk/; revision=16788
 2009-08-20 20:18:58 +00:00
Eelco Dolstra
9f59fb9377 * findFirst is used by the LaTeX function. Forgot to commit. 
svn path=/nixpkgs/trunk/; revision=16438
 2009-07-22 14:43:39 +00:00
Eelco Dolstra
10c4ec0ed8 svn path=/nixpkgs/trunk/; revision=16412 2009-07-17 12:04:34 +00:00
Eelco Dolstra
80cab44fce * Options / config: these should be attrsets, not lists (IMHO). 
svn path=/nixpkgs/trunk/; revision=16359
 2009-07-14 16:22:42 +00:00
Nicolas Pierron
b09382fcd1 Extract properties.nix and modules.nix from options.nix. 
svn path=/nixpkgs/trunk/; revision=16339
 2009-07-13 16:18:52 +00:00
Andres Löh
9f9ec8d2c6 Added myself as a maintainer. 
svn path=/nixpkgs/trunk/; revision=16327
 2009-07-10 19:50:04 +00:00
Nicolas Pierron
5cd8eefb26 Allow to set priority which are below the default priority level. 
This help to define default values which can be override without any extra syntax.

svn path=/nixpkgs/trunk/; revision=16304
 2009-07-10 09:44:09 +00:00
Marc Weber
07df330fd5 maintainers + marcweber 
svn path=/nixpkgs/trunk/; revision=16294
 2009-07-09 22:23:56 +00:00
Sander van der Burg
9c2379e263 Added myself (sander) to the maintainers list 
svn path=/nixpkgs/trunk/; revision=16275
 2009-07-09 13:42:22 +00:00
Marc Weber
6abf8471fb fix sourceWithTagsDerivation, myhasktags now based on current haskell derivations 
svn path=/nixpkgs/trunk/; revision=16263
 2009-07-09 03:50:47 +00:00
Eelco Dolstra
edd198ee8b * Doh. 
svn path=/nixpkgs/trunk/; revision=16259
 2009-07-08 16:14:51 +00:00
Eelco Dolstra
73ac7f5876 svn path=/nixpkgs/trunk/; revision=16256 2009-07-08 15:56:05 +00:00
Michael Raskin
dd89941fb2 Added myself as the maintainer of some packages 
svn path=/nixpkgs/trunk/; revision=16221
 2009-07-07 15:05:15 +00:00
Nicolas Pierron
aec4341cb4 Fix: (in moduleClosure) remove key attribute of inlined sets. 
svn path=/nixpkgs/trunk/; revision=16198
 2009-07-06 23:20:14 +00:00
Nicolas Pierron
c49dddb1ab Substitute fixOptionSetsFun by multiple functions which are: 
- well named,
- capable to handle the proposal of Eelco Dolstra { imports= [..]; options = {}; config = {}; } in addition to the current { require = [..]; .. } syntax.

svn path=/nixpkgs/trunk/; revision=16192
 2009-07-06 16:20:05 +00:00
Nicolas Pierron
a89f3bca50 allow the argument set of modules to be defined outside of option.nix file. 
svn path=/nixpkgs/trunk/; revision=16191
 2009-07-06 16:20:00 +00:00
Nicolas Pierron
736523d992 cleanSource: Avoid copying git files. 
svn path=/nixpkgs/trunk/; revision=16190
 2009-07-06 16:19:52 +00:00
Eelco Dolstra
0281a7deb8 svn path=/nixpkgs/trunk/; revision=16131 2009-07-02 08:58:30 +00:00
Ludovic Courtès
7b7ed8f1af Add `stdenv.lib.maintainers'. 
Suggested by Eelco Dolstra.

svn path=/nixpkgs/trunk/; revision=16126
 2009-07-01 15:38:55 +00:00
Eelco Dolstra
a440fba8e3 * Refactoring: move the types out of options.nix, which is much too 
big.  Also, they could be useful beyond option handling.

svn path=/nixpkgs/trunk/; revision=16055
 2009-06-26 13:53:31 +00:00
Nicolas Pierron
dd50af4923 Add a description of values which cause a bad type the failure. 
svn path=/nixpkgs/trunk/; revision=16054
 2009-06-26 12:42:00 +00:00
Nicolas Pierron
6c0912ee9c - partition based on the content of the properties. (rmProperties * isOption) 
- Do not eval properties on option declarations.
  -> mkIf does not mask option declarations if the condition is evaluated to false.

svn path=/nixpkgs/trunk/; revision=16043
 2009-06-25 21:25:33 +00:00