ostree: v2015.3 -> v2016.5

1 files changed, 41 insertions, 17 deletions

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index ff64b65a89b..7d9d5545f40 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -1,32 +1,56 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
-, libgsystem, xz, e2fsprogs, libsoup, gpgme
+, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse
+, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
 }:
 
-stdenv.mkDerivation {
-  name = "ostree-2015.3";
+let
+  libglnx-src = fetchFromGitHub {
+    owner  = "GNOME";
+    repo   = "libglnx";
+    rev    = "769522753c25537e520adc322fa62e5390272add";
+    sha256 = "0gfc8dl63xpmf73dwb1plj7cymq7z6w6wq5m06yx8jymwhq7x1l8";
+  };
 
-  meta = with stdenv.lib; {
-    description = "Git for operating system binaries";
-    homepage    = "http://live.gnome.org/OSTree/";
-    license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+  bsdiff-src = fetchFromGitHub {
+    owner  = "mendsley";
+    repo   = "bsdiff";
+    rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";
+    sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
   };
+in stdenv.mkDerivation rec {
+  rev = "v2016.5";
+  name = "ostree-${rev}";
 
   src = fetchFromGitHub {
-    owner = "GNOME";
-    repo = "ostree";
-    rev = "v2015.3";
-    sha256 = "1n5q0yxwqx4pqiww3yjmqxl5835kknpw1bnwzbpanmyndnnl88dd";
+    inherit rev;
+    owner  = "ostreedev";
+    repo   = "ostree";
+    sha256 = "1dfyhzgv94ldjv2l4jxf4xhks2z5ljljqa3k579qskds755n6kvg";
   };
 
   nativeBuildInputs = [
-    autoreconfHook pkgconfig gtk_doc gobjectIntrospection
+    autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc
+    libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
-  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme ];
+  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ];
+
+  prePatch = ''
+    rmdir libglnx bsdiff
+    cp --no-preserve=mode -r ${libglnx-src} libglnx
+    cp --no-preserve=mode -r ${bsdiff-src} bsdiff
+  '';
 
-  preAutoreconf = ''
-    mkdir m4
-    gtkdocize
+  preConfigure = ''
+    env NOCONFIGURE=1 ./autogen.sh
   '';
+
+  meta = with stdenv.lib; {
+    description = "Git for operating system binaries";
+    homepage    = "http://live.gnome.org/OSTree/";
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
 }
+