Commit graph

2689 commits

Author SHA1 Message Date
Aycan iRiCAN 1ff1fe44d9 Added myself to maintainer of hdaemonize and hweblib 2014-08-23 12:28:35 +03:00
Daniel Bergey a24775bf22 haskell Diagrams libraries
latest versions support lens-4.4 - fix broken builds
add bergey as maintainer
2014-08-23 02:05:39 +00:00
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Eelco Dolstra f932910323 types.nix: Add ‘either’ type 2014-08-19 18:24:37 +02:00
Nathan Bijnens 23da6f9ca4 mailutils: fix for sendmail path 2014-08-15 21:16:33 +02:00
Eelco Dolstra df7bc53606 Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02:00
Vladimír Čunát 5d8c8845ed licenses: add LPL-102 2014-08-15 00:11:09 +02:00
Luca Bruno b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
Vladimír Čunát 7133c791b5 licenses: fixup double isc definition 2014-08-14 21:04:24 +02:00
Vladimír Čunát d1ed0f44cd Merge #2823: better cygwin support, also add x86_64
Conflicts (easy):
	pkgs/development/interpreters/perl/5.16/default.nix
2014-08-14 20:38:09 +02:00
William A. Kennington III ae48ab82ad license: Add isc 2014-08-13 15:10:04 -05:00
Vladimír Čunát 665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs
The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
2014-08-12 19:08:53 +02:00
Vladimír Čunát 905b163b49 Revert "lib/licenses.nix: allow choosing license by its shortName"
There's no consensus to adopt that (yet).
This reverts commit 229e5c41df.
2014-08-12 19:05:54 +02:00
Matt Miemiec 8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Christoph Hrdinka f44e69a55d luminanceHDR: add version 2.4.0
fixes #3229
2014-08-12 10:19:35 +02:00
Damien Cassou fe045a71c4 Adding myself to the maintainers 2014-08-10 15:57:24 +02:00
Luca Bruno b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
NOTtheMessiah 127441813b added license for gcolor2 and myself to maintainers 2014-08-07 01:19:24 +02:00
William A. Kennington III ede3e60a3c unifi: Add wkennington as a maintainer 2014-08-05 21:48:19 -05:00
Vladimír Čunát 229e5c41df lib/licenses.nix: allow choosing license by its shortName
Example: license = licenses."GPL-2.0+";
This comes with some performance cost during eval of licenses.nix,
but that's probably negligible.
2014-07-30 19:22:09 +02:00
Vladimír Čunát 0f2101215d lib/licenses.nix: improve sortedness 2014-07-30 18:16:36 +02:00
Vladimír Čunát 32c237d782 lib/licenses.nix: convert to spdx.org shortnames
Done where possible, replacing links to point to spdx.org (probably stabler).
Also make libtiff use its dedicated license.
2014-07-30 18:16:09 +02:00
Paul Colomiets 9bc1676e5a Upgrade docker to 1.1.2 and add docker module
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
2014-07-28 21:45:49 +02:00
Sven Keidel ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
tv c12f6e3ce9 maintainers: add tv 2014-07-12 13:18:46 +02:00
cillianderoiste d6e8e764ae Merge pull request #3233 from wjlroe/exercism
New Exercism package
2014-07-10 18:56:47 +02:00
William Roe 09209878c6 Added wjlroe (me) as maintainer of this new Exercism package 2014-07-10 15:03:50 +01:00
Martin Lavoie 3df7911f35 Add bitbucket-cli to nixpkgs
Adding refnil as mainteners

Added alias in top-level
2014-07-09 01:15:49 +02:00
Oliver Charles 847a9a5c30 Merge pull request #3206 from bosu/mp3splt
Add mp3splt: utility to split mp3 files
2014-07-07 19:58:00 +01:00
Boris Sukholitko 70ad9ad8f9 Add mp3splt 2014-07-07 21:38:14 +03:00
Jascha Geerds 28322c8d58 Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
Oliver Charles 2480f2465c Merge pull request #3138 from flosse/lua5-expat
added luaexpat 1.3.0
2014-07-01 08:47:39 +01:00
Michael Raskin d001de0100 Merge pull request #3102 from auntieNeo/ipafont
Added package for Japanese IPAFonts.
2014-06-30 10:19:48 +04:00
Michael Raskin d41a7bd9e2 Merge pull request #2871 from auntieNeo/kochi-substitute
Added Kochi substitute Japanese font package
2014-06-30 10:14:14 +04:00
Markus Kohlhase 7987cd2cc1 added luaexpat 1.3.0 2014-06-30 00:38:05 +02:00
Michael Raskin a278c3dfa8 Fix tarball by adding the missing maintainer entry; email copied from commit metadata 2014-06-29 10:18:39 +04:00
Vladimír Čunát c00f589ff2 licenses: add attribute "free" to fix eval of smlnjBootstrap 2014-06-27 09:48:42 +02:00
Jan Malakhovski 0ea84c4445 minor fix in documentation
Signed-off-by: Domen Kožar <domen@dev.si>
2014-06-26 11:13:15 +02:00
Jonathan Glines 339b347987 Added package for Japanese IPAFonts. 2014-06-15 10:02:41 -06:00
Jonathan Glines b913409e0b Removed non-free kochi-substitute and added kochi from Debian package. 2014-06-11 22:08:14 -06:00
Vladimír Čunát e1775895a6 Merge #2711: add ansible-1.6.1
Conflicts (trivial):
	lib/maintainers.nix
2014-06-11 20:29:55 +02:00
Kirill Elagin 751a01063d lib: Do not take string context into account
Close #2883.
2014-06-11 20:22:58 +02:00
Jonathan Glines 8e2556bd7f Added auntie as a maintainer, and set license properly. 2014-06-08 23:47:59 -06:00
Austin Seipp ec1eadf5a0 Merge pull request #2691 from joelteon/cdecl-osx
Update cdecl to block-supporting version
2014-06-03 20:37:30 -05:00
Philip Lykke Carlsen e87da7761a subtitleeditor, gstreamermm: new packages 2014-06-03 22:00:47 +02:00
Peter Simons ce7be7584f Merge pull request #2790 from ehmry/unbound
unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd
2014-05-30 14:46:29 +02:00
Emery Hemingway 0ddce8db12 unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd 2014-05-29 09:59:55 -04:00
Sander van der Burg 9ec52d6323 Fixes to make basic builds on Cygwin work again + additions to support x86_64-cygwin 2014-05-29 14:47:07 +02:00
Matthew Brown 3e7f8bce62 maintainers.nix: add missing edeoryd46, fixing channel
Close #2783.
2014-05-28 21:51:35 +02:00
Alexei Robyn 4fa4518875 Add TeamSpeak 3 server & service module (close #2056)
Conflicts (trivial):
	lib/maintainers.nix
	nixos/modules/misc/ids.nix
2014-05-27 17:30:26 +02:00
Luca Bruno 0f51ae90b9 Revert "typescript: add package. Closes #2712"
This reverts commit 93a7cf74b9.
2014-05-21 15:57:34 +02:00
Jussi Maki 93a7cf74b9 typescript: add package. Closes #2712
Typed superset of JavaScript that compiles to plain JavaScript.

http://www.typescriptlang.org/
2014-05-21 15:21:48 +02:00
Jussi Maki 75cb485718 ansible: conventions, fix module execution 2014-05-21 14:46:37 +02:00
Jussi Maki 92d8001c25 ansible: Add maintainer 2014-05-21 09:41:48 +02:00
Joel Taylor d56dcb50f4 add me to maintainers 2014-05-18 20:52:18 -07:00
Vladimír Čunát 4da7eb78ec lib/maintainers: add "berdario", maintain redis
Relates #2541.
2014-05-15 21:11:17 +02:00
Eelco Dolstra 168fe56f3b Merge branch 'monit-5.8' of github.com:wmertens/nixpkgs 2014-05-15 14:42:20 +02:00
Vladimír Čunát bf2bc0f0dc lib/strings: add hasPrefix and simplify hasSuffix
It was discussed as a part of #2570.
2014-05-13 11:05:37 +02:00
Vladimír Čunát 180bd65cd0 lib/strings: simplify removePrefix readability
It was discussed as a part of #2570.
2014-05-13 11:04:38 +02:00
Eelco Dolstra ea36f3b868 fetchFromGitHub: Use .tar.gz instead of .zip
Also clean up the name attribute of fetchzip derivations a bit.
2014-05-09 15:53:44 +02:00
Rob Vermaas 0d50061b4f Merge pull request #2454 from MarcWeber/submit/document-composableDerivation
Shea told me composableDerivation is hard to understand.
2014-05-09 15:16:28 +02:00
cillianderoiste 45ed706cea Merge pull request #2536 from CodeBlock/poly-font
Poly font
2014-05-07 09:48:26 +02:00
Ricky Elrod 139c6fb180 Add OFL as an actual license 2014-05-06 04:04:43 -04:00
Ricky Elrod df0014488a First attempt at data/fonts/poly 2014-05-06 03:48:04 -04:00
Rob Vermaas 90a7711e08 Re-introduce (marked as obsolete) mkStrict function, to allow old nixops deployments to keep working. 2014-05-05 12:29:38 +02:00
Wout Mertens e017139e70 Add wmertens to maintainers 2014-05-04 09:50:58 +02:00
Austin Seipp 145dcdc539 Add licenses for CompCert/Z3
Both of these allow for binary redistribution.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 19:08:59 -05:00
Shea Levy da4adc2a4f Fix description to match convention 2014-05-01 11:46:44 -04:00
Shea Levy ab2cd34076 Add enum option type 2014-05-01 11:30:20 -04:00
Austin Seipp 6d52463bd3 nixpkgs: add alt-ergo 0.95.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:42:31 -05:00
Marc Weber 31fc4c6aa4 Shea told me composableDerivation is hard to understand.
Thus comment it and why it was written long time ago until it'll get replaced piecewise.
2014-04-30 20:31:40 +02:00
Peter Simons 3445df42a4 Merge pull request #2368 from Chaddai/texmaker
TeXmaker
2014-04-28 22:42:47 +02:00
Mateusz Kowalczyk 9a77b8e64f tibia: version 10.38
Closes #2396
2014-04-26 12:58:25 -05:00
Charles Strahan 604a4b680c capnproto: Add package 2014-04-25 11:18:18 -04:00
Chaddaï Fouché 3701fdf066 Adding myself to lib/maintainers.nix 2014-04-24 11:40:06 +02:00
Vincent Bernardoff ce422b4553 Updated OCaml package findlib 2014-04-21 23:06:35 +02:00
John Wiegley 5c18bbe34f Update ledger expression, add myself as a maintainer 2014-04-17 21:47:15 -05:00
Luca Bruno 9d5a06cfe7 gnome3: use package names for environment.gnome3.excludePackages 2014-04-14 09:58:03 +02:00
Luca Bruno b4096479fa gnome-user-docs: new package licensed under the new licenses.cc-by-30
User and system administration help for the Gnome

https://help.gnome.org/users/gnome-help/3.10
2014-04-14 09:58:02 +02:00
Ertugrul Söylemez 7be040cdcb maintainers: ertes: New temporary email address. 2014-04-11 21:17:22 +02:00
Luca Bruno a3115707dd Add environment.gnome3.excludePackages
Give the user a full desktop, and the possibility to exclude
non-base packages from the default list of packages.
2014-04-09 00:36:53 +02:00
Shea Levy ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs
rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
2014-04-05 14:23:29 -04:00
Eelco Dolstra 0469f92faf Bring back mkOrder 2014-03-30 20:35:25 +02:00
Eelco Dolstra aaf01268ff Revert "slim: remove duplicate code"
This reverts commit f7d5e83abb.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
2014-03-30 17:06:01 +02:00
Emery Hemingway 6c77690b28 rippled: initial pkg and module expressions
rippled is the Ripple P2P payment network reference server
https://ripple.com
2014-03-29 15:31:37 -04:00
Maxim Ivanov f949a71aac add libmsgpack C/C++ library (close #2059) 2014-03-29 14:38:53 +01:00
Shea Levy 63f97fe9db Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs
add normal theme support for slim and slimlock
2014-03-29 00:17:52 -04:00
Shea Levy 8a15cfdaec Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs
Add mps 1.113.0, fix usage of Sleepycat license
2014-03-28 23:03:20 -04:00
_1126 34301c89e1 ncmcp: New expression 2014-03-26 12:15:01 +01:00
Shea Levy 97a733ae57 Merge branch 'submit/sloane' of git://github.com/akc/nixpkgs
Add sloane -- a command line interface to OEIS
2014-03-26 02:42:22 -04:00
Austin Seipp 023464f13f licenses: add Sleepycat Public License
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-24 19:58:11 -05:00
Shea Levy fc0ea57efc Merge branch 'misc-gvolicon' of git://github.com/bennofs/nixpkgs
new expression: gvolicon
2014-03-22 20:56:00 -04:00
Benno Fünfstück 3f2b74bf08 new expression: gvolicon 2014-03-22 12:50:45 +01:00
AndersonTorres f7498e5a7e Adding info about maintainer (myself - AndersonTorres) and modifying the meta.license field for some packages I have made. 2014-03-22 01:12:48 -03:00
Anders Claesson ac3de98f07 Add sloane -- a command line interface to OEIS. 2014-03-18 14:37:56 +00:00
Shea Levy dddb4f45e9 Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs
Bump wqy-zenhei font to the latest version and add wqy-microhei
2014-03-15 13:22:31 -04:00
Domen Kozar 059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
Arseniy Seroka f7d5e83abb slim: remove duplicate code 2014-03-11 16:27:27 +04:00
Domen Kožar 2de56d103c Merge pull request #1837 from falsifian/apt-offline
apt-offline: offline APT package manager
2014-03-10 21:39:43 +01:00
Eelco Dolstra e167cf9f21 Make appendToName do the right thing
I.e. append a suffix *before* the version, rather than after.  So we
get "sqlite-interactive-3.8.0.2" instead of
"sqlite-3.8.0.2-interactive".  The latter is broken since nix-env just
sees it the suffix as part of the version, so "nix-env -u" will
happily upgrade "sqlite-3.8.0.2-interactive" to "sqlite-3.9".
2014-03-10 15:01:56 +01:00
José Romildo Malaquias ab75d0fd77 Add romildo to maintainers list 2014-03-07 21:52:36 +01:00
Thomas Tuegel 9fab4366bf Add ttuegel to maintainers list 2014-03-07 14:49:48 +01:00
Eelco Dolstra ebe57b1ac8 Remove lib.typeOf
It clashes with builtins.typeOf.
2014-02-27 21:27:29 +01:00
Matthew Sackman 5e09175765 add serfdom (close #1672) 2014-02-27 19:18:28 +01:00
James Cook 2294553cb1 apt-offline: offline APT package manager 2014-02-25 21:33:51 -08:00
Ricardo M. Correia 6554a490f6 gradm, pax-utils, paxctl: Add myself as a maintainer 2014-02-22 20:17:00 +01:00
cillianderoiste f47d6a1314 Merge pull request #1792 from larkery/davmail-and-lxappearance
Add lxappearance and davmail
2014-02-20 23:08:04 +01:00
Shea Levy 83c98e4dd6 loaOf: Allow merging definitions from a list into other definitions IFF there is a name attribute 2014-02-20 10:40:49 -05:00
Tom Hinton f6ba040bdc Add me to maintainers list
Add a derivation for davmail
Add a derivation for lxappearance
Add both new derivations to all-packages
2014-02-20 09:49:50 +00:00
Eelco Dolstra 4a91cfd32b Add a global variable ‘inNixShell’
This is primarily useful in Nix expressions that are also intended to
be used by nix-shell.  It allows saying things like:

  buildInputs = [ ... ] ++ (if inNixShell then [ emacs ] else [ ]);

This should not be used in Nixpkgs (since the question of what
constitutes a useful nix-shell environment is very subjective).
2014-02-19 19:03:16 +01:00
Eelco Dolstra 484403bf0e Add a constant ‘nixpkgsVersion’
This makes it a bit easier to find out the current Nixpkgs version,
e.g.

  $ nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion
  "14.02.35657.66f51a9"
2014-02-19 19:03:16 +01:00
Austin Seipp fb2d903a63 Add myself to the maintainers list.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-02-18 04:36:00 -06:00
Domen Kožar 3f3a3ec24c Merge pull request #1755 from lethalman/baobab
baobab: new package
2014-02-15 22:32:31 +01:00
Luca Bruno 402c1d582e baobab: new package
Graphical application to analyse disk usage in any Gnome environment.

https://wiki.gnome.org/Apps/Baobab
2014-02-15 22:21:06 +01:00
Shea Levy c8f1a6ac1e Revert "Add nixosSubmodule option type"
Moving recent types work to a separate branch for now

This reverts commit ca1c5cfa8f.
2014-02-13 12:10:50 -05:00
Shea Levy 4fd825cc94 Revert "Add option type for a submodule with extra arguments"
Moving recent types work to a separate branch for now

This reverts commit 8764758044.
2014-02-13 12:10:50 -05:00
Shea Levy 220654e205 Revert "Add heterogeneousAttrsOf option type"
Moving recent types work to a separate branch for now

This reverts commit 3f70dabad3.
2014-02-13 12:10:50 -05:00
PkmX 5181713002 Add myself to maintainers and metadata to wqy-*. 2014-02-12 11:32:00 +08:00
cillianderoiste c75ce202e6 Merge pull request #1570 from rszibele/scite
Added SciTE 3.3.7.
2014-02-12 01:39:40 +01:00
Shea Levy 3f70dabad3 Add heterogeneousAttrsOf option type
It is parameterized by a function that takes a name and evaluates to the
option type for the attribute of that name. Together with
submoduleWithExtraArgs, this subsumes nixosSubmodule.
2014-02-11 14:59:24 -05:00
Shea Levy 8764758044 Add option type for a submodule with extra arguments 2014-02-11 14:39:46 -05:00
Shea Levy ca1c5cfa8f Add nixosSubmodule option type
Since NixOS modules expect special arguments, use a hack to provide them
2014-02-11 14:21:34 -05:00
Shea Levy 2deb26bd4a Pass lib to modules
Since mkOption, types, etc. are defined there, lib is really part of the interface
2014-02-11 13:51:54 -05:00
Shea Levy 84a7a09bc8 Try to improve naming of list elements in loaOf types
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-08 15:20:25 -05:00
Eelco Dolstra de9ed78ab2 cleanSources: Filter *.o and *.so 2014-02-06 12:30:26 +01:00
Eelco Dolstra 34638ebc1e cleanSource: Support Mercurial 2014-02-03 23:44:11 +01:00
Jaka Hudoklin 2778c00bfe amdadl-sdk: set license to unfree (close #1647)
We cannot auto build amdadl-sdk on hydra, so setting license to unfree disable
auto builds. I also remove amdadl license, because it's irrelevant.

vcunat changed string license to attribute.
2014-01-31 18:39:21 +01:00
Linquize c27148d650 Add libcangjie 2014-01-30 17:33:34 +01:00
Moritz Maxeiner b0d2f0e3f0 Add myself as a maintainer for ykpers and libyubikey 2014-01-29 18:05:17 +01:00
rszibele 1d50967424 Added SciTE 3.3.7. 2014-01-23 10:35:02 +01:00
Peter Simons 43d59a9a3b lib/maintainers.nix: add missing entry for 'sprock' 2014-01-20 18:18:35 +01:00
Eelco Dolstra 8890492872 openjdk: Ugly hack to fix nix-env installation
Nix-env always wants to install all outputs of a derivation, but this
failed for openjdk/openjre because openjdk has some symlinks (such as
bin/java) to openjre.  Also, it prevents installing the openjre
without the openjdk.  So as a workaround, mess with the "outputs"
attribute to fool nix-env.

Also, give openjre a separate name and description.

Fixes #1535.
2014-01-20 14:58:09 +01:00
Georges Dubus 2a0f1cd6f1 rust: Add 2014-01-19 17:30:36 +01:00
Matej Cotman 7d4d3536f7 connman: new packages ConnMan v1.20 and connman-ui 2014-01-11 20:22:53 +01:00
Ian-Woo Kim 398ae63aa6 haskell-poppler package is added. 2014-01-08 17:32:15 +01:00
Tomasz Kontusz fc55c71fb8 Add platforms and maintainers to d-feet. 2014-01-06 00:48:23 +01:00
Evgeny Egorochkin bdfcda81e7 add lowPrioSet and hiPrioSet functions to enable changing of priorities of attrsets with packages such as kde. 2013-12-26 04:22:29 +02:00
Shea Levy 3c5971692a Simplify crossLists
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-12 14:01:48 -05:00
Shea Levy a42508a8ba Add function to call a function with a cross-product of lists of arguments
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-12 13:10:41 -05:00
Vladimír Čunát 50493458bd gnome3.gnome-menus: fix file path, add maintainer
Also some whitespace nitpicks.
2013-12-07 14:04:50 +01:00
Thomas Bereknyei f2581d2894 Add alienfx. Only tested with M11x Made some corrections. Added meta-data Use more of the original makefile 2 space indent 2013-11-24 15:19:54 +01:00
zimbatm d33f1a218e Add myself to the maintainers. Hello NixOS ! 2013-11-17 19:53:54 +01:00
Eelco Dolstra a8b693fef7 Remove backward-compatible implementations of some primops
Nixpkgs requires at least Nix 1.2 anyway, so these are now useless.
2013-11-12 13:50:45 +01:00
Eelco Dolstra 785eaf2cea Add some primops to lib 2013-11-12 13:48:30 +01:00
cillianderoiste ed67672aac Merge pull request #1181 from Zoomulator/master
New application: Milkytracker v0.90.85
2013-11-07 02:54:32 -08:00
Kim Simmons db2075b6d8 Added milkytracker: Compiles and runs. 2013-11-07 11:05:13 +01:00
Eelco Dolstra 0296defd0c Remove some unsupported platforms 2013-11-04 21:11:00 +01:00
Eelco Dolstra a61b800da5 Fix backward compatibility with Nix < 1.6
"with" used to be less lazy, so don't rely on that.  Also don't use
the "<" operator.
2013-10-30 19:12:25 +01:00
Eelco Dolstra be5d3a59dd Clean up some option examples 2013-10-30 18:47:43 +01:00
Eelco Dolstra 70a2c54527 Strictly check the arguments to mkOption
And fix various instances of bad arguments.
2013-10-30 15:35:09 +01:00
Eelco Dolstra 800f9c2037 Show correct position info for errors in submodules
E.g.

  The unique option `fileSystems./.device' is defined multiple times, in `/etc/nixos/configuration.nix' and `/etc/nixos/foo.nix'.

This requires passing file/value tuples to the merge functions.
2013-10-30 14:57:43 +01:00
Eelco Dolstra c7f7ceefd6 Export only the files of the active definitions 2013-10-30 14:57:42 +01:00
Eelco Dolstra 89b1dd8dde Fix environment.checkConfigurationOptions
This requires delaying the declaredness check until later, otherwise
we get an infinite recursion querying
environment.checkConfigurationOptions.
2013-10-29 16:18:23 +01:00
Eelco Dolstra 85b69834e7 fixMergeModules shouldn't check whether options are declared 2013-10-29 14:34:39 +01:00
Eelco Dolstra be33a68177 Add fixMergeModules back in
NixOps uses it.
2013-10-29 14:23:10 +01:00
Eelco Dolstra 9143910139 Support module keys that are paths 2013-10-29 14:15:33 +01:00
Eelco Dolstra 0afdb1e933 Add option type "str" for unique strings
An annoying and dangerous property of "types.string" is that it merges
multiple definitions by concatenating them, which almost never
produces a sensible result.  (Those options for which it does make
sense typically should use "types.lines" instead, and things only work
because the option definitions already end in a newline.)  Of course,
you can use "types.uniq types.string", but that's rather verbose, and
inconsistent with other basic types like "types.int".

Changing the behaviour of "types.string" to be unique by default is
not an option, given the large number of options that use it.  So
instead, we now have "types.str", which is equivalent to "types.uniq
types.string".
2013-10-29 13:45:30 +01:00
Eelco Dolstra adc1b38b85 Add a priority level for overrides in VM tests
Now that overriding fileSystems in qemu-vm.nix works again, it's
important that the VM tests that add additional file systems use the
same override priority.  Instead of using the same magic constant
everywhere, they can now use mkVMOverride.

http://hydra.nixos.org/build/6695561
2013-10-29 13:14:30 +01:00
Eelco Dolstra 3115addf4c Fix nixos-option
In particular, it no longer produces an "infinite recursion" error
when run with no arguments.
2013-10-28 22:45:58 +01:00
Eelco Dolstra c9dad37f01 Remove obsolete function addDefaultOptionValues 2013-10-28 22:45:58 +01:00
Eelco Dolstra 73f32d0375 Show precise error messages in option merge failures
For instance, if time.timeZone is defined multiple times, you now get
the error message:

  error: user-thrown exception: The unique option `time.timeZone' is defined multiple times, in `/etc/nixos/configurations/misc/eelco/x11vnc.nix' and `/etc/nixos/configuration.nix'.

while previously you got:

  error: user-thrown exception: Multiple definitions of string. Only one is allowed for this option.

and only an inspection of the stack trace gave a clue as to what
option caused the problem.
2013-10-28 22:45:57 +01:00
Eelco Dolstra 1b2006270f Support mkOverride in non-leaf nodes 2013-10-28 22:45:57 +01:00
Eelco Dolstra 1367074940 Allow imports in plain modules 2013-10-28 22:45:57 +01:00
Eelco Dolstra 1e24ce2a9b Remove debug code 2013-10-28 22:45:57 +01:00
Eelco Dolstra e28ea1239f Fix evaluation of environment.variables 2013-10-28 22:45:57 +01:00
Eelco Dolstra 9a8516438e Fix NixOps evaluation 2013-10-28 22:45:57 +01:00
Eelco Dolstra 44d6d88739 Fix option renaming 2013-10-28 22:45:56 +01:00
Eelco Dolstra d5047faede Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or
an apply function.
2013-10-28 22:45:56 +01:00
Eelco Dolstra f4a418761b Check for undeclared options 2013-10-28 22:45:56 +01:00
Eelco Dolstra c263b5b284 Show error locations in submodules 2013-10-28 22:45:56 +01:00
Eelco Dolstra 89bd18b3af Fix manual generation 2013-10-28 22:45:56 +01:00
Eelco Dolstra 3bfbdcdfbf Remove dead code 2013-10-28 22:45:56 +01:00
Eelco Dolstra b6b14dae78 Fix comment 2013-10-28 22:45:55 +01:00
Eelco Dolstra b479dac8df Inline some functions on the critical path 2013-10-28 22:45:55 +01:00
Eelco Dolstra 9769671260 Reduce the number of allocations a bit 2013-10-28 22:45:55 +01:00
Eelco Dolstra 40913958a2 Keep position information for option declarations and definitions
Also, when an option definition fails to type-check, print the file
name of the module in which the offending definition occurs, e.g.

  error: user-thrown exception: The option value `boot.loader.grub.version' in `/etc/nixos/configuration.nix' is not a integer.
2013-10-28 22:45:55 +01:00
Eelco Dolstra cfab329437 Use isType instead of typeOf 2013-10-28 22:45:55 +01:00
Eelco Dolstra 4b1a9dd00b Remove uses of mkFixStrictness
mkFixStrictness is no longer needed, woohoo!
2013-10-28 22:45:55 +01:00
Eelco Dolstra 0e333688ce Big cleanup of the NixOS module system
The major changes are:

* The evaluation is now driven by the declared options.  In
  particular, this fixes the long-standing problem with lack of
  laziness of disabled option definitions.  Thus, a configuration like

    config = mkIf false {
      environment.systemPackages = throw "bla";
    };

  will now evaluate without throwing an error.  This also improves
  performance since we're not evaluating unused option definitions.

* The implementation of properties is greatly simplified.

* There is a new type constructor "submodule" that replaces
  "optionSet".  Unlike "optionSet", "submodule" gets its option
  declarations as an argument, making it more like "listOf" and other
  type constructors.  A typical use is:

    foo = mkOption {
      type = type.attrsOf (type.submodule (
        { config, ... }:
        { bar = mkOption { ... };
          xyzzy = mkOption { ... };
        }));
    };

  Existing uses of "optionSet" are automatically mapped to
  "submodule".

* Modules are now checked for unsupported attributes: you get an error
  if a module contains an attribute other than "config", "options" or
  "imports".

* The new implementation is faster and uses much less memory.
2013-10-28 22:45:55 +01:00
Vladimir Still e329bb7877 maintainers: add vlstill. 2013-10-27 06:33:14 +02:00
Eelco Dolstra a4f1f4b367 Small cleanup 2013-10-24 14:49:59 +02:00
Eelco Dolstra d49f141a79 Manual: When building from the channel, link to the exact Git revision 2013-10-24 02:03:10 +02:00
Eelco Dolstra 6de7886fb8 Slightly improve option type error messages 2013-10-23 20:08:22 +02:00
Eelco Dolstra ec0911ce7f Manual: Don't show obsolete/deprecated options 2013-10-23 20:08:21 +02:00
Eelco Dolstra 29014a47fb Allow options to be marked as "internal"
This means they're not for end users.  Currently they're filtered from
the manual, but we could include them in a separate section.
2013-10-23 20:08:21 +02:00
Michael Raskin 5bbb1f77b2 Adding SlimerJS — script-driven Gecko browser 2013-10-21 00:30:39 +04:00
Eelco Dolstra ad0568e64a mkEnableOption: Add a period at the end of the description 2013-10-17 14:29:51 +02:00
Eelco Dolstra 04690da3bd Rename newOptionAttrSetToDocList -> optionAttrSetToDocList 2013-10-17 14:09:05 +02:00
Eelco Dolstra 5fef92c4a0 Move pkgs/lib/ to lib/ 2013-10-10 13:28:21 +02:00