Update gitile package to latest version

Julien LepillerThu Mar 18 15:02:44+0100 2021

5476473

Update gitile package to latest version

modules/packages/gitile.scm

2424 
  #:use-module (gnu packages guile)
2525 
  #:use-module (gnu packages guile-xyz)
2626 
  #:use-module (gnu packages pkg-config)
27+
  #:use-module (gnu packages texinfo)
2728 
  #:use-module (gnu packages tls)
2829 
  #:use-module (guix build-system gnu)
2930 
  #:use-module (guix git-download)
3031 
  #:use-module (guix packages)
3132 
  #:use-module (guix licenses))
3233 
33-
(define-public gitile
34+
(define my-guile-git
3435 
  (package
35-
    (name "gitile")
36-
    (version "0.1")
36+
    (inherit guile-git)
3737 
    (source (origin
3838 
              (method git-fetch)
3939 
              (uri (git-reference
40-
                     (url "https://git.lepiller.eu/git/gitile")
41-
                     (commit "47c1ff58e830b905a394f023f62dd7a03c111606")))
42-
              (file-name (git-file-name name (string-append version "-47c1ff5")))
40+
                     (url "https://gitlab.com/roptat/guile-git")
41+
                     (commit "c39ab944d8004d3ab751a9e27336469afec081eb")))
42+
              (file-name (git-file-name "guile-git" "0.4.0.c39ab94"))
4343 
              (sha256
4444 
               (base32
45-
                "1s6pk77glyy6rrx76kv3vzjkp9g7j5kkwn2khbx1hyhada21i63y"))))
46-
    (build-system gnu-build-system)
47-
    (arguments
48-
     `(#:modules ((guix build utils)
49-
                  (guix build gnu-build-system)
50-
                  (ice-9 rdelim)
51-
                  (ice-9 popen))
52-
       #:make-flags (list "GUILE_AUTO_COMPILE=0")
53-
       #:phases
54-
       (modify-phases %standard-phases
55-
         (add-after 'install 'install-bin
56-
           (lambda* (#:key outputs #:allow-other-keys)
57-
             (install-file "scripts/gitile"
58-
                           (string-append (assoc-ref outputs "out")
59-
                                          "/bin"))
60-
             #t))
61-
         (add-after 'install-bin 'wrap-program
62-
             (lambda* (#:key inputs outputs #:allow-other-keys)
63-
               ;; Wrap the 'cuirass' command to refer to the right modules.
64-
               (let* ((out    (assoc-ref outputs "out"))
65-
                      (git    (assoc-ref inputs "guile-git"))
66-
                      (bytes  (assoc-ref inputs "guile-bytestructures"))
67-
                      (fibers (assoc-ref inputs "guile-fibers"))
68-
                      (gcrypt (assoc-ref inputs "guile-gcrypt"))
69-
                      (deps   (list out git bytes fibers gcrypt))
70-
                      (guile  (assoc-ref %build-inputs "guile"))
71-
                      (effective (read-line
72-
                                  (open-pipe* OPEN_READ
73-
                                              (string-append guile "/bin/guile")
74-
                                              "-c" "(display (effective-version))")))
75-
                      (mods   (string-drop-right  ;drop trailing colon
76-
                               (string-join deps
77-
                                            (string-append "/share/guile/site/"
78-
                                                           effective ":")
79-
                                            'suffix)
80-
                               1))
81-
                      (objs   (string-drop-right
82-
                               (string-join deps
83-
                                            (string-append "/lib/guile/" effective
84-
                                                           "/site-ccache:")
85-
                                            'suffix)
86-
                               1)))
87-
                 (wrap-program (string-append out "/bin/gitile")
88-
                   `("GUILE_LOAD_PATH" ":" prefix (,mods))
89-
                   `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
90-
                 #t))))))
45+
                "0hknsv9r7pjahmxkvd7zpz93saki5kymh88xs6pb4h9d0ssp4fmp"))))
9146 
    (native-inputs
9247 
     `(("autoconf" ,autoconf)
9348 
       ("automake" ,automake)
94-
       ("guile" ,guile-3.0)
95-
       ("pkg-config" ,pkg-config)))
96-
    (inputs
97-
     `(("guile" ,guile-3.0)
98-
       ("guile-fibers" ,guile-fibers)
99-
       ("guile-gcrypt" ,guile-gcrypt)
100-
       ("guile-git" ,guile-git)
101-
       ("gnutls" ,gnutls)))
102-
    (home-page "")
103-
    (synopsis "")
104-
    (description "")
105-
    (license gpl3+)))
49+
       ("texinfo" ,texinfo)
50+
       ,@(package-native-inputs guile-git)))))
51+
52+
(define my-guile-syntax-highlight
53+
  (package
54+
    (inherit guile-syntax-highlight)
55+
    (source (origin
56+
              (method git-fetch)
57+
              (uri (git-reference
58+
                     (url "https://git.dthompson.us/guile-syntax-highlight.git")
59+
                     (commit "51727cbb7fc05ef743aab2d7b16314ea1ed790e4")))
60+
              (file-name (git-file-name "guile-syntax-highlight" "0.1.51727cb"))
61+
              (sha256
62+
               (base32
63+
                "1cvacy4y5qxajygb1qg8hvhjdf2xnnwnm5j918cabsi8wfwchig7"))))
64+
    (native-inputs
65+
     `(("autoconf" ,autoconf)
66+
       ("automake" ,automake)
67+
       ("texinfo" ,texinfo)
68+
       ,@(package-native-inputs guile-syntax-highlight)))))
69+
70+
(define-public gitile
71+
  (let ((commit "fac1f0ccdbaca794451ae43526b1bbffacd8161a")
72+
	(revision "0"))
73+
    (package
74+
      (name "gitile")
75+
      (version (git-version "0.0" revision commit))
76+
      (source (origin
77+
                (method git-fetch)
78+
                (uri (git-reference
79+
                       (url "https://git.lepiller.eu/git/gitile")
80+
                       (commit commit)))
81+
                (file-name (git-file-name name version))
82+
                (sha256
83+
                 (base32
84+
                  "048pm743gnxashggngw3zlsr13wf0k686n3j23czc4988gz7mfvp"))))
85+
      (build-system gnu-build-system)
86+
      (arguments
87+
       `(#:modules ((guix build utils)
88+
                    (guix build gnu-build-system)
89+
                    (ice-9 rdelim)
90+
                    (ice-9 popen))
91+
         #:make-flags (list "GUILE_AUTO_COMPILE=0")
92+
         #:phases
93+
         (modify-phases %standard-phases
94+
           (add-after 'install 'install-bin
95+
             (lambda* (#:key outputs #:allow-other-keys)
96+
               (install-file "scripts/gitile"
97+
                             (string-append (assoc-ref outputs "out")
98+
                                            "/bin"))
99+
               #t))
100+
           (add-after 'install-bin 'wrap-program
101+
               (lambda* (#:key inputs outputs #:allow-other-keys)
102+
                 ;; Wrap the 'cuirass' command to refer to the right modules.
103+
                 (let* ((out    (assoc-ref outputs "out"))
104+
                        (commonmark (assoc-ref inputs "guile-commonmark"))
105+
                        (git    (assoc-ref inputs "guile-git"))
106+
                        (bytes  (assoc-ref inputs "guile-bytestructures"))
107+
                        (fibers (assoc-ref inputs "guile-fibers"))
108+
                        (gcrypt (assoc-ref inputs "guile-gcrypt"))
109+
			(syntax-highlight (assoc-ref inputs "guile-syntax-highlight"))
110+
                        (deps   (list out commonmark git bytes fibers gcrypt
111+
				      syntax-highlight))
112+
                        (guile  (assoc-ref %build-inputs "guile"))
113+
                        (effective (read-line
114+
                                    (open-pipe* OPEN_READ
115+
                                                (string-append guile "/bin/guile")
116+
                                                "-c" "(display (effective-version))")))
117+
                        (mods   (string-drop-right  ;drop trailing colon
118+
                                 (string-join deps
119+
                                              (string-append "/share/guile/site/"
120+
                                                             effective ":")
121+
                                              'suffix)
122+
                                 1))
123+
                        (objs   (string-drop-right
124+
                                 (string-join deps
125+
                                              (string-append "/lib/guile/" effective
126+
                                                             "/site-ccache:")
127+
                                              'suffix)
128+
                                 1)))
129+
                   (wrap-program (string-append out "/bin/gitile")
130+
                     `("GUILE_LOAD_PATH" ":" prefix (,mods))
131+
                     `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
132+
                   #t))))))
133+
      (native-inputs
134+
       `(("autoconf" ,autoconf)
135+
         ("automake" ,automake)
136+
         ("guile" ,guile-3.0)
137+
         ("pkg-config" ,pkg-config)))
138+
      (inputs
139+
       `(("guile" ,guile-3.0)
140+
	 ("guile-commonmark" ,guile-commonmark)
141+
         ("guile-fibers" ,guile-fibers)
142+
         ("guile-gcrypt" ,guile-gcrypt)
143+
         ("guile-git" ,my-guile-git)
144+
	 ("guile-syntax-highlight" ,my-guile-syntax-highlight)
145+
         ("gnutls" ,gnutls)))
146+
      (home-page "")
147+
      (synopsis "")
148+
      (description "")
149+
      (license gpl3+))))
106150 
107151 
gitile