Commit Graph

163 Commits

Author SHA1 Message Date
Eelco Dolstra
5332480454 nixos-install: Fix copying from the CD
Nix 1.6 doesn't run the copy-from-other-stores substituter by default
anymore, so turn it on explicitly.

http://hydra.nixos.org/build/6144173
2013-09-16 13:30:34 +02:00
Eelco Dolstra
17457297cb Update all legacy-style modules
I.e., modules that use "require = [options]".  Nowadays that should be
written as

  {
    options = { ... };
    config = { ... };
  };

Also, use "imports" instead of "require" in places where we actually
import another module.
2013-09-04 13:05:09 +02:00
Ivan Kozik
425b0f0507 nixos-rebuild: support -vv, -vvv, -vvvv, and -vvvvv 2013-08-10 21:51:44 +00:00
Evgeny Egorochkin
35ac2ad9ca nixos-checkout: let it run without args again. 2013-08-06 19:04:21 +03:00
Evgeny Egorochkin
0bcabfa886 nixos-checkout: fix output if ran with no options, -h and --help. Other options will still trigger
mkdir output :(
2013-08-06 18:56:10 +03:00
aszlig
5a2390327d
nixos-rebuild: Allow to use --repair.
Unfortunately, the flag only works directly and without the daemon, so
this adds an extra variable $repair, to avoid the daemon. This is to
avoid to iterate through the $extraBuildFlags just to test whether
"--repair" exists.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-26 06:23:49 +02:00
Eelco Dolstra
a6aba08d35 Bump the NixOS version number to 13.07
This is in preparation of making a stable release/branch.  The version
number is <YY>.<MM>, Ubuntu style, denoting the intended release
year/month.  It also has a release codename ("Aardvark").
2013-07-17 13:34:40 +02:00
Eelco Dolstra
986e236068 nixos-rebuild: Support Nix's --repair flag 2013-07-15 13:54:15 +02:00
Sander van der Burg
d312695d78 Fixed minor issue with unary operator expected 2013-07-03 11:13:58 +02:00
Eelco Dolstra
365307ada1 nixos-rebuild: Handle .version-suffix not being writable
Reported by @vcunat.
2013-06-05 17:10:46 +02:00
Bjørn Forsman
ec13407807 nixos-install: fix error message consistency
The test is for path A but the error message says path B. Fix it.
2013-04-22 22:06:27 +02:00
Shea Levy
cc1ae918bd Fix cut-off comment in generated configuration.nix
Pointed out by Mathnerd626 on irc

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-16 13:34:37 -04:00
Shea Levy
ce8c145a98 nixos-install: Include nix's perl libs in perl's INC
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 16:18:24 -04:00
Shea Levy
6e0723bac6 nixos-install: Mound nixos and nixpkgs src directly
Previously nixos-install would fail if nixos and nixpkgs weren't on the same mountpoint as /

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 16:12:43 -04:00
Shea Levy
a215600335 nixos-install: Unmount efivars if mounted
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-10 15:08:33 -04:00
Shea Levy
6a1e1fa108 nixos-install: Bind-mount efivars if it exists
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-10 09:15:54 -04:00
Eelco Dolstra
fbde5e027e Sync after installing the boot loader
Previously we synced just before calling switch-to-configuration.
That prevents corruption of the Nix store, but it can leave the boot
loader configuration and kernel files in /boot corrupted.  So do the
sync after installing the boot loader.
2013-03-28 16:11:54 +01:00
Shea Levy
12d77805ef nixos-install: Unset NIX_REMOTE 2013-02-06 12:20:52 -05:00
Shea Levy
5e88e9b2ff nixos-install: Fully resolve symlinks in the paths to nixos/nixpkgs sources. 2013-02-05 10:37:50 -05:00
Shea Levy
98b7253b29 nixos-install: Append the default nixos-channel path to $NIX_PATH 2013-02-05 09:44:00 -05:00
Shea Levy
05f01685a0 D'oh 2013-02-05 06:39:18 -05:00
Shea Levy
6199d4bb8e nixos-install: Don't grep nix.conf directly, use nix perl bindings instead 2013-02-04 09:44:32 -05:00
Shea Levy
99623e9940 nixos-install: If NIX_CONF_DIR is unset, use /etc/nix 2013-02-04 09:27:56 -05:00
Shea Levy
e83f946f9e nixos-install: Respect the build-users-group of the host 2013-02-04 07:46:31 -05:00
Shea Levy
722d8497e7 nixos-install: Respect /home/shlevy/src:/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services to find the nixos and nixpkgs sources, only copy the nixos channel if it exists 2013-02-04 07:46:31 -05:00
Shea Levy
9db243b4aa nixos-install: Respect host $NIX_CONF_DIR and don't assume nix.conf exists 2013-02-04 07:46:31 -05:00
Eelco Dolstra
6d19777455 nixos-install: Handle /nix/var/nix/db being on a separate filesystem
This is the case on S3-backed EC2 instances.
2013-01-25 16:00:47 +01:00
Eelco Dolstra
314adf9648 nixos-rebuild: Don't rely on $SHELL
Fixes #74.
2013-01-23 11:31:48 +01:00
Eelco Dolstra
6e7b0a0c0e Fix ‘nixos-rebuikd dry-run’ 2013-01-16 16:11:51 +01:00
Eelco Dolstra
e65a49f00f Add missing file 2013-01-16 16:06:50 +01:00
Eelco Dolstra
b35fe01f02 Set the NixOS version to something useful when building from Git 2013-01-16 14:40:41 +01:00
Eelco Dolstra
ea358b4eae nixos-rebuild: Use ‘[ ... ]’ instead of ‘test’ 2013-01-16 13:21:59 +01:00
Eelco Dolstra
45f0de21f0 nixos-rebuild: Fix the check for running nix-daemon 2012-12-21 00:18:12 +01:00
Eelco Dolstra
97ae408e83 Merge remote-tracking branch 'origin/master' into systemd 2012-12-11 17:40:39 +01:00
Eelco Dolstra
13617b803b Use the binary cache in the installer
Also remove "nixos-rebuild pull".
2012-12-08 19:00:06 +01:00
Eelco Dolstra
994a15bc25 nixos-rebuild: Handle options with spaces in them
Like ‘--option binary-caches "http://foo http://bar"’
2012-11-22 12:04:00 +01:00
Eelco Dolstra
f44d27a96c Make the installer work on systemd
Systemd mounts the root filesystem as a shared subtree, which breaks
recursive bind mounts.
2012-11-15 22:53:57 +01:00
Eelco Dolstra
08e6c0cb7c Update channel URLs 2012-11-12 09:19:25 +01:00
Eelco Dolstra
458f36f5f1 Turn fileSystems into an attribute set
So now you can write

  fileSystems =
    [ { mountPoint = "/";
        device = "/dev/sda1";
      }
    ];

as

  fileSystems."/".device = "/dev/sda1";
2012-11-02 18:02:12 +01:00
Eelco Dolstra
75583c7984 nixos-rebuild: Support --option 2012-09-14 13:23:19 -04:00
Eelco Dolstra
348691645d Remove broken "nopipefail" option
http://hydra.nixos.org/build/2751337
2012-07-02 10:57:36 -04:00
Lluís Batlle i Rossell
de87b07bb3 nixos-rebuild: fail if any case of pull fails. 2012-06-27 21:57:15 +02:00
Lluís Batlle i Rossell
5b7c019e2a nixos-rebuild: make 'pull' fail in case it did not pull anything. 2012-06-27 21:36:46 +02:00
Eelco Dolstra
cc357c7e64 nixos-rebuild: Add a convenience option ‘--upgrade’
This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
2012-06-25 16:17:34 -04:00
Eelco Dolstra
f2a33809c1 * Check for .git instead of .svn.
svn path=/nixos/trunk/; revision=34350
2012-06-04 15:57:32 +00:00
Eelco Dolstra
a0cc181117 * nixos-checkout: get the NixOS/Nixpkgs sources from GitHub.
svn path=/nixos/trunk/; revision=34347
2012-06-04 15:39:07 +00:00
Eelco Dolstra
f81eb12d41 * Now hopefully a proper fix for the problem in
http://hydra.nixos.org/build/2645533 (which I can't reproduce btw -
  so much for reproducibility...).

svn path=/nixos/trunk/; revision=34243
2012-05-25 14:06:46 +00:00
Eelco Dolstra
d0786fd3e7 * Cache nix-pull calls in nixos-install.
svn path=/nixos/trunk/; revision=34241
2012-05-25 13:32:30 +00:00
Eelco Dolstra
a3e04ba0aa * Fix problems with repeated installations due to the immutable bit
(http://hydra.nixos.org/build/2645533).

svn path=/nixos/trunk/; revision=34235
2012-05-25 02:30:52 +00:00
Eelco Dolstra
b11770373a * Work properly if /root/.nix-defexpr/channels already exists.
svn path=/nixos/trunk/; revision=34233
2012-05-24 23:37:06 +00:00