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

index 091e2b17c281645f2f7e495edec2eb146365f344..daa1401062474aeb8ce82cb7d0b8c8940e9c683c 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -1,18 +1,4 @@

{

• "docker-reg-tool": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2021-02-15T13:13:33Z",
  

•    "description": "Docker registry cli tool, primarily for deleting images",
  

•    "homepage": "https://github.com/byrnedo/docker-reg-tool",
  

•    "owner": "byrnedo",
  

•    "repo": "docker-reg-tool",
  

•    "rev": "23292d234289b1fd114b53786c9e4f9fece3674b",
  

•    "sha256": "0vwcdkxyg575dhchyshcjnkl7764ib1h21zqzb35gmncvkms0sx3",
  

•    "type": "tarball",
  

•    "url": "https://github.com/byrnedo/docker-reg-tool/archive/23292d234289b1fd114b53786c9e4f9fece3674b.tar.gz",
  

•    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  

• },

 "elevation": {

     "branch": "master",

     "builtin": false,

@@ -64,20 +50,6 @@ "type": "file",

     "url": "https://download.geofabrik.de/russia/northwestern-fed-district-210306.osm.pbf",

     "url_template": "https://download.geofabrik.de/russia/northwestern-fed-district-<version>.osm.pbf",

     "version": "210306"

• },

• "gimgtools": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2013-09-19T06:22:45Z",
  

•    "description": "Garmin Image Tools",
  

•    "homepage": "https://github.com/wuyongzheng/gimgtools",
  

•    "owner": "wuyongzheng",
  

•    "repo": "gimgtools",
  

•    "rev": "92d015749e105c5fb8eb704ae503a5c7e51af2bd",
  

•    "sha256": "14i9knc1dbkag0gsc2y1kv9hwzzzkycfy7fj1zmrgbsq71rnl1h2",
  

•    "type": "tarball",
  

•    "url": "https://github.com/wuyongzheng/gimgtools/archive/92d015749e105c5fb8eb704ae503a5c7e51af2bd.tar.gz",
  

•    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  

 },

 "gpxelevations": {

     "branch": "master",

@@ -312,20 +284,6 @@ "rev": "f445fa128b826c1cee527afdcc97e3e1e8433c32",

     "sha256": "1h201rqn74hcspxjigq50vj4rl526x8s0sx18j5gbswisf84bgql",

     "type": "tarball",

     "url": "https://github.com/sfluor/musig/archive/f445fa128b826c1cee527afdcc97e3e1e8433c32.tar.gz",

•    "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  

• },

• "nnn": {

•    "branch": "master",
  

•    "builtin": false,
  

•    "date": "2021-03-06T06:50:14Z",
  

•    "description": "n³ The missing terminal file manager for X",
  

•    "homepage": "https://github.com/jarun/nnn",
  

•    "owner": "jarun",
  

•    "repo": "nnn",
  

•    "rev": "3387f0a6ac41bf7a96f461ca62df4190f6b853f9",
  

•    "sha256": "1y06h1qqlsmdhcb7g33x38c4xv66w4cjk9f82hj4czdjavjp132r",
  

•    "type": "tarball",
  

•    "url": "https://github.com/jarun/nnn/archive/3387f0a6ac41bf7a96f461ca62df4190f6b853f9.tar.gz",
  

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

 "odict": {

diff --git a/pkgs/applications/nnn-plugins/default.nix b/pkgs/applications/nnn-plugins/default.nix

index 79f353a7df073fcfc33ec8191698c389330c4f4c..17cbac8990bed4b619903251508a934563ff4e25 100644

--- a/pkgs/applications/nnn-plugins/default.nix

+++ b/pkgs/applications/nnn-plugins/default.nix

@@ -1,10 +1,8 @@

-{ lib, stdenv, sources }:

+{ lib, stdenv, nnn }:

stdenv.mkDerivation {

pname = "nnn-plugins";

• version = lib.substring 0 10 sources.nnn.date;

• src = sources.nnn;

• inherit (nnn) version src;

phases = [ "installPhase" "fixupPhase" ];

diff --git a/pkgs/applications/visualgps/default.nix b/pkgs/applications/visualgps/default.nix

index 5b3cc002b7d7e18667c8174f8ddba4186f0ed916..661bbc975aa48fafa8ca0a6885cbc85460b984da 100644

--- a/pkgs/applications/visualgps/default.nix

+++ b/pkgs/applications/visualgps/default.nix

@@ -14,7 +14,7 @@ src = fetchFromGitHub {

 owner = "VisualGPS";

 repo = "VisualGPSqt";

 rev = "f2e213208a48e1f7d7294bc832a848de4efb4fd4";

• sha256 = "0f66xaisvgrjd25129li4lbp34d2hmw49i44vqq06hinjvpma7yp";

• sha256 = "sha256-1x9V75Y2QgMw3oTERHiFopFxFyWRJhGKaDK/raPqxjg=";

 fetchSubmodules = true;

};

diff --git a/pkgs/garmin/garmin-uploader/default.nix b/pkgs/garmin/garmin-uploader/default.nix

index 82f1b9255cea214ef9540e8cfadd07e7812d6088..73094673d2bf1cd20703bdfe45c7d5acfb0da44b 100644

--- a/pkgs/garmin/garmin-uploader/default.nix

+++ b/pkgs/garmin/garmin-uploader/default.nix

@@ -8,7 +8,7 @@ src = fetchFromGitHub {

 owner = "La0";

 repo = "garmin-uploader";

 rev = version;

• sha256 = "1nkkhj30yb00l0an3ds4x4gzcmmfkba4aj84ifbi4zr3xmzkhxiq";

• hash = "sha256-OHY4f+0jfxKXiwRJRdSarlb2H+lEt2EVoAAsD4aEc9o=";

};

propagatedBuildInputs = with python3Packages; [ requests six ];

@@ -19,7 +19,7 @@ doCheck = false;

meta = with lib; {

 description = "Garmin Connect Python Uploader";

• homepage = "https://github.com/La0/garmin-uploader";

• inherit (src.meta) homepage;

 license = licenses.gpl2;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix

index 79ec28a71a8dff5cad28691ecb8d7a0e4742a4af..1e46b5b3564dab95c1fb3d5d42f7302a7149b923 100644

--- a/pkgs/garmin/gimgtools/default.nix

+++ b/pkgs/garmin/gimgtools/default.nix

@@ -1,10 +1,15 @@

-{ lib, stdenv, sources, libiconv }:

+{ lib, stdenv, fetchFromGitHub, libiconv }:

-stdenv.mkDerivation {

• pname = "gimgtools-unstable";

• version = lib.substring 0 10 sources.gimgtools.date;

+stdenv.mkDerivation rec {

• pname = "gimgtools";

• version = "2013-09-19";

• src = sources.gimgtools;

• src = fetchFromGitHub {

• owner = "wuyongzheng";

• repo = pname;

• rev = "92d015749e105c5fb8eb704ae503a5c7e51af2bd";

• hash = "sha256-AgZqczhYr5frD9Id75if/38O057BC6YfeGquFpidKZI=";

• };

buildInputs = lib.optional stdenv.isDarwin libiconv;

@@ -20,7 +25,8 @@ done

'';

meta = with lib; {

• inherit (sources.gimgtools) description homepage;

• description = "Garmin Image Tools";

• inherit (src.meta) homepage;

 license = licenses.free;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.unix;

diff --git a/pkgs/garmin/imgdecode/default.nix b/pkgs/garmin/imgdecode/default.nix

index 1fc008a68c3c3bdc133e34bab21e41a003e93dc8..edaed06ce682e7819a7866804a066fe28f218626 100644

--- a/pkgs/garmin/imgdecode/default.nix

+++ b/pkgs/garmin/imgdecode/default.nix

@@ -6,7 +6,7 @@ version = "1.1";

src = fetchurl {

 url = "mirror://sourceforge/garmin-img/imgdecode-${version}.tar.gz";

• sha256 = "0rxrzvbpw6cbgq0fab7hy8n9jhp98x5y48i69jijxdhfyjivs02m";

• hash = "sha256-VQC9o/QOti6jTCYi4ktH6UKZLPLwLOUAfosZftf+uWc=";

};

postPatch = ''

diff --git a/pkgs/misc/docker-reg-tool/default.nix b/pkgs/misc/docker-reg-tool/default.nix

index 070efb7805a6501a94d69d4d5c1fa78aa3cb4220..e80309ec06caf2f8bf3f22424d42349f06d9d2a5 100644

--- a/pkgs/misc/docker-reg-tool/default.nix

+++ b/pkgs/misc/docker-reg-tool/default.nix

@@ -1,15 +1,21 @@

-{ lib, stdenv, sources }:

+{ lib, stdenv, fetchFromGitHub }:

-stdenv.mkDerivation {

+stdenv.mkDerivation rec {

pname = "docker-reg-tool";

• version = lib.substring 0 10 sources.docker-reg-tool.date;

• version = "2021-02-15";

• src = sources.docker-reg-tool;

• src = fetchFromGitHub {

• owner = "byrnedo";

• repo = pname;

• rev = "23292d234289b1fd114b53786c9e4f9fece3674b";

• hash = "sha256-o2ug69zM1lfG+vgHAcOKxJxDp5UMag8ZbOWU5/tsjG8=";

• };

installPhase = "install -Dm755 docker_reg_tool -t $out/bin";

meta = with lib; {

• inherit (sources.docker-reg-tool) description homepage;

• description = "Docker registry cli tool, primarily for deleting images";

• inherit (src.meta) homepage;

 license = licenses.mit;

 maintainers = [ maintainers.sikmir ];

 platforms = platforms.all;