commit 64733ff646eceb2f50910c64e0d6ae6b744d80a7
parent 92fd557e827561b0577c25fa2235d78fec6ef07e
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 20 Apr 2020 22:33:55 +0300
Cleanup
Diffstat:
7 files changed, 55 insertions(+), 85 deletions(-)
diff --git a/pkgs/data/dicts/cambridge/default.nix b/pkgs/data/dicts/cambridge/default.nix
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "cambridge";
- version = "2.4.2";
-
- src = fetchurl {
- url = "http://download.huzheng.org/bigdict/stardict-Cambridge_Advanced_Learners_Dictionary_3th_Ed-${version}.tar.bz2";
- sha256 = "0mqrf5fr6hx3bjy1brsggmkrii2xf497jkaj6zf1hjxnp0ijswgr";
- };
-
- installPhase = ''
- install -dm755 "$out/share/goldendict/dictionaries/${pname}"
- cp -a . "$out/share/goldendict/dictionaries/${pname}"
- '';
-
- preferLocalBuild = true;
-
- meta = with stdenv.lib; {
- description = "Cambridge Advanced Learners Dictionary 3th Ed. (En-En)";
- homepage = "http://download.huzheng.org/bigdict/";
- license = licenses.free;
- maintainers = with maintainers; [ sikmir ];
- platforms = platforms.all;
- skip.ci = true;
- };
-}
diff --git a/pkgs/data/dicts/huzheng/base.nix b/pkgs/data/dicts/huzheng/base.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pname, version, filename, sha256, description }:
+
+stdenv.mkDerivation rec {
+ inherit pname version;
+
+ src = fetchurl {
+ url = "http://download.huzheng.org/bigdict/${filename}";
+ inherit sha256;
+ };
+
+ installPhase = ''
+ install -dm755 "$out/share/goldendict/dictionaries/${pname}"
+ cp -a . "$out/share/goldendict/dictionaries/${pname}"
+ '';
+
+ preferLocalBuild = true;
+
+ meta = with stdenv.lib; {
+ inherit description;
+ homepage = "http://download.huzheng.org/bigdict/";
+ license = licenses.free;
+ maintainers = with maintainers; [ sikmir ];
+ platforms = platforms.all;
+ skip.ci = true;
+ };
+}
diff --git a/pkgs/data/dicts/huzheng/default.nix b/pkgs/data/dicts/huzheng/default.nix
@@ -0,0 +1,27 @@
+{ callPackage }:
+
+{
+ cambridge = callPackage ./base.nix rec {
+ pname = "cambridge";
+ version = "2.4.2";
+ filename = "stardict-Cambridge_Advanced_Learners_Dictionary_3th_Ed-${version}.tar.bz2";
+ description = "Cambridge Advanced Learners Dictionary 3th Ed. (En-En)";
+ sha256 = "0mqrf5fr6hx3bjy1brsggmkrii2xf497jkaj6zf1hjxnp0ijswgr";
+ };
+
+ macmillan = callPackage ./base.nix rec {
+ pname = "macmillan";
+ version = "2.4.2";
+ filename = "stardict-Macmillan_English_Dictionary-${version}.tar.bz2";
+ description = "Macmillan English Dictionary (En-En)";
+ sha256 = "1xg4xvxnni5vc371sd0bvskl1vly6p62q3c8r36bd2069ln7jy8r";
+ };
+
+ webster = callPackage ./base.nix rec {
+ pname = "webster";
+ version = "2.4.2";
+ filename = "stardict-Webster_s_Unabridged_3-${version}.tar.bz2";
+ description = "Webster's Third New International Dictionary, Unabridged (En-En)";
+ sha256 = "1gj33px44d4ywhnxv7x5hxvh43f8m7skwmhvc62ld0c50blrqi7a";
+ };
+}
diff --git a/pkgs/data/dicts/macmillan/default.nix b/pkgs/data/dicts/macmillan/default.nix
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "macmillan";
- version = "2.4.2";
-
- src = fetchurl {
- url = "http://download.huzheng.org/bigdict/stardict-Macmillan_English_Dictionary-${version}.tar.bz2";
- sha256 = "1xg4xvxnni5vc371sd0bvskl1vly6p62q3c8r36bd2069ln7jy8r";
- };
-
- installPhase = ''
- install -dm755 "$out/share/goldendict/dictionaries/${pname}"
- cp -a . "$out/share/goldendict/dictionaries/${pname}"
- '';
-
- preferLocalBuild = true;
-
- meta = with stdenv.lib; {
- description = "Macmillan English Dictionary (En-En)";
- homepage = "http://download.huzheng.org/bigdict/";
- license = licenses.free;
- maintainers = with maintainers; [ sikmir ];
- platforms = platforms.all;
- skip.ci = true;
- };
-}
diff --git a/pkgs/data/dicts/webster/default.nix b/pkgs/data/dicts/webster/default.nix
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "webster";
- version = "2.4.2";
-
- src = fetchurl {
- url = "http://download.huzheng.org/bigdict/stardict-Webster_s_Unabridged_3-${version}.tar.bz2";
- sha256 = "1gj33px44d4ywhnxv7x5hxvh43f8m7skwmhvc62ld0c50blrqi7a";
- };
-
- installPhase = ''
- install -dm755 "$out/share/goldendict/dictionaries/${pname}"
- cp -a . "$out/share/goldendict/dictionaries/${pname}"
- '';
-
- preferLocalBuild = true;
-
- meta = with stdenv.lib; {
- description = "Webster's Third New International Dictionary, Unabridged (En-En)";
- homepage = "http://download.huzheng.org/bigdict/";
- license = licenses.free;
- maintainers = with maintainers; [ sikmir ];
- platforms = platforms.all;
- skip.ci = true;
- };
-}
diff --git a/pkgs/data/maps/qmapshack-routinodb/default.nix b/pkgs/data/maps/qmapshack-routinodb/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "qmapshack-routinodb";
- version = "2020-04-03";
+ version = sources.geofabrik-russia-nwfd.version;
srcs = [
sources.geofabrik-finland
sources.geofabrik-estonia
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -29,9 +29,7 @@ lib.makeScope newScope (
### DATA
- cambridge = callPackage ./data/dicts/cambridge {};
- macmillan = callPackage ./data/dicts/macmillan {};
- webster = callPackage ./data/dicts/webster {};
+ huzheng = callPackage ./data/dicts/huzheng {};
wiktionary = callPackage ./data/dicts/wiktionary {};
gpxsee-maps = callPackage ./data/maps/gpxsee-maps {};
