Nicolas B. Pierron
a3beabf327
Merge pull request #53397 from cdepillabout/aliasoptionmodule-set-priority
...
lib/modules: Add function to create option alias that respects priority
2019-01-14 20:28:28 +01:00
Nicolas B. Pierron
e2f8fa37f2
Flag my-self as owner of Nixpkgs and NixOS internals
2017-11-01 11:48:35 +01:00
Nicolas B. Pierron
1d56d0c8a7
types.submodule: Fix the NixOS Manual, by escaping the <> symbols.
2017-10-30 17:52:00 +00:00
Nicolas B. Pierron
d8987135c2
types.submodule: Replace a friendly comment by a more gentle one.
2017-10-30 13:06:18 +01:00
Nicolas B. Pierron
5442484c5f
Update Mozilla Software Releases sub-key.
...
This commit update the Mozilla Software Releases, with the key found at:
https://gpg.mozilla.org/pks/lookup?search=Mozilla+Software+Releases+%3Crelease%40mozilla.com%3E&op=vindex
2017-07-18 00:13:08 +02:00
Nicolas B. Pierron
0214d94b24
Remove extra "in" keyword from the release notes about overlays.
...
Thanks to @teh for reporting this issue on the pull request.
2017-01-17 21:24:44 +00:00
Nicolas B. Pierron
5c6bcee944
Fix #18316 - Revert #14398 , Using self prevent aliasing overriden packages.
2016-09-10 14:05:02 +00:00
Nicolas B. Pierron
48972763c8
Remove pkgs aliases ( #14398 )
...
* Security: Remove pkgs aliases of amdappssdk.
* Security: Remove pkgs aliases of amule.
* Security: Remove pkgs aliases of androidnenv.
* Security: Remove pkgs aliases of apacheAnt.
* Security: Remove pkgs aliases of apacheHttp.
* Security: Remove pkgs aliases of apparmor.
* Security: Remove pkgs aliases of ardour.
* Security: Remove pkgs aliases of arduino.
* Security: Remove pkgs aliases of aria.
* Security: Remove pkgs aliases of asciidoc.
* Security: Remove pkgs aliases of aterm.
* Security: Remove pkgs aliases of atlas.
* Security: Remove pkgs aliases of automake.
* Security: Remove pkgs aliases of awesome.
* Security: Remove pkgs aliases of backintime.
* Security: Remove pkgs aliases of binutils.
* Security: Remove pkgs aliases of bison.
* Security: Remove pkgs aliases of bitcoin.
* Security: Remove pkgs aliases of bittorrentSync.
* Security: Remove pkgs aliases of bleuz.
* Security: Remove pkgs aliases of boolector.
* Security: Remove pkgs aliases of boost.
* Security: Remove pkgs aliases of cabal, ghc and stack.
* Security: Remove pkgs aliases of cabal2nix.
* Security: Remove pkgs aliases of cassandra.
* Security: Remove pkgs aliases of cdparanioa.
* Security: Remove pkgs aliases of ceph-dev.
* Security: Remove pkgs aliases of chromium.
* Security: Remove pkgs aliases of clangSelf.
* Security: Remove pkgs aliases of clementine.
* Security: Remove pkgs aliases of clucene_core.
* Security: Remove pkgs aliases of cmake.
* Security: Remove pkgs aliases of conkeror.
* Security: Remove pkgs aliases of construo.
* Security: Remove pkgs aliases of crafty.
* Security: Remove pkgs aliases of crawl.
* Security: Remove pkgs aliases of cryptol.
* Security: Remove pkgs aliases of cudatoolkit.
* Security: Remove pkgs aliases of curl.
* Security: Remove pkgs aliases of darcs.
* Security: Remove pkgs aliases of db.
* Security: Remove pkgs aliases of dblatex.
* Security: Remove pkgs aliases of dbus.
* Security: Remove pkgs aliases of devicemapper.
* Security: Remove pkgs aliases of dfilemanager.
* Security: Remove pkgs aliases of djview.
* Security: Remove pkgs aliases of dmtx.
* Remove useless callPackage above dmtx-utils.
* Security: Remove pkgs aliases of docbook.
* Security: Remove pkgs aliases of doxygen.
* Security: Remove pkgs aliases of drive.
* Security: Remove pkgs aliases of dwarf-fortress.
* Remove useless override function call on dwarf-fortress.
* Use inherit to copy attributes of dwarf-fortress-packages.
* Security: Remove pkgs aliases of eject.
* Security: Remove pkgs aliases of emacs.
* Security: Remove pkgs aliases of erlang.
* Security: Remove pkgs aliases of fam.
* Security: Remove pkgs aliases of faust.
* Security: Remove pkgs aliases of ffmpeg.
* Security: Remove pkgs aliases of fftw.
* Security: Remove pkgs aliases of firefox.
* Security: Remove pkgs aliases of flashplayer-standalone.
* Security: Remove pkgs aliases of fuseki.
* Replace callPackage by callPackages for apparmor's derivations.
* Security: Remove pkgs aliases of gcc-arm-embedded.
* Security: Remove pkgs aliases of gdbGuile.
* Security: Remove pkgs aliases of gecode.
* Remove useless makeOverridable from geoipWithDatabase.
* Remove useless makeOverridable from geoipWithDatabase.
* Security: Remove pkgs aliases of ghostscriptX.
* Security: Remove pkgs aliases of giflib.
* Security: Remove pkgs aliases of gimp.
* Security: Remove pkgs aliases of gitAndTools.
* Security: Remove pkgs aliases of glfw.
* Security: Remove pkgs aliases of glib.
* Security: Remove pkgs aliases of gmp.
* Security: Remove pkgs aliases of gnome.
* Security: Remove pkgs aliases of gnumake.
* Security: Remove pkgs aliases of gnupg.
* Security: Remove pkgs aliases of gnuplot.
* Security: Remove pkgs aliases of gnutls.
* Security: Remove pkgs aliases of go.
* Security: Remove pkgs aliases of google-chrome.
* Security: Remove pkgs aliases of gpm.
* Security: Remove pkgs aliases of qt5.
* Security: Remove pkgs aliases of grub2.
* Security: Remove pkgs aliases of gtk.
* Security: Remove pkgs aliases of gtk-sharp.
* Security: Remove pkgs aliases of guile.
* Security: Remove pkgs aliases of hdf5.
* Security: Remove pkgs aliases of heyefi.
* Security: Remove pkgs aliases of hiphopvm.
* Security: Remove pkgs aliases of hplip.
* Security: Remove pkgs aliases of icedtea_web.
* Security: Remove pkgs aliases of imagemagick.
* Security: Remove pkgs aliases of iperf.
* Security: Remove pkgs aliases of ipfs.
* Security: Remove pkgs aliases of isl.
* Security: Remove pkgs aliases of jackmix.
* Security: Remove pkgs aliases of jdk & jre.
* Security: Remove pkgs aliases of kde4.
* Security: Remove pkgs aliases of kodi.
* Security: Remove pkgs aliases of lcms.
* Security: Remove pkgs aliases of ledger.
* Security: Remove pkgs aliases of libaudit.
* Security: Remove pkgs aliases of libav.
* Security: Remove pkgs aliases of libcanberra.
* Security: Remove pkgs aliases of libceph.
* Security: Remove pkgs aliases of libdbiDrivers.
* Security: Remove pkgs aliases of libdevil.
* Security: Remove pkgs aliases of liberation_ttf.
* Security: Remove pkgs aliases of libffado.
* Security: Remove pkgs aliases of libheimdal.
* Security: Remove pkgs aliases of libjack2.
* Security: Remove pkgs aliases of libjpeg.
* Security: Remove pkgs aliases of libkrb5.
* Security: Remove pkgs aliases of liblapack.
* Security: Remove pkgs aliases of liblrdf.
* Security: Remove pkgs aliases of libmusicbrainz.
* Security: Remove pkgs aliases of libnghttp2.
* Security: Remove pkgs aliases of libpng.
* Security: Remove pkgs aliases of librecad.
* Security: Remove pkgs aliases of libressl.
* Security: Remove pkgs aliases of libsysfs.
* Security: Remove pkgs aliases of libtool.
* Security: Remove pkgs aliases of libuv.
* Security: Remove pkgs aliases of libv4l.
* Security: Remove pkgs aliases of libwnck.
* Security: Remove pkgs aliases of libxfs.
* Security: Remove pkgs aliases of libxml2.
* Security: Remove pkgs aliases of lightdm.
* Security: Remove pkgs aliases of linuxHeaders.
* Security: Remove pkgs aliases of linux and linuxPackages.
* Security: Remove pkgs aliases of llvmPackages.
* Security: Remove pkgs aliases of llvm.
* Security: Remove pkgs aliases of love.
* Security: Remove pkgs aliases of lua.
* Security: Remove pkgs aliases of luaPackages.
2016-04-11 10:17:42 +01:00
Nicolas B. Pierron
ab707cf8df
Merge pull request #14549 from brandonedens/xserver-dpi
...
Add DPI option to xserver invocation.
2016-04-09 14:22:34 +02:00
Nicolas B. Pierron
411408f74c
Fix typo in service.syncthing.dataDir description.
2016-04-03 17:36:38 +00:00
Nicolas B. Pierron
cbca7d5707
Clean-up abc package expressions.
2016-04-02 17:56:32 +01:00
Nicolas B. Pierron
5d6a4a6fa9
Merge pull request #14000 from nbp/fix-extend
...
Use fix and extends functions for all-packages.nix
2016-03-24 20:54:20 +01:00
Nicolas B. Pierron
87ad35e336
Fix comments typos.
2016-03-24 19:40:12 +00:00
Nicolas B. Pierron
aa7f0fc214
Move stdenvOverrides under pkgsWithOverrides.
2016-03-20 19:26:57 +00:00
Nicolas B. Pierron
5ae7356d42
Replace the merge operators by the fix' and extends functions.
2016-03-20 19:23:08 +00:00
Nicolas B. Pierron
1bcefcdf5c
Under pkgsWithOverrides, replace the last uses of pkgs by the corresponding argument.
2016-03-20 19:18:33 +00:00
Nicolas B. Pierron
800766fb0b
Change the customOverrides to use the stdenvOverrides instead of the original package set.
2016-03-20 19:10:48 +00:00
Nicolas B. Pierron
21b8007bcf
Move the customOverrides after the stdenvOverrides.
...
This change is not backward compatible, in the sense that this allow you to
override the packages which used to be overriden by the last stage of
stdenv. Note, this does not mean that these packages would be used by
stdenv.
2016-03-20 19:04:15 +00:00
Nicolas B. Pierron
9e8c5208a1
Add bootStdenv condition around the overrider.
...
This condition used to be implicit in the sense that the stdenvOverrides
uses pkgs_6, instead of pkgs_7 as its super set, and also that each stage of
the compiler is build again the bootstrap packages of the previous stage,
thus overriden by the stdenv.override function.
2016-03-20 19:03:37 +00:00
Nicolas B. Pierron
598ed874df
Add extra argument to better identity with the extend function later.
2016-03-20 18:23:29 +00:00
Nicolas B. Pierron
a190baa479
In top-level/default.nix, rename self to allPackages.
2016-03-20 18:18:39 +00:00
Nicolas B. Pierron
5783f66bc8
Internalize the recursion over the set of all packages.
2016-03-20 18:17:35 +00:00
Nicolas B. Pierron
f8dedbb101
Build aliases based on the previous set including all-packages, instead of only using all-packages.
2016-03-20 18:02:28 +00:00
Nicolas B. Pierron
01693ac154
Move stdenvAdapaters attribute from all-packages.nix into the stdenvAdapters of the top-level.
2016-03-20 17:50:06 +00:00
Nicolas B. Pierron
ff72cf185e
Split helperFunctions to simplify the identification with the extend function.
2016-03-20 17:37:40 +00:00
Nicolas B. Pierron
5cdaa7b907
Remove all-packages.nix helperFunctions dependency.
2016-03-20 16:41:20 +00:00
Nicolas B. Pierron
ae0471b737
Split consecutive merge operators to simplify the identification of extend functions.
2016-03-20 16:40:36 +00:00
Nicolas B. Pierron
335a969d45
Inline pkgsFun in pkgsWithOverrides.
2016-03-20 16:33:46 +00:00
Nicolas B. Pierron
ad31783405
Extract the top-level logic out of all-packages.nix into pkgs/top-level/default.nix
2016-03-20 16:28:18 +00:00
Nicolas B. Pierron
a543a57ab5
Reformat pkgsWithOverrides to later facilitate the identitication with the extend functions.
2016-03-20 16:11:52 +00:00
Nicolas B. Pierron
07e549ee5b
Rename applyGlobalOverrides to pkgsWithOverrides
2016-03-20 16:11:51 +00:00
Nicolas B. Pierron
32e96bbb8b
Within applyGlobalOverrides, alias pkgsFun calls.
2016-03-20 16:11:51 +00:00
Nicolas B. Pierron
5e3ce6334c
Remove applyGlobalOverrides's pkgsOrig argument.
...
This patch change the behaviour or overridePackages:
- Before, overridePackages was based on top of the set of packages
overriden by `~/.nixpkgs/config.nix` file.
- After, overridePackages should when given a function f, behave almost¹
the same as-if the packageOverrides attribute of `~/.nixpkgs/config.nix`
file attribute was set to f, assuming that we ignore the extra `self`
argument.
¹ It is not yet exactly the same because we have many paths which are
re-entering nixpkgs while taking the default attributes, such as the
bootstrap phase of stdenv. Thus if the nixpkgs configuration overrides any
of the dependencies need for the bootstrap, then we might get different sha.
2016-03-20 16:11:51 +00:00
Nicolas B. Pierron
007500f2ec
Move the merge of the overrides from pkgsFun to applyGlobalOverrides.
2016-03-20 16:11:51 +00:00
Nicolas B. Pierron
054327729c
Move stdenvDefault into its own file.
2016-03-20 16:11:51 +00:00
Nicolas B. Pierron
f043ffcea4
Move the set of aliases after 'self', such that we can later use the extend function.
2016-03-20 14:52:28 +00:00
Nicolas B. Pierron
a09683ed29
Remove unused 'ncat' alias, as a package with the same name already exists.
2016-03-20 14:51:20 +00:00
Nicolas B. Pierron
0b67f7cb5d
Move tweakAlias function into the aliases.nix file, and rename it.
2016-03-20 14:50:27 +00:00
Nicolas B. Pierron
f7c86ee018
Move merge of stdenvDefault from the self attribute to the returned value of pkgsFun.
2016-03-20 14:31:27 +00:00
Nicolas B. Pierron
be3531a56e
Replace with statements of stdenvDefault to rely on pkgs instead of self.
2016-03-20 14:31:27 +00:00
Nicolas B. Pierron
020bb40454
Split stdenv attribute set.
...
Extract stdenvDefault from the set of all packages. As this set of
attributes are inter-dependant, probably due to stdenvOverrides, we have to
keep them in a close set of inter-dependent options.
I guess I will have to investigate more ...
2016-03-20 14:31:27 +00:00
Nicolas B. Pierron
7f3a4f4287
Swap conditions of stdenvOverrides to prevent infinite loops while evaluating stdenvCross.
...
While evaluating the derivation of xbursttools:
the condition `pkgs.stdenv ? overrides` causes the evaluation of
`stdenvCross`. This evaluation comes too early during the execution, as
it prevents the resolution of names such as `pkgs.lib`, and
`stdenvAdapaters.makeStdenvCross`, which we want to take from `pkgs`
instead of `self` in following patches.
By swapping the conditions, we effectively make the resolution of `pkgs.lib`
and `stdenvAdapaters.makeStdenvCross` possible through the pkgs attribute.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron
8d355b8d85
Under pkgsFun, expand self attribute, and rename self_ to self.
...
Note, the aliases are now computed against the set of packages defined in
the set of all packages, and no longer apply to any overriden package.
I think this is better as this reduces the amount of surprizes.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron
ffcb6682bc
Under pkgsFun, move the merge of helper functions from self_ to self.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron
a658645e1e
Remove with helperFunction above the list of all packages.
...
This modification change the names bound to the `helperFunctions` attribute
set, to be bound to `self` which is constructed by merging the same
`helperFunctions` set with the set of all packages.
This patch works as expected because none of the helperFunction names is
aliased by the name of a package.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron
a8374f2168
Under applyGlobalOverrides, inline mkOverrides in overrides.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron
71b2fd92b3
Move mkOverrides under applyGlobalOverrides.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron
acaa99cbd2
Move applyGlobalOverrides comment to stdenvOverrides, where it fits better.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron
00963c3dfd
Extract stdenvOverrides function out of mkOverrides function.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
a5188bda7b
Unify the applyGlobalOverride function with the overridePackages function.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
a6e260c91f
Add an extra argument to the overrider function of applyGlobalOverrides.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
f9a29887fe
Move pkgsOrig outside applyGlobalOverrides and provide it as argument.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
5f4cb91a1c
Move helperfunctions and stdenvAdapters under pkgsFun.
...
The `helperFunctions` and `stdenvAdapters` both use the `pkgs` attribute as
input, either to inherit some properties, either to use it as argument.
The `pkgs` binding used in both expressions of the `helperFunctions` and
`stdenvAdapters` is no longer the result of the `applyGlobalOverrides`
function, but the argument of the `pkgsFun` function.
The `pkgsFun` functions is called twice under `applyGlobalOverrides`, and in
both cases, the first argument of `pkgsFun` correspond to the result of
`applyGlobalOverrides`.
Thus, this modification will change the bindings, but the evaluation of
`<nixpkgs>`.
A third call the `pkgsFun` exists under `overridePackages` in the set of all
packages. Previously, the `helperFunctions` and `stdenvAdapaters` would use
the functions defined as part of the default `<nixpkgs>` set. With this
modification, the `helperFunctions` and the `stdenvAdapters` are now using
the fix-point of the newly evaluated package set.
This implies that this modification allow the user to use
`overridePackages`, which is already not recommended for performance
reasons, to override the inputs of the `helperFucntions` and
`stdenvAdapaters` too, where this was not possible before.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
11a566b5bc
Move 'with helperFunctions' above the set of all packages.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
a39c5ff0d8
Re-indent the top of pkgsFun.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
9444d6e6de
Split miss-indented last lines. to simplify future diffs.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron
804ade1c6d
Merge pull request #14029 from nbp/alias-packages
...
Move all aliases into their own file.
2016-03-18 21:22:50 +00:00
Nicolas B. Pierron
89f7dcaa21
Move all aliases into their own file.
2016-03-18 21:22:27 +00:00
Nicolas B. Pierron
1941c80610
rr: 4.0.3 -> 4.2.0
2016-03-18 16:01:14 +01:00
Nicolas B. Pierron
72c6f8a140
Ensure that we can evaluate the platform attribute of ocaml packages.
2016-03-13 19:08:26 +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
Nicolas B. Pierron
73630b8986
nsd service: add non-backward compatible release note entry
2016-02-28 09:18:39 +01:00
Nicolas B. Pierron
8fe518e763
Merge pull request #11291 from rvl/rl-longview
...
release-notes: add longview as a new service
2015-11-26 21:52:25 +00:00
Nicolas B. Pierron
21abe66d78
Merge pull request #11218 from ebzzry/typo-fix
...
Fixed typo in stdenv documentation.
2015-11-23 19:51:39 +00:00
Nicolas B. Pierron
946dbb4ea4
Merge pull request #11185 from CMCDragonkai/patch-1
...
Change the preset networking.hostId to use `mkDefault` so it can be easily changed by the user later.
2015-11-21 14:13:14 +00:00
Nicolas B. Pierron
4e61fc89d2
Merge pull request #11106 from nbp/nixos-reentry
...
Add a way to pin a NixOS version within the module system.
2015-11-20 20:11:21 +00:00
Nicolas B. Pierron
a5992ad61b
Add a way to pin a NixOS version within the module system.
...
This modification add a way to re-evaluate the module system with a
different version of NixOS, or with a different set of arguments.
2015-11-19 20:58:45 +00:00
Nicolas B. Pierron
13a379cfa2
Merge pull request #10672 from wizeman/u/upd-rr
...
rr: 3.0.0 -> 4.0.0
2015-11-05 14:21:25 +00:00
Nicolas B. Pierron
50146ce815
Add pkgs module argument documentation for #6794 incompatible change.
2015-09-30 21:13:42 +02:00
Nicolas B. Pierron
03fb785b5c
Merge pull request #9497 from joachifm/fuppes-broken
...
fuppes: mark as broken
2015-08-28 20:51:42 +02:00
Nicolas B. Pierron
bb81ba7ef6
sane-config: Prevent find warnings by moving maxdepth argument first.
2015-08-23 13:55:25 +02:00
Nicolas B. Pierron
f8caa49f00
sane-config: Merge /etc/sane.d/dll.conf content.
2015-08-23 13:54:34 +02:00
Nicolas B. Pierron
77250457bc
Merge pull request #9183 from nbp/option-usage
...
Update option-usages.nix expression to work with newer version of the module system.
2015-08-15 12:29:32 +02:00
Nicolas B. Pierron
c47e89623b
Update option-usages.nix expression to work with newer version of the module system.
2015-08-09 17:52:34 +02:00
Nicolas B. Pierron
da74a8dc35
Merge pull request #9166 from taku0/thunderbird-38.1.0
...
thunderbird: 31.7.0 -> 38.1.0
2015-08-08 18:46:05 +02:00
Nicolas B. Pierron
d460e1b5c2
freeciv: change the naming scheme to add build annotations before the version number.
2015-08-08 16:54:28 +02:00
Nicolas B. Pierron
256c4996c4
freeciv: 2.4.0 -> 2.5.0
2015-08-07 17:41:12 +02:00
Nicolas B. Pierron
37dad0ee0b
Merge pull request #8814 from nbp/module-arg-context
...
NixOS modules: Add error context on module arguments evaluation.
2015-07-14 16:35:01 +02:00
Nicolas B. Pierron
a6b455bbae
NixOS modules: Add error context on module arguments evaluation.
2015-07-14 15:07:54 +02:00
Nicolas B. Pierron
ff8b35a643
Merge pull request #8806 from nbp/issue-8152
...
Issue 8152 - Reduce number of attribute sets created by replaceChars.
2015-07-14 12:34:36 +02:00
Nicolas B. Pierron
be65ac7c32
Issue 8152 - Reduce number of attribute set created by replaceChars.
2015-07-13 23:46:38 +02:00
Nicolas B. Pierron
7585d42d2b
Fix #7354 - Accept _module attributes added to every submodule.
2015-04-20 23:58:32 +02:00
Nicolas B. Pierron
9647a72835
Fix amazon default configuration.nix file.
2015-04-09 22:18:13 +02:00
Nicolas B. Pierron
c653111167
Merge pull request #7278 from nbp/nixos-manual-x86
...
Fix NixOS Manual builds
2015-04-08 14:24:23 -07:00
Nicolas B. Pierron
296e6c4991
Fix #7252 - NixOS Manual: Carry the current system value to evaluation of the manual.
2015-04-08 23:14:19 +02:00
Nicolas B. Pierron
3eef61a6eb
NixOS Manual: Do not use unfree packages as default value.
2015-04-08 23:14:19 +02:00
Nicolas B. Pierron
889f72bad4
Merge pull request #6794 from nbp/module-system-tweaks
...
Module system improvements
2015-04-03 14:22:33 -07:00
Nicolas B. Pierron
6de931a0f8
Merge rename.nix changes.
2015-04-03 23:12:12 +02:00
Nicolas B. Pierron
7f1a782d91
Add tests for the new module system improvements.
2015-03-16 22:38:41 +01:00
Nicolas B. Pierron
05e8a48fb4
Document and rename internal option of modules.
2015-03-15 14:45:42 +01:00
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
Nicolas B. Pierron
7699f34c52
Merge pull request #6242 from nbp/issue-6161
...
Issue #6161 - Add tests for NixOS modules.
2015-02-23 12:12:01 -08:00
Nicolas B. Pierron
de0f122b01
Issue #6161 - Register lib tests as release blockers.
2015-02-09 00:07:44 +01:00
Nicolas B. Pierron
6d15e32536
Issue #6161 - Add tests for NixOS modules.
2015-02-09 00:07:44 +01:00
Nicolas B. Pierron
8196727fad
Improve the documentation of the syncserver module.
2015-01-18 12:21:23 +01:00
Nicolas B. Pierron
0d13ea0131
Change default syncserver listen.port to a safer one.
2015-01-18 12:20:44 +01:00
Nicolas B. Pierron
816229593a
Merge pull request #5441 from nbp/mkAlias
...
modules: Extract mkAliasDefinition from the rename.nix NixOS module.
2015-01-01 06:59:42 -08:00