Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid package attributes starting with a digit #33897

Merged
merged 2 commits into from
Feb 2, 2018
Merged

Avoid package attributes starting with a digit #33897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c946c10
avoid package attributes starting with a digit
rnhmjoj Jan 15, 2018
aff5137
docs: document changes regarding package attribute with a digit
rnhmjoj Jan 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions nixos/doc/manual/release-notes/rl-1803.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,28 @@ following incompatible changes:</para>
<option>services.pgmanage</option>.
</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">
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/window-managers/2bwm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];

};

Expand Down
6 changes: 5 additions & 1 deletion pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ in
### Deprecated aliases - for backward compatibility

mapAliases (rec {
accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
_2048-in-terminal = "2048-in-terminal"; # added 2017-01-16
_2bwm = "2bwm"; # added 2017-01-16
_389-ds-base = "389-ds-base"; # added 2017-01-16
_90secondportraits = "90secondsportraits"; # added 2017-01-16
accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
adobeReader = adobe-reader; # added 2013-11-04
aircrackng = aircrack-ng; # added 2016-01-14
ammonite-repl = ammonite; # added 2017-05-02
Expand Down
10 changes: 5 additions & 5 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7313,7 +7313,7 @@ with pkgs;

cide = callPackage ../development/tools/continuous-integration/cide { };

"cl-launch" = callPackage ../development/tools/misc/cl-launch {};
cl-launch = callPackage ../development/tools/misc/cl-launch {};

cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { };

Expand Down Expand Up @@ -11739,7 +11739,7 @@ with pkgs;

### SERVERS

"389-ds-base" = callPackage ../servers/ldap/389 {
_389-ds-base = callPackage ../servers/ldap/389 {
kerberos = libkrb5;
};

Expand Down Expand Up @@ -14040,7 +14040,7 @@ with pkgs;

### APPLICATIONS

"2bwm" = callPackage ../applications/window-managers/2bwm {
_2bwm = callPackage ../applications/window-managers/2bwm {
patches = config."2bwm".patches or [];
};

Expand Down Expand Up @@ -18052,9 +18052,9 @@ with pkgs;

### GAMES

"2048-in-terminal" = callPackage ../games/2048-in-terminal { };
_2048-in-terminal = callPackage ../games/2048-in-terminal { };

"90secondportraits" = callPackage ../games/90secondportraits { love = love_0_10; };
_90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };

adom = callPackage ../games/adom { };

Expand Down