Merge branch 'master' into nixos-nixpkgs-pkgs-use-overlays

2018-11-04 14:19:33 +01:00
parent 5341e145c3 033dce35d8
commit 03fc1167e8
622 changed files with 20016 additions and 14237 deletions
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -331,6 +331,9 @@
      zeronet = 304;
      lirc = 305;
      lidarr = 306;
+      slurm = 307;
+      kapacitor = 308;
+      solr = 309;

      # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

@@ -622,6 +625,9 @@
      zeronet = 304;
      lirc = 305;
      lidarr = 306;
+      slurm = 307;
+      kapacitor = 308;
+      solr = 309;

      # When adding a gid, make sure it doesn't match an existing
      # uid. Users and groups with the same name should have equal