summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-02-02 19:30:23 +0000
committerGitHub <noreply@github.com>2018-02-02 19:30:23 +0000
commita4170403e6a543662c97056ac20bb288b2c91af5 (patch)
treeeb827fbff247b7ed8e085b041c5c5ae8438d4755 /nixos
parentd8ba530e64da97cf6f4ff9a01d8d9173cafc0bcb (diff)
parentaff5137fc0c927f380d4c1ae7bcf001a3a303a05 (diff)
Merge pull request #33897 from rnhmjoj/digits
Avoid package attributes starting with a digit
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-1803.xml22
-rw-r--r--nixos/modules/services/x11/window-managers/2bwm.nix4
2 files changed, 24 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index a67d6939790d..46cbeb0a158e 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -90,6 +90,28 @@ following incompatible changes:</para>
</listitem>
<listitem>
<para>
+ Package attributes starting with a digit have been prefixed with an
+ underscore sign. This is to avoid quoting in the configuration and
+ other issues with command-line tools like <literal>nix-env</literal>.
+ The change affects the following packages:
+ <itemizedlist>
+ <listitem>
+ <para><literal>2048-in-terminal</literal> → <literal>_2048-in-terminal</literal></para>
+ </listitem>
+ <listitem>
+ <para><literal>90secondportraits</literal> → <literal>_90secondportraits</literal></para>
+ </listitem>
+ <listitem>
+ <para><literal>2bwm</literal> → <literal>_2bwm</literal></para>
+ </listitem>
+ <listitem>
+ <para><literal>389-ds-base</literal> → <literal>_389-ds-base</literal></para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<emphasis role="strong">
The OpenSSH service no longer enables support for DSA keys by default,
which could cause a system lock out. Update your keys or, unfavorably,
diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix
index e3f5ec7dbe67..fdbdf35b0f5a 100644
--- a/nixos/modules/services/x11/window-managers/2bwm.nix
+++ b/nixos/modules/services/x11/window-managers/2bwm.nix
@@ -25,12 +25,12 @@ in
{ name = "2bwm";
start =
''
- ${pkgs."2bwm"}/bin/2bwm &
+ ${pkgs._2bwm}/bin/2bwm &
waitPID=$!
'';
};
- environment.systemPackages = [ pkgs."2bwm" ];
+ environment.systemPackages = [ pkgs._2bwm ];
};