commit 090a80834bb8fc5be688dd54a00160aa9165d086
parent 22e2ab28830a8287784626d3d345f6d340b51202
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 4 Apr 2021 23:13:03 +0300
Up
Diffstat:
6 files changed, 48 insertions(+), 82 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -874,48 +874,6 @@
"url": "https://github.com/tumic0/QtPBFImagePlugin-styles/archive/577bb119641c80e1736815ed70a0b99c942c63e0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "redict": {
- "branch": "master",
- "builtin": false,
- "date": "2019-06-20T23:15:30Z",
- "description": "A dictionary for Linux, based on C++/Qt development",
- "homepage": "https://github.com/rekols/redict",
- "owner": "rekols",
- "repo": "redict",
- "rev": "525aac01ed5fc0f74f8393dc5b5b3bb57c9b0c5f",
- "sha256": "1zlad1bmlyy4hirm93f0744c98y9hg11b32ym06rsax719qj2rjl",
- "type": "tarball",
- "url": "https://github.com/rekols/redict/archive/525aac01ed5fc0f74f8393dc5b5b3bb57c9b0c5f.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
- "s2sphere": {
- "branch": "master",
- "builtin": false,
- "date": "2017-11-16T17:47:11Z",
- "description": "Python implementation of the S2 geometry library",
- "homepage": "http://s2sphere.sidewalklabs.com/",
- "owner": "sidewalklabs",
- "repo": "s2sphere",
- "rev": "d1d067e8c06e5fbaf0cc0158bade947b4a03a438",
- "sha256": "0jidg5bg6qpiji8j2r8s8abxxs08ldkc7rdplhbnfw6k4axlh4za",
- "type": "tarball",
- "url": "https://github.com/sidewalklabs/s2sphere/archive/d1d067e8c06e5fbaf0cc0158bade947b4a03a438.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
- "stardict-3": {
- "branch": "master",
- "builtin": false,
- "date": "2021-01-07T02:11:57Z",
- "description": "Automatically exported from code.google.com/p/stardict-3",
- "homepage": "https://github.com/huzheng001/stardict-3",
- "owner": "huzheng001",
- "repo": "stardict-3",
- "rev": "c551c8dd0d8abaa93968dcfb432963671d537807",
- "sha256": "18j4r125mcyf9iy01092s2fr80xij7lh40s6l969k3jx77xkpfxc",
- "type": "tarball",
- "url": "https://github.com/huzheng001/stardict-3/archive/c551c8dd0d8abaa93968dcfb432963671d537807.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"supermercado": {
"branch": "master",
"builtin": false,
@@ -999,19 +957,5 @@
"type": "tarball",
"url": "https://github.com/woboq/tr/archive/28f8b95ccb8055cf785382f71d11aa9bbd35dab4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
- "zdict": {
- "branch": "master",
- "builtin": false,
- "date": "2021-03-06T07:20:36Z",
- "description": "The last online dictionary framework you need",
- "homepage": "https://pypi.org/project/zdict/",
- "owner": "zdict",
- "repo": "zdict",
- "rev": "75bb41aebbe150fb874aa577a955c5d547fa0f69",
- "sha256": "081h6wz11kd9dr00vdig3662j69gbv9fk79c58gisxpjddawf7w6",
- "type": "tarball",
- "url": "https://github.com/zdict/zdict/archive/75bb41aebbe150fb874aa577a955c5d547fa0f69.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -140,9 +140,7 @@ lib.makeScope newScope (
lsdreader = callPackage ./dict/lsdreader { };
odict = callPackage ./dict/odict { };
opendict = callPackage ./dict/opendict { };
- redict = libsForQt5.callPackage ./dict/redict {
- inherit sources;
- };
+ redict = libsForQt5.callPackage ./dict/redict { };
stardict-tools = callPackage ./dict/stardict-tools { };
tatoebatools = callPackage ./dict/tatoebatools { };
zdict = callPackage ./dict/zdict { };
diff --git a/pkgs/development/python-modules/s2sphere/default.nix b/pkgs/development/python-modules/s2sphere/default.nix
@@ -1,10 +1,15 @@
-{ lib, python3Packages, sources }:
+{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonPackage {
- pname = "s2sphere-unstable";
- version = lib.substring 0 10 sources.s2sphere.date;
+ pname = "s2sphere";
+ version = "0.2.5";
- src = sources.s2sphere;
+ src = fetchFromGitHub {
+ owner = "sidewalklabs";
+ repo = "s2sphere";
+ rev = "d1d067e8c06e5fbaf0cc0158bade947b4a03a438";
+ sha256 = "0jidg5bg6qpiji8j2r8s8abxxs08ldkc7rdplhbnfw6k4axlh4za";
+ };
propagatedBuildInputs = with python3Packages; [ future ];
@@ -13,7 +18,8 @@ python3Packages.buildPythonPackage {
pythonImportsCheck = [ "s2sphere" ];
meta = with lib; {
- inherit (sources.s2sphere) description homepage;
+ description = "Python implementation of the S2 geometry library";
+ homepage = "http://s2sphere.sidewalklabs.com/";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
};
diff --git a/pkgs/dict/redict/default.nix b/pkgs/dict/redict/default.nix
@@ -1,6 +1,7 @@
{ mkDerivation
, stdenv
, lib
+, fetchFromGitHub
, pkg-config
, qmake
, qtbase
@@ -11,15 +12,19 @@
, libX11
, libXext
, libXtst
-, sources
, withI18n ? true
}:
mkDerivation {
- pname = "redict-unstable";
- version = lib.substring 0 10 sources.redict.date;
+ pname = "redict";
+ version = "2019-06-21";
- src = sources.redict;
+ src = fetchFromGitHub {
+ owner = "rekols";
+ repo = "redict";
+ rev = "525aac01ed5fc0f74f8393dc5b5b3bb57c9b0c5f";
+ sha256 = "1zlad1bmlyy4hirm93f0744c98y9hg11b32ym06rsax719qj2rjl";
+ };
nativeBuildInputs = [ qmake pkg-config ]
++ lib.optional withI18n qttools;
@@ -44,7 +49,8 @@ mkDerivation {
];
meta = with lib; {
- inherit (sources.redict) description homepage;
+ description = "A dictionary for Linux, based on C++/Qt development";
+ homepage = "https://github.com/rekols/redict";
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/dict/stardict-tools/default.nix b/pkgs/dict/stardict-tools/default.nix
@@ -1,5 +1,6 @@
{ lib
, stdenv
+, fetchFromGitHub
, autoconf
, automake
, libtool
@@ -8,14 +9,18 @@
, libmysqlclient
, libxml2
, pcre
-, sources
}:
stdenv.mkDerivation {
pname = "stardict-tools";
- version = lib.substring 0 10 sources.stardict-3.date;
+ version = "2021-01-07";
- src = sources.stardict-3;
+ src = fetchFromGitHub {
+ owner = "huzheng001";
+ repo = "stardict-3";
+ rev = "36347a29526e4bacea910017efa1d839dab89667";
+ sha256 = "1qvf74j4m7s3cjhrwdfgji436im0zxh0m1j92ybdk0krnnv29c4m";
+ };
nativeBuildInputs = [
autoconf
@@ -51,7 +56,8 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
meta = with lib; {
- inherit (sources.stardict-3) description homepage;
+ description = "Stardict tools";
+ homepage = "https://github.com/huzheng001/stardict-3";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/dict/zdict/default.nix b/pkgs/dict/zdict/default.nix
@@ -1,12 +1,17 @@
-{ lib, python37Packages, sources }:
+{ lib, fetchFromGitHub, python3Packages }:
-python37Packages.buildPythonApplication {
- pname = "zdict-unstable";
- version = lib.substring 0 10 sources.zdict.date;
+python3Packages.buildPythonApplication rec {
+ pname = "zdict";
+ version = "3.8.2";
- src = sources.zdict;
+ src = fetchFromGitHub {
+ owner = "zdict";
+ repo = "zdict";
+ rev = version;
+ sha256 = "0x0952m0yknzpvpfc5qxwijx2fa163rqsvs8masv0n2h9fl5rr8z";
+ };
- propagatedBuildInputs = with python37Packages; [
+ propagatedBuildInputs = with python3Packages; [
beautifulsoup4
peewee
requests
@@ -16,17 +21,18 @@ python37Packages.buildPythonApplication {
postPatch = "sed -i 's/==.*//' requirements.txt";
buildPhase = ''
- ${python37Packages.python.interpreter} setup.py build
+ ${python3Packages.python.interpreter} setup.py build
'';
doCheck = false;
installPhase = ''
- ${python37Packages.python.interpreter} setup.py install --skip-build --prefix=$out
+ ${python3Packages.python.interpreter} setup.py install --skip-build --prefix=$out
'';
meta = with lib; {
- inherit (sources.zdict) description homepage;
+ description = "The last online dictionary framework you need";
+ homepage = "https://github.com/zdict/zdict";
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
