public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons
2013-08-30 10:45:11 +02:00
parent 9f541bcdde f90bdd6a09
commit 98fcc2f746
54 changed files with 2062 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/default.nix
+1 -1
View File
@@ -71,7 +71,7 @@ rec {
hub = import ./hub {
inherit (rubyLibs) rake;
inherit stdenv fetchgit groff makeWrapper;
inherit stdenv fetchurl groff makeWrapper;
};
gitFastExport = import ./fast-export {
pkgs/applications/version-management/git-and-tools/hub/default.nix
+5 -6
View File
@@ -1,13 +1,12 @@
{ stdenv, fetchgit, groff, rake, makeWrapper }:
{ stdenv, fetchurl, groff, rake, makeWrapper }:
stdenv.mkDerivation rec {
name = "hub-${version}";
version = "1.10.3";
version = "1.10.6";
src = fetchgit {
url = "git://github.com/defunkt/hub.git";
rev = "refs/tags/v${version}";
sha256 = "0j0krmf0sf09hhw3nsn0w1y97d67762g4qrc8080bwcx38lbyvbg";
src = fetchurl {
url = "https://github.com/github/hub/archive/v${version}.tar.gz";
sha256 = "0vfl1iq1927in81vd7zvp7yqqzay7pciyj87s83qfxrqyjpxn609";
};
buildInputs = [ rake makeWrapper ];