From patchwork Tue Nov 3 19:24:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christine Lemmer-Webber X-Patchwork-Id: 24975 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A421527BBF5; Tue, 3 Nov 2020 19:26:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 12BB427BBF3 for ; Tue, 3 Nov 2020 19:26:09 +0000 (GMT) Received: from localhost ([::1]:52094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ka1wW-0001jY-1o for patchwork@mira.cbaines.net; Tue, 03 Nov 2020 14:26:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ka1wQ-0001jG-De for guix-patches@gnu.org; Tue, 03 Nov 2020 14:26:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ka1wQ-00069e-4Y for guix-patches@gnu.org; Tue, 03 Nov 2020 14:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ka1wQ-0001HU-1K for guix-patches@gnu.org; Tue, 03 Nov 2020 14:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44425] Add git-annex assistant and dependencies Resent-From: Christopher Lemmer Webber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Nov 2020 19:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44425 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44425@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16044315414886 (code B ref -1); Tue, 03 Nov 2020 19:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Nov 2020 19:25:41 +0000 Received: from localhost ([127.0.0.1]:46474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ka1w1-0001Gg-8G for submit@debbugs.gnu.org; Tue, 03 Nov 2020 14:25:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:40864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ka1vz-0001GZ-DQ for submit@debbugs.gnu.org; Tue, 03 Nov 2020 14:25:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ka1vy-0001he-2C for guix-patches@gnu.org; Tue, 03 Nov 2020 14:25:35 -0500 Received: from dustycloud.org ([50.116.34.160]:43898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ka1vv-000611-WC for guix-patches@gnu.org; Tue, 03 Nov 2020 14:25:33 -0500 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id A823C26665 for ; Tue, 3 Nov 2020 14:25:06 -0500 (EST) User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Lemmer Webber Date: Tue, 03 Nov 2020 14:24:40 -0500 Message-ID: <878sbi9rbb.fsf@dustycloud.org> MIME-Version: 1.0 Received-SPF: pass client-ip=50.116.34.160; envelope-from=cwebber@dustycloud.org; helo=dustycloud.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 14:25:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Attached is a highly WIP patch for the git-annex assistant (sloppily includes the two dependencies that also need to be added, will separate once I get it all working). However, it doesn't work... here's the point at which it stopped working: [601 of 607] Compiling Assistant ( Assistant.hs, dist/build/git-annex/git-annex-tmp/Assistant.dyn_o ) Assistant.hs:73:55: warning: [-Wunused-matches] Defined but not used: ‘listenhost’ | 73 | startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = do | ^^^^^^^^^^ [602 of 607] Compiling Command.Watch ( Command/Watch.hs, dist/build/git-annex/git-annex-tmp/Command/Watch.dyn_o ) [603 of 607] Compiling Command.Assistant ( Command/Assistant.hs, dist/build/git-annex/git-annex-tmp/Command/Assistant.dyn_o ) [604 of 607] Compiling CmdLine.GitAnnex ( CmdLine/GitAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex.dyn_o ) [605 of 607] Compiling Main ( git-annex.hs, dist/build/git-annex/git-annex-tmp/Main.dyn_o ) [606 of 607] Compiling Assistant.Pairing.Network ( Assistant/Pairing/Network.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/Network.dyn_o ) Assistant/Pairing/Network.hs:20:1: error: Could not find module ‘Network.Multicast’ Use -v to see a list of the files searched for. | 20 | import Network.Multicast | ^^^^^^^^^^^^^^^^^^^^^^^^ Assistant/Pairing/Network.hs:21:1: error: Could not load module ‘Network.Info’ It is a member of the hidden package ‘network-info-0.2.0.10’. Perhaps you need to add ‘network-info’ to the build-depends in your .cabal file. Use -v to see a list of the files searched for. | 21 | import Network.Info | ^^^^^^^^^^^^^^^^^^^ command "runhaskell" "Setup.hs" "build" "--ghc-option=-j8" failed with status 1 I'm unsure why it would be failing since I did add network-info to the inputs. Any ideas? From 092183597b503ef349401a99ce1e981f4b3d29ba Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Tue, 3 Nov 2020 14:21:51 -0500 Subject: [PATCH] Git annex assistant wip --- gnu/packages/haskell-apps.scm | 6 +++++- gnu/packages/haskell-xyz.scm | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 1de8b040f1..e3f0ed01f5 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -350,7 +350,7 @@ to @code{cabal repl}).") (build-system haskell-build-system) (arguments `(#:configure-flags - '("--flags=-Android -Assistant -Pairing -Webapp") + '("--flags=-Android -Pairing -Webapp") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-shell-for-tests @@ -449,6 +449,7 @@ to @code{cabal repl}).") ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-data-default" ,ghc-data-default) ("ghc-dav" ,ghc-dav) + ("ghc-dbus" ,ghc-dbus) ("ghc-disk-free-space" ,ghc-disk-free-space) ("ghc-dlist" ,ghc-dlist) ("ghc-edit-distance" ,ghc-edit-distance) @@ -457,6 +458,7 @@ to @code{cabal repl}).") ("ghc-feed" ,ghc-feed) ("ghc-filepath-bytestring" ,ghc-filepath-bytestring) ("ghc-free" ,ghc-free) + ("ghc-hinotify" ,ghc-hinotify) ("ghc-hslogger" ,ghc-hslogger) ("ghc-http-client" ,ghc-http-client) ("ghc-http-conduit" ,ghc-http-conduit) @@ -466,7 +468,9 @@ to @code{cabal repl}).") ("ghc-memory" ,ghc-memory) ("ghc-monad-control" ,ghc-monad-control) ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-mountpoints" ,ghc-mountpoints) ("ghc-network" ,ghc-network) + ("ghc-network-info" ,ghc-network-info) ("ghc-old-locale" ,ghc-old-locale) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-persistent" ,ghc-persistent) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 43dc7d5bbf..24be3ce5bc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -15416,3 +15416,24 @@ Zstandard compression algorithm, a fast lossless compression algorithm targeting real-time compression scenarios at zlib-level and better compression ratios.") (license license:bsd-3))) + +(define-public ghc-mountpoints + (package + (name "ghc-mountpoints") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/mountpoints/mountpoints-" + version + ".tar.gz")) + (sha256 + (base32 + "1hnm31pqcffphyc463wf0vbik9fzm5lb2r4wjdc1y4dqzmjdzz37")))) + (build-system haskell-build-system) + (home-page + "http://hackage.haskell.org/package/mountpoints") + (synopsis "list mount points") + (description "Lists currently mounted filesystems. . Works on: Linux, BSD, Mac OS X, Android") + (license license:lgpl2.1+))) -- 2.29.1