JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,640 Commits 2 Branches 0 Tags 13 GiB
b4afefcc40
Commit Graph

3640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eelco Dolstra
b4afefcc40 * Typo. 
svn path=/nixos/trunk/; revision=33826
 2012-04-18 12:32:17 +00:00
Eelco Dolstra
395d73db70 * nixos-rebuild: don't do a pull of the manifest by default anymore. 
It's not necessary when using the NixOS channel.  "nixos-rebuild
  pull" now pulls from the NixOS channel.

svn path=/nixos/trunk/; revision=33825
 2012-04-18 11:46:16 +00:00
Eelco Dolstra
6abf3c8a97 * Change $NIXPKGS_CONFIG to a better location (/etc/nix instead of 
/nix/etc).  Not sure the default profile should be setting this at
  all though.

svn path=/nixos/trunk/; revision=33824
 2012-04-18 10:59:57 +00:00
Eelco Dolstra
7ba5881146 * Don't install the "nixpkgs_sys" symlink in ~/.nix-defexpr anymore. 
Note that for attribute-based nix-env installations, the NixOS
  channel contains Nixpkgs as its "pkgs" attribute, so

    $ nix-env -iA nixos.pkgs.foo

  will work instead of the old

    $ nix-env -iA nixpkgs_sys.foo
    
* Fix the path to root's channels installed in ~/.nix-defexpr.

svn path=/nixos/trunk/; revision=33823
 2012-04-18 10:58:33 +00:00
Eelco Dolstra
a193fe4f1d * Add root's NixOS channel to $NIX_PATH. Will remove 
/etc/nixos/{nixos,nixpkgs,services} eventually.

svn path=/nixos/trunk/; revision=33822
 2012-04-18 10:34:39 +00:00
Eelco Dolstra
e3879fe365 * Store the NixOS version in the top-level derivation. 
* Change the name of the top-level derivation from "system" to
  "nixos-<version>".
* Show the NixOS version in the GRUB boot menu instead of the kernel
  version.

svn path=/nixos/trunk/; revision=33785
 2012-04-14 17:09:59 +00:00
Eelco Dolstra
91b91cc847 * Set the channel name to "nixos". 
svn path=/nixos/trunk/; revision=33783
 2012-04-14 14:15:17 +00:00
Mathijs Kwik
3bbaa3b60c slim display manager: enabled auto_login setting 
useful for demo/kiosk mode

svn path=/nixos/trunk/; revision=33774
 2012-04-13 14:52:25 +00:00
Eelco Dolstra
bcc24c1b86 * Finish the EBS creation script. It now takes a --region option to 
specify the EC2 region in which the AMI is to be created.  It also
  starts an instance booted from the newly created AMI to test it.

svn path=/nixos/trunk/; revision=33771
 2012-04-13 11:26:22 +00:00
Eelco Dolstra
2821289aeb * Ugly hack: force udev to exit to prevent random "Device or resource 
busy while trying to open /dev/xvda" errors from fsck.

svn path=/nixos/trunk/; revision=33766
 2012-04-12 18:01:19 +00:00
Eelco Dolstra
d82a7d328d * Script for creating NixOS EBS-based AMIs. 
svn path=/nixos/trunk/; revision=33765
 2012-04-12 17:15:55 +00:00
Eelco Dolstra
185e9b69ed * Assume that the ephemeral devices are called /dev/xvda-e. So 
in Charon deployments, non-ephemeral devices should be >= /dev/xvdf.

svn path=/nixos/trunk/; revision=33764
 2012-04-12 16:48:01 +00:00
Eelco Dolstra
f2fd48e131 * Fix the "autocreate" option. 
svn path=/nixos/trunk/; revision=33750
 2012-04-11 21:21:00 +00:00
Sander van der Burg
a34e20e292 deployment attribute does not exists anymore, will fix this later 
svn path=/nixos/trunk/; revision=33747
 2012-04-11 13:46:49 +00:00
Eelco Dolstra
1d0c23bffb * Use a raw disk for the installer test. This speeds it up by almost 
two minutes on my laptop.  Note that due to sparse allocation, raw
  disks don't actually take up more space than qcow2 disks (and
  they're temporary anyway).

svn path=/nixos/trunk/; revision=33746
 2012-04-11 10:05:29 +00:00
Eelco Dolstra
375511eb33 * Add a installer test that uses GRUB 1 (it currently fails). 
svn path=/nixos/trunk/; revision=33745
 2012-04-11 09:42:53 +00:00
Eelco Dolstra
e567309d85 * Include all of Nixpkgs. 
svn path=/nixos/trunk/; revision=33744
 2012-04-11 09:17:32 +00:00
Lluís Batlle i Rossell
918edf8612 I think this makes the memtest module work on grub1. 
But I can't test it because grub-install fails for me for grub1.

I tested it works for grub2.


svn path=/nixos/trunk/; revision=33739
 2012-04-10 22:20:20 +00:00
Eelco Dolstra
fb0a54b803 * In nixos-install, do a nix-pull from 
http://nixos.org/releases/nixos/nixos-<version> to ensure we're
  getting the right binaries.

svn path=/nixos/trunk/; revision=33738
 2012-04-10 22:17:37 +00:00
Eelco Dolstra
322a0ff7cd * Set the version properly in the source tree in the ISO. 
svn path=/nixos/trunk/; revision=33736
 2012-04-10 21:42:47 +00:00
Eelco Dolstra
049d2dfca7 * Slight cleanup. 
svn path=/nixos/trunk/; revision=33735
 2012-04-10 21:19:41 +00:00
Lluís Batlle i Rossell
2ca7e8a43e Reverting 33692, because memtest in the iso was failing. 
I set the grub entry for memtest to read "Memtest86", as suggested by Eelco.

I run:
svn merge -c -33692 ^/nixos/trunk
And edited the change a bit.


svn path=/nixos/trunk/; revision=33734
 2012-04-10 21:18:48 +00:00
Eelco Dolstra
c02240082a * Add missing file. 
svn path=/nixos/trunk/; revision=33733
 2012-04-10 21:17:43 +00:00
Eelco Dolstra
dccd99b564 * Disable "nixos-gen-seccure-keys": it's not clear what it's for, it's 
not documented, and it doesn't seem to be used anywhere.

svn path=/nixos/trunk/; revision=33732
 2012-04-10 21:11:11 +00:00
Eelco Dolstra
907df082dc * Including the Nixpkgs revision made the ISO volume label slightly 
too long.  So make it shorter.

svn path=/nixos/trunk/; revision=33731
 2012-04-10 21:08:10 +00:00
Eelco Dolstra
096b7723c8 * Add a command "nixos-version" that prints the version of the 
currently activated NixOS.  This is "0.1pre-svn" when built from a
  SVN tree, but contains the actual revision when installed from the
  NixOS channel or from the ISO.

svn path=/nixos/trunk/; revision=33730
 2012-04-10 20:56:38 +00:00
Eelco Dolstra
871b4bd43a * Consistently include the Nixpkgs revision in the NixOS version 
string.

svn path=/nixos/trunk/; revision=33729
 2012-04-10 20:28:06 +00:00
Eelco Dolstra
f9ac67c67f * Copying manifests is slightly tricky because 
download-using-manifests expects that the files in
  /nix/var/nix/manifests are symlinks into the store.

svn path=/nixos/trunk/; revision=33727
 2012-04-10 15:36:50 +00:00
Eelco Dolstra
f37b453b19 * nixos-install: Ensure that builds are done by the nixbld users 
rather than root.  Also copy all manifests into the chroot so that
  any nix-pull done outside the chroot is "inherited".

svn path=/nixos/trunk/; revision=33725
 2012-04-10 14:39:12 +00:00
Eelco Dolstra
d2a6be078e * Typo. 
svn path=/nixos/trunk/; revision=33724
 2012-04-10 14:12:49 +00:00
Eelco Dolstra
f9e8e735bb * Remove debug line. 
svn path=/nixos/trunk/; revision=33723
 2012-04-10 13:28:48 +00:00
Eelco Dolstra
5c06c66b68 * Clear more locale-related variables in the installer. 
svn path=/nixos/trunk/; revision=33722
 2012-04-10 13:28:17 +00:00
Eelco Dolstra
b2025c4687 * Use "umount -l" to clean up. 
svn path=/nixos/trunk/; revision=33721
 2012-04-10 13:25:55 +00:00
Eelco Dolstra
5409e76353 * Disable wicd in the installation CD for now, because it causes 
dhcpcd to segfault randomly or give corrupt output.  See e.g.

    http://hydra.nixos.org/build/2380666/nixlog/1/raw

  The problem seems to be that wicd sends a "-k" command to dhcpcd to
  release the interface, which doesn't work well with a dhcpcd that
  handles all interfaces in one process.

svn path=/nixos/trunk/; revision=33720
 2012-04-10 13:09:56 +00:00
Eelco Dolstra
1201116832 * Temporarily add "-cpu kvm64" to work around the GMP abort() bug that 
has been fixed in the stdenv branch.

  http://hydra.nixos.org/build/2380676

svn path=/nixos/trunk/; revision=33718
 2012-04-10 12:50:20 +00:00
Eelco Dolstra
a7af5588b6 * Drop ugly reference to var/run/current-system/sw/sbin/wpa_cli, and 
make it conditional.

svn path=/nixos/trunk/; revision=33717
 2012-04-10 12:07:30 +00:00
Eelco Dolstra
83679c99b1 * Don't put /var and /nix on ephemeral storage if we're booting 
from EBS.

svn path=/nixos/trunk/; revision=33716
 2012-04-10 11:11:05 +00:00
Lluís Batlle i Rossell
849d136aa6 Making also the system-tarball-pc show the memtest entry as the 
pkgs.memtest86.name.


svn path=/nixos/trunk/; revision=33693
 2012-04-09 20:37:54 +00:00
Lluís Batlle i Rossell
9017ccf9fe Removing the special memtest.nix module for the isos, and using 
the same as the usual nixos. I think this trivial change works;
I checked the grub.cfg output generated in the iso_minimal.


svn path=/nixos/trunk/; revision=33692
 2012-04-09 20:36:26 +00:00
Lluís Batlle i Rossell
6e281e46b7 I update the name of the memtest entry in grub of the iso images, 
because it can be overriden choosing another memtest86.

As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the 
former is released later, and I deduce it should work better.


svn path=/nixos/trunk/; revision=33691
 2012-04-09 20:30:14 +00:00
Lluís Batlle i Rossell
0b8b6616b6 Making the memtest name come from the pkgs.memtest86, as the nixos 
user can override choosing between two memtests.


svn path=/nixos/trunk/; revision=33690
 2012-04-09 20:08:14 +00:00
Eelco Dolstra
d3c1261665 * Add a combined NixOS/Nixpkgs jobset. This is to get a NixOS channel 
containing Nixpkgs binaries.

svn path=/nixos/trunk/; revision=33686
 2012-04-09 13:04:58 +00:00
Eelco Dolstra
80866302b4 * Disable two jobs that don't evaluate. 
svn path=/nixos/trunk/; revision=33685
 2012-04-09 12:52:15 +00:00
Eelco Dolstra
defe1d36cb * Generate a NixOS channel. 
svn path=/nixos/trunk/; revision=33684
 2012-04-09 12:49:03 +00:00
Rob Vermaas
6b34bd8564 remove remaining reference to nixos-deploy-nwtork 
svn path=/nixos/trunk/; revision=33663
 2012-04-07 15:18:39 +00:00
Eelco Dolstra
301c4d96b1 * Remove nixos-deploy-network. It has been superceded by Charon. 
svn path=/nixos/trunk/; revision=33662
 2012-04-07 13:26:35 +00:00
Eelco Dolstra
6e7859814c * Move misc/deployment.nix to Charon, since these options don't really 
make sense outside of a Charon deployment.

svn path=/nixos/trunk/; revision=33661
 2012-04-07 13:17:03 +00:00
Peter Simons
ec3dca188c Dropped the unused/unknown/obsolete module i8042 from 'boot.initrd.kernelModules'. 
svn path=/nixos/trunk/; revision=33654
 2012-04-06 19:21:50 +00:00
Eelco Dolstra
4f4c529979 Stage 1 improvements: 
* Load scsi_wait_scan after all other kernel modules to ensure that
  all SCSI device nodes have been created.
* Increase the timeout for the appearance of the root device to 20
  seconds.
* Do a "udevadm settle" just after the root device has appeared to
  make sure that udev isn't accessing the device anymore (hopefully).
  On EC2 (Xen), I've seen fsck on the root fail randomly with "device
  in use" errors.

svn path=/nixos/trunk/; revision=33650
 2012-04-06 14:20:43 +00:00
Eelco Dolstra
1e8e83408b * Revert unintended commit. 
svn path=/nixos/trunk/; revision=33646
 2012-04-06 12:23:44 +00:00