nur-packages

My NUR packages
git clone git://git.sikmir.ru/nur-packages
Log | Files | Refs | README | LICENSE

commit 71f7abfa38d3dfc575d83ea3f57ace0e7139b0ba
parent d7e14677641a81e19903ee1f8d3434166a9a960c
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Wed, 21 Apr 2021 20:07:26 +0300

Up

Diffstat:
Mdefault.nix | 4+---
Mnix/sources.json | 70----------------------------------------------------------------------
Mpkgs/applications/gpxsee/bin.nix | 4++--
Mpkgs/gis/mapsoft/default.nix | 18++++++++++++------
Mpkgs/nakarte/map-tiler/default.nix | 16+++++++++++-----
Mpkgs/nakarte/maprec/default.nix | 15++++++++++-----
Mpkgs/nakarte/ozi_map/default.nix | 16+++++++++++-----
Mpkgs/nakarte/thinplatespline/default.nix | 16+++++++++++-----
Mpkgs/suckless/lacc/default.nix | 6+++---
9 files changed, 61 insertions(+), 104 deletions(-)

diff --git a/default.nix b/default.nix @@ -12,14 +12,12 @@ , ... }@args: -with (import <nixpkgs/lib>).attrsets; - { # The `lib`, `modules`, and `overlay` names are special lib = import ./lib { inherit pkgs; }; # functions modules = import ./modules; # NixOS modules overlays = import ./overlays; # nixpkgs overlays -} // (optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs { +} // (pkgs.lib.optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs { inherit sources pkgs; } ) diff --git a/nix/sources.json b/nix/sources.json @@ -527,48 +527,6 @@ "url": "https://github.com/Absolute-Tinkerer/map-stylizer/archive/6279f40408aff823a4eb1071334bd2acd10cb921.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "map-tiler": { - "branch": "master", - "builtin": false, - "date": "2019-10-24T19:20:49Z", - "description": "Raster maps to map tiles", - "homepage": "https://github.com/wladich/map-tiler", - "owner": "wladich", - "repo": "map-tiler", - "rev": "1dc5be65e58638f5899cd6cdc2010e00ce5e62d4", - "sha256": "0y0ww7qsbgbc7xyh2dfp9xgvjqjah10ms44504023gqvbi9y206v", - "type": "tarball", - "url": "https://github.com/wladich/map-tiler/archive/1dc5be65e58638f5899cd6cdc2010e00ce5e62d4.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "maprec": { - "branch": "master", - "builtin": false, - "date": "2019-10-24T18:36:24Z", - "description": null, - "homepage": "https://github.com/wladich/maprec", - "owner": "wladich", - "repo": "maprec", - "rev": "20f5177cae7454455b21cd5f7178f5639c02d385", - "sha256": "1zy49sbpxjg5dvkvxxxy2fh1vq26q0cnjdszb5zpwnxqmk7c4lpj", - "type": "tarball", - "url": "https://github.com/wladich/maprec/archive/20f5177cae7454455b21cd5f7178f5639c02d385.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "mapsoft": { - "branch": "master", - "builtin": false, - "date": "2021-01-31T11:05:32Z", - "description": "Mapping software for linux", - "homepage": "https://github.com/ushakov/mapsoft", - "owner": "ushakov", - "repo": "mapsoft", - "rev": "45fdd650f1fb1d30ac0682550c541bc7a3d368fc", - "sha256": "1nm0nj9dya71s93f6gjbvxjmlwbswsdavr5x1ldqnybw8ygmxzxk", - "type": "tarball", - "url": "https://github.com/ushakov/mapsoft/archive/45fdd650f1fb1d30ac0682550c541bc7a3d368fc.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "maptourist": { "builtin": false, "description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin", @@ -748,20 +706,6 @@ "url": "https://github.com/osmcode/osmcoastline/archive/56371668ebb6261009f35a7411a8fbcc83aabfe0.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "ozi-map": { - "branch": "master", - "builtin": false, - "date": "2019-10-24T18:44:05Z", - "description": "python module for reading OziExplorer .map files", - "homepage": "https://github.com/wladich/ozi_map", - "owner": "wladich", - "repo": "ozi_map", - "rev": "4d6bd3f234960ba90d82e6d58da9c1bf4677eb16", - "sha256": "1ap6r38n5dvvi6n8s0fps9afs7sa5rgdwsjk4fdzj44rs65hmc5i", - "type": "tarball", - "url": "https://github.com/wladich/ozi_map/archive/4d6bd3f234960ba90d82e6d58da9c1bf4677eb16.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "polyvectorization": { "branch": "master", "builtin": false, @@ -846,20 +790,6 @@ "url": "https://github.com/mapbox/supermercado/archive/ecc9f5a36c1c8d13872df5bdcbd01621e5f3ab48.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "thinplatespline": { - "branch": "master", - "builtin": false, - "date": "2013-01-23T09:17:04Z", - "description": "Python library for thin plate spline calculations", - "homepage": "https://github.com/wladich/thinplatespline", - "owner": "wladich", - "repo": "thinplatespline", - "rev": "55fecd22c7160577b925e03169e74bd488a41cf3", - "sha256": "0xj00z0glaz4hgijdd47ck3xj4p1hf0n46i48v7ajr6lxlxn4pmp", - "type": "tarball", - "url": "https://github.com/wladich/thinplatespline/archive/55fecd22c7160577b925e03169e74bd488a41cf3.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "tile-stitch": { "branch": "master", "builtin": false, diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpxsee-bin"; - version = "8.9"; + version = "9.0"; src = fetchurl { url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg"; - sha256 = "0sm65shma9ll69y9g5zwn7pbw2qjj7ha1l3wfb2rqp3s6kf9p90n"; + sha256 = "sha256-9QZdQPPg/Cl7fjM6ucGnno6HNQnkdEtAFnVTH66KSjI="; }; preferLocalBuild = true; diff --git a/pkgs/gis/mapsoft/default.nix b/pkgs/gis/mapsoft/default.nix @@ -1,9 +1,9 @@ { lib , stdenv +, fetchFromGitHub , perlPackages , python2Packages , gimp -, sources , bc , fig2dev , imagemagick @@ -30,11 +30,16 @@ , getopt }: -stdenv.mkDerivation { - pname = "mapsoft-unstable"; - version = lib.substring 0 10 sources.mapsoft.date; +stdenv.mkDerivation rec { + pname = "mapsoft"; + version = "2021-01-31"; - src = sources.mapsoft; + src = fetchFromGitHub { + owner = "ushakov"; + repo = pname; + rev = "45fdd650f1fb1d30ac0682550c541bc7a3d368fc"; + sha256 = "sha256-s/9en0d8eYsbDb3krZrmenFaZd9LPuNG0uEo35K0oNo="; + }; patches = [ ./0001-fix-build.patch ]; @@ -94,7 +99,8 @@ stdenv.mkDerivation { ''; meta = with lib; { - inherit (sources.mapsoft) description homepage; + description = "Mapping software for linux"; + homepage = "https://github.com/ushakov/mapsoft"; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix @@ -1,12 +1,17 @@ -{ lib, python3Packages, sources +{ lib, python3Packages, fetchFromGitHub , gobject-introspection, pango , maprec, ozi_map, pyimagequant }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "map-tiler"; - version = lib.substring 0 10 sources.map-tiler.date; + version = "2019-10-24"; - src = sources.map-tiler; + src = fetchFromGitHub { + owner = "wladich"; + repo = pname; + rev = "1dc5be65e58638f5899cd6cdc2010e00ce5e62d4"; + sha256 = "sha256-2wDhU1wbvyEAAYUQXUGASmK5X0/XNQF9P2y9pfHhHHg="; + }; patches = [ ./gobject.patch @@ -44,7 +49,8 @@ python3Packages.buildPythonApplication { ''; meta = with lib; { - inherit (sources.map-tiler) description homepage; + description = "Raster maps to map tiles"; + homepage = "https://github.com/wladich/map-tiler"; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix @@ -1,10 +1,15 @@ -{ lib, python3Packages, thinplatespline, sources }: +{ lib, python3Packages, fetchFromGitHub, thinplatespline }: -python3Packages.buildPythonPackage { +python3Packages.buildPythonPackage rec { pname = "maprec"; - version = lib.substring 0 10 sources.maprec.date; + version = "2019-10-24"; - src = sources.maprec; + src = fetchFromGitHub { + owner = "wladich"; + repo = pname; + rev = "20f5177cae7454455b21cd5f7178f5639c02d385"; + sha256 = "sha256-8lLCzqy4W35/WV83aRnARuAdoBO+977nbuXJfpdOxP8="; + }; patches = [ ./python3.patch ]; @@ -17,7 +22,7 @@ python3Packages.buildPythonPackage { pythonImportsCheck = [ "maprec" ]; meta = with lib; { - inherit (sources.maprec) description homepage; + homepage = "https://github.com/wladich/maprec"; license = licenses.free; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix @@ -1,10 +1,15 @@ -{ lib, python3Packages, maprec, sources }: +{ lib, python3Packages, fetchFromGitHub, maprec }: -python3Packages.buildPythonPackage { +python3Packages.buildPythonPackage rec { pname = "ozi_map"; - version = lib.substring 0 10 sources.ozi-map.date; + version = "2019-10-24"; - src = sources.ozi-map; + src = fetchFromGitHub { + owner = "wladich"; + repo = pname; + rev = "4d6bd3f234960ba90d82e6d58da9c1bf4677eb16"; + sha256 = "sha256-sbAKi9GZEPmbI1Nq3l4uSh/tVNLXAY2siXu3YtHI5qo="; + }; postPatch = "2to3 -n -w ozi_map/*.py"; @@ -15,7 +20,8 @@ python3Packages.buildPythonPackage { pythonImportsCheck = [ "ozi_map" ]; meta = with lib; { - inherit (sources.ozi-map) description homepage; + description = "python module for reading OziExplorer .map files"; + homepage = "https://github.com/wladich/ozi_map"; license = licenses.free; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix @@ -1,10 +1,15 @@ -{ lib, python3Packages, sources }: +{ lib, python3Packages, fetchFromGitHub }: -python3Packages.buildPythonPackage { +python3Packages.buildPythonPackage rec { pname = "thinplatespline"; - version = lib.substring 0 10 sources.thinplatespline.date; + version = "2013-01-23"; - src = sources.thinplatespline; + src = fetchFromGitHub { + owner = "wladich"; + repo = pname; + rev = "55fecd22c7160577b925e03169e74bd488a41cf3"; + sha256 = "sha256-t15iO+3UZKnORiQaYoGD4RLZx2SHtCbjg+Qr+sAHQHY="; + }; postPatch = '' 2to3 -n -w tps/*.py @@ -16,7 +21,8 @@ python3Packages.buildPythonPackage { pythonImportsCheck = [ "tps" ]; meta = with lib; { - inherit (sources.thinplatespline) description homepage; + description = "Python library for thin plate spline calculations"; + homepage = "https://github.com/wladich/thinplatespline"; license = licenses.mit; maintainers = [ maintainers.sikmir ]; }; diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lacc"; - version = "2021-01-31"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "larmel"; repo = "lacc"; - rev = "70436fe2e7ba21ce3a8c43decc99f2b4e8cf1c9f"; - sha256 = "0swh28xlmirbz1m3iwgqmcnhi8bvvnjkqcg9bnfzqn5x7lhjpr1v"; + rev = "f6ab3973d44ce79e469c4c3dc770a8b2e7a5543f"; + sha256 = "sha256-L9EW7Zl5PxOIGJwSwhq1gvAkN8fbpHg7gSbtTzuBHSE="; }; installFlags = [ "PREFIX=$(out)" ];