guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#47540: [PATCH] gnu: Add prips.


From: Ludovic Courtès
Subject: bug#47540: [PATCH] gnu: Add prips.
Date: Mon, 12 Apr 2021 12:47:41 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)

Hi,

david larsson <david.larsson@selfhosted.xyz> skribis:

> From 85cf7b9d22801d9b3bac8956b358fce4c32dcb4c Mon Sep 17 00:00:00 2001
> From: methuselah-0 <david.larsson@selfhosted.xyz>
> Date: Thu, 8 Apr 2021 21:26:23 +0200
> Subject: [PATCH] gnu: Add prips.
>
> gnu/packages/admin.scm (prips): New variable.

[...]

> +                  (replace 'install
> +                    (lambda _
> +                      (let*
> +                          ((bin-dir  (string-append %output "/bin"))
> +                           (bin-file (string-append bin-dir "/prips")))
> +                        (mkdir-p bin-dir)
> +                        (copy-file "prips" bin-file)
> +                        (chmod bin-file #o600)))))))

That installed a non-executable file.  I fixed this with the patch
below, which also make the style more consistent.

Thanks David, and thanks Maxime for the review!

Ludo’.

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index f3e8774b75..512ac320e6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1070,13 +1070,10 @@ recursive runs on the generated subnets.  (also IPv6)
        #:phases (modify-phases %standard-phases
                   (delete 'configure)
                   (replace 'install
-                    (lambda _
-                      (let*
-                          ((bin-dir  (string-append %output "/bin"))
-                           (bin-file (string-append bin-dir "/prips")))
-                        (mkdir-p bin-dir)
-                        (copy-file "prips" bin-file)
-                        (chmod bin-file #o600)))))))
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (install-file "prips"
+                                      (string-append out "/bin"))))))))
     (native-inputs `(("perl-test-harness" ,perl-test-harness)))
     (synopsis "Tool that prints the IP addresses in a given range")
     (description "Prips can be used to print all of the IP addresses in

reply via email to

[Prev in Thread] Current Thread [Next in Thread]