daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-23 15:10:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:2d6d8fb9a1370a7573ae4284e84dad9e3c476fc1
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:3a5410f68b31c94a3c0f0526773cbb7b56ef78ee
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "2d6d8fb9a1370a7573ae4284e84dad9e3c476fc1" and "3a5410f68b31c94a3c0f0526773cbb7b56ef78ee" have entirely different histories.
2d6d8fb9a1 ... 3a5410f68b

6 changed files with 24 additions and 32 deletions
Show stats Expand all files Collapse all files

6
flake.lock
View file

@ -1209,11 +1209,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1727122609, "lastModified": 1726527644,
"narHash": "sha256-M6tkMDvt4zOoYAhBOCFxFQGjORhhjZbWMC+0tPnHkxU=", "narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "tsm", "repo": "tsm",
"rev": "e8539740f6faf49404f30225607edbad58c34962", "rev": "5991d93bcb216c4cd5345296111fee7027be29cf",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
lib/default.nix
View file

@ -6,6 +6,7 @@ let
inherit (lib) inherit (lib)
genAttrs genAttrs
pkgFromSystem pkgFromSystem
pkgsFromSystem
loadOverlays loadOverlays
; ;
@ -45,7 +46,7 @@ let
oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { }; oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { };
oizys-go = pkgs.callPackage ../pkgs/oizys { }; oizys-go = pkgs.callPackage ../pkgs/oizys { };
# nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { }; # nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { };
nph = pkgs.callPackage ../pkgs/nph { }; # nph = pkgs.callPackage ../pkgs/nph { };
iso = mkIso.config.system.build.isoImage; iso = mkIso.config.system.build.isoImage;
# roc = (pkgsFromSystem pkgs.system "roc").full; # roc = (pkgsFromSystem pkgs.system "roc").full;
} }

13
pkgs/nim/nimlangserver/default.nix
View file

@ -1,16 +1,15 @@
{ fetchFromGitHub, buildNimPackage }: { fetchFromGitHub, buildNimPackage }:
buildNimPackage( finalAttrs: { buildNimPackage{
pname = "nimlangserver"; pname = "nimlangserver";
version = "1.6.0"; version = "unstable";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nim-lang"; owner = "daylinmorgan";
repo = "langserver"; repo = "langserver";
# rev = "26b333d0c8d62ba947a9ce9fbd59a7a77766872c"; rev = "26b333d0c8d62ba947a9ce9fbd59a7a77766872c";
rev = "v${finalAttrs.version}"; # rev = "v${version}";
hash = "sha256-rTlkbNuJbL9ke1FpHYVYduiYHUON6oACg20pBs0MaP4="; hash = "sha256-XFgA0yOfE34+bZxBgOdoK+5CWhxvppzl8QSQx1TTPpQ=";
}; };
doCheck = false; doCheck = false;
lockFile = ./lock.json; lockFile = ./lock.json;
} }
)

15
pkgs/nim/nph/default.nix
View file

@ -1,7 +1,4 @@
{ { fetchFromGitHub, buildNimPackage }:
fetchFromGitHub,
buildNimPackage,
}:
buildNimPackage (finalAttrs: { buildNimPackage (finalAttrs: {
pname = "nph"; pname = "nph";
version = "0.6.0"; version = "0.6.0";
@ -11,11 +8,7 @@ buildNimPackage (finalAttrs: {
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-9t5VeGsxyytGdu7+Uv/J+x6bmeB5+eQapbyp30iPxqs="; hash = "sha256-9t5VeGsxyytGdu7+Uv/J+x6bmeB5+eQapbyp30iPxqs=";
}; };
# replace gorge(git...) call to for version
patchPhase = ''
runHook prePatch
sed -i 's/Version = gorge(.*/Version = """v${finalAttrs.version}\n"""/' src/nph.nim
runHook postPatch
'';
doCheck = false; doCheck = false;
}) }
)

13
pkgs/oizys-nim/src/oizys.nim
View file

@ -117,14 +117,13 @@ when isMainModule:
# clUse must be set here using clCfg doesn't seem to work with dispatchMutli ... # clUse must be set here using clCfg doesn't seem to work with dispatchMutli ...
clUse* = $bb("$command $args\n${doc}[bold]Options[/]:\n$options") clUse* = $bb("$command $args\n${doc}[bold]Options[/]:\n$options")
osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options") osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options")
dispatchMulti( dispatchMulti(
[build, help = sharedHelp, usage = clUse ], [build, help = sharedHelp],
[cache, help = cacheHelp , usage = clUse ], [cache, help = cacheHelp ],
[ci, help = ciHelp , usage = clUse ], [ci, help = ciHelp ],
[dry, help = sharedHelp, usage = clUse ], [dry, help = sharedHelp],
[osCmd, help = sharedHelp, usage = osUsage, cmdName = "os"], [osCmd, help = sharedHelp, usage = osUsage, cmdName = "os"],
[output, help = sharedHelp, usage = clUse], [output, help = sharedHelp],
[update, help = updateHelp, usage = clUse], [update, help = updateHelp],
) )

6
pkgs/oizys-nim/src/oizys/logging.nim
View file

@ -94,10 +94,10 @@ method log*(logger: FancyConsoleLogger, level: Level, args: varargs[string, `$`]
if level >= logger.levelThreshold: if level >= logger.levelThreshold:
let ln = substituteLog(logger.fmtStrs[level], level, args) let ln = substituteLog(logger.fmtStrs[level], level, args)
when defined(js): {.fatal: "handler does not support JS".} when defined(js): {.fatal: "handler does note support JS".}
try: try:
let handle = let handle =
if logger.useStderr: stderr if logger.useStderr: stderr
else: stdout else: stdout
writeLine(handle, ln) writeLine(handle, ln)
if level >= logger.flushThreshold: flushFile(handle) if level >= logger.flushThreshold: flushFile(handle)
@ -112,6 +112,6 @@ template errorQuit*(args: varargs[string, `$`]) =
quit QuitFailure quit QuitFailure
template fatalQuit*(args: varargs[string, `$`]) = template fatalQuit*(args: varargs[string, `$`]) =
fatal args error args
quit QuitFailure quit QuitFailure