From 10812379fa0e70b054102ff2d6ee0672eab7fb6b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Jun 2019 09:47:10 +0200 Subject: libgit2: remove 0.26, default to 0.27 --- .../version-management/git-and-tools/gitstatus/romkatv_libgit2.nix | 4 ++-- pkgs/applications/version-management/git-and-tools/grv/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index f8aae5da047..22f35e22fb5 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,6 +1,6 @@ -{fetchFromGitHub, libgit2_0_27, ...}: +{fetchFromGitHub, libgit2, ...}: -libgit2_0_27.overrideAttrs (oldAttrs: rec { +libgit2.overrideAttrs (oldAttrs: rec { cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_ICONV=OFF" 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 32c163c45c4..b7828418db0 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_27, ncurses, pkgconfig, readline }: +{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }: let version = "0.3.1"; in buildGoPackage { name = "grv-${version}"; - buildInputs = [ ncurses readline curl libgit2_0_27 ]; + buildInputs = [ ncurses readline curl libgit2 ]; nativeBuildInputs = [ pkgconfig ]; goPackagePath = "github.com/rgburke/grv"; -- cgit 1.4.1