commit 78ac54f97b1e46c305cbffc6733b4766887bad8d
parent 2f6be43fb7b2ef353f2a6d23afae0d64ee6a1345
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Fri, 12 Mar 2021 22:21:27 +0300
Cleanup
Diffstat:
17 files changed, 43 insertions(+), 61 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -83,20 +83,6 @@
"url": "https://github.com/DavyLandman/csvtools/archive/efd3ef1c94c26c673e958ecb045056bfc2c7b4f3.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "datamaps": {
- "branch": "master",
- "builtin": false,
- "date": "2014-08-19T19:28:16Z",
- "description": "Indexes points and lines and generates map tiles to display them",
- "homepage": "https://github.com/ericfischer/datamaps",
- "owner": "ericfischer",
- "repo": "datamaps",
- "rev": "76e620adabbedabd6866b23b30c145b53bae751e",
- "sha256": "1rdqbyfmgidiv4aqy1s6llls304dxbg5226c7k622smd2rnda2jk",
- "type": "tarball",
- "url": "https://github.com/ericfischer/datamaps/archive/76e620adabbedabd6866b23b30c145b53bae751e.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"dict2rest": {
"branch": "master",
"builtin": false,
@@ -345,20 +331,6 @@
"url": "https://github.com/remisalmon/gpx_interpolate/archive/24236e45e3d8baa0662c329b735b79a17e84c1bd.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "gpx-layer": {
- "branch": "master",
- "builtin": false,
- "date": "2013-09-19T22:24:41Z",
- "description": "Tools to turn GPX files into a GPS map tracing layer",
- "homepage": "https://github.com/ericfischer/gpx-layer",
- "owner": "ericfischer",
- "repo": "gpx-layer",
- "rev": "746b4723cf1f69fb86d45cf2d4efeaae9e711d2d",
- "sha256": "0v5vfjqm5flmr30mpgabjwzy4avxl620051pcw03sdf3za8xkpr3",
- "type": "tarball",
- "url": "https://github.com/ericfischer/gpx-layer/archive/746b4723cf1f69fb86d45cf2d4efeaae9e711d2d.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"gpxelevations": {
"branch": "master",
"builtin": false,
diff --git a/pkgs/applications/i18n-editor/default.nix b/pkgs/applications/i18n-editor/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GUI for editing your i18n translation files";
- homepage = "https://github.com/jcbvm/i18n-editor";
+ homepage = 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
@@ -6,7 +6,7 @@
, qtserialport
}:
-mkDerivation {
+mkDerivation rec {
pname = "visualgps-unstable";
version = "2020-03-29";
@@ -34,7 +34,7 @@ mkDerivation {
meta = with lib; {
description = "A QT application (GUI) that makes use of the VisualGPS/NMEAParser project";
- homepage = "https://github.com/VisualGPS/VisualGPSqt";
+ homepage = 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 = "https://github.com/aequitas/macos-menubar-wireguard";
+ homepage = src.meta.homepage;
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-darwin" ];
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -122,9 +122,7 @@ lib.makeScope newScope (
fx-bin = callPackage ./tools/text/fx/bin.nix { };
go-staticmaps = callPackage ./tools/geo/go-staticmaps { };
gpx-interpolate = callPackage ./tools/geo/gpx-interpolate { };
- gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer {
- inherit sources;
- };
+ gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer { };
gpxtools = callPackage ./tools/geo/gpxtools { };
gpxtrackposter = callPackage ./tools/geo/gpxtrackposter { };
py-staticmaps = callPackage ./tools/geo/py-staticmaps { };
diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Translate text/gemini into HTML";
- homepage = "https://github.com/shtanton/gmi2html";
+ homepage = src.meta.homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, zig }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "gurl-unstable";
version = "2020-12-28";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A curl-like cli application to interact with Gemini sites";
- homepage = "https://github.com/MasterQ32/gurl";
+ homepage = 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
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Yet another HTTPie clone";
- homepage = "https://github.com/ducaale/ht";
+ homepage = src.meta.homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/misc/yabai/default.nix b/pkgs/misc/yabai/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A tiling window manager for macOS based on binary space partitioning";
- homepage = "https://github.com/koekeishiya/yabai";
- changelog = "https://github.com/koekeishiya/yabai/blob/v${version}/CHANGELOG.md";
+ homepage = src.meta.homepage;
+ changelog = "${src.meta.homepage}/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.darwin;
diff --git a/pkgs/nakarte/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonPackage rec {
meta = with lib; {
description = "python bindings for libimagequant (pngquant core)";
- homepage = "https://github.com/wladich/pyimagequant";
+ homepage = src.meta.homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
};
diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, curl, SDL2, SDL2_image }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "sdlmap";
version = "2014-02-09";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A SDL + libcurl OpenStreetMap viewer";
- homepage = "https://github.com/jhawthorn/sdlmap";
+ homepage = src.meta.homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "lacc";
version = "2021-01-31";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A simple, self-hosting C compiler";
- homepage = "https://github.com/larmel/lacc";
+ homepage = 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
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "sfm";
version = "2021-02-18";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Simple file manager";
- homepage = "https://github.com/afify/sfm";
+ homepage = 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
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A dmenu rip-off with contextual completion";
- homepage = "https://github.com/phillbush/xprompt";
+ homepage = src.meta.homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, libpng, pkg-config, sources }:
+{ lib, stdenv, fetchFromGitHub, libpng, pkg-config }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "datamaps";
- version = lib.substring 0 10 sources.datamaps.date;
+ version = "2014-08-19";
- src = sources.datamaps;
+ src = fetchFromGitHub {
+ owner = "ericfischer";
+ repo = pname;
+ rev = "76e620adabbedabd6866b23b30c145b53bae751e";
+ sha256 = "1rdqbyfmgidiv4aqy1s6llls304dxbg5226c7k622smd2rnda2jk";
+ };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpng ];
@@ -19,7 +24,8 @@ stdenv.mkDerivation {
'';
meta = with lib; {
- inherit (sources.datamaps) description homepage;
+ description = "Indexes points and lines and generates map tiles to display them";
+ homepage = src.meta.homepage;
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }:
+{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, XMLParser }:
-buildPerlPackage {
+buildPerlPackage rec {
pname = "gpx-layer";
- version = lib.substring 0 10 sources.gpx-layer.date;
+ version = "2013-09-19";
- src = sources.gpx-layer;
+ src = fetchFromGitHub {
+ owner = "ericfischer";
+ repo = pname;
+ rev = "746b4723cf1f69fb86d45cf2d4efeaae9e711d2d";
+ sha256 = "0v5vfjqm5flmr30mpgabjwzy4avxl620051pcw03sdf3za8xkpr3";
+ };
outputs = [ "out" ];
@@ -23,7 +28,8 @@ buildPerlPackage {
'';
meta = with lib; {
- inherit (sources.gpx-layer) description homepage;
+ description = "Tools to turn GPX files into a GPS map tracing layer";
+ homepage = src.meta.homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/tools/geo/render_geojson/default.nix b/pkgs/tools/geo/render_geojson/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30-gtk3 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "render_geojson";
version = "2018-07-11";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library";
- homepage = "https://github.com/pedro-vicente/render_geojson";
+ homepage = src.meta.homepage;
license = licenses.asl20;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
