Commit Graph

59198 Commits

Author SHA1 Message Date
Nicolas B. Pierron
ed91474e9b Share common code for merging option definitions.
This move idioms which were used in `evalOptionValue` and in the `merge`
functions of `listOf` and `attrsOf` types, such that we can use a names such
as `isDefined` and `optionalValue` instead or repeating identical
comparisons of `defsFinal == []`.
2015-03-12 23:42:58 +01:00
Nicolas B. Pierron
dd4f5f6b78 Rename mergeDefinitions internal steps to functions which are independent of each others. 2015-03-12 23:42:58 +01:00
Nicolas B. Pierron
83dc60456e Expose submodule arguments to builtins.functionArgs before applying the arguments.
The current implementation of the ApplyIfFunction is looking at the
arguments of a module to decide which arguments should be given to each
module.  This patch make sure that we do not wrap a submodule function in
order to keep functionArgs working as expected.
2015-03-12 23:42:58 +01:00
Nicolas B. Pierron
9f2865515d Fix infinite loop in fontconfig-ultimate.nix
With the new evaluation of arguments, pkgs is now defined by the
configuration, which implies that option declaration with pkgs.lib
will cause an infinite loop.
2015-03-12 23:42:58 +01:00
Shea Levy
3177d37652 Fix import using module args 2015-03-12 23:42:57 +01:00
Shea Levy
772b8869d2 Add comment about limitation on __internal.check 2015-03-12 23:42:57 +01:00
Shea Levy
f69ce50529 Move most extra args out of eval-config.nix 2015-03-12 23:42:57 +01:00
Shea Levy
0a0a29fd0b Add comments about the module system interface
Ideally the module system could be configured pretty much completely by
the contents of the modules themselves, so add comments about avoiding
complicating it further and possibly removing now-redundant
configurability from the existing interface.
2015-03-12 23:42:57 +01:00
Shea Levy
e3eff53037 evalModules: Add internal option for the check argument 2015-03-12 23:42:57 +01:00
Shea Levy
e4a06f35b1 nixos: Don't evaluate twice to get the value of config.nixpkgs 2015-03-12 23:42:57 +01:00
Shea Levy
1d62ad4746 modules.nix: Generate the extra argument set from the configuration
This allows for module arguments to be handled modularly, in particular
allowing the nixpkgs module to handle the nixpkgs import internally.
This creates the __internal option namespace, which should only be added
to by the module system itself.
2015-03-12 23:42:57 +01:00
Shea Levy
4f5c6330c9 types.loaOf: Update check function
This symplifies typechecking and allows properties to be used inside the
function body. It also makes possible checking the type of the result.
2015-03-12 23:42:57 +01:00
Shea Levy
8737d1783f types.attrsOf: Use mergeDefinitions to handle each element
This simplifes typechecking and allows properties to be used inside of
the attribute sets.

This fixes the empty synergy-client and synergy-server services
previously generated on systems with synergy disabled.
2015-03-12 23:42:57 +01:00
Shea Levy
e4bc2592f3 types.listOf: Use mergeDefinitions to handle each element
This simplifies typechecking and allows properties to be used inside the lists
2015-03-12 23:42:57 +01:00
Shea Levy
9255c48a06 Move property processing, type checking, and merge code into a function
This makes the relationship between property types clearer, and more
importantly will let option types parameterized by other option types
reuse the code for delegated type checking and merging.
2015-03-12 23:42:57 +01:00
Bob van der Linden
decf15fd57 grub: make sure grub builds again (close #6774) 2015-03-12 23:05:54 +01:00
Vladimír Čunát
208d1f24db xfce: more update fallout
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
2015-03-12 23:02:15 +01:00
Domen Kožar
9567ba4601 xfce: 4.10 -> 4.12 (close #6610) 2015-03-12 23:02:15 +01:00
aszlig
b40eee79a7
youtube-dl: Update to version 2015.03.09.
With the old version, not even YouTube videos are working anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-12 22:23:52 +01:00
Charles Strahan
4b2b30ea24 libtermkey: new package
Allows easy processing of keyboard entry from terminal-based programs.
2015-03-12 17:13:45 -04:00
Charles Strahan
c43b787f96 unibilium: new package
Unibilium is a very basic terminfo library. It doesn't depend on curses
or any other library. It also doesn't use global variables, so it should
be thread-safe.
2015-03-12 17:13:45 -04:00
William A. Kennington III
2ec1f1203b rsyslog: Make compatible with non-linux 2015-03-12 14:12:28 -07:00
Eelco Dolstra
ebef573641 Merge pull request #6476 from ts468/squashfs
Change kernel config: improve squashfs support of kernel
2015-03-12 21:41:53 +01:00
Pascal Wittmann
9cda91bcd8 pmd: update from 4.2.6 to 5.2.3 2015-03-12 21:19:49 +01:00
Pascal Wittmann
e0d91fa1b9 levmar: update from 2.5 to 2.6 2015-03-12 21:19:49 +01:00
Arseniy Seroka
efa28a05c7 Merge pull request #6775 from fredlebel/atom_0.187.0
Atom: updated to 0.187.0
2015-03-12 23:01:53 +03:00
Frederic LeBel
b9f0cfd85a Atom: updated to 0.187.0 2015-03-12 15:37:32 -04:00
William A. Kennington III
a5ae04f179 chromium: Update
Tested that chromium, chromiumBeta, chromiumDev all build
2015-03-12 12:32:32 -07:00
Vladimír Čunát
07e49e6952 libav*: maintenance updates, including security 2015-03-12 20:15:22 +01:00
Vladimír Čunát
263ac41c18 texLiveModerntimeline: fix download by updating
Unfortunately I only see them providing an unversioned tarball :-/
CC #6747.
2015-03-12 20:15:22 +01:00
Nikolay Amiantov
edaa3a7643 xorg-server: add Xephyr (close #6715) 2015-03-12 20:15:21 +01:00
William A. Kennington III
c32437b16e libressl: 2.1.3 -> 2.1.4 2015-03-12 11:37:27 -07:00
William A. Kennington III
42d985df99 rsyslog-light: Add derivation 2015-03-12 10:56:07 -07:00
Sander van der Burg
0bc51eacd9 dysnomia: bump development version 2015-03-12 16:40:34 +00:00
lethalman
14ed261fc7 Merge pull request #6765 from gebner/ibus-plugins
Add ibus-qt and ibus-anthy.
2015-03-12 14:35:23 +01:00
Luca Bruno
6cd99a4eb2 Revert "systemd: Only build on linux"
This reverts commit 4933a34279.
2015-03-12 13:08:42 +01:00
Peter Simons
39d397d578 Merge pull request #6767 from kirelagin/cupsd-cups
cupsd: rename `cupsd.service` to `cups.service`
2015-03-12 12:49:34 +01:00
Gabriel Ebner
2e8cbfbc58 Move ibus packages to the inputmethods directory. 2015-03-12 11:57:54 +01:00
lethalman
e8ff24b034 Merge pull request #6759 from bstrik/master
2 more windowmaker dockapps
2015-03-12 11:33:01 +01:00
Tobias Geerinckx-Rice
e19ab84435 encfs 1.8-rc1 -> 1.8 2015-03-12 11:18:58 +01:00
lethalman
50de6f7acf Merge pull request #6369 from mvcisback/funcy3
Allow funcy package to be built under python3 and python2
2015-03-12 10:29:10 +01:00
Kirill Elagin
356810b178 cupsd: rename cupsd.service to cups.service 2015-03-12 09:00:56 +03:00
William A. Kennington III
ce0a5ab6c2 rsyslog: 7.6.3 -> 8.8.0 2015-03-11 18:50:04 -07:00
William A. Kennington III
a5c221c299 rabbitmq-c: 0.4.1 -> 0.6.0 2015-03-11 18:50:04 -07:00
William A. Kennington III
bd43fc7103 czmq: Refactor 2015-03-11 18:50:04 -07:00
William A. Kennington III
e0ba90ba4e zeromq4: Refactor 2015-03-11 18:50:04 -07:00
William A. Kennington III
048148ad97 zeromq3: Refactor 2015-03-11 18:50:04 -07:00
William A. Kennington III
abb8507126 zeromq: Add default version 2015-03-11 18:50:04 -07:00
William A. Kennington III
94a4bce09d hiredis: Add derivation 2015-03-11 18:50:03 -07:00
William A. Kennington III
5545212000 libmongo-client: Add derivation 2015-03-11 18:50:03 -07:00