public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33897 from rnhmjoj/digits

Browse Source 
Avoid package attributes starting with a digit
This commit is contained in:
Jörg Thalheim 2018-02-02 19:30:23 +00:00 committed by GitHub
commit a4170403e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/doc/manual/release-notes/rl-1803.xml
View File

@ -88,6 +88,28 @@ following incompatible changes:</para>
<option>services.pgmanage</option>. <option>services.pgmanage</option>.
</para> </para>
</listitem> </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> <listitem>
<para> <para>
<emphasis role="strong"> <emphasis role="strong">

4
nixos/modules/services/x11/window-managers/2bwm.nix
View File

@ -25,12 +25,12 @@ in
{ name = "2bwm"; { name = "2bwm";
start = start =
'' ''
${pkgs."2bwm"}/bin/2bwm & ${pkgs._2bwm}/bin/2bwm &
waitPID=$! waitPID=$!
''; '';
}; };
environment.systemPackages = [ pkgs."2bwm" ]; environment.systemPackages = [ pkgs._2bwm ];
}; };

6
pkgs/top-level/aliases.nix
View File

@ -24,7 +24,11 @@ in
### Deprecated aliases - for backward compatibility ### Deprecated aliases - for backward compatibility
mapAliases (rec { 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 adobeReader = adobe-reader; # added 2013-11-04
aircrackng = aircrack-ng; # added 2016-01-14 aircrackng = aircrack-ng; # added 2016-01-14
ammonite-repl = ammonite; # added 2017-05-02 ammonite-repl = ammonite; # added 2017-05-02

10
pkgs/top-level/all-packages.nix
View File

@ -7342,7 +7342,7 @@ with pkgs;
cide = callPackage ../development/tools/continuous-integration/cide { }; 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 { }; cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { };
@ -11782,7 +11782,7 @@ with pkgs;
### SERVERS ### SERVERS
"389-ds-base" = callPackage ../servers/ldap/389 { _389-ds-base = callPackage ../servers/ldap/389 {
kerberos = libkrb5; kerberos = libkrb5;
}; };
@ -14107,7 +14107,7 @@ with pkgs;
### APPLICATIONS ### APPLICATIONS
"2bwm" = callPackage ../applications/window-managers/2bwm { _2bwm = callPackage ../applications/window-managers/2bwm {
patches = config."2bwm".patches or []; patches = config."2bwm".patches or [];
}; };
@ -18141,9 +18141,9 @@ with pkgs;
### GAMES ### 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 { }; adom = callPackage ../games/adom { };