diff --git a/nix/sources.json b/nix/sources.json

index a9f4d6b0996d9595bd35d3787073ab0e06bc5339..c20b051e15b29bd8a0399799d7d72b27ecbeaab6 100644

--- 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

index c8cc9f38e836331c06a12dcf8a58dae6197453d2..7d46032c0a3faf4c1e8fe8858380f309e0217fc6 100644

--- 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

index 4bef7e8fac246444c5927691d72ab5cc7e19b0a5..24285673ba2f25401dd59a056dc5fdbc9070ad24 100644

--- 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

index 5cbbdcae4ebe50348354f9c09e87063e218fbc3a..9ec0ed44f146225e2651ff3d6f58496fd1c6edd3 100644

--- 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

index 50ebd5581a4e99b803b83aa99d8e7a93dfc212c4..66f2cd4c5f736bf03a98bb0a43f86fa9bf20ee7e 100644

--- 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

index 5e8ec2ae27ecf8998a17e5b63414a8d132f1ca7e..6669edb090fedb7b4a0774a91b12a6eff3758e55 100644

--- 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

index 4ad90b38a28f905e76c8c541bd396f8bcc842a91..b10d8535e2bce3556cc90df6e1520dec1e817d39 100644

--- 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

index 81ae64215e8347ff725fa0390a0509b5162ce2ef..4a51830e39107b831df01b7f296105672e7e8b96 100644

--- a/pkgs/development/libraries/microjson/default.nix

+++ b/pkgs/development/libraries/microjson/default.nix

@@ -13,9 +13,7 @@ '';

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

index 555f3b4d5f54a10144ce1f6cff7c609fc7651280..67918f34498dd0726a326daa418dc25c11b74bbc 100644

--- a/pkgs/development/python-modules/pyimagequant/default.nix

+++ b/pkgs/development/python-modules/pyimagequant/default.nix

@@ -17,7 +17,8 @@

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

index d7a77879c61ac628bf6a6cda024bb100fbded865..6c8eb1e2b931155a538173382b1024697c4cc4a0 100644

--- a/pkgs/development/python-modules/s2sphere/default.nix

+++ b/pkgs/development/python-modules/s2sphere/default.nix

@@ -10,7 +10,7 @@ propagatedBuildInputs = with python3Packages; [ future ];

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

index d755822066c7d231bf50c33a37959569db090fff..9de4aa694c53a85f6dc74e7459774356fd0b940c 100644

--- a/pkgs/servers/nakarte/default.nix

+++ b/pkgs/servers/nakarte/default.nix

@@ -5,6 +5,7 @@ version = stdenv.lib.substring 0 10 sources.nakarte.date;

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

index 4bea500cb17a80fb8efad8e5ee1c2e167e9d5d0c..d2f766b9d862759dd8efa61dd266e6af516ca2dc 100644

--- a/pkgs/tools/geo/gpxtools/default.nix

+++ b/pkgs/tools/geo/gpxtools/default.nix

@@ -2,7 +2,8 @@ { stdenv, cmake, expat, exiv2, sources }:

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 @@ substituteInPlace gpxgeotag.cpp \

   --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

index 130137e55d03664800e607c7d41f8635415c85e0..3840d559f9171afae799ee253d246360cfe5ce73 100644

--- 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 @@ '';

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

index 89375a24dc6ebb20350c8f374e135f5b0fcf09c7..80a9bc1bc72e42ddf2828549175a9ae38fc1deae 100644

--- 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

index 97bb4efe8860c5f56f0ce8d25f96db13e451472b..55464f8bc5f9db647373e45e02e111f44241c6d6 100644

--- 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

index 4d6242d771a99b3e9f9f2340a986b5dbb3e2b48c..4956456a5d440c2b35ab3a59fb309e0f3474068d 100644

--- 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";