ostree: 2018.4 → 2018.6

Update, clean-up dependencies and add installed tests.

nixos/release.nix

@@ -314,6 +314,7 @@ in rec {
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
+  tests.ostree = callTest tests/ostree.nix {};
   tests.osquery = callTest tests/osquery.nix {};
   tests.plasma5 = callTest tests/plasma5.nix {};
   tests.plotinus = callTest tests/plotinus.nix {};

nixos/tests/ostree.nix

@@ -0,0 +1,21 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, lib, ... }: {
+  name = "ostree";
+
+  meta = {
+    maintainers = pkgs.ostree.meta.maintainers;
+  };
+
+  # TODO: Wrap/patch the tests directly in the package
+  machine = { pkgs, ... }: {
+    environment.systemPackages = with pkgs; [
+      gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
+    ];
+
+    environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests
+  };
+
+  testScript = ''
+    $machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share");
+  '';
+})

pkgs/tools/misc/ostree/default.nix

@@ -1,40 +1,56 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobjectIntrospection, gnome3
-, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse
+, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux
-, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
+, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3
 }:
 
 let
+  version = "2018.6";
+
   libglnx-src = fetchFromGitHub {
-    owner  = "GNOME";
+    owner = "GNOME";
-    repo   = "libglnx";
+    repo = "libglnx";
-    rev    = "0c82203cd459a35cc3f471e3205355e9fb79160f";
+    rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3";
-    sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc";
+    sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc";
   };
 
   bsdiff-src = fetchFromGitHub {
-    owner  = "mendsley";
+    owner = "mendsley";
-    repo   = "bsdiff";
+    repo = "bsdiff";
-    rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";
+    rev = "1edf9f656850c0c64dae260960fabd8249ea9c60";
     sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
   };
-
-  version = "2018.4";
 in stdenv.mkDerivation {
   name = "ostree-${version}";
 
+  outputs = [ "out" "dev" "man" "installedTests" ];
+
   src = fetchFromGitHub {
-    rev    = "v${version}";
+    rev = "v${version}";
-    owner  = "ostreedev";
+    owner = "ostreedev";
-    repo   = "ostree";
+    repo = "ostree";
-    sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr";
+    sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g";
   };
 
+  patches = [
+    # Tests access the helper using relative path
+    # https://github.com/ostreedev/ostree/issues/1593
+    (fetchpatch {
+      url = https://github.com/ostreedev/ostree/pull/1633.patch;
+      sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j";
+    })
+  ];
+
   nativeBuildInputs = [
     autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc
     libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
-  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ];
+  buildInputs = [
+    glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap
+    libarchive bzip2 xz
+    utillinuxMinimal # for libmount
+    (python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests
+  ];
 
   prePatch = ''
     rmdir libglnx bsdiff
@@ -44,16 +60,24 @@ in stdenv.mkDerivation {
 
   preConfigure = ''
     env NOCONFIGURE=1 ./autogen.sh
-
-    configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system"
   '';
 
+  configureFlags = [
+    "--with-systemdsystemunitdir=$(out)/lib/systemd/system"
+    "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators"
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=$(installedTests)/libexec/installed-tests/libostree"
+    "installed_test_metadir=$(installedTests)/share/installed-tests/libostree"
+  ];
+
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
-    homepage    = https://ostree.readthedocs.io/en/latest/;
+    homepage = https://ostree.readthedocs.io/en/latest/;
-    license     = licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ copumpkin ];
   };
 }
-