diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-01-26 20:45:55 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-01-26 21:01:07 -0600 |
| commit | 63ec1a9677adc730df58ef60dfce09e253fb3dbf (patch) | |
| tree | f75ded11aa7c0928c1459f77e37282d886b9da43 | |
| parent | a55543711e98a16e6611e4eea60581ea6c503dbe (diff) | |
add stable attrs for plasma5, kf5, and kdeApps
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index c5fc711b779c6..6d6479da2a1ff 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -33,11 +33,11 @@ let phononBackendPackages = flip concatMap cfg.phononBackends (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); - kf5 = pkgs.kf55; + kf5 = pkgs.kf5_stable; - plasma5 = pkgs.plasma51; + plasma5 = pkgs.plasma5_stable; - kdeApps = pkgs.kdeApps_14_12; + kdeApps = pkgs.kdeApps_stable; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6e8bea0ef7e7..26cb9eda76abf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5813,6 +5813,7 @@ let stdenv = overrideGCC stdenv gccStdInc; }); kf5_latest = kf55; + kf5_stable = kf55; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { openldap = openldap.override { @@ -10373,10 +10374,11 @@ let boost = boost155; }; - kdeApps_latest = kdeApps_14_12; kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { stdenv = overrideGCC stdenv gccStdInc; }); + kdeApps_latest = kdeApps_14_12; + kdeApps_stable = kdeApps_14_12; keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; @@ -12451,10 +12453,11 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; - plasma5_latest = plasma51; plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 { stdenv = overrideGCC stdenv gccStdInc; }); + plasma5_latest = plasma51; + plasma5_stable = plasma51; kde5 = kf55 // plasma51 // kdeApps_14_12; |