Commit graph

724 commits

Author SHA1 Message Date
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
Nikolay Amiantov 1c8a21dfad Merge branch 'pdnsd-service' of https://github.com/nfjinjing/nixpkgs
Closes #12932
2016-02-16 20:35:01 +03:00
Ricardo M. Correia 957ed2c08c Merge pull request #13015 from ehegnes/exa
exa: init at git 2016-02-15
2016-02-16 18:11:42 +01:00
Eric Hegnes 23ab6bf6b2 exa: init at git 2016-02-15 2016-02-16 11:02:38 -05:00
Arseniy Seroka 6b205a9eba Merge pull request #12988 from colemickens/cfdyndns
cfdyndns: init at 0.0.1
2016-02-16 00:24:32 +03:00
Cole Mickens c7571611dc cfdyndns: init at 0.0.1 2016-02-15 12:54:04 -08:00
Arseniy Seroka cf73c7a91c Merge pull request #12997 from ryantm/minecraft
minecraft: add desktop entry; add ryantm as maintainer
2016-02-15 22:14:24 +03:00
Arseniy Seroka a13f9a708b Merge pull request #12992 from lukasepple/master
intel2200BGFirmware: init at 3.1
2016-02-15 22:10:49 +03:00
lukasepple 0b72e7e247 intel2200BGFirmware: init at 3.1
This commit adds the firmware for the Intel 2200BG wireless cards for
the ipw2200 kernel module. Also it changes the
networking.enableIntel2200BGFirmware option to set it as
hardware.firmware since firmware-linux-nonfree does not contain the
appropiate firmware anymore. Also hardware.enableAllFirmware does enable
the intel2200BGFirmware now.
2016-02-15 19:53:07 +01:00
Christoph-Simon Senjak 50bd1a0e8f bluez-tools: init 2015-09-10 (close #12936)
vcunat only fixed whitespace and changed the authorship e-mail
from dummy address you@example.com to the one recorded in maintainers.nix.
(Now github should recognize the commit as yours.)
2016-02-15 17:23:36 +01:00
Tomas Hlavaty af64bedaca add armv7l-linux to mesaPlatforms 2016-02-14 23:45:32 +01:00
Arseniy Seroka 5a63bf15e0 Merge pull request #12964 from sleexyz/spectrojack
spectrojack: init at 0.4
2016-02-14 22:34:14 +03:00
Ryan Mulligan ad50cbe8bb minecraft: add desktop entry; add ryantm as maintainer 2016-02-14 10:24:46 -08:00
Igor Sharonov 2656baef0c dirac: init at 1.0.2 2016-02-13 21:22:17 +03:00
Sean Lee 47282a0ee6 spectrojack: init at 0.4
spectrojack - moved in all-packages

spectrojack: init at 0.4

updated

spectrojack: init at 0.4
2016-02-13 11:19:53 -05:00
Jinjing Wang 73b9a9662d pdnsd service: init 2016-02-12 19:53:41 +08:00
Franz Pletz bb55126965 Merge pull request #12933 from mayflower/pkgs_upstream/nntp-proxy
nntp-proxy: init at 2014-01-06 (0358e7a)
2016-02-12 08:26:29 +01:00
Tristan Helmich f8d0ba7447 nntp-proxy: init at 2014-01-06 (0358e7a) 2016-02-11 16:24:48 +01:00
Arseniy Seroka 6a44d3fb9d Merge pull request #12884 from elitak/sunxi-tools_packages
sunxi-tools: (new)
2016-02-11 16:52:50 +03:00
Eric Litak 0d1d91efdd sunxi-tools: init at 1.3 2016-02-10 10:48:08 -08:00
Nikolay Amiantov 6a2cbbb24a Merge pull request #12888 from vanzef/qtscrob
Qtscrob
2016-02-09 17:20:56 +03:00
Ivan Solyankin d4dcfa9a76 maintainers: add vanzef 2016-02-09 16:43:37 +03:00
Robin Gloster a538959ca0 lib.maintainers.globin: use my normal mail address 2016-02-07 11:31:19 +00:00
Pascal Wittmann 98b365386a Merge pull request #12808 from kevincox/b2
backblaze-b2: init at version 0.3.10
2016-02-04 13:22:02 +01:00
Pascal Wittmann 1b998d97a9 Merge pull request #12810 from aneeshusa/add-as31
as31: init at 2.3.1
2016-02-04 08:35:45 +01:00
Aneesh Agrawal b4c449635a as31: init at 2.3.1 2016-02-04 01:37:28 -05:00
Kevin Cox 47c863f9ef backblaze-b2: init at version 0.3.10 2016-02-03 18:45:01 -05:00
Vladimír Čunát 889351af8b Revert "Merge #12357: nixos docs: show references to packages"
The PR wasn't good enough yet.
This reverts commit b2a37ceeea, reversing
changes made to 7fa9a1abce.
2016-02-03 12:16:33 +01:00
Vladimír Čunát b2a37ceeea Merge #12357: nixos docs: show references to packages 2016-02-03 10:07:27 +01:00
Octavian Cerna 3c011d0f1c quagga: init at 0.99.24.1 2016-02-02 11:56:30 +02:00
Luca Bruno eeb3600e55 Merge pull request #12562 from tvestelind/vassal
vassal: new package
2016-02-01 23:56:12 +01:00
Tomas Vestelind beabacf8c7 tvestelind in maintainers 2016-02-01 09:40:50 +01:00
Arseniy Seroka 10f7070bf0 Merge pull request #12221 from spinus/solaar
solaar: init at 0.9.2
2016-01-24 23:16:12 +03:00
Aaron Schif 9aac99ccb0 homesick: init at 1.1.3 (close #12465) 2016-01-24 17:22:13 +01:00
Tomasz Czyż 2bdd64d6dc solaar: init at 0.9.2 2016-01-24 02:26:19 +00:00
Nikolay Amiantov 29785c5b7a Merge pull request #12309 from zohl/chromiumos-kernel
Add ChromiumOS kernels
2016-01-23 13:13:59 +03:00
Franz Pletz 501f9166b1 Merge pull request #12407 from jgillich/chats
xmpp-client, ricochet
2016-01-18 15:15:59 +01:00
Domen Kožar f69743b4b4 Merge pull request #11401 from zagy/add/shortuuid
pythonPackage shortuuid: init at 0.4.2
2016-01-17 13:01:16 +01:00
Svein Ove Aas 6987f87832 maintainers: Add Baughn 2016-01-15 09:33:37 +01:00
Tobias Geerinckx-Rice a8265ea458 maintainers: remove roelof
Inactive since April 2014. Vanished from GitHub. Unreachable.
2016-01-14 23:55:47 +01:00
codsl 5acaa993f3 maintainers: add myself 2016-01-14 16:54:57 +01:00
Al Zohali d28eeb8ad4 maintainers: add zohl 2016-01-13 22:43:19 +03:00
Vladimír Čunát b9f6dfe8c5 nixos manuals: allow displaying package references
The manuals are now evaluated with each derivation in `pkgs` (recursively)
replaced by a fake with path "\${pkgs.path.to.the.attribute}".
It isn't perfect, but it seems to cover a vast majority of use cases.
Caveat: even if the package is reached by a different means,
the path above will be shown and not e.g. `${config.services.foo.package}`.

As before, defaults created by `mkDefault` aren't displayed,
but documentation shouldn't (mostly) be a reason to use that anymore.

Note: t wouldn't be enough to just use `lib.mapAttrsRecursive`,
because derivations are also (special) attribute sets.
2016-01-13 12:03:18 +01:00
Peter Simons 7ca8e13918 lib.getVersion: extend the function to cope with strings as well as derivations 2016-01-05 20:09:39 +01:00
Radvendii 2371acdeb2 tldr: init at 1.0
added tldr to all-packages.nix

cleaned up style

added metadata

semicolons

didn't test on mac. removed platform

wrong types

fixed duplication of version
2016-01-03 17:51:34 -05:00
Philipp Hausmann b574af31f4 maintainers: Make attrname match my github account 2016-01-03 10:27:30 +01:00
Reno Reckling a1e0894cb4 ding: init at 1.8 (close #11989)
vcunat improved meta.
2015-12-29 21:03:19 +01:00
Jascha Geerds d623916494 maintainers: Change my email address 2015-12-26 14:08:56 +01:00
Hoang Xuan Phu b8bc82a459 archiveopteryx: init at 3.2.0 2015-12-24 15:22:44 +08:00