commit 43f1f4e869e34c992807fb5501631f494ed020be
parent 6daee44a6c0d522dce1589eab7b3629c1b805b9a
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 25 Apr 2021 01:14:48 +0300
Up
Diffstat:
5 files changed, 38 insertions(+), 62 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -1,18 +1,4 @@
{
- "apibackuper": {
- "branch": "master",
- "builtin": false,
- "date": "2020-11-03T14:35:02Z",
- "description": "Python library and cmd tool to backup API calls",
- "homepage": "https://github.com/ruarxive/apibackuper",
- "owner": "ruarxive",
- "repo": "apibackuper",
- "rev": "1ff139f688d59b899ff041ccc282e224110ddc76",
- "sha256": "01lwd958byqh3ly9f1n4rk8sq3mdjgydsw2il4mvblsmcid7pg84",
- "type": "tarball",
- "url": "https://github.com/ruarxive/apibackuper/archive/1ff139f688d59b899ff041ccc282e224110ddc76.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"docker-reg-tool": {
"branch": "master",
"builtin": false,
@@ -205,20 +191,6 @@
"url": "https://github.com/viva64/how-to-use-pvs-studio-free/archive/abc39706151159d102d29e3e2f2b8d5688362ec3.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "jsonseq": {
- "branch": "master",
- "builtin": false,
- "date": "2019-07-31T19:44:30Z",
- "description": "Python implementation of RFC 7464",
- "homepage": "https://github.com/sgillies/jsonseq",
- "owner": "sgillies",
- "repo": "jsonseq",
- "rev": "d9a9c86c6c05abca1ed2bdbff248eb3cd9f214fd",
- "sha256": "0a2ivyc4dbfxnwc8phzgxxnmg57n5iwk4sjcnarhib25qkwbi6v9",
- "type": "tarball",
- "url": "https://github.com/sgillies/jsonseq/archive/d9a9c86c6c05abca1ed2bdbff248eb3cd9f214fd.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"klogg": {
"branch": "master",
"builtin": false,
@@ -453,19 +425,5 @@
"type": "tarball",
"url": "https://github.com/mapbox/tilesets-cli/archive/23b74acadf89ad917c15dd8fb9c8f59aa6cc8640.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
- "tpkutils": {
- "branch": "main",
- "builtin": false,
- "date": "2021-02-10T19:44:55Z",
- "description": "ArcGIS Tile Package Utilities",
- "homepage": "https://github.com/consbio/tpkutils",
- "owner": "consbio",
- "repo": "tpkutils",
- "rev": "5f3694451a1759548af579b689f478cefc633252",
- "sha256": "0rr5ynzzy0a9y2d55bhq271vsjdi5nqq70329zinwgs1d9207qg9",
- "type": "tarball",
- "url": "https://github.com/consbio/tpkutils/archive/5f3694451a1759548af579b689f478cefc633252.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix
@@ -1,15 +1,21 @@
-{ lib, python3Packages, sources }:
+{ lib, fetchFromGitHub, python3Packages }:
-python3Packages.buildPythonPackage {
- pname = "jsonseq-unstable";
- version = lib.substring 0 10 sources.jsonseq.date;
+python3Packages.buildPythonPackage rec {
+ pname = "jsonseq";
+ version = "1.0.0";
- src = sources.jsonseq;
+ src = fetchFromGitHub {
+ owner = "sgillies";
+ repo = pname;
+ rev = version;
+ hash = "sha256-aZu4+MRFrAizskxqMnks9pRXbe/vw4sYt92tRpjfUSg=";
+ };
checkInputs = with python3Packages; [ pytestCheckHook ];
meta = with lib; {
- inherit (sources.jsonseq) description homepage;
+ description = "Python implementation of RFC 7464";
+ inherit (src.meta) homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
};
diff --git a/pkgs/misc/apibackuper/default.nix b/pkgs/misc/apibackuper/default.nix
@@ -1,17 +1,23 @@
-{ lib, python3Packages, bson, sources }:
+{ lib, fetchFromGitHub, python3Packages, bson }:
-python3Packages.buildPythonApplication {
- pname = "apibackuper-unstable";
- version = lib.substring 0 10 sources.apibackuper.date;
+python3Packages.buildPythonApplication rec {
+ pname = "apibackuper";
+ version = "2020-11-03";
- src = sources.apibackuper;
+ src = fetchFromGitHub {
+ owner = "ruarxive";
+ repo = pname;
+ rev = "1ff139f688d59b899ff041ccc282e224110ddc76";
+ hash = "sha256-BL17WmRV07UroVFw3fyTrQ6s0czEBpc8HRD7hUpqnAY=";
+ };
propagatedBuildInputs = with python3Packages; [ bson click lxml requests xmltodict ];
doCheck = false;
meta = with lib; {
- inherit (sources.apibackuper) description homepage;
+ description = "Python library and cmd tool to backup API calls";
+ inherit (src.meta) homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/misc/reproxy/default.nix b/pkgs/misc/reproxy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "reproxy";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "umputun";
repo = pname;
rev = "v${version}";
- sha256 = "1ai72c7yj9328ssj4hhklg7zrkpb1b0l315infbdzkchc82p7wwj";
+ hash = "sha256-6NjW/JnHVspGZAOiPOkOztJmqLlmjJZm9vuL/fN94Jc=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix
@@ -1,17 +1,23 @@
-{ lib, python3Packages, mercantile, pymbtiles, sources }:
+{ lib, fetchFromGitHub, python3Packages, mercantile, pymbtiles }:
-python3Packages.buildPythonApplication {
- pname = "tpkutils-unstable";
- version = lib.substring 0 10 sources.tpkutils.date;
+python3Packages.buildPythonApplication rec {
+ pname = "tpkutils";
+ version = "2021-02-10";
- src = sources.tpkutils;
+ src = fetchFromGitHub {
+ owner = "consbio";
+ repo = pname;
+ rev = "5f3694451a1759548af579b689f478cefc633252";
+ hash = "sha256-6eEDRGpBP27jT2KAg7EtsUm9wxEYrlKa8EkB/7/1JWc=";
+ };
propagatedBuildInputs = with python3Packages; [ mercantile pymbtiles setuptools six ];
checkInputs = with python3Packages; [ pytestCheckHook ];
meta = with lib; {
- inherit (sources.tpkutils) description homepage;
+ description = "ArcGIS Tile Package Utilities";
+ inherit (src.meta) homepage;
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
