Skip to content

prooftree: refactor#525037

Merged
vbgl merged 1 commit into
NixOS:masterfrom
vbgl:prooftree
Jun 4, 2026
Merged

prooftree: refactor#525037
vbgl merged 1 commit into
NixOS:masterfrom
vbgl:prooftree

Conversation

@vbgl

@vbgl vbgl commented May 27, 2026

Copy link
Copy Markdown
Contributor

Move to pkgs/by-name/
Build with default version of OCaml
Use finalAttrs pattern
Remove unused dependencies

Things done

Move to pkgs/by-name/
Build with default version of OCaml
Use finalAttrs pattern
Remove unused dependencies
@vbgl vbgl added 8.has: clean-up This PR removes packages or removes other cruft backport release-26.05 Backport PR automatically labels May 27, 2026
@nixpkgs-ci nixpkgs-ci Bot requested a review from jwiegley May 27, 2026 22:13
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels May 27, 2026
@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels May 28, 2026
@stepbrobd

Copy link
Copy Markdown
Member

thanks a lot!

to answer the questions:

Does prooftree really depends on gtksourceview? Is it maintained?

gtksourceview is brought in by lablgtk and gtk2 related pkgs are EOL per #410814

this version still doesnt build on darwin

$ nix build -L .#prooftree
gtksourceview> Running phase: unpackPhase
gtksourceview> unpacking source archive /nix/store/kd88s6iq082dvf3szvf3czjw6yx0lqgl-gtksourceview-2.10.5.tar.bz2
gtksourceview> source root is gtksourceview-2.10.5
gtksourceview> setting SOURCE_DATE_EPOCH to timestamp 1285667125 of file "gtksourceview-2.10.5/docs/reference/html/up.png"
gtksourceview> Running phase: patchPhase
gtksourceview> applying patch /nix/store/67ddwpmgvk0kfyj3532ciykyfi47wijw-change-igemacintegration-to-gtkosxapplication.patch
gtksourceview> patching file configure.ac
gtksourceview> patching file gtksourceview/Makefile.am
gtksourceview> patching file gtksourceview/gtksourceview-i18n.c
gtksourceview> applying patch /nix/store/v9rq6nwypfavr1g3a2ij0ym7m6wvyy4b-update-to-gtk-mac-integration-2.0-api.patch
gtksourceview> patching file configure.ac
gtksourceview> patching file gtksourceview/gtksourceview-i18n.c
gtksourceview> Running phase: autoreconfPhase
gtksourceview> autoreconf: export WARNINGS=
gtksourceview> autoreconf: Entering directory '.'
gtksourceview> autoreconf: configure.ac: no obvious need to run autopoint
gtksourceview> autoreconf: running: aclocal --force -I m4 ${ACLOCAL_FLAGS}
gtksourceview> configure.ac:102: warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library
gtksourceview> autoreconf: configure.ac: tracing
gtksourceview> autoreconf: running: libtoolize --copy --force
gtksourceview> libtoolize: putting auxiliary files in '.'.
gtksourceview> libtoolize: copying file './ltmain.sh'
gtksourceview> libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
gtksourceview> libtoolize: copying file 'm4/libtool.m4'
gtksourceview> libtoolize: copying file 'm4/ltoptions.m4'
gtksourceview> libtoolize: copying file 'm4/ltsugar.m4'
gtksourceview> libtoolize: copying file 'm4/ltversion.m4'
gtksourceview> libtoolize: copying file 'm4/lt~obsolete.m4'
gtksourceview> autoreconf: running: intltoolize --copy --force
gtksourceview> You should update your 'aclocal.m4' by running aclocal.
gtksourceview> autoreconf: running: gtkdocize --copy
gtksourceview> autoreconf: configure.ac: no need to run autopoint (confirmed)
gtksourceview> autoreconf: running: aclocal --force -I m4 ${ACLOCAL_FLAGS}
gtksourceview> configure.ac:102: warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library
gtksourceview> autoreconf: running: /nix/store/z81cjs7gbr38jza8a9rslfb9x0nyywn1-autoconf-2.73/bin/autoconf --force
gtksourceview> configure.ac:13: warning: The macro 'AC_CONFIG_HEADER' is obsolete.
gtksourceview> configure.ac:13: You should run autoupdate.
gtksourceview> ./lib/autoconf/status.m4:719: AC_CONFIG_HEADER is expanded from...
gtksourceview> configure.ac:13: the top level
gtksourceview> configure.ac:45: warning: The macro 'AC_HELP_STRING' is obsolete.
gtksourceview> configure.ac:45: You should run autoupdate.
gtksourceview> ./lib/autoconf/general.m4:205: AC_HELP_STRING is expanded from...
gtksourceview> aclocal.m4:26: GNOME_COMPILE_WARNINGS is expanded from...
gtksourceview> configure.ac:45: the top level
gtksourceview> configure.ac:45: warning: The macro 'AC_TRY_COMPILE' is obsolete.
gtksourceview> configure.ac:45: You should run autoupdate.
gtksourceview> ./lib/autoconf/general.m4:2903: AC_TRY_COMPILE is expanded from...
gtksourceview> aclocal.m4:26: GNOME_COMPILE_WARNINGS is expanded from...
gtksourceview> configure.ac:45: the top level
gtksourceview> configure.ac:103: warning: The macro 'GLIB_GNU_GETTEXT' is obsolete.
gtksourceview> configure.ac:103: You should run autoupdate.
gtksourceview> aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
gtksourceview> aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
gtksourceview> configure.ac:103: the top level
gtksourceview> configure.ac:103: warning: The macro 'AC_TRY_LINK' is obsolete.
gtksourceview> configure.ac:103: You should run autoupdate.
gtksourceview> ./lib/autoconf/general.m4:2976: AC_TRY_LINK is expanded from...
gtksourceview> lib/m4sugar/m4sh.m4:689: _AS_IF_ELSE is expanded from...
gtksourceview> lib/m4sugar/m4sh.m4:696: AS_IF is expanded from...
gtksourceview> ./lib/autoconf/general.m4:2305: AC_CACHE_VAL is expanded from...
gtksourceview> ./lib/autoconf/general.m4:2326: AC_CACHE_CHECK is expanded from...
gtksourceview> aclocal.m4:215: GLIB_LC_MESSAGES is expanded from...
gtksourceview> aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
gtksourceview> aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
gtksourceview> configure.ac:103: the top level
gtksourceview> configure.ac:103: warning: The macro 'AC_TRY_LINK' is obsolete.
gtksourceview> configure.ac:103: You should run autoupdate.
gtksourceview> ./lib/autoconf/general.m4:2976: AC_TRY_LINK is expanded from...
gtksourceview> lib/m4sugar/m4sh.m4:689: _AS_IF_ELSE is expanded from...
gtksourceview> lib/m4sugar/m4sh.m4:696: AS_IF is expanded from...
gtksourceview> ./lib/autoconf/general.m4:2305: AC_CACHE_VAL is expanded from...
gtksourceview> ./lib/autoconf/general.m4:2326: AC_CACHE_CHECK is expanded from...
gtksourceview> lib/m4sugar/m4sh.m4:696: AS_IF is expanded from...
gtksourceview> ./lib/autoconf/headers.m4:90: _AC_CHECK_HEADER_COMPILE is expanded from...
gtksourceview> ./lib/autoconf/headers.m4:57: AC_CHECK_HEADER is expanded from...
gtksourceview> aclocal.m4:314: GLIB_WITH_NLS is expanded from...
gtksourceview> aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
gtksourceview> aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
gtksourceview> configure.ac:103: the top level
gtksourceview> configure.ac:103: warning: The macro 'AC_TRY_LINK' is obsolete.
gtksourceview> configure.ac:103: You should run autoupdate.
gtksourceview> ./lib/autoconf/general.m4:2976: AC_TRY_LINK is expanded from...
gtksourceview> lib/m4sugar/m4sh.m4:696: AS_IF is expanded from...
gtksourceview> ./lib/autoconf/headers.m4:90: _AC_CHECK_HEADER_COMPILE is expanded from...
gtksourceview> ./lib/autoconf/headers.m4:57: AC_CHECK_HEADER is expanded from...
gtksourceview> aclocal.m4:314: GLIB_WITH_NLS is expanded from...
gtksourceview> aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
gtksourceview> aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
gtksourceview> configure.ac:103: the top level
gtksourceview> configure.ac:103: warning: The macro 'AC_OUTPUT_COMMANDS' is obsolete.
gtksourceview> configure.ac:103: You should run autoupdate.
gtksourceview> ./lib/autoconf/status.m4:1029: AC_OUTPUT_COMMANDS is expanded from...
gtksourceview> aclocal.m4:314: GLIB_WITH_NLS is expanded from...
gtksourceview> aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
gtksourceview> aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
gtksourceview> configure.ac:103: the top level
gtksourceview> configure.ac:102: error: undefined or overquoted macro: AM_GNU_GETTEXT_VERSION
gtksourceview>       If this token and others are legitimate, please use m4_pattern_allow.
gtksourceview>       See the Autoconf documentation.
gtksourceview> autoreconf: error: /nix/store/z81cjs7gbr38jza8a9rslfb9x0nyywn1-autoconf-2.73/bin/autoconf failed with exit status: 1
note: keeping build directory "/nix/var/nix/builds/nix-28740-1638547970"
error: Cannot build '/nix/store/xw5a8rg30jvhrqc7f9cyi4p48rpl5nc6-gtksourceview-2.10.5.drv'.
       Reason: builder failed with exit code 1.
       Output paths:
         /nix/store/pviha4q3r2kmi7xpadbrdsdln7n59qa3-gtksourceview-2.10.5
       Last 25 log lines:
       > aclocal.m4:314: GLIB_WITH_NLS is expanded from...
       > aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
       > aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
       > configure.ac:103: the top level
       > configure.ac:103: warning: The macro 'AC_TRY_LINK' is obsolete.
       > configure.ac:103: You should run autoupdate.
       > ./lib/autoconf/general.m4:2976: AC_TRY_LINK is expanded from...
       > lib/m4sugar/m4sh.m4:696: AS_IF is expanded from...
       > ./lib/autoconf/headers.m4:90: _AC_CHECK_HEADER_COMPILE is expanded from...
       > ./lib/autoconf/headers.m4:57: AC_CHECK_HEADER is expanded from...
       > aclocal.m4:314: GLIB_WITH_NLS is expanded from...
       > aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
       > aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
       > configure.ac:103: the top level
       > configure.ac:103: warning: The macro 'AC_OUTPUT_COMMANDS' is obsolete.
       > configure.ac:103: You should run autoupdate.
       > ./lib/autoconf/status.m4:1029: AC_OUTPUT_COMMANDS is expanded from...
       > aclocal.m4:314: GLIB_WITH_NLS is expanded from...
       > aclocal.m4:530: GLIB_GNU_GETTEXT is expanded from...
       > aclocal.m4:630: AM_GLIB_GNU_GETTEXT is expanded from...
       > configure.ac:103: the top level
       > configure.ac:102: error: undefined or overquoted macro: AM_GNU_GETTEXT_VERSION
       >       If this token and others are legitimate, please use m4_pattern_allow.
       >       See the Autoconf documentation.
       > autoreconf: error: /nix/store/z81cjs7gbr38jza8a9rslfb9x0nyywn1-autoconf-2.73/bin/autoconf failed with exit status: 1
       For full logs, run:
         nix log /nix/store/xw5a8rg30jvhrqc7f9cyi4p48rpl5nc6-gtksourceview-2.10.5.drv
error: Cannot build '/nix/store/wbi0i4dnkxs62ir9ff3y0mqmyam4d6jn-ocaml5.4.1-lablgtk-2.18.13.drv'.
       Reason: 1 dependency failed.
       Output paths:
         /nix/store/pm3xxlm30q2mv6jjgj4a4d36fy3sfhh2-ocaml5.4.1-lablgtk-2.18.13
error: Build failed due to failed dependency
error: Cannot build '/nix/store/564mvmrcxffvj92ahyghbnn4y949xglp-prooftree-0.14.drv'.
       Reason: 1 dependency failed.
       Output paths:
         /nix/store/bjjr9yx62xy177kiyfxwnvk0vx9xpixs-prooftree-0.14
error: Build failed due to failed dependency

we still need something like this for it to work:

diff --git c/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix i/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index f7035701133f..917162504325 100644
--- c/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ i/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     autoreconfHook
     gtk-doc
+    gettext
   ];

   buildInputs = [
@@ -73,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: {
     gtk-mac-integration-gtk2
   ];

+  preAutoreconf = ''
+    export ACLOCAL_PATH="${gettext}/share/gettext/m4:$ACLOCAL_PATH"
+  '';
+
   doCheck = false; # requires X11 daemon

   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

@stepbrobd

Copy link
Copy Markdown
Member

related #522127

@stepbrobd

Copy link
Copy Markdown
Member

this gtksourceview patch is better #521903 maybe we can directly merge this and wait for that

@vbgl vbgl added this pull request to the merge queue Jun 4, 2026
Merged via the queue into NixOS:master with commit 7531ef2 Jun 4, 2026
38 of 40 checks passed
@vbgl vbgl deleted the prooftree branch June 4, 2026 04:36
@nixpkgs-ci

nixpkgs-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-26.05:

@github-actions github-actions Bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. backport release-26.05 Backport PR automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants