[PATCH] build: Fix errors in "make dist"

[PATCH] build: Fix errors in "make dist"

[John Darrington]

* Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
* gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
"/gnu/store/..."
---
 Makefile.am                                                    | 1 -
 gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0de2e09..8069241 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -391,7 +391,6 @@ EXTRA_DIST =						\
   build-aux/compile-all.scm				\
   build-aux/hydra/evaluate.scm				\
   build-aux/hydra/gnu-system.scm			\
-  build-aux/hydra/demo-os.scm				\
   build-aux/hydra/guix.scm				\
   build-aux/check-available-binaries.scm		\
   build-aux/check-final-inputs-self-contained.scm	\
diff --git a/gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch b/gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch
index 03093e8..3648f02 100644
--- a/gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch
+++ b/gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch
@@ -6,7 +6,7 @@ expected, which manifest like this:
 E       hypothesis.errors.FailedHealthCheck: Data generation is extremely slow: Only produced 4 valid examples in 1.08 seconds (1 invalid ones and 0 exceeded maximum size). Try decreasing size of the data you're generating (with e.g.average_size or max_leaves parameters).
 E       See http://hypothesis.readthedocs.org/en/latest/healthchecks.html for more information about this. If you want to disable just this health check, add HealthCheck.too_slowto the suppress_health_check settings for this test.
 
-/gnu/store/b8d1r8bilvm3jkncgrpvmg3dni9cgcr1-python-hypothesis-3.1.0/lib/python3.5/site-packages/hypothesis/core.py:296: FailedHealthCheck
+[store]...-python-hypothesis-3.1.0/lib/python3.5/site-packages/hypothesis/core.py:296: FailedHealthCheck
 ------
 
 Patch copied from upstream source repository:
-- 
2.1.4

Re: [PATCH] build: Fix errors in "make dist"

[Leo Famulari]

On Tue, Feb 21, 2017 at 08:29:18PM +0100, John Darrington wrote:
> * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
> * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
> "/gnu/store/..."

Interesting, what goes wrong?

Re: [PATCH] build: Fix errors in "make dist"

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

On Tue, Feb 21, 2017 at 03:37:36PM -0500, Leo Famulari wrote:
     On Tue, Feb 21, 2017 at 08:29:18PM +0100, John Darrington wrote:
     > * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
     > * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
     > "/gnu/store/..."
     
     Interesting, what goes wrong?

Why don't you try it?


-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] build: Fix errors in "make dist"

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

On Tue, Feb 21, 2017 at 09:46:19PM +0100, John Darrington wrote:
> On Tue, Feb 21, 2017 at 03:37:36PM -0500, Leo Famulari wrote:
>      On Tue, Feb 21, 2017 at 08:29:18PM +0100, John Darrington wrote:
>      > * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
>      > * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
>      > "/gnu/store/..."
>      
>      Interesting, what goes wrong?
> 
> Why don't you try it?

I did try to run `make dist`, but I was missing `convert` from
ImageMagick. I added that to my environment, but then I was missing
Perl. I thought it might be faster for you to share the information you
have about the problem than for me to learn how to run `make dist`.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] build: Fix errors in "make dist"

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]

On Tue, Feb 21, 2017 at 03:48:45PM -0500, Leo Famulari wrote:
     On Tue, Feb 21, 2017 at 09:46:19PM +0100, John Darrington wrote:
     > On Tue, Feb 21, 2017 at 03:37:36PM -0500, Leo Famulari wrote:
     >      On Tue, Feb 21, 2017 at 08:29:18PM +0100, John Darrington wrote:
     >      > * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
     >      > * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
     >      > "/gnu/store/..."
     >      
     >      Interesting, what goes wrong?
     > 
     > Why don't you try it?
     
     I did try to run `make dist`, but I was missing `convert` from
     ImageMagick. I added that to my environment, but then I was missing
     Perl. I thought it might be faster for you to share the information you
     have about the problem than for me to learn how to run `make dist`.

"guix environment guix" will create an environment with everything you need.

Compiling Scheme modules...
make[1]: *** No rule to make target 'build-aux/hydra/demo-os.scm', needed by 'distdir'.  Stop.
...
guix-0.12.0/gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch:/gnu/store/b8d1r8bilvm3jkncgrpvmg3dni9cgcr1-python-hypothesis-3.1.0/lib/python3.5/site-packages/hypothesis/core.py:296: FailedHealthCheck
error: store file names embedded in the distribution
make[2]: *** [Makefile:5048: assert-no-store-file-names] Error 1
make[2]: Leaving directory '/home/john/guix'
make[1]: *** [Makefile:4341: distdir] Error 2
make[1]: Leaving directory '/home/john/guix'
make: *** [Makefile:4439: dist] Error 2




-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] build: Fix errors in "make dist"

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

On Tue, Feb 21, 2017 at 09:52:21PM +0100, John Darrington wrote:
> "guix environment guix" will create an environment with everything you need.

I had tried `guix environment --pure guix`, and got this:

  GEN      gen-ChangeLog
./build-aux/gitlog-to-changelog: line 1: exec: perl: not found
  GEN      gen-AUTHORS
In execvp of git: No such file or directory
Backtrace:
In ice-9/boot-9.scm:
 160: 10 [catch #t #<catch-closure 1964e40> ...]
In unknown file:
   ?: 9 [apply-smob/1 #<catch-closure 1964e40>]
In ice-9/boot-9.scm:
  66: 8 [call-with-prompt prompt0 ...]
In ice-9/eval.scm:
 432: 7 [eval # #]
In ice-9/boot-9.scm:
2404: 6 [save-module-excursion #<procedure 1984980 at ice-9/boot-9.scm:4051:3 ()>]
4058: 5 [#<procedure 1984980 at ice-9/boot-9.scm:4051:3 ()>]
In build-aux/generate-authors.scm:
 115: 4 [#<procedure 1a54ba0 ()>]
  80: 3 [generate-authors-file "guix-0.12.0/AUTHORS"]
In unknown file:
   ?: 2 [find #<procedure 1f0e5c0 at build-aux/generate-authors.scm:80:10 (tag)> #]
In build-aux/generate-authors.scm:
  82: 1 [#<procedure 1f0e5c0 at build-aux/generate-authors.scm:80:10 (tag)> ""]
In unknown file:
   ?: 0 [substring "" 1 #<undefined>]

ERROR: In procedure substring:
ERROR: Value out of range 0 to 0: 1
make[2]: *** [Makefile:5039: gen-AUTHORS] Error 1
make[2]: Leaving directory '/home/leo/work/guix'
make[1]: *** [Makefile:4341: distdir] Error 2
make[1]: Leaving directory '/home/leo/work/guix'
make: *** [Makefile:4439: dist] Error 2

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] build: Fix errors in "make dist"

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

On Tue, Feb 21, 2017 at 03:37:36PM -0500, Leo Famulari wrote:
     On Tue, Feb 21, 2017 at 08:29:18PM +0100, John Darrington wrote:
     > * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
     > * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
     > "/gnu/store/..."
     
     Interesting, what goes wrong?

Compiling Scheme modules...
make[1]: *** No rule to make target 'build-aux/hydra/demo-os.scm', needed by 'distdir'.
...
guix-0.12.0/gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch:/gnu/store/b8d1r8bilvm3jkncgrpvmg3dni9cgcr1-python-hypothesis-3.1.0/lib/python3.5/site-packages/hypothesis/core.py:296: FailedHealthCheck
error: store file names embedded in the distribution
make[2]: *** [Makefile:5048: assert-no-store-file-names] Error 1
make[2]: Leaving directory '/home/john/guix'
make[1]: *** [Makefile:4341: distdir] Error 2
make[1]: Leaving directory '/home/john/guix'
make: *** [Makefile:4439: dist] Error 2

-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] build: Fix errors in "make dist"

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 928 bytes --]

On Tue, Feb 21, 2017 at 09:49:55PM +0100, John Darrington wrote:
> On Tue, Feb 21, 2017 at 03:37:36PM -0500, Leo Famulari wrote:
>      On Tue, Feb 21, 2017 at 08:29:18PM +0100, John Darrington wrote:
>      > * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
>      > * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
>      > "/gnu/store/..."
>      
>      Interesting, what goes wrong?
> 
> Compiling Scheme modules...
> make[1]: *** No rule to make target 'build-aux/hydra/demo-os.scm', needed by 'distdir'.
> ...
> guix-0.12.0/gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch:/gnu/store/b8d1r8bilvm3jkncgrpvmg3dni9cgcr1-python-hypothesis-3.1.0/lib/python3.5/site-packages/hypothesis/core.py:296: FailedHealthCheck
> error: store file names embedded in the distribution

Ah, I had not considered this issue when making that patch. Thank you
for fixing it!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] build: Fix errors in "make dist"

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm
> * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: Remove
> "/gnu/store/..."

Good catch.  Looks like this hasn't been applied yet.  Please push!

Thanks,
Ludo’.