diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/jdiskreport/builder.sh | 15 | ||||
-rw-r--r-- | pkgs/tools/misc/jdiskreport/default.nix | 41 | ||||
-rw-r--r-- | pkgs/tools/misc/lazydocker/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/opencorsairlink/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch | 41 | ||||
-rw-r--r-- | pkgs/tools/misc/ostree/default.nix | 105 | ||||
-rw-r--r-- | pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/ostree/fix-test-paths.patch | 26 | ||||
-rw-r--r-- | pkgs/tools/misc/pandoc-imagine/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/rpm-ostree/default.nix | 112 | ||||
-rw-r--r-- | pkgs/tools/misc/rpm-ostree/fix-introspection-build.patch | 11 |
11 files changed, 283 insertions, 116 deletions
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh deleted file mode 100644 index f95dafedd32a..000000000000 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -unzip $src - -jar=$(ls */*.jar) - -mkdir -p $out/share/java -mv $jar $out/share/java - -mkdir -p $out/bin -cat > $out/bin/jdiskreport <<EOF -#! $SHELL -e -exec $jre/bin/java -jar $out/share/java/$(basename $jar) -EOF -chmod +x $out/bin/jdiskreport diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index b1d71a892d6f..6b1c0d735eed 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,22 +1,51 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, fetchurl, unzip, jre, makeDesktopItem }: +let + desktopItem = makeDesktopItem { + desktopName = "JDiskReport"; + genericName = "A graphical utility to visualize disk usage"; + categories = "Utility;"; + exec = "jdiskreport"; + name = "jdiskreport"; + type = "Application"; + }; +in stdenv.mkDerivation { name = "jdiskreport-1.4.1"; - builder = ./builder.sh; - src = fetchurl { url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip; sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; buildInputs = [ unzip ]; - inherit jre; - meta = { + installPhase = '' + source $stdenv/setup + + unzip $src + + jar=$(ls */*.jar) + + mkdir -p $out/share/java + mv $jar $out/share/java + + mkdir -p $out/bin + cat > $out/bin/jdiskreport <<EOF + #! $SHELL -e + exec $jre/bin/java -jar $out/share/java/$(basename $jar) + EOF + chmod +x $out/bin/jdiskreport + + ${desktopItem.buildCommand} + ''; + + meta = with stdenv.lib; { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = stdenv.lib.licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 + license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ kylesferrazza ]; }; } diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 96c13010fac2..b63892178d91 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "lazydocker"; - version = "0.7.6"; + version = "0.8"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "1sp5f9lkysqkyhd6gvrlpszrih78bj67yidkkd6azv9ianrndx0b"; + sha256 = "02x03nmkbj0133bziaqmqlh3x515w3n01iqvg7q6b55r7nan7hv7"; }; goPackagePath = "github.com/jesseduffield/lazydocker"; diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix new file mode 100644 index 000000000000..11df20b3b827 --- /dev/null +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, libusb1, pkgconfig }: + +stdenv.mkDerivation rec { + name = "OpenCorsairLink-${version}"; + version = "2019-12-23"; + + buildInputs = [ libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + src = fetchFromGitHub { + owner = "audiohacked"; + repo = "OpenCorsairLink"; + rev = "46dbf206e19a40d6de6bd73142ed93bdb26c5c1a"; + sha256 = "1nizicl0mc9pslc6065mnrs0fnn8sh7ca8iiw7w9ix57zrhabpld"; + }; + + meta = with stdenv.lib; { + description = "Linux and Mac OS support for the CorsairLink Devices "; + homepage = "https://github.com/audiohacked/OpenCorsairLink"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + }; +} diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch index 9c334436162b..a6b7af5f1c79 100644 --- a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch +++ b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch @@ -1,4 +1,4 @@ -From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001 +From 977fdfad2ceba7232b4f78144b20640d7fd0aedb Mon Sep 17 00:00:00 2001 From: Colin Walters <walters@verbum.org> Date: Tue, 19 Jun 2018 09:34:18 -0400 Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory @@ -13,22 +13,22 @@ Also at this point nothing should depend on `ostree trivial-httpd`. Makefile-man.am | 6 -- Makefile-ostree.am | 7 --- Makefile-tests.am | 7 +++ - configure.ac | 10 --- + configure.ac | 9 --- man/ostree-trivial-httpd.xml | 118 ----------------------------------- src/ostree/main.c | 5 -- tests/libtest.sh | 13 ++-- - 7 files changed, 12 insertions(+), 154 deletions(-) + 7 files changed, 12 insertions(+), 153 deletions(-) delete mode 100644 man/ostree-trivial-httpd.xml diff --git a/Makefile-man.am b/Makefile-man.am -index 8ccbba8c..d204aa3e 100644 +index bc58103b..bcfde285 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ ostree-static-delta.1 --if BUILDOPT_TRIVIAL_HTTPD +-if USE_LIBSOUP -man1_files += ostree-trivial-httpd.1 -else -# We still want to distribute the source, even if we are not building it @@ -38,10 +38,10 @@ index 8ccbba8c..d204aa3e 100644 if BUILDOPT_FUSE man1_files += rofiles-fuse.1 diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index 8d352e38..1471b3e5 100644 +index f861afe4..497d99b0 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am -@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c +@@ -144,13 +144,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c endif if USE_LIBSOUP @@ -56,12 +56,12 @@ index 8d352e38..1471b3e5 100644 # This is necessary for the cookie jar bits ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) diff --git a/Makefile-tests.am b/Makefile-tests.am -index 2c0916f6..b11fde89 100644 +index fc2f2d91..7343b63f 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am -@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u - tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ - tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h +@@ -263,6 +263,13 @@ _installed_or_uninstalled_test_programs += \ + $(NULL) + endif +if USE_LIBSOUP +test_extra_programs += ostree-trivial-httpd @@ -74,10 +74,10 @@ index 2c0916f6..b11fde89 100644 test_programs += tests/test-repo-finder-avahi endif diff --git a/configure.ac b/configure.ac -index e6e145db..1e36e6a0 100644 +index 46a900f5..2f91cdec 100644 --- a/configure.ac +++ b/configure.ac -@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi +@@ -190,14 +190,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) @@ -85,15 +85,14 @@ index e6e145db..1e36e6a0 100644 - [AS_HELP_STRING([--enable-trivial-httpd-cmdline], - [Continue to support "ostree trivial-httpd" [default=no]])],, - enable_trivial_httpd_cmdline=no) --AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) --AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, +-AS_IF([test x$enable_trivial_httpd_cmdline = xyes], - [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] -) - AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) ]) -@@ -602,7 +593,6 @@ echo " +@@ -617,7 +609,6 @@ echo " Rust (internal oxidation): $rust_debug_release rofiles-fuse: $enable_rofiles_fuse HTTP backend: $fetcher_backend @@ -226,10 +225,10 @@ index d03c12be..00000000 - </refsect1> -</refentry> diff --git a/src/ostree/main.c b/src/ostree/main.c -index c5b45012..6478a62b 100644 +index a523ff9a..61ea742d 100644 --- a/src/ostree/main.c +++ b/src/ostree/main.c -@@ -116,11 +116,6 @@ static OstreeCommand commands[] = { +@@ -118,11 +118,6 @@ static OstreeCommand commands[] = { { "summary", OSTREE_BUILTIN_FLAG_NONE, ostree_builtin_summary, "Manage summary metadata" }, @@ -242,10 +241,10 @@ index c5b45012..6478a62b 100644 }; diff --git a/tests/libtest.sh b/tests/libtest.sh -index e0022512..b07dc962 100755 +index 3f5fd931..eacd96de 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -149,15 +149,12 @@ fi +@@ -160,15 +160,12 @@ fi if test -n "${OSTREE_UNINSTALLED:-}"; then OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd else @@ -267,5 +266,5 @@ index e0022512..b07dc962 100755 files_are_hardlinked() { -- -2.22.0 +2.25.0 diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 8ec9fc1d4886..4bc690bc45fd 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,40 +1,105 @@ -{ 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 +, substituteAll +, pkgconfig +, gtk-doc +, gobject-introspection +, gjs +, nixosTests +, glib +, systemd +, xz +, e2fsprogs +, libsoup +, gpgme +, which +, makeWrapper +, autoconf +, automake +, libtool +, fuse +, utillinuxMinimal +, libselinux +, libarchive +, libcap +, bzip2 +, yacc +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, python3 }: -stdenv.mkDerivation rec { +let + testPython = (python3.withPackages (p: with p; [ + pyyaml + ])); +in stdenv.mkDerivation rec { pname = "ostree"; - version = "2019.2"; + version = "2019.6"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y"; + sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl"; }; 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 + # Patch from https://github.com/ostreedev/ostree/pull/1633 ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch + + # Fix tests running in Catalan instead of C locale. + (fetchpatch { + url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch"; + sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8"; + }) + + # Workarounds for https://github.com/ostreedev/ostree/issues/1592 + ./fix-1592.patch + + # Hard-code paths in tests + (substituteAll { + src = ./fix-test-paths.patch; + python3 = testPython.interpreter; + }) ]; 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 + makeWrapper + 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 + testPython + gjs ]; preConfigure = '' @@ -54,6 +119,12 @@ stdenv.mkDerivation rec { "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree" ]; + postFixup = '' + for test in $installedTests/libexec/installed-tests/libostree/*.js; do + wrapProgram "$test" --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" + done + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.ostree; @@ -62,7 +133,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 ]; diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch deleted file mode 100644 index 8da2fb82dd0e..000000000000 --- a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile-tests.am b/Makefile-tests.am -index b11fde89..82937a67 100644 ---- a/Makefile-tests.am -+++ b/Makefile-tests.am -@@ -245,7 +245,6 @@ endif - - _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ - tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ -- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ - tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h - - if USE_LIBSOUP diff --git a/pkgs/tools/misc/ostree/fix-test-paths.patch b/pkgs/tools/misc/ostree/fix-test-paths.patch new file mode 100644 index 000000000000..cf94b33f31c9 --- /dev/null +++ b/pkgs/tools/misc/ostree/fix-test-paths.patch @@ -0,0 +1,26 @@ +diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh +index f65094fd..105be893 100755 +--- a/tests/test-basic-user-only.sh ++++ b/tests/test-basic-user-only.sh +@@ -29,7 +29,7 @@ extra_basic_tests=5 + . $(dirname $0)/basic-test.sh + + $CMD_PREFIX ostree --version > version.yaml +-python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))' ++@python3@ -c 'import yaml; yaml.safe_load(open("version.yaml"))' + echo "ok yaml version" + + # Reset things so we don't inherit a lot of state from earlier tests +diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh +index a41d087a..77b34c90 100755 +--- a/tests/test-remote-headers.sh ++++ b/tests/test-remote-headers.sh +@@ -26,7 +26,7 @@ echo '1..2' + . $(dirname $0)/libtest.sh + + V=$($CMD_PREFIX ostree --version | \ +- python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') ++ @python3@ -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])') + + setup_fake_remote_repo1 "archive" "" \ + --expected-header foo=bar \ diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix index 811e44a6ce8e..67e27da960fc 100644 --- a/pkgs/tools/misc/pandoc-imagine/default.nix +++ b/pkgs/tools/misc/pandoc-imagine/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pandoc-imagine"; - version = "unstable-2018-11-19"; + version = "0.1.6"; src = fetchFromGitHub { repo = "imagine"; owner = "hertogp"; - rev = "cc9be85155666c2d12d47a71690ba618cea1fac2"; - sha256 = "0iksh9081g488yfjzd24bz4lm1nrrjamph1vynx3imrcfgyq7nsb"; + rev = version; + sha256 = "1wpnckc7qyrf6ga5xhr6gv38k1anpy9nx888n7n3rh6nixzcz2dw"; }; propagatedBuildInputs = [ pandocfilters six ]; 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 |