diff options
| author | Jascha Geerds <jascha@jgeerds.name> | 2016-10-19 12:57:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 12:57:48 +0200 |
| commit | e376ed81dc2ed64dd9b74099f315f09e3a02d01f (patch) | |
| tree | 2ee4744377fb2e99feb995827ae3d08597475065 /pkgs | |
| parent | 9803ad85eb3d5e5d1baf883b948452a4c179af40 (diff) | |
| parent | c7d9de0e390a14119b76379e8cb310eb520c1c65 (diff) | |
| download | nixlib-e376ed81dc2ed64dd9b74099f315f09e3a02d01f.tar nixlib-e376ed81dc2ed64dd9b74099f315f09e3a02d01f.tar.gz nixlib-e376ed81dc2ed64dd9b74099f315f09e3a02d01f.tar.bz2 nixlib-e376ed81dc2ed64dd9b74099f315f09e3a02d01f.tar.lz nixlib-e376ed81dc2ed64dd9b74099f315f09e3a02d01f.tar.xz nixlib-e376ed81dc2ed64dd9b74099f315f09e3a02d01f.tar.zst nixlib-e376ed81dc2ed64dd9b74099f315f09e3a02d01f.zip | |
Merge pull request #19677 from jgeerds/deis
deis: 1.13.0 -> 1.13.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/deis/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/development/tools/deis/deps.nix | 29 |
2 files changed, 17 insertions, 34 deletions
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 5c76fc69ac3a..fe4ec06322f4 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "deis-${version}"; - version = "1.13.0"; + version = "1.13.3"; rev = "v${version}"; - + goPackagePath = "github.com/deis/deis"; subPackages = [ "client" ]; @@ -18,8 +18,20 @@ buildGoPackage rec { inherit rev; owner = "deis"; repo = "deis"; - sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; + sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p"; }; - goDeps = ./deps.nix; + preBuild = '' + export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace + ''; + + meta = with stdenv.lib; { + homepage = https://deis.io; + description = "A command line utility used to interact with the Deis open source PaaS."; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ + jgeerds + ]; + }; } 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"; - }; - } -] |