diff options
Diffstat (limited to 'pkgs/tools/misc/rpm-ostree')
| -rw-r--r-- | pkgs/tools/misc/rpm-ostree/default.nix | 112 | ||||
| -rw-r--r-- | pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch | 11 |
2 files changed, 83 insertions, 40 deletions
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 09f2150cdce3..79003ff1ecfe 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,41 +1,95 @@ -{ stdenv, fetchurl, ostree, 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 +, fetchurl +, ostree +, 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 +, zchunk +, libmodulemd_1 +, utillinux +, sqlite +, cppunit +}: stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2019.5"; + version = "2020.1"; + + outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { - url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; + url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "1xgfppq4fqqvg3cs327bckjpiz6rrn3bbbhg3q5p4j2bzsq89xiz"; }; - patches = [ - # gobject-introspection requires curl in cflags - # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-449777169 - # https://github.com/NixOS/nixpkgs/pull/50953#issuecomment-452177080 - ./fix-introspection-build.patch - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://github.com/coreos/rpm-ostree/commit/60053d0d3d2279d120ae7007c6048e499d2c4d14.patch"; - sha256 = "0ig21zip09iy2da7ksg87jykaj3q8jyzh8r7yrpzyql85qxiwm0m"; - }) - ]; - - outputs = [ "out" "dev" "man" "devdoc" ]; nativeBuildInputs = [ - pkgconfig which autoconf automake libtool cmake gperf cargo rustc - gobject-introspection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_43 + pkgconfig + 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 = [ - libcap ostree rpm glib systemd polkit bubblewrap - json-glib libarchive libsolv librepo - pcre check python - # libdnf - json_c libmodulemd_1 utillinux sqlite cppunit + libcap + ostree + rpm + glib + systemd + polkit + bubblewrap + json-glib + libarchive + libsolv + librepo + pcre + check + python + # libdnf + json_c + zchunk + libmodulemd_1 + utillinux + sqlite + cppunit ]; configureFlags = [ @@ -60,7 +114,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { 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; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch b/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch deleted file mode 100644 index b82ad5b24b5c..000000000000 --- a/pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -103,7 +103,7 @@ - ostree-1 >= 2018.9 - libsystemd - polkit-gobject-1 -- rpm librepo libsolv -+ rpm librepo libsolv libcurl - libarchive]) - - dnl -ldl: https://github.com/ostreedev/ostree/commit/1f832597fc83fda6cb8daf48c4495a9e1590774c |