commit 1d4c7f9ffdfa5291e59c877fe316cf55a5dfef03 parent 94fc880f361445ed18905252d80dbd3bf1e1c569 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Fri, 23 Apr 2021 11:52:28 +0300 Up Diffstat:
67 files changed, 168 insertions(+), 231 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json @@ -41,20 +41,6 @@ "url": "https://github.com/byrnedo/docker-reg-tool/archive/23292d234289b1fd114b53786c9e4f9fece3674b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "docx2csv": { - "branch": "master", - "builtin": false, - "date": "2020-05-05T21:11:02Z", - "description": "Extracts tables from .docx files and saves them as .csv or .xls files", - "homepage": "https://github.com/ivbeg/docx2csv", - "owner": "ivbeg", - "repo": "docx2csv", - "rev": "e397b6bd17c73d76b21404ce3422496b8da262db", - "sha256": "0n0h9wc8jqaqpi7cdv8692af5mwy9djgmrhwicb2f8917idj0pzf", - "type": "tarball", - "url": "https://github.com/ivbeg/docx2csv/archive/e397b6bd17c73d76b21404ce3422496b8da262db.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "elevation": { "branch": "master", "builtin": false, @@ -83,20 +69,6 @@ "url": "https://github.com/mhulden/foma/archive/b44022c7d9d347dc7392aabbf72c82e558767675.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "garminimg": { - "branch": "main", - "builtin": false, - "date": "2021-01-05T11:21:46Z", - "description": "Encode/decode a Garmin IMG file", - "homepage": "https://github.com/kiozen/GarminImg", - "owner": "kiozen", - "repo": "GarminImg", - "rev": "049b10a35da548f032e7e1e3ce3e9ae8600fd83e", - "sha256": "1d80gxnb6qh3485d46vm0w5vw26b3a6jkbsi52hawwwh68a1knnw", - "type": "tarball", - "url": "https://github.com/kiozen/GarminImg/archive/049b10a35da548f032e7e1e3ce3e9ae8600fd83e.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "gdcv": { "branch": "master", "builtin": false, @@ -149,20 +121,6 @@ "url": "https://github.com/wuyongzheng/gimgtools/archive/92d015749e105c5fb8eb704ae503a5c7e51af2bd.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "glauth": { - "branch": "master", - "builtin": false, - "date": "2021-02-27T13:51:46Z", - "description": "A lightweight LDAP server for development, home use, or CI", - "homepage": "https://github.com/glauth/glauth", - "owner": "glauth", - "repo": "glauth", - "rev": "5681dc4d0236c49e549ae7804ef2f4e4455340e4", - "sha256": "1fcr6xrn9rqj5jxy1n18rjk11zbb5qanmh39msv1avs5dmvmg7ly", - "type": "tarball", - "url": "https://github.com/glauth/glauth/archive/5681dc4d0236c49e549ae7804ef2f4e4455340e4.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "gpx-interpolate": { "branch": "master", "builtin": false, @@ -482,48 +440,6 @@ "url": "https://github.com/btittelbach/openmtbmap_openvelomap_linux/archive/de24cd5d4168d8571c544ac42c51883af957a01a.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "osm-area-tools": { - "branch": "master", - "builtin": false, - "date": "2021-01-04T16:32:27Z", - "description": "OSM Area Tools", - "homepage": "https://osmcode.org/osm-area-tools/", - "owner": "osmcode", - "repo": "osm-area-tools", - "rev": "b96db0ced55f1bb574084620ca34f0a2e9d19b5a", - "sha256": "1awb2kj2afdcn29zl3cgrsmld0bwmf3z3f0bn1lhkbvpqzqgxh3c", - "type": "tarball", - "url": "https://github.com/osmcode/osm-area-tools/archive/b96db0ced55f1bb574084620ca34f0a2e9d19b5a.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "osmcoastline": { - "branch": "master", - "builtin": false, - "date": "2021-01-08T14:38:44Z", - "description": "Extracts coastline data from OpenStreetMap planet file", - "homepage": "https://osmcode.org/osmcoastline/", - "owner": "osmcode", - "repo": "osmcoastline", - "rev": "56371668ebb6261009f35a7411a8fbcc83aabfe0", - "sha256": "0q7pmyxdkylydxhwcwnvcig6i96wss825hv9w971455qickravl1", - "type": "tarball", - "url": "https://github.com/osmcode/osmcoastline/archive/56371668ebb6261009f35a7411a8fbcc83aabfe0.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "polyvectorization": { - "branch": "master", - "builtin": false, - "date": "2019-08-23T14:52:46Z", - "description": "Reference implementation of Vectorization of Line Drawings via PolyVector Fields", - "homepage": "https://github.com/bmpix/PolyVectorization", - "owner": "bmpix", - "repo": "PolyVectorization", - "rev": "bceb8e2a08cca29cef1df074eb1a1f6450cc163f", - "sha256": "0d8281q3rdxzrxr5y9bxjkq2s2sfl8fgkk9kqpmpp3z5hxg893jq", - "type": "tarball", - "url": "https://github.com/bmpix/PolyVectorization/archive/bceb8e2a08cca29cef1df074eb1a1f6450cc163f.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "pyephem": { "branch": "master", "builtin": false, diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg"; - sha256 = "sha256-9QZdQPPg/Cl7fjM6ucGnno6HNQnkdEtAFnVTH66KSjI="; + hash = "sha256-9QZdQPPg/Cl7fjM6ucGnno6HNQnkdEtAFnVTH66KSjI="; }; preferLocalBuild = true; diff --git a/pkgs/applications/i18n-editor/default.nix b/pkgs/applications/i18n-editor/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jcbvm"; repo = "i18n-editor"; name = "i18n-editor-${version}.zip"; - sha256 = "19p9p6h4kfv468frdsl88w4x3z4bnhlcnll21zw63xhccw55v0lj"; + hash = "sha256-koJdCmcM9mH4D4JSyyi0i/zRCUeI6pYdMmS7SaC56aY="; inherit version; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for editing your i18n translation files"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/applications/visualgps/default.nix b/pkgs/applications/visualgps/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { meta = with lib; { description = "A QT application (GUI) that makes use of the VisualGPS/NMEAParser project"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/applications/wireguard-statusbar/default.nix b/pkgs/applications/wireguard-statusbar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "macOS menubar icon for WireGuard/wg-quick"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix @@ -1,6 +1,6 @@ { lib, stdenvNoCC, fetchFromGitHub, dict, pandoc, stardict-tools }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "it-sanasto"; version = "2020-02-27"; @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation { owner = "HankiDesign"; repo = "IT-sanasto"; rev = "e31974edd50a50db6ef1b95aab81a18f33800e67"; - sha256 = "sha256-+YLKG4kqflWkRdrER0A7GRYXluZpuf1TO0zyk3gVzU4="; + hash = "sha256-+YLKG4kqflWkRdrER0A7GRYXluZpuf1TO0zyk3gVzU4="; }; nativeBuildInputs = [ dict pandoc stardict-tools ]; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation { meta = with lib; { description = "IT-alan englanti-suomi -sanasto"; - homepage = "https://github.com/HankiDesign/IT-sanasto"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -153,9 +153,7 @@ lib.makeScope newScope ( basecamp = callPackage ./garmin/basecamp { }; cgpsmapper = callPackage ./garmin/cgpsmapper { }; garmin-uploader = callPackage ./garmin/garmin-uploader { }; - garminimg = libsForQt5.callPackage ./garmin/garminimg { - inherit sources; - }; + garminimg = libsForQt5.callPackage ./garmin/garminimg { }; gimgtools = callPackage ./garmin/gimgtools { }; gmaptool = callPackage ./garmin/gmaptool { }; imgdecode = callPackage ./garmin/imgdecode { }; @@ -237,9 +235,7 @@ lib.makeScope newScope ( morse-talk = callPackage ./misc/morse-talk { }; musig = callPackage ./misc/musig { }; playonmac = callPackage ./misc/playonmac { }; - polyvectorization = libsForQt5.callPackage ./misc/polyvectorization { - inherit sources; - }; + polyvectorization = libsForQt5.callPackage ./misc/polyvectorization { }; ptunnel = callPackage ./misc/ptunnel { }; pvs-studio = callPackage ./misc/pvs-studio { }; reproxy = callPackage ./misc/reproxy { }; diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "legionus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BkKBmKzmL3O+BQi4VZm3agRLpQ8nIZ2ZhQBL40oeCy4="; + hash = "sha256-BkKBmKzmL3O+BQi4VZm3agRLpQ8nIZ2ZhQBL40oeCy4="; }; nativeBuildInputs = [ help2man ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library of shell functions"; - homepage = "https://github.com/legionus/libshell"; + inherit (src.meta) homepage; license = licenses.gpl2; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage { meta = with lib; { description = "Independent BSON codec for Python that doesn't depend on MongoDB"; - homepage = "https://github.com/py-bson/bson"; + inherit (src.meta) homepage; license = with licenses; [ bsd3 asl20 ]; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { description = "Mikatools provides fast and easy methods for common Python coding tasks"; - homepage = "https://github.com/mikahama/mikatools"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/dict/redict/default.nix b/pkgs/dict/redict/default.nix @@ -50,7 +50,7 @@ mkDerivation { meta = with lib; { description = "A dictionary for Linux, based on C++/Qt development"; - homepage = "https://github.com/rekols/redict"; + inherit (src.meta) homepage; 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 @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Stardict tools"; - homepage = "https://github.com/huzheng001/stardict-3"; + inherit (src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/dict/tatoebatools/default.nix b/pkgs/dict/tatoebatools/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication { meta = with lib; { description = "A library for downloading, updating and iterating over data files from Tatoeba"; - homepage = "https://github.com/LBeaudoux/tatoebatools"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/dict/zdict/default.nix b/pkgs/dict/zdict/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "The last online dictionary framework you need"; - homepage = "https://github.com/zdict/zdict"; + inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix @@ -1,10 +1,15 @@ -{ lib, mkDerivation, cmake, gdal, proj, sources }: +{ lib, mkDerivation, fetchFromGitHub, cmake, gdal, proj }: mkDerivation { pname = "garminimg"; - version = lib.substring 0 10 sources.garminimg.date; + version = "2021-01-07"; - src = sources.garminimg; + src = fetchFromGitHub { + owner = "kiozen"; + repo = "GarminImg"; + rev = "6bfd029e9712b47eeab144bfe150baccd8c879bd"; + hash = "sha256-6vNN80NJSo2GdGruUKTupMcWOR7E3vo2SD1fAkMCodE="; + }; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -24,7 +29,8 @@ mkDerivation { installPhase = "install -Dm755 bin/* -t $out/bin"; meta = with lib; { - inherit (sources.garminimg) description homepage; + description = "Encode/decode a Garmin IMG file"; + inherit (src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/garmin/ocad2img/default.nix b/pkgs/garmin/ocad2img/default.nix @@ -7,7 +7,7 @@ buildPerlPackage { src = fetchwebarchive { url = "http://worldofo.com/div/ocad2img.zip"; timestamp = "20150326063156"; - sha256 = "1w68jww1kyy2cdzc8b69pca5w05gxj8q3ap5q0ff10ix0sfcm0mn"; + hash = "sha256-toLKnAY9guAcwOWqgZHsrwBeFLvJLMR+Y8L7GTiXyPA="; }; sourceRoot = "."; diff --git a/pkgs/garmin/osm2mp/default.nix b/pkgs/garmin/osm2mp/default.nix @@ -27,7 +27,7 @@ buildPerlPackage rec { owner = "liosha"; repo = pname; rev = "748f93792ead174ad0e94a183a173ef3fcacf200"; - sha256 = "sha256-YxtEOuoLeglpdpmStrcEkXwRGHRE+N1hKDB2Rr8rokw="; + hash = "sha256-YxtEOuoLeglpdpmStrcEkXwRGHRE+N1hKDB2Rr8rokw="; }; outputs = [ "out" ]; @@ -72,7 +72,7 @@ buildPerlPackage rec { meta = with lib; { description = "Convert Openstreetmap data to MP format"; - homepage = "https://github.com/liosha/osm2mp"; + inherit (src.meta) homepage; license = licenses.gpl2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jovoro"; repo = pname; rev = "bf6148baf91847e8dc011c3a101bee547142f4b5"; - sha256 = "sha256-yiD3GMrYi9KhKgCWAs+tdenP/0Q1E16FdhatdbTkYK4="; + hash = "sha256-yiD3GMrYi9KhKgCWAs+tdenP/0Q1E16FdhatdbTkYK4="; }; nativeBuildInputs = [ flex ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gemini Server in C"; - homepage = "https://github.com/jovoro/geminid"; + inherit (src.meta) homepage; license = licenses.bsd3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gemreader/default.nix b/pkgs/gemini/gemreader/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "~sircmpwn"; repo = pname; rev = "7f9df147d6785d5f2b77ce9d44513de65985657a"; - sha256 = "0w6jky5qz6p7i67jm6ab9rrlym2xkfqiaxgxfr4g2wg628qb32nl"; + hash = "sha256-1IqxMBLmcfFIdv11FbGbXVRPc05LmSqPieeaj4uf0nA="; }; vendorSha256 = "0wvxq1sbkw274bcihkh3axvg7fbqm3xcs5zvsr2jngsycy3xjfip"; meta = with lib; { description = "Feed reader for the Geminispace"; - homepage = "https://git.sr.ht/~sircmpwn/gemreader"; + inherit (src.meta) homepage; license = licenses.agpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "kconner"; repo = pname; rev = "49707b008cd6e3fb3ecb453a472051644fb319eb"; - sha256 = "1kd3saxlzclm2n0l02za1zvs0lrxppwd3f5j249cgzv63dfwjr5m"; + hash = "sha256-tWTJXRtm/8cSEbK40fi9PVOg9w/qC0CBFZWyT7vSo80="; }; nativeBuildInputs = [ go ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gemtext blog static site generator"; - homepage = "https://github.com/kconner/gloggery"; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "shtanton"; repo = "gmi2html"; rev = "v${version}"; - sha256 = "1nfl0cy99mm2rk9v0g43370i4rnz26hg9ryl0gkm5d1v2sg2i4al"; + hash = "sha256-VJEonhY7tFLnA9Tn9KAR32YSwRmDPLDTzKLWlDwD1Nk="; }; nativeBuildInputs = [ scdoc zig ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Translate text/gemini into HTML"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gmni/default.nix b/pkgs/gemini/gmni/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "~sircmpwn"; repo = pname; rev = "e0993d4886e7e0b8970f7c83b6d0003e75f33348"; - sha256 = "09gdgyz21ni707ph91fs61v61j2lladzhvbplqqc80hg17w9av4s"; + hash = "sha256-mmyV+AkPAsQwpndt+JuiVMhgdjDahQTvASfaIL5/7SU="; }; nativeBuildInputs = [ pkg-config scdoc ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gemini client"; - homepage = "https://git.sr.ht/~sircmpwn/gmni"; + inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gmnigit/default.nix b/pkgs/gemini/gmnigit/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "~kornellapacz"; repo = pname; rev = "9cdc82885cf4286f621f8cb7f26c45aa4e513ad6"; - sha256 = "1wx41k3mgypacgavlnnr7z62879xs0n4986pmcqk4bjgn77471nn"; + hash = "sha256-1oZDzrFPLjIxq9egRCzQPR0kzD/ZWrrVY+r6V8cMpPM="; }; vendorSha256 = "0kjz21bzn829k10x3fvsvij4zxmi1ahq4bnk62lghrvazjbqk2r9"; meta = with lib; { description = "Static git gemini viewer"; - homepage = "https://git.sr.ht/~kornellapacz/gmnigit"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gmnisrv/default.nix b/pkgs/gemini/gmnisrv/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "~sircmpwn"; repo = pname; rev = "8b65e303b01fc573cb1c40a365fb5db166146a37"; - sha256 = "1n0iiz6gd3dmv1r7i6437zmrv0vim69fc0haqfvagd4y20hy5s8z"; + hash = "sha256-H+niIRCetKe2wwoC5pKpcYOd6z+DmHhy2LWN9syPEdg="; }; nativeBuildInputs = [ pkg-config scdoc ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple Gemini protocol server"; - homepage = "https://git.sr.ht/~sircmpwn/gmnisrv"; + inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gssg/default.nix b/pkgs/gemini/gssg/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "~gsthnz"; repo = pname; rev = "747b6b41fbe93f0b408a58c8e6a1f11c7945c819"; - sha256 = "131c9png0ky6sag39nr6jab2l62y88d0ii7cv6cq5ayj07gs7if8"; + hash = "sha256-yMWj3wHSq4KZ2ezECBpCXhgqlpIm2zSe0sZP8OxNLIw="; }; vendorSha256 = "188v7nax3yss7hqin41mjin8inkh6q7bv8pmbls2dwd809pxj5rp"; meta = with lib; { description = "A gemini static site generator"; - homepage = "https://git.sr.ht/~gsthnz/gssg"; + inherit (src.meta) homepage; license = licenses.gpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A curl-like cli application to interact with Gemini sites"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/kiln/default.nix b/pkgs/gemini/kiln/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "~adnano"; repo = pname; rev = "v${version}"; - sha256 = "0rj2h8l5b92kjfb3hhm77w6zwmvxwrrd3yjs1718q77xxf2l83m1"; + hash = "sha256-oQ5Ehev9HIzCCVr60XLmfVf+DT+nQjiWk1OkVSiCQmY="; }; vendorSha256 = "1vqzbw4a2rh043cim17ys0yn33qxk0d7szxr9gkcs5dqlaa8z36y"; meta = with lib; { description = "A simple static site generator for Gemini"; - homepage = "https://git.sr.ht/~adnano/kiln"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/kineto/default.nix b/pkgs/gemini/kineto/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "~sircmpwn"; repo = pname; rev = "8f35e0a2b17b70691b8634c2bd8c99f98557105c"; - sha256 = "0vh28k3mnqv27nr3s6c4b4zcf5q1q2c1fs73np1cb0l4fpl6l7s2"; + hash = "sha256-Qh9q6HWEgsXCteNoF5jAARfHPlmEGT2yPWJjW8dEAm4="; }; vendorSha256 = "06yjz1rsnfz2dyky53q4y5g05f2h724cjvc9z5d57rra1kjp3p1j"; meta = with lib; { description = "An HTTP to Gemini proxy"; - homepage = "https://git.sr.ht/~sircmpwn/kineto"; + inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/md2gemini/default.nix b/pkgs/gemini/md2gemini/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { owner = "makeworld-the-better-one"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DQH7/wn6chgsDAclXaqHM37sT2aw6RMByCZ9/UPx0Zc="; + hash = "sha256-DQH7/wn6chgsDAclXaqHM37sT2aw6RMByCZ9/UPx0Zc="; }; propagatedBuildInputs = with python3Packages; [ @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "File converter from Markdown to Gemini"; - homepage = "https://github.com/makeworld-the-better-one/md2gemini"; + inherit (src.meta) homepage; license = licenses.lgpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/satellite/default.nix b/pkgs/gemini/satellite/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "~gsthnz"; repo = pname; rev = "v${version}"; - sha256 = "0s0dnjb140w6xiw0nfif86ia38xym5gwbyx671k43zavw9721svw"; + hash = "sha256-fOsgTuJb/UFmOKb7xV+pvqOhokEuOgt47IYDEpa0DWg="; }; vendorSha256 = "188v7nax3yss7hqin41mjin8inkh6q7bv8pmbls2dwd809pxj5rp"; meta = with lib; { description = "Small Gemini server for serving static files"; - homepage = "https://git.sr.ht/~gsthnz/satellite"; + inherit (src.meta) homepage; license = licenses.agpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gemini/shavit/default.nix b/pkgs/gemini/shavit/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "~yotam"; repo = pname; rev = "129b3e7fc700d02843c4fbd3e7cc73bf714f9cc2"; - sha256 = "02g1igsx441q20yv2ylc50mf598whl0lfnwrj9nzab1jk5q3nhic"; + hash = "sha256-LEI7cJkyLPVtkplbRwGFHKXiKiiMerE9EDgQ0vWL4Qk="; }; vendorSha256 = "00avyrznhgw4zxp6z6n8zi86nsvm91iygm26401k3vp3i24ydhda"; meta = with lib; { description = "Gemini server"; - homepage = "https://git.sr.ht/~yotam/shavit"; + inherit (src.meta) homepage; license = licenses.agpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/gis/mapsoft/default.nix b/pkgs/gis/mapsoft/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "ushakov"; repo = pname; rev = "45fdd650f1fb1d30ac0682550c541bc7a3d368fc"; - sha256 = "sha256-s/9en0d8eYsbDb3krZrmenFaZd9LPuNG0uEo35K0oNo="; + hash = "sha256-s/9en0d8eYsbDb3krZrmenFaZd9LPuNG0uEo35K0oNo="; }; patches = [ ./0001-fix-build.patch ]; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mapping software for linux"; - homepage = "https://github.com/ushakov/mapsoft"; + inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; diff --git a/pkgs/gis/qmapshack/bin.nix b/pkgs/gis/qmapshack/bin.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/Maproom/qmapshack"; description = "Consumer grade GIS software"; + inherit (src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A ncurses file manager written in C with vim like keybindings"; - homepage = "https://github.com/mananapr/cfiles"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/misc/csvquote/default.nix b/pkgs/misc/csvquote/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "dbro"; repo = pname; rev = "baf37fa4cccc656282551db4ea7ce4ec6b9c318e"; - sha256 = "sha256-Pi50Gd1YSBmCHuaPs0WLQzt6pIubcJj5riBSW0V5fxo="; + hash = "sha256-Pi50Gd1YSBmCHuaPs0WLQzt6pIubcJj5riBSW0V5fxo="; }; makeFlags = [ "BINDIR=$(out)/bin" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { 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"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "DavyLandman"; repo = pname; rev = "efd3ef1c94c26c673e958ecb045056bfc2c7b4f3"; - sha256 = "sha256-hNEI5vQ3j6zyn31H2G+0xywdff7uaXi0kv2q4Hjiimg="; + hash = "sha256-hNEI5vQ3j6zyn31H2G+0xywdff7uaXi0kv2q4Hjiimg="; }; buildInputs = [ pcre ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU-alike tools for parsing RFC 4180 CSVs at high speed"; - homepage = "https://github.com/DavyLandman/csvtools"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/misc/docx2csv/default.nix b/pkgs/misc/docx2csv/default.nix @@ -1,15 +1,21 @@ -{ lib, python3Packages, sources }: +{ lib, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonApplication { - pname = "docx2csv-unstable"; - version = lib.substring 0 10 sources.docx2csv.date; +python3Packages.buildPythonApplication rec { + pname = "docx2csv"; + version = "2020-05-06"; - src = sources.docx2csv; + src = fetchFromGitHub { + owner = "ivbeg"; + repo = pname; + rev = "e397b6bd17c73d76b21404ce3422496b8da262db"; + hash = "sha256-7l8gWzwhIScWixzm+mRLntfilEgG7cZOvFhhiRhPEFg="; + }; propagatedBuildInputs = with python3Packages; [ click openpyxl python-docx xlwt ]; meta = with lib; { - inherit (sources.docx2csv) description homepage; + description = "Extracts tables from .docx files and saves them as .csv or .xls files"; + inherit (src.meta) homepage; license = licenses.bsd3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/misc/glauth/default.nix b/pkgs/misc/glauth/default.nix @@ -1,23 +1,29 @@ -{ lib, buildGoModule, go-bindata, sources }: +{ lib, fetchFromGitHub, buildGoModule, go-bindata }: -buildGoModule { - pname = "glauth-unstable"; - version = lib.substring 0 10 sources.glauth.date; +buildGoModule rec { + pname = "glauth"; + version = "1.1.2"; - src = sources.glauth; + src = fetchFromGitHub { + owner = "glauth"; + repo = pname; + rev = "v${version}"; + hash = "sha256-2U9LmK+gqVaYnVBvqS3CeNmrK2pFmS5X/oQqFb4MQKk="; + }; - vendorSha256 = "18inm0s9mww7c19z9alnvy0g80d3laxh4lwbgzkcc8kf9zg25149"; + vendorSha256 = "sha256-iYQi3k9uIsbmf4tTAruiowH0gN+WqvRTYIfzmjSoNqI="; nativeBuildInputs = [ go-bindata ]; - buildFlagsArray = [ "-ldflags=-X main.GitCommit=${sources.glauth.rev}" ]; + buildFlagsArray = [ "-ldflags=-X main.LastGitTag=v${version} -X main.GitTagIsCommit=1" ]; preBuild = "go-bindata -pkg=assets -o=pkg/assets/bindata.go assets"; doCheck = false; meta = with lib; { - inherit (sources.glauth) description homepage; + description = "A lightweight LDAP server for development, home use, or CI"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/misc/ht/default.nix b/pkgs/misc/ht/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { owner = "ducaale"; repo = "ht"; rev = "v${version}"; - sha256 = "083m1wz8rs5mr1lgvj5rnygv7b5l7ik4m6h666qivm4hci1d4ynh"; + hash = "sha256-0HrSQmSQ1B2xMQaaSmY8tKyzn7e5yP1oyLXojD4PdSA="; }; - cargoSha256 = "1h0i6zcbhjik6452x73pfz292yb1yclwxxf04gj76y6y4cas3d5p"; + cargoHash = "sha256-t7ShFSPeeHPkI8D1zinzYXmRxHd3nC4KMTNKuNg3EcA="; doCheck = false; meta = with lib; { description = "Yet another HTTPie clone"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; 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 @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { owner = "morse-talk"; repo = pname; rev = "71e09ace0aa554d28cada5ee658e43758305b8fa"; - sha256 = "sha256-fvQCETz0Lv0hyfKG7HC2Whm+xoZ9233hF/1ogsfZ10o="; + hash = "sha256-fvQCETz0Lv0hyfKG7HC2Whm+xoZ9233hF/1ogsfZ10o="; }; propagatedBuildInputs = with python3Packages; [ matplotlib sounddevice tkinter ]; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A Python library written for Morse Code"; - homepage = "https://github.com/morse-talk/morse-talk"; + inherit (src.meta) homepage; license = licenses.gpl2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/misc/polyvectorization/default.nix b/pkgs/misc/polyvectorization/default.nix @@ -1,10 +1,15 @@ -{ lib, mkDerivation, cmake, boost165, eigen, opencv2, sources }: +{ lib, mkDerivation, fetchFromGitHub, cmake, boost165, eigen, opencv2 }: mkDerivation { pname = "polyvectorization"; - version = lib.substring 0 10 sources.polyvectorization.date; + version = "2019-08-23"; - src = sources.polyvectorization; + src = fetchFromGitHub { + owner = "bmpix"; + repo = "PolyVectorization"; + rev = "bceb8e2a08cca29cef1df074eb1a1f6450cc163f"; + hash = "sha256-WI6EXoflj3vrxTPN+RyiTgst8JR9JV9yz7+3PHBAAjU="; + }; patches = [ ./with-gui.patch ]; @@ -22,7 +27,8 @@ mkDerivation { installPhase = "install -Dm755 polyvector_thing -t $out/bin"; meta = with lib; { - inherit (sources.polyvectorization) description homepage; + description = "Reference implementation of Vectorization of Line Drawings via PolyVector Fields"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { owner = "woboq"; repo = "tr"; rev = "v${version}"; - sha256 = "sha256-IgiCcZHtcNOGw0l/sYb4nz15hhzmZ+4G6zzO3I4hpxA="; + hash = "sha256-IgiCcZHtcNOGw0l/sYb4nz15hhzmZ+4G6zzO3I4hpxA="; }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "sha256-6a+n1ApCyfcPQy4wqWNDhXCRGCbJ8BgxHxz/b9uY6Qk="; + cargoHash = "sha256-6a+n1ApCyfcPQy4wqWNDhXCRGCbJ8BgxHxz/b9uY6Qk="; meta = with lib; { description = "Translation tools for rust"; - homepage = "https://github.com/woboq/tr"; + inherit (src.meta) homepage; license = with licenses; [ agpl3 mit ]; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/misc/yabai/default.nix b/pkgs/misc/yabai/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiling window manager for macOS based on binary space partitioning"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; changelog = "${src.meta.homepage}/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.sikmir ]; diff --git a/pkgs/nakarte/elevation_server/default.nix b/pkgs/nakarte/elevation_server/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { owner = "wladich"; repo = pname; rev = version; - sha256 = "sha256-2mpBboPKIV+Wm2p3FHy3a+6H3+qJUOu2+F28MufzBwU="; + hash = "sha256-2mpBboPKIV+Wm2p3FHy3a+6H3+qJUOu2+F28MufzBwU="; }; goPackagePath = "github.com/wladich/elevation_server"; @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "The server providing elevation data"; - homepage = "https://github.com/wladich/elevation_server"; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { owner = "wladich"; repo = pname; rev = "1dc5be65e58638f5899cd6cdc2010e00ce5e62d4"; - sha256 = "sha256-2wDhU1wbvyEAAYUQXUGASmK5X0/XNQF9P2y9pfHhHHg="; + hash = "sha256-2wDhU1wbvyEAAYUQXUGASmK5X0/XNQF9P2y9pfHhHHg="; }; patches = [ @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Raster maps to map tiles"; - homepage = "https://github.com/wladich/map-tiler"; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { owner = "wladich"; repo = pname; rev = "20f5177cae7454455b21cd5f7178f5639c02d385"; - sha256 = "sha256-8lLCzqy4W35/WV83aRnARuAdoBO+977nbuXJfpdOxP8="; + hash = "sha256-8lLCzqy4W35/WV83aRnARuAdoBO+977nbuXJfpdOxP8="; }; patches = [ ./python3.patch ]; @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { pythonImportsCheck = [ "maprec" ]; meta = with lib; { - homepage = "https://github.com/wladich/maprec"; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/nakarte/default.nix b/pkgs/nakarte/nakarte/default.nix @@ -10,7 +10,7 @@ mkYarnPackage { owner = "wladich"; repo = pname; rev = "ddc52268bd00f656ac1d4301b580c287c84f314d"; - sha256 = "sha256-cxyxT7B12HtfQ5vx2p1DS8Ol3eZ0U7W1oy0jLw6YN+Y="; + hash = "sha256-cxyxT7B12HtfQ5vx2p1DS8Ol3eZ0U7W1oy0jLw6YN+Y="; }; postPatch = diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { owner = "wladich"; repo = pname; rev = "4d6bd3f234960ba90d82e6d58da9c1bf4677eb16"; - sha256 = "sha256-sbAKi9GZEPmbI1Nq3l4uSh/tVNLXAY2siXu3YtHI5qo="; + hash = "sha256-sbAKi9GZEPmbI1Nq3l4uSh/tVNLXAY2siXu3YtHI5qo="; }; postPatch = "2to3 -n -w ozi_map/*.py"; @@ -20,8 +20,8 @@ python3Packages.buildPythonPackage rec { pythonImportsCheck = [ "ozi_map" ]; meta = with lib; { - description = "python module for reading OziExplorer .map files"; - homepage = "https://github.com/wladich/ozi_map"; + description = "Python module for reading OziExplorer .map files"; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { owner = "wladich"; repo = pname; rev = "a467b3b2566f4edd31a272738f7c5e646c0d84a9"; - sha256 = "1alyaizr910zv885a15mmw9v74bsmmkch5n14ggi69w54sq5j6y8"; + sha256 = "sha256-yBtZsCaFJxPfI8EWyGatepGzE6+1BFUQ2h+ElH9Unqo="; fetchSubmodules = true; }; @@ -17,8 +17,8 @@ python3Packages.buildPythonPackage rec { pythonImportsCheck = [ "imagequant" ]; meta = with lib; { - description = "python bindings for libimagequant (pngquant core)"; - homepage = src.meta.homepage; + description = "Python bindings for libimagequant (pngquant core)"; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { owner = "wladich"; repo = pname; rev = "55fecd22c7160577b925e03169e74bd488a41cf3"; - sha256 = "sha256-t15iO+3UZKnORiQaYoGD4RLZx2SHtCbjg+Qr+sAHQHY="; + hash = "sha256-t15iO+3UZKnORiQaYoGD4RLZx2SHtCbjg+Qr+sAHQHY="; }; postPatch = '' @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { description = "Python library for thin plate spline calculations"; - homepage = "https://github.com/wladich/thinplatespline"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/osm/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { owner = "Absolute-Tinkerer"; repo = pname; rev = "6279f40408aff823a4eb1071334bd2acd10cb921"; - sha256 = "sha256-vUMHdUn5IZkB21Wg83lRZ/HwSnmgzem4ZBjELcizNE0="; + hash = "sha256-vUMHdUn5IZkB21Wg83lRZ/HwSnmgzem4ZBjELcizNE0="; }; patches = [ ./config.patch ]; @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "GUI written in Python to parse OSM (OpenStreetMap) files and render them onscreen"; - homepage = "https://github.com/Absolute-Tinkerer/map-stylizer"; + inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/osm/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix @@ -10,14 +10,18 @@ , protozero , sqlite , zlib -, sources }: stdenv.mkDerivation rec { pname = "osm-area-tools"; - version = lib.substring 0 10 sources.osm-area-tools.date; + version = "2021-01-04"; - src = sources.osm-area-tools; + src = fetchFromGitHub { + owner = "osmcode"; + repo = pname; + rev = "b96db0ced55f1bb574084620ca34f0a2e9d19b5a"; + hash = "sha256-bMD+8Md3rwlpsAu48YerfIFGq86PDfqTsKw5JeQUi6s="; + }; nativeBuildInputs = [ cmake ]; @@ -35,7 +39,8 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - inherit (sources.osm-area-tools) description homepage; + description = "OSM Area Tools"; + homepage = "https://osmcode.org/osm-area-tools/"; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/osm/osmcoastline/default.nix b/pkgs/osm/osmcoastline/default.nix @@ -10,14 +10,18 @@ , protozero , sqlite , zlib -, sources }: stdenv.mkDerivation rec { pname = "osmcoastline"; - version = lib.substring 0 10 sources.osmcoastline.date; + version = "2021-01-08"; - src = sources.osmcoastline; + src = fetchFromGitHub { + owner = "osmcode"; + repo = pname; + rev = "56371668ebb6261009f35a7411a8fbcc83aabfe0"; + hash = "sha256-gW6VJ4u4FBJO4mnDIpDW3KRoXmTbcsZhb5762bqv92A="; + }; nativeBuildInputs = [ cmake ]; @@ -27,22 +31,14 @@ stdenv.mkDerivation rec { gdal geos libosmium - (libosmium.overrideAttrs (old: rec { - version = "2.16.0"; - src = fetchFromGitHub { - owner = "osmcode"; - repo = "libosmium"; - rev = "v${version}"; - sha256 = "1na51g6xfm1bx0d0izbg99cwmqn0grp0g41znn93xnhs202qnb2h"; - }; - })) protozero sqlite zlib ]; meta = with lib; { - inherit (sources.osmcoastline) description homepage; + description = "Extracts coastline data from OpenStreetMap planet file"; + homepage = "https://osmcode.org/osmcoastline/"; license = licenses.boost; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/osm/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "http://katze.tfiu.de/projects/phyghtmap/phyghtmap_${version}.orig.tar.gz"; - sha256 = "04xhqcf4bvgbahzw1vcx4khja0z3xqkd0mvk2z8b0xnmy5rsw3lc"; + hash = "sha256-jA6uc/HVdrDQF3NX0Cbu4wMl4SSd7cA/VOvtRRzDsBM="; }; propagatedBuildInputs = with python3Packages; [ beautifulsoup4 lxml matplotlib numpy ]; diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jhawthorn"; repo = "sdlmap"; rev = "0baa8fb4472751c28bfe8b063070ea8b2d459224"; - sha256 = "125hsfjbpvf2zia6702qgjyqsa84wnxxb75xskawif564b65cksv"; + hash = "sha256-W09WzCKmuMjV1L2c1bvlBCmNvXxYgGNU/MLtu6TTsIg="; }; patches = [ ./tile.patch ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A SDL + libcurl OpenStreetMap viewer"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/suckless/blind/default.nix b/pkgs/suckless/blind/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.suckless.org/tools/blind-${version}.tar.gz"; - sha256 = "0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94"; + hash = "sha256-JPkDzLXhGNdfONOuDYX+2Ql0n5eL/0f/aXPuG/3fzFo="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "~coco"; repo = pname; rev = "e5aff3bdf04cb4324b203d218f3853c6374f4399"; - sha256 = "1pqy5qcbpk40bsi4r70grgb5bg3pqjfz7gnrqw7060xm3r4239p9"; + hash = "sha256-6aYhSB61AwMOx9m+853Ed7xV1ssPnEyiXoDMuxguHt8="; }; buildInputs = [ libpng libjpeg libtiff fftwFloat libX11 gsl ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of small and standalone utilities for image processing"; - homepage = "https://git.sr.ht/~coco/imscript"; + inherit (src.meta) homepage; license = licenses.agpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { owner = "larmel"; repo = "lacc"; rev = "f6ab3973d44ce79e469c4c3dc770a8b2e7a5543f"; - sha256 = "sha256-L9EW7Zl5PxOIGJwSwhq1gvAkN8fbpHg7gSbtTzuBHSE="; + hash = "sha256-L9EW7Zl5PxOIGJwSwhq1gvAkN8fbpHg7gSbtTzuBHSE="; }; installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "A simple, self-hosting C compiler"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.sikmir ]; diff --git a/pkgs/suckless/sfm/default.nix b/pkgs/suckless/sfm/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { owner = "afify"; repo = "sfm"; rev = "b6063fd0a91a0ee976a09c79cbeb097ba26bfd21"; - sha256 = "198ij2bdm8i8izpgcl8vckrfw2f5pj11mzal3h7aqp3igargq55m"; + hash = "sha256-tRT8snpxXKwOHFT9GoK8xQnu8mQbUfbujyii2paQEaU="; }; installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "Simple file manager"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.isc; platforms = platforms.linux; maintainers = [ maintainers.sikmir ]; diff --git a/pkgs/suckless/xprompt/default.nix b/pkgs/suckless/xprompt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "phillbush"; repo = "xprompt"; rev = "v${version}"; - sha256 = "00i4zlypsbh43w0xkjlhy768d8s26kcf15rpbf62viffkg8s4z7w"; + hash = "sha256-/Hyi0ZvOxS2MWzeX4Ng0QqOGzPGQytkBHwQufT39JAI="; }; buildInputs = [ libX11 libXft libXinerama ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A dmenu rip-off with contextual completion"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; diff --git a/pkgs/tools/geo/cmpgpx/default.nix b/pkgs/tools/geo/cmpgpx/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication { meta = with lib; { description = "Show the differences between GPX files"; - homepage = "https://github.com/jonblack/cmpgpx"; + inherit (src.meta) homepage; license = licenses.unlicense; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Indexes points and lines and generates map tiles to display them"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.bsd2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/geo/go-staticmaps/default.nix b/pkgs/tools/geo/go-staticmaps/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "flopp"; repo = pname; rev = "9eef5d84e2f2fd705ebb1cd0c0601cf2301ad9ca"; - sha256 = "sha256-HH7HjVdv9yTpE7on6PDXqiUSGQzSqyh5/+psFm53+WQ="; + hash = "sha256-HH7HjVdv9yTpE7on6PDXqiUSGQzSqyh5/+psFm53+WQ="; }; patches = [ ./extra-tileproviders.patch ]; @@ -17,7 +17,7 @@ buildGoModule rec { meta = with lib; { description = "A go (golang) library and command line tool to render static map images using OpenStreetMap tiles"; - homepage = "https://github.com/flopp/go-staticmaps"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix @@ -29,7 +29,7 @@ buildPerlPackage rec { meta = with lib; { description = "Tools to turn GPX files into a GPS map tracing layer"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/geo/gpxtrackposter/default.nix b/pkgs/tools/geo/gpxtrackposter/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { owner = "flopp"; repo = pname; rev = "545c551b808fece43ff199e006d8a1c399536a05"; - sha256 = "sha256-2if0e74mYItTM7tYc2OS2EhZu3gnZjfkT5kzLnacH7Y="; + hash = "sha256-2if0e74mYItTM7tYc2OS2EhZu3gnZjfkT5kzLnacH7Y="; }; patches = [ ./fix-localedir.patch ]; @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Create a visually appealing poster from your GPX tracks"; - homepage = "https://github.com/flopp/GpxTrackPoster"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/geo/py-staticmaps/default.nix b/pkgs/tools/geo/py-staticmaps/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { owner = "flopp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vW457HbdDDhfz8hsvEN3/HJmIHKdrRDVNuhSpZXoZ78="; + hash = "sha256-vW457HbdDDhfz8hsvEN3/HJmIHKdrRDVNuhSpZXoZ78="; }; propagatedBuildInputs = with python3Packages; [ appdirs geographiclib pillow pycairo python-slugify requests s2sphere svgwrite ]; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A python module to create static map images with markers, geodesic lines, etc"; - homepage = "https://github.com/flopp/py-staticmaps"; + inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/geo/render_geojson/default.nix b/pkgs/tools/geo/render_geojson/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library"; - homepage = src.meta.homepage; + inherit (src.meta) homepage; license = licenses.asl20; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix;