commit dcf5e7ae3ba7d6d0d3bb0608be94995950001ce6
parent 4abfb87876060fbd533f8ee82a7f2255843712ac
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 23 Nov 2020 22:23:21 +0300
Cleanup
Diffstat:
16 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -363,6 +363,7 @@
"gpxtools": {
"branch": "master",
"builtin": false,
+ "date": "2020-05-10T10:24:49Z",
"description": "A collection of c++ tools for using GPX files",
"homepage": "https://notabug.org/irdvo/gpxtools",
"owner": "irdvo",
diff --git a/pkgs/applications/gis/sasplanet/default.nix b/pkgs/applications/gis/sasplanet/default.nix
@@ -11,6 +11,7 @@ in
stdenv.mkDerivation {
pname = "sasplanet";
version = "20${year}-${month}-${day}";
+
src = sources.sasplanet;
dontUnpack = true;
diff --git a/pkgs/applications/i18n-editor/default.nix b/pkgs/applications/i18n-editor/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchfromgh, unzip, jre, makeWrapper }:
-let
- version = "2.0.0-beta.1";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
pname = "i18n-editor";
- inherit version;
+ version = "2.0.0-beta.1";
src = fetchfromgh {
owner = "jcbvm";
diff --git a/pkgs/applications/wireguard-statusbar/default.nix b/pkgs/applications/wireguard-statusbar/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchfromgh, undmg }:
-let
- version = "1.24";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
pname = "wireguard-statusbar";
- inherit version;
+ version = "1.24";
src = fetchfromgh {
owner = "aequitas";
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
@@ -3,6 +3,7 @@
stdenvNoCC.mkDerivation {
pname = "maptourist";
version = sources.maptourist.version;
+
src = sources.maptourist;
sourceRoot = ".";
diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix
@@ -3,6 +3,7 @@
stdenvNoCC.mkDerivation {
pname = "mtk-suomi";
version = sources.mtk-suomi.version;
+
src = sources.mtk-suomi;
preferLocalBuild = true;
diff --git a/pkgs/data/maps/routinodb/default.nix b/pkgs/data/maps/routinodb/default.nix
@@ -7,6 +7,7 @@ in
stdenv.mkDerivation {
pname = "routinodb";
version = "20${year}-${month}-${day}";
+
srcs = [
sources.geofabrik-finland
sources.geofabrik-estonia
diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix
@@ -13,9 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake gtest ];
- cmakeFlags = [
- "-DMICROJSON_MAKE_TESTS=ON"
- ];
+ cmakeFlags = [ "-DMICROJSON_MAKE_TESTS=ON" ];
doCheck = true;
diff --git a/pkgs/development/python-modules/pyimagequant/default.nix b/pkgs/development/python-modules/pyimagequant/default.nix
@@ -17,7 +17,8 @@ python3Packages.buildPythonPackage rec {
pythonImportsCheck = [ "imagequant" ];
meta = with lib; {
- inherit (sources.pyimagequant) description homepage;
+ description = "python bindings for libimagequant (pngquant core)";
+ homepage = "https://github.com/wladich/pyimagequant";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
diff --git a/pkgs/development/python-modules/s2sphere/default.nix b/pkgs/development/python-modules/s2sphere/default.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonPackage {
doCheck = false;
- pythonImportCheck = [ "s2sphere" ];
+ pythonImportsCheck = [ "s2sphere" ];
meta = with lib; {
inherit (sources.s2sphere) description homepage;
diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/servers/nakarte/default.nix
@@ -5,6 +5,7 @@ let
in
mkYarnPackage {
name = "${pname}-${version}";
+
src = sources.nakarte;
postPatch =
diff --git a/pkgs/tools/geo/gpxtools/default.nix b/pkgs/tools/geo/gpxtools/default.nix
@@ -2,7 +2,8 @@
stdenv.mkDerivation {
pname = "gpxtools";
- version = stdenv.lib.substring 0 7 sources.gpxtools.rev;
+ version = stdenv.lib.substring 0 10 sources.gpxtools.date;
+
src = sources.gpxtools;
nativeBuildInputs = [ cmake ];
@@ -13,9 +14,7 @@ stdenv.mkDerivation {
--replace "exiv2" "${exiv2}/bin/exiv2"
'';
- installPhase = ''
- install -Dm755 gpx* -t $out/bin
- '';
+ installPhase = "install -Dm755 gpx* -t $out/bin";
meta = with stdenv.lib; {
inherit (sources.gpxtools) description homepage;
diff --git a/pkgs/tools/geo/imgdecode/default.nix b/pkgs/tools/geo/imgdecode/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl }:
-let
- version = "1.1";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
pname = "imgdecode";
- inherit version;
+ version = "1.1";
src = fetchurl {
url = "mirror://sourceforge/garmin-img/imgdecode-${version}.tar.gz";
@@ -18,9 +16,7 @@ stdenv.mkDerivation {
configurePhase = "./configure || true";
- installPhase = ''
- install -Dm755 imgdecode -t $out/bin
- '';
+ installPhase = "install -Dm755 imgdecode -t $out/bin";
meta = with stdenv.lib; {
description = "IMG Decoder";
diff --git a/pkgs/tools/networking/ish/default.nix b/pkgs/tools/networking/ish/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl }:
-let
- version = "0.2";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
pname = "ish";
- inherit version;
+ version = "0.2";
src = fetchurl {
url = "mirror://sourceforge/icmpshell/ish-v${version}.tar.gz";
diff --git a/pkgs/tools/networking/ptunnel/default.nix b/pkgs/tools/networking/ptunnel/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl, libpcap }:
-let
- version = "0.72";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
pname = "ptunnel";
- inherit version;
+ version = "0.72";
src = fetchurl {
url = "https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${version}.tar.gz";
diff --git a/pkgs/tools/xfractint/default.nix b/pkgs/tools/xfractint/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl, xlibsWrapper }:
-let
- version = "20.04p14";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
pname = "xfractint";
- inherit version;
+ version = "20.04p14";
src = fetchurl {
url = "https://fractint.org/ftp/current/linux/xfractint-${version}.tar.gz";
