lol

gjs: 1.64.4 -> 1.66.0

- Installed tests execdir was moved: https://gitlab.gnome.org/GNOME/gjs/-/issues/318

Changelogs:
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.1.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.2.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.3.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.4.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.90.news
- libsysprof-capture-4 ← libsysprof-capture-3
- We did not depend on it previously either.
- SpiderMonkey 78
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.91.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.92.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.66/gjs-1.66.0.news

Changes reviewed by: Jan Tojnar <jtojnar@gmail.com>

authored by

Doron Behar and committed by
Jan Tojnar
dde31ed4 cdc3ce56

+16 -16
+10 -10
pkgs/development/libraries/gjs/default.nix
··· 8 8 , gtk3 9 9 , atk 10 10 , gobject-introspection 11 - , spidermonkey_68 11 + , spidermonkey_78 12 12 , pango 13 13 , cairo 14 14 , readline ··· 29 29 ]; 30 30 in stdenv.mkDerivation rec { 31 31 pname = "gjs"; 32 - version = "1.64.4"; 32 + version = "1.66.0"; 33 33 34 34 src = fetchurl { 35 35 url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 36 - sha256 = "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53"; 36 + sha256 = "1y5m7as3jwhb3svb4xgk443hyxhijralk5q5s3ywidkd047gj37k"; 37 37 }; 38 38 39 39 outputs = [ "out" "dev" "installedTests" ]; ··· 51 51 gobject-introspection 52 52 cairo 53 53 readline 54 - spidermonkey_68 54 + spidermonkey_78 55 55 dbus # for dbus-run-session 56 56 ]; 57 57 ··· 88 88 # in the GIR files. When running tests, the library is not yet installed, 89 89 # though, so we need to replace the absolute path with a local one during build. 90 90 # We are using a symlink that will be overridden during installation. 91 - mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests 91 + mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs 92 92 ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 93 - ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so 94 - ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so 95 - ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so 93 + ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so 94 + ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so 95 + ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so 96 96 ''; 97 97 98 98 postInstall = '' 99 - # TODO: make the glib setup hook handle this 99 + # TODO: make the glib setup hook handle moving the schemas in other outputs. 100 100 installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}" 101 101 mkdir -p "$installedTestsSchemaDatadir" 102 102 mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" 103 103 ''; 104 104 105 105 postFixup = '' 106 - wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ 106 + wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ 107 107 --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ 108 108 --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" 109 109 '';
+6 -6
pkgs/development/libraries/gjs/installed-tests-path.patch
··· 1 1 diff --git a/installed-tests/meson.build b/installed-tests/meson.build 2 - index 7e842025..1e5029e0 100644 2 + index 04c7910f..9647908c 100644 3 3 --- a/installed-tests/meson.build 4 4 +++ b/installed-tests/meson.build 5 5 @@ -1,7 +1,7 @@ 6 6 ### Installed tests ############################################################ 7 7 8 - -installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests' 8 + -installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name() 9 9 -installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name() 10 - +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests' 10 + +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name() 11 11 +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() 12 12 13 13 # Simple shell script tests # 14 14 15 15 diff --git a/meson.build b/meson.build 16 - index 084d5396..e5d73fcd 100644 16 + index 9ab29475..42ffe07f 100644 17 17 --- a/meson.build 18 18 +++ b/meson.build 19 - @@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp', 19 + @@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp', 20 20 install_dir: get_option('datadir') / api_name / 'lsan') 21 21 22 22 if get_option('installed_tests') ··· 26 26 meson.add_install_script('build/compile-gschemas.py', schemadir) 27 27 endif 28 28 diff --git a/meson_options.txt b/meson_options.txt 29 - index 66f66024..008687cb 100644 29 + index 825ba77a..21f0323c 100644 30 30 --- a/meson_options.txt 31 31 +++ b/meson_options.txt 32 32 @@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,