From e5d6d9cfb21248106532bb005a7dfb4ea936e4f6 Mon Sep 17 00:00:00 2001 From: TakeV Date: Thu, 6 Jul 2023 21:54:37 -0700 Subject: [PATCH 1/6] Read local source for package --- guix.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/guix.scm b/guix.scm index ec71fe9..74d1a9d 100644 --- a/guix.scm +++ b/guix.scm @@ -3,17 +3,26 @@ ((guix licenses) #:prefix license:) (guix download) (guix build-system gnu) + (guix gexp) (gnu packages) (gnu packages autotools) (gnu packages guile) (gnu packages guile-xyz) (gnu packages pkg-config) - (gnu packages texinfo)) + (gnu packages texinfo) + (srfi srfi-1)) + +(define (keep-file? file stat) + (not (any (lambda (my-string) + (string-contains file my-string)) + (list ".git" ".dir-locals.el" "guix.scm")))) (package (name "gib-gab-gob") (version "0.1") - (source "./gib-gab-gob-0.1.tar.gz") + (source (local-file (dirname (current-filename)) + #:recursive? #t + #:select? keep-file?)) (build-system gnu-build-system) (arguments `(#:modules From 0f460487c12cdaf68973975d7587962ffa00d097 Mon Sep 17 00:00:00 2001 From: TakeV Date: Thu, 6 Jul 2023 22:04:03 -0700 Subject: [PATCH 2/6] Add copying and guix.scm files to hall --- hall.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hall.scm b/hall.scm index b0f99b2..1e11923 100644 --- a/hall.scm +++ b/hall.scm @@ -30,9 +30,11 @@ (in-file "make-initiator") (text-file "make-initiator") (text-file "make-joiner"))))) - (documentation ((org-file "README"))) + (documentation + ((text-file "COPYING") (org-file "README"))) (infrastructure - ((in-file "pre-inst-env") + ((scheme-file "guix") + (in-file "pre-inst-env") (directory "build-aux" ((tex-file "texinfo") From abe82b9532f0fa5dca160f1929e6bca62ce2d007 Mon Sep 17 00:00:00 2001 From: TakeV Date: Thu, 6 Jul 2023 22:28:28 -0700 Subject: [PATCH 3/6] Add helper autoconfig script and manifest.scm --- bootstrap.sh | 3 +++ manifest.scm | 5 +++++ 2 files changed, 8 insertions(+) create mode 100755 bootstrap.sh create mode 100644 manifest.scm diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..872167c --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +autoreconf -vif diff --git a/manifest.scm b/manifest.scm new file mode 100644 index 0000000..07242e4 --- /dev/null +++ b/manifest.scm @@ -0,0 +1,5 @@ +;; What follows is a "manifest" equivalent to the command line you gave. +;; You can store it in a file that you may then pass to any 'guix' command +;; that accepts a '--manifest' (or '-m') option. + +(specifications->manifest (list "tor")) From d98c5db39a3798df165ca988e7a22e950b4b058f Mon Sep 17 00:00:00 2001 From: TakeV Date: Thu, 6 Jul 2023 23:17:13 -0700 Subject: [PATCH 4/6] Let hall know about bootstrap.sh and the manifest --- hall.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hall.scm b/hall.scm index 1e11923..a494ea1 100644 --- a/hall.scm +++ b/hall.scm @@ -33,7 +33,9 @@ (documentation ((text-file "COPYING") (org-file "README"))) (infrastructure - ((scheme-file "guix") + ((shell-file "bootstrap") + (scheme-file "manifest") + (scheme-file "guix") (in-file "pre-inst-env") (directory "build-aux" From 138e328367d361fb34fb0f46e180dd727f4586c1 Mon Sep 17 00:00:00 2001 From: TakeV Date: Thu, 6 Jul 2023 23:18:10 -0700 Subject: [PATCH 5/6] Remove manifest --- manifest.scm | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 manifest.scm diff --git a/manifest.scm b/manifest.scm deleted file mode 100644 index 07242e4..0000000 --- a/manifest.scm +++ /dev/null @@ -1,5 +0,0 @@ -;; What follows is a "manifest" equivalent to the command line you gave. -;; You can store it in a file that you may then pass to any 'guix' command -;; that accepts a '--manifest' (or '-m') option. - -(specifications->manifest (list "tor")) From 1116ff27a5669f312885e02c4cf014b21664bcbe Mon Sep 17 00:00:00 2001 From: TakeV Date: Thu, 6 Jul 2023 23:19:47 -0700 Subject: [PATCH 6/6] Mess up hall's formating --- hall.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/hall.scm b/hall.scm index a494ea1..19a3a80 100644 --- a/hall.scm +++ b/hall.scm @@ -16,35 +16,32 @@ (files (libraries ((directory "gib-gab-gob" - ((compiled-scheme-file "game") - (scheme-file "rps") + ((compiled-scheme-file "board") + (compiled-scheme-file "game") (scheme-file "game") - (compiled-scheme-file "board") (scheme-file "board") + (scheme-file "rps") (compiled-scheme-file "rps"))))) - (tests ((directory "tests" ()))) + (tests ()) (programs ((directory "scripts" ((in-file "make-joiner") (in-file "make-initiator") - (text-file "make-initiator") - (text-file "make-joiner"))))) + (text-file "make-joiner") + (text-file "make-initiator"))))) (documentation - ((text-file "COPYING") (org-file "README"))) + ((org-file "README") (text-file "COPYING"))) (infrastructure - ((shell-file "bootstrap") - (scheme-file "manifest") - (scheme-file "guix") - (in-file "pre-inst-env") + ((automake-file "Makefile") + (autoconf-file "configure") + (text-file ".gitignore") + (scheme-file "hall") (directory "build-aux" - ((tex-file "texinfo") - (scheme-file "test-driver") + ((scheme-file "test-driver") (text-file "missing") - (text-file "install-sh") - (text-file "mdate-sh"))) - (scheme-file "hall") - (text-file ".gitignore") - (autoconf-file "configure") - (automake-file "Makefile"))))) + (text-file "install-sh"))) + (in-file "pre-inst-env") + (scheme-file "guix") + (shell-file "bootstrap")))))