From b5eab187fcddaed3602b21b05e9657b8b54412b6 Mon Sep 17 00:00:00 2001 From: kousu Date: Fri, 4 Sep 2020 00:08:07 -0400 Subject: [PATCH 1/4] git-annex: enable S3 support. --- Formula/git-annex.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Formula/git-annex.rb b/Formula/git-annex.rb index 8aa02aaeea1e..2db610feb658 100644 --- a/Formula/git-annex.rb +++ b/Formula/git-annex.rb @@ -3,6 +3,7 @@ class GitAnnex < Formula homepage "https://git-annex.branchable.com/" url "https://hackage.haskell.org/package/git-annex-8.20200810/git-annex-8.20200810.tar.gz" sha256 "e631c9d52e440f80e9d305c95a078dcae71f200125bca91e49d5b8e2d864c6f3" + revision 1 head "git://git-annex.branchable.com/" livecheck do @@ -25,7 +26,8 @@ class GitAnnex < Formula def install system "cabal", "v2-update" - system "cabal", "v2-install", *std_cabal_v2_args + system "cabal", "v2-install", *std_cabal_v2_args, + "--flags=+S3" bin.install_symlink "git-annex" => "git-annex-shell" end From 79edea98e5b3327fa80401d5e2f5ad493e885e20 Mon Sep 17 00:00:00 2001 From: kousu Date: Fri, 4 Sep 2020 02:03:33 -0400 Subject: [PATCH 2/4] git-annex: test for the existence of all expected remote plugins --- Formula/git-annex.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Formula/git-annex.rb b/Formula/git-annex.rb index 2db610feb658..85417fdca59f 100644 --- a/Formula/git-annex.rb +++ b/Formula/git-annex.rb @@ -70,6 +70,11 @@ def plist system "git", "commit", "-a", "-m", "Initial Commit" assert File.symlink?("Hello.txt") + # make sure the various remotes were built + assert_match shell_output("git annex version | grep 'remote types:'").chomp, + "remote types: git gcrypt p2p S3 bup directory rsync web bittorrent " \ + "webdav adb tahoe glacier ddar git-lfs hook external" + # The steps below are necessary to ensure the directory cleanly deletes. # git-annex guards files in a way that isn't entirely friendly of automatically # wiping temporary directories in the way `brew test` does at end of execution. From a8b805f02fa0cb7d8eed7b557320380fe3040a36 Mon Sep 17 00:00:00 2001 From: kousu Date: Fri, 4 Sep 2020 02:31:55 -0400 Subject: [PATCH 3/4] git-annex: annotate licenses. These were extracted from COPYRIGHT in git://git-annex.branchable.com/ --- Formula/git-annex.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Formula/git-annex.rb b/Formula/git-annex.rb index 85417fdca59f..db54ec22a1dc 100644 --- a/Formula/git-annex.rb +++ b/Formula/git-annex.rb @@ -3,6 +3,8 @@ class GitAnnex < Formula homepage "https://git-annex.branchable.com/" url "https://hackage.haskell.org/package/git-annex-8.20200810/git-annex-8.20200810.tar.gz" sha256 "e631c9d52e440f80e9d305c95a078dcae71f200125bca91e49d5b8e2d864c6f3" + license all_of: ["AGPL-3.0-or-later", "BSD-2-Clause", "BSD-3-Clause", + "GPL-2.0-only", "GPL-3.0-or-later", "icon-license", "MIT"] revision 1 head "git://git-annex.branchable.com/" From cfb0384bac68fb7c741f0fd58a834487509be11a Mon Sep 17 00:00:00 2001 From: kousu Date: Sat, 5 Sep 2020 19:17:11 -0400 Subject: [PATCH 4/4] git-annex: hide non-SPDX license. The text of icon-license in the git-annex source code is Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns Copyright: 2007 Henrik Nyh 2010 Joey Hess 2013 John Lawrence License: icon-license Free to modify and redistribute with due credit, and obviously free to use. this seems libre to me, but it's not on the SPDX list. To get my patch past the Homebrew linter, drop it. --- Formula/git-annex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/git-annex.rb b/Formula/git-annex.rb index db54ec22a1dc..fda6c3a28a07 100644 --- a/Formula/git-annex.rb +++ b/Formula/git-annex.rb @@ -4,7 +4,7 @@ class GitAnnex < Formula url "https://hackage.haskell.org/package/git-annex-8.20200810/git-annex-8.20200810.tar.gz" sha256 "e631c9d52e440f80e9d305c95a078dcae71f200125bca91e49d5b8e2d864c6f3" license all_of: ["AGPL-3.0-or-later", "BSD-2-Clause", "BSD-3-Clause", - "GPL-2.0-only", "GPL-3.0-or-later", "icon-license", "MIT"] + "GPL-2.0-only", "GPL-3.0-or-later", "MIT"] revision 1 head "git://git-annex.branchable.com/"