From 4dd53f030e4dfde6d241c51aea4f3f642aed2be7 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 16 Sep 2019 11:24:14 -0400 Subject: km-git-annex: Remove custom ghc-magic input Upstream now has ghc-magic and builds git-annex with MagicMime support. --- km-packages/git-annex.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm index 8732044..ded0762 100644 --- a/km-packages/git-annex.scm +++ b/km-packages/git-annex.scm @@ -52,33 +52,7 @@ newspace." (define (current-commit) (git-output "rev-parse" "HEAD")) -(define-public ghc-magic - (package - (name "ghc-magic") - (version "1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/magic/magic-" - version - ".tar.gz")) - (sha256 - (base32 - "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j")))) - (build-system haskell-build-system) - (home-page - "http://hackage.haskell.org/package/magic") - (synopsis "Interface to C file/magic library") - (description - "This package provides a Haskell interface to the C libmagic -library. With it, you can determine the type of a file by examining -its contents rather than its name. The Haskell interface provides a -full-featured binding.") - ;; TODO: check - (license license:bsd-2))) - -;; Upstream doesn't use ghc-magic yet and disables S3 support. +;; Upstream doesn't build with S3 support. (define-public km-git-annex (package (inherit git-annex) @@ -105,7 +79,6 @@ full-featured binding.") `(modify-phases ,phases (delete 'check)))))) (inputs `(("ghc-aws" ,ghc-aws) - ("ghc-magic" ,ghc-magic) ,@(package-inputs git-annex))))) (define-public git-annex-dev -- cgit v1.2.3