about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2016-10-19 08:33:10 +0200
committerEdward Tjörnhammar <ed@cflags.cc>2016-10-19 08:43:30 +0200
commitf59a1ee660060232891789cef8951cb9dfd9aeb9 (patch)
treecb7a86a2de685607d60da2f26c3b9fead7cf4a91 /pkgs
parent5929a5d9580fe522c5d055b49c3de846ff8b543d (diff)
move dictd* in toplevel dicts to dictdDBs
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/dict/dictd-db.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 995a643d7efd7..500ac6fd47bf2 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, callPackage }:
 
 let
  # Probably a bug in some FreeDict release files, but easier to trivially
@@ -82,4 +82,6 @@ in rec {
     dbName = "mueller-names";
     locale = "en_UK";
   };
+  wordnet = callPackage ./dictd-wordnet.nix {};
+  wiktionary = callPackage ./dictd-wiktionary.nix {};
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85e1336deb459..e6b5a75221dcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9817,10 +9817,6 @@ in
 
   dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix {};
 
-  dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {};
-
-  dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
-
   diod = callPackage ../servers/diod { lua = lua5_1; };
 
   #dnschain = callPackage ../servers/dnschain { };