b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ostree: 2018.9 → 2019.1

Browse source
This commit is contained in:
Jan Tojnar 2018-12-24 23:54:25 +01:00
parent f2a1a4e93b
commit 2a92edfbc4
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 11 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pkgs/tools/misc/ostree/default.nix
View file

@ -1,34 +1,17 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3
, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux
, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3
}:
let
version = "2018.9";
libglnx-src = fetchFromGitHub {
owner = "GNOME";
repo = "libglnx";
rev = "470af8763ff7b99bec950a6ae0a957c1dcfc8edd";
sha256 = "1fwik38i6w3r6pn4qkizradcqp1m83n7ljh9jg0y3p3kvrbfxh15";
};
bsdiff-src = fetchFromGitHub {
owner = "mendsley";
repo = "bsdiff";
rev = "1edf9f656850c0c64dae260960fabd8249ea9c60";
sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
};
in stdenv.mkDerivation {
name = "ostree-${version}";
stdenv.mkDerivation rec {
pname = "ostree";
version = "2019.1";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "ostreedev";
repo = "ostree";
sha256 = "0a8gr4qqxcvz3fqv9w4dxy6iq0rq4kdzf08rzv8xg4gic3ldgyvj";
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm";
};
patches = [
@ -57,13 +40,6 @@ in stdenv.mkDerivation {
(python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests
];
prePatch = ''
rmdir libglnx bsdiff
cp --no-preserve=mode -r ${libglnx-src} libglnx
cp --no-preserve=mode -r ${bsdiff-src} bsdiff
'';
preConfigure = ''
env NOCONFIGURE=1 ./autogen.sh
'';
@ -71,17 +47,16 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
configureFlags = [
"--with-systemdsystemunitdir=$(out)/lib/systemd/system"
"--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators"
"--enable-installed-tests"
];
makeFlags = [
"installed_testdir=$(installedTests)/libexec/installed-tests/libostree"
"installed_test_metadir=$(installedTests)/share/installed-tests/libostree"
"installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree"
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
];
meta = with stdenv.lib; {
description = "Git for operating system binaries";
homepage = https://ostree.readthedocs.io/en/latest/;