diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-12-31 14:09:41 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-12-31 14:09:41 -0400 |
commit | cbb7f306b8f8f2672ea34b040a0010739f722310 (patch) | |
tree | a1818bf7bab9e240a0a8dbca947e65e7062322d9 /Utility/Env | |
parent | c7c745d28868c8cd646d3e31dd8ba6a0b763f611 (diff) |
Revert "git-annex.cabal: Add back custom-setup stanza, so cabal new-build works."
This reverts commit c7c745d28868c8cd646d3e31dd8ba6a0b763f611.
No, still doesn't work when built with cabal. It did with stack; stack
must somehow make the unix package implicitly available.
With cabal, System.Posix.Process and System.Posix.Env are both missing.
Diffstat (limited to 'Utility/Env')
-rw-r--r-- | Utility/Env/Set.hs | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/Utility/Env/Set.hs b/Utility/Env/Set.hs deleted file mode 100644 index fd8d5140d..000000000 --- a/Utility/Env/Set.hs +++ /dev/null @@ -1,40 +0,0 @@ -{- portable environment variables - - - - Copyright 2013 Joey Hess <id@joeyh.name> - - - - License: BSD-2-clause - -} - -{-# LANGUAGE CPP #-} - -module Utility.Env.Set where - -#ifdef mingw32_HOST_OS -import qualified System.Environment as E -import qualified System.SetEnv -#else -import qualified System.Posix.Env as PE -#endif - -{- Sets an environment variable. To overwrite an existing variable, - - overwrite must be True. - - - - On Windows, setting a variable to "" unsets it. -} -setEnv :: String -> String -> Bool -> IO () -#ifndef mingw32_HOST_OS -setEnv var val overwrite = PE.setEnv var val overwrite -#else -setEnv var val True = System.SetEnv.setEnv var val -setEnv var val False = do - r <- getEnv var - case r of - Nothing -> setEnv var val True - Just _ -> return () -#endif - -unsetEnv :: String -> IO () -#ifndef mingw32_HOST_OS -unsetEnv = PE.unsetEnv -#else -unsetEnv = System.SetEnv.unsetEnv -#endif |