ostree: 2017.9 → 2017.12

This commit is contained in:
Jan Tojnar 2017-10-02 15:39:35 +02:00
parent c2bc772203
commit db16b93039
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse , 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 let
libglnx-src = fetchFromGitHub { libglnx-src = fetchFromGitHub {
owner = "GNOME"; owner = "GNOME";
repo = "libglnx"; repo = "libglnx";
rev = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6"; rev = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08";
sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs"; sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr";
}; };
bsdiff-src = fetchFromGitHub { bsdiff-src = fetchFromGitHub {
owner = "mendsley"; owner = "mendsley";
repo = "bsdiff"; repo = "bsdiff";
rev = "7d70d8f4ff48345bc76e314c9d98da91f78873fa"; rev = "1edf9f656850c0c64dae260960fabd8249ea9c60";
sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws"; sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
}; };
version = "2017.9"; version = "2017.12";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "ostree-${version}"; name = "ostree-${version}";
@ -26,7 +26,7 @@ in stdenv.mkDerivation {
rev = "v${version}"; rev = "v${version}";
owner = "ostreedev"; owner = "ostreedev";
repo = "ostree"; repo = "ostree";
sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3"; sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -34,7 +34,7 @@ in stdenv.mkDerivation {
libxslt docbook_xsl docbook_xml_dtd_42 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 = '' prePatch = ''
rmdir libglnx bsdiff rmdir libglnx bsdiff
@ -50,7 +50,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Git for operating system binaries"; description = "Git for operating system binaries";
homepage = "http://live.gnome.org/OSTree/"; homepage = https://ostree.readthedocs.io/en/latest/;
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ copumpkin ]; maintainers = with maintainers; [ copumpkin ];