commit e5b8f231b142522bb6da5f310e1b9706c43bf21f
parent 58589106baed20fd63fd53af607d8bf2fd3a9997
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 25 Apr 2021 15:13:49 +0300
Up
Diffstat:
7 files changed, 29 insertions(+), 61 deletions(-)
diff --git 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,
@@ -65,20 +51,6 @@
"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",
"builtin": false,
@@ -314,20 +286,6 @@
"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": {
"branch": "master",
"builtin": false,
diff --git 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
@@ -14,7 +14,7 @@ mkDerivation rec {
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
@@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec {
owner = "La0";
repo = "garmin-uploader";
rev = version;
- sha256 = "1nkkhj30yb00l0an3ds4x4gzcmmfkba4aj84ifbi4zr3xmzkhxiq";
+ hash = "sha256-OHY4f+0jfxKXiwRJRdSarlb2H+lEt2EVoAAsD4aEc9o=";
};
propagatedBuildInputs = with python3Packages; [ requests six ];
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
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
@@ -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 @@ stdenv.mkDerivation {
'';
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
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
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
@@ -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;
