about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-07-29 12:50:33 +0100
committerGitHub <noreply@github.com>2018-07-29 12:50:33 +0100
commita2c6dbe370160ffea5537f64dda04489184c5ce1 (patch)
treec91bec9b459560c4d4b533d879696755aad37378 /pkgs
parentbee7a673239a78c211a1c038bd76a2461edd244c (diff)
parentbdfba1a95486a0941eb538a3330a217ff07d1be7 (diff)
downloadnixlib-a2c6dbe370160ffea5537f64dda04489184c5ce1.tar
nixlib-a2c6dbe370160ffea5537f64dda04489184c5ce1.tar.gz
nixlib-a2c6dbe370160ffea5537f64dda04489184c5ce1.tar.bz2
nixlib-a2c6dbe370160ffea5537f64dda04489184c5ce1.tar.lz
nixlib-a2c6dbe370160ffea5537f64dda04489184c5ce1.tar.xz
nixlib-a2c6dbe370160ffea5537f64dda04489184c5ce1.tar.zst
nixlib-a2c6dbe370160ffea5537f64dda04489184c5ce1.zip
Merge pull request #44137 from dtzWill/update/grv-0.2.0
grv: 0.1.2 -> 0.2.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/version-management/git-and-tools/grv/default.nix8
-rw-r--r--pkgs/development/libraries/git2/0.27.nix (renamed from pkgs/development/libraries/git2/0.25.nix)4
-rw-r--r--pkgs/tools/misc/blsd/deps.nix19
-rw-r--r--pkgs/top-level/all-packages.nix4
4 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index be5b58c57334..cfb028004c70 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -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;
   };
 
diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.27.nix
index 6bb1de2cf348..8d9ff3cfe43c 100644
--- a/pkgs/development/libraries/git2/0.25.nix
+++ b/pkgs/development/libraries/git2/0.27.nix
@@ -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" ];
diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix
index 55e6daea5e21..d212f213a60e 100644
--- a/pkgs/tools/misc/blsd/deps.nix
+++ b/pkgs/tools/misc/blsd/deps.nix
@@ -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";
+    };
+  }
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 278001443256..dd4ce7f71b7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;
   };