various fixes

[sbourdeauducq]

Without these, it fails to build or to boot.

diff --git a/base.nix b/base.nix
index e7f5d6d..ae6fc5b 100644
--- a/base.nix
+++ b/base.nix
@@ -94,7 +94,7 @@ with lib;
         hosts:     files  dns   myhostname mymachines
         networks:  files dns
       '';
-      "services".source = pkgs.iana_etc + "/etc/services";
+      "services".source = pkgs.iana-etc + "/etc/services";
       group.text = ''
         root:x:0:
         nixbld:x:30000:nixbld1,nixbld10,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9
@@ -133,6 +133,8 @@ with lib;
     system.activationScripts.groups = ''
       # dummy to make setup-etc happy
     '';
+    system.activationScripts.etc =
+      stringAfter [ "users" "groups" ] config.system.build.etcActivationCommands;

     # nix-build -A system.build.toplevel && du -h $(nix-store -qR result) --max=0 -BM|sort -n
     system.build.toplevel = pkgs.runCommand "not-os" {
diff --git a/configuration.nix b/configuration.nix
index 010c487..ab9c20f 100644
--- a/runit.nix
+++ b/runit.nix
@@ -64,7 +64,7 @@ in
     '';
     "service/rngd/run".source = pkgs.writeScript "rngd" ''
       #!/bin/sh
-      export PATH=$PATH:${pkgs.rng_tools}/bin
+      export PATH=$PATH:${pkgs.rng-tools}/bin
       exec rngd -r /dev/hwrng
     '';
     "service/nix/run".source = pkgs.writeScript "nix" ''
diff --git a/stage-1.nix b/stage-1.nix
index 8fcc04a..c372866 100644
--- a/stage-1.nix
+++ b/stage-1.nix
@@ -165,7 +165,6 @@ let

       cat /proc/partitions
-      lsblk
       lspci
       lsmod
     ${if config.not-os.nix then ''