1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
Commit graph

3894 commits

Author SHA1 Message Date
Eelco Dolstra 104c252b61 Merge pull request #11279 from rickynils/nixos-rebuild-remote
nixos-rebuild: Add option for building and/or deploying on a remote host
2016-01-04 11:52:25 +01:00
Tobias Geerinckx-Rice 82419575aa btrfsProgs -> canonical btrfs-progs 2016-01-03 20:38:44 +01:00
Shea Levy 06356c90dc Merge branch 'kmscon-extraoptions' of git://github.com/nathan7/nixpkgs 2016-01-03 10:01:43 -05:00
Tobias Geerinckx-Rice 99075fb402 saneBackends{,Git} -> sane-backends{,-git}
Fixes xsane evaluation.
2016-01-03 03:31:38 +01:00
Nikolay Amiantov e312276b01 Merge pull request #12000 from nathan7/nix-auto-run
command-not-found: add NIX_AUTO_RUN option, to automatically invoke nix-shell
2016-01-03 03:22:50 +03:00
Rickard Nilsson 7772293a0a Merge pull request #12099 from jmitchell/patch-1
Fix package name typo
2016-01-02 23:53:41 +01:00
Arseniy Seroka 1d2accb8fe Merge pull request #9716 from benley/mathics-service
Add a Mathics notebook service (with test)
2016-01-03 01:37:06 +03:00
Benjamin Staffin fe8498f609 nixos/mathics: New service and test 2016-01-02 14:34:55 -08:00
Nathan Zadoks d396f1e99b kmscon service: add extraOptions option 2016-01-02 22:21:54 +01:00
Jacob Mitchell 7ce9699a6a Fix package name typo 2016-01-02 12:37:20 -08:00
Tobias Geerinckx-Rice a88b771ae7 Merge pull request #11936 from dezgeg/pr-cd-touchpad
installation-cd-graphical: Enable the 'synaptics' touchpad driver
2016-01-02 20:13:29 +01:00
Domen Kožar 8225e1b1c1 Merge pull request #12086 from bmorphism/master
thinkfan levels option to control actuation points
2016-01-02 10:56:37 +01:00
Barton Yadlowski d732a7f5c5 thinkfan levels option to control actuation points 2016-01-02 04:49:58 -05:00
Rickard Nilsson 448a2af041 nixos-rebuild: Document --build-host and --target-host options 2016-01-01 18:22:11 +01:00
Rickard Nilsson ca0c460406 nixos-rebuild: Add option for building and/or deploying on a remote host
This commit adds the options --build-host and --target-host to nixos-rebuild.

--build-host instructs nixos-rebuild to perform all nix builds on the
specified host (via ssh). Build results are then copied back to the
local machine and used when activating the system.

--build-target instructs nixos-rebuild to activate the configuration
not on the local machine but on the specified remote host. Build
results are copied to the target machine and then activated there (via ssh).

It is possible to combine the usage of --build-host and --target-host,
in which case you can perform the build on one remote machine and deploy
the configuration to another remote machine. The only requirement is that
the build host has a working ssh connection to the target host (if the
target is not local), and that the local machine can connect to both
the target and the build host. Also, your user must be allowed to copy
nix closures between the local machine and the target and host machines.

At no point in time are the configuration sources (the nix files) copied
anywhere. Instead, nix evaluation always happens locally
(with nix-instantiate). The drv-file is then copied and realised remotely
(with nix-store).

As a convenience, if only --target-host is specified, --build-host is
implicitly set to that host too. So if you want to build locally and deploy
remotely you have to explicitly set "--build-host localhost".

To activate (test, boot or switch) you need to have root access to the
target host. You can specify this by "--target-host root@myhost".

I have tested the obvious scenarios and they are working. Some of the
combinations of --build-host and --target-host and the various actions might
not make much sense, and should maybe be forbidden (like setting a remote
target host when building a VM), and some combinations might not work at all.
2016-01-01 18:21:59 +01:00
Austin Seipp 59acfd4f16 nixos/plex: Add 'package' option to module
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-12-30 20:20:25 -06:00
Peter Simons e402a2e670 Merge pull request #12042 from anderspapitto/docs
docs
2015-12-30 21:08:52 +01:00
Anders Papitto 58cc890d2b sysctl: use literalExample in docs 2015-12-30 10:22:04 -08:00
Domen Kožar f41603d8a6 Merge pull request #11940 from jgillich/dnsmasq-leases
dnsmasq: create state dir for dhcp leases file
2015-12-30 16:50:14 +01:00
Arseniy Seroka 640d861d13 Merge pull request #12020 from ehmry/windowlab
WindowLab: initial pkg at 1.40
2015-12-30 18:07:20 +03:00
Eelco Dolstra 146c727924 waitForUnit: Fail if the unit reaches inactive state with no pending jobs
This prevents waitForUnit for looping for many minutes before giving
up.
2015-12-30 15:17:52 +01:00
Eelco Dolstra e78bad5262 etc: Use a friendlier name than "etc-file" 2015-12-30 15:17:30 +01:00
Eelco Dolstra 1ba2015450 install-grub: Make more robust against GC'ed system profile entries
Previously this barfed with:

  updating GRUB 2 menu...
  fileparse(): need a valid pathname at /nix/store/zldbbngl0f8g5iv4rslygxwp0dbg1624-install-grub.pl line 391.
  warning: error(s) occured while switching to the new configuration
2015-12-30 15:07:18 +01:00
Emery 952563d620 WindowLab: initial pkg at 1.40
http://nickgravgaard.com/windowlab/
2015-12-30 11:10:30 +01:00
Dan Peebles cd7612b841 amazon-image: enable configure-from-userdata and the corresponding VM test 2015-12-30 04:59:52 +00:00
Eelco Dolstra 7906169ce1 Add some preferLocalBuild 2015-12-29 17:21:49 +01:00
Eelco Dolstra 74aac17878 Force rebuild of some corrupted files 2015-12-29 16:39:26 +01:00
Arda Xi e60c4995fd command-not-found: pass all of argv to helper 2015-12-28 15:09:48 +01:00
Nathan Zadoks 254eebd8a0 command-not-found: add NIX_AUTO_RUN 2015-12-28 15:09:48 +01:00
Rodney Lorrimar 5d682e515e release-notes: add pump.io as a new service 2015-12-27 13:32:44 +00:00
Domen Kožar fe9a7c6d5b Merge pull request #11956 from zimbatm/nm-openvpn-uid-gid
networkmanager: set uid/gid for the networkmanager openvpn agent
2015-12-27 11:02:55 +01:00
Domen Kožar bd8731ab9d Merge pull request #11963 from anderspapitto/typo
NixOS manual: fix typo
2015-12-27 01:18:54 +01:00
Anders Papitto bbcc08cb30 NixOS manual: fix typo 2015-12-26 10:38:17 -08:00
Drew Carey Buglione 0f52d33f96 nixos/manual: typo 2015-12-26 12:36:19 -06:00
Jakob Gillich ae4a7f9351 hostapd: rename extraCfg -> extraConfig, added asserts 2015-12-26 11:37:00 +01:00
Vladimír Čunát 5a2f0541a1 nixos/xserver: fix evaluation of xkbDir
I solved it this way because it seems the current state-of-the-art 89e983786
The problem was introduced in #11930. Close #11951 (a different solution).
2015-12-26 09:09:15 +01:00
Arseniy Seroka 7e14e28a80 Merge pull request #11870 from lancelotsix/improve_slurm_service
Improve slurm service configuration
2015-12-25 18:36:18 +03:00
Lancelot SIX 4994f0f7d0 slurm service: add tests 2015-12-25 15:55:07 +01:00
Lancelot SIX ca4c354789 slurm service: improve config 2015-12-25 15:54:35 +01:00
Shea Levy 384a4ca4e4 Merge branch 'fix-gwwndsz' of git://github.com/tk-ecotelecom/nixpkgs
Maybe option defaultGatewayWindowSize is used very rarely, but when it is used there will be an error.
2015-12-25 09:27:36 -05:00
Arseniy Seroka 4f2f99d9b6 Merge pull request #11930 from exi/xdgDir-configurable
xserver: make xkbdir configurable
2015-12-25 17:25:28 +03:00
Timofei Kushnir 5925f9f709 Network script module fix 2015-12-25 03:43:49 +03:00
Jakob Gillich a193ea3700 dnsmasq: create state dir for dhcp leases file
ref #11718
2015-12-24 22:36:19 +01:00
Shea Levy c26062884b Merge branch 'pr-cd-nomodeset' of git://github.com/dezgeg/nixpkgs 2015-12-24 13:50:26 -05:00
Tuomas Tynkkynen 269f261c73 installation-cd: Add separate boot entry that has 'nomodeset'
We seem to be in an unfortunate situation: booting without 'nomodeset'
causes hangs when booting on some NVIDIA cards (6948c3ab80), but on the
other hand adding 'nomodeset' prevents X from starting on other hardware
(e.g. issue #10381 and my Thinkpad X250 with an integrated Broadwell GPU).

Attempt to remedy this situation a bit by adding a separate entry in the
ISOLINUX menu (with the non-'nomodeset' being the default).
2015-12-24 20:12:26 +02:00
Tuomas Tynkkynen 9ac80c1f15 installation-cd-graphical: Enable the 'synaptics' touchpad driver
This is needed to get touchpad working in the installer on several
laptops. Tested on a Thinkpad X250.
2015-12-24 17:45:51 +02:00
Reno Reckling 92e48a4383 xserver: make xkbdir configurable 2015-12-24 13:45:27 +01:00
Benno Fünfstück 79b4e5a8d7 docker module: fix kernel module loading
The docker module used different code for socket-activated docker daemon than for the non-socket activated daemon.
In particular, if the socket-activated daemon is used, then modprobe wasn't set up to be usable and in PATH for
the docker daemon, which resulted in a failure to start the daemon with overlayfs as storageDriver if the
`overlay` kernel module wasn't already loaded. This commit fixes that bug (which only appears if socket
activation is used), and also reduces the duplication between code paths so that it's easier to keep
both in sync in future.
2015-12-24 12:07:45 +01:00
Tobias Geerinckx-Rice 09c8911bd7 redshift: don't busy-loop like crazy on NixOS start-up 2015-12-24 04:05:57 +01:00
Bjørn Forsman b2d0886b37 nixos/jenkins: fix typo in docstring (s/adress/address/) 2015-12-23 23:49:01 +01:00