From 9f739df21867da6250e598ef7e0868fe941250e7 Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Wed, 31 Jul 2019 21:23:17 +1200 Subject: [PATCH 1/2] maintainers: add hugoreeves --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee279d0429a..5bf922d86d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2156,6 +2156,11 @@ github = "hlolli"; name = "Hlodver Sigurdsson"; }; + hugoreeves = { + email = "hugolreeves@gmail.com"; + github = "hugoreeves"; + name = "Hugo Reeves"; + }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; From 4fa644bceca4296619ba6d3a1a18201f4ca27538 Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Wed, 31 Jul 2019 21:29:18 +1200 Subject: [PATCH 2/2] croc: init at 6.1.1 --- pkgs/tools/networking/croc/default.nix | 38 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/networking/croc/default.nix diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix new file mode 100644 index 00000000000..160b5840cf5 --- /dev/null +++ b/pkgs/tools/networking/croc/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "croc"; + version = "6.1.1"; + + goPackagePath = "github.com/schollz/croc"; + + src = fetchFromGitHub { + owner = "schollz"; + repo = pname; + rev = "v${version}"; + sha256 = "08gkwllk3m5hpkr1iwabvs739rvl6rzdnra2v040dzdj6zgyd12r"; + }; + + modSha256 = "026m3hc2imna7bf4jpqm7yq6mr4l5is2crsx1vxdpr4h0n6z0v3i"; + subPackages = [ "." ]; + + meta = with stdenv.lib; { + description = "Easily and securely send things from one computer to another"; + homepage = https://github.com/schollz/croc; + license = licenses.mit; + maintainers = with maintainers; [ hugoreeves ]; + + longDescription = '' + Croc is a command line tool written in Go that allows any two computers to + simply and securely transfer files and folders. + + Croc does all of the following: + - Allows any two computers to transfer data (using a relay) + - Provides end-to-end encryption (using PAKE) + - Enables easy cross-platform transfers (Windows, Linux, Mac) + - Allows multiple file transfers + - Allows resuming transfers that are interrupted + - Does not require a server or port-forwarding + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89fc4364ffb..ddef47d8add 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1276,6 +1276,8 @@ in ccnet = callPackage ../tools/networking/ccnet { }; + croc = callPackage ../tools/networking/croc { }; + cddl = callPackage ../development/tools/cddl { }; cedille = callPackage ../applications/science/logic/cedille