unfuck this on nix
This commit is contained in:
parent
7fa70f8377
commit
e7c03d3608
5
.gitignore
vendored
5
.gitignore
vendored
@ -55,4 +55,7 @@ Thumbs.db
|
||||
dist-newstyle
|
||||
*.o
|
||||
*.hi
|
||||
*.conf
|
||||
*.conf
|
||||
|
||||
#this isn't needed but I can't delete it, thanks nixos
|
||||
nixtclnonsense
|
@ -40,7 +40,7 @@ library
|
||||
ini
|
||||
|
||||
extra-libraries: tcl8.6
|
||||
Includes: /usr/include/tcl.h,
|
||||
Includes: tcl.h,
|
||||
src/tclstubswrapper/tclstubs.h
|
||||
|
||||
ghc-options:
|
||||
@ -81,7 +81,8 @@ executable GypsFulvus
|
||||
other-modules: GypsFulvus.PluginStuff,GypsFulvus, Carrion.Plugin.IO.STDIO, Carrion.Plugin.TCL, Carrion.Plugin.IO.IRC.Client
|
||||
exposed-modules: GypsFulvus
|
||||
extra-libraries: tcl8.6
|
||||
Includes: /usr/include/tcl.h,
|
||||
-- extra-include-dirs: /var/run/current-system/sw/include
|
||||
Includes: tcl.h,
|
||||
src/tclstubswrapper/tclstubs.h
|
||||
C-Sources: src/tclstubswrapper/tclstubs.c
|
||||
main-is: Main.hs
|
||||
|
@ -227,7 +227,7 @@ initPlugin mh = do
|
||||
-- First validate with the standard function
|
||||
res <- (onServerCertificate $ clientHooks cpara) cs vc sid cc
|
||||
-- Then strip out non-issues
|
||||
return $ filter (`notElem` [UnknownCA, SelfSigned]) res
|
||||
return $ filter (`notElem` [UnknownCA, SelfSigned, Expired]) res
|
||||
myClientConfig = (tlsClientConfig myPort (encodeUtf8 myHost)) { tlsClientTLSSettings = TLSSettings cpara
|
||||
{ clientHooks = (clientHooks cpara)
|
||||
{ onServerCertificate = validate }
|
||||
|
@ -95,13 +95,13 @@ lEN_AUTO = -1
|
||||
eVAL_FLAGS_CLEAR :: Int
|
||||
eVAL_FLAGS_CLEAR = 0
|
||||
|
||||
dumpDebug :: Monad m => p -> m ()
|
||||
dumpDebug _ = return ()
|
||||
|
||||
--dumpDebug :: Monad m => p -> m ()
|
||||
--dumpDebug _ = return ()
|
||||
dumpDebug = putStrLn
|
||||
initPlugin :: Manhole -> IO InitStatus
|
||||
initPlugin manhole = do
|
||||
myFakeArg0 <- getExecutablePath >>= newCString
|
||||
myTCLDl <- dlopen "/usr/lib/libtcl8.6.so" [RTLD_NOW]
|
||||
myTCLDl <- dlopen "libtcl8.6.so" [RTLD_NOW]
|
||||
let bless name convf = dlsym myTCLDl name >>= \fp -> return $ convf $ fp
|
||||
tcl_CreateInterp <- bless "Tcl_CreateInterp" mkTcl_CreateInterp
|
||||
interp <- tcl_CreateInterp
|
||||
|
@ -1,6 +1,7 @@
|
||||
# smeggdrop.tcl
|
||||
encoding system utf-8
|
||||
set SMEGGDROP_ROOT [file dirname [info script]]
|
||||
lappend auto_path ./tclcurl-fa
|
||||
proc putlog args {}
|
||||
if [file exists smeggdrop.conf] {source smeggdrop.conf}
|
||||
source $SMEGGDROP_ROOT/smeggdrop/smeggdrop.tcl
|
||||
|
@ -28,6 +28,12 @@ resolver: lts-16.13
|
||||
# subdirs:
|
||||
# - auto-update
|
||||
# - wai
|
||||
nix:
|
||||
enable: true
|
||||
packages:
|
||||
- "zlib"
|
||||
- "tcl"
|
||||
|
||||
packages:
|
||||
- .
|
||||
# Dependency packages to be pulled from upstream that are not in the resolver.
|
||||
|
Loading…
x
Reference in New Issue
Block a user