diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2018-01-15 12:10:23 +0100 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2018-01-16 21:13:16 +0100 |
| commit | c946c101d6dad31897c13a6ba3d6ff75ade1c81d (patch) | |
| tree | 02c1eaa93bc2f97418298cd8b31d16eeab70b3f1 | |
| parent | 222f905fd9042f80d4cdef65bb7d2801fdb63429 (diff) | |
| download | nixpkgs-c946c101d6dad31897c13a6ba3d6ff75ade1c81d.tar nixpkgs-c946c101d6dad31897c13a6ba3d6ff75ade1c81d.tar.gz nixpkgs-c946c101d6dad31897c13a6ba3d6ff75ade1c81d.tar.bz2 nixpkgs-c946c101d6dad31897c13a6ba3d6ff75ade1c81d.tar.lz nixpkgs-c946c101d6dad31897c13a6ba3d6ff75ade1c81d.tar.xz nixpkgs-c946c101d6dad31897c13a6ba3d6ff75ade1c81d.tar.zst nixpkgs-c946c101d6dad31897c13a6ba3d6ff75ade1c81d.zip | |
avoid package attributes starting with a digit
| -rw-r--r-- | nixos/modules/services/x11/window-managers/2bwm.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix index e3f5ec7dbe6..fdbdf35b0f5 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 ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f0054b9841b..6ee622d2eef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a6eaec0a2..4c946882633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; @@ -11739,7 +11739,7 @@ with pkgs; ### SERVERS - "389-ds-base" = callPackage ../servers/ldap/389 { + _389-ds-base = callPackage ../servers/ldap/389 { kerberos = libkrb5; }; @@ -14040,7 +14040,7 @@ with pkgs; ### APPLICATIONS - "2bwm" = callPackage ../applications/window-managers/2bwm { + _2bwm = callPackage ../applications/window-managers/2bwm { patches = config."2bwm".patches or []; }; @@ -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 { }; |