summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAlexander V. Nikolaev <avn@avnik.info>2016-11-04 06:48:54 +0200
committerRok Garbas <rok@garbas.si>2016-11-11 23:04:31 +0100
commit9743c0e623ec0b62230241a4fa69b3cdc7ccaca1 (patch)
treeee488156860400c5f634ae0231a4093b020bca19 /pkgs
parent9bd197fc975e78a21183f7616ab90d449329ecf7 (diff)
downloadnixlib-9743c0e623ec0b62230241a4fa69b3cdc7ccaca1.tar
nixlib-9743c0e623ec0b62230241a4fa69b3cdc7ccaca1.tar.gz
nixlib-9743c0e623ec0b62230241a4fa69b3cdc7ccaca1.tar.bz2
nixlib-9743c0e623ec0b62230241a4fa69b3cdc7ccaca1.tar.lz
nixlib-9743c0e623ec0b62230241a4fa69b3cdc7ccaca1.tar.xz
nixlib-9743c0e623ec0b62230241a4fa69b3cdc7ccaca1.tar.zst
nixlib-9743c0e623ec0b62230241a4fa69b3cdc7ccaca1.zip
drone: fix build issue on OSX
also update all hashes to recent snapshots
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/continuous-integration/drone/default.nix43
1 files changed, 38 insertions, 5 deletions
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 3569f8215dac..0d9d19c8b939 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,18 +2,47 @@
 
 buildGoPackage rec {
   name = "drone.io-${version}";
-  version = "0.5-20160813-${stdenv.lib.strings.substring 0 7 revision}";
-  revision = "e82ddd002276deb1741eca5345260ff1c2059abb";
+  version = "0.5-20161104-${stdenv.lib.strings.substring 0 7 revision}";
+  revision = "232df356afeeb4aec5e2959fa54b084dcadb267f";
   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}
   extraSrcs = [ 
     {
       goPackagePath = "github.com/drone/drone-ui";
       src = fetchFromGitHub {
         owner = "drone";
         repo = "drone-ui";
-        rev = "43bdae89a59c4d26e24f80f65748b9f78f1df0a9";
-        sha256 = "0k0kg07nkk595yk10n1fym3x8wlgn34n3f4mb237gqp8hhlnp5ra";
+        rev = "e66df33b4620917a2e7b59760887cc3eed543664";
+        sha256 = "0d50xdzkh9akpf5c0sqgcgy11v2vz858l36jp5snr94zkrdkv0n1";
+      };
+    }
+    {
+      goPackagePath = "github.com/drone/mq";
+      src = fetchFromGitHub {
+        owner = "drone";
+        repo = "mq";
+        rev = "0f296601feeed952dabd038793864acdbefe6dbe";
+        sha256 = "1k7439c90l4w29g7wyixfmpbkap7bn8yh8zynbjyjf9qjzwsnw97";
+      };
+    }
+    {
+      goPackagePath = "github.com/tidwall/redlog";
+      src = fetchFromGitHub {
+        owner = "tidwall";
+        repo = "redlog";
+        rev = "54086c8553cd23aba652513a87d2b085ea961541";
+        sha256 = "12a7mk6r8figjinzkbisxcaly6sasggy62m8zs4cf35lpq2lhffq";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/crypto";
+      src = fetchFromGitHub {
+        owner = "golang";
+        repo = "crypto";
+        rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd";
+        sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5";
       };
     }
   ];
@@ -24,11 +53,15 @@ buildGoPackage rec {
     go generate github.com/drone/drone/store/datastore/ddl
   '';
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone
+  '';
+
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone";
     rev = revision;
-    sha256 = "11ld8dzjn4g7wbfm4xqr3ih2dqaqqa8rdnw7m7d3sd78w7r7s3gs";
+    sha256 = "0xrijcrlv3ag9n2kywkrhdkxyhxc8fs6zqn0hyav6a6jpqnsahg3";
   };
 
   meta = with stdenv.lib; {