diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-07 23:09:48 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-10 12:55:22 -0500 |
| commit | b108a07e3802284fe0f896b0a615711f7cc5aece (patch) | |
| tree | 8302b55a760aebeef47ab54688b0f6dd8292d1e6 /pkgs/tools/misc/ostree | |
| parent | 0f76b3c61dacf7500a445c360cb9a5f6ddd03353 (diff) | |
| download | nixlib-b108a07e3802284fe0f896b0a615711f7cc5aece.tar nixlib-b108a07e3802284fe0f896b0a615711f7cc5aece.tar.gz nixlib-b108a07e3802284fe0f896b0a615711f7cc5aece.tar.bz2 nixlib-b108a07e3802284fe0f896b0a615711f7cc5aece.tar.lz nixlib-b108a07e3802284fe0f896b0a615711f7cc5aece.tar.xz nixlib-b108a07e3802284fe0f896b0a615711f7cc5aece.tar.zst nixlib-b108a07e3802284fe0f896b0a615711f7cc5aece.zip | |
ostree: clean up
Diffstat (limited to 'pkgs/tools/misc/ostree')
| -rw-r--r-- | pkgs/tools/misc/ostree/default.nix | 67 |
1 files changed, 58 insertions, 9 deletions
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 8ec9fc1d4886..76c478208926 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,6 +1,32 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gjs, nixosTests -, 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 +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, gtk-doc +, gobject-introspection +, gjs +, nixosTests +, 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 }: stdenv.mkDerivation rec { @@ -17,24 +43,47 @@ stdenv.mkDerivation rec { patches = [ # Workarounds for https://github.com/ostreedev/ostree/issues/1592 ./fix-1592.patch + # Disable test-gpg-verify-result.test, # https://github.com/ostreedev/ostree/issues/1634 ./disable-test-gpg-verify-result.patch + # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch ]; nativeBuildInputs = [ - autoconf automake libtool pkgconfig gtk-doc gobject-introspection which yacc - libxslt docbook_xsl docbook_xml_dtd_42 + autoconf + automake + libtool + pkgconfig + gtk-doc + gobject-introspection + which + yacc + libxslt + docbook_xsl + docbook_xml_dtd_42 ]; buildInputs = [ - glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap - libarchive bzip2 xz + glib + systemd + e2fsprogs + libsoup + gpgme + fuse + libselinux + libcap + libarchive + bzip2 + xz utillinuxMinimal # for libmount - (python3.withPackages (p: with p; [ pyyaml ])) gjs # for tests + + # for installed tests + (python3.withPackages (p: with p; [ pyyaml ])) + gjs ]; preConfigure = '' @@ -62,7 +111,7 @@ stdenv.mkDerivation rec { 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; platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; |