pyrox.dev / nixpkgs
lol
fork atom

guile-git: 0.9.0 -> 0.10.0, modernize (#424430)

authored by Weijia Wang and committed by GitHub f4c638a7 97234ec2

+8 -177
unified split
-80
pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch
··· 1 - From cc70ed70b19a712babd834806d6fc700b20c020a Mon Sep 17 00:00:00 2001 2 - From: Emily <hello@emily.moe> 3 - Date: Wed, 22 Jan 2025 23:25:51 +0000 4 - Subject: [PATCH 1/2] =?UTF-8?q?structs:=20Omit=20=E2=80=98free=E2=80=99=20?= 5 - =?UTF-8?q?field=20from=20=E2=80=98%config-entry=E2=80=99=20on=20libgit2?= 6 - =?UTF-8?q?=201.9+.?= 7 - MIME-Version: 1.0 8 - Content-Type: text/plain; charset=UTF-8 9 - Content-Transfer-Encoding: 8bit 10 - 11 - * configure.ac: Check for the ‘free’ field of ‘git_config_entry’. 12 - * git/configuration.scm.in (%have-config-entry-free?): New variable. 13 - * git/structs.scm (%config-entry): Omit ‘free’ field conditionally. 14 - --- 15 - configure.ac | 10 ++++++++++ 16 - git/configuration.scm.in | 4 ++++ 17 - git/structs.scm | 4 +++- 18 - 3 files changed, 17 insertions(+), 1 deletion(-) 19 - 20 - diff --git a/configure.ac b/configure.ac 21 - index b04ca6b..7f8f0b9 100644 22 - --- a/configure.ac 23 - +++ b/configure.ac 24 - @@ -87,6 +87,16 @@ else 25 - fi 26 - AC_SUBST([HAVE_CONFIG_ENTRY_BACKEND_TYPE]) 27 - 28 - +dnl Does 'git_config_entry' have 'free'? Removed in 1.9. 29 - +AC_CHECK_MEMBER([git_config_entry.free], [], [], 30 - + [[#include <git2.h>]]) 31 - +if test "x$ac_cv_member_git_config_entry_free" = "xyes"; then 32 - + HAVE_CONFIG_ENTRY_FREE="#true" 33 - +else 34 - + HAVE_CONFIG_ENTRY_FREE="#false" 35 - +fi 36 - +AC_SUBST([HAVE_CONFIG_ENTRY_FREE]) 37 - + 38 - dnl Does 'git_diff_options' have 'oid_type'? It's new in 1.7. 39 - AC_CHECK_MEMBER([git_diff_options.oid_type], [], [], 40 - [[#include <git2.h>]]) 41 - diff --git a/git/configuration.scm.in b/git/configuration.scm.in 42 - index e10b195..864b9ff 100644 43 - --- a/git/configuration.scm.in 44 - +++ b/git/configuration.scm.in 45 - @@ -24,6 +24,7 @@ 46 - %have-fetch-options-depth? 47 - %have-diff-options-oid-type? 48 - %have-config-entry-backend-type? 49 - + %have-config-entry-free? 50 - %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? 51 - %have-GIT_OPT_SET_HOMEDIR? 52 - %have-GIT_OPT_SET_USER_AGENT_PRODUCT?)) 53 - @@ -48,6 +49,9 @@ 54 - (define %have-config-entry-backend-type? 55 - @HAVE_CONFIG_ENTRY_BACKEND_TYPE@) 56 - 57 - +(define %have-config-entry-free? 58 - + @HAVE_CONFIG_ENTRY_FREE@) 59 - + 60 - (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? 61 - @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@) 62 - 63 - diff --git a/git/structs.scm b/git/structs.scm 64 - index beebd11..b35ae6d 100644 65 - --- a/git/structs.scm 66 - +++ b/git/structs.scm 67 - @@ -505,7 +505,9 @@ 68 - '()) 69 - (include-depth ,unsigned-int) 70 - (level ,int) ;git_config_level_t 71 - - (free ,(bs:pointer int)) 72 - + ,@(if %have-config-entry-free? 73 - + `(free ,(bs:pointer int)) 74 - + '()) 75 - ,@(if %have-config-entry-backend-type? 76 - '() 77 - `((payload ,(bs:pointer int))))))) ;removed in 1.8 78 - -- 79 - 2.47.0 80 -
···
-84
pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch
··· 1 - From 595b850c85f55592b94d2218a12084fd7050b508 Mon Sep 17 00:00:00 2001 2 - From: Emily <hello@emily.moe> 3 - Date: Wed, 22 Jan 2025 23:55:45 +0000 4 - Subject: [PATCH 2/2] =?UTF-8?q?structs:=20Add=20=E2=80=98update-refs?= 5 - =?UTF-8?q?=E2=80=99=20field=20to=20=E2=80=98%remote-callbacks=E2=80=99=20?= 6 - =?UTF-8?q?on=20libgit2=201.9+.?= 7 - MIME-Version: 1.0 8 - Content-Type: text/plain; charset=UTF-8 9 - Content-Transfer-Encoding: 8bit 10 - 11 - * configure.ac: Check for the ‘update_refs’ field of 12 - ‘git_remote_callbacks’. 13 - * git/configuration.scm.in (%have-remote-callbacks-update-refs?): New 14 - variable. 15 - * git/structs.scm (%remote-callbacks): Add ‘update-refs’ field 16 - conditionally. 17 - --- 18 - configure.ac | 10 ++++++++++ 19 - git/configuration.scm.in | 4 ++++ 20 - git/structs.scm | 5 ++++- 21 - 3 files changed, 18 insertions(+), 1 deletion(-) 22 - 23 - diff --git a/configure.ac b/configure.ac 24 - index 7f8f0b9..a2575f4 100644 25 - --- a/configure.ac 26 - +++ b/configure.ac 27 - @@ -107,6 +107,16 @@ else 28 - fi 29 - AC_SUBST([HAVE_DIFF_OPTIONS_OID_TYPE]) 30 - 31 - +dnl Does 'git_remote_callbacks' have 'update_refs'? New in 1.9. 32 - +AC_CHECK_MEMBER([git_remote_callbacks.update_refs], [], [], 33 - + [[#include <git2.h>]]) 34 - +if test "x$ac_cv_member_git_remote_callbacks_update_refs" = "xyes"; then 35 - + HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#true" 36 - +else 37 - + HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#false" 38 - +fi 39 - +AC_SUBST([HAVE_REMOTE_CALLBACKS_UPDATE_REFS]) 40 - + 41 - dnl 'GIT_OPT_SET_SERVER_CONNECT_TIMEOUT' & co. are new in 1.7. 42 - GUILE_GIT_CHECK_DECLARATION([GIT_OPT_SET_SERVER_CONNECT_TIMEOUT]) 43 - 44 - diff --git a/git/configuration.scm.in b/git/configuration.scm.in 45 - index 864b9ff..1e82c24 100644 46 - --- a/git/configuration.scm.in 47 - +++ b/git/configuration.scm.in 48 - @@ -25,6 +25,7 @@ 49 - %have-diff-options-oid-type? 50 - %have-config-entry-backend-type? 51 - %have-config-entry-free? 52 - + %have-remote-callbacks-update-refs? 53 - %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? 54 - %have-GIT_OPT_SET_HOMEDIR? 55 - %have-GIT_OPT_SET_USER_AGENT_PRODUCT?)) 56 - @@ -52,6 +53,9 @@ 57 - (define %have-config-entry-free? 58 - @HAVE_CONFIG_ENTRY_FREE@) 59 - 60 - +(define %have-remote-callbacks-update-refs? 61 - + @HAVE_REMOTE_CALLBACKS_UPDATE_REFS@) 62 - + 63 - (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? 64 - @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@) 65 - 66 - diff --git a/git/structs.scm b/git/structs.scm 67 - index b35ae6d..664a7c1 100644 68 - --- a/git/structs.scm 69 - +++ b/git/structs.scm 70 - @@ -670,7 +670,10 @@ type to 'specified for this to take effect." 71 - (transport ,(bs:pointer uint8)) 72 - (remote-ready ,(bs:pointer void)) 73 - (payload ,(bs:pointer uint8)) 74 - - (resolve-url ,(bs:pointer uint8))))) 75 - + (resolve-url ,(bs:pointer uint8)) 76 - + ,@(if %have-remote-callbacks-update-refs? 77 - + `((update-refs ,(bs:pointer uint8))) 78 - + '())))) 79 - 80 - (define-record-type <remote-callbacks> 81 - (%make-remote-callbacks bytestructure) 82 - -- 83 - 2.47.0 84 -
···
+8 -13
pkgs/by-name/gu/guile-git/package.nix
··· 10 texinfo, 11 }: 12 13 - stdenv.mkDerivation rec { 14 pname = "guile-git"; 15 - version = "0.9.0"; 16 17 src = fetchFromGitLab { 18 owner = "guile-git"; 19 repo = "guile-git"; 20 - rev = "v${version}"; 21 - hash = "sha256-lFBoA1VBJRHcZkP3h2gnlXQrMjDFWS4jl9RlF8VVf/Q="; 22 }; 23 - 24 - patches = [ 25 - ./0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch 26 - ./0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch 27 - ]; 28 29 strictDeps = true; 30 nativeBuildInputs = [ ··· 52 53 __darwinAllowLocalNetworking = true; 54 55 - meta = with lib; { 56 description = "Bindings to Libgit2 for GNU Guile"; 57 homepage = "https://gitlab.com/guile-git/guile-git"; 58 - license = licenses.gpl3Plus; 59 - maintainers = with maintainers; [ ethancedwards8 ]; 60 platforms = guile.meta.platforms; 61 }; 62 - }
··· 10 texinfo, 11 }: 12 13 + stdenv.mkDerivation (finalAttrs: { 14 pname = "guile-git"; 15 + version = "0.10.0"; 16 17 src = fetchFromGitLab { 18 owner = "guile-git"; 19 repo = "guile-git"; 20 + tag = "v${finalAttrs.version}"; 21 + hash = "sha256-ihKpEnng6Uemrguecbd25vElEhIu2Efb86aM8679TAc="; 22 }; 23 24 strictDeps = true; 25 nativeBuildInputs = [ ··· 47 48 __darwinAllowLocalNetworking = true; 49 50 + meta = { 51 description = "Bindings to Libgit2 for GNU Guile"; 52 homepage = "https://gitlab.com/guile-git/guile-git"; 53 + license = lib.licenses.gpl3Plus; 54 + maintainers = with lib.maintainers; [ ethancedwards8 ]; 55 platforms = guile.meta.platforms; 56 }; 57 + })