commit d4106e33b6751efb43f887edc0e2bcfacefc3513
parent 71f7abfa38d3dfc575d83ea3f57ace0e7139b0ba
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 22 Apr 2021 10:34:20 +0300
Up
Diffstat:
13 files changed, 124 insertions(+), 214 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -27,34 +27,6 @@
"url": "https://github.com/CheetahTemplate3/cheetah3/archive/a4e33f0f55ed5909437cbbf262fa99de78a7ad2b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "csvquote": {
- "branch": "master",
- "builtin": false,
- "date": "2018-05-28T13:43:50Z",
- "description": "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines",
- "homepage": "https://github.com/dbro/csvquote",
- "owner": "dbro",
- "repo": "csvquote",
- "rev": "baf37fa4cccc656282551db4ea7ce4ec6b9c318e",
- "sha256": "06kzg52mnli0mvwrhw4vifj7lfs3id2v73z63s11jj2qvlcp8biy",
- "type": "tarball",
- "url": "https://github.com/dbro/csvquote/archive/baf37fa4cccc656282551db4ea7ce4ec6b9c318e.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
- "csvtools": {
- "branch": "master",
- "builtin": false,
- "date": "2019-08-03T13:11:03Z",
- "description": "GNU-alike tools for parsing RFC 4180 CSVs at high speed",
- "homepage": "https://github.com/DavyLandman/csvtools",
- "owner": "DavyLandman",
- "repo": "csvtools",
- "rev": "efd3ef1c94c26c673e958ecb045056bfc2c7b4f3",
- "sha256": "0s4aw9wf1apxjas7hsgfzryisb67nipxhivxkzrar3rpykk0ilc4",
- "type": "tarball",
- "url": "https://github.com/DavyLandman/csvtools/archive/efd3ef1c94c26c673e958ecb045056bfc2c7b4f3.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"dict2rest": {
"branch": "master",
"builtin": false,
@@ -167,20 +139,6 @@
"url": "https://github.com/konstare/gdcv/archive/39fd2667362710f69c13dd596e112b0391e0a57e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "geminid": {
- "branch": "master",
- "builtin": false,
- "date": "2020-09-09T10:08:52Z",
- "description": "Gemini Server in C",
- "homepage": "https://github.com/jovoro/geminid",
- "owner": "jovoro",
- "repo": "geminid",
- "rev": "3f79348aaffebfb2d80252d8cdbaf6ad26fa9121",
- "sha256": "1r3pakhgr4kry71blxay1hq93raw7xc2ypzk6z7zk0ljfqp2qq3v",
- "type": "tarball",
- "url": "https://github.com/jovoro/geminid/archive/3f79348aaffebfb2d80252d8cdbaf6ad26fa9121.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"geofabrik-estonia": {
"builtin": false,
"sha256": "07gy3280arvkvfpm82aqcing1w7av6hq3crf5wxm66ipk2viwmg7",
@@ -401,20 +359,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"
},
- "it-sanasto": {
- "branch": "master",
- "builtin": false,
- "date": "2020-02-27T16:11:28Z",
- "description": "IT-alan englanti-suomi -sanasto",
- "homepage": "https://github.com/HankiDesign/IT-sanasto",
- "owner": "HankiDesign",
- "repo": "IT-sanasto",
- "rev": "e31974edd50a50db6ef1b95aab81a18f33800e67",
- "sha256": "0knd2mw97wjc7d9zvfb9wsb1f5hr7d04gi6s8nj5aziai4dwm0pr",
- "type": "tarball",
- "url": "https://github.com/HankiDesign/IT-sanasto/archive/e31974edd50a50db6ef1b95aab81a18f33800e67.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"jsonseq": {
"branch": "master",
"builtin": false,
@@ -457,20 +401,6 @@
"url": "https://github.com/ivbeg/lazyscraper/archive/2e14bd829311cde19ef32d7f0e11c3c4a3c08e1b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "libshell": {
- "branch": "master",
- "builtin": false,
- "date": "2020-03-16T17:18:36Z",
- "description": "A library of shell functions",
- "homepage": "https://github.com/legionus/libshell",
- "owner": "legionus",
- "repo": "libshell",
- "rev": "62559f85214bb902c2201d0a1e338d56d5f640e4",
- "sha256": "1iyqagc8mc0afp0clbigjqds1hg3wz884cp1nng7gx08rnmr0l89",
- "type": "tarball",
- "url": "https://github.com/legionus/libshell/archive/62559f85214bb902c2201d0a1e338d56d5f640e4.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"lsdreader": {
"branch": "master",
"builtin": false,
@@ -513,20 +443,6 @@
"url": "https://github.com/slazav/map_podm/archive/c95a381155986f9f621e5d26b21bda041ad8c24f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "map-stylizer": {
- "branch": "master",
- "builtin": false,
- "date": "2020-06-30T03:06:18Z",
- "description": "GUI written in Python to parse OSM (OpenStreetMap) files and render them onscreen",
- "homepage": "https://github.com/Absolute-Tinkerer/map-stylizer",
- "owner": "Absolute-Tinkerer",
- "repo": "map-stylizer",
- "rev": "6279f40408aff823a4eb1071334bd2acd10cb921",
- "sha256": "0k9lng42vi0qcjwfkkd0g55g1wb7a5wz782mvc0rj8gr95shfhxx",
- "type": "tarball",
- "url": "https://github.com/Absolute-Tinkerer/map-stylizer/archive/6279f40408aff823a4eb1071334bd2acd10cb921.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"maptourist": {
"builtin": false,
"description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin",
@@ -538,20 +454,6 @@
"url_template": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-<region>-RU_<version>.zip",
"version": "2021-03-06"
},
- "md2gemini": {
- "branch": "master",
- "builtin": false,
- "date": "2020-12-14T20:05:33Z",
- "description": "File converter from Markdown to Gemini",
- "homepage": "https://github.com/makeworld-the-better-one/md2gemini",
- "owner": "makeworld-the-better-one",
- "repo": "md2gemini",
- "rev": "c83ad7f9b22407154556625ea2d1c3b89890f04a",
- "sha256": "156k0caqmmsypqiirmxsn22ddk6rz8wcxzkw0jrdwszv78ai750y",
- "type": "tarball",
- "url": "https://github.com/makeworld-the-better-one/md2gemini/archive/c83ad7f9b22407154556625ea2d1c3b89890f04a.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"mercantile": {
"branch": "master",
"builtin": false,
@@ -580,20 +482,6 @@
"url": "https://github.com/semlanik/microjson/archive/0d9f50e407cd117e56582faf0d99bfececc1b6ea.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "morse-talk": {
- "branch": "master",
- "builtin": false,
- "date": "2016-12-25T13:48:00Z",
- "description": "A Python library written for Morse Code",
- "homepage": "https://github.com/morse-talk/morse-talk",
- "owner": "morse-talk",
- "repo": "morse-talk",
- "rev": "71e09ace0aa554d28cada5ee658e43758305b8fa",
- "sha256": "0jnpv73q4s7x2zhpvnvxhv3bw6asnrqfr1pjr4hzsbpl7h8h5x3y",
- "type": "tarball",
- "url": "https://github.com/morse-talk/morse-talk/archive/71e09ace0aa554d28cada5ee658e43758305b8fa.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"musig": {
"branch": "master",
"builtin": false,
@@ -608,20 +496,6 @@
"url": "https://github.com/sfluor/musig/archive/f445fa128b826c1cee527afdcc97e3e1e8433c32.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "nakarte": {
- "branch": "master",
- "builtin": false,
- "date": "2021-02-21T11:11:31Z",
- "description": "Source code of site http://nakarte.me",
- "homepage": "https://nakarte.me",
- "owner": "wladich",
- "repo": "nakarte",
- "rev": "131a70c6143b31569f75477396d4745edc89d22f",
- "sha256": "17bzaj8s2sgl1yjknyk7kdxbd8ydxizag28wwmxpir5zm85is4pz",
- "type": "tarball",
- "url": "https://github.com/wladich/nakarte/archive/131a70c6143b31569f75477396d4745edc89d22f.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"nnn": {
"branch": "master",
"builtin": false,
@@ -678,20 +552,6 @@
"url": "https://github.com/osmcode/osm-area-tools/archive/b96db0ced55f1bb574084620ca34f0a2e9d19b5a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "osm2mp": {
- "branch": "master",
- "builtin": false,
- "date": "2018-08-31T10:45:18Z",
- "description": "Convert Openstreetmap data to MP format",
- "homepage": "https://github.com/liosha/osm2mp",
- "owner": "liosha",
- "repo": "osm2mp",
- "rev": "748f93792ead174ad0e94a183a173ef3fcacf200",
- "sha256": "0k525fzlcxih51hxvy24fhc12z4i0jvvd4lrfrlhjyhbx8x486v3",
- "type": "tarball",
- "url": "https://github.com/liosha/osm2mp/archive/748f93792ead174ad0e94a183a173ef3fcacf200.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"osmcoastline": {
"branch": "master",
"builtin": false,
@@ -831,19 +691,5 @@
"type": "tarball",
"url": "https://github.com/consbio/tpkutils/archive/5f3694451a1759548af579b689f478cefc633252.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
- "xtr": {
- "branch": "master",
- "builtin": false,
- "date": "2021-02-14T10:34:29Z",
- "description": "Translation tools for rust",
- "homepage": "https://github.com/woboq/tr",
- "owner": "woboq",
- "repo": "tr",
- "rev": "28f8b95ccb8055cf785382f71d11aa9bbd35dab4",
- "sha256": "0457467drkiwxc3fwrz63j37jgczz23b2zs9qf3d6w7dj5qq4212",
- "type": "tarball",
- "url": "https://github.com/woboq/tr/archive/28f8b95ccb8055cf785382f71d11aa9bbd35dab4.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix
@@ -1,10 +1,15 @@
-{ lib, stdenvNoCC, dict, pandoc, stardict-tools, sources }:
+{ lib, stdenvNoCC, fetchFromGitHub, dict, pandoc, stardict-tools }:
stdenvNoCC.mkDerivation {
pname = "it-sanasto";
- version = lib.substring 0 10 sources.it-sanasto.date;
+ version = "2020-02-27";
- src = sources.it-sanasto;
+ src = fetchFromGitHub {
+ owner = "HankiDesign";
+ repo = "IT-sanasto";
+ rev = "e31974edd50a50db6ef1b95aab81a18f33800e67";
+ sha256 = "sha256-+YLKG4kqflWkRdrER0A7GRYXluZpuf1TO0zyk3gVzU4=";
+ };
nativeBuildInputs = [ dict pandoc stardict-tools ];
@@ -19,7 +24,8 @@ stdenvNoCC.mkDerivation {
installPhase = "install -Dm644 *.{dict*,idx,ifo} -t $out";
meta = with lib; {
- inherit (sources.it-sanasto) description homepage;
+ description = "IT-alan englanti-suomi -sanasto";
+ homepage = "https://github.com/HankiDesign/IT-sanasto";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -169,7 +169,6 @@ lib.makeScope newScope (
ocad2mp = callPackage ./garmin/ocad2mp { };
openmtbmap = callPackage ./garmin/openmtbmap { };
osm2mp = perlPackages.callPackage ./garmin/osm2mp {
- inherit sources;
inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR;
};
sendmap20 = callPackage ./garmin/sendmap20 { };
diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix
@@ -1,19 +1,24 @@
{ lib
, stdenv
+, fetchFromGitHub
, bash
, dash
, help2man
, ncurses
-, sources
, withDoc ? false
, scdoc
}:
-stdenv.mkDerivation {
- pname = "libshell-unstable";
- version = lib.substring 0 10 sources.libshell.date;
+stdenv.mkDerivation rec {
+ pname = "libshell";
+ version = "0.4.9";
- src = sources.libshell;
+ src = fetchFromGitHub {
+ owner = "legionus";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-BkKBmKzmL3O+BQi4VZm3agRLpQ8nIZ2ZhQBL40oeCy4=";
+ };
nativeBuildInputs = [ help2man ];
@@ -36,7 +41,8 @@ stdenv.mkDerivation {
doCheck = false;
meta = with lib; {
- inherit (sources.libshell) description homepage;
+ description = "A library of shell functions";
+ homepage = "https://github.com/legionus/libshell";
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
diff --git a/pkgs/garmin/osm2mp/default.nix b/pkgs/garmin/osm2mp/default.nix
@@ -2,7 +2,7 @@
, stdenv
, buildPerlPackage
, shortenPerlShebang
-, sources
+, fetchFromGitHub
, ConfigStd
, EncodeLocale
, FileSlurp
@@ -19,11 +19,16 @@
, YAML
}:
-buildPerlPackage {
+buildPerlPackage rec {
pname = "osm2mp";
- version = lib.substring 0 10 sources.osm2mp.date;
+ version = "2018-08-31";
- src = sources.osm2mp;
+ src = fetchFromGitHub {
+ owner = "liosha";
+ repo = pname;
+ rev = "748f93792ead174ad0e94a183a173ef3fcacf200";
+ sha256 = "sha256-YxtEOuoLeglpdpmStrcEkXwRGHRE+N1hKDB2Rr8rokw=";
+ };
outputs = [ "out" ];
@@ -66,7 +71,8 @@ buildPerlPackage {
'';
meta = with lib; {
- inherit (sources.osm2mp) description homepage;
+ description = "Convert Openstreetmap data to MP format";
+ homepage = "https://github.com/liosha/osm2mp";
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, libconfig, file, openssl, flex, sources }:
+{ lib, stdenv, fetchFromGitHub, libconfig, file, openssl, flex }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "geminid";
- version = lib.substring 0 10 sources.geminid.date;
+ version = "2021-04-11";
- src = sources.geminid;
+ src = fetchFromGitHub {
+ owner = "jovoro";
+ repo = pname;
+ rev = "bf6148baf91847e8dc011c3a101bee547142f4b5";
+ sha256 = "sha256-yiD3GMrYi9KhKgCWAs+tdenP/0Q1E16FdhatdbTkYK4=";
+ };
nativeBuildInputs = [ flex ];
@@ -15,7 +20,8 @@ stdenv.mkDerivation {
installPhase = "install -Dm755 geminid -t $out/bin";
meta = with lib; {
- inherit (sources.geminid) description homepage;
+ description = "Gemini Server in C";
+ homepage = "https://github.com/jovoro/geminid";
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/gemini/md2gemini/default.nix b/pkgs/gemini/md2gemini/default.nix
@@ -1,10 +1,15 @@
-{ lib, python3Packages, sources, cjkwrap }:
+{ lib, fetchFromGitHub, python3Packages, cjkwrap }:
-python3Packages.buildPythonApplication {
- pname = "md2gemini-unstable";
- version = lib.substring 0 10 sources.md2gemini.date;
+python3Packages.buildPythonApplication rec {
+ pname = "md2gemini";
+ version = "1.8.1";
- src = sources.md2gemini;
+ src = fetchFromGitHub {
+ owner = "makeworld-the-better-one";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-DQH7/wn6chgsDAclXaqHM37sT2aw6RMByCZ9/UPx0Zc=";
+ };
propagatedBuildInputs = with python3Packages; [
(mistune.overrideAttrs (old: rec {
@@ -22,7 +27,8 @@ python3Packages.buildPythonApplication {
checkInputs = with python3Packages; [ pytestCheckHook ];
meta = with lib; {
- inherit (sources.md2gemini) description homepage;
+ description = "File converter from Markdown to Gemini";
+ homepage = "https://github.com/makeworld-the-better-one/md2gemini";
license = licenses.lgpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/misc/csvquote/default.nix b/pkgs/misc/csvquote/default.nix
@@ -1,17 +1,23 @@
-{ lib, stdenv, sources }:
+{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "csvquote";
- version = lib.substring 0 10 sources.csvquote.date;
+ version = "2018-05-28";
- src = sources.csvquote;
+ src = fetchFromGitHub {
+ owner = "dbro";
+ repo = pname;
+ rev = "baf37fa4cccc656282551db4ea7ce4ec6b9c318e";
+ sha256 = "sha256-Pi50Gd1YSBmCHuaPs0WLQzt6pIubcJj5riBSW0V5fxo=";
+ };
makeFlags = [ "BINDIR=$(out)/bin" ];
preInstall = "mkdir -p $out/bin";
meta = with lib; {
- inherit (sources.csvquote) description homepage;
+ description = "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines";
+ homepage = "https://github.com/dbro/csvquote";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, pcre, openssl, sources }:
+{ lib, stdenv, fetchFromGitHub, pcre, openssl }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "csvtools";
- version = lib.substring 0 10 sources.csvtools.date;
+ version = "2019-08-03";
- src = sources.csvtools;
+ src = fetchFromGitHub {
+ owner = "DavyLandman";
+ repo = pname;
+ rev = "efd3ef1c94c26c673e958ecb045056bfc2c7b4f3";
+ sha256 = "sha256-hNEI5vQ3j6zyn31H2G+0xywdff7uaXi0kv2q4Hjiimg=";
+ };
buildInputs = [ pcre ];
@@ -19,7 +24,8 @@ stdenv.mkDerivation {
preInstall = "mkdir -p $out/bin";
meta = with lib; {
- inherit (sources.csvtools) description homepage;
+ description = "GNU-alike tools for parsing RFC 4180 CSVs at high speed";
+ homepage = "https://github.com/DavyLandman/csvtools";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/misc/morse-talk/default.nix b/pkgs/misc/morse-talk/default.nix
@@ -1,10 +1,15 @@
-{ lib, python3Packages, sources }:
+{ lib, fetchFromGitHub, python3Packages }:
-python3Packages.buildPythonApplication {
- pname = "morse-talk-unstable";
- version = lib.substring 0 10 sources.morse-talk.date;
+python3Packages.buildPythonApplication rec {
+ pname = "morse-talk";
+ version = "2016-12-25";
- src = sources.morse-talk;
+ src = fetchFromGitHub {
+ owner = "morse-talk";
+ repo = pname;
+ rev = "71e09ace0aa554d28cada5ee658e43758305b8fa";
+ sha256 = "sha256-fvQCETz0Lv0hyfKG7HC2Whm+xoZ9233hF/1ogsfZ10o=";
+ };
propagatedBuildInputs = with python3Packages; [ matplotlib sounddevice tkinter ];
@@ -12,7 +17,8 @@ python3Packages.buildPythonApplication {
checkPhase = "nosetests";
meta = with lib; {
- inherit (sources.morse-talk) description homepage;
+ description = "A Python library written for Morse Code";
+ homepage = "https://github.com/morse-talk/morse-talk";
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix
@@ -1,16 +1,22 @@
-{ lib, rustPlatform, sources }:
+{ lib, rustPlatform, fetchFromGitHub }:
-rustPlatform.buildRustPackage {
- pname = "xtr-unstable";
- version = lib.substring 0 10 sources.xtr.date;
+rustPlatform.buildRustPackage rec {
+ pname = "xtr";
+ version = "0.1.6";
- src = sources.xtr;
+ src = fetchFromGitHub {
+ owner = "woboq";
+ repo = "tr";
+ rev = "v${version}";
+ sha256 = "sha256-IgiCcZHtcNOGw0l/sYb4nz15hhzmZ+4G6zzO3I4hpxA=";
+ };
cargoPatches = [ ./cargo-lock.patch ];
- cargoSha256 = "0l7gj8ddhjvbnzkvm9ij2f6p89zp2faiqm03ra26a75589imnw9m";
+ cargoSha256 = "sha256-6a+n1ApCyfcPQy4wqWNDhXCRGCbJ8BgxHxz/b9uY6Qk=";
meta = with lib; {
- inherit (sources.xtr) description homepage;
+ description = "Translation tools for rust";
+ homepage = "https://github.com/woboq/tr";
license = with licenses; [ agpl3 mit ];
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/nakarte/nakarte/default.nix b/pkgs/nakarte/nakarte/default.nix
@@ -1,12 +1,17 @@
-{ lib, stdenv, mkYarnPackage, sources, secretsConfig ? null }:
+{ lib, stdenv, mkYarnPackage, fetchFromGitHub, secretsConfig ? null }:
let
pname = "nakarte";
- version = lib.substring 0 10 sources.nakarte.date;
+ version = "2021-04-16";
in
mkYarnPackage {
name = "${pname}-${version}";
- src = sources.nakarte;
+ src = fetchFromGitHub {
+ owner = "wladich";
+ repo = pname;
+ rev = "ddc52268bd00f656ac1d4301b580c287c84f314d";
+ sha256 = "sha256-cxyxT7B12HtfQ5vx2p1DS8Ol3eZ0U7W1oy0jLw6YN+Y=";
+ };
postPatch =
if (secretsConfig != null) then
@@ -24,7 +29,7 @@ mkYarnPackage {
distPhase = "true";
meta = with lib; {
- inherit (sources.nakarte) description homepage;
+ homepage = "https://github.com/wladich/nakarte";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
diff --git a/pkgs/osm/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix
@@ -1,10 +1,15 @@
-{ lib, python3Packages, qt5, sources }:
+{ lib, fetchFromGitHub, python3Packages, qt5 }:
-python3Packages.buildPythonApplication {
- pname = "map-stylizer-unstable";
- version = lib.substring 0 10 sources.map-stylizer.date;
+python3Packages.buildPythonApplication rec {
+ pname = "map-stylizer";
+ version = "2020-06-30";
- src = sources.map-stylizer;
+ src = fetchFromGitHub {
+ owner = "Absolute-Tinkerer";
+ repo = pname;
+ rev = "6279f40408aff823a4eb1071334bd2acd10cb921";
+ sha256 = "sha256-vUMHdUn5IZkB21Wg83lRZ/HwSnmgzem4ZBjELcizNE0=";
+ };
patches = [ ./config.patch ];
@@ -28,7 +33,8 @@ python3Packages.buildPythonApplication {
'';
meta = with lib; {
- inherit (sources.map-stylizer) description homepage;
+ description = "GUI written in Python to parse OSM (OpenStreetMap) files and render them onscreen";
+ homepage = "https://github.com/Absolute-Tinkerer/map-stylizer";
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
