Commit Graph
100 Commits
Author SHA1 Message Date
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
Nicolas B. Pierron d7f29acd48 modules: Extract mkAliasDefinition from the rename.nix NixOS module. 2014-12-22 22:38:38 +01:00
Nicolas B. Pierron c184d7e7e0 Merge pull request #5421 from nbp/mkSink
modules: Add mkSinkUndeclaredOptions.
2014-12-22 11:59:42 -08:00
Nicolas B. Pierron 6a7971bee7 Merge pull request #5416 from nbp/nixos-option-include
nixos-option: Support -I option
2014-12-21 15:11:11 -08:00
Nicolas B. Pierron e4fb4168fc Merge pull request #5415 from nbp/nixos-options-submodules
nixos-option: Handle submodules
2014-12-21 15:10:46 -08:00
Nicolas B. Pierron 2f365923d6 modules: Add mkSinkUndeclaredOptions. 2014-12-21 14:50:46 +01:00
Nicolas B. Pierron 91cc22e841 Merge pull request #5405 from nbp/nixos-options-derivation
nixos-option: Print the outPath of derivation for option values.
2014-12-20 16:51:49 -08:00
Nicolas B. Pierron c231506b5a Merge pull request #5362 from nbp/update-channels
Add a script to add git branches for each channel.

To create / update references to remote / local channels, you have to run `./maintainers/scripts/update-channel-branches.sh` while you are at the top-level of nixpkgs work directory.  To make this convenient for Nixpkgs / NixOS developer, one can run the following command:

```
$ git config --add alias.fetch-channels '!sh -c "$(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh"'
```

Which will register the alias fetch-channels such that the script can used from sub-directory of nixpkgs by running `git fetch-channels`.
2014-12-20 16:49:18 -08:00
Nicolas B. Pierron 974edc5056 nixos-option: Use <nixpkgs/nixos> instead of <nixpkgs>. 2014-12-21 01:33:06 +01:00
Nicolas B. Pierron 82a5f54c0d nixos-option: Support -I option. 2014-12-20 20:30:19 +01:00
Nicolas B. Pierron c9682a22ff nixos-option: Produce nicer error messages in case of typos. 2014-12-20 19:52:28 +01:00
Nicolas B. Pierron 640428d3c5 nixos-option: Handle 'attrsOf submodule' options. 2014-12-20 19:16:43 +01:00
Nicolas B. Pierron cd2f7ce9f9 nixos-option: Improve error messages to avoid reporting internal location and traces. 2014-12-19 23:00:52 +01:00
Nicolas B. Pierron b2abfe54b3 nixos-option: Print derivation outPath within attribute sets and list, when the strict mode is used. 2014-12-19 23:00:00 +01:00
Nicolas B. Pierron 9db6a84f0b nixos-option: Print the outPath of derivation for option values. 2014-12-19 22:33:24 +01:00
Nicolas B. Pierron 9334085e80 update-channel-branches.sh: Add verbosity to improve the user experience, and update NixOS documentation. 2014-12-18 22:25:21 +01:00
Nicolas Pierron d7edec4888 Add other source of channels, and distinguish between local and remote channels. 2014-12-18 01:24:40 +00:00
Nicolas Pierron f0c21ab3f7 Add a script to add git branches for each channel. 2014-12-17 00:44:58 +00:00
Nicolas B. Pierron 42c3c205c4 Merge remote-tracking branch 'origin/master' into syncserver 2014-12-14 14:17:56 +01:00
Nicolas B. Pierron 28f4ef2a5f Disable configparser backport on pypy. 2014-12-13 22:26:13 +01:00
Nicolas B. Pierron 1a1fc17957 Firefox Sync Server: Create the private config file as non-world readable. 2014-12-12 22:14:38 +01:00
Nicolas B. Pierron a0154145d5 Firefox Sync Server: Fix copy&paste issue. 2014-12-12 22:13:03 +01:00
Nicolas B. Pierron 1532709854 paste-deploy: Remove unnecessary propagated build inputs. 2014-12-12 21:53:07 +01:00
Nicolas B. Pierron b4ab60cd5e configparser, konfig, umemcache and pybrowserid: Disable python 3 support. 2014-12-12 21:52:14 +01:00
Nicolas B. Pierron 0570a08b83 Merge remote-tracking branch 'origin/master' into syncserver 2014-12-11 23:49:19 +01:00
Nicolas B. Pierron 01886aef22 Add Firefox Sync server module. 2014-12-11 23:48:15 +01:00
Nicolas B. Pierron 0a0678cf5a Fix mozsvc, such that we can split public/private parts of the configuration of the syncserver. 2014-12-11 23:41:36 +01:00
Nicolas B. Pierron c74c6360e0 Fix konfig, in order to propagate its dependencies on configparser and argparse. 2014-12-11 23:40:34 +01:00
Nicolas B. Pierron 62e48b42d5 Merge pull request #5 from ametaireau/syncserver 2014-12-08 14:59:22 -08:00
Nicolas B. Pierron 428a83713b Add PasteScript 1.7.5 2014-12-08 22:26:28 +01:00
Nicolas B. Pierron bd68791d08 Merge pull request #2 from ametaireau/syncserver 2014-12-08 12:53:53 -08:00
Nicolas B. Pierron b8bb7e6db9 Add memcache 1.6.3 2014-12-08 21:25:04 +01:00
Nicolas B. Pierron 5f488a16ff Add tokenserver 1.2.11 2014-12-08 21:07:46 +01:00
Nicolas B. Pierron 498130be27 Merge pull request #1 from ametaireau/syncserver
Fix the sha256 for PyBrowserID
2014-12-08 11:27:28 -08:00
Nicolas B. Pierron bb02daf594 Add PyBrowserID 0.9.2 2014-12-08 20:15:48 +01:00
Nicolas B. Pierron e0a57ad7f1 Add mozservices 0.8 2014-12-08 20:05:14 +01:00
Nicolas B. Pierron 44fbef6d44 Add konfig 0.9 2014-12-08 20:04:57 +01:00
Nicolas B. Pierron 00913e355e Add configparser 3.3.0r2 2014-12-08 20:04:41 +01:00
Nicolas B. Pierron c4673962ed Add cornice 0.17.0 2014-12-08 20:04:25 +01:00
Nicolas B. Pierron 8caa0ea525 rr: Bump to version 2.0.0 and fetch it from github. 2014-11-30 17:20:34 +01:00
Nicolas Pierron 1b294105d7 libpfm & rr: Add packages. 2014-11-30 17:20:34 +01:00
Nicolas B. Pierron ccc089f601 Add python-bugwarrior 1.0.2. 2014-11-30 16:48:52 +01:00
Nicolas B. Pierron 43bbfae9e5 Add python-taskw 0.8.6. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron 82f42f38bf Bump Jinja2 to version 2.7.3. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron e778d5dcfb Add python-bugzilla 1.1.0. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron 9e4de80736 Add python-Twiggy 0.4.5. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron ca02c60cb8 Disable fuppes module
fuppes has not been compiling for a long moment, and the ffmpeg version on
which it depends is no longer listed in nixpkgs.
2014-09-11 23:46:20 +02:00
Nicolas Pierron 4ff1ab5a56 Remove types.functionTo. 2014-09-07 19:41:45 +02:00
Nicolas Pierron becde6132b Replace environment.profileVariables by environment.profileRelativeEnvVars 2014-09-07 19:41:00 +02:00
Nicolas Pierron b5f0cc3cda Merge options having the submodule type.
Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type.  If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.

In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
2014-09-07 19:03:20 +02:00
Nicolas Pierron bb944b4dc8 Annotate option-set options with the file in which they are declared.
This modification improves NixOS manual by listing in which file, each
submodule option is declared.  This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
2014-09-07 19:03:20 +02:00
Nicolas Pierron 79411db08b Export options.json & options.xml for building tools for NixOS. 2014-09-07 18:39:24 +02:00
Nicolas Pierron eb7a17a1cf Add error an message to prevent use of useless submodules. 2014-08-29 18:54:15 +02:00
Nicolas Pierron 8c19690d99 Remove useless use of optionSet. 2014-08-29 18:43:03 +02:00
Nicolas Pierron 43e52ef001 Remove useless use of undocumented submodules. 2014-08-29 18:28:34 +02:00
Nicolas Pierron 7b9fa26b10 Quote paths from example & default attributes. 2014-08-28 08:36:55 +02:00
Nicolas Pierron 873ab39401 NixOS: Add meta.maintainer option to modules. 2014-08-25 01:04:39 +02:00
Nicolas Pierron 7a4cf21350 Add git-bz nix expression.
svn path=/nixpkgs/trunk/; revision=33801
2012-04-15 23:48:16 +00:00
Nicolas Pierron 7b7dd238fc Add dulwich (git filesystem in python).
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
Nicolas Pierron 811b035171 Mercurial: Support ssl and curses python packages for fast-export and crecord.
svn path=/nixpkgs/trunk/; revision=33799
2012-04-15 23:48:07 +00:00
Nicolas Pierron 82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Nicolas Pierron 6a9ac1f016 Add opentyrian game.
svn path=/nixpkgs/trunk/; revision=33797
2012-04-15 23:38:38 +00:00
Nicolas Pierron 8a67709183 Add mkMerge and obsolete mkThenElse.
svn path=/nixpkgs/trunk/; revision=33796
2012-04-15 23:31:48 +00:00
Nicolas Pierron 338bc7b9f8 Fix nixos-option without argument.
svn path=/nixos/trunk/; revision=31139
2011-12-29 06:33:34 +00:00
Nicolas Pierron e264d1ab79 Convert users.extraUsers to an option set and add support for openssh
authorized_keys file generation.

svn path=/nixos/trunk/; revision=30611
2011-11-29 06:08:55 +00:00
Nicolas Pierron 262e883554 Add more options for LDAP module. (timeLimit, bind.timeLimit, bind.policy)
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=30138
2011-10-30 18:46:31 +00:00
Nicolas Pierron 87bf637319 Mercurial: Give access to ssl and curses python packages for
fast-export and crecord.

svn path=/nixpkgs/trunk/; revision=29972
2011-10-22 15:41:20 +00:00
Nicolas Pierron 38bc39c299 Add support for NFS root file system.
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29855
2011-10-15 21:01:30 +00:00
Nicolas Pierron 47a1941696 LDAP non-anonymous bind.
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29563
2011-10-02 13:24:10 +00:00
Nicolas Pierron 9cd0f7ed09 nix-prefetch-git: remove .git in the cloned directory. (Fix issue 116)
svn path=/nixpkgs/trunk/; revision=29077
2011-09-07 10:02:17 +00:00
Nicolas Pierron 0608f1a9b5 nix-prefetch-git: Display usage message if missing builder arguments are
missing.

svn path=/nixpkgs/trunk/; revision=29076
2011-09-07 10:02:14 +00:00
Nicolas Pierron 5f5a47fc76 nix-prefetch-git: Remove missleading option name.
svn path=/nixpkgs/trunk/; revision=29075
2011-09-07 10:02:12 +00:00
Nicolas Pierron 6669cf61f4 Add merge capabilities to nixpkgs.config option.
svn path=/nixos/trunk/; revision=29021
2011-09-05 09:19:59 +00:00
Nicolas Pierron def746fcdd Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode).
svn path=/nixos/trunk/; revision=29020
2011-09-05 09:19:55 +00:00
Nicolas Pierron 51ccaadce3 Thunderbird 5.x: Add Linux as a build platform.
svn path=/nixpkgs/trunk/; revision=29019
2011-09-05 08:33:07 +00:00
Nicolas Pierron ad416e1cff Add additional Intel firmwares (naming iwlwifig2{a,b}-ucode).
svn path=/nixpkgs/trunk/; revision=29018
2011-09-05 08:33:03 +00:00
Nicolas Pierron 174153238a rdiff-backup: Fix nix expression.
svn path=/nixpkgs/trunk/; revision=29017
2011-09-05 08:32:55 +00:00
Nicolas Pierron d528cba5b8 fetchgit: Handle https.
svn path=/nixpkgs/trunk/; revision=28857
2011-08-28 16:03:14 +00:00
Nicolas Pierron b14e107495 Doc: Fix location of thunderbird (2.x -> 3.x) expression.
svn path=/nixpkgs/trunk/; revision=28851
2011-08-27 15:29:18 +00:00
Nicolas Pierron 6e9492d7fd Fix mozilla urls.
svn path=/nixpkgs/trunk/; revision=28850
2011-08-27 15:29:13 +00:00
Nicolas Pierron fb3a64c934 Gdb: Remove un-neccessary --with-python.
svn path=/nixpkgs/trunk/; revision=28849
2011-08-27 15:29:04 +00:00
Nicolas Pierron 2defa3e715 Follow Mozilla homepages migrations. (.com -> .org)
svn path=/nixpkgs/trunk/; revision=28722
2011-08-21 15:44:53 +00:00