philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

1924 commits

Author SHA1 Message Date
Eelco Dolstra d0786fd3e7 * Cache nix-pull calls in nixos-install. 
svn path=/nixos/trunk/; revision=34241
 2012-05-25 13:32:30 +00:00
Lluís Batlle i Rossell 22fc2bdb24 Fixing the evaluation of the system-tarball-pc. 
It complained that grub device wasn't defined, and I guess it wanted some
fileSystems too. I copied those details from the sheevaplug expression, that I
made evaluate some minutes ago.


svn path=/nixos/trunk/; revision=34238
 2012-05-25 08:09:25 +00:00
Lluís Batlle i Rossell 4157166f8a Making the sheevaplug system tarball evaluate fine again. It had some pieces not up to date: 
fileSystems definition, kernel version, ...


svn path=/nixos/trunk/; revision=34237
 2012-05-25 07:52:12 +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
Eelco Dolstra a6892051ef * Allow building with boot.loader.grub.enable set to "false". 
svn path=/nixos/trunk/; revision=34218
 2012-05-23 15:52:29 +00:00
Eelco Dolstra 9dadfc3541 * Mark QEMU VMs as NixOS machines. 
svn path=/nixos/trunk/; revision=34217
 2012-05-23 15:40:31 +00:00
Rob Vermaas 53af6f5668 Execute mount-all task on config-changed event to make sure it is performed before other upstart jobs are started on activating the new configuration. 
svn path=/nixos/trunk/; revision=34201
 2012-05-21 21:26:45 +00:00
Mathijs Kwik be69799f35 better workaround for building nested child configurations 
svn path=/nixos/trunk/; revision=34164
 2012-05-18 06:17:08 +00:00
Mathijs Kwik 7fca5408f3 Revert "Provided a workaround for grub's missing-devices check, so nested child configurations can still build." 
This reverts commit a89e8831e3d95bcf3ddc19ee34b938db7e8aa572.

svn path=/nixos/trunk/; revision=34163
 2012-05-18 06:17:05 +00:00
Eelco Dolstra 2577a17468 * Add /etc/os-release to be Lennart Poettering compliant. 
See http://0pointer.de/blog/projects/os-release.html

svn path=/nixos/trunk/; revision=34162
 2012-05-17 21:10:42 +00:00
Eelco Dolstra 801cd7402c * Don't use ‘chown user.group’ since that syntax is not officially 
supported (you're supposed to say ‘chown user:group’).

svn path=/nixos/trunk/; revision=34161
 2012-05-17 19:43:32 +00:00
Eelco Dolstra f889ebc488 * Allow runtime changes to boot.devShmSize and friends. 
svn path=/nixos/trunk/; revision=34160
 2012-05-17 19:33:55 +00:00
Eelco Dolstra e9e6885d3b * Lower the limits on /run and /dev. 
svn path=/nixos/trunk/; revision=34159
 2012-05-17 19:33:12 +00:00
Eelco Dolstra 91acb81b11 * Support globbing in the source attribute of environment.etc entries. 
svn path=/nixos/trunk/; revision=34158
 2012-05-17 18:43:45 +00:00
Eelco Dolstra c10b41ad99 * Make the fail2ban module configurable. 
svn path=/nixos/trunk/; revision=34157
 2012-05-17 18:19:48 +00:00
Mathijs Kwik 88b3c4b82e Provided a workaround for grub's missing-devices check, so nested child configurations can still build. 
svn path=/nixos/trunk/; revision=34153
 2012-05-17 10:17:32 +00:00
Eelco Dolstra 3ce8859551 * Basic module for fail2ban. Not configurable yet. It currently 
blocks IP addresses if they make too many failed login attempts.

svn path=/nixos/trunk/; revision=34149
 2012-05-17 02:51:24 +00:00
Eelco Dolstra a9a507eede * On headless systems, disable the emergency shell and redirect 
mountall output to the standard Upstart job log file
  (/var/log/upstart/mountall).

svn path=/nixos/trunk/; revision=34138
 2012-05-16 15:08:44 +00:00
Eelco Dolstra 6a6eec0f53 * Add a filesystem option ‘autoFormat’ to automatically do a format if 
the device has no filesystem yet.  Useful in Charon deployments.
  The check for an uninitialised filesystem is kind of shaky now.

svn path=/nixos/trunk/; revision=34133
 2012-05-16 00:03:44 +00:00
Eelco Dolstra 07fcf5baee * Make the boot.initrd.luks.enable option obsolete. It's enough to 
see that boot.initrd.luks.devices is non-empty.

svn path=/nixos/trunk/; revision=34120
 2012-05-15 20:45:01 +00:00
Eelco Dolstra dbf5e3229e * Remove Nix's dependencies from the chroot. Nix 1.0 doesn't need 
this anymore.

svn path=/nixos/trunk/; revision=34113
 2012-05-15 16:12:22 +00:00
Eelco Dolstra 560262dae0 * Fix "error: the group nixbld' specified in build-users-group' does 
not exist" during nixos-install.

svn path=/nixos/trunk/; revision=34103
 2012-05-15 13:50:36 +00:00
Eelco Dolstra ea3cfc9287 * Add xdg-open to the default X11 configuration so that programs like 
Chrome can open downloaded files.

svn path=/nixos/trunk/; revision=34097
 2012-05-15 02:49:47 +00:00
Eelco Dolstra 3b314fa40b * Include cryptsetup in EC2 AMIs. 
svn path=/nixos/trunk/; revision=34096
 2012-05-14 23:43:38 +00:00
Eelco Dolstra 29b05fb62a * nixos-checkout: add an argument to specify the directory where the 
sources should be stored.  E.g. "nixos-checkout /home/eelco/srcs"
  will check out to /home/eelco/srcs/{nixos,nixpkgs}.  Probably the
  /etc/nixos default should be removed eventually because /etc is a
  pretty weird place to keep large source trees.

svn path=/nixos/trunk/; revision=34086
 2012-05-14 04:12:43 +00:00
Eelco Dolstra 8d568e5a71 * nixos-option: clean up the English and the generated file. 
svn path=/nixos/trunk/; revision=34082
 2012-05-14 01:56:42 +00:00
Eelco Dolstra 3dd0718939 * Give an error at evaluation time if boot.loader.grub.device or 
boot.loader.grub.devices are not set, rather than complaining about
  it when it's too late.

svn path=/nixos/trunk/; revision=34081
 2012-05-14 01:53:47 +00:00
Eelco Dolstra 67d5f2b444 * Require fileSystems to be set. 
svn path=/nixos/trunk/; revision=34080
 2012-05-14 01:33:11 +00:00
Eelco Dolstra ce3941d6e6 * Move logFormat to the per-vhost options. 
svn path=/nixos/trunk/; revision=34066
 2012-05-11 23:14:05 +00:00
Eelco Dolstra 5167f5abef * Remove a bad definition of environment.etc. 
svn path=/nixos/trunk/; revision=34065
 2012-05-11 23:08:37 +00:00
Eelco Dolstra c4aa833e56 * Use optionSet to check environment.etc. 
svn path=/nixos/trunk/; revision=34064
 2012-05-11 23:06:35 +00:00
Rickard Nilsson 35f9502a27 Added option for specifying the path to the private key file sshd should use. 
svn path=/nixos/trunk/; revision=34039
 2012-05-09 22:13:53 +00:00
Rickard Nilsson 658ea20e7f Added option for specifying system-wide known hosts file for OpenSSH. 
svn path=/nixos/trunk/; revision=34038
 2012-05-09 22:11:07 +00:00
Rickard Nilsson 2df81f42a5 Moved idmapd configuration file to Nix store. 
svn path=/nixos/trunk/; revision=34037
 2012-05-09 22:06:17 +00:00
Eelco Dolstra e4200d7e61 * Some more trivial builders with lots of dependencies that should be 
built locally.

svn path=/nixos/trunk/; revision=34034
 2012-05-09 21:35:47 +00:00
Peter Simons 7a69733704 Added 'networking.dhcpcd.denyInterfaces' to extend the list of network 
interfaces black-listed for dhcpcd via configuration.nix. I use this option to
disable DHCP for "veth*" interfaces, which are created by LXC for use inside of
virtual machines.

svn path=/nixos/trunk/; revision=34018
 2012-05-08 11:46:01 +00:00
Shea Levy 1a0c9ce201 The efibootmgr bricking problem was fixed in 2.6.39 
svn path=/nixos/trunk/; revision=33990
 2012-05-05 15:43:28 +00:00
Shea Levy c716747cce Need a slighty bigger boot image to contain the efi shell 
svn path=/nixos/trunk/; revision=33986
 2012-05-05 14:23:51 +00:00
Shea Levy 3aae8bfa61 Switch to using efi shell + startup.nsh as the 
removable media efi boot option.

svn path=/nixos/trunk/; revision=33984
 2012-05-04 22:16:35 +00:00
Sander van der Burg 4b650026bf The <> syntax has to be applied properly, in order to find build-vms.nix 
svn path=/nixos/trunk/; revision=33981
 2012-05-03 12:31:01 +00:00
Eelco Dolstra b603babd0f * Use PostgreSQL's fast shutdown mode. In the default 
smart shutdown mode, Postgres waits until all 
  active connections have closed, which can take an
  unbounded amount of time.

svn path=/nixos/trunk/; revision=33959
 2012-04-30 18:15:32 +00:00
Eelco Dolstra be189991e0 * Revert r33928: veth* can also be a bridged interface requiring dhcp. 
See e.g. https://nixos.org/repos/nix/configurations/trunk/tud/stan.nix

  So we need a better solution for this...

svn path=/nixos/trunk/; revision=33957
 2012-04-30 17:46:11 +00:00
Eelco Dolstra 03f2847054 * Set preferLocalBuild on a few trivial top-level derivations. These 
tend to cause a lot of unnecessary I/O to the build machines.

svn path=/nixos/trunk/; revision=33936
 2012-04-26 15:19:23 +00:00
Eelco Dolstra 836fa3b6ae * Fix missing semicolon. 
svn path=/nixos/trunk/; revision=33933
 2012-04-26 14:53:58 +00:00
Eelco Dolstra 4d07f159a1 * Create /nix/var/nix/profiles/per-user with the right permissions. 
Fixes NixOS/149.

svn path=/nixos/trunk/; revision=33929
 2012-04-26 13:16:58 +00:00
Peter Simons 8b841505ff modules/services/networking/{dhclient,dhcpcd}.nix: ignore virtual veth* devices created by LXC/cgroups 
svn path=/nixos/trunk/; revision=33928
 2012-04-26 12:31:33 +00:00
Peter Simons 8c93993e1b modules/system/boot/luksroot.nix: fixed the descriptions of the options defined in this module 
svn path=/nixos/trunk/; revision=33927
 2012-04-26 12:21:45 +00:00
Peter Simons 86ba0c52b3 modules/services/networking/ssh/sshd.nix: stripped trailing whitespace 
svn path=/nixos/trunk/; revision=33926
 2012-04-26 08:13:24 +00:00
Peter Simons ee2fcb645b modules/services/networking/ssh/sshd.nix: don't write debug output to /tmp/log 
svn path=/nixos/trunk/; revision=33925
 2012-04-26 08:13:21 +00:00
Eelco Dolstra e6fd0fa893 * Cleanup. 
svn path=/nixos/trunk/; revision=33921
 2012-04-25 15:44:47 +00:00
Eelco Dolstra 43215ff80f * In the implementation of the ‘authorizedKeys’, don't delete all 
lines below a certain marker.  This is undesirable because commands
  like "ssh-copy-id" add keys to the end of the file.  Instead mark
  all automatically added lines individually.

svn path=/nixos/trunk/; revision=33918
 2012-04-25 14:14:20 +00:00
Ludovic Courtès a98ad26fea GNU: Comment `fdisk' out. 
svn path=/nixos/trunk/; revision=33907
 2012-04-24 12:54:42 +00:00
Eelco Dolstra ac4a059f8a * Put old NixOS configurations in a GRUB submenu. Contributed by 
Andreas Källberg.

svn path=/nixos/trunk/; revision=33891
 2012-04-23 15:47:03 +00:00
Eelco Dolstra 6c1bb54483 * In the installation CD, make the NixOS/Nixpkgs available as if they 
were obtained from the NixOS channel.  "nixos-install" copies this
  to the installed system as well.
* In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for
  the benefit of memory-constrained environments.

svn path=/nixos/trunk/; revision=33887
 2012-04-23 00:41:37 +00:00
Eelco Dolstra 72990dae37 * Add some missing GRUB modules. 
svn path=/nixos/trunk/; revision=33886
 2012-04-23 00:30:48 +00:00
Eelco Dolstra 9195b1125f * Include the version number in the mingetty greeting line. 
svn path=/nixos/trunk/; revision=33884
 2012-04-22 23:35:34 +00:00
Eelco Dolstra f1a99bd914 * Subscribe the root user to the NixOS channel by default. 
svn path=/nixos/trunk/; revision=33883
 2012-04-22 22:43:57 +00:00
Eelco Dolstra d96f330fcf * Slight simplification. 
svn path=/nixos/trunk/; revision=33877
 2012-04-22 16:28:08 +00:00
Eelco Dolstra d587329615 * Turn users.extraGroups into an attribute set (using types.loaOf). 
Also the gid is looked up in ids.gids if not specified.

svn path=/nixos/trunk/; revision=33860
 2012-04-20 12:55:09 +00:00
Eelco Dolstra 235ea24ec4 * Remove unused option "user". Not clear what it was supposed to do. 
svn path=/nixos/trunk/; revision=33857
 2012-04-20 12:22:08 +00:00
Eelco Dolstra fa50d105d7 * Pass -cpu kvm64 in NixOS VMs (and add a simple regression test for 
GMP).

svn path=/nixos/trunk/; revision=33849
 2012-04-19 18:56:35 +00:00
Eelco Dolstra 43f43fd185 * Only stop libvirt-guests automatically on system shutdown. 
Saving/restoring VMs is disruptive.

svn path=/nixos/trunk/; revision=33844
 2012-04-19 15:12:55 +00:00
Arie Middelkoop 0cb5673400 Some additional synaptics settings. 
svn path=/nixos/trunk/; revision=33837
 2012-04-19 08:29:22 +00:00
Arie Middelkoop 298e0e1829 Some additional xinetd settings. 
svn path=/nixos/trunk/; revision=33836
 2012-04-19 08:28:54 +00:00
Eelco Dolstra f8e36664a6 * Subtle: since nix-env processes flags in order, any ‘-I’ flag should 
come before ‘-f <nixos>’.

svn path=/nixos/trunk/; revision=33831
 2012-04-18 15:01:42 +00:00
Eelco Dolstra cb74284b75 * Handle the case where there is no GRUB 1 splash image. 
svn path=/nixos/trunk/; revision=33830
 2012-04-18 14:28:30 +00:00
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
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 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 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
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
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 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 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 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
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