From fd01f8d1a76ca59e082b484374ed82c9deda6fef Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 17 Nov 2015 18:40:03 +0100
Subject: [PATCH] libgit2-glib: 0.0.24 -> 0.23.6
---
pkgs/desktops/gnome-3/3.18/default.nix | 4 +---
.../gnome-3/3.18/misc/libgit2-glib/default.nix | 14 +++-----------
.../gnome-3/3.18/misc/libgit2-glib/src.nix | 10 ++++++++++
3 files changed, 14 insertions(+), 14 deletions(-)
create mode 100644 pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index a3ae8933e64f..e98424a22503 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -370,9 +370,7 @@ let
libgda = callPackage ./misc/libgda { };
- libgit2-glib = callPackage ./misc/libgit2-glib {
- libgit2 = pkgs.libgit2.override { libssh2 = null; };
- };
+ libgit2-glib = callPackage ./misc/libgit2-glib { };
libmediaart = callPackage ./misc/libmediaart { };
diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix
index dbdd2cc7fd13..d7e89702795f 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix
@@ -1,18 +1,10 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2
, gtk_doc, gobjectIntrospection, libgit2, glib }:
-let
- majorVersion = "0.0";
-in
stdenv.mkDerivation rec {
- name = "libgit2-glib-${majorVersion}.24";
+ inherit (import ./src.nix fetchurl) name src;
- src = fetchurl {
- url = "mirror://gnome/sources/libgit2-glib/0.0/${name}.tar.xz";
- sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8";
- };
-
- buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
+ buildInputs = [ gnome3.gnome_common libtool pkgconfig vala libssh2
gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix
new file mode 100644
index 000000000000..8bf571189961
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "libgit2-glib-0.23.6";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/libgit2-glib/0.23/libgit2-glib-0.23.6.tar.xz;
+ sha256 = "5c8d6b5cb81ab64b96cb0c52ef37463b6d8998a40ce77a08eda9db66fb781144";
+ };
+}