Commit Graph

772 Commits

Author SHA1 Message Date
aszlig
009fd5ef77
lib/types: Revert handling submodules for "either"
This reverts commit 0f0805b, because @nbp had concerns about whether
this would be a good idea and pointed out problems with this.

We currently do not have a case where "either" is used in conjunction
with submodules, but I'm reverting it anyway to prevent people from
adding options using that type in that way.

This is now being reviewed in #14053.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-19 19:11:31 +01:00
aszlig
0f0805b51a
lib/types: Handle submodules for type "either"
So far the "either" type only handled "flat" types, so you couldn't do
something like:

type = either int (submodule {
  options = ...;
});

Not only caused this the submodule's options not being checked but also
not show up in the documentation.

This was something we stumbled on with #13916.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
2016-03-19 17:22:39 +01:00
Ryan Artecona
9da0403527 yamdi: init at 1.9 2016-03-16 11:39:43 -04:00
Eelco Dolstra
27af419541 Merge pull request #13896 from nbp/import-top-level
Replace references to all-packages.nix, by references to the top-level
2016-03-14 13:49:42 +01:00
zimbatm
94774a717b Merge pull request #13889 from frlan/Update/Geany/1.27
geany: 1.26 -> 1.27
2016-03-13 18:29:18 +00:00
Nicolas B. Pierron
6313a5698a Replace references to all-packages.nix, by references to the top-level of nixpkgs repository. 2016-03-13 18:25:52 +00:00
Frank Lanitz
9d34f2054d geany: 1.26 -> 1.27
Also adding myself as list of maintainers
2016-03-13 18:41:08 +01:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
joachifm
25148e8621 Merge pull request #13884 from sheenobu/maintainers/sheenobu
Added sheenobu as maintainer
2016-03-13 12:37:53 +00:00
Sheena Artrip
15f46547d9 Added sheenobu as maintainer 2016-03-13 08:20:16 -04:00
Markus Hauck
c97c667610 lib.maintainers: add markus1189 2016-03-11 19:32:10 +01:00
Domen Kožar
721462634f Merge pull request #13546 from zimbatm/document-stdlib
Document stdlib
2016-03-10 12:31:33 +00:00
zimbatm
7883ca774b lib/strings: document all the functions 2016-03-10 12:31:06 +00:00
zimbatm
c71e2d4235 lib/lists: document all functions 2016-03-10 12:31:05 +00:00
joachifm
d30b6f6a7b Merge pull request #13781 from romildo/new.epson_201207w
epson_201207w: init at 1.0.0
2016-03-10 11:29:10 +00:00
zimbatm
523e328318 lib/attrsets: document all the functions 2016-03-09 19:59:57 +00:00
zimbatm
a086858ef5 Remove lib.deepSeqList and lib.deepSeqAttrs
Both functions are broken and unused in the repo.
2016-03-09 19:59:57 +00:00
José Romildo Malaquias
e57f1eb6d0 epson_201207w: init at 1.0.0 2016-03-09 15:25:53 -03:00
Matthew Bauer
f0e5910c24 rgbds: init at 0.2.4 2016-03-09 00:44:01 -06:00
Sergiu Ivanov
7a31227573 oh-my-zsh-git: init at 2016-02-27 2016-03-07 19:42:26 +01:00
Nikolay Amiantov
234c5dce67 Merge commit 'refs/pull/13667/head' of git://github.com/NixOS/nixpkgs 2016-03-06 20:39:27 +03:00
Jakub Skrzypnik
d80811d881 ahoviewer: init at 1.4.6 2016-03-06 18:36:16 +01:00
Mathieu Boespflug
73878e1c10 keyfuzz: init at 0.2. 2016-03-05 19:41:33 +01:00
Adam Boseley
5b83791207 spice-vdagentd service : initial at 0.16.0 2016-03-05 07:56:47 +10:00
zimbatm
d3ee8298c4 Merge pull request #13642 from artuuge/epson-escpr-meta
epson-escpr: update the package meta
2016-03-03 14:58:51 +00:00
artuuge
edfb2e7ccb update epson-escpr meta 2016-03-03 14:59:40 +01:00
Raymond Gauthier
5f57d2dc50 maintainers: add a maintainer to the set 2016-03-03 01:03:31 -05:00
michael bishop
a855ef85ea
multimc: fix building under chroot 2016-03-02 13:48:27 -04:00
Nikolay Amiantov
23dd97ee88 Merge commit 'refs/pull/13412/head' of git://github.com/NixOS/nixpkgs 2016-03-02 18:56:24 +03:00
Alex Franchuk
69d8cb4a6b libreswan: add package and service to nixos 2016-03-02 09:44:30 -05:00
Eelco Dolstra
f3d94cfc23 Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
This reverts commit cad8957eab. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
2016-03-01 20:52:06 +01:00
zimbatm
22d7c08dc5 lib.trivial: add a new importJSON function
This is meant to be used by packages who often re-generate their inputs.

Producing valid JSON is easier than nix, and also garantees it's purity.
2016-02-29 11:21:56 +00:00
Thomas Strobel
bc52fa0508 update maintainer's email address 2016-02-29 01:51:41 +01:00
Thomas Strobel
cad8957eab Add the tool "nixos-typecheck" that can check an option declaration to:
- Enforce that an option declaration has a "defaultText" if and only if the
   type of the option derives from "package", "packageSet" or "nixpkgsConfig"
   and if a "default" attribute is defined.

 - Enforce that the value of the "example" attribute is wrapped with "literalExample"
   if the type of the option derives from "package", "packageSet" or "nixpkgsConfig".

 - Warn if a "defaultText" is defined in an option declaration if the type of
   the option does not derive from "package", "packageSet" or "nixpkgsConfig".

 - Warn if no "type" is defined in an option declaration.
2016-02-29 01:09:00 +01:00
leenaars
6c916515d6 lib.maintainers: add Michiel Leenaars (close #13516)
As suggested in https://github.com/NixOS/nixpkgs/pull/13504 by @hrdinka.
2016-02-27 22:13:11 +01:00
Eelco Dolstra
6d111b353f Make explicit that maintainers should use a real name 2016-02-27 00:18:07 +01:00
zimbatm
07b1f78b94 lib: alphabetize things 2016-02-26 22:15:41 +00:00
zimbatm
6e5a748224 lib.platforms: alphabetize 2016-02-26 22:15:40 +00:00
zimbatm
dea3279593 lib.maintainers: alphabetize 2016-02-26 22:13:58 +00:00
Franz Pletz
db2b0c8406 Merge pull request #13430 from nico202/yarp
yarp (+ libace): init at 2.3.64
2016-02-26 09:29:21 +01:00
=
a5ed58445f yarp (+ libace): init at 2.3.64 2016-02-24 22:08:29 +01:00
Arseniy Seroka
fbca8ede65 Merge pull request #13358 from aespinosa/dpic-preprocessor
dpic: init at 2016.01.12
2016-02-22 23:08:46 +03:00
Robin Gloster
06546b0ec1 Merge pull request #13143 from onlinemediagroup/ios_cross_compiler
ios-cross-compile: init at Feb 16, 2016
2016-02-22 19:17:22 +00:00
Edgar Aroutiounian
058c768892 ios-cross-compile: init at 9.2 2016-02-22 11:16:11 -08:00
Pascal Wittmann
2d2efceecb Merge pull request #13367 from bzizou/nco
nco: init at 4.5.5
2016-02-22 16:26:23 +01:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr
2960ea5292 nco: init at 4.5.5 2016-02-22 15:14:34 +01:00
Allan Espinosa
2dd51275eb dpic: init at 2016.01.12 2016-02-22 07:42:53 -06:00
mingchuan
9e0b5358e2 pcmanx-gtk2: init at 1.3 2016-02-20 19:49:13 +08:00
aszlig
98faa0c8f3
lib/types: Set name of types.package to "package"
Nobody seems to have noticed this (except @Profpatsch) that options with
a "package" type do not get included in the manual.

So debugging this was a bit more involving because while generating the
manual there is an optionList' attribute built from the collected
attributes of all the option declarations.

Up to that point everything is fine except if it comes to
builtins.toXML, where attributes with { type = "derivation" } won't get
included, for example see here:

nix-repl> builtins.toXML { type = "derivation"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <derivation>
 <repeated />\n  </derivation>\n</expr>\n"

nix-repl> builtins.toXML { type = "somethingelse"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <attrs>
     <attr name=\"foo\">\n      <string value=\"bar\" />\n    </attr>
     <attr name=\"type\">\n      <string value=\"somethingelse\" />
     </attr>\n </attrs>\n</expr>\n"

The following function in libexpr/eval.cc (Nix) is responsible for toXML
dropping the attributes:

bool EvalState::isDerivation(Value & v)
{
    if (v.type != tAttrs) return false;
    Bindings::iterator i = v.attrs->find(sType);
    if (i == v.attrs->end()) return false;
    forceValue(*i->value);
    if (i->value->type != tString) return false;
    return strcmp(i->value->string.s, "derivation") == 0;
}

So I've renamed this now to "package" which is not only more consistent
with the option type but also shouldn't cause similar issues anymore.

Tested this on base of b60ceea, because building the dependencies on
recent libc/staging changes on master took too long.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Profpatsch <mail@profpatsch.de>
2016-02-17 21:12:24 +01:00
zimbatm
078e85e0e5 Merge pull request #12922 from igsha/dirac
dirac: init at 1.0.2
2016-02-17 10:17:59 +00:00