haskell-dbus: drop semicolons.patch; this change appears to have been included upstream
This commit is contained in:
parent
4c8056a8d9
commit
87ec7bb087
@ -768,10 +768,6 @@ self: super: {
|
|||||||
# horribly outdated (X11 interface changed a lot)
|
# horribly outdated (X11 interface changed a lot)
|
||||||
sindre = markBroken super.sindre;
|
sindre = markBroken super.sindre;
|
||||||
|
|
||||||
# https://github.com/jmillikin/haskell-dbus/pull/7
|
|
||||||
# http://hydra.cryp.to/build/498404/log/raw
|
|
||||||
dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch);
|
|
||||||
|
|
||||||
# Test suite occasionally runs for 1+ days on Hydra.
|
# Test suite occasionally runs for 1+ days on Hydra.
|
||||||
distributed-process-tests = dontCheck super.distributed-process-tests;
|
distributed-process-tests = dontCheck super.distributed-process-tests;
|
||||||
|
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
From 8fd84b4d6ba257ac93a61bce3378777840e8bf80 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nikolay Amiantov <ab@fmap.me>
|
|
||||||
Date: Sat, 5 Nov 2016 14:27:04 +0300
|
|
||||||
Subject: [PATCH] getSessionAddress: take first bus address from
|
|
||||||
semicolon-separated variable
|
|
||||||
|
|
||||||
---
|
|
||||||
lib/DBus/Address.hs | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/DBus/Address.hs b/lib/DBus/Address.hs
|
|
||||||
index 72ac99d..596b18c 100644
|
|
||||||
--- a/lib/DBus/Address.hs
|
|
||||||
+++ b/lib/DBus/Address.hs
|
|
||||||
@@ -18,6 +18,7 @@ module DBus.Address where
|
|
||||||
import qualified Control.Exception
|
|
||||||
import Data.Char (digitToInt, ord, chr)
|
|
||||||
import Data.List (intercalate)
|
|
||||||
+import Data.Maybe (listToMaybe)
|
|
||||||
import qualified Data.Map
|
|
||||||
import Data.Map (Map)
|
|
||||||
import qualified System.Environment
|
|
||||||
@@ -152,7 +153,7 @@ getSystemAddress = do
|
|
||||||
getSessionAddress :: IO (Maybe Address)
|
|
||||||
getSessionAddress = do
|
|
||||||
env <- getenv "DBUS_SESSION_BUS_ADDRESS"
|
|
||||||
- return (env >>= parseAddress)
|
|
||||||
+ return $ maybe Nothing listToMaybe (env >>= parseAddresses)
|
|
||||||
|
|
||||||
-- | Returns the address in the environment variable
|
|
||||||
-- @DBUS_STARTER_ADDRESS@, which must be set.
|
|
||||||
--
|
|
||||||
2.10.1
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user