Shea Levy
6c6d40452f
Stage 1 mounts securityfs, so require that in the kernel
2013-02-19 20:47:23 -05:00
Vladimír Čunát
9de455cf2e
Merge pull request #53 from jcumming/zfs.121204
...
add a zfs module
2013-02-19 11:35:20 -08:00
Vladimír Čunát
8e765363d5
Merge pull request #86 from maggesi/blcr-updates
...
blcr module: fix (and simplify)
2013-02-19 11:30:52 -08:00
Vladimír Čunát
c2a213e559
Merge pull request #70 from cpages/master
...
Support driSupport32Bit for nvidia legacy 304
2013-02-19 11:29:14 -08:00
Aristid Breitkreuz
37be1c8982
x11/mesa: driSupport32Bit for the mesa implementation
2013-02-19 18:28:25 +01:00
Shea Levy
338ef594c7
Add boot.initrd.compressor option
2013-02-19 11:55:39 -05:00
Shea Levy
b83be79adf
default-websockify: Stop when reconfigured (i.e. new ports added/removed)
2013-02-18 11:55:46 -05:00
Shea Levy
762ea5c578
websockify: Add unit descriptions
2013-02-18 11:55:10 -05:00
Shea Levy
969fe07be6
Websockify: End descriptions with a period.
2013-02-18 11:51:33 -05:00
Eelco Dolstra
18e8724e64
Log the configuration when booting / switching
2013-02-18 15:39:47 +01:00
Eelco Dolstra
202340e3f6
nixos-rebuild build-vm: Override filesystems defined in the normal config
2013-02-18 15:39:47 +01:00
Peter Simons
a5e443295b
Merge pull request #90 from iElectric/xbmc
...
Add xbmc window manager
2013-02-18 01:31:43 -08:00
Peter Simons
09bfc9a53e
modules/config/fonts.nix: revert "export GDFONTPATH in /etc/profile"
...
This reverts commit 2802538dc2
. The idea
was good, but unfortunately $GDFONTPATH has a different format, i.e.
programs that use this variable don't descend into the directories
listed here like fontconfig does, so we cannot use the same values for
both settings.
2013-02-17 23:13:27 +01:00
Peter Simons
2802538dc2
modules/config/fonts.nix: export GDFONTPATH in /etc/profile
...
Set the environment variable GDFONTPATH to the list of directories where fonts
are expected to be installed. This is search path is used by same GD-based
applications, such as Gnuplot.
Alternatively, we could rely on fontconfig to achieve the same thing, i.e. by
running
for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq
to get that list at run-time, but the static approach feels more deterministic.
2013-02-17 22:47:08 +01:00
Domen Kozar
4a66331625
add xbmc window manager
2013-02-16 23:19:09 +01:00
Eelco Dolstra
233cc2fdaa
Add a module for MiniDLNA
...
Now my NixOS machine can serve videos to my Bluray player!
2013-02-16 23:08:53 +01:00
Shea Levy
08fdc234c8
Fix manual build
2013-02-15 14:36:20 -05:00
Shea Levy
59a4df3159
Add websockify service
2013-02-14 21:50:41 -05:00
Shea Levy
3ad424632b
Linux 3.6 has been EOL'd, hopefully 3.7 works for the fuloong2f
2013-02-14 14:37:00 -05:00
Shea Levy
b669633d63
gummiboot-builder.py: Handle the case where there's no /etc/machine-id.
...
Bug hit by add^_ in IRC when installing from the livecd, as there's no /mnt/etc/machine-id
2013-02-12 10:47:52 -05:00
Eelco Dolstra
46b7ddf402
Add option to disable predictable network interface naming
2013-02-11 16:01:01 +01:00
Evgeny Egorochkin
aaffb21f25
bluetooth: add the systemd unit needed for activation by recent bluez versions
2013-02-10 20:30:02 +02:00
Evgeny Egorochkin
06f90c6ffc
Tor-privoxy: quick and dirty fix for activation under systemd
2013-02-10 20:29:17 +02:00
Marco Maggesi
c593065585
Fix (and simplify) the blcr module.
2013-02-08 08:57:42 +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
Eelco Dolstra
8ef4074811
Use nss_myhostname from systemd
2013-02-04 15:50:37 +01: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
979117b6b8
Selectively allow /etc files to be disabled
...
For instance, if you don't want NixOS to emit /etc/hosts, you
can say:
environment.etc.hosts.enable = false;
2013-02-03 14:28:18 +01:00
Eelco Dolstra
1daab1ebf5
environment.etc: Add convenience option 'text'
...
This allows writing
environment.etc.hosts.text = "127.0.0.1 localhost";
instead of
environment.etc.hosts.source = pkgs.writeText "hosts" "127.0.0.1 localhost";
2013-02-03 14:28:18 +01:00
Eelco Dolstra
ab238804b8
Turn environment.etc into an attribute set
...
This provides a more convenient syntax and allows easier overriding.
For example,
environment.etc = singleton
{ target = "vconsole.conf";
source = vconsoleConf;
};
can now be written as
environment.etc."vconsole.conf".source = vconsoleConf;
2013-02-03 14:28:18 +01:00
Eelco Dolstra
73152e1702
etc.nix: Fix style
2013-02-03 14:28:17 +01:00
Shea Levy
36088abb39
gummiboot-builder: Only read /etc/machine-id once per invocation
2013-02-02 21:16:12 -05:00
Shea Levy
d57df55566
gummiboot-builder: When NIXOS_INSTALL_GRUB is set and efibootmgr is used, prepend the gummiboot entry to the boot entries list
2013-02-02 21:10:09 -05:00
Shea Levy
c384ea26e4
Update iso_efi to use gummiboot
2013-02-02 00:54:05 -05:00
Shea Levy
3f37031c4f
Merge branch 'gummiboot' into upstream-master
2013-02-02 00:04:31 -05:00
Shea Levy
02e209b139
Add gummiboot module.
...
We should probably eventually get rid of the old direct boot stub approach.
2013-02-02 00:03:45 -05:00
Eelco Dolstra
88e4569147
systemd: Allow whitespace in environment values
2013-02-01 13:40:44 +01:00
Lluís Batlle i Rossell
3c2f45695f
Merge branch 'raspberrypi'
...
Adding support for the kind of bootloader in raspberrypi. Disable grub,
disable generationsDir, enable boot.loader.raspberrypi.
Usual layout expected: /boot being the first vfat the board reads blobs from.
2013-01-31 18:55:12 +01:00
Lluís Batlle i Rossell
9e63011176
Fixing the doublePatchelf in initrd; it should be for all ARM.
2013-01-31 18:55:06 +01:00
Lluís Batlle i Rossell
d1a9ccbaf4
Changing ensureDir -> mkdir -p
...
(told by shlevy)
2013-01-30 20:58:00 +01:00
Lluís Batlle i Rossell
a61154c0d4
Adding support of the Intel 2230 wireless card to nixos
...
It should go to the livecd, added to the all-hardware profile.
Yes, the card is called 2230, the ucode called 2030:
http://wireless.kernel.org/en/users/Drivers/iwlwifi
2013-01-30 20:51:49 +01:00
Lluís Batlle i Rossell
d50b22e882
Adding vaapi drivers to nixos
...
Enabling nvidia and intel drivers by default. I tried both,
and they work fine with "vlc --ffmpeg-hw".
2013-01-30 20:40:55 +01:00
Eelco Dolstra
37985ad66b
Make xz available by default
...
NixOS depends on xz anyway, so we may as well make it available.
2013-01-30 15:01:31 +01:00
Eelco Dolstra
b89f941b20
Provide missing command suggestions, Ubuntu style
...
If the user tries to run a program that doesn't exist from Bash, the
program name is looked up in a database that maps to Nix package
names. If it is found, we print out a message like:
$ pdflatex
The program ‘pdflatex’ is currently not installed. It is provided by
several packages. You can install it by typing one of the following:
nix-env -i tetex
nix-env -i texlive-core
If the environment variable $NIX_AUTO_INSTALL is set, the command is
installed and executed automatically:
$ hello --version
The program ‘hello’ is currently not installed. It is provided by
the package ‘hello’, which I will now install for you.
installing `hello-2.8'
hello (GNU hello) 2.8
Copyright (C) 2011 Free Software Foundation, Inc. ...
To use this, you must currently manually put the SQLite programs
database in /var/lib/nixos/programs.sqlite. In the future, this file
should be provided as part of the NixOS channel so it gets updated
automatically. To get a test version:
$ curl http://nixos.org/~eelco/programs.sqlite.xz | xz -d > /var/lib/nixos/programs.sqlite
2013-01-30 15:00:59 +01:00
Eelco Dolstra
2f97304833
Add an option ‘environment.interactiveShellInit’
...
This is like ‘environment.shellInit’, but only for interactive shells.
2013-01-30 14:05:53 +01:00
Shea Levy
41eaa4615f
linuxPackages_2_6_32_xen is gone
2013-01-30 02:43:37 -05:00
Lluís Batlle i Rossell
2c27a41686
Fixing the init= in raspberrypi loader.
2013-01-29 20:08:38 +01:00
Lluís Batlle i Rossell
fe85f4be6c
Adding an untested bootloader for raspberrypi
2013-01-28 20:58:46 +00:00
Lluís Batlle i Rossell
39ccd50896
Fixing the doublePatchelf in initrd; it should be for all ARM.
2013-01-27 20:42:45 +00:00
Rickard Nilsson
45522d0806
mpd: Adjust service definition to systemd
2013-01-27 20:21:04 +01:00
Rickard Nilsson
27414c4656
nslcd: Adjust service definition to systemd
2013-01-27 20:07:37 +01: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
Rickard Nilsson
8fe8ab7097
switch-to-configuration.pl: Fix parsing of comments in fstab, hash-tokens inside strings are not comments.
2013-01-25 15:54:45 +01:00
Rickard Nilsson
e32e501435
activation: Don't use double quotes in boot loader warning message, it messes up perl system call
2013-01-25 15:47:38 +01:00
Shea Levy
28cf26d674
Remove unneeded /nix/rw-store creation when using readOnlyStore
2013-01-24 20:50:28 -05:00
Peter Simons
d241240ba4
spamassassin: convert module to systemd
2013-01-24 18:37:25 +01:00
Eelco Dolstra
859d75186a
Put the root FS of S3-backed instances on ext4
2013-01-24 18:14:13 +01:00
Eelco Dolstra
001ddd1799
Get the VirtualBox image generation to work again
2013-01-24 16:42:37 +01:00
Eelco Dolstra
f0a1e5e356
Use systemd.targets to define ip-up
2013-01-24 15:40:56 +01:00
Eelco Dolstra
7464d850d3
Start a getty on tty1 again
2013-01-24 14:55:55 +01:00
Eelco Dolstra
685a901597
Fix description of powerManagement.cpuFreqGovernor
2013-01-24 13:55:59 +01:00
Eelco Dolstra
0930befd58
nix-daemon: Put back the --daemon flag
...
That flag doesn't do anything, except that it allows setting the
client PID in the process title of the children.
2013-01-24 13:34:47 +01:00
Eelco Dolstra
4ac619f6e5
Turn on nix.readOnlyStore again
2013-01-24 13:09:31 +01:00
Eelco Dolstra
8e1f243b30
xserver.nix: Check whether Polkit is enabled
...
Our X session script requires Polkit because it calls systemd-inhibit.
2013-01-24 13:06:32 +01:00
Eelco Dolstra
bd328680ce
Revert "Enable nix.readOnlyStore by default"
...
This reverts commit 683100666d
.
Seems somebody (systemd? the kernel?) gets confused at power
events and remounts the filesystem containing /nix/store as
read-only.
2013-01-24 10:28:34 +01:00
Eelco Dolstra
683100666d
Enable nix.readOnlyStore by default
2013-01-23 23:41:01 +01:00
Eelco Dolstra
75662a45d6
wpa_supplicant: Remove accidentally committed debug flag
2013-01-23 22:07:40 +01:00
Eelco Dolstra
6580588230
Set $HOME in stage-2
...
http://hydra.nixos.org/build/3900294
2013-01-23 20:16:33 +01:00
Eelco Dolstra
7a382679e4
Revert 434260c772
...
There is a bug in unionfs, but it only manifested itself because of
our accidental use of stage-1 libraries in stage-2.
2013-01-23 14:46:54 +01:00
Eelco Dolstra
ef5108f560
Fix registering valid paths in VM tests
...
Commit 37b56574e2
revealed that the code
to get regInfo from /proc/cmdline was broken. It only happened to
work because the kernel passes the command line to stage 1 through the
environment, so $regInfo was set anyway.
2013-01-23 14:35:52 +01:00
Eelco Dolstra
37b56574e2
stage-1: Clear environment before calling stage-2
...
In particular, stage-1's LD_LIBRARY_PATH should not infect stage-2.
Reported by viric.
2013-01-23 11:51:58 +01:00
Eelco Dolstra
314adf9648
nixos-rebuild: Don't rely on $SHELL
...
Fixes #74 .
2013-01-23 11:31:48 +01:00
Rickard Nilsson
4eb2b099e6
Generate share/glib-2.0/schemas/gschemas.compiled in system-path.
...
This is required to create a gschemas.compiled file with content
from all gschemas. Otherwise, gschemas.compiled will be taken
from a random package, and gsettings programs will not find what
they are looking for. I had to add this to get NetworkManager-applet
to work. You'll also have to add share/glib-2.0 to the pathsToLink
list.
Generating this in the activation script (along with gtk icons
etc), is not the nicest solution. But I have no real idea on
how to modularise it.
2013-01-23 09:10:14 +01:00
Eelco Dolstra
2b8cb59399
Fix the fix of the description of the memtest86 option
2013-01-22 19:25:14 +01:00
Eelco Dolstra
434260c772
Work around a bug in unionfs
...
Unionfs cannot delete directories that contain open deleted files.
This broke a Nix test.
http://hydra.nixos.org/build/3843354
2013-01-22 18:18:05 +01:00
Eelco Dolstra
ca4f93d3ae
stage-1: Don't create a log file in $out
2013-01-22 18:18:05 +01:00
Lluís Batlle i Rossell
64ffca1e06
Fixing the description of memtest86. It's not memtest86+.
...
Noticed by abogani@freenode
2013-01-22 16:32:51 +01:00
Eelco Dolstra
fc14a31f2c
unionfs: Increase the open file limit
...
The default (1024) is way too low, e.g. to start KDE on the
installation CD.
2013-01-22 13:31:08 +01:00
Eelco Dolstra
4068648563
Blacklist the cirrusfb kernel module
2013-01-22 13:30:45 +01:00
Eelco Dolstra
dd760bac9c
Fix help message
2013-01-22 12:52:13 +01:00
Eelco Dolstra
d75fa1fdc1
wpa_supplicant: Use the nl80211 and wext drivers by default
...
This should make wpa_supplicant work out of the box on newer and older
kernels.
2013-01-22 12:33:41 +01:00
Shea Levy
82fb34f409
Upstart -> systemd
2013-01-21 18:14:09 -05:00
Eelco Dolstra
f2c2b7ace9
Don't start emergency mode on EC2 instances
...
EC2 instances don't have a console, so it's pointless to start
emergency mode if a mount fails. (This happened to me with an
encrypted filesystem where the key wasn't sent on time using "charon
send-keys".) Better to cross fingers and continue booting.
2013-01-21 21:01:48 +01:00
Eelco Dolstra
1aaa726e75
Merge remote-tracking branch 'origin/systemd'
2013-01-21 12:45:50 +01:00
Rickard Nilsson
1440e92ae8
Rename NetworkManager-init service to networkmanager-init
2013-01-17 13:37:54 +01:00
Rickard Nilsson
c6bb091b5b
Rewrite NetworkManager job to systemd service
2013-01-17 12:51:52 +01:00
Carles Pagès
3965f46085
Merge remote-tracking branch 'upstream/master'
2013-01-16 22:53:39 +01:00
Carles Pagès
ab29ea3c37
Support driSupport32Bit for nvidia legacy 304.
...
I need this for steam to work with some older cards.
2013-01-16 22:49:21 +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
f290808509
Set some missing types
2013-01-16 15:03:54 +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