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

Merge pull request #44137 from dtzWill/update/grv-0.2.0

Browse Source 
grv: 0.1.2 -> 0.2.0
This commit is contained in:
Jörg Thalheim 2018-07-29 12:50:33 +01:00 committed by GitHub
commit a2c6dbe370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/version-management/git-and-tools/grv/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }:
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
let
version = "0.1.2";
version = "0.2.0";
in
buildGoPackage {
name = "grv-${version}";
buildInputs = [ ncurses readline curl libgit2_0_25 ];
buildInputs = [ ncurses readline curl libgit2_0_27 ];
nativeBuildInputs = [ pkgconfig ];
goPackagePath = "github.com/rgburke/grv";
@ -14,7 +14,7 @@ buildGoPackage {
owner = "rgburke";
repo = "grv";
rev = "v${version}";
sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2";
sha256 = "0hlqw6b51jglqzzjgazncckpgarp25ghshl0lxv1mff80jg8wd1a";
fetchSubmodules = true;
};

4
pkgs/development/libraries/git2/0.25.nix → pkgs/development/libraries/git2/0.27.nix
View File

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "0.25.1";
version = "0.27.3";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
sha256 = "044dzwgl8zf1i1mk2g1z07hzxz46gma9sh63x09hswhw8j6zqx61";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];

19
pkgs/tools/misc/blsd/deps.nix generated
View File

@ -1,11 +1,12 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
type = "git";
url = "https://github.com/libgit2/git2go";
rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5";
sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc";
};
}
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
type = "git";
url = "https://github.com/libgit2/git2go";
rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8";
sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi";
};
}
]

4
pkgs/top-level/all-packages.nix
View File

@ -898,7 +898,7 @@ with pkgs;
blockdiag = pythonPackages.blockdiag;
blsd = callPackage ../tools/misc/blsd {
libgit2 = libgit2_0_25;
libgit2 = libgit2_0_27;
};
bluez-tools = callPackage ../tools/bluetooth/bluez-tools { };
@ -9326,7 +9326,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix {
libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};