summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-01-14 13:07:56 +0100
committerDomen Kožar <domen@dev.si>2016-01-14 13:08:56 +0100
commit8525936f807620e3d98fe4865033bdcd6932a362 (patch)
tree2bcad3d13a4f46375b7bea4583ca27b730683446 /nixos
parentc8b231a40c444f9f0b419f3456fe15ad0b81fd29 (diff)
downloadnixpkgs-8525936f807620e3d98fe4865033bdcd6932a362.tar
nixpkgs-8525936f807620e3d98fe4865033bdcd6932a362.tar.gz
nixpkgs-8525936f807620e3d98fe4865033bdcd6932a362.tar.bz2
nixpkgs-8525936f807620e3d98fe4865033bdcd6932a362.tar.lz
nixpkgs-8525936f807620e3d98fe4865033bdcd6932a362.tar.xz
nixpkgs-8525936f807620e3d98fe4865033bdcd6932a362.tar.zst
nixpkgs-8525936f807620e3d98fe4865033bdcd6932a362.zip
nixos: Document "jobs" option removal
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-unstable.xml6
-rw-r--r--nixos/modules/rename.nix1
2 files changed, 7 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 9853e7f9d70..48771d8c225 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -48,6 +48,12 @@ following incompatible changes:</para>
   </listitem>
 
   <listitem>
+    <para><literal>jobs</literal> NixOS option has been removed. It served as
+    compatibility layer between Upstart jobs and SystemD services. All services
+    have been rewritten to use <literal>systemd.services</literal></para>
+  </listitem>
+
+  <listitem>
     <para><command>wmiimenu</command> is removed, as it has been
     removed by the developers upstream. Use <command>wimenu</command>
     from the <command>wmii-hg</command> package.</para>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 491e6fa7d0c..010d44c40d1 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -26,6 +26,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
+    (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
 
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])