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: 44f93731d6f0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8502d94b31fb
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 5, 2017

  1. bwa: 0.7.15 -> 0.7.16a

    @globin
    globin committed Sep 5, 2017
    Copy the full SHA
    a096794 View commit details

  2. jenkins: 2.73 -> 2.77

    @globin
    globin committed Sep 5, 2017
    Copy the full SHA
    8502d94 View commit details
Showing with 8 additions and 11 deletions.
  1. +6 −9 pkgs/applications/science/biology/bwa/default.nix
  2. +2 −2 pkgs/development/tools/continuous-integration/jenkins/default.nix
15 changes: 6 additions & 9 deletions pkgs/applications/science/biology/bwa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{ stdenv, fetchFromGitHub, zlib }:
{ stdenv, fetchurl, zlib }:

stdenv.mkDerivation rec {
name = "bwa-${version}";
version = "0.7.15";
version = "0.7.16a";

src = fetchFromGitHub {
owner = "lh3";
repo = "bwa";
rev = "v${version}";
sha256 = "1aasdr3lik42gafi9lds7xw0wgv8ijjll1g32d7jm04pp235c7nl";
src = fetchurl {
url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2";
sha256 = "0w61zxh6b4isydw5qp6pdb1mc50jg1h8vhahw2xm24w7i1gxpv4g";
};

buildInputs = [ zlib ];

installPhase = ''
mkdir -p $out/bin
cp bwa $out/bin
install -vD bwa $out/bin/bwa
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/tools/continuous-integration/jenkins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "2.73";
version = "2.77";

src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "1q9q2vjza3slmbh6sbxak1y3ryvisphlh92nidsp88rv60zn3nv8";
sha256 = "1hmj5f14qpq58018q2jmdd4j36v2idsbb9caiakxfy08gppzhz00";
};

buildCommand = ''