Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a467383f05ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 50bd8979084c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 10, 2019

  1. drone: 0.8.6 -> 1.3.1

    @elohmeier
    elohmeier committed Sep 10, 2019
    Copy the full SHA
    90608a3 View commit details

Commits on Oct 6, 2019

  1. Merge pull request #68271 from elohmeier/drone 

    drone: 0.8.6 -> 1.3.1
    @c0bw3b
    c0bw3b authored Oct 6, 2019
    Copy the full SHA
    50bd897 View commit details
Showing with 8 additions and 51 deletions.
  1. +8 −13 pkgs/development/tools/continuous-integration/drone/default.nix
  2. +0 −38 pkgs/development/tools/continuous-integration/drone/deps.nix
21 changes: 8 additions & 13 deletions pkgs/development/tools/continuous-integration/drone/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
38 changes: 0 additions & 38 deletions pkgs/development/tools/continuous-integration/drone/deps.nix
View file

This file was deleted.