From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7PLL-0003jD-1K for guix-patches@gnu.org; Sat, 14 Apr 2018 13:52:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7PLG-00016g-Rf for guix-patches@gnu.org; Sat, 14 Apr 2018 13:52:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44666) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7PLG-000166-Km for guix-patches@gnu.org; Sat, 14 Apr 2018 13:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f7PLG-0004ZP-5d for guix-patches@gnu.org; Sat, 14 Apr 2018 13:52:02 -0400 Subject: [bug#30884] Status: [PATCH 0/6] gnu: Add emacs-epkg. References: <20180320162956.11860-1-go.wigust@gmail.com> Resent-Message-ID: From: Oleg Pykhalov Date: Sat, 14 Apr 2018 20:50:47 +0300 In-Reply-To: bug's message of "Sat\, 14 Apr 2018 17\:22\:04 +0000" Message-ID: <87tvsdk77s.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: bug#30884 <30884@debbugs.gnu.org> --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Ludovic, Thank you for review! I've applied all your suggestions except =E2=80=98set-emacs-load-path=E2=80= =99. First of all this procedure is not exported. Another pitfall is =E2=80=98Invalid keyword=E2=80=99 error. --=-=-= Content-Type: text/x-patch Content-Disposition: inline Content-Description: Use set-emacs-load-path diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6258dbaed..d290a61b4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7733,7 +7733,8 @@ object has been freed.") ,@%gnu-build-system-modules (guix build emacs-utils)) #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) + (guix build emacs-utils) + (guix build emacs-build-system)) #:phases (modify-phases %standard-phases (delete 'configure) @@ -7744,22 +7745,8 @@ object has been freed.") #t)) (add-after 'patch-elisp-shell-shebangs 'setenv-emacsloadpath (lambda* (#:key inputs #:allow-other-keys) - (define (el-dir store-dir) - (match (find-files store-dir "\\.el$") - ((f1 f2 ...) (dirname f1)) - (_ ""))) - (define emacs-prefix? (cut string-prefix? "emacs-" <>)) - (let* ((emacs-load-paths - (map (match-lambda - (((? emacs-prefix? name) . dir) - (string-append (el-dir dir) ":")) - (_ "")) - inputs)) - (emacs-load-path-value - (string-concatenate emacs-load-paths))) - (format #t "environment variable `EMACSLOADPATH' set to ~a\n" - emacs-load-path-value) - (setenv "EMACSLOADPATH" emacs-load-path-value)) + ((@@ (guix build emacs-build-system) set-emacs-load-path) + inputs) #t)) (add-after 'setenv-emacsloadpath 'setenv-shell (lambda _ --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env env GUIX_PACKAGE_PATH=3D guix build --no-grafts emacs-emacsql ;;; note: source file /home/natsu/src/guix/gnu/packages/emacs.scm ;;; newer than compiled /home/natsu/src/guix/gnu/packages/emacs.go ;;; note: source file /home/natsu/src/guix/gnu/packages/emacs.scm ;;; newer than compiled /home/natsu/.guix-profile/lib/guile/2.2/site-= ccache/gnu/packages/emacs.go ;;; note: source file /home/natsu/src/guix/gnu/packages/emacs.scm ;;; newer than compiled /run/current-system/profile/lib/guile/2.2/sit= e-ccache/gnu/packages/emacs.go substitute: updating list of substitutes from 'https://berlin.guixsd.org'..= . 100.0% substitute: updating list of substitutes from 'https://mirror.hydra.gnu.org= '... 100.0% substitute: updating list of substitutes from 'https://hydra.gnu.org'... 10= 0.0% The following derivation will be built: /gnu/store/zjfh5lf4gaxrliwsihj9i80x9n15smkn-emacs-emacsql-2.0.3.drv @ build-started /gnu/store/zjfh5lf4gaxrliwsihj9i80x9n15smkn-emacs-emacsql-2= .0.3.drv - x86_64-linux /var/log/guix/drvs/zj//fh5lf4gaxrliwsihj9i80x9n15sm= kn-emacs-emacsql-2.0.3.drv.bz2 starting phase `set-SOURCE-DATE-EPOCH' phase `set-SOURCE-DATE-EPOCH' succeeded after 0.0 seconds starting phase `set-paths' environment variable `PATH' set to `/gnu/store/k9slb2ysqp2n82pl6knb2isapav8= 1dvx-tar-1.29/bin:/gnu/store/4r1g01m0isdfd4ahd8qigfp04276biv3-gzip-1.8/bin:= /gnu/store/77l8sxh9py133cy1p9kypshji4q9wv0w-bzip2-1.0.6/bin:/gnu/store/kgaf= 671a9a76k0ql1pwwjxjbj80x22mj-xz-5.2.3/bin:/gnu/store/p7vdir85501lq7qsgrx5z2= yrr0py26h1-file-5.32/bin:/gnu/store/rp61rxvajx4w1k0ci2nqi10y8xgds53b-diffut= ils-3.6/bin:/gnu/store/5gq1gn722zpz1crsnfmxij21zdxqj37x-patch-2.7.5/bin:/gn= u/store/z24b9d81w7bfcyk3j73xixygwx2ymlhv-sed-4.4/bin:/gnu/store/0qxdnkyh0cq= wflxhqa4v4vsjwff08j9p-findutils-4.6.0/bin:/gnu/store/1ymg8yf9imgw8ac4n3i611= nsv1mb4643-gawk-4.1.4/bin:/gnu/store/5jhfm3r3h7cjl8qqc86rx70nw7bzizpf-grep-= 3.1/bin:/gnu/store/6i33ik7haav0hd5a797l3llkq04ghx6g-coreutils-8.28/bin:/gnu= /store/vj24ah9a4kqsyhim2s4n6gvc4hsxhnli-make-4.2.1/bin:/gnu/store/icz3hd36a= qpjz5slyp4hhr8wsfbgiml1-bash-minimal-4.4.12/bin:/gnu/store/37h89zknsp0p6nss= zc1n4lyxc9s393ak-ld-wrapper-0/bin:/gnu/store/j7gsbkgq72qjas7plzvak40ymf0yba= mq-binutils-2.28.1/bin:/gnu/store/cfdn69spjc44x4sd0acrwhxq6yay3rbc-gcc-5.5.= 0/bin:/gnu/store/n6acaivs0jwiwpidjr551dhdni5kgpcr-glibc-2.26.105-g0890d5379= c/bin:/gnu/store/n6acaivs0jwiwpidjr551dhdni5kgpcr-glibc-2.26.105-g0890d5379= c/sbin:/gnu/store/10sdmjxi2qv1z4v3pzsvhj7ycv62bi0n-emacs-minimal-25.3/bin:/= gnu/store/vhdmylfq7vdfrpj0xqyf9kp833v6akbs-mysql-5.7.21/bin:/gnu/store/z0py= jzkv6c8mr3i9z6hmvnskf7471lbf-postgresql-10.3/bin' environment variable `BASH_LOADABLES_PATH' unset environment variable `C_INCLUDE_PATH' set to `/gnu/store/77l8sxh9py133cy1p9= kypshji4q9wv0w-bzip2-1.0.6/include:/gnu/store/kgaf671a9a76k0ql1pwwjxjbj80x2= 2mj-xz-5.2.3/include:/gnu/store/p7vdir85501lq7qsgrx5z2yrr0py26h1-file-5.32/= include:/gnu/store/1ymg8yf9imgw8ac4n3i611nsv1mb4643-gawk-4.1.4/include:/gnu= /store/vj24ah9a4kqsyhim2s4n6gvc4hsxhnli-make-4.2.1/include:/gnu/store/j7gsb= kgq72qjas7plzvak40ymf0ybamq-binutils-2.28.1/include:/gnu/store/cfdn69spjc44= x4sd0acrwhxq6yay3rbc-gcc-5.5.0/include:/gnu/store/n6acaivs0jwiwpidjr551dhdn= i5kgpcr-glibc-2.26.105-g0890d5379c/include:/gnu/store/vhdmylfq7vdfrpj0xqyf9= kp833v6akbs-mysql-5.7.21/include:/gnu/store/z0pyjzkv6c8mr3i9z6hmvnskf7471lb= f-postgresql-10.3/include:/gnu/store/yqahwgll57j88bq275m4xvifg9x3alsb-linux= -libre-headers-4.9.59/include' environment variable `CPLUS_INCLUDE_PATH' set to `/gnu/store/77l8sxh9py133c= y1p9kypshji4q9wv0w-bzip2-1.0.6/include:/gnu/store/kgaf671a9a76k0ql1pwwjxjbj= 80x22mj-xz-5.2.3/include:/gnu/store/p7vdir85501lq7qsgrx5z2yrr0py26h1-file-5= .32/include:/gnu/store/1ymg8yf9imgw8ac4n3i611nsv1mb4643-gawk-4.1.4/include:= /gnu/store/vj24ah9a4kqsyhim2s4n6gvc4hsxhnli-make-4.2.1/include:/gnu/store/j= 7gsbkgq72qjas7plzvak40ymf0ybamq-binutils-2.28.1/include:/gnu/store/cfdn69sp= jc44x4sd0acrwhxq6yay3rbc-gcc-5.5.0/include:/gnu/store/n6acaivs0jwiwpidjr551= dhdni5kgpcr-glibc-2.26.105-g0890d5379c/include:/gnu/store/vhdmylfq7vdfrpj0x= qyf9kp833v6akbs-mysql-5.7.21/include:/gnu/store/z0pyjzkv6c8mr3i9z6hmvnskf74= 71lbf-postgresql-10.3/include:/gnu/store/yqahwgll57j88bq275m4xvifg9x3alsb-l= inux-libre-headers-4.9.59/include' environment variable `LIBRARY_PATH' set to `/gnu/store/77l8sxh9py133cy1p9ky= pshji4q9wv0w-bzip2-1.0.6/lib:/gnu/store/kgaf671a9a76k0ql1pwwjxjbj80x22mj-xz= -5.2.3/lib:/gnu/store/p7vdir85501lq7qsgrx5z2yrr0py26h1-file-5.32/lib:/gnu/s= tore/1ymg8yf9imgw8ac4n3i611nsv1mb4643-gawk-4.1.4/lib:/gnu/store/j7gsbkgq72q= jas7plzvak40ymf0ybamq-binutils-2.28.1/lib:/gnu/store/n6acaivs0jwiwpidjr551d= hdni5kgpcr-glibc-2.26.105-g0890d5379c/lib:/gnu/store/hrhxx37z97j7pniyr437il= lc0b5qq9pa-glibc-2.26.105-g0890d5379c-static/lib:/gnu/store/q7jz2as54ycdvjg= 7zggxxjkxjrp6d5mr-glibc-utf8-locales-2.26.105-g0890d5379c/lib:/gnu/store/vh= dmylfq7vdfrpj0xqyf9kp833v6akbs-mysql-5.7.21/lib:/gnu/store/z0pyjzkv6c8mr3i9= z6hmvnskf7471lbf-postgresql-10.3/lib' environment variable `GUIX_LOCPATH' set to `/gnu/store/q7jz2as54ycdvjg7zggx= xjkxjrp6d5mr-glibc-utf8-locales-2.26.105-g0890d5379c/lib/locale' environment variable `INFOPATH' set to `/gnu/store/k9slb2ysqp2n82pl6knb2isa= pav81dvx-tar-1.29/share/info:/gnu/store/4r1g01m0isdfd4ahd8qigfp04276biv3-gz= ip-1.8/share/info:/gnu/store/rp61rxvajx4w1k0ci2nqi10y8xgds53b-diffutils-3.6= /share/info:/gnu/store/z24b9d81w7bfcyk3j73xixygwx2ymlhv-sed-4.4/share/info:= /gnu/store/0qxdnkyh0cqwflxhqa4v4vsjwff08j9p-findutils-4.6.0/share/info:/gnu= /store/1ymg8yf9imgw8ac4n3i611nsv1mb4643-gawk-4.1.4/share/info:/gnu/store/5j= hfm3r3h7cjl8qqc86rx70nw7bzizpf-grep-3.1/share/info:/gnu/store/6i33ik7haav0h= d5a797l3llkq04ghx6g-coreutils-8.28/share/info:/gnu/store/vj24ah9a4kqsyhim2s= 4n6gvc4hsxhnli-make-4.2.1/share/info:/gnu/store/icz3hd36aqpjz5slyp4hhr8wsfb= giml1-bash-minimal-4.4.12/share/info:/gnu/store/j7gsbkgq72qjas7plzvak40ymf0= ybamq-binutils-2.28.1/share/info:/gnu/store/cfdn69spjc44x4sd0acrwhxq6yay3rb= c-gcc-5.5.0/share/info:/gnu/store/n6acaivs0jwiwpidjr551dhdni5kgpcr-glibc-2.= 26.105-g0890d5379c/share/info:/gnu/store/10sdmjxi2qv1z4v3pzsvhj7ycv62bi0n-e= macs-minimal-25.3/share/info' phase `set-paths' succeeded after 0.0 seconds starting phase `install-locale' using 'en_US.utf8' locale for category "LC_ALL" phase `install-locale' succeeded after 0.0 seconds starting phase `unpack' emacsql-2.0.3/ emacsql-2.0.3/.dir-locals.el emacsql-2.0.3/.gitignore emacsql-2.0.3/Makefile emacsql-2.0.3/README.md emacsql-2.0.3/UNLICENSE emacsql-2.0.3/emacsql-compiler.el emacsql-2.0.3/emacsql-mysql.el emacsql-2.0.3/emacsql-pg.el emacsql-2.0.3/emacsql-psql.el emacsql-2.0.3/emacsql-sqlite.el emacsql-2.0.3/emacsql-system.el emacsql-2.0.3/emacsql.el emacsql-2.0.3/sqlite/ emacsql-2.0.3/sqlite/.gitignore emacsql-2.0.3/sqlite/Makefile emacsql-2.0.3/sqlite/emacsql.c emacsql-2.0.3/sqlite/sqlite3.c emacsql-2.0.3/sqlite/sqlite3.h emacsql-2.0.3/tests/ emacsql-2.0.3/tests/.nosearch emacsql-2.0.3/tests/emacsql-compiler-tests.el emacsql-2.0.3/tests/emacsql-external-tests.el emacsql-2.0.3/tests/emacsql-tests.el phase `unpack' succeeded after 0.0 seconds starting phase `patch-usr-bin-file' phase `patch-usr-bin-file' succeeded after 0.0 seconds starting phase `patch-source-shebangs' phase `patch-source-shebangs' succeeded after 0.0 seconds starting phase `patch-generated-file-shebangs' phase `patch-generated-file-shebangs' succeeded after 0.0 seconds starting phase `patch-elisp-shell-shebangs' phase `patch-elisp-shell-shebangs' succeeded after 0.0 seconds starting phase `setenv-emacsloadpath' Backtrace: 5 (primitive-load "/gnu/store/qr6bdp56ccgnj02znamwngjvlpp=E2=80= =A6") In ice-9/eval.scm: 191:35 4 (_ #f) In srfi/srfi-1.scm: 863:16 3 (every1 # =E2=80=A6) In /gnu/store/dniwjwywb9lkdxwa6sn3hcpm4bbm6r32-module-import/guix/build/gnu= -build-system.scm: 711:27 2 (_ _) In ice-9/eval.scm: 619:8 1 (_ #(#(#) (("s=E2=80=A6" . #) = =E2=80=A6))) In /gnu/store/dniwjwywb9lkdxwa6sn3hcpm4bbm6r32-module-import/guix/build/ema= cs-build-system.scm: 77:0 0 (set-emacs-load-path #:inputs _) /gnu/store/dniwjwywb9lkdxwa6sn3hcpm4bbm6r32-module-import/guix/build/emacs-= build-system.scm:77:0: In procedure set-emacs-load-path: Invalid keyword: (("source" . "/gnu/store/304az1rlv6nbmfq661yfv4r89y6z4dpb-= emacs-emacsql-2.0.3.tar.gz") ("tar" . "/gnu/store/k9slb2ysqp2n82pl6knb2isap= av81dvx-tar-1.29") ("gzip" . "/gnu/store/4r1g01m0isdfd4ahd8qigfp04276biv3-g= zip-1.8") ("bzip2" . "/gnu/store/77l8sxh9py133cy1p9kypshji4q9wv0w-bzip2-1.0= .6") ("xz" . "/gnu/store/kgaf671a9a76k0ql1pwwjxjbj80x22mj-xz-5.2.3") ("file= " . "/gnu/store/p7vdir85501lq7qsgrx5z2yrr0py26h1-file-5.32") ("diffutils" .= "/gnu/store/rp61rxvajx4w1k0ci2nqi10y8xgds53b-diffutils-3.6") ("patch" . "/= gnu/store/5gq1gn722zpz1crsnfmxij21zdxqj37x-patch-2.7.5") ("sed" . "/gnu/sto= re/z24b9d81w7bfcyk3j73xixygwx2ymlhv-sed-4.4") ("findutils" . "/gnu/store/0q= xdnkyh0cqwflxhqa4v4vsjwff08j9p-findutils-4.6.0") ("gawk" . "/gnu/store/1ymg= 8yf9imgw8ac4n3i611nsv1mb4643-gawk-4.1.4") ("grep" . "/gnu/store/5jhfm3r3h7c= jl8qqc86rx70nw7bzizpf-grep-3.1") ("coreutils" . "/gnu/store/6i33ik7haav0hd5= a797l3llkq04ghx6g-coreutils-8.28") ("make" . "/gnu/store/vj24ah9a4kqsyhim2s= 4n6gvc4hsxhnli-make-4.2.1") ("bash" . "/gnu/store/icz3hd36aqpjz5slyp4hhr8ws= fbgiml1-bash-minimal-4.4.12") ("ld-wrapper" . "/gnu/store/37h89zknsp0p6nssz= c1n4lyxc9s393ak-ld-wrapper-0") ("binutils" . "/gnu/store/j7gsbkgq72qjas7plz= vak40ymf0ybamq-binutils-2.28.1") ("gcc" . "/gnu/store/cfdn69spjc44x4sd0acrw= hxq6yay3rbc-gcc-5.5.0") ("libc" . "/gnu/store/n6acaivs0jwiwpidjr551dhdni5kg= pcr-glibc-2.26.105-g0890d5379c") ("libc:static" . "/gnu/store/hrhxx37z97j7p= niyr437illc0b5qq9pa-glibc-2.26.105-g0890d5379c-static") ("locales" . "/gnu/= store/q7jz2as54ycdvjg7zggxxjkxjrp6d5mr-glibc-utf8-locales-2.26.105-g0890d53= 79c") ("emacs-minimal" . "/gnu/store/10sdmjxi2qv1z4v3pzsvhj7ycv62bi0n-emacs= -minimal-25.3") ("mysql" . "/gnu/store/vhdmylfq7vdfrpj0xqyf9kp833v6akbs-mys= ql-5.7.21") ("postgresql" . "/gnu/store/z0pyjzkv6c8mr3i9z6hmvnskf7471lbf-po= stgresql-10.3") ("emacs-finalize" . "/gnu/store/dz0glc49z7nlx37fcjdf3w9gd73= 6cbib-emacs-finalize-2.0.0") ("emacs-pg" . "/gnu/store/jhqq4v9i6d9zl248z10n= mdvk7l8m3h6g-emacs-pg-0.1-1.4f6516e") ("kernel-headers" . "/gnu/store/yqahw= gll57j88bq275m4xvifg9x3alsb-linux-libre-headers-4.9.59") ("emacs-cl-generic= " . "/gnu/store/d5lnalnrxa2ia2hjzbs2bqw4srlr9777-emacs-cl-generic-0.3")) builder for `/gnu/store/zjfh5lf4gaxrliwsihj9i80x9n15smkn-emacs-emacsql-2.0.= 3.drv' failed with exit code 1 @ build-failed /gnu/store/zjfh5lf4gaxrliwsihj9i80x9n15smkn-emacs-emacsql-2.= 0.3.drv - 1 builder for `/gnu/store/zjfh5lf4gaxrliwsihj9i80x9n15smkn-emacs-= emacsql-2.0.3.drv' failed with exit code 1 guix build: error: build failed: build of `/gnu/store/zjfh5lf4gaxrliwsihj9i= 80x9n15smkn-emacs-emacsql-2.0.3.drv' failed =2D-8<---------------cut here---------------end--------------->8--- I've fixed all linter warnings reported by this command: =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env env GUIX_PACKAGE_PATH=3D guix lint $(PAGER=3D git log --onel= ine | head -n 6 | cut -d ' ' -f 4 | sed 's/\.//' | tr '\n' ' ') =2D-8<---------------cut here---------------end--------------->8--- Also I've tested an Emacs =E2=80=98epkg-list-packages=E2=80=99 procedure in= side: =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env env GUIX_PACKAGE_PATH=3D guix environment --no-grafts --ad-h= oc emacs-epkg emacs =2D-8<---------------cut here---------------end--------------->8--- I could push a set of patches without =E2=80=98set-emacs-load-path=E2=80=99= . WDYT? Oleg. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEc+OyAXw1EaDPCmAPckbhHGm3lWkFAlrSP3cACgkQckbhHGm3 lWnRuRAAyhEfU1YrEjze+X+g64PE5jR5xQHWJa7fg5hL+yQPEwrLS5JbVu3X4MFz KqKlWFVelIHW6YLtXX741zJJm2s2mJgdQ2kJVCSvWcqlbuKheUEUCUDj83wTXkAk vrpjjXY+aUQzSq1PTtSImzAacHUBAHqbJLF1vaPP+Ipjl0A3aLb5L6HA3dJ+QS4Y D/UM6Ss4ogAvLuE3AKt1qylzIywgp9vVPCpUv9UIPjU0N5Cvz0PQ1pXxF0pextBQ aHQdgHuMY/ciWUSSItkpJgcwxel4zogmPKTy+uUdfjPnlRnpFithky+neTRg3dIE u1uhFAjKZSprMdyjnM9PpBhb51ovliaxkp1ulH44anjHdfS3jpc4pmb8gCrme7So gdD2w54OJC1ymx+HA1aRHxjq6ONoM35da8vVc1ZFf9NIIZGhxPQ48Docnb2MC6lL ta8XGdAfN3bydUzDOgVzt+bCWJqsJJuiIAS+x2EGoTLLunrjDwlJwLggO7NyCQIC y8URxTpOUifcpqHJgmkTogbvu3P7DTz7A6/hXGkoqCiiVdLf2ijJwm8iDPtHVbZy dz+qNPUkqs7DpbFzT8IKNW+KCPmpZ+WdzrHS3FH0trhWAA0wbcyWmWsxtya/adiG f+XgCPv39+K5Br/mXvBk8JuwZVTXv5wx7Y10O659MRVPuFdR8qQ= =XV1l -----END PGP SIGNATURE----- --==-=-=--