about summary refs log tree commit diff
diff options
context:
space:
mode:
authoradisbladis <adis@blad.is>2018-04-24 15:16:45 +0800
committeradisbladis <adis@blad.is>2018-04-25 09:35:50 +0800
commit337e9723ce402c74996453b27088f2aa53e9e013 (patch)
tree6e2dc7bc8074eb3218d807fa8560e4e2e93d354e
parent58f53dc4d4b8b87172956e3658d24f158f9abaa4 (diff)
downloadnixlib-337e9723ce402c74996453b27088f2aa53e9e013.tar
nixlib-337e9723ce402c74996453b27088f2aa53e9e013.tar.gz
nixlib-337e9723ce402c74996453b27088f2aa53e9e013.tar.bz2
nixlib-337e9723ce402c74996453b27088f2aa53e9e013.tar.lz
nixlib-337e9723ce402c74996453b27088f2aa53e9e013.tar.xz
nixlib-337e9723ce402c74996453b27088f2aa53e9e013.tar.zst
nixlib-337e9723ce402c74996453b27088f2aa53e9e013.zip
kde-applications: Create alias to okteta
-rw-r--r--pkgs/applications/kde/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 451fdbe151f4..5870179b6c0b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -28,6 +28,7 @@ still shows most of the available features is in `./gwenview.nix`.
 {
   stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
   plasma5, attica, phonon,
+  okteta
 }:
 
 let
@@ -151,7 +152,6 @@ let
       mbox-importer = callPackage ./mbox-importer.nix {};
       messagelib = callPackage ./messagelib.nix {};
       minuet = callPackage ./minuet.nix {};
-      okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       pimcommon = callPackage ./pimcommon.nix {};
       pim-data-exporter = callPackage ./pim-data-exporter.nix {};
@@ -159,6 +159,9 @@ let
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
       syndication = callPackage ./syndication.nix {};
+      # Okteta was removed from kde applications and will now be released independently
+      # Lets keep an alias for compatibility reasons
+      inherit okteta;
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a82de21279b6..d5e8b16e017c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16411,6 +16411,7 @@ with pkgs;
         inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
         inherit plasma5;
         inherit attica phonon;
+        inherit okteta;
       };
     in
       recurseIntoAttrs (makeOverridable mkApplications attrs);