gjs: 1.81.2 → 1.82.0

https://gitlab.gnome.org/GNOME/gjs/-/compare/1.81.2...1.82.0
NixOS · Sep 24, 2024 · c5ff6da · c5ff6da
1 parent 35ce371
commit c5ff6da
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 6 deletions.
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
@@ -32,13 +32,13 @@ let
   ];
 in stdenv.mkDerivation (finalAttrs: {
   pname = "gjs";
-  version = "1.81.2";
+  version = "1.82.0";
 
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LwkwI5LXCI0B25YltzcfFypgE2Z7SuTPqNWgvRBUKdM=";
+    hash = "sha256-FEkCNoaNC/gi96p884/NMz52IHYP3PUOkyQjYR9iZiM=";
   };
 
   patches = [
@@ -104,10 +104,10 @@ in stdenv.mkDerivation (finalAttrs: {
     # We are using a symlink that will be overridden during installation.
     mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
     ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
-    ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
+    ln -s $PWD/subprojects/gobject-introspection-tests/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
+    ln -s $PWD/subprojects/gobject-introspection-tests/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
+    ln -s $PWD/subprojects/gobject-introspection-tests/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
     ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so
-    ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
-    ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
   '';
 
   postInstall = ''

diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch
@@ -1,3 +1,43 @@
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 98475f7d..942d9eca 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -10,7 +10,7 @@ jsunit_resources_files = gnome.compile_resources('jsunit-resources',
+ minijasmine = executable('minijasmine', '../minijasmine.cpp',
+     jsunit_resources_files, dependencies: libgjs_dep,
+     cpp_args: [
+-        '-DINSTTESTDIR="@0@"'.format(prefix / installed_tests_execdir),
++        '-DINSTTESTDIR="@0@"'.format(installed_tests_execdir),
+     ],
+     include_directories: top_include,
+     install: get_option('installed_tests'), install_dir: installed_tests_execdir)
+@@ -82,7 +82,7 @@ foreach test : jasmine_tests
+
+     test_description_subst = {
+         'name': 'test@[email protected]'.format(test),
+-        'installed_tests_execdir': prefix / installed_tests_execdir,
++        'installed_tests_execdir': installed_tests_execdir,
+     }
+     configure_file(configuration: test_description_subst,
+         input: '../minijasmine.test.in',
+@@ -125,7 +125,7 @@ foreach test : dbus_tests
+
+     dbus_test_description_subst = {
+         'name': 'test@[email protected]'.format(test),
+-        'installed_tests_execdir': prefix / installed_tests_execdir,
++        'installed_tests_execdir': installed_tests_execdir,
+     }
+     configure_file(
+         configuration: dbus_test_description_subst,
+@@ -163,7 +163,7 @@ foreach test : modules_tests
+
+     esm_test_description_subst = {
+         'name': 'test@[email protected]'.format(test),
+-        'installed_tests_execdir': prefix / installed_tests_execdir,
++        'installed_tests_execdir': installed_tests_execdir,
+     }
+     configure_file(configuration: esm_test_description_subst,
+         input: '../minijasmine-module.test.in',
 diff --git a/installed-tests/meson.build b/installed-tests/meson.build
 index 7a7c48ab..52508c2c 100644
 --- a/installed-tests/meson.build
@@ -20,8 +60,19 @@ index 7a7c48ab..52508c2c 100644
      }
      configure_file(configuration: test_description_subst,
          input: 'debugger.test.in',
+diff --git a/installed-tests/script.test.in b/installed-tests/script.test.in
+index debefc4c..96a91b88 100644
+--- a/installed-tests/script.test.in
++++ b/installed-tests/script.test.in
+@@ -3,5 +3,5 @@
+
+ [Test]
+ Type=session
+-Exec=sh @prefix@/@installed_tests_execdir@/scripts/@name@
++Exec=sh @installed_tests_execdir@/scripts/@name@
+ Output=TAP
 diff --git a/meson.build b/meson.build
-index 83dce932..9d3bca18 100644
+index bbfe8bc8..e6f87dc3 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -25,8 +25,8 @@ datadir = get_option('datadir')