nur-packages

commit f6152fa2121815bf03d31707b6e38b00c6039494
parent 2bb47dd4ecbed579f3264906594524604f853fe1
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Thu, 19 Dec 2019 20:35:02 +0300

Cleanup

Diffstat:
M
default.nix
 | 
44
++++++++++++++++++++++++++++++--------------
M
pkgs/datamaps/default.nix
 | 
9
++++-----
M
pkgs/gpxsee-maps/default.nix
 | 
2
+-

3 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/default.nix b/default.nix
@@ -1,18 +1,34 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> { } }:
 
 with pkgs;
 
-let
-  sources = import ./nix/sources.nix;
-in
-{
-  datamaps = callPackage ./pkgs/datamaps { inherit (sources) datamaps; };
-  gpx-layer = perlPackages.callPackage ./pkgs/gpx-layer { inherit (sources) gpx-layer; };
-  gpxlab = libsForQt5.callPackage ./pkgs/gpxlab { inherit (sources) GPXLab; };
-  gpxpy = python3Packages.callPackage ./pkgs/gpxpy { inherit (sources) gpxpy; };
-  gpxsee-maps = callPackage ./pkgs/gpxsee-maps { inherit (sources) GPXSee-maps; };
-  gpxtools = callPackage ./pkgs/gpxtools { inherit (sources) gpxtools; };
-  gt4gd = python3Packages.callPackage ./pkgs/gt4gd { inherit (sources) google-translate-for-goldendict; };
-  mbutil = python3Packages.callPackage ./pkgs/mbutil { inherit (sources) mbutil; };
-  redict = libsForQt5.callPackage ./pkgs/redict { inherit (sources) redict; };
+let sources = import ./nix/sources.nix;
+in {
+  datamaps = callPackage ./pkgs/datamaps {
+    inherit (sources) datamaps;
+  };
+  gpx-layer = perlPackages.callPackage ./pkgs/gpx-layer {
+    inherit (sources) gpx-layer;
+  };
+  gpxlab = libsForQt5.callPackage ./pkgs/gpxlab {
+    inherit (sources) GPXLab;
+  };
+  gpxpy = python3Packages.callPackage ./pkgs/gpxpy {
+    inherit (sources) gpxpy;
+  };
+  gpxsee-maps = callPackage ./pkgs/gpxsee-maps {
+    inherit (sources) GPXSee-maps;
+  };
+  gpxtools = callPackage ./pkgs/gpxtools {
+    inherit (sources) gpxtools;
+  };
+  gt4gd = python3Packages.callPackage ./pkgs/gt4gd {
+    inherit (sources) google-translate-for-goldendict;
+  };
+  mbutil = python3Packages.callPackage ./pkgs/mbutil {
+    inherit (sources) mbutil;
+  };
+  redict = libsForQt5.callPackage ./pkgs/redict {
+    inherit (sources) redict;
+  };
 }
diff --git a/pkgs/datamaps/default.nix b/pkgs/datamaps/default.nix
@@ -12,15 +12,14 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   installPhase = ''
-    install -Dm755 encode $out/bin/datamaps-encode
-    install -Dm755 enumerate $out/bin/datamaps-enumerate
-    install -Dm755 merge $out/bin/datamaps-merge
-    install -Dm755 render $out/bin/datamaps-render
+    for tool in encode enumerate merge render; do
+      install -Dm755 $tool $out/bin/$pname-$tool
+    done
   '';
 
   meta = with stdenv.lib; {
     description = datamaps.description;
-    homepage = https://github.com/ericfischer/datamaps;
+    homepage = "https://github.com/ericfischer/datamaps";
     license = licenses.bsd2;
     maintainers = with maintainers; [ sikmir ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/gpxsee-maps/default.nix b/pkgs/gpxsee-maps/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = GPXSee-maps.description;
-    homepage = https://github.com/tumic0/GPXSee-maps;
+    homepage = "https://github.com/tumic0/GPXSee-maps";
     license = licenses.unlicense;
     maintainers = with maintainers; [ sikmir ];
     platforms = platforms.unix;