From 383275fcb416e78669abab2b9ef2b1e158ba4e75 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Sun, 9 Sep 2018 20:00:42 +0200 Subject: [PATCH] Added git and mercurial as dependencies (for git and hg commands needed by godep) Updated installation and usage instructions --- README.md | 7 ++----- default.nix | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 97b644e..8c5890b 100755 --- a/README.md +++ b/README.md @@ -11,16 +11,13 @@ In other words: For go projects using [golang dep](https://github.com/golang/dep git clone https://github.com/nixcloud/dep2nix cd dep2nix nix-env -f default.nix -i dep2nix - nix-env -i nix-prefetch-git (this step might not be needed anymore soon) ## Using dep2nix cd yourproject (contains the Gopkg.lock) - dep2nix - Found 14 libraries to process: - github.com/Masterminds/semver github.com/Masterminds/vcs github.com/armon/go-radix github.com/boltdb/bolt github.com/golang/dep github.com/golang/protobuf github.com/jmank88/nuts github.com/nightlyone/lockfile github.com/pelletier/go-toml github.com/pkg/errors github.com/sdboyer/constext golang.org/x/net golang.org/x/sync golang.org/x/sys - + dep2nix [-i Gopkg.lock] [-o deps.nix] + Found 14 projects to process. * Processing: "github.com/Masterminds/semver" * Processing: "github.com/Masterminds/vcs" * Processing: "github.com/armon/go-radix" diff --git a/default.nix b/default.nix index 4285e9a..e49b451 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { src = ./.; buildInputs = [ makeWrapper ]; - binPath = lib.makeBinPath [ nix-prefetch-git nix-prefetch-hg ]; + binPath = lib.makeBinPath [ git nix-prefetch-git mercurial nix-prefetch-hg ]; goDeps = ./deps.nix;