Tuomas Tynkkynen
6d176afe5e
generic-extlinux-compatible: Add new bootloader for ARM
...
This module generates a /boot/extlinux/extlinux.conf bootloader
configuration file that is supported by e.g. U-Boot:
http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master
With this, all ARM boards supported by U-Boot can be booted in a common
way (a single boot file generator, all boards booting via initrd like
x86) and with same boot menu functionality as GRUB has.
-- sample extlinux.conf file --
# Generated file, all changes will be lost on nixos-rebuild!
# Change this to e.g. nixos-42 to temporarily boot to an older configuration.
DEFAULT nixos-default
TIMEOUT 50
LABEL nixos-default
MENU LABEL NixOS - Default
LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf
LABEL nixos-71
MENU LABEL NixOS - Configuration 71 (2015-05-17 21:32 - 15.06.git.0b7a7a6M)
LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf
2015-05-17 23:38:03 +03:00
Richard Zetterberg
bd5011fc34
Fixes eval and build error of nova image builder
2015-05-17 20:55:07 +02:00
Arseniy Seroka
0b3e2becca
Merge pull request #7829 from joamaki/vmware_guest
...
VMWare guest support and open-vm-tools package
2015-05-15 15:13:30 +03:00
Jussi Maki
6a0d21eb86
VMWare guest support and open-vm-tools package
2015-05-15 12:43:21 +02:00
Arseniy Seroka
946e7dca61
Merge pull request #7842 from dezgeg/pr-nix-serve
...
nix-serve: Add nixos module
2015-05-14 22:44:43 +03:00
lethalman
1103392dd9
Merge pull request #7794 from womfoo/kbdlight
...
Add kbdlight package and setuid wrapper
2015-05-14 17:09:28 +02:00
Tuomas Tynkkynen
fd8cb1ff2d
nix-serve: Add nixos module
...
This allows sharing the Nix store of the machine as a binary cache
simply by setting 'services.nix-serve.enable = true'.
2015-05-14 12:27:28 +03:00
Eelco Dolstra
fc8011ad8d
Ensure that nscd, sshd are created as system users
...
c0f70b4694
removed the fixed uid
assignment, but then it becomes necessary to set isSystemUser.
http://hydra.nixos.org/build/22182588
2015-05-13 16:23:36 +02:00
Nikolay Amiantov
e9679ce32a
postgresql-backup: use system postgresql package
2015-05-13 16:06:50 +03:00
William A. Kennington III
2806491cc4
nixos/consul: Add shell for health checks
2015-05-11 17:44:07 -07:00
William A. Kennington III
b6e26aa8df
nixos/consul: Support a config directory for health checks
2015-05-11 16:45:04 -07:00
William A. Kennington III
1938dc9b54
nixos/consul: Remove the joinNodes and joinRetries options as they are now built in consul options
2015-05-11 16:27:53 -07:00
Arseniy Seroka
26492cdba3
Merge pull request #7434 from Forkk/plex-media-server
...
plex: add support for managing plugins via Nix
2015-05-11 14:48:30 +03:00
Eelco Dolstra
492471b453
Apply some overrides to upstream systemd units
...
This removes the need for the following patches:
9a6cade993
9f7e832c90
2015-05-11 12:43:35 +02:00
Arseniy Seroka
c0727fb751
Merge pull request #7788 from Lassulus/charybdis
...
add charybdis nixos module
2015-05-11 12:57:58 +03:00
lassulus
304cab2b46
add charybdis nixos module
2015-05-11 11:38:53 +02:00
Domen Kožar
bb4d658f64
Merge branch 'master' into staging
...
Conflicts:
nixos/doc/manual/release-notes/rl-unstable.xml
nixos/modules/services/printing/cupsd.nix
pkgs/applications/misc/calibre/default.nix
pkgs/development/haskell-modules/hackage-packages.nix
pkgs/development/libraries/libsodium/default.nix
pkgs/misc/emulators/wine/unstable.nix
pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Kranium Gikos Mendoza
6f634e3c3a
Add kbdlight package and setuid wrapper
...
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
2015-05-11 13:23:01 +08:00
Ricardo M. Correia
aa75bb25d8
grsecurity: Update stable and test patches
...
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test: 3.1-4.0.2-201505072057 -> 3.1-4.0.2-201505101122
2015-05-11 02:45:38 +02:00
Charles Strahan
ba186ec4b9
mesos service: only pass --zk if quorum > 0
...
The ZooKeeper URL is not necessary when using in-memory slave
registration.
2015-05-10 19:36:20 -04:00
Charles Strahan
760169663e
mesos: fix indentation in service definition
2015-05-10 17:23:33 -04:00
Jascha Geerds
19dbe42aeb
Revert "cups: Rename "browsing" config option to "advertise""
...
This reverts commit 48e65cec4e
.
2015-05-10 20:47:50 +02:00
Jascha Geerds
652d06207d
cups: Rename "browsing" config option to "advertise"
2015-05-10 13:46:32 +02:00
Jascha Geerds
6f69dd46d7
cups: Add defaultShared, browsing and webInterace config option
2015-05-10 13:46:32 +02:00
Jascha Geerds
f4d9c9043c
cups: Remove deprecated config options from cupsd.conf
2015-05-10 13:46:32 +02:00
Jascha Geerds
e9cf6cd34f
cups: Use systemd files provided by CUPS
2015-05-10 13:46:32 +02:00
Jascha Geerds
48e65cec4e
cups: Rename "browsing" config option to "advertise"
2015-05-10 12:41:21 +02:00
Jascha Geerds
2cc8d15653
cups: Add defaultShared, browsing and webInterace config option
2015-05-10 12:41:21 +02:00
Jascha Geerds
3710dbec05
cups: Remove deprecated config options from cupsd.conf
2015-05-10 12:41:20 +02:00
Jascha Geerds
4ac95ab328
cups: Use systemd files provided by CUPS
2015-05-10 12:41:20 +02:00
Lluís Batlle i Rossell
21dd114f82
Revert "Making nixos keep a ref to its stdenv"
...
This reverts commit d170c98d13
.
niksnut argues that we need smaller system closures, not bigger.
So users facing the trouble of getting gcc rebuilds after nix-collect-garbage
for any minimal nixos configuration change should use other means of
not losing the stdenv output.
One way is to keep one somewhere: nix-build -A stdenv -o stdenv '<nixpkgs>'.
Another may be to use nix.conf options like gc-keep-outputs, gc-keep-derivations
or env-keep-derivations.
2015-05-09 21:11:49 +00:00
Lluís Batlle i Rossell
d170c98d13
Making nixos keep a ref to its stdenv
...
This will help a lot on ARM, where nix-collect-garbage erases gcc; then, any
change to a small system config file requires rebuilding gcc again.
I don't know why it does not happen on x86. Maybe it just pulls the gcc from
hydra, if garbage is collected.
2015-05-09 20:19:34 +00:00
Lluís Batlle i Rossell
d8a2bb86c0
Raspberry Pi 2 changes to make it boot.
...
It boots, but some things still don't work:
1) Installation of DTBs
2) Boot of initrd
Booting still needs a proper config.txt in /boot, which could probably be
managed by NixOS.
2015-05-09 17:05:24 +00:00
William A. Kennington III
c9395e1e92
Merge branch 'master' into staging
2015-05-08 05:59:50 -07:00
Rob Vermaas
650d3f8fc4
Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared.
...
(cherry picked from commit ccf672ca6b055e5e862e45b65d122754c16cf7d1)
2015-05-07 08:51:38 +00:00
William A. Kennington III
074c4a7f78
Merge remote-tracking branch 'upstream/master' into staging
2015-05-07 01:44:49 -07:00
Joachim Schiele
7aed6ddbb4
Merge pull request #7482 from qknight/mysql_socket_permissions
...
/run/mysqld now 0755 (instead 0700)
2015-05-07 01:55:00 +02:00
Joachim Schiele
db79335c07
mysql: /run/mysql now 0755 (instead 0700)
...
see https://github.com/NixOS/nixpkgs/pull/7482
2015-05-07 01:51:05 +02:00
Pascal Wittmann
40b9e938b6
postfix service: description enhancement
...
closes #7651
2015-05-06 21:53:39 +02:00
Stephen Weinberg
a6ebccfbb8
Sane default configuration for sabnzbd module
...
Added option to set user. Use unpriviledged user by default. Add sane
default for configuration location.
2015-05-05 00:18:22 -04:00
Aristid Breitkreuz
5ccbfb2dcc
tarsnap: fix up permissions of existing cache directories
2015-05-04 18:58:35 +00:00
Eelco Dolstra
4239e276ea
fetch-ec2-data: Don't restart
...
This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.
2015-05-04 16:56:46 +02:00
Eelco Dolstra
28e49dcb41
Style fix
2015-05-04 14:18:14 +02:00
Eelco Dolstra
c2bf9c3ee3
Typo
2015-05-04 14:16:19 +02:00
lethalman
f2870bd77d
Merge pull request #7601 from cstrahan/iso-name-fix
...
nixos: fix infinite recursion in isoImage.isoName
2015-05-04 10:24:38 +02:00
Thomas Tuegel
2325791c2b
plasma53: patch upstream startkde
...
Rather than shipping our own startkde script, we will go back to
patching upstream's script. This will be less confusing to potential
contributors.
2015-05-03 17:09:50 -05:00
Philip Potter
2216728979
add support for pam_u2f to nixos pam module
...
This adds support for authenticating using a U2F device such as a
yubikey neo.
2015-05-03 19:22:00 +01:00
Steven Shaw
2a8577d7fe
Correct spelling
2015-05-03 19:15:03 +10:00
Domen Kožar
00ef77f426
Merge pull request #7565 from offlinehacker/nixos/confd/module
...
nixos: add confd module
2015-05-02 14:43:02 +02:00
William A. Kennington III
00df204c82
Merge remote-tracking branch 'upstream/master' into staging
2015-05-01 15:57:09 -07:00
Charles Strahan
ba50d48400
mbpfan: service improvements
...
* add verbosity setting
* don't set mbpfan as a setuid program
2015-05-01 17:11:55 -04:00
Charles Strahan
d83399dcd9
mgpfan: new service
2015-04-30 21:21:15 -04:00
Jascha Geerds
6823b5e657
Merge pull request #7636 from bramd/brltty
...
Added BRLTTY package
2015-05-01 00:21:49 +02:00
Alexei Robyn
60da99ea2a
grub module: removed invalid device check for grub EFI installation
2015-04-30 19:28:34 +10:00
aszlig
4cdb4a4fef
networkd: Fix evaluation of systemd.network units.
...
During the refactor of the networkd stuff in f8dbe5f
, a lot of the
options are now needed by systemd.nix as well as networkd.nix but
weren't moved by that commit as well.
For now, this fixes all networkd VM tests except for the macvlan one and
thus it should fix #7505 for at least DHCP-based configuration.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-30 06:49:10 +02:00
aszlig
49fa00cded
networkd: Fix disabled networkd units.
...
In f8dbe5f
, the default value for networking unit "enabled" option
suddenly flipped to false. I have no idea of whether this happened by
accident, but I'm setting it to true again, because it essentially
breaks systemd networking support and we have systemd.network.enable to
have a "turn the world off" switch.
And of course, because the mentioned commit obviously wasn't done with
even a run of the simplest run of one of the network VM tests, we now
get an evaluation error if we switch useNetworkd to true.
Fixes the core issue of #7505 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-30 06:49:10 +02:00
Bram Duvigneau
9a535b9023
Added BRLTTY package
2015-04-29 23:02:09 +02:00
Domen Kožar
ff88f4bcda
nixos-install: correctly detect stdin
2015-04-29 18:48:21 +02:00
Thomas Tuegel
1fe28a1132
Merge remote-tracking branch 'upstream/master' into staging
2015-04-29 11:33:28 -05:00
Rob Vermaas
ad0bd73775
Work around infinite recursion issue in nixops.
2015-04-29 09:55:20 +00:00
Arseniy Seroka
8150cf11b0
Merge pull request #7605 from ip1981/wiki
...
Mediawiki updates
2015-04-28 19:00:27 +03:00
Ricardo M. Correia
f5e7190572
nixos.system_tarball_pc: Fix evaluation
...
It was broken due to 57b05765c9
.
ZFS requires `networking.hostId` to be set.
2015-04-28 17:15:02 +02:00
Herwig Hochleitner
8233fd5c6a
i2p: add service to module-list
2015-04-28 14:35:36 +02:00
Jaka Hudoklin
f5bc58d733
Merge pull request #7545 from offlinehacker/pkgs/kubernetes/fixes
...
kubernetes: update to 0.15, module fixes
2015-04-28 14:12:53 +02:00
Jaka Hudoklin
7b878a7ca9
Merge pull request #7555 from offlinehacker/nixos/nginx/reload
...
nixos/nginx: enable service/config reload
2015-04-28 14:12:21 +02:00
Jaka Hudoklin
ef6b88690d
Merge pull request #7549 from offlinehacker/nixos/ripple-data-api/importmode
...
nixos/ripple-data-api: add import mode option
2015-04-28 14:10:50 +02:00
Jookia
71910be9ea
nixos-install: Fix chroot flag not defaulting to Bash outside NixOS.
...
Passing the chroot flag to nixos-install without arguments should now give you a
Bash shell as intended rather than try an empty path.
This was masked by the user's shell (usually /bin/bash) being defaulted to by
chroot, and being found since their paths used NixOS conventions.
2015-04-28 06:37:04 -04:00
Jookia
7b37a5f168
nixos-install: Fix password prompt failing outside NixOS.
...
When bootstrapping from other distributions, nixos-install is unable to find
various tools in the chroot since their paths aren't aware of NixOS conventions.
This makes a small change to existing code by specifying nixpkgs/nixos instead
of just nixos when running nix-instantiate in the chroot. I haven't tested this
outside of bootstrapping, but the same specification is used elsewhere in the
code so I don't see why it wouldn't work.
2015-04-28 06:34:47 -04:00
Igor Pashev
4855b0b3fb
Mediawiki 1.23.9
2015-04-28 08:05:16 +00:00
Igor Pashev
bca76e46f0
Apache servedFiles: fixed a typo in example
2015-04-28 08:05:15 +00:00
Igor Pashev
8388bd3280
wiki: do not rewrite served files
2015-04-28 08:05:08 +00:00
Charles Strahan
a64e90bdef
nixos: fix infinite recursion in isoImage.isoName
2015-04-27 23:10:53 -04:00
Herwig Hochleitner
c600f5af25
gnome3: move definition of package sets into pkgs
2015-04-28 02:54:14 +02:00
Eelco Dolstra
19366a10fc
Remove redundant i18n.supportedLocales setting
...
This is already set in profiles/minimal.nix.
Probably fixes #7589 .
2015-04-27 19:21:28 +02:00
Eelco Dolstra
534b84a9ac
Don't require sslServerChain to be set
2015-04-27 18:24:16 +02:00
lethalman
9807dbc142
Merge pull request #7486 from oxij/actkbd-and-media-keys
...
add actkbd; nixos: add support for volume control with media keys
2015-04-27 12:31:15 +02:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Domen Kožar
ff12c3274a
Merge pull request #7548 from offlinehacker/etcdfix
...
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 22:14:55 +02:00
Jaka Hudoklin
a9cd286cd0
Merge pull request #7546 from offlinehacker/nixos/panamax/reload
...
nixos/fluentd: add support for config reload
2015-04-25 16:29:34 +02:00
Jaka Hudoklin
ffea231652
Merge pull request #7550 from offlinehacker/nixos/rippled/changes
...
nixos/rippled: new options, fixes
2015-04-25 16:28:15 +02:00
Jaka Hudoklin
ff095f5002
nixos: add node docker registry server
2015-04-25 16:16:34 +02:00
Jaka Hudoklin
6ca12344b3
nixos: add confd module
2015-04-25 16:10:49 +02:00
Emery Hemingway
34f1c39fe0
nixos: fix cjdns json config
...
filter extraneous attributes from config modules
2015-04-25 09:40:44 -04:00
Jaka Hudoklin
ec6ecce8cf
nixos/openvswitch: add ipsec gre tunnels support
2015-04-25 15:35:02 +02:00
Jaka Hudoklin
b5114de4ac
nixos: add racoon ipsec IKE deamon
2015-04-25 15:31:27 +02:00
Jaka Hudoklin
d6660af8ac
nixos/docker: set extraOptions to separatedString type
...
This change is needed if you want to pass extraOptions to docker in multiple
nixos modules.
2015-04-25 15:25:15 +02:00
Jaka Hudoklin
fb8bc4da21
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 15:21:49 +02:00
Jaka Hudoklin
494d1820e3
nixos/nginx: enable service/config reload
2015-04-25 15:17:06 +02:00
Jaka Hudoklin
54ddf2176b
nixos/rippled: new options, fixes
2015-04-25 14:39:24 +02:00
Jaka Hudoklin
5984c04f1f
nixos/ripple-data-api: add import mode option
2015-04-25 14:38:05 +02:00
Jaka Hudoklin
f6bb49ad4a
nixos/fluentd: add support for config reload
2015-04-25 14:21:27 +02:00
Jaka Hudoklin
6cb195a83d
nixos/kubernetes: fix module
2015-04-25 14:18:25 +02:00
Luca Bruno
db3b86560f
GNOME 3.16.1, closes #7357
2015-04-25 12:02:33 +02:00
Edward Tjörnhammar
4ea47155af
Merge pull request #7498 from k0ral/sslh
...
sslh: argument to -F can no longer be separated from the option by a space
2015-04-23 21:35:46 +02:00
Dan Peebles
81d8074881
Add hologram service
2015-04-23 14:30:12 -04:00
Oliver Matthews
a498b28322
wait for filesystem before starting btsync; bump to latest package version
2015-04-23 13:09:34 +00:00
koral
88ce17b6e1
sslh: argument to -F can no longer be separated from the option by a space
2015-04-21 16:29:25 +00:00
Nicolas B. Pierron
7585d42d2b
Fix #7354 - Accept _module attributes added to every submodule.
2015-04-20 23:58:32 +02:00
Jan Malakhovski
57ab189e78
nixos: add actkbd module and sound.enableMediaKeys option
2015-04-20 17:11:19 +00:00
Nikolay Amiantov
0f5d5f9d12
lambdabot: add named pipe for incoming commands
2015-04-20 18:56:48 +03:00