GNU bug report logs - #65351
[PATCH] gnu: Add cgit-pink.

Previous Next

Full log

View this message in rfc822 format

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Arun Isaac <arunisaac <at> systemreboot.net>, 65351 <at> debbugs.gnu.org
Subject: [bug#65351] [PATCH v2 1/7] gnu: cgit: Make git-source a native input.
Date: Mon, 04 Sep 2023 19:09:05 +0200

Am Montag, dem 04.09.2023 um 10:02 +0100 schrieb Arun Isaac:
> * gnu/packages/version-control.scm (cgit)[inputs]: Move git-source to
> ...
> [native-inputs]: ... here.
> ---
>  gnu/packages/version-control.scm | 21 ++++++++++-----------
>  1 file changed, 10 insertions(+), 11 deletions(-)
> 
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-
> control.scm
> index 86dcea908c..c977da468d 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -21,7 +21,7 @@
>  ;;; Copyright © 2018 Sou Bunnbu <iyzsong <at> member.fsf.org>
>  ;;; Copyright © 2018 Christopher Baines <mail <at> cbaines.net>
>  ;;; Copyright © 2018 Timothy Sample <samplet <at> ngyro.com>
> -;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
> +;;; Copyright © 2018, 2023 Arun Isaac <arunisaac <at> systemreboot.net>
>  ;;; Copyright © 2019 Jovany Leandro G.C <bit4bit <at> riseup.net>
>  ;;; Copyright © 2019 Kei Kebreau <kkebreau <at> posteo.net>
>  ;;; Copyright © 2019, 2020 Alex Griffin <a <at> ajgrf.com>
> @@ -1104,9 +1104,6 @@ (define-public cgit
>                  "html-converters/md2html"))
>               #t)))))
>      (native-inputs
> -     ;; For building manpage.
> -     (list asciidoc gzip bzip2 xz))
> -    (inputs
>       `(;; Building cgit requires a Git source tree.
>         ("git-source"
>          ,(origin
> @@ -1116,13 +1113,15 @@ (define-public cgit
>             (uri "mirror://kernel.org/software/scm/git/git-
> 2.25.4.tar.xz")
>             (sha256
>              (base32
> "11am6s46wmn1yll5614smjhzlghbqq6gysgcs64igjr9y5wzpdxq"))))
> -       ("openssl" ,openssl)
> -       ("groff" ,groff)
> -       ("python" ,python)
> -       ("python-docutils" ,python-docutils)
> -       ("python-markdown" ,python-markdown)
> -       ("python-pygments" ,python-pygments)
> -       ("zlib" ,zlib)))
> +       ;; For building manpage.
> +       ("asciidoc" ,asciidoc)
> +       ("gzip" ,gzip)
> +       ("bzip2" ,bzip2)
> +       ("xz" ,xz)))
> +    (inputs
> +     (list openssl groff
> +           python python-docutils python-markdown python-pygments
> +           zlib))
This patch is broken and it doesn't appear to get fixed in 4/7.  If you
want git-source to be in native-inputs, you need to use (or native-
inputs inputs).

Most of these patches are not really atomic, depending on each other to
make sense.  I'd instead possibly do the following:
3
[1, 2, 4, 5] squashed into a single commit
6
7

In 7, you might want to use /bin/sh if the compatibility is meant for
stuff that actually lands in the store.

Cheers

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.