From: Christopher Allan Webber Date: Thu, 9 Feb 2017 21:06:18 +0000 (-0600) Subject: Switch to using git-predicate from guix X-Git-Tag: fosdem-2017~4 X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=commitdiff_plain;h=929b6c5c898d33c085aed150fad70734b9f1db42 Switch to using git-predicate from guix This cuts out the sizableish git-file? procedure we had before. --- diff --git a/guix.scm b/guix.scm index 0ae9e4b..04e5236 100644 --- a/guix.scm +++ b/guix.scm @@ -2,10 +2,6 @@ ;;; Copyright (C) 2016 Jan Nieuwenhuizen ;;; Copyright (C) 2017 Christopher Allan Webber ;;; -;;; Also borrowing code from: -;;; guile-sdl2 --- FFI bindings for SDL2 -;;; Copyright © 2015 David Thompson -;;; ;;; This program is free software: you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by ;;; the Free Software Foundation, either version 3 of the License, or @@ -55,23 +51,6 @@ (define %source-dir (dirname (current-filename))) -(define git-file? - (let* ((pipe (with-directory-excursion %source-dir - (open-pipe* OPEN_READ "git" "ls-files"))) - (files (let loop ((lines '())) - (match (read-line pipe) - ((? eof-object?) - (reverse lines)) - (line - (loop (cons line lines)))))) - (status (close-pipe pipe))) - (lambda (file stat) - (match (stat:type stat) - ('directory #t) - ((or 'regular 'symlink) - (any (cut string-suffix? <> file) files)) - (_ #f))))) - (define guile-without-select-bug (package (inherit guile-next) @@ -98,7 +77,9 @@ (package (name "guile-mudsync") (version "git") - (source (local-file %source-dir #:recursive? #t #:select? git-file?)) + (source (local-file %source-dir + #:recursive? #t + #:select? (git-predicate %source-dir))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake)