nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,725 Commits 1 Branch 0 Tags 104 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
Mark H Weaver 1212999868 union: Rewrite to be faster; handle symlink/directory conflicts. 
* guix/build/union.scm: Rewrite; only 'file=?' remains unchanged.  Remove
  'tree-union' and 'delete-duplicate-leaves' exports.  Merge inputs in a
  breadth-first fashion.  Follow symlinks for purposes of making decisions
  about the merge.

* tests/union.scm: Remove tests of 'tree-union' and 'delete-duplicate-leaves'.
 2014-04-02 15:31:46 -04:00
Ludovic Courtès 6ede17ca69 union: Do not compare directories upon collision. 
* guix/build/union.scm (file=?): Return #f if FILE1 and FILE2 are not
  regular files.  Fixes a bug whereby collisions among directories would
  lead to the invocation of 'file=?' and thus 'call-with-input-file' on
  directories.  Reported by Mark H. Weaver <mhw@netris.org>.
 2014-02-10 00:05:39 +01:00
Ludovic Courtès cdbca518ca union: Do not warn when identical files collide. 
* guix/build/union.scm (file=?): New procedure.
  (union-build)[resolve-collision]: Do not warn when identical files
  collide.
 2013-10-31 23:38:58 +01:00
Ludovic Courtès c065c443a0 union: Make the log port a parameter. 
* guix/build/union.scm (union-build): Add 'log-port' keyword parameter;
  use it.
 2013-10-30 22:09:32 +01:00
Ludovic Courtès 43dd92024a union: Don't traverse sub-directories only found in one element of the union. 
This significantly reduces I/O when building profiles, especially with
lots of package-specific sub-directories (such as 'share/emacs/24.3',
'texmf', etc.)

* guix/build/union.scm (union-build)[file-tree](others-have-it?): New
  procedure.  Use it in the 'enter?' parameter of 'file-system-fold';
  change 'skip' parameter accordingly.
* tests/union.scm ("union-build"): Ensure that 'include' is a symlink
  and 'bin' is a directory.
 2013-09-02 23:04:25 +02:00
Ludovic Courtès 1be77eac08 union: Don't warn when colliding leaves point to the same file. 
* guix/build/union.scm (union-build)[resolve-collision]: Pass LEAVES
  through `delete-duplicates'; warn iff the result contains more than
  one item.
 2013-02-06 23:04:10 +01:00
Ludovic Courtès 6211223021 union: Delete duplicates when passed the same input several times. 
* guix/build/union.scm (union-build): Prepend "." to the result of
  `union-tree', to match the expectations of `delete-duplicate-leaves'.
  Don't do mkdir when SUBDIR is ".".
* tests/union.scm ("union-build"): Keep duplicates in %BOOTSTRAP-INPUTS.
 2013-02-06 23:04:10 +01:00
Ludovic Courtès 01e354eb83 Merge branch 'core-updates' 
Conflicts:
	guix/build/union.scm
 2013-01-11 16:01:49 +01:00
Ludovic Courtès b2d58cd80a union: Detect collisions, and delete duplicate leaves. 
* guix/build/union.scm (delete-duplicate-leaves): New procedure.
  (union-build)[leaf=?, resolve-collision]: New procedures.
  Use `delete-duplicate-leaves' on the result of `tree-union'.
* tests/union.scm ("delete-duplicate-leaves, default",
  "delete-duplicate-leaves, file names"): New tests.
 2013-01-09 22:10:06 +01:00
Ludovic Courtès 4155e2a909 Update license headers of builder-side code. 
Change license headers with this script:

  (use-modules (guix build utils))

  (fluid-set! %default-port-encoding "UTF-8")

  (substitute* (cons "distro/packages/ld-wrapper.scm"
		     (find-files "guix/build" "\\.scm$"))
    (("^([[:graph:]]+) This file is part of Guix." _ comment-start)
     (string-append comment-start " This file is part of GNU Guix."))
    (("^([[:graph:]]+) Guix --- Nix package management.*" _ comment-start)
     (string-append comment-start
		    " GNU Guix --- Functional package management for GNU\n"))
    (("^([[:graph:]]+) Guix is " _ comment-start)
     (string-append comment-start " GNU Guix is "))
    (("^([[:graph:]]+) along with Guix." _ comment-start)
     (string-append comment-start " along with GNU Guix."))
    (("^([[:graph:]]+) Copyright \\(C\\)" _ comment-start)
     (string-append comment-start " Copyright ©")))

* distro/packages/ld-wrapper.scm, guix/build/download.scm,
  guix/build/gnu-build-system.scm, guix/build/union.scm,
  guix/build/utils.scm: Update license headers.
 2013-01-05 16:08:07 +01:00
Ludovic Courtès c8c88afaa1 Add (guix build union). 
* guix/build/union.scm, tests/union.scm: New files.
* Makefile.am (MODULES): Add `guix/build/union.scm'.
  (TESTS): Add `tests/union.scm'.
 2012-10-29 22:39:46 +01:00