summary refs log tree commit diff
path: root/pkgs/tools/misc/ostree
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-10-02 15:39:35 +0200
committerJan Tojnar <jtojnar@gmail.com>2017-11-05 20:44:13 +0100
commitdb16b930394ba40ecacba6b3c3b4202b18456ad2 (patch)
treec80b7a42e8d9bb7d4a7327ee7174bfca19ce0ba9 /pkgs/tools/misc/ostree
parentc2bc77220336e717f901b44967148144db78ed09 (diff)
downloadnixpkgs-db16b930394ba40ecacba6b3c3b4202b18456ad2.tar
nixpkgs-db16b930394ba40ecacba6b3c3b4202b18456ad2.tar.gz
nixpkgs-db16b930394ba40ecacba6b3c3b4202b18456ad2.tar.bz2
nixpkgs-db16b930394ba40ecacba6b3c3b4202b18456ad2.tar.lz
nixpkgs-db16b930394ba40ecacba6b3c3b4202b18456ad2.tar.xz
nixpkgs-db16b930394ba40ecacba6b3c3b4202b18456ad2.tar.zst
nixpkgs-db16b930394ba40ecacba6b3c3b4202b18456ad2.zip
ostree: 2017.9 → 2017.12
Diffstat (limited to 'pkgs/tools/misc/ostree')
-rw-r--r--pkgs/tools/misc/ostree/default.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 82abb5c9bbc..a8332ad494d 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
 , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse
-, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
+, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
 }:
 
 let
   libglnx-src = fetchFromGitHub {
     owner  = "GNOME";
     repo   = "libglnx";
-    rev    = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6";
-    sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs";
+    rev    = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08";
+    sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr";
   };
 
   bsdiff-src = fetchFromGitHub {
     owner  = "mendsley";
     repo   = "bsdiff";
-    rev    = "7d70d8f4ff48345bc76e314c9d98da91f78873fa";
-    sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws";
+    rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";
+    sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
   };
 
-  version = "2017.9";
+  version = "2017.12";
 in stdenv.mkDerivation {
   name = "ostree-${version}";
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
     rev    = "v${version}";
     owner  = "ostreedev";
     repo   = "ostree";
-    sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3";
+    sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
     libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
-  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ];
+  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ];
 
   prePatch = ''
     rmdir libglnx bsdiff
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
-    homepage    = "http://live.gnome.org/OSTree/";
+    homepage    = https://ostree.readthedocs.io/en/latest/;
     license     = licenses.lgpl2Plus;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ copumpkin ];