summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/patches
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-04-20 10:02:36 +0200
committerPeter Simons <simons@cryp.to>2017-04-21 16:25:52 +0200
commit87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a (patch)
treeeefcfd94cf3bc8f9b7feffba5c4bf1b42e3ead57 /pkgs/development/haskell-modules/patches
parent4c8056a8d9b8e5862ad84ee849589b11b685f367 (diff)
downloadnixlib-87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a.tar
nixlib-87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a.tar.gz
nixlib-87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a.tar.bz2
nixlib-87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a.tar.lz
nixlib-87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a.tar.xz
nixlib-87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a.tar.zst
nixlib-87ec7bb087b7d475c9118dcfff8b35ef62f8ce1a.zip
haskell-dbus: drop semicolons.patch; this change appears to have been included upstream
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
-rw-r--r--pkgs/development/haskell-modules/patches/hdbus-semicolons.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch
deleted file mode 100644
index dc7ece8f3e8d..000000000000
--- a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch
+++ /dev/null
@@ -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
-