From c7c77ab0294562311fcfd70f58bcc7a72ede6625 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 11 Feb 2021 16:25:11 +0000
Subject: [PATCH] dictdDBs.wiktionary: improve expression

* Fix style
* Move builder.sh into its own file
* Use standard "src" name for source
* Add myself as maintainer
* Add license
---
 pkgs/servers/dict/dictd-db.nix                |  2 +-
 pkgs/servers/dict/dictd-wiktionary.nix        | 31 -------------------
 pkgs/servers/dict/wiktionary/builder.sh       |  8 +++++
 pkgs/servers/dict/wiktionary/default.nix      | 23 ++++++++++++++
 .../dict/{ => wiktionary}/wiktionary2dict.py  |  0
 5 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/dict/dictd-wiktionary.nix
 create mode 100644 pkgs/servers/dict/wiktionary/builder.sh
 create mode 100644 pkgs/servers/dict/wiktionary/default.nix
 rename pkgs/servers/dict/{ => wiktionary}/wiktionary2dict.py (100%)

diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 584c35bf7f8..da73a94c2aa 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -91,5 +91,5 @@ in rec {
     locale = "en_UK";
   };
   wordnet = callPackage ./dictd-wordnet.nix {};
-  wiktionary = callPackage ./dictd-wiktionary.nix {};
+  wiktionary = callPackage ./wiktionary {};
 }
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
deleted file mode 100644
index ed6f7357172..00000000000
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{lib, stdenv, fetchurl, python, dict, glibcLocales, writeScript}:
-
-stdenv.mkDerivation rec {
-  version = "20210201";
-  pname = "dict-db-wiktionary";
-  data = fetchurl {
-    url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
-    sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs";
-  };
-
-  convert = ./wiktionary2dict.py;
-  buildInputs = [python dict glibcLocales];
-
-  builder = writeScript "wiktionary-builder.sh" ''
-    source $stdenv/setup
-
-    mkdir -p $out/share/dictd/
-    cd $out/share/dictd
-
-    python -O ${convert} ${data}
-    dictzip wiktionary-en.dict
-    echo en_US.UTF-8 > locale
-  '';
-
-  meta = {
-    description = "DICT version of English Wiktionary";
-    homepage = "http://en.wiktionary.org/";
-    maintainers = [ ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/servers/dict/wiktionary/builder.sh b/pkgs/servers/dict/wiktionary/builder.sh
new file mode 100644
index 00000000000..65652ad4bdb
--- /dev/null
+++ b/pkgs/servers/dict/wiktionary/builder.sh
@@ -0,0 +1,8 @@
+source $stdenv/setup
+
+mkdir -p $out/share/dictd/
+cd $out/share/dictd
+
+python -O "$convert" "$src"
+dictzip wiktionary-en.dict
+echo en_US.UTF-8 > locale
diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix
new file mode 100644
index 00000000000..3c18056821d
--- /dev/null
+++ b/pkgs/servers/dict/wiktionary/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchurl, python, dict, glibcLocales }:
+
+stdenv.mkDerivation rec {
+  version = "20210201";
+  pname = "dict-db-wiktionary";
+
+  src = fetchurl {
+    url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
+    sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs";
+  };
+
+  convert = ./wiktionary2dict.py;
+  buildInputs = [ python dict glibcLocales ];
+  builder = ./builder.sh;
+
+  meta = with lib; {
+    description = "DICT version of English Wiktionary";
+    homepage = "http://en.wiktionary.org/";
+    maintainers = with maintainers; [ qyliss ];
+    platforms = platforms.all;
+    license = with licenses; [ cc-by-sa-30 fdl11Plus ];
+  };
+}
diff --git a/pkgs/servers/dict/wiktionary2dict.py b/pkgs/servers/dict/wiktionary/wiktionary2dict.py
similarity index 100%
rename from pkgs/servers/dict/wiktionary2dict.py
rename to pkgs/servers/dict/wiktionary/wiktionary2dict.py