Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging
2016-08-29 00:24:47 +00:00
Thomas Tuegel
1074c159f7
nixos/cpu-freq: list correct default governor in description
2016-08-28 17:14:37 -05:00
obadz
92d929c884
Merge branch 'master' into staging
2016-08-28 14:48:02 +01:00
obadz
4f299fdd53
nixos/modules/rename.nix: fix eval error
...
cc @Profpatsch @joachifm @domenkozar
2016-08-28 14:47:24 +01:00
obadz
c7142c1aa3
Merge branch 'master' into staging
2016-08-28 13:33:13 +01:00
Domen Kožar
e01e92f12f
Merge pull request #15025 from ericsagnes/modules/manual
...
manual: automatically generate modules documentation
2016-08-28 13:57:34 +02:00
Domen Kožar
4af09e0031
Merge pull request #14311 from Profpatsch/mkRemovedOptionModule-replacement
...
mkRemovedOptionModule: add replacement argument
2016-08-28 13:55:28 +02:00
obadz
57ddc155fc
Merge branch 'master' into staging
...
Conflicts:
pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
obadz
f0da094b2e
virtualbox-image: remove raw image (hopefully fixes ova tests)
...
See also 80660f8
2016-08-28 11:33:15 +01:00
Bjørn Forsman
26f65ae860
nixos/redis: enforce owner/perms on /var/lib/redis ( #18046 )
...
Previously it was only set once, now it is enforced on each start-up of
redis.service. Also set _ownership_ recursively, so that the
/var/lib/redis/dump.rdb file is guaranteed to be accessible by the
currently configured redis user.
Fixes issue #9687 , where redis wouldn't start because /var/lib/redis had
wrong owner.
2016-08-28 08:05:14 +00:00
obadz
3de6e5be50
Merge branch 'master' into staging
...
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Nikolay Amiantov
3f70fcd4c1
Merge pull request #11484 from oxij/nixos-toposort-filesystems
...
lib: add toposort, nixos: use toposort for fileSystems to properly support bind and move mounts
2016-08-27 14:34:55 +04:00
obadz
80660f8261
virtualbox-image: use vmdk wrapper instead of vdi copy (avoids 1 disk copy)
2016-08-27 03:02:53 +01:00
obadz
58db7f508f
virtualbox-image: remove configFile to let clone-config do its job in demo
...
Fixes #13927
cc @edolstra
configFile in make-disk-image clashes with clone-config as the latter does
nothing if it finds a a /etc/nixos/configuration.nix during stage-2.
2016-08-27 02:07:47 +01:00
Franz Pletz
eba0098eab
nixos/doc/gitlab: fix build
2016-08-26 15:47:39 +02:00
Joachim F
0cbba7c673
Merge pull request #17941 from romildo/upd.efl
...
efl: 1.17.2 -> 1.18.0
2016-08-26 15:04:29 +02:00
Franz Pletz
d70f83e7e9
gitlab: 8.10.6 -> 8.11.2
2016-08-26 15:03:19 +02:00
Graham Christensen
8d10928ad0
Merge pull request #17908 from Mic92/ferm
...
Ferm
2016-08-25 20:38:02 -04:00
Robin Gloster
c011aa86ab
nginx module: add index and tryFiles
2016-08-25 23:27:56 +00:00
Jörg Thalheim
7b354ce8cc
ferm: init at 2.3
2016-08-25 21:37:19 +02:00
Profpatsch
56a320d4a3
nixos/pulseaudio: remove stray load-modules
...
There was an additional load-modules put into `default.pa` which caused
pulse to fail.
2016-08-25 19:34:57 +02:00
Bjørn Forsman
fbf9162cbb
treewide: cups_filters -> cups-filters
2016-08-25 17:48:35 +02:00
Carles Pagès
3374aa25bc
cjdns: fix assertion.
2016-08-25 08:57:18 +02:00
Bjørn Forsman
6cd8f48327
nixos/filesystems: update /etc/fstab comment header
2016-08-24 20:40:58 +02:00
Igor Pashev
7e48ecc0c0
Merge nixpkgs.config.perlPackageOverrides
2016-08-24 19:58:45 +02:00
obadz
e208e698f9
deleted: nixos/modules/virtualisation/qemu-opts (file likely checked in by accident)
2016-08-24 18:07:43 +01:00
obadz
697518d467
nixos-install: remove manifest related stuff
2016-08-24 16:09:30 +01:00
Franz Pletz
c0fa26ef3b
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-08-24 11:01:53 +02:00
Markus Mueller
07c44b81c3
ldap: Add option for NSS integration
2016-08-23 21:12:51 +02:00
Markus Mueller
e04c3506eb
ldap: Add option for login PAM integration
2016-08-23 21:12:51 +02:00
Jan Malakhovski
b267785c43
nixos: generalize copy-paste from stage-1 and zfs to utils
2016-08-23 18:14:06 +00:00
Jan Malakhovski
8da59c406c
nixos: copy resize2fs only for stage-1 fileSystems
2016-08-23 18:14:05 +00:00
Jan Malakhovski
65d26c4dc1
nixos: apply toposort to fileSystems to support bind and move mounts
...
And use new `config.system.build.fileSystems` property everywhere.
2016-08-23 18:14:05 +00:00
Jan Malakhovski
2c8ca0d1bd
nixos: tasks/fileSystems: cleanup
2016-08-23 18:02:07 +00:00
Jan Malakhovski
1266852fd8
Revert a soon to be useless pice of "nixos/stage-1: add mechanism which lustrates all impurities from / ( #17784 )"
...
This reverts a pice of commit 3d16af70bf
2016-08-23 17:48:14 +00:00
Robin Gloster
7413278f9b
Revert "Remove lsh, broken & unmaintained"
...
This reverts commit 73f4c2bdf8
2016-08-23 15:32:41 +00:00
Robin Gloster
3a18f06eab
Revert "lsh: remove last references"
...
This reverts commit 8329066d5e
2016-08-23 15:31:33 +00:00
José Romildo Malaquias
98a630586e
enlightenment: adapt service for efl-0.18.0
2016-08-23 11:50:45 -03:00
Nikolay Amiantov
1df4dd6bf5
initrd-ssh service: ensure that keys got copied into initrd
...
Fixes #17927 .
2016-08-23 16:20:26 +03:00
Joachim Fasting
f3ef4383c6
nix-daemon service: fix unbalanced parens in description
2016-08-23 13:06:25 +02:00
Tuomas Tynkkynen
01c197df68
glib: Add some FIXMEs about inappropriate outputs
2016-08-23 05:05:42 +03:00
Tuomas Tynkkynen
b61fbf3132
treewide: Fix output references to openssl
2016-08-23 04:53:27 +03:00
Tuomas Tynkkynen
8877efa65b
treewide: Fix output references to gnome.GConf
2016-08-23 04:52:57 +03:00
Tuomas Tynkkynen
c73aa79a8f
graphite service: Use correct output of cairo
2016-08-23 03:20:21 +03:00
Thomas Tuegel
cb78ef0eb3
kde5: colord-kde moved
2016-08-22 18:49:13 -05:00
Tuomas Tynkkynen
74a3a2cd7e
treewide: Use makeBinPath
2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
d3705faa56
treewide: Use makeLibraryPath in LD_LIBRARY_PATHs
2016-08-23 00:14:00 +03:00
Bjørn Forsman
8b18f3814f
treewide: update cifs-utils attr references (cifs_utils -> cifs-utils)
2016-08-22 17:28:26 +02:00
obadz
ba50fd7170
Merge branch 'master' into staging
2016-08-22 01:18:11 +01:00
obadz
3d16af70bf
nixos/stage-1: add mechanism which lustrates all impurities from / ( #17784 )
...
lustrate /ˈlʌstreɪt/ verb.
purify by expiatory sacrifice, ceremonial washing, or some other
ritual action.
- sudo touch /etc/NIXOS_LUSTRATE
⇒ on next reboot, during stage 1, everything but /nix and /boot
is moved to /old-root
- echo "etc/passwd" | sudo tee -a /etc/NIXOS_LUSTRATE
⇒ on next reboot, during stage 1, everything but /nix and /boot
is moved to /old-root; except /etc/passwd is copied back.
Useful for installing NixOS in place on another distro. For instance:
$ nix-env -iE '_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config manual.manpages ]'
$ sudo mkdir /etc/nixos
$ sudo `which nixos-generate-config`
… edit the configuration files in /etc/nixos using man configuration.nix
if needed
maybe add: users.extraUsers.root.initialHashedPassword = "" ?
… Build the entire NixOS system and link it to the system profile:
$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -A system --set
… If you were using a single user install:
$ sudo chown -R 0.0 /nix
… NixOS is about to take over
$ sudo touch /etc/NIXOS
$ sudo touch /etc/NIXOS_LUSTRATE
… Let's keep the configuration files we just created
$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
$ sudo mv -v /boot /boot.bak &&
sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
$ sudo reboot
… NixOS boots, Stage 1 moves all the old distro stuff in /old-root.
2016-08-22 01:15:13 +01:00
