git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65291 from worldofpeace/xdg-updates

Flatpak updates

commit4f3e9ca93a91626256d1b1edae005288704c8225 authorworldofpeace <worldofpeace@protonmail.ch> dateSun 18 Aug 2019, 04:23 (7 years ago) parent8ed485cce0511e
22 files changed+606−89
nixos/modules/services/desktops/flatpak.nix+11 pkgs/development/libraries/flatpak/bubblewrap-paths.patch+2−2 pkgs/development/libraries/flatpak/default.nix+4−4 pkgs/development/libraries/flatpak/fix-paths.patch+4−2 pkgs/development/libraries/flatpak/fix-test-paths.patch+18−11 pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch+3−1 pkgs/development/libraries/flatpak/unset-env-vars.patch+3−1 pkgs/development/libraries/flatpak/use-flatpak-from-path.patch+12−10 pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch+2−2 pkgs/development/libraries/libmodulemd/1.nix+21 pkgs/development/libraries/libmodulemd/default.nix+59 pkgs/development/libraries/libmodulemd/dont-check-docs.patch+29 pkgs/development/libraries/libmodulemd/pygobject-dir.patch+45 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix+26−5 pkgs/development/libraries/xdg-desktop-portal/default.nix+4−4 pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch+11−9 pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch+271 pkgs/tools/misc/ostree/default.nix+3−6 pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch+6−6 pkgs/tools/misc/ostree/fix-1592.patch+64−23 pkgs/tools/misc/rpm-ostree/default.nix+5−3 pkgs/top-level/all-packages.nix+3
nixos/modules/services/desktops/flatpak.nix+11
@@ -38,5 +38,16 @@ in {
3838 "$HOME/.local/share/flatpak/exports"
3939 "/var/lib/flatpak/exports"
4040 ];
41+
42+ # It has been possible since https://github.com/flatpak/flatpak/releases/tag/1.3.2
43+ # to build a SELinux policy module.
44+
45+ users.users.flatpak = {
46+ description = "Flatpak system helper";
47+ group = "flatpak";
48+ isSystemUser = true;
49+ };
50+
51+ users.groups.flatpak = { };
4152 };
4253}
pkgs/development/libraries/flatpak/bubblewrap-paths.patch+2−2
@@ -1,8 +1,8 @@
11diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
2−index 6e23d9f2..8c621ec4 100644
2+index 9e885070..d02eeb8c 100644
33--- a/icon-validator/validate-icon.c
44+++ b/icon-validator/validate-icon.c
5−@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width,
5+@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width,
66 "--unshare-ipc",
77 "--unshare-net",
88 "--unshare-pid",
pkgs/development/libraries/flatpak/default.nix+4−4
@@ -1,18 +1,18 @@
11{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
22, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
3−, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme
3+, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse
44, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
55
66stdenv.mkDerivation rec {
77 pname = "flatpak";
8− version = "1.2.4";
8+ version = "1.4.2";
99
1010 # TODO: split out lib once we figure out what to do with triggerdir
1111 outputs = [ "out" "man" "doc" "installedTests" ];
1212
1313 src = fetchurl {
1414 url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
15− sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v";
15+ sha256 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj";
1616 };
1717
1818 patches = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343
4444 buildInputs = [
4545 bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
46− libsoup lzma ostree polkit python3 systemd xorg.libXau
46+ libsoup lzma ostree polkit python3 systemd xorg.libXau fuse
4747 gsettings-desktop-schemas glib-networking
4848 librsvg # for flatpak-validate-icon
4949 ];
pkgs/development/libraries/flatpak/fix-paths.patch+4−2
@@ -1,6 +1,8 @@
1+diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
2+index 5dd7629e..ddc71a4c 100644
13--- a/session-helper/flatpak-session-helper.c
24+++ b/session-helper/flatpak-session-helper.c
3−@@ -624,7 +624,7 @@
5+@@ -693,7 +693,7 @@ start_p11_kit_server (const char *flatpak_dir)
46 g_auto(GStrv) stdout_lines = NULL;
57 int i;
68 char *p11_argv[] = {
@@ -9,7 +11,7 @@
911 /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
1012 * this flag. This is good, because those earlier versions did not properly daemonize and caused
1113 * the spawn_sync to hang forever, waiting for the pipe to close.
12−@@ -770,7 +770,7 @@
14+@@ -836,7 +836,7 @@ main (int argc,
1315 exit (1);
1416 }
1517
pkgs/development/libraries/flatpak/fix-test-paths.patch+18−11
@@ -1,6 +1,8 @@
1+diff --git a/tests/libtest.sh b/tests/libtest.sh
2+index 46bcefb3..0134425e 100644
13--- a/tests/libtest.sh
24+++ b/tests/libtest.sh
3−@@ -328,7 +328,7 @@
5+@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then
46 # running installed-tests: assume we know what we're doing
57 _flatpak_bwrap_works=true
68 elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@@ -9,7 +11,7 @@
911 _flatpak_bwrap_works=false
1012 else
1113 _flatpak_bwrap_works=true
12−@@ -309,12 +309,12 @@
14+@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \
1315 export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
1416 DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
1517
@@ -24,9 +26,11 @@
2426 gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
2527 fusermount -u $XDG_RUNTIME_DIR/doc || :
2628 if test -n "${TEST_SKIP_CLEANUP:-}"; then
29+diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
30+index 0a0a28f1..16fd51fe 100755
2731--- a/tests/make-test-app.sh
2832+++ b/tests/make-test-app.sh
29−@@ -114,13 +114,13 @@ msgid "Hello world"
33+@@ -129,13 +129,13 @@ msgid "Hello world"
3034 msgstr "Hallo Welt"
3135 EOF
3236 mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
@@ -42,9 +46,11 @@
4246
4347 flatpak build-finish ${DIR}
4448 mkdir -p repos
49+diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
50+index 57899b75..9236996f 100755
4551--- a/tests/make-test-runtime.sh
4652+++ b/tests/make-test-runtime.sh
47−@@ -26,6 +26,7 @@
53+@@ -28,6 +28,7 @@ EOF
4854 PATH="$PATH:/usr/sbin:/sbin"
4955
5056 # Add bash and dependencies
@@ -52,7 +58,7 @@
5258 mkdir -p ${DIR}/usr/bin
5359 mkdir -p ${DIR}/usr/lib
5460 ln -s ../lib ${DIR}/usr/lib64
55−@@ -35,48 +36,27 @@
61+@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then
5662 else
5763 cp `which ldconfig` ${DIR}/usr/bin
5864 fi
@@ -105,21 +111,20 @@
105111-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
106112-# the real en_US locale is often not available, because its in the
107113-# local archive.
114+-mkdir -p ${DIR}/usr/lib/locale/
115+-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
108116+mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
109117+chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
110118+find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
111119+find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets
112−+
113−+# We copy the whole locale archive because we do not have C.UTF8 locale
114− mkdir -p ${DIR}/usr/lib/locale/
115−-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
116−+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive
117120
118121 if [ x$COLLECTION_ID != x ]; then
119122 collection_args=--collection-id=${COLLECTION_ID}
123+diff --git a/tests/testlibrary.c b/tests/testlibrary.c
124+index f2773dc8..3af9026f 100644
120125--- a/tests/testlibrary.c
121126+++ b/tests/testlibrary.c
122−@@ -584,7 +584,7 @@
127+@@ -1053,7 +1053,7 @@ check_bwrap_support (void)
123128 {
124129 gint exit_code = 0;
125130 char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net",
@@ -128,6 +133,8 @@
128133 g_autofree char *argv_str = g_strjoinv (" ", argv);
129134 g_test_message ("Spawning %s", argv_str);
130135 g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
136+diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger
137+index 711cfab2..10c220ec 100755
131138--- a/triggers/gtk-icon-cache.trigger
132139+++ b/triggers/gtk-icon-cache.trigger
133140@@ -1,7 +1,7 @@
pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch+3−1
@@ -1,6 +1,8 @@
1+diff --git a/acinclude.m4 b/acinclude.m4
2+index 92ec3985..b3fccf1d 100644
13--- a/acinclude.m4
24+++ b/acinclude.m4
3−@@ -40,8 +40,8 @@
5+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
46 [
57 AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
68 AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
pkgs/development/libraries/flatpak/unset-env-vars.patch+3−1
@@ -1,6 +1,8 @@
1+diff --git a/common/flatpak-run.c b/common/flatpak-run.c
2+index 8d52d3a5..81700183 100644
13--- a/common/flatpak-run.c
24+++ b/common/flatpak-run.c
3−@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = {
5+@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = {
46 {"PERLLIB", NULL},
57 {"PERL5LIB", NULL},
68 {"XCURSOR_PATH", NULL},
pkgs/development/libraries/flatpak/use-flatpak-from-path.patch+12−10
@@ -1,6 +1,8 @@
1+diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
2+index 8f9dc66c..d3ab6e5f 100644
13--- a/common/flatpak-dir.c
24+++ b/common/flatpak-dir.c
3−@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app,
5+@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app,
46
57 new_exec = g_string_new ("");
68 g_string_append_printf (new_exec,
@@ -9,7 +11,7 @@
911 escaped_branch,
1012 escaped_arch);
1113
12−@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self,
14+@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self,
1315 error))
1416 return FALSE;
1517
@@ -21,28 +23,28 @@
2123 G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error))
2224 return FALSE;
2325diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh
24−index 6937b041..01f8add7 100755
26+index dff17f33..a9857adc 100755
2527--- a/tests/test-bundle.sh
2628+++ b/tests/test-bundle.sh
2729@@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files
2830 assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export
2931 assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
3032 # Ensure Exec key is rewritten
31−-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
32−+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
33+-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
34++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
3335 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
3436 assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png
3537
3638diff --git a/tests/test-run.sh b/tests/test-run.sh
37−index 9d83d82e..234e4ec6 100755
39+index 233df9ad..76e0b23b 100644
3840--- a/tests/test-run.sh
3941+++ b/tests/test-run.sh
40−@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files
41− assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export
42+@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files
43+ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export
4244 assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
4345 # Ensure Exec key is rewritten
44−-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
45−+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
46+-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
47++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
4648 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
4749 assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png
4850 assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png
pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch+2−2
@@ -1,8 +1,8 @@
11diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
2−index 6e23d9f2..f0659a78 100644
2+index 9e885070..44fea035 100644
33--- a/icon-validator/validate-icon.c
44+++ b/icon-validator/validate-icon.c
5−@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width,
5+@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width,
66 add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL);
77 if (g_getenv ("G_MESSAGES_PREFIXED"))
88 add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);
pkgs/development/libraries/libmodulemd/1.nixnew file+21
@@ -0,0 +1,21 @@
1+{ libmodulemd, fetchurl }:
2+
3+libmodulemd.overrideAttrs(old: rec {
4+ name = "libmodulemd-${version}";
5+ version = "1.8.15";
6+
7+ # Removes py output since there's no overrides here
8+ outputs = [ "out" "devdoc" ];
9+
10+ patches = [
11+ # Checks for glib docs in glib's prefix
12+ # but they're installed to another
13+ ./dont-check-docs.patch
14+ ];
15+
16+ src = fetchurl {
17+ url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz";
18+ sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z";
19+ };
20+
21+})
pkgs/development/libraries/libmodulemd/default.nixnew file+59
@@ -0,0 +1,59 @@
1+{ stdenv
2+, fetchFromGitHub
3+, pkgconfig
4+, meson
5+, ninja
6+, gobject-introspection
7+, python3
8+, libyaml
9+, gtk-doc
10+, docbook_xsl
11+, docbook_xml_dtd_412
12+, glib
13+}:
14+
15+stdenv.mkDerivation rec {
16+ pname = "libmodulemd";
17+ version = "2.6.0";
18+
19+ outputs = [ "out" "devdoc" "py" ];
20+
21+ src = fetchFromGitHub {
22+ owner = "fedora-modularity";
23+ repo = pname;
24+ rev = "${pname}-${version}";
25+ sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i";
26+ };
27+
28+ patches = [
29+ ./pygobject-dir.patch
30+ ];
31+
32+ nativeBuildInputs = [
33+ pkgconfig
34+ meson
35+ ninja
36+ gtk-doc
37+ docbook_xsl
38+ docbook_xml_dtd_412
39+ gobject-introspection
40+ ];
41+
42+ buildInputs = [
43+ libyaml
44+ glib
45+ ];
46+
47+ mesonFlags = [
48+ "-Ddeveloper_build=false"
49+ "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
50+ ];
51+
52+ meta = with stdenv.lib; {
53+ description = "C Library for manipulating module metadata files";
54+ homepage = "https://github.com/fedora-modularity/libmodulemd";
55+ license = licenses.mit;
56+ maintainers = with maintainers; [ ];
57+ platforms = platforms.linux;
58+ };
59+}
pkgs/development/libraries/libmodulemd/dont-check-docs.patchnew file+29
@@ -0,0 +1,29 @@
1+diff --git a/meson.build b/meson.build
2+index 155c9e7..9125372 100644
3+--- a/meson.build
4++++ b/meson.build
5+@@ -60,15 +60,15 @@ sh = find_program('sh')
6+ sed = find_program('sed')
7+ test = find_program('test')
8+
9+-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
10+-if ret.returncode() != 0
11+- error('Missing documentation for GLib.')
12+-endif
13+-
14+-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
15+-if ret.returncode() != 0
16+- error('Missing documentation for GObject.')
17+-endif
18++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
19++# if ret.returncode() != 0
20++# error('Missing documentation for GLib.')
21++# endif
22++
23++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
24++# if ret.returncode() != 0
25++# error('Missing documentation for GObject.')
26++# endif
27+
28+ python_name = get_option('python_name')
29+
pkgs/development/libraries/libmodulemd/pygobject-dir.patchnew file+45
@@ -0,0 +1,45 @@
1+diff --git a/bindings/python/meson.build b/bindings/python/meson.build
2+index 4358b79..61fd5a5 100644
3+--- a/bindings/python/meson.build
4++++ b/bindings/python/meson.build
5+@@ -1,3 +1,5 @@
6++pygobject_override_dir = get_option('pygobject_override_dir')
7++
8+ get_overridedir = '''
9+ import os
10+ import sysconfig
11+@@ -21,7 +23,7 @@ print(overridedir)
12+ '''
13+
14+ # Python 3
15+-if (get_option('with_py3_overrides'))
16++if (get_option('with_py3_overrides')) and pygobject_override_dir == ''
17+ ret = run_command([python3, '-c', get_overridedir])
18+
19+ if ret.returncode() != 0
20+@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides'))
21+ endif
22+
23+ # Python 2
24+-if (get_option('with_py2_overrides'))
25++if (get_option('with_py2_overrides')) and pygobject_override_dir == ''
26+ ret2 = run_command([python2, '-c', get_overridedir])
27+
28+ if ret2.returncode() != 0
29+@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides'))
30+
31+ install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir)
32+ endif
33++
34++if pygobject_override_dir != ''
35++ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir)
36++endif
37+diff --git a/meson_options.txt b/meson_options.txt
38+index 147419f..9071a04 100644
39+--- a/meson_options.txt
40++++ b/meson_options.txt
41+@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false)
42+ option('python_name', type : 'string')
43+ option('with_py2_overrides', type : 'boolean', value : false)
44+ option('with_py3_overrides', type : 'boolean', value : true)
45++option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory')
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix+26−5
@@ -1,18 +1,39 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }:
1+{ stdenv
2+, fetchFromGitHub
3+, autoreconfHook
4+, pkgconfig
5+, libxml2
6+, xdg-desktop-portal
7+, gtk3
8+, glib
9+, wrapGAppsHook
10+, gsettings-desktop-schemas
11+}:
212
313stdenv.mkDerivation rec {
414 pname = "xdg-desktop-portal-gtk";
5− version = "1.2.0";
15+ version = "1.4.0";
616
717 src = fetchFromGitHub {
818 owner = "flatpak";
919 repo = pname;
1020 rev = version;
11− sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j";
21+ sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap";
1222 };
1323
14− nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ];
15− buildInputs = [ glib gtk3 gsettings-desktop-schemas ];
24+ nativeBuildInputs = [
25+ autoreconfHook
26+ libxml2
27+ pkgconfig
28+ wrapGAppsHook
29+ xdg-desktop-portal
30+ ];
31+
32+ buildInputs = [
33+ glib
34+ gsettings-desktop-schemas
35+ gtk3
36+ ];
1637
1738 meta = with stdenv.lib; {
1839 description = "Desktop integration portals for sandboxed apps";
pkgs/development/libraries/xdg-desktop-portal/default.nix+4−4
@@ -1,8 +1,8 @@
1−{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, wrapGAppsHook }:
1+{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "xdg-desktop-portal";
5− version = "1.2.0";
5+ version = "1.4.2";
66
77 outputs = [ "out" "installedTests" ];
88
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 owner = "flatpak";
1111 repo = pname;
1212 rev = version;
13− sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71";
13+ sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6";
1414 };
1515
1616 patches = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 ];
2323
2424 nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ];
25− buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas ];
25+ buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ];
2626
2727 doCheck = true; # XXX: investigate!
2828
pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch+11−9
@@ -1,10 +1,12 @@
1−--- a/src/xdg-desktop-portal.c
2−+++ b/src/xdg-desktop-portal.c
3−@@ -177,38 +177,50 @@
4− static void
5− load_installed_portals (void)
1+diff --git a/src/portal-impl.c b/src/portal-impl.c
2+index 4fd48ff..346da7c 100644
3+--- a/src/portal-impl.c
4++++ b/src/portal-impl.c
5+@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a,
6+ void
7+ load_installed_portals (gboolean opt_verbose)
68 {
7−- const char *portal_dir = PKGDATADIR "/portals";
9+- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals";
810- g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);
911- g_autoptr(GFileEnumerator) enumerator = NULL;
1012
@@ -14,7 +16,7 @@
1416+ const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH");
1517+
1618+ if (portal_dir == NULL)
17−+ portal_dir = PKGDATADIR "/portals";
19++ portal_dir = DATADIR "/portals";
1820
1921- if (enumerator == NULL)
2022- return;
@@ -56,7 +58,7 @@
5658- path = g_file_get_path (child);
5759+ name = g_file_info_get_name (info);
5860
59−- if (!register_portal (path, &error))
61+- if (!register_portal (path, opt_verbose, &error))
6062- {
6163- g_warning ("Error loading %s: %s", path, error->message);
6264- continue;
@@ -66,7 +68,7 @@
6668+ child = g_file_enumerator_get_child (enumerator, info);
6769+ path = g_file_get_path (child);
6870+
69−+ if (!register_portal (path, &error))
71++ if (!register_portal (path, opt_verbose, &error))
7072+ {
7173+ g_warning ("Error loading %s: %s", path, error->message);
7274+ continue;
pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patchnew file+271
@@ -0,0 +1,271 @@
1+From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001
2+From: Colin Walters <walters@verbum.org>
3+Date: Tue, 19 Jun 2018 09:34:18 -0400
4+Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory
5+
6+See https://github.com/ostreedev/ostree/issues/1593
7+
8+Basically this makes it easier for people packaging, as the trivial-httpd
9+is only for tests, and this way the binary will live with the tests.
10+
11+Also at this point nothing should depend on `ostree trivial-httpd`.
12+---
13+ Makefile-man.am | 6 --
14+ Makefile-ostree.am | 7 ---
15+ Makefile-tests.am | 7 +++
16+ configure.ac | 10 ---
17+ man/ostree-trivial-httpd.xml | 118 -----------------------------------
18+ src/ostree/main.c | 5 --
19+ tests/libtest.sh | 13 ++--
20+ 7 files changed, 12 insertions(+), 154 deletions(-)
21+ delete mode 100644 man/ostree-trivial-httpd.xml
22+
23+diff --git a/Makefile-man.am b/Makefile-man.am
24+index 8ccbba8c..d204aa3e 100644
25+--- a/Makefile-man.am
26++++ b/Makefile-man.am
27+@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \
28+ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \
29+ ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \
30+ ostree-static-delta.1
31+-if BUILDOPT_TRIVIAL_HTTPD
32+-man1_files += ostree-trivial-httpd.1
33+-else
34+-# We still want to distribute the source, even if we are not building it
35+-EXTRA_DIST += man/ostree-trivial-httpd.xml
36+-endif
37+
38+ if BUILDOPT_FUSE
39+ man1_files += rofiles-fuse.1
40+diff --git a/Makefile-ostree.am b/Makefile-ostree.am
41+index 8d352e38..1471b3e5 100644
42+--- a/Makefile-ostree.am
43++++ b/Makefile-ostree.am
44+@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
45+ endif
46+
47+ if USE_LIBSOUP
48+-# Eventually once we stop things from using this, we should support disabling this
49+-ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c
50+-pkglibexec_PROGRAMS += ostree-trivial-httpd
51+-ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
52+-ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
53+-ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS)
54+-
55+ if !USE_CURL
56+ # This is necessary for the cookie jar bits
57+ ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
58+diff --git a/Makefile-tests.am b/Makefile-tests.am
59+index 2c0916f6..b11fde89 100644
60+--- a/Makefile-tests.am
61++++ b/Makefile-tests.am
62+@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u
63+ tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
64+ tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
65+
66++if USE_LIBSOUP
67++test_extra_programs += ostree-trivial-httpd
68++ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
69++ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
70++ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS)
71++endif
72++
73+ if USE_AVAHI
74+ test_programs += tests/test-repo-finder-avahi
75+ endif
76+diff --git a/configure.ac b/configure.ac
77+index e6e145db..1e36e6a0 100644
78+--- a/configure.ac
79++++ b/configure.ac
80+@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
81+ AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
82+ AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes)
83+
84+-AC_ARG_ENABLE(trivial-httpd-cmdline,
85+- [AS_HELP_STRING([--enable-trivial-httpd-cmdline],
86+- [Continue to support "ostree trivial-httpd" [default=no]])],,
87+- enable_trivial_httpd_cmdline=no)
88+-AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes)
89+-AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
90+- [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
91+-)
92+-
93+ AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
94+ AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)])
95+ ])
96+@@ -602,7 +593,6 @@ echo "
97+ Rust (internal oxidation): $rust_debug_release
98+ rofiles-fuse: $enable_rofiles_fuse
99+ HTTP backend: $fetcher_backend
100+- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline
101+ SELinux: $with_selinux
102+ cryptographic checksums: $with_crypto
103+ systemd: $have_libsystemd
104+diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml
105+deleted file mode 100644
106+index d03c12be..00000000
107+--- a/man/ostree-trivial-httpd.xml
108++++ /dev/null
109+@@ -1,118 +0,0 @@
110+-<?xml version='1.0'?> <!--*-nxml-*-->
111+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
112+- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
113+-
114+-<!--
115+-Copyright 2011,2013 Colin Walters <walters@verbum.org>
116+-
117+-SPDX-License-Identifier: LGPL-2.0+
118+-
119+-This library is free software; you can redistribute it and/or
120+-modify it under the terms of the GNU Lesser General Public
121+-License as published by the Free Software Foundation; either
122+-version 2 of the License, or (at your option) any later version.
123+-
124+-This library is distributed in the hope that it will be useful,
125+-but WITHOUT ANY WARRANTY; without even the implied warranty of
126+-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
127+-Lesser General Public License for more details.
128+-
129+-You should have received a copy of the GNU Lesser General Public
130+-License along with this library; if not, write to the
131+-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
132+-Boston, MA 02111-1307, USA.
133+--->
134+-
135+-<refentry id="ostree">
136+-
137+- <refentryinfo>
138+- <title>ostree trivial-httpd</title>
139+- <productname>OSTree</productname>
140+-
141+- <authorgroup>
142+- <author>
143+- <contrib>Developer</contrib>
144+- <firstname>Colin</firstname>
145+- <surname>Walters</surname>
146+- <email>walters@verbum.org</email>
147+- </author>
148+- </authorgroup>
149+- </refentryinfo>
150+-
151+- <refmeta>
152+- <refentrytitle>ostree trivial-httpd</refentrytitle>
153+- <manvolnum>1</manvolnum>
154+- </refmeta>
155+-
156+- <refnamediv>
157+- <refname>ostree-trivial-httpd</refname>
158+- <refpurpose>Simple webserver</refpurpose>
159+- </refnamediv>
160+-
161+- <refsynopsisdiv>
162+- <cmdsynopsis>
163+- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
164+- </cmdsynopsis>
165+- </refsynopsisdiv>
166+-
167+-<!-- Don't entirely understand this command. Needs details, better content-->
168+- <refsect1>
169+- <title>Description</title>
170+-
171+- <para>
172+- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory.
173+- </para>
174+- </refsect1>
175+-
176+- <refsect1>
177+- <title>Options</title>
178+-
179+- <variablelist>
180+- <varlistentry>
181+- <term><option>--daemonize</option>,<option>-d</option></term>
182+-
183+- <listitem><para>
184+- Fork into background when ready.
185+- </para></listitem>
186+- </varlistentry>
187+-
188+- <varlistentry>
189+- <term><option>--autoexit</option></term>
190+-
191+- <listitem><para>
192+- Automatically exit when directory is deleted.
193+- </para></listitem>
194+- </varlistentry>
195+-
196+- <varlistentry>
197+- <term><option>--port-file</option>,<option>-p</option>="PATH"</term>
198+-
199+- <listitem><para>
200+- Write port number to PATH (- for standard output).
201+- </para></listitem>
202+- </varlistentry>
203+-
204+- <varlistentry>
205+- <term><option>--port</option>,<option>-P</option></term>
206+-
207+- <listitem><para>
208+- Use the specified TCP port to listen on.
209+- </para></listitem>
210+- </varlistentry>
211+-
212+- <varlistentry>
213+- <term><option>--force-range-requests</option></term>
214+-
215+- <listitem><para>
216+- Force range requests by only serving half of files.
217+- </para></listitem>
218+- </varlistentry>
219+- </variablelist>
220+- </refsect1>
221+-
222+-<!-- NEED EXAMPLE OUTPUT HERE!-->
223+- <refsect1>
224+- <title>Example</title>
225+- <para><command>$ ostree trivial-httpd</command></para>
226+- </refsect1>
227+-</refentry>
228+diff --git a/src/ostree/main.c b/src/ostree/main.c
229+index c5b45012..6478a62b 100644
230+--- a/src/ostree/main.c
231++++ b/src/ostree/main.c
232+@@ -116,11 +116,6 @@ static OstreeCommand commands[] = {
233+ { "summary", OSTREE_BUILTIN_FLAG_NONE,
234+ ostree_builtin_summary,
235+ "Manage summary metadata" },
236+-#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE)
237+- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE,
238+- ostree_builtin_trivial_httpd,
239+- NULL },
240+-#endif
241+ { NULL }
242+ };
243+
244+diff --git a/tests/libtest.sh b/tests/libtest.sh
245+index e0022512..b07dc962 100755
246+--- a/tests/libtest.sh
247++++ b/tests/libtest.sh
248+@@ -149,15 +149,12 @@ fi
249+ if test -n "${OSTREE_UNINSTALLED:-}"; then
250+ OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd
251+ else
252+- # trivial-httpd is now in $libexecdir by default, which we don't
253+- # know at this point. Fortunately, libtest.sh is also in
254+- # $libexecdir, so make an educated guess. If it's not found, assume
255+- # it's still runnable as "ostree trivial-httpd".
256+- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then
257+- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd"
258+- else
259+- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd"
260++ # trivial-httpd is now the test directory.
261++ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd"
262++ if ! [ -x "${OSTREE_HTTPD}" ]; then
263++ fatal "Failed to find ${OSTREE_HTTPD}"
264+ fi
265++ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}"
266+ fi
267+
268+ files_are_hardlinked() {
269+--
270+2.22.0
271+
pkgs/tools/misc/ostree/default.nix+3−6
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "ostree";
8− version = "2019.1";
8+ version = "2019.2";
99
1010 outputs = [ "out" "dev" "man" "installedTests" ];
1111
1212 src = fetchurl {
1313 url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
14− sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm";
14+ sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y";
1515 };
1616
1717 patches = [
@@ -22,10 +22,7 @@ stdenv.mkDerivation rec {
2222 ./disable-test-gpg-verify-result.patch
2323 # Tests access the helper using relative path
2424 # https://github.com/ostreedev/ostree/issues/1593
25− (fetchpatch {
26− url = https://github.com/ostreedev/ostree/pull/1633.patch;
27− sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j";
28− })
25+ ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
2926 ];
3027
3128 nativeBuildInputs = [
pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch+6−6
@@ -1,12 +1,12 @@
1−diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am
2−--- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100
3−+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200
4−@@ -243,7 +243,7 @@
1+diff --git a/Makefile-tests.am b/Makefile-tests.am
2+index b11fde89..82937a67 100644
3+--- a/Makefile-tests.am
4++++ b/Makefile-tests.am
5+@@ -245,7 +245,6 @@ endif
56
67 _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
78 tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
89- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
9−+ tests/test-checksum tests/test-lzma tests/test-rollsum \
1010 tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
1111
12− if USE_AVAHI
12+ if USE_LIBSOUP
pkgs/tools/misc/ostree/fix-1592.patch+64−23
@@ -1,6 +1,7 @@
1−diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
2−--- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100
3−+++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200
1+diff --git a/tests/pull-test.sh b/tests/pull-test.sh
2+index a8bc49a9..4a08ebb5 100644
3+--- a/tests/pull-test.sh
4++++ b/tests/pull-test.sh
45@@ -275,7 +275,7 @@
56 if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
67 fatal "pull with mixed refs succeeded?"
@@ -19,23 +20,62 @@ diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
1920 echo "ok pull-local nonexistent branch"
2021
2122 cd ${test_tmpdir}
22−@@ -587,5 +587,5 @@
23+@@ -593,5 +593,5 @@
2324 if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
2425 fatal "pull of invalid ref succeeded"
2526 fi
2627-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
2728+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
2829 echo "ok pull got HTML for a ref"
29−diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
30−--- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100
31−+++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200
30+diff --git a/tests/test-config.sh b/tests/test-config.sh
31+index 7e913d32..69d1675d 100755
32+--- a/tests/test-config.sh
33++++ b/tests/test-config.sh
34+@@ -46,7 +46,7 @@
35+ if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then
36+ assert_not_reached "ostree config get should error out if too many arguments are given"
37+ fi
38+-assert_file_has_content err.txt "error: Too many arguments given"
39++assert_file_has_content err.txt "Too many arguments given"
40+ echo "ok config get"
41+
42+ ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only
43+@@ -63,7 +63,7 @@
44+ if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then
45+ assert_not_reached "ostree config set should error out if too many arguments are given"
46+ fi
47+-assert_file_has_content err.txt "error: Too many arguments given"
48++assert_file_has_content err.txt "Too many arguments given"
49+ echo "ok config set"
50+
51+ # Check that "ostree config unset" works
52+@@ -78,7 +78,7 @@
53+ fi
54+ # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
55+ # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
56+-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core."
57++assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core."
58+
59+ # Check that it's idempotent
60+ ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs
61+@@ -95,5 +95,5 @@
62+ if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then
63+ assert_not_reached "ostree config unset should error out if too many arguments are given"
64+ fi
65+-assert_file_has_content err.txt "error: Too many arguments given"
66++assert_file_has_content err.txt "Too many arguments given"
67+ echo "ok config unset"
68+diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
69+index dc6bcfeb..4a5eef55 100755
70+--- a/tests/test-fsck-collections.sh
71++++ b/tests/test-fsck-collections.sh
3272@@ -100,7 +100,7 @@
3373 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
3474 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
3575 fi
3676-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
3777+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
38− assert_file_has_content fsck "^Validating refs...$"
78+ assert_file_has_content fsck "^Validating refs\.\.\.$"
3979
4080 echo "ok 3 fsck detects missing ref bindings"
4181@@ -113,7 +113,7 @@
@@ -44,26 +84,26 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
4484 fi
4585-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
4686+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
47− assert_file_has_content fsck "^Validating refs...$"
48− assert_file_has_content fsck "^Validating refs in collections...$"
87+ assert_file_has_content fsck "^Validating refs\.\.\.$"
88+ assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
4989
5090@@ -127,7 +127,7 @@
5191 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
5292 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
5393 fi
54−-assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’"
55−+assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2."
56− assert_file_has_content fsck "^Validating refs...$"
57− assert_file_has_content fsck "^Validating refs in collections...$"
94+-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’"
95++assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2."
96+ assert_file_has_content fsck "^Validating refs\.\.\.$"
97+ assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
5898
5999@@ -147,7 +147,7 @@
60100 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
61101 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
62102 fi
63−-assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist"
64−+assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist'
65− assert_file_has_content fsck "^Validating refs...$"
66− assert_file_has_content fsck "^Validating refs in collections...$"
103+-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist"
104++assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist'
105+ assert_file_has_content fsck "^Validating refs\.\.\.$"
106+ assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
67107
68108@@ -186,7 +186,7 @@
69109 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
@@ -71,7 +111,7 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
71111 fi
72112-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)"
73113+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)"
74− assert_file_has_content fsck "^Validating refs...$"
114+ assert_file_has_content fsck "^Validating refs\.\.\.$"
75115
76116 echo "ok 9 fsck detects missing ref bindings"
77117@@ -205,7 +205,7 @@
@@ -80,12 +120,13 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co
80120 fi
81121-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist"
82122+assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist'
83− assert_file_has_content fsck "^Validating refs...$"
123+ assert_file_has_content fsck "^Validating refs\.\.\.$"
84124
85125 echo "ok 11 fsck ignores unreferenced ref bindings"
86−diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh
87−--- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100
88−+++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200
126+diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
127+index bb7eae89..62a3bcd7 100755
128+--- a/tests/test-remote-add.sh
129++++ b/tests/test-remote-add.sh
89130@@ -83,7 +83,7 @@
90131 if $OSTREE remote delete nosuchremote 2>err.txt; then
91132 assert_not_reached "Deleting remote unexpectedly succeeded"
pkgs/tools/misc/rpm-ostree/default.nix+5−3
@@ -1,15 +1,15 @@
11{ stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc,
22 gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake,
33 libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit,
4− bubblewrap, pcre, check, python }:
4+ bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit }:
55
66stdenv.mkDerivation rec {
77 pname = "rpm-ostree";
8− version = "2019.2";
8+ version = "2019.5";
99
1010 src = fetchurl {
1111 url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
12− sha256 = "0sxjlcq15avb0fv6v89z2xrqv095dck4k5s9f0pk6y7sm063n2pk";
12+ sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn";
1313 };
1414
1515 patches = [
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
2828 libcap ostree rpm glib systemd polkit bubblewrap
2929 json-glib libarchive libsolv librepo
3030 pcre check python
31+ # libdnf
32+ json_c libmodulemd_1 utillinux sqlite cppunit
3133 ];
3234
3335 configureFlags = [
pkgs/top-level/all-packages.nix+3
@@ -12348,6 +12348,9 @@ in
1234812348
1234912349 libvdpau = callPackage ../development/libraries/libvdpau { };
1235012350
12351+ libmodulemd = callPackage ../development/libraries/libmodulemd { };
12352+ libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { };
12353+
1235112354 libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { };
1235212355
1235312356 libversion = callPackage ../development/libraries/libversion { };