3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2023 commits

Author SHA1 Message Date
Ricardo M. Correia 7a7bf8368e nixos-generate-config: Configure networking.hostId by default
The host id value gets generated by reading a 32-bit value from
/dev/urandom.

This makes programs that rely on a correct host id more reliable.

It also makes using ZFS more seamless, as you don't need to configure
the hostId manually; instead, it becomes part of your config from the
moment you install NixOS.
2014-11-12 22:31:50 +01:00
Ricardo M. Correia e9affb4274 nixos: Add system-wide option to set the hostid
The old boot.spl.hostid option was not working correctly due to an
upstream bug.

Instead, now we will create the /etc/hostid file so that all applications
(including the ZFS kernel modules, ZFS user-space applications and other
unrelated programs) pick-up the same system-wide host id. Note that glibc
(and by extension, the `hostid` program) also respect the host id configured in
/etc/hostid, if it exists.

The hostid option is now mandatory when using ZFS because otherwise, ZFS will
require you to force-import your ZFS pools if you want to use them, which is
undesirable because it disables some of the checks that ZFS does to make sure it
is safe to import a ZFS pool.

The /etc/hostid file must also exist when booting the initrd, before the SPL
kernel module is loaded, so that ZFS picks up the hostid correctly.

The complexity in creating the /etc/hostid file is due to having to
write the host ID as a 32-bit binary value, taking into account the
endianness of the machine, while using only shell commands and/or simple
utilities (to avoid exploding the size of the initrd).
2014-11-12 22:31:49 +01:00
Ricardo M. Correia 12e77fdc3f nixos/zfs: Improve the ZFS boot process
It turns out that the upstream systemd services that import ZFS pools contain
serious bugs. The first major problem is that importing pools fails if there
are no pools to import. The second major problem is that if a pool ends up in
/etc/zfs/zpool.cache but it disappears from the system (e.g. if you
reboot but during the reboot you unplug your ZFS-formatted USB pen drive),
then the import service will always fail and it will be impossible to get rid
of the pool from the cache (unless you manually delete the cache).

Also, the upstream service would always import all available ZFS pools every
boot, which may not be what is desired in some cases.

This commit will solve these problems in the following ways:

1. Ignore /etc/zfs/zpool.cache. This seems to be a major source of
issues, and also does not play well with NixOS's philosophy of
reproducible configurations. Instead, on every boot NixOS will try to import
the set of pools that are specified in its configuration.  This is also the
direction that upstream is moving towards.

2. Instead of trying to import all ZFS pools, only import those that are
actually necessary. NixOS will automatically determine these from the
config.fileSystems.* option. Also, the user can import any additional
pools every boot by adding them to the config.boot.zfs.extraPools
option, but this is only necessary if their filesystems are not
specified in config.fileSystems.*.

3. Added options to configure if ZFS should force-import ZFS pools. This may
currently be necessary, especially if your pools have not been correctly
imported with a proper host id configuration (which is probably true for 99% of
current NixOS ZFS users). Once host id configuration becomes mandatory when
using ZFS in NixOS and we are sure that most users have updated their
configurations and rebooted at least once, we should disable force-import by
default. Probably, this shouldn't be done before the next stable release.

WARNING: This commit may change the order in which your non-ZFS vs ZFS
filesystems are mounted.  To avoid this problem (now or in the future)
it is recommended that you set the 'mountpoint' property of your ZFS
filesystems to 'legacy', and that you manage them using
config.fileSystems, just like any other non-ZFS filesystem is usually
managed in NixOS.
2014-11-12 22:31:49 +01:00
Ricardo M. Correia 3b0fa60a98 zfs: Enable systemd
Also remove custom zfs services from NixOS.  This makes NixOS more aligned with
upstream.

More importantly, it prepares the way for NixOS to use ZED (the ZFS event
daemon). This service will automatically be enabled but it is not possible to
configure it via configuration.nix yet.
2014-11-12 22:31:49 +01:00
Michael Raskin 0d6306be4d Merge pull request #4950 from joachifm/dnscrypt-proxy
dnscrypt-proxy service
2014-11-13 00:25:05 +03:00
Michael Raskin 232f6bb4d2 Merge pull request #4929 from abbradar/prl-tools
Add packages and support for Parallel Guest Tools
2014-11-13 00:22:42 +03:00
Michael Raskin efe5eb4709 Merge pull request #4573 from fpletz/feature/lxc-configuration
Add support for global LXC config files
2014-11-13 00:14:46 +03:00
Eelco Dolstra 433a845081 Disable zfs in the ISO for now
It's giving zpool-import.service errors.

http://hydra.nixos.org/build/16883184
2014-11-12 15:32:21 +01:00
Longrin Wischnewski 490232bd2e apache-httpd: add mod_access_compat for compatibility with old httpd-22 configurations 2014-11-12 13:18:02 +01:00
Eelco Dolstra c5a7ff0afd Fix /dev/root udev rule in the ISO 2014-11-11 23:48:31 +01:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Nikolay Amiantov 32e18bc722 nixos/parallels-guest: add options 2014-11-12 01:26:23 +03:00
Joachim Fasting 52f0553209 Add dnscrypt-proxy service
The dnscrypt-proxy service relays regular DNS queries to
a DNSCrypt enabled upstream resolver.
The traffic between the client and the upstream resolver is
encrypted and authenticated, which may mitigate the risk of
MITM attacks and third-party snooping (assuming a trustworthy
upstream).

Though dnscrypt-proxy can run as a standalone DNS client,
the recommended setup is to use it as a forwarder for a
caching DNS client.
To use dnscrypt-proxy as a forwarder for dnsmasq, do

```nix
{
  # ...

  networking.nameservers = [ "127.0.0.1" ];
  networking.dhcpcd.extraConfig = "nohook resolv.conf";

  services.dnscrypt-proxy.enable = true;
  services.dnscrypt-proxy.localAddress = "127.0.0.1";
  services.dnscrypt-proxy.port = 40;

  services.dnsmasq.enable = true;
  services.dnsmasq.extraConfig = ''
    no-resolv
    server=127.0.0.1#40
    listen-address=127.0.0.1
  '';

  # ...
}
```
2014-11-11 22:47:19 +01:00
Luca Bruno b77d166b17 nixos: move bcache udev rule in a new bcache.nix module 2014-11-10 22:19:43 +01:00
Luca Bruno 31df4f70af nixos: Add boot.initrd.extraUdevRulesCommands 2014-11-10 22:19:43 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Brian McKenna a6bacd4d81 Add "light" package and setuid wrapper 2014-11-09 19:45:43 -07:00
Michael Raskin 6d0518fbdf Merge pull request #4282 from sztupi/crashplan
Crashplan

OK, it is an external service with unfree client, so let's declare that ensuring usability of the service is not our headache.
2014-11-09 18:09:33 +03:00
Edward Tjörnhammar c329e5bbd9 i2pd: added package, service 2014-11-09 09:55:35 +01:00
Emery Hemingway 67a2a58314 cjdns: service tweaks, new NixOS test 2014-11-08 23:39:02 +01:00
Nikolay Amiantov aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Luca Bruno 510fba95e8 nixos-rebuild: reload dbus before starting other units. Closes #4546 2014-11-08 19:40:28 +01:00
Aristid Breitkreuz 8b949e5ff5 Merge pull request #4823 from abbradar/synaptics-fix
synaptics: fix tapButtons setting
2014-11-08 19:38:06 +01:00
Aristid Breitkreuz 8b50383c45 Merge pull request #4859 from abbradar/git-daemon
nixos/git-daemon: fix a bug and add 'user' and 'group' options
2014-11-08 19:33:24 +01:00
Domen Kožar 9ea81152cc Merge pull request #4891 from pSub/prefer-xresources
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 19:32:46 +01:00
Rüdiger Sonderfeld fa1cec1037 update-users-groups.pl: Use UTF-8 instead of latin1.
Perl seems to write the file in latin1 independent of the actual input
encoding.  This can corrupt the "description" field of /etc/passwd.  By
setting "binmode" to ":utf8" Perl can be forced to write UTF-8.  Ideally
the program would simply read/write the fields by value without any
changes in encoding.  However, assuming/enforcing UTF-8 is a lot better
than using an obsolete coding like latin1.
2014-11-08 19:25:17 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Pascal Wittmann d6e87f1749 Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670 2014-11-08 15:25:40 +01:00
Aristid Breitkreuz cf4a976ced quassel: make a proper systemd unit (also properly works in containers now) 2014-11-08 14:59:25 +01:00
Luca Bruno 7885c2ed12 Revert "nixos: iso-image: use syslinux bootloader for USB booting support"
This reverts commit 455db168b3.
2014-11-08 14:33:27 +01:00
Luca Bruno e3611709d6 Revert "nixos: installation: make installation ISOs USB bootable"
This reverts commit b7f6a138b1.
2014-11-08 14:33:27 +01:00
Jaka Hudoklin 53667c7b1a Merge pull request #4870 from bosu/docker-proxy
docker: propagate nix.proxy into daemon environment
2014-11-08 13:06:56 +01:00
Nikolay Amiantov 46b866cf63 nixos/git-daemon: fix 'exportAll' option 2014-11-07 15:50:01 +03:00
Nikolay Amiantov af1d09879b nixos/git-daemon: add 'user' and 'group' options 2014-11-07 15:49:45 +03:00
Nikolay Amiantov 4b2e43865a nixos/git-daemon: add types 2014-11-07 15:49:03 +03:00
Boris Sukholitko 0d89afdedd docker: propagate nix.proxy into daemon environment 2014-11-07 13:46:36 +02:00
Rickard Nilsson 71f64ded06 Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""
This reverts commit 8e1072fd60.
2014-11-06 21:59:04 +01:00
Rickard Nilsson 2b3c3d0e32 Fixes to Apache 2.4 configuration 2014-11-06 21:58:40 +01:00
Eelco Dolstra b3eb981a95 apache-httpd: Make 2.4 the default
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Evgeny Egorochkin 85d23f5292 thermald needs dbus config files to run 2014-11-06 15:19:33 +02:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Peter Simons 02c37c1027 Merge pull request #4838 from abbradar/ssmtp-root
Add 'root' option to ssmtp
2014-11-05 15:45:47 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Vladimír Čunát c0e2aceef4 fontconfig: patch and document 2014-11-05 12:12:30 +01:00
Nikolay Amiantov 1b6f0ffb6e ssmtp: add 'root' option 2014-11-05 02:47:59 +03:00
Nikolay Amiantov 292e07689a ssmtp: add types to options 2014-11-05 02:42:48 +03:00
Jaka Hudoklin d232390d5d nixos/graphite: fix user creation 2014-11-04 19:38:24 +01:00
Ricardo M. Correia 98a59df81f nixos/transmission: Start after local-fs.target 2014-11-04 18:40:13 +01:00
Eelco Dolstra c7ee917197 Fix tests.runInMachine evaluation 2014-11-04 14:28:09 +01:00
aszlig 8e516de3e7
nixos: Fix priorities of initialHashedPassword.
Regression introduced in f496c3cbe4.

Previously when we used security.initialRootPassword, the default
priority for this option was 1001, because it was a default value set by
the option itself.

With the mentioned commit, it is no longer an option default but a
mkDefault, which is priority 1000.

I'm setting this to 150 now, as test-instrumentation.nix is using this
for overriding other options and because I think it still makes it
possible to simple-override it, because if no priority is given, we get
priority 100.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-04 05:19:07 +01:00
Nikolay Amiantov 5f84c785ff synaptics: fix tapButtons setting 2014-11-04 06:20:10 +03:00
lethalman 636a4c00ca Merge pull request #4801 from robberer/pkgs/zabbix-server
zabbix-server: add extraConfig option
2014-11-04 00:32:46 +01:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Longrin Wischnewski ce8e1a278b zabbix-server: add extraConfig option
add types to options
2014-11-03 16:47:07 +01:00
Eelco Dolstra f496c3cbe4 Obsolete security.initialPassword
You can now set users.extraUsers.root.initialHashedPassword instead.
2014-11-03 12:36:56 +01:00
Eelco Dolstra f8f787b800 Handle initialPassword and initialHashedPassword for !mutableUsers
In this case, they're equivalent to setting ‘password’ and
‘hashedPassword’ (since there is no distinction between an initial and
non-initial user account state).
2014-11-03 12:32:32 +01:00
Eelco Dolstra 3696536115 Handle removing a password if mutableUsers = false 2014-11-03 12:32:27 +01:00
Eelco Dolstra 1b53a3fcb7 Add initialPassword and initialHashedPassword options
These are like password and hashedPassword, except that they only
apply when the user is initially created.
2014-11-03 12:32:19 +01:00
William A. Kennington III 8e1072fd60 Revert "syslog-ng: Update from 3.5.6 to 3.6.1"
This reverts commit e2ada42623.
2014-11-02 17:22:28 -08:00
William A. Kennington III 5ae216558f jfsrec: Remove derivation 2014-11-02 17:22:27 -08:00
Luca Bruno 7dbf4d73c7 docs: hint to stop NetworkManager during installation to manually configure the network 2014-11-02 23:42:17 +01:00
Bob van der Linden b7f6a138b1 nixos: installation: make installation ISOs USB bootable 2014-11-02 17:35:16 +01:00
Bob van der Linden 455db168b3 nixos: iso-image: use syslinux bootloader for USB booting support
This changes the bootloader for iso generation from Grub to
syslinux. In addition this adds USB booting support, so that
"dd" can be used to burn the generated ISO to USB thumbdrives
instead of needing applications like UnetBootin.
2014-11-02 17:35:16 +01:00
lethalman 560fd3a5b7 Merge pull request #4742 from abbradar/bcache-stage1
Support bcache volumes in initrd
2014-11-02 17:29:38 +01:00
Nikolay Amiantov 775f381a9e stage-1: add bcache support
This adds necessary udev rule into initrd to support autodetecting
bcache partitions in stage-1. It also fixes 'sh' path for the new
rule to work.
2014-11-02 19:03:50 +03:00
Luca Bruno 5d2b3ff8cf nixos: increase allocated memory for gnome tests. Closes #4651 2014-11-02 16:33:10 +01:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Luca Bruno 6bb278659f kde installer: enable networkmanager. Closes #3433 2014-11-02 15:23:22 +01:00
Mathijs Kwik f356cee747 sudo: allow adding extra configuration options to the bottom of sudoers
from sudoers (5):
When multiple entries match for a user, they are applied in order.
Where there are multiple matches, the last match is used (which is not necessarily the most specific match).
2014-11-02 13:27:05 +01:00
Peter Simons 415f41bf68 nixos/modules/services/monitoring/graphite.nix: strip trailing whitespace 2014-11-02 12:40:00 +01:00
Peter Simons 96a7e65c37 nixos/modules/services/monitoring/graphite.nix: don't create graphite user unconditionally
I'm not sure what exactly this user is needed for, i.e. under what circumstances
it must exist or not, but creating it unconditionally seems like the wrong thing
to do. I complained to @offlinehacker about this on Github, but got no response
for a week or so. I'm disabling the extraUsers bit to put out the fire, and now
hope that someone who actually knows about Graphite implements a proper solution
later.
2014-11-02 12:34:16 +01:00
Nikolay Amiantov 5423f62373 gitolite: add dataDir 2014-11-02 02:24:41 +03:00
lethalman f079cd1721 Merge pull request #4750 from abbradar/nix-maxcores
Add buildCores option to nix
2014-11-01 22:01:39 +01:00
Nikolay Amiantov e8dace201f nix-daemon: add maxCores option 2014-11-01 23:58:21 +03:00
William A. Kennington III ba53392bce nixos/nat: Fix override so that sysctls are properly preserved 2014-10-31 16:50:25 -07:00
Eelco Dolstra a9f5e77e2f update-users-groups.pl: Generate hashed passwords internally
I.e. don't call "passwd" to update /etc/shadow from the "password"
option. This has the side-effect of not updating the password if
mutableUsers = true (since the code path for "hashedPassword" has a
check for mutableUsers).

Fixes #4747.
2014-10-31 17:42:09 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Peter Simons e18e77fbcd Merge pull request #4746 from abbradar/synaptics-fingers
Add "fingersMap" option to Synaptics
2014-10-31 11:06:58 +01:00
Nikolay Amiantov 118096fc0b synaptics: add fingersMap option 2014-10-31 12:45:54 +03:00
Nikolay Amiantov 0eb86647b3 synaptics: add types to options 2014-10-31 12:45:54 +03:00
Aristid Breitkreuz 93f2c180d0 rsnapshot: add git version & make it configurable in the nixos module 2014-10-27 20:38:39 +01:00
Kirill Elagin 0c6d49da7d xsession: Start the right pulseaudio binary
Fixes #4663.
2014-10-27 15:43:19 +03:00
Rickard Nilsson e2ada42623 syslog-ng: Update from 3.5.6 to 3.6.1
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
2014-10-27 12:22:22 +01:00
Rob Vermaas 5a23232edf Refactor EC2 image generation script. Now uses same procedure for both hvm and pv-grub
images. Root disks are now SSD backed and 20GB by default, both on hvm and pv-grub
(previously was 8GB for HVM). Added new eu-central region to the locations to copy images
to. Also the root disk for HVM instances was not deleted on termination with previous
images, this is fixed as well.
2014-10-27 11:48:43 +01:00
Eelco Dolstra 63d7ad74e7 Add nodejs to the small channel
(cherry picked from commit d927ce03e4)
2014-10-27 10:40:49 +01:00
lethalman 40b5aa1d33 Merge pull request #4506 from cstrahan/logstash-config
logstash service: make log verbosity configurable.
2014-10-26 20:10:03 +01:00
William A. Kennington III 8636d93f54 Merge pull request #4213 from wkennington/master.zfsiso
[Dont Merge] nixos-iso: Add zfs / btrfs to supportedFilesystems
2014-10-25 18:01:17 -07:00
Aristid Breitkreuz dabdab8dce Merge pull request #4640 from lethalman/installer-icons
kde installer: Add gparted, nixos manual and konsole in the desktop
2014-10-25 16:32:56 +02:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Luca Bruno 9e1ab43459 gnome3: Add cantarell fonts. Closes #4633 2014-10-24 11:50:47 +02:00
Luca Bruno e553e27f48 kde installer: Add gparted, nixos manual and konsole in the desktop 2014-10-23 18:59:25 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar 3b133beb7a Merge pull request #4553 from ehmry/polipo
drop permission prestart from polipo service module
2014-10-23 12:51:36 +02:00
Peter Simons 5986bb2199 Merge pull request #4631 from robberer/tmp1
passwordFile: update description
2014-10-23 11:36:30 +02:00
Luca Bruno 0927405a37 fontconfig: update 2.10.2 -> 2.11.1. Close #4410, #2050 2014-10-23 10:40:26 +02:00
Longrin Wischnewski a2c65d447f passwordFile: update description 2014-10-23 04:52:50 +02:00
Thomas Tuegel da77d9f409 Merge pull request #4614 from geerds/kde4-plasma-nm
kde4: Use plasma-nm instead of knetworkmanager
2014-10-22 20:28:36 -05:00
Aristid Breitkreuz 608aeede89 Merge pull request #4597 from ehmry/cjdns
Cjdns
2014-10-22 20:49:20 +02:00
Ricardo M. Correia 10348a0f2c grsecurity: Update documentation to mention correct kernels 2014-10-22 16:50:36 +02:00
Domen Kožar 5858ac57a8 next release will be 14.11 2014-10-22 15:41:30 +02:00
Jascha Geerds 83ae3042a7 kde4: Use plasma-nm instead of knetworkmanager 2014-10-22 13:27:19 +02:00
aszlig 57aaf3d36e
Merge branch 'nixpart-1.0-preparations'.
Partially and temporarily addresses NixOS/nixops#228.

We now have an up-to-date version of Blivet and a bunch of its dependen-
cies as well as the old nixpart 0.4 with all its old and crappy
dependencies, which should fix _simple_ partitioning layouts for NixOps.

Also, nixpart 1.0 is now marked as broken, because it is not yet
released and this branch is more of a preparation and "damage control"
in case I shouldn't manage to finish nixpart + nixos-assimilate in time
for the next NixOS release.
2014-10-22 08:23:31 +02:00
aszlig 78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir.
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:59 +02:00
aszlig 7676ff5973
nixpart: Bring back requirements for version 0.4.
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig 9d2e514f46
nixos/tests/partition: Fix typo in F2FS tests.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig cff26e2d38
nixos: Add VM test for blivet.
I'm really not sure whether these tests are actually run upstream,
because there are quite a few oddities which either are my fault by just
missing something important or upstream really doesn't bother to run
those tests.

One example of this are testDiskChunk1 and testDiskChunk2, which create
two non-existing partitions and tries to allocate them. Now, in
allocatePartitions(), the partedPartition attributes are reset to None
and shortly afterwards a for loop is expecting it to be NOT None.

So, for now I'm disabling these tests and will see if we stumble on them
during work on nixpart 1.0, so we're really sure whether it's my fault
or a real bug in blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig 23160383e3
nixos: Add a filesystem module for JFS.
I'm not using JFS, but this is to mainly make jfsutils available if you
have defined a JFS filesystem in your configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
aszlig cb2c34f1bb
blivet: Update to new upstream version 0.67.
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
Emery Hemingway a3338abcfe cjdns: add peer hostnames to extraHosts, option for external config 2014-10-21 13:16:04 -04:00
Georges Dubus 50be0d5447 Removed the kde4_next nixos module
Merged its differences into kde4. This commit fixes #4519.
2014-10-21 14:04:28 +02:00
Domen Kožar 14631cec82 nixos: prosody was clashing with seeks unix ids 2014-10-20 17:22:01 +02:00
Jaka Hudoklin 594f354bc7 nixos/graphite: fix grahite api documentation url 2014-10-20 13:32:58 +02:00
Jaka Hudoklin 09c8d909fb nixos/graphite: update docs, add graphite pager 2014-10-20 13:27:21 +02:00
Eelco Dolstra a3b873924b Let the kernel load firmware directly
Loading firmware via udevd is obsolete. Fixes #4552.
2014-10-20 13:25:00 +02:00
Eelco Dolstra 4ecb762ee5 Add openjdk to the small channel 2014-10-20 08:39:58 +02:00
William A. Kennington III f020a26164 nixos/systemd: Also escape \ characters 2014-10-19 16:34:53 -07:00
Vladimír Čunát 359dd3b8ac nixos: fix two pipefail problems
It failed since 3c6efec2c0, i.e. #4453.
Now it should "work" the same as before.
2014-10-19 19:29:28 +02:00
Domen Kožar 2fa662c957 systemd: replace @ when generating unit command name 2014-10-19 17:20:37 +02:00
Domen Kožar 0854836fd2 systemd: include name of the unit when generating nix store path 2014-10-19 15:49:55 +02:00
Aristid Breitkreuz bda39ae4de remove unused parameter from nixos module that is causing trouble with nixops 1.2 2014-10-19 14:10:28 +02:00
Jaka Hudoklin 988ed87e70 nixos/neo4j: add package option 2014-10-18 13:18:37 +02:00
Franz Pletz 2c321bf296 Add support for global LXC config files 2014-10-18 05:02:39 +02:00
Emery Hemingway 32d6ae7ed9 drop permission prestart from polipo service module
chowning the cache directory can timeout the service, permissions
on this directory should never change without user intervention
2014-10-16 10:57:16 -04:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Rickard Nilsson 135d677690 nixos/logrotate: Fix spelling mistake 2014-10-16 08:20:43 +02:00
Rickard Nilsson cdba59d0f2 nixos/syslog-ng: Add option configHeader 2014-10-16 08:14:45 +02:00
Rickard Nilsson 2ffe274486 nixos/logrotate: Specify type for config option 2014-10-15 16:52:50 +02:00
Mathnerd314 938f92e8b2 Fix the driver for qemu ("vesa" -> "modesetting")
Signed-off-by: Domen Kožar <domen@dev.si>
2014-10-15 12:24:50 +02:00
Domen Kožar bc015be0f3 fix eval 2014-10-15 12:00:20 +02:00
Lluís Batlle i Rossell f594033822 nixos nfs: allow setting the lockd ports.
This helps in setting a fixed firewall open port for NFS lockd.

Based on:
http://rlworkman.net/howtos/NFS_Firewall_HOWTO

(cherry picked from commit b32ca0616ff70795f71995fa79ea508b82f30b3a)

Conflicts:
	nixos/modules/services/network-filesystems/nfsd.nix
2014-10-15 10:59:33 +02:00
Joachim Schiele 13298fcbb9 Merge pull request #4535 from flosse/lua-bitop
lua-packages: added lua-bitop to add websocket support for prosody
2014-10-15 09:41:32 +02:00
William A. Kennington III 5118dcf4fb nixos-iso: Add zfs / btrfs to supportedFilesystems 2014-10-14 20:24:43 -07:00
Markus Kohlhase 5308d3284b prosody: added websocket support 2014-10-15 03:57:00 +02:00
Rickard Nilsson 54a0ac090c nixos/syslog-ng: Replace option serviceName with listenToJournal. Fix socket activation 2014-10-14 15:38:42 +02:00
Rob Vermaas 8523d0e44c Dohh
(cherry picked from commit b7451d91e8)
2014-10-14 11:43:51 +02:00
Rob Vermaas 028807c3a0 amazon-image.nix: Pass --option build-users-group '' to nix tools to make Amazon generation work with nix-1.8+
(cherry picked from commit 654eaeb2ca)
2014-10-14 11:40:04 +02:00
Mateusz Kowalczyk b9c2fe5fd8 Merge pull request #4400 from matejc/seeksservice
seeks: update and write nixos module
2014-10-13 21:37:11 +01:00
Charles Strahan dc2fac7c0c logstash service: make log verbosity configurable. 2014-10-13 15:48:41 -04:00
Michael Raskin 2ef0a17561 Merge pull request #4387 from 1126/refactor-stumpwm
stumpwm: update and refactoring
2014-10-13 17:50:46 +04:00
Matej Cotman 561d3b3860 seeks: nixos module 2014-10-13 13:10:49 +02:00
Jaka Hudoklin dd0758ab6b Merge pull request #4392 from cstrahan/logstash
logstash service improvements
2014-10-12 23:02:52 +02:00
Joachim Schiele df95acd13c Merge pull request #3960 from flosse/prosody-service
Prosody service
2014-10-11 23:10:05 +02:00
Markus Kohlhase d86c2c30c5 prosody: packaged as a service
Conflicts:
	nixos/modules/misc/ids.nix
2014-10-11 18:53:43 +02:00
William A. Kennington III a5bed86fa4 zfs: zpool-import service must be wanted to start 2014-10-11 01:53:24 -07:00
Eelco Dolstra 058bf4ccc4 Create a udev rule for /dev/root
In the installation CD, this ensures that systemd will see a proper
udev node for /dev/root.

Fixes #4399.

Borrowed from

  http://lists.freedesktop.org/archives/systemd-devel/2014-July/020988.html
2014-10-10 17:18:04 +02:00
Eelco Dolstra a97e1ee52d Add a Hydra job to track the size of the initrd 2014-10-09 18:40:37 +02:00
Eelco Dolstra 5614b000ed Add some more stuff to the small channel
(cherry picked from commit 8cf5281744)
2014-10-09 16:35:34 +02:00
Eelco Dolstra 93ff0d5496 Add an entire NixOS build to the channel
This causes some cruft to be uploaded (such as unit files) but it
ensures that every package used by the base system ends up in the
channel, not just environment.systemPackages.

(cherry picked from commit 4dfca8e14a)
2014-10-09 16:35:28 +02:00
Eelco Dolstra c7a1944ad9 Remove missing attribute
(cherry picked from commit f963f57b62)
2014-10-09 16:35:13 +02:00
Eelco Dolstra a0fd8e8066 Add a jobset for a "nixos-small" channel
This channel only builds a small subset of Nixpkgs, mostly suitable
for servers. Since the channel update doesn't require thousands of
packages to be built first, it should provide much faster turnaround
in case of security updates.

(cherry picked from commit 2c7acc6731)
2014-10-09 16:34:50 +02:00
William A. Kennington III 362699376a nixos/network-interfaces: Bond interface configuration must wait for the bond device service
Also fixes some formatting and removal of slave devices.
2014-10-07 23:07:10 -07:00
Domen Kožar 4941b96f0c eval fix 2014-10-07 21:46:15 +02:00
Shea Levy 92837f2dbf Ditch efi installer tests
They've been broken forever due to weirdness in qemu tests, and they don't add much over installer tests
2014-10-07 12:20:56 -04:00
Domen Kožar b0b9e5d50c tests.bittorrent: use opentracker as bittorrent tracker 2014-10-07 17:22:42 +02:00
Domen Kožar 1992bd1331 Merge pull request #4409 from iElectric/redmine
Add Redmine package and NixOS Service
2014-10-07 13:41:46 +02:00
Shea Levy 3432414808 Merge branch 'nixos-cronfiles' of git://github.com/rickynils/nixpkgs
nixos: Add option services.cron.cronFiles
2014-10-07 05:59:03 -04:00
Domen Kožar b4a335cd59 nixos: add redmine service 2014-10-07 10:55:50 +02:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Charles Strahan fc7098abf7 logstash service improvements
* add logstash-contrib plugins package
* add additional options to the logstash service
2014-10-05 21:53:05 -04:00
Bjørn Forsman fca51849ec nixos/lighttpd: add services.lighttpd.enableModules option
This option makes the coupling between lighttpd and its sub-services
more "loose".

While the option is a list, its purpose is to provide a "set" of needed
modules to load for lighttpd to function correctly with its config. The
NixOS lighttpd module ensures that lighttpd modules are loaded no more
than once (because lighttpd dislikes that), and in the correct order.

Also add an assertion that all modules listed in .enableModules are
valid.
2014-10-05 19:15:19 +02:00
Vladimír Čunát e4436ad841 FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf
Any reasonably new version of fontconfig does search that path by default,
and setting this globally causes problems, as 2.10 and 2.11 need
incompatible configs.

Tested: slim+xfce desktop, chrootenv-ed steam.
I have no idea why we were setting the global variable;
e.g., neither Fedora nor Ubuntu does that.
2014-10-05 17:05:27 +02:00
_1126 7536d41287 stumpwm: update and refactoring
This commit updates the stumpwm to version 0.9.8. Futhermore, it
refactors the expression quite a lot:

* stumpwm has been moved from lisp modules to window-managers.
* stumpwm has been added to the window managers NixOS knows about, this
  enables the user to add stumpwm as a default window manager in his
  NixOS configuration like with Xmonad or i3.
* the package has been split into stumpwm and stumpwmContrib. This is
  due to the fact that development of stumpwm and its extension modules
  has been split into two repositories. As of today, the release is the
  last one before this split. This split into two packages only reflect
  those upcoming upstream changes already.

It is planned to make the addition of the extension modules voluntarily,
like with Xmonads option "enableContribAndExtras". Furthermore it might
be possible to add an option to compile stumpwm with clisp instead of
sbcl.
2014-10-05 14:50:08 +02:00
William A. Kennington III f1572d37c3 network-interfaces: Bonding fixes 2014-10-04 18:37:00 -07:00
William A. Kennington III 93eb325004 network-interface: Add extra bond options 2014-10-04 17:59:10 -07:00
Eelco Dolstra 97220c973f Replace hasAttr/getAttr calls with the ? and . operators
For NixOS evaluation, this gives a ~21% reduction in the number of
values allocated and a ~4% speedup. It's also more readable.
2014-10-05 01:11:06 +02:00
Nathaniel Baxter 0c8ad65560 pulseaudio: Add support for 32bit alsa apps on 64bit systems. 2014-10-04 14:48:58 +02:00
Nathaniel Baxter ab8ef63ff4 alsa: Add multilib plugin support via "libs" entry in asound config.
alsa: Remove unused $ALSA_PLUGIN_DIRS support.
2014-10-04 14:48:58 +02:00
Austin Seipp 8cc3460a87 Merge pull request #4294 from daogames/tb/psql-port-fix
postgresql: use configured port when invoking psql
2014-10-01 18:56:39 -05:00
Rickard Nilsson 57721a2888 nixos: Add option services.cron.cronFiles
This allows you to configure extra files that should be appended to your
crontab. Implemented by writing to /etc/crontab when the cron service starts.
Would be nicer to use a cron that supports /etc/cron.d but that would require
us to patch vixie-cron.
2014-10-01 17:33:38 +02:00
Shea Levy f5aaefbb6c More pkgs.lib -> lib fixes 2014-09-29 09:45:59 -04:00
Eelco Dolstra 7f043ffbbe tests/kde4.nix: Don't build kdeedu
This prevents a dependency on liblapack (which randomly fails) and
TeXlive (which is huge).

http://hydra.nixos.org/build/14897240
(cherry picked from commit b9bde98161)
2014-09-29 13:32:55 +02:00
Domen Kožar 63280c511e nixos: munin/jenkins: specify timeout correctly 2014-09-28 14:25:11 +02:00
Domen Kožar 1e05bbaa96 nixos: increase timeout for jenkins/munin systemd services 2014-09-27 23:28:49 +02:00
Vladimír Čunát 4bcae6dc96 merge #4265: add KDE 4.14.1 2014-09-27 18:15:00 +02:00
Tino Breddin eb7bbb4862 postgresql: use configured port when invoking psql 2014-09-27 14:37:11 +02:00
Jaka Hudoklin ff8f23ab26 Merge pull request #4280 from wkennington/master.consul
nixos/consul: Add module
2014-09-27 07:00:39 +02:00
Attila Sztupak 90a326eecd crashplan: nixos module for backup service 2014-09-26 15:33:36 +01:00
William A. Kennington III 36f9b9c284 nixos/consul: Add module 2014-09-26 03:25:14 -07:00
Matej Cotman 5e18182a30 mailpile: add module 2014-09-26 10:49:09 +02:00
William A. Kennington III 9a90ce0bf7 nixos/ids: Add consul 2014-09-26 01:44:14 -07:00
William A. Kennington III d084245e74 iproute: Fix regressions introduced in 3.16.0
3.16.0 introduced a regression where vlan and veth devices could not be
created due to a check in the code for existing devices. This applies
the upstream patch which fixes the issue.

Additionally, this corrects the nixos network-interfaces task which now
needs to specify the name parameter when adding links.
2014-09-26 00:45:38 -07:00
Eelco Dolstra 1cd727180e Add all default NixOS packages to the channel
The job ‘dummy’ depends on the default contents of
‘environment.systemPackages’, thus ensuring that those packages all
end up in the channel.
2014-09-25 00:25:54 +02:00
Eelco Dolstra 0a967b9268 Installer test: Use the minimal ISO
So we don't depend on KDE etc. (which we don't even test here).
2014-09-25 00:07:35 +02:00
Eelco Dolstra 51c349d0cc test-driver: Use netpbm instead of imagemagick
Imagemagick pulls in 100s of megabytes of dependencies.
2014-09-25 00:07:30 +02:00
ambrop7@gmail.com bea503ec36 kde: Allow kde_next as a desktop environment
This is the same as
93fda9e353
2014-09-24 23:50:23 +02:00
Bjørn Forsman 9ce2cca6aa nixos: mark services.samba.defaultShare as obsolete
It was removed in 753d9d4e4f
("nixos/samba: remove services.samba.defaultShare option").
2014-09-24 23:07:04 +02:00
Franz Pletz 30690d05bc Add cryptodisk support for Grub
Closes #4193
2014-09-24 21:48:55 +01:00
Bjørn Forsman 3ebe3df4d0 nixos/samba: add services.samba.configText option
The .configText option is for providing verbatim content of smb.conf.

I'm adding this because I cannot seem to find any other way to override
(with mkForce) the generated smb.conf with the current samba module. All
attempts ends with errors ("duplicate entry samba/smb.conf").
2014-09-24 18:31:20 +02:00
Bjørn Forsman 753d9d4e4f nixos/samba: remove services.samba.defaultShare option
It's not that difficult to define shares using standard samba config
file syntax, so why do we need the semi-configurable .defaultShare
option?

Also:
 * It uses /home/smbd and I think /home should be reserved
   for real human users.
 * If enabled, it breaks the assumption that .extraConfig continues in
   the [global] section.

Without .defaultShare there is no need for the "smbguest" user and group
either, mark them as unused.
2014-09-24 18:31:20 +02:00
Eelco Dolstra 38d57b4a94 Merge pull request #4244 from abbradar/resume
Replace resumeDevice with autodetection of hibernation partition
2014-09-24 18:05:53 +02:00
Nikolay Amiantov ba31749458 stage-1: Use udevadm instead of blkid 2014-09-24 20:00:51 +04:00
Nikolay Amiantov 18bd9917ed stage-1: autodetect resume swap partitions 2014-09-24 18:51:44 +04:00
Emil Rangden c7b73b2b12 include thermald service in module list
Closes #4230
2014-09-23 22:41:24 +01:00
Emery Hemingway 61f0d9b251 cjdns: update from 20140919 20140922
package installs to .../bin
fix service module to look in .../bin

Closes #4240
2014-09-23 22:30:53 +01:00
William A. Kennington III 13ca3708b5 Fix #4236 2014-09-23 10:18:05 -07:00
Rickard Nilsson 5be23fe888 nixos/install-grub: Don't run GrubFs(/nix/store) if copyKernels is true 2014-09-23 14:34:44 +02:00
Luca Bruno 8ef7b83ca7 Fix nixos-rebuild evaluation 2014-09-23 14:01:25 +02:00
Mateusz Kowalczyk cd5f4e7f85 Merge pull request #4211 from ehmry/cpuminer-cryptonight
Cpuminer cryptonight
2014-09-22 19:26:35 +01:00
Emery Hemingway c8109488b3 cpuminer-cryptonight: new service module 2014-09-22 13:37:47 -04:00
Rickard Nilsson a59df1e567 nixos: Add also group.members to group 2014-09-22 19:18:08 +02:00
Eelco Dolstra a2971118ac scrubDrv: Don't scrub the system and meta attributes 2014-09-22 16:58:02 +02:00
Mateusz Kowalczyk 1ffe41b34f Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs 2014-09-22 01:27:00 +01:00
AndersonTorres 9c25f350a8 Ratpoison: updated for 1.4.8
Also, adding the infamous service file

Closes #4192
2014-09-21 20:05:12 +01:00
Mateusz Kowalczyk 7fedb1baa6 Try fixing #4084 2014-09-21 07:04:01 +01:00
Dmitry Malikov 08cc8da65a mpd service: add network.{host,port} options
Closes #4084
2014-09-21 01:43:06 +01:00
Ronny Esterluss 473ffd9eae extended gitolite service to take custom hooks
Closes #4160
2014-09-21 00:08:40 +01:00
AndersonTorres 90fcd66599 AfterStep (version 2.2.12): New Package
AfterStep is a beautiful window manager, inspired by NEXTStep interface

Closes #4177
2014-09-21 00:03:44 +01:00
AndersonTorres c6f28f988c Windowmaker: adding system service file, and a long description
Closes #4066
2014-09-20 23:36:07 +01:00
Domen Kožar 2247f3a8d3 Merge pull request #4168 from lostdj/ltp/master/btsyncfix
bittorrentsync: fix storage_path
2014-09-20 10:53:57 +02:00
lostdj f02d4ec9ed bittorrentsync: fix storage_path.
If this path is a symlink, btsync won't be able to read it if it's not ending with "/".
2014-09-19 18:19:04 +04:00
William A. Kennington III 8250059a9f nixos/tests/nat: Add tests for standalone and firewall based nat 2014-09-18 14:39:46 -07:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
William A. Kennington III b047f2ddec nixos/tests/nat: Modify test to accomodate for firewall consolidation 2014-09-18 11:28:58 -07:00
William A. Kennington III ae195727b7 nixos/nat: Don't flush tables, create subchains for autogenerated rules 2014-09-18 11:28:58 -07:00
Eelco Dolstra 0de982d75b httpd: Add option for specifying robots.txt 2014-09-18 19:05:26 +02:00
Eelco Dolstra 837a0c05e5 httpd: Don't emit robots.txt if there are no robots entries 2014-09-18 18:48:28 +02:00
Eelco Dolstra 9b66e1f7b1 Fix the manual jobs 2014-09-18 16:21:26 +02:00
Eelco Dolstra ec4f38c56f Manual: Remove some option defaults that refer to store paths
Option defaults should not refer to store paths, because they cause
the manual to be rebuilt gratuitously. It's especially bad to refer to
a highly variable path like a computed configuration file.
2014-09-18 16:21:26 +02:00
Eelco Dolstra 97a8e959b4 Remove some ISOs 2014-09-18 12:19:09 +02:00
Rickard Nilsson 8fc777ffd6 syslog-ng module: Add package option 2014-09-17 19:48:51 +02:00
Jaka Hudoklin 9c3c7a75d3 collectd: add pidFile option, change default pid to /var/run/collectd.pid 2014-09-17 19:21:05 +02:00
Eelco Dolstra e6b9656e24 Quick hack to reduce Hydra memory consumption 2014-09-17 19:13:01 +02:00
Jaka Hudoklin 1cdb6cfb00 nixos/graphite: add package option to graphiteApi 2014-09-17 18:33:51 +02:00
Jaka Hudoklin 75aaeca9d2 nixos/graphite: add seyren service, graphite alerting dashboard 2014-09-17 18:33:50 +02:00
Jaka Hudoklin c396ee9912 nixos: add collectd module 2014-09-17 18:33:50 +02:00
William A. Kennington III ec9c4143a7 nixos/firewall: Cleanup in case reload fails 2014-09-16 15:51:57 -07:00
lethalman 3224b32e64 Merge pull request #4101 from ts468/e19
Add package: Enlightenment E19!!!!
2014-09-16 16:13:56 +02:00
Rickard Nilsson 66bbbc205d nixos/nfs: Fix configuration merge 2014-09-16 13:53:18 +02:00
Jaka Hudoklin 9bd66b24d9 nixos/graphiteApi: add example config for influxdb backend 2014-09-16 10:41:56 +02:00
Jaka Hudoklin 996da030b6 nixos/mongodb: service fixes
- Log to syslog, so journal picks-up logs
- Start as foring service, so systemd will wait for service to start
- Add extraConfig option
2014-09-16 10:28:04 +02:00
Jaka Hudoklin 271e0f7488 nixos/graphite: add host and port options for graphiteApi 2014-09-16 10:28:04 +02:00
William A. Kennington III 1321fd175d nixos/nat: Leverage firewall module 2014-09-15 21:31:27 -07:00
William A. Kennington III 6a43d51291 nixos/firewall: Support extraStopCommands 2014-09-15 21:31:26 -07:00
William A. Kennington III 43c2bc0f8c Merge pull request #4108 from wkennington/master.firewall
Firewall: Don't allow traffic during nixos-switch / reload
2014-09-15 20:42:40 -07:00
William A. Kennington III fd7b9b4291 nixos/firewall: Don't allow traffic during reload 2014-09-15 20:40:16 -07:00
William A. Kennington III 4d193b7262 systemd: Support reload scripts 2014-09-15 20:04:49 -07:00
Thomas Strobel 1613d6cca6 Add package: Enlightenment E19!
Wayland desktop shell is not enabled, yet.
2014-09-15 23:34:28 +02:00
Bjørn Forsman 0bfd27535f nixos/libvirtd: refresh LXC emulator path on startup
This fixes the issue when the LXC emulator binary is garbage collected
and breaks libvirtd containers, because libvirtd XML file still refers
to GC'ed store path.

We already have a fix for QEMU, this commit extends the fix to cover LXC
too.
2014-09-15 23:03:20 +02:00
Michael Raskin d05684be21 Merge pull request #3694 from matejc/cmst
new package: cmst - qt gui for connman
2014-09-15 23:12:01 +04:00
Aristid Breitkreuz 69c95e3fdf Merge pull request #4041 from nbp/disable-fuppes
Disable fuppes module
2014-09-14 22:29:30 +02:00
Vladimír Čunát d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Jaka Hudoklin d6f9878fbf nixos/elasticsearch: wait for start 2014-09-13 02:21:31 +02:00
Jaka Hudoklin f7ba3d833f nixos/znc: fix module, createUser option does not exist anymore 2014-09-13 02:20:32 +02:00
Jaka Hudoklin 74122464da nixos/influxdb: wait for start 2014-09-13 02:19:39 +02:00
Jaka Hudoklin 26fd945151 nixos/rabbitmq: wait for start 2014-09-13 02:16:53 +02:00
Jaka Hudoklin a23e4997d3 Merge pull request #4034 from offlinehacker/graphiteApi
nixos: add graphite api to graphite functionality
2014-09-13 00:05:36 +00:00
Bjørn Forsman ec59929c9f nixos/jekins: add services.jenkins.extraGroups option
This makes it easy to give jenkins extra privileges by adding group
memberships. Use with care :-)
2014-09-12 15:25:15 +02:00
Matej Cotman 99a46a0eca set network manager as default true 2014-09-12 13:52:26 +02:00
William A. Kennington III bab5efd237 nixos/ssh: Allow user to configure the package that provides ssh/sshd 2014-09-11 22:07:39 -07:00
Nicolas B. Pierron ca02c60cb8 Disable fuppes module
fuppes has not been compiling for a long moment, and the ffmpeg version on
which it depends is no longer listed in nixpkgs.
2014-09-11 23:46:20 +02:00