diff options
| author | Jascha Geerds <jascha@jgeerds.name> | 2016-10-19 10:26:03 +0200 |
|---|---|---|
| committer | Jascha Geerds <jascha@jgeerds.name> | 2016-10-19 11:27:02 +0200 |
| commit | 27bf1c0794e2a68f6c0ca42017b44e480619333a (patch) | |
| tree | 8e3677587835e3906e4b6cde6e1b67a77bca5645 /pkgs/development/tools/deis | |
| parent | 306a8d9e8ca90d7a1fac141cca35dfe19750f9cd (diff) | |
| download | nixlib-27bf1c0794e2a68f6c0ca42017b44e480619333a.tar nixlib-27bf1c0794e2a68f6c0ca42017b44e480619333a.tar.gz nixlib-27bf1c0794e2a68f6c0ca42017b44e480619333a.tar.bz2 nixlib-27bf1c0794e2a68f6c0ca42017b44e480619333a.tar.lz nixlib-27bf1c0794e2a68f6c0ca42017b44e480619333a.tar.xz nixlib-27bf1c0794e2a68f6c0ca42017b44e480619333a.tar.zst nixlib-27bf1c0794e2a68f6c0ca42017b44e480619333a.zip | |
deis: Use Godeps workspace instead of deps.nix
Diffstat (limited to 'pkgs/development/tools/deis')
| -rw-r--r-- | pkgs/development/tools/deis/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/deis/deps.nix | 29 |
2 files changed, 3 insertions, 30 deletions
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 5c76fc69ac3a..599353fb6d3f 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -21,5 +21,7 @@ buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.nix; + preBuild = '' + export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace + ''; } diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix deleted file mode 100644 index 5a1b30a7e662..000000000000 --- a/pkgs/development/tools/deis/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "github.com/docopt/docopt-go"; - fetch = { - type = "git"; - url = "https://github.com/docopt/docopt-go"; - rev = "784ddc588536785e7299f7272f39101f7faccc3f"; - sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } -] |