diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2019-10-06 18:21:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-06 18:21:51 +0200 |
commit | 50bd8979084c0f21b54069a582df25cb668fd81c (patch) | |
tree | 3a9b7cc0e95773f7b02954445a953044273c02df /pkgs/development/tools | |
parent | a467383f05ae6b0b733ffed734521d3358497ef3 (diff) | |
parent | 90608a38924e014148f40be3a5d88b8ebc6ccb66 (diff) | |
download | nixlib-50bd8979084c0f21b54069a582df25cb668fd81c.tar nixlib-50bd8979084c0f21b54069a582df25cb668fd81c.tar.gz nixlib-50bd8979084c0f21b54069a582df25cb668fd81c.tar.bz2 nixlib-50bd8979084c0f21b54069a582df25cb668fd81c.tar.lz nixlib-50bd8979084c0f21b54069a582df25cb668fd81c.tar.xz nixlib-50bd8979084c0f21b54069a582df25cb668fd81c.tar.zst nixlib-50bd8979084c0f21b54069a582df25cb668fd81c.zip |
Merge pull request #68271 from elohmeier/drone
drone: 0.8.6 -> 1.3.1
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/continuous-integration/drone/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/tools/continuous-integration/drone/deps.nix | 38 |
2 files changed, 8 insertions, 51 deletions
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 53ad6f4c2f61..12386ab2c084 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }: +{ stdenv, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { - pname = "drone.io"; - version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}"; - revision = "c48150767c2700d35dcc29b110a81c8b5969175e"; +buildGoModule rec { + name = "drone.io-${version}"; + version = "1.3.1"; goPackagePath = "github.com/drone/drone"; - # These dependencies pulled (in `drone` buildprocess) via Makefile, - # so I extracted them here, all revisions pinned by same date, as ${version} - goDeps= ./deps.nix; - - nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; + modSha256 = "128nnn8axnr30y3r46d11g8qznbsg82z2qw9qbxkq3bja6nz8fn2"; src = fetchFromGitHub { owner = "drone"; repo = "drone"; - rev = revision; - sha256 = "0miq2012nivvr1ysi3aa2xrr5ak3mf0l3drybyc83iycy0kp4bda"; + rev = "v${version}"; + sha256 = "0vp86k1z3r79sx0ln3vndzx8ycf0dbiv7jk56ncmk390iiz2a4g4"; }; meta = with stdenv.lib; { - maintainers = with maintainers; [ avnik vdemeester ]; + maintainers = with maintainers; [ elohmeier vdemeester ]; license = licenses.asl20; description = "Continuous Integration platform built on container technology"; }; diff --git a/pkgs/development/tools/continuous-integration/drone/deps.nix b/pkgs/development/tools/continuous-integration/drone/deps.nix deleted file mode 100644 index 86059fba28d9..000000000000 --- a/pkgs/development/tools/continuous-integration/drone/deps.nix +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - goPackagePath = "github.com/drone/drone-ui"; - fetch = { - type = "git"; - url = "https://github.com/drone/drone-ui"; - rev = "5a497bd6cd5c3c17c53b00d40bcda1bf6f68f475"; - sha256 = "1666xlz3dg468izfwprg17sgb3f4ppn5sj5klds3wgdfrjjm4v57"; - }; - } - { - goPackagePath = "github.com/drone/mq"; - fetch = { - type = "git"; - url = "https://github.com/drone/mq"; - rev = "280af2a3b9c7d9ce90d625150dfff972c6c190b8"; - sha256 = "10a24yq3ya8mvs7j6m7lqhyws7jd923rnih75ciq1g327qxf743s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://github.com/golang/net"; - rev = "dfa909b99c79129e1100513e5cd36307665e5723"; - sha256 = "0nsansy1yqy1kzh5wpv3zi85s0chxfq0ha8knhgnfa0wj0k8q0il"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } -] |