rpm-ostree: clean up

This commit is contained in:
Jan Tojnar 2020-02-07 23:11:34 +01:00 committed by worldofpeace
parent b108a07e38
commit c55c3b9c3c

View file

@ -1,12 +1,49 @@
{ stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc, { stdenv
gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake, , fetchurl
libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, , ostree
bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit, fetchpatch }: , rpm
, which
, autoconf
, automake
, libtool
, pkgconfig
, cargo
, rustc
, gobject-introspection
, gtk-doc
, libxml2
, libxslt
, docbook_xsl
, docbook_xml_dtd_42
, docbook_xml_dtd_43
, gperf
, cmake
, libcap
, glib
, systemd
, json-glib
, libarchive
, libsolv
, librepo
, polkit
, bubblewrap
, pcre
, check
, python
, json_c
, libmodulemd_1
, utillinux
, sqlite
, cppunit
, fetchpatch
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rpm-ostree"; pname = "rpm-ostree";
version = "2019.5"; version = "2019.5";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn";
@ -25,17 +62,46 @@ stdenv.mkDerivation rec {
}) })
]; ];
outputs = [ "out" "dev" "man" "devdoc" ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig which autoconf automake libtool cmake gperf cargo rustc pkgconfig
gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_43 which
autoconf
automake
libtool
cmake
gperf
cargo
rustc
gobject-introspection
gtk-doc
libxml2
libxslt
docbook_xsl
docbook_xml_dtd_42
docbook_xml_dtd_43
]; ];
buildInputs = [ buildInputs = [
libcap ostree rpm glib systemd polkit bubblewrap libcap
json-glib libarchive libsolv librepo ostree
pcre check python rpm
# libdnf glib
json_c libmodulemd_1 utillinux sqlite cppunit systemd
polkit
bubblewrap
json-glib
libarchive
libsolv
librepo
pcre
check
python
# libdnf
json_c
libmodulemd_1
utillinux
sqlite
cppunit
]; ];
configureFlags = [ configureFlags = [
@ -60,7 +126,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
homepage = https://rpm-ostree.readthedocs.io/en/latest/; homepage = "https://rpm-ostree.readthedocs.io/en/latest/";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ copumpkin ]; maintainers = with maintainers; [ copumpkin ];
platforms = platforms.linux; platforms = platforms.linux;