mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Code Issues Wiki Activity
86273 commits 256 branches 124 tags 5.2 GiB
Commit graph

339 commits

Author SHA1 Message Date
Gaëtan André 099712f78d nixos-manual: fix incomplete container doc 2015-12-09 17:06:27 +01:00
Nikolay Amiantov ca3b47cccc release-notes: mention bumblebee changes 2015-12-08 18:54:02 +03:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát 8d62b2b8fa nixos/release notes: explain removal of tidy-html5 
This belongs to 81b9cc6f54.
 2015-11-29 13:50:55 +01:00
Rodney Lorrimar 27e621a60e release-notes: add longview as a new service 2015-11-26 21:43:11 +00:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
zimbatm ad2a4ab24c ruby: remove insecure 1.8.7, fixes #11194 
1.8.x is unsupported and is probably insecure.

This also simplifies things a little bit
 2015-11-25 12:10:03 +01:00
zimbatm e7cd9077a8 s3sync: delete dead project 
According to http://s3sync.net/wiki.html, https://github.com/ms4720/s3sync was
supposed to take over the development but nothing has happened in 4 years.

The project is unfortunately dead and is our only dependency to ruby 1.8.
 2015-11-25 11:51:09 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01: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
Hajo Möller f1ac7bf80a nixos manual: point to NixOps' homepage, not Github 2015-11-14 17:17:29 +01:00
Nikolay Amiantov 7487aba1a8 manual: document nginx changes 2015-11-02 01:15:48 +03:00
Vladimír Čunát 91dced6ba0 nixos/manual: installation iso logs in automatically 2015-10-11 13:37:19 +02:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
 2015-10-05 13:44:16 +02:00
Luca Bruno e9b3a4f7c4 rl-1509.xml: Gnome -> GNOME 2015-10-01 12:53:27 +02:00
Domen Kožar aca373c6b2 typos 2015-09-30 21:26:41 +02:00
Nicolas B. Pierron 50146ce815 Add pkgs module argument documentation for #6794 incompatible change. 2015-09-30 21:13:42 +02:00
Eelco Dolstra 5374c07c15 Tweak release notes 2015-09-30 19:30:07 +02:00
Domen Kožar 187854fced update release notes for 15.09 
(cherry picked from commit e13b657670)
 2015-09-30 19:28:16 +02:00
Peter Simons ece50d57ce rl-1509.xml: update Haskell-related release notes 
- Update the link to the manual to refer to the proper place.
 - Mention LTS Haskell and Stackage Nightly.
 - Minor cosmetic to improve readability.
 2015-09-30 16:17:05 +02:00
Vladimír Čunát 6070cd09fc haskell: make ghc, cabal-install, and stack visible 
Thanks to @peti. Close #10035.
 2015-09-27 17:18:44 +02:00
aszlig 39a03b679a
release-notes/15.09: Document changes for vboxsf. 
Since 74209a4 we have initial support for the "vboxsf" (VirtualBox
shared folder) file system support. This will be cherry-picked to
release-15.09 so we need to notice people about the change.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-26 11:02:05 +02:00
aszlig 02c2500195
release-notes/15.09: Use <option/> for options. 
There were quite a few configuration options which were tagged via
<literal/>, so in order to keep consistency with other docbook manuals
in the source tree, let's use <option/> here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-26 11:01:37 +02:00
Vladimír Čunát 48200a96e0 doc/release notes (15.09): mention texlive 2015-09-25 14:24:47 +02:00
Eelco Dolstra 5b8dae8ef3 Prevent future store path references in the manual 2015-09-24 11:51:26 +02:00
Vladimír Čunát 9bd0bac311 nixos/manualPDF: use new texlive instead of tetex 
This includes updating dblatex and crafting ~100 MB TeX package set
to make our manual compile.
 2015-09-23 21:14:16 +02:00
Eelco Dolstra ddb39be324 Update 15.09 release notes 2015-09-21 11:17:25 +02:00
Eelco Dolstra 9c146220a9 Style / typo fixes 2015-09-21 11:17:25 +02:00
Edward Tjörnhammar 533a2799bc release-notes: properly close the item list 2015-09-21 05:36:10 +02:00
Edward Tjörnhammar 122d5e497e Remove Gitit from the list of evaluated modules 2015-09-20 21:40:16 +02:00
Kovacsics Robert (NixOS-SSD2) b22e6cb299 wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609 
wiimenu superseded by wimenu from wmii
wmiiSnap superseded by wmii_hg
libixp_for_wmii superseded by libixp_hg
 2015-09-03 12:58:24 +02:00
Eelco Dolstra e70f8c58cc Manual: Document system.autoUpgrade 2015-09-02 16:17:32 +02:00
Bjørn Forsman bd84ebaa1e nixos: document nvidia legacy driver options 2015-09-02 13:25:50 +02:00
Eelco Dolstra d4ccd68648 Rename rl-unstable.xml -> rl-1509.xml 2015-08-27 11:50:45 +02:00
Nikolay Amiantov 89a2f87011 elm: add the platform and helpful scripts 2015-08-17 21:32:30 +03:00
aszlig 6440e9bbfd
nixos/vbox: Move all options to virtualisation.*. 
Commit 687caeb renamed services.virtualboxHost to programs.virtualbox,
but according to the discussion on the commit, it's probably a better to
put it into virtualisation.virtualbox instead.

The discussion can be found here:

https://github.com/NixOS/nixpkgs/commit/687caeb#commitcomment-12664978

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-08-13 12:28:24 +02:00
Vladimír Čunát f4dc055689 nixos/release-notes: mention unification of channels 2015-08-12 06:54:37 +02:00
Vladimír Čunát 2bdd4aa1cb nixos/release-notes: move "new services" section 
It seems much less important than incompatible changes (though it's shorter).
 2015-08-12 06:41:55 +02:00
Eelco Dolstra 214d4fb73c Allow options with type "package" to be store paths 
For example, this allows writing

  nix.package = /nix/store/786mlvhd17xvcp2r4jmmay6jj4wj6b7f-nix-1.10pre4206_896428c;

Also, document types.package in the manual.
 2015-08-07 03:09:57 +02:00
Eelco Dolstra 2cd7c1f198 Unify NixOS and Nixpkgs channel structure 
This is primarily to ensure that

  -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz

and

  -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz

and

  -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz

behave consistently.

It also allows installing packages via "nix-env -iA nixos.<pkg>"
rather than "nixos.pkgs.<pkg>". It would be even better to allow
"nixpkgs.<pkg>", but that requires a change to nix-channel.

Fixes #7659.
 2015-08-05 17:37:11 +02:00
Eelco Dolstra b3d8d750de Remove /etc/nixos/nixpkgs from $NIX_PATH 
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
 2015-08-05 14:34:33 +02:00
Eelco Dolstra ff4e92f2cc Spelling etc 2015-08-03 13:48:43 +02:00
Profpatsch 8c652379df locate: option includeStore 2015-08-02 01:04:13 +02:00
Eelco Dolstra bb9aff2f0c Manual: Don't render types as strings 2015-07-30 13:44:54 +02:00
Eelco Dolstra f463d24903 Add read-only options 
These are options that can have only one definition, regardless of
priority.
 2015-07-30 13:44:50 +02:00
Eelco Dolstra d61e1b24e6 Fix indentation 2015-07-30 13:44:47 +02:00
Eelco Dolstra a5b83c3573 sshd: Use RSA and ED25519 host keys 
Closes #7939.
 2015-07-27 20:30:10 +02:00
Eelco Dolstra e3a5bca4ae Require signed binary caches by default 2015-07-27 20:30:09 +02:00
Eelco Dolstra 6948c3ab80 Installer: Add nomodeset and blacklist the nouveau driver 
I observed a hang at the moment the nouveau driver gets loaded on a
GTX 970.
 2015-07-25 19:06:07 +02:00
Eelco Dolstra 1a03de173b Move release notes to an appendix and a separate chunk 2015-07-22 16:21:32 +02:00
Eelco Dolstra 48a25dc899 Manual: Reduce chunking 
Fixes #7607.
 2015-07-22 16:21:32 +02:00
Eelco Dolstra 57e48df19e Remove non-incompatible changes from the list of incompatible changes 2015-07-22 15:17:01 +02:00
Eelco Dolstra 201f9beddb Don't enable cron by default 
The rationale for disabling this is: 1) systemd timers are better; 2)
it gets rid of one usually unnecessary process, which makes containers
more light-weight.

Note that cron is still enabled if services.cron.systemCronJobs is
non-empty, so this only matters if you have no declarative cron jobs
but do have user cron jobs.
 2015-07-22 15:15:09 +02:00
Luca Bruno fc5b0f826f release notes: phpfpm now using default php instead of php54 2015-07-17 18:18:43 +02:00
Eelco Dolstra c46e424c8f Remove obsolete reference to /media 2015-07-17 11:27:33 +02:00
Simon Vandel Sillesen 9dab1a840c tvheadend: init at 4.0.4 2015-06-24 13:22:09 +00:00
Travis B. Hartwell caa216b640 atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2 
Added systemd to buildEnv path because of new libudev dependency.
 2015-06-19 15:32:12 -06:00
Thomas Tuegel 2a2448bcb7 Merge pull request #8182 from ttuegel/openblas 
Numerical computing overhaul
 2015-06-12 08:06:03 -05:00
Thomas Tuegel c02dd4a726 Update release notes about OpenBLAS 2015-06-12 08:04:02 -05:00
William A. Kennington III 514a9fdf87 Merge pull request #8173 from dezgeg/pr-kernel-config 
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
 2015-06-07 10:14:51 -07:00
Eelco Dolstra 18b5bd8dca Add some info about editors 2015-06-04 14:32:10 +02:00
Tuomas Tynkkynen 9c2f2bc893 kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE 
Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS
systems to start in non-text mode as well. Enable FB_VESA to get a
framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y'
instead of the default 'm' to so the user doesn't need to manually load
the fbcon module anymore.

Other distros have similar defaults, at least on Arch:
    CONFIG_FB_VESA=y
    CONFIG_FRAMEBUFFER_CONSOLE=y
and on Ubuntu (12.04):
    CONFIG_FB_VESA=m
    CONFIG_FRAMEBUFFER_CONSOLE=y

Fixes #8139
 2015-06-04 11:26:20 +03:00
Peter Simons 789f20eba8 nixos release notes: document new services.openssh.moduliFile option 2015-06-01 15:20:18 +02:00
Peter Simons d4412bf6c4 nixos release notes: document incompatible changes due to Haskell NG 2015-06-01 15:19:53 +02:00
Peter Simons 4f0d8460c0 nixos release notes: add an item about Haskell NG 2015-06-01 14:43:40 +02:00
aszlig 8be00dc71d
nixos/test-driver: Make tesseract OCR optional. 
By default this is now enabled, and it has to be explicitely enabled
using "enableOCR = true". If it is set to false, any usage of
getScreenText or waitForText will fail with an error suggesting to pass
enableOCR.

This should get rid of the rather large dependency on tesseract which
we don't need for most tests.

Note, that I'm using system("type -P") here to check whether tesseract
is in PATH. I know it's a bashism but we already have other bashisms
within the test scripts and we also run it with bash, so IMHO it's not a
problem here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-05-22 07:21:58 +02:00
aszlig 8bd025a75e
nixos/test-driver: Add new waitForText function. 
As promised in the previous commit, this can be used similarly to
$machine->waitForWindow, where you supply a regular expression and it's
retrying OCR until the regexp matches.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-05-21 19:55:21 +02:00
aszlig 235c2228ca
nixos/test-driver: Add new getScreenText function. 
Basically, this creates a screenshot and throws tesseract at it to
recognize the characters from the screenshot. In order to produce a
result that is well enough, we're using lanczos scaling and scale the
image up to 400% of its original size.

This provides the base functionality for a new Machine method which will
be called waitForText. I originally had that idea long ago when writing
the VM tests for VirtualBox and Chromium, but thought it would be
disproportionate to the case.

The downside however is that VM tests now depend on tesseract, but given
the average runtime of our tests it really shouldn't have a too big
impact and it's only a runtime dependency after all.

Another issue is that the OCR process takes quite some time to finish,
but IMHO it's better (as in more deterministic) than to rely on sleep().

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-05-21 19:55:21 +02:00
Arseniy Seroka f134150180 Merge pull request #7857 from rushmorem/marathon-module-update 
Update Marathon module
 2015-05-21 16:52:14 +03:00
rushmorem b5820a5ebd Update Marathon module 
The new module makes it possible to pass extra commandline
arguments to Marathon as well as environment variables.
 2015-05-21 15:45:13 +02:00
Eelco Dolstra 10ce7ae769 Document the nixpkgs-channels repo 
This replaces update-channel-branches.sh with standard Git
invocations.
 2015-05-20 14:20:53 +02:00
Thomas Tuegel c59c20ca0f Update HPLIP to 3.15.4 2015-05-16 14:12:11 -05:00
Jascha Geerds 19dbe42aeb Revert "cups: Rename "browsing" config option to "advertise"" 
This reverts commit 48e65cec4e.
 2015-05-10 20:47:50 +02:00
Jascha Geerds 48e65cec4e cups: Rename "browsing" config option to "advertise" 2015-05-10 12:41:21 +02:00
Jascha Geerds 116006702b cups: Add changelog for the upcoming NixOS release 2015-05-10 12:41:21 +02:00
Bram Duvigneau e37dbea942 Document the brltty servicve in release notes 2015-05-01 00:08:48 +02:00
Domen Kožar f39b1ead2a manual: re-add running nixos tests sections 2015-04-21 02:28:59 -04:00
aszlig e6591588a9
releaso-notes: Document changes from #7349. 
Thanks to @domenkozar for implicitly reminding me that documentation is
probably our biggest issue. And I'm a dumbass for contributing to that
situation, so let's do better than that and document it.

The current changes are only preparation for a bigger change coming real
soon[TM] in Hydra and release-tools, so right now it's still a bit
tedious to create custom channels.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-04-15 21:48:16 +02:00
Luca Bruno fe6b0b15e6 nixos-install: support -j, --cores and --option. Closes #6755 2015-03-11 16:47:44 +00:00
Eelco Dolstra 8a9e427174 Manual tweak 2015-03-11 15:34:57 +01:00
Luca Bruno 6fdd92742c Document container@ systemd service 2015-03-10 16:23:00 +01:00
Eelco Dolstra a574065a81 nixos-rebuild: Add ‘dry-activate’ command 
‘nixos-rebuild dry-activate’ builds the new configuration and then
prints what systemd services would be stopped, restarted etc. if the
configuration were actually activated. This could be extended later to
show other activation actions (like uids being deleted).

To prevent confusion, ‘nixos-rebuild dry-run’ has been renamed to
‘nixos-rebuild dry-build’.
 2015-03-09 16:50:59 +01:00
Vladimír Čunát dfaded0b8e nixos docs: fix typo 2015-03-07 14:44:13 +01:00
Nikita Mikhailov 25e29b3870 Correct NetworkManager documentation 2015-02-24 22:09:36 +05:00
Nikolay Amiantov 540e3a63e4 manual/release-notes: add unstable release notes with first entries 2015-02-06 02:57:49 +03:00
aszlig 6308cba3fa
nixos/manual: Re-add development section. 
I think this has been accidentally dropped by a099ca4, at least there is
no reason stated, why it shouldn't be included, so I'm bringing it back.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-25 20:12:06 +01:00
Eelco Dolstra f637e27138 Fix release notes 2015-01-21 16:27:48 +01:00
Domen Kožar c876f7a25d document options to nixos-install script 2015-01-06 14:49:24 +01:00
Khalid Jebbari b385d14b81 Fix typo in recursive set example 2015-01-04 19:28:16 +01:00
Khalid Jebbari 1d3a592ae0 Bad name for the NixOS download page 2015-01-04 18:33:30 +01:00
Domen Kožar 79a51b0cf3 Add Type information into manual and manpages, fixes #4600 2015-01-04 15:41:32 +01:00
Eelco Dolstra c2af4f3ea8 Tweak 2014-12-31 01:29:05 +01:00
Vladimír Čunát 13d5f305da nixos/doc release notes: mention intel GPU driver 
(cherry picked from commit 3865ab9e69)
 2014-12-31 01:29:05 +01:00
aszlig d137ff33e2
nixos/release-notes: Fix typo in VirtualBox notes. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-12-30 23:42:14 +01:00
Eelco Dolstra 3370ee6a13 Document small channels 2014-12-30 22:31:27 +01:00
Eelco Dolstra cf1d9ed317 Release notes tweak 2014-12-30 18:43:13 +01:00
Eelco Dolstra 4df1ca0875 Sort stuff 2014-12-30 18:43:13 +01:00
Eelco Dolstra adf62ba9c1 Drop reference to obsolete ControlGroupAttribute option 2014-12-30 18:32:05 +01:00
Eelco Dolstra c502369a23 Release notes 2014-12-30 18:25:02 +01:00
Eelco Dolstra 5f2d5fcc12 Release date 2014-12-30 18:12:52 +01: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
aszlig efb2b27a8f
nixos: Add VBox hardening to 14.12 release notes. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-12-18 22:58:37 +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
Domen Kožar 3d5220e691 release notes: reindent, remove renames (redudant) 
(cherry picked from commit 8566f66ea4)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-18 12:22:22 +01:00
Domen Kožar 44af18f8ae update release notes 
(cherry picked from commit 33e9a0503a)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-18 12:22:17 +01:00
Eelco Dolstra 997531d172 Document screen incompatibility 2014-12-15 19:55:37 +01:00
Peter Simons 60f21f983f nixos/doc/manual/release-notes/rl-1412.xml: document change of default time zone 
https://github.com/NixOS/nixpkgs/pull/5332
 2014-12-15 16:38:04 +01:00
Domen Kožar 5d9b24e1ec typo 
(cherry picked from commit ad4e371acf)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-14 11:29:09 +01:00
Domen Kožar 48a282b913 http://nixos.org -> https://nixos.org 
(cherry picked from commit 78bb17dd22e4da4e3810fbc78185d73bb25ea73e)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-14 11:26:45 +01:00
Eelco Dolstra 4d918cb6c7 php-5.3: Remove 
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.
 2014-12-10 17:19:37 +01:00
Eelco Dolstra df1f751f03 Rename release notes 2014-12-10 17:19:37 +01:00
Eelco Dolstra faf0797c0c Use https://cache.nixos.org 2014-12-09 13:38:46 +01:00
cillianderoiste 9c90498b1f Update obtaining.xml 
Avoid pointing to the wiki for the default installation method (which points back to the manual anyway). Use more words.
 2014-12-07 14:38:54 +01:00
Domen Kožar b4cedc7965 nixos: reverse logic in nixos interactive tests documentation 2014-11-27 20:01:18 +01:00
Domen Kožar 91bdca38a0 NetworkManager.service -> network-manager.service 2014-11-27 12:10:20 +01:00
Domen Kožar 85daeeb222 Merge pull request #4639 from lethalman/installer-nm 
kde installer: enable networkmanager. Closes #3433
 2014-11-21 22:29:10 +01:00
Luca Bruno 117f3359ac nixos: document default GNOME 3.12 in the 14.11 release notes 2014-11-18 01:02:43 +01:00
Eelco Dolstra b89c06722f options.json: Filter out "visible" and "internal" attributes 2014-11-17 15:17:40 +01:00
Eelco Dolstra 44d14e2264 options.json: Export as an object rather than a list 
This makes it easier to look up options by name.
 2014-11-17 15:17:39 +01:00
Eelco Dolstra 8b79cc00bf Manual: Don't depend on the JSON options 2014-11-17 15:17:39 +01:00
Rene Donner 8bd2f6bfc1 some typos 2014-11-14 13:05:55 +01:00
Eelco Dolstra b3eb981a95 apache-httpd: Make 2.4 the default 
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
 2014-11-06 14:55:44 +01:00
Luca Bruno 7dbf4d73c7 docs: hint to stop NetworkManager during installation to manually configure the network 2014-11-02 23:42:17 +01:00
Domen Kožar 5858ac57a8 next release will be 14.11 2014-10-22 15:41:30 +02:00
Mateusz Kowalczyk 1ffe41b34f Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs 2014-09-22 01:27:00 +01:00
Eelco Dolstra 32fa5ee2c5 Manual: Fix build product 2014-09-10 15:03:59 +02:00
Michael Fellinger 33aaa7ac54 fix location of options.xml 2014-09-09 13:43:23 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Nicolas B. Pierron a4e60ebacf Merge pull request #3811 from nbp/options-json 
Export the list of options to XML & JSON, such that external tools can use it.
 2014-09-07 10:39:03 -07:00
Nicolas Pierron 79411db08b Export options.json & options.xml for building tools for NixOS. 2014-09-07 18:39:24 +02:00
Nathaniel Baxter 5856fbc7d2 nixos-manual: Fix reference to obsolete configuration option 2014-09-07 11:58:06 +02:00
Nathaniel Baxter fb9a6221b6 ati_unfree: Update nixos-manual for AMD driver support 2014-09-07 12:42:32 +10:00
Domen Kožar 18d9904433 nixos-option: fixes as suggested by @nbp 2014-09-06 20:59:14 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging 
Hydra: ?compare=1150594
 2014-09-06 16:52:45 +02:00
Domen Kožar 2e97c06999 nixos-option: enable all flags by default and make output a bit readable cc @nbp 2014-09-03 22:08:25 +02:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
William A. Kennington III 3d037ebb94 Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6"" 
This reverts commit ea8910652f.
 2014-08-31 09:46:16 -07:00
Rob Vermaas ea8910652f Revert "Merge pull request #3182 from wkennington/master.ipv6" 
This reverts commit b23fd65854, reversing
changes made to 43654cba2c.
 2014-08-31 10:58:54 +02:00
William A. Kennington III 86c0f8c549 Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes 2014-08-30 07:33:38 -07:00
Vladimír Čunát e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Eelco Dolstra 41788255ab Manual: Start of module-specific documentation 2014-08-27 12:24:44 +02:00
Eelco Dolstra 60e6cc81b5 No caps in filenames 2014-08-26 19:04:02 +02:00
Mikey Ariel a099ca4505 Chunk NixOS manual 
[Squashed commits to make git blame etc. more likely to work. -ED]
 2014-08-26 19:03:49 +02:00
Eelco Dolstra c72fdf4f48 Manual: Tweak 2014-08-26 15:13:21 +02:00
Eelco Dolstra 81f2749012 Manual: Chunk into separate pages 2014-08-25 19:08:31 +02:00
Eelco Dolstra b1ce3cc172 Manual: Handle XML files in subdirectories 2014-08-25 14:33:33 +02:00
Eelco Dolstra f002a27a80 Remove obsolete directory 2014-08-24 16:35:28 +02:00
Michael Raskin 327074682f Merge pull request #3522 from ryantm/patch-1 
add note about mutableUsers to user management section
 2014-08-23 12:47:42 +04: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
Nathaniel Baxter 7d4cd20ea4 nixos manual: Fix instruction for getting booted kernel confix 2014-08-17 16:10:10 +10:00