You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

.dir-locals.el 5.3 KiB

build-system: Introduce "bags" as an intermediate representation. * guix/build-system.scm (<build-system>)[build, cross-build]: Remove. [lower]: New field. (<bag>): New record type. (make-bag): New procedure. * guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs, bag-transitive-host-inputs, bag-transitive-target-inputs, package->bag): New procedures. (package-derivation): Use it; use the bag, apply its build procedure, etc. (package-cross-derivation): Likewise. * gnu/packages/bootstrap.scm (raw-build, make-raw-bag): New procedure. (%bootstrap-guile): Use them. * guix/build-system/trivial.scm (lower): New procedure. (trivial-build, trivial-cross-build): Remove 'source' parameter. Pass INPUTS as is. (trivial-build-system): Adjust accordingly. * guix/build-system/gnu.scm (%store, inputs-search-paths, standard-search-paths, expand-inputs, standard-inputs): Remove. (gnu-lower): New procedure. (gnu-build): Remove 'source' and #:implicit-inputs? parameters. Remove 'implicit-inputs' and 'implicit-search-paths' variables. Get the source from INPUT-DRVS. (gnu-cross-build): Likewise. (standard-cross-packages): Remove call to 'standard-packages'. (standard-cross-inputs, standard-cross-search-paths): Remove. (gnu-build-system): Remove 'build' and 'cross-build'; add 'lower'. * guix/build-system/cmake.scm (lower): New procedure. (cmake-build): Remove 'source' and #:cmake parameters. Use INPUTS and SEARCH-PATHS as is. Get the source from INPUTS. * guix/build-system/perl.scm: Likewise. * guix/build-system/python.scm: Likewise. * guix/build-system/ruby.scm: Likewise. * gnu/packages/cross-base.scm (cross-gcc): Change "cross-linux-headers" to "linux-headers". (cross-libc)[xlinux-headers]: Pass #:implicit-cross-inputs? #f. Likewise. In 'propagated-inputs', change "cross-linux-headers" to "linux-headers". * guix/git-download.scm (git-fetch): Use 'standard-packages' instead of 'standard-inputs'. * tests/builders.scm ("gnu-build-system"): Remove use of 'build-system-builder'. ("gnu-build"): Remove 'source' and #:implicit-inputs? arguments to 'gnu-build'. * tests/packages.scm ("search paths"): Adjust to new build system API. ("package-cross-derivation, no cross builder"): Likewise. * doc/guix.texi (Build Systems): Add paragraph on bags.
6 years ago
Add (guix status) and use it for pretty colored output. * guix/progress.scm (progress-reporter/trace): New procedure. (%progress-interval): New variable. (progress-reporter/file): Use it. * guix/scripts/build.scm (set-build-options-from-command-line): Pass #:print-extended-build-trace?. (%default-options): Add 'print-extended-build-trace?'. (guix-build): Parameterize CURRENT-TERMINAL-COLUMNS. Use 'build-status-updater'. * guix/scripts/environment.scm (%default-options): Add 'print-extended-build-trace?'. (guix-environment): Wrap body in 'with-status-report'. * guix/scripts/pack.scm (%default-options): Add 'print-build-trace?' and 'print-extended-build-trace?'. (guix-pack): Wrap body in 'with-status-report'. * guix/scripts/package.scm (%default-options, guix-package): Likewise. * guix/scripts/system.scm (%default-options, guix-system): Likewise. * guix/scripts/pull.scm (%default-options, guix-pull): Likewise. * guix/scripts/substitute.scm (progress-report-port): Don't call STOP when TOTAL is zero. (process-substitution): Add #:print-build-trace? and honor it. (guix-substitute)[print-build-trace?]: New variable. Pass #:print-build-trace? to 'process-substitution'. * guix/status.scm: New file. * guix/store.scm (set-build-options): Add #:print-extended-build-trace?; pass it into PAIRS. (%protocol-version): Bump. (protocol-version, nix-server-version): New procedures. (current-store-protocol-version): New variable. (with-store, build-things): Parameterize it. * guix/ui.scm (build-output-port): Remove. (colorize-string): Export. * po/guix/POTFILES.in: Add guix/status.scm. * tests/status.scm: New file. * Makefile.am (SCM_TESTS): Add it. * nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump to 0x162. * nix/libstore/build.cc (DerivationGoal::registerOutputs) (SubstitutionGoal::finished): Print a "@ hash-mismatch" trace before throwing.
3 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106
  1. ;; Per-directory local variables for GNU Emacs 23 and later.
  2. ((nil
  3. . ((fill-column . 78)
  4. (tab-width . 8)
  5. (sentence-end-double-space . t)
  6. ;; For use with 'bug-reference-prog-mode'.
  7. (bug-reference-url-format . "http://bugs.gnu.org/%s")
  8. (bug-reference-bug-regexp
  9. . "<https?://\\(debbugs\\|bugs\\)\\.gnu\\.org/\\([0-9]+\\)>")))
  10. (c-mode . ((c-file-style . "gnu")))
  11. (scheme-mode
  12. .
  13. ((indent-tabs-mode . nil)
  14. (eval . (put 'eval-when 'scheme-indent-function 1))
  15. (eval . (put 'call-with-prompt 'scheme-indent-function 1))
  16. (eval . (put 'test-assert 'scheme-indent-function 1))
  17. (eval . (put 'test-assertm 'scheme-indent-function 1))
  18. (eval . (put 'test-equalm 'scheme-indent-function 1))
  19. (eval . (put 'test-equal 'scheme-indent-function 1))
  20. (eval . (put 'test-eq 'scheme-indent-function 1))
  21. (eval . (put 'call-with-input-string 'scheme-indent-function 1))
  22. (eval . (put 'guard 'scheme-indent-function 1))
  23. (eval . (put 'lambda* 'scheme-indent-function 1))
  24. (eval . (put 'substitute* 'scheme-indent-function 1))
  25. (eval . (put 'match-record 'scheme-indent-function 2))
  26. ;; 'modify-phases' and its keywords.
  27. (eval . (put 'modify-phases 'scheme-indent-function 1))
  28. (eval . (put 'replace 'scheme-indent-function 1))
  29. (eval . (put 'add-before 'scheme-indent-function 2))
  30. (eval . (put 'add-after 'scheme-indent-function 2))
  31. (eval . (put 'modify-services 'scheme-indent-function 1))
  32. (eval . (put 'with-directory-excursion 'scheme-indent-function 1))
  33. (eval . (put 'with-file-lock 'scheme-indent-function 1))
  34. (eval . (put 'with-file-lock/no-wait 'scheme-indent-function 1))
  35. (eval . (put 'with-profile-lock 'scheme-indent-function 1))
  36. (eval . (put 'package 'scheme-indent-function 0))
  37. (eval . (put 'origin 'scheme-indent-function 0))
  38. (eval . (put 'build-system 'scheme-indent-function 0))
  39. (eval . (put 'bag 'scheme-indent-function 0))
  40. (eval . (put 'graft 'scheme-indent-function 0))
  41. (eval . (put 'operating-system 'scheme-indent-function 0))
  42. (eval . (put 'file-system 'scheme-indent-function 0))
  43. (eval . (put 'manifest-entry 'scheme-indent-function 0))
  44. (eval . (put 'manifest-pattern 'scheme-indent-function 0))
  45. (eval . (put 'substitute-keyword-arguments 'scheme-indent-function 1))
  46. (eval . (put 'with-store 'scheme-indent-function 1))
  47. (eval . (put 'with-external-store 'scheme-indent-function 1))
  48. (eval . (put 'with-error-handling 'scheme-indent-function 0))
  49. (eval . (put 'with-mutex 'scheme-indent-function 1))
  50. (eval . (put 'with-atomic-file-output 'scheme-indent-function 1))
  51. (eval . (put 'call-with-compressed-output-port 'scheme-indent-function 2))
  52. (eval . (put 'call-with-decompressed-port 'scheme-indent-function 2))
  53. (eval . (put 'call-with-gzip-input-port 'scheme-indent-function 1))
  54. (eval . (put 'call-with-gzip-output-port 'scheme-indent-function 1))
  55. (eval . (put 'call-with-lzip-input-port 'scheme-indent-function 1))
  56. (eval . (put 'call-with-lzip-output-port 'scheme-indent-function 1))
  57. (eval . (put 'signature-case 'scheme-indent-function 1))
  58. (eval . (put 'emacs-batch-eval 'scheme-indent-function 0))
  59. (eval . (put 'emacs-batch-edit-file 'scheme-indent-function 1))
  60. (eval . (put 'emacs-substitute-sexps 'scheme-indent-function 1))
  61. (eval . (put 'emacs-substitute-variables 'scheme-indent-function 1))
  62. (eval . (put 'with-derivation-narinfo 'scheme-indent-function 1))
  63. (eval . (put 'with-derivation-substitute 'scheme-indent-function 2))
  64. (eval . (put 'with-status-report 'scheme-indent-function 1))
  65. (eval . (put 'with-status-verbosity 'scheme-indent-function 1))
  66. (eval . (put 'with-build-handler 'scheme-indent-function 1))
  67. (eval . (put 'mlambda 'scheme-indent-function 1))
  68. (eval . (put 'mlambdaq 'scheme-indent-function 1))
  69. (eval . (put 'syntax-parameterize 'scheme-indent-function 1))
  70. (eval . (put 'with-monad 'scheme-indent-function 1))
  71. (eval . (put 'mbegin 'scheme-indent-function 1))
  72. (eval . (put 'mwhen 'scheme-indent-function 1))
  73. (eval . (put 'munless 'scheme-indent-function 1))
  74. (eval . (put 'mlet* 'scheme-indent-function 2))
  75. (eval . (put 'mlet 'scheme-indent-function 2))
  76. (eval . (put 'run-with-store 'scheme-indent-function 1))
  77. (eval . (put 'run-with-state 'scheme-indent-function 1))
  78. (eval . (put 'wrap-program 'scheme-indent-function 1))
  79. (eval . (put 'with-imported-modules 'scheme-indent-function 1))
  80. (eval . (put 'with-extensions 'scheme-indent-function 1))
  81. (eval . (put 'with-parameters 'scheme-indent-function 1))
  82. (eval . (put 'with-database 'scheme-indent-function 2))
  83. (eval . (put 'call-with-transaction 'scheme-indent-function 2))
  84. (eval . (put 'call-with-container 'scheme-indent-function 1))
  85. (eval . (put 'container-excursion 'scheme-indent-function 1))
  86. (eval . (put 'eventually 'scheme-indent-function 1))
  87. (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1))
  88. (eval . (put 'with-temporary-git-repository 'scheme-indent-function 2))
  89. ;; This notably allows '(' in Paredit to not insert a space when the
  90. ;; preceding symbol is one of these.
  91. (eval . (modify-syntax-entry ?~ "'"))
  92. (eval . (modify-syntax-entry ?$ "'"))
  93. (eval . (modify-syntax-entry ?+ "'"))))
  94. (emacs-lisp-mode . ((indent-tabs-mode . nil)))
  95. (texinfo-mode . ((indent-tabs-mode . nil)
  96. (fill-column . 72))))