tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

graphene: fix nixos test

The file introspection.py was missing in the installed-tests files and
it requires python3 to run.

Matthias Devlamynck a1c5f4e2 690496c4

+15 -2
unified split
+7 -2
pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
··· 23 + value: '', 24 + description: 'Installation directory for binary files in tests') 25 diff --git a/tests/meson.build b/tests/meson.build 26 - index 77281f5..c4c7fac 100644 27 --- a/tests/meson.build 28 +++ b/tests/meson.build 29 @@ -21,8 +21,17 @@ unit_tests = [ ··· 71 ), 72 env: ['MUTEST_OUTPUT=tap'], 73 protocol: 'tap', 74 - @@ -70,13 +79,13 @@ if build_gir and host_system == 'linux' and not meson.is_cross_build() 75 output: wrapper, 76 command: [ 77 gen_installed_test,
··· 23 + value: '', 24 + description: 'Installation directory for binary files in tests') 25 diff --git a/tests/meson.build b/tests/meson.build 26 + index 77281f5..7522456 100644 27 --- a/tests/meson.build 28 +++ b/tests/meson.build 29 @@ -21,8 +21,17 @@ unit_tests = [ ··· 71 ), 72 env: ['MUTEST_OUTPUT=tap'], 73 protocol: 'tap', 74 + @@ -66,17 +75,18 @@ endif 75 + if build_gir and host_system == 'linux' and not meson.is_cross_build() 76 + foreach unit: ['introspection.py'] 77 + wrapper = '@0@.test'.format(unit) 78 + + install_data(unit, install_dir: test_bindir) 79 + custom_target(wrapper, 80 output: wrapper, 81 command: [ 82 gen_installed_test,
+8
pkgs/development/libraries/graphene/default.nix
··· 12 , docbook_xsl 13 , docbook_xml_dtd_43 14 , gobject-introspection 15 }: 16 17 stdenv.mkDerivation rec { ··· 41 pkg-config 42 gobject-introspection 43 python3 44 ]; 45 46 buildInputs = [ ··· 62 63 postPatch = '' 64 patchShebangs tests/gen-installed-test.py 65 ''; 66 67 passthru = {
··· 12 , docbook_xsl 13 , docbook_xml_dtd_43 14 , gobject-introspection 15 + , makeWrapper 16 }: 17 18 stdenv.mkDerivation rec { ··· 42 pkg-config 43 gobject-introspection 44 python3 45 + makeWrapper 46 ]; 47 48 buildInputs = [ ··· 64 65 postPatch = '' 66 patchShebangs tests/gen-installed-test.py 67 + PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py 68 + ''; 69 + 70 + postFixup = '' 71 + wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/graphene-1.0/introspection.py" \ 72 + --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" 73 ''; 74 75 passthru = {