Fix Jerboa prelude import conflicts for macOS build
ober
f59d7c753a7275a91572f2beaf29fa17adf06c5e
--- a/gitsafe/allowlist.ss +++ b/gitsafe/allowlist.ss @@ -13,7 +13,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude) + (except (jerboa prelude) meta atom?) (std pregexp) (std misc ports) (std misc string) --- a/gitsafe/config.ss +++ b/gitsafe/config.ss @@ -22,7 +22,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude) + (except (jerboa prelude) meta atom?) (std text json) (std misc ports) (std misc string)) --- a/gitsafe/entropy.ss +++ b/gitsafe/entropy.ss @@ -15,7 +15,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude)) + (except (jerboa prelude) meta atom?)) ;; --- Thresholds --- (def *entropy-threshold-hex* 3.0) --- a/gitsafe/git.ss +++ b/gitsafe/git.ss @@ -23,7 +23,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude) + (except (jerboa prelude) meta atom?) (std pregexp) (std misc process) (std misc string) --- a/gitsafe/main-binary.ss +++ b/gitsafe/main-binary.ss @@ -12,7 +12,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude) + (except (jerboa prelude) meta atom?) (std misc process) (std misc ports) (gitsafe config) --- a/gitsafe/main.ss +++ b/gitsafe/main.ss @@ -29,7 +29,7 @@ (library-directories))) ;; --- Now we can import gitsafe modules --- -(import (jerboa prelude) + (import (except (jerboa prelude) meta atom?) (std misc process) (std misc ports) (gitsafe config) --- a/gitsafe/output.ss +++ b/gitsafe/output.ss @@ -12,7 +12,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude) + (except (jerboa prelude) meta atom?) (std text json) (gitsafe scanner)) --- a/gitsafe/patterns.ss +++ b/gitsafe/patterns.ss @@ -19,7 +19,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude) + (except (jerboa prelude) meta atom?) (std pregexp)) ;; --- Secret pattern struct --- --- a/gitsafe/scanner.ss +++ b/gitsafe/scanner.ss @@ -26,7 +26,7 @@ iota 1+ 1- partition make-date make-time) - (jerboa prelude) + (except (jerboa prelude) meta atom?) (std pregexp) (std misc string) (std misc ports) --- a/test/test-gitsafe.ss +++ b/test/test-gitsafe.ss @@ -24,7 +24,7 @@ (string-append jerboa-dir "/lib"))) (library-directories))) -(import (jerboa prelude) + (import (except (jerboa prelude) meta atom?) (std test) (std pregexp) (gitsafe entropy)