mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-23 11:00:44 -06:00
Compare commits
1 commit
98583c4687
...
5f175aa4b2
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f175aa4b2 |
6 changed files with 37 additions and 45 deletions
32
flake.lock
32
flake.lock
|
|
@ -356,11 +356,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727173505,
|
||||
"narHash": "sha256-DaiWKEntVBrgy1OZEGW3izIfzyIr1jav/Jpo9tqL4EU=",
|
||||
"lastModified": 1727137145,
|
||||
"narHash": "sha256-3HB4Y7YBWItpKBWyzQHXzNH9JXAoYqkNIYpeV4dB7kI=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "00c862686354d139a53222d41a1c80d698a50c43",
|
||||
"revCount": 5253,
|
||||
"rev": "0a211f29f5952322925b9f982cbf9b0326d45f0f",
|
||||
"revCount": 5252,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -819,11 +819,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727202948,
|
||||
"narHash": "sha256-qJ6JiwyAD4tsJ6IR8Ake5/sH/jIJGwwrLzJgvy1yzwI=",
|
||||
"lastModified": 1727127028,
|
||||
"narHash": "sha256-hs7sutM2xdq+DhW7xICNSbmF7ZlIgZLeJ2nlJC/tQVc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "988dc351f28deee2781202697bebaf76b8b82014",
|
||||
"rev": "ddf94f1857eabb72773d268272312a3c217fe2c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -975,11 +975,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727199359,
|
||||
"narHash": "sha256-wS8T3zKv1liHf87Vts2DUzCZTvrZepy7HDgs14WkgvM=",
|
||||
"lastModified": 1727074224,
|
||||
"narHash": "sha256-L2DS4jqALMY1W/NkRu7LoZch+nefBEiKeXD84zWKvZY=",
|
||||
"owner": "roc-lang",
|
||||
"repo": "roc",
|
||||
"rev": "8c737868aa09c58fe5ef9da587fc3fe3b1c7e43f",
|
||||
"rev": "5f3a956137c9e9814f304abb44478dc398bde21a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1289,11 +1289,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727179839,
|
||||
"narHash": "sha256-OpO99oyPGvNeWDzuKMb/6tmTLKlmn+8IM4Ehltih68w=",
|
||||
"lastModified": 1726878449,
|
||||
"narHash": "sha256-gchxeelL+IdgL/LoEsg3FnO4Dv5z+lmRVHqIE3tq6NA=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "9b4f376b30a69b4b129e92b2979b92f5b95ed6d3",
|
||||
"rev": "2419eb9f968f451e2c342a69ec44112de5aa36b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1314,11 +1314,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727202282,
|
||||
"narHash": "sha256-c6fMn99XWXymIaQoMwQfJpZgvE5dU4OzIf+qdHkEFmY=",
|
||||
"lastModified": 1726791560,
|
||||
"narHash": "sha256-0SDGQeb/onI7zVdNOdUhTJ2r4EmSJQJV2bjyXENBgws=",
|
||||
"owner": "zigtools",
|
||||
"repo": "zls",
|
||||
"rev": "59d18631e4277dd403ca21cde3a4af419933359a",
|
||||
"rev": "2b613d32696676bcbc257e31542a1dcbfa7f22a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ let
|
|||
inherit (lib)
|
||||
genAttrs
|
||||
pkgFromSystem
|
||||
pkgsFromSystem
|
||||
loadOverlays
|
||||
;
|
||||
|
||||
|
|
@ -45,7 +46,7 @@ let
|
|||
oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { };
|
||||
oizys-go = pkgs.callPackage ../pkgs/oizys { };
|
||||
# nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { };
|
||||
nph = pkgs.callPackage ../pkgs/nph { };
|
||||
# nph = pkgs.callPackage ../pkgs/nph { };
|
||||
iso = mkIso.config.system.build.isoImage;
|
||||
# roc = (pkgsFromSystem pkgs.system "roc").full;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
{ fetchFromGitHub, buildNimPackage }:
|
||||
buildNimPackage( finalAttrs: {
|
||||
buildNimPackage{
|
||||
pname = "nimlangserver";
|
||||
version = "1.6.0";
|
||||
version = "unstable";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
owner = "daylinmorgan";
|
||||
repo = "langserver";
|
||||
# rev = "26b333d0c8d62ba947a9ce9fbd59a7a77766872c";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rTlkbNuJbL9ke1FpHYVYduiYHUON6oACg20pBs0MaP4=";
|
||||
rev = "26b333d0c8d62ba947a9ce9fbd59a7a77766872c";
|
||||
# rev = "v${version}";
|
||||
hash = "sha256-XFgA0yOfE34+bZxBgOdoK+5CWhxvppzl8QSQx1TTPpQ=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
lockFile = ./lock.json;
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
fetchFromGitHub,
|
||||
buildNimPackage,
|
||||
}:
|
||||
{ fetchFromGitHub, buildNimPackage }:
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "nph";
|
||||
version = "0.6.0";
|
||||
|
|
@ -11,11 +8,7 @@ buildNimPackage (finalAttrs: {
|
|||
rev = "v${finalAttrs.version}";
|
||||
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;
|
||||
})
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -117,14 +117,13 @@ when isMainModule:
|
|||
# clUse must be set here using clCfg doesn't seem to work with dispatchMutli ...
|
||||
clUse* = $bb("$command $args\n${doc}[bold]Options[/]:\n$options")
|
||||
osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options")
|
||||
|
||||
dispatchMulti(
|
||||
[build, help = sharedHelp, usage = clUse ],
|
||||
[cache, help = cacheHelp , usage = clUse ],
|
||||
[ci, help = ciHelp , usage = clUse ],
|
||||
[dry, help = sharedHelp, usage = clUse ],
|
||||
[build, help = sharedHelp],
|
||||
[cache, help = cacheHelp ],
|
||||
[ci, help = ciHelp ],
|
||||
[dry, help = sharedHelp],
|
||||
[osCmd, help = sharedHelp, usage = osUsage, cmdName = "os"],
|
||||
[output, help = sharedHelp, usage = clUse],
|
||||
[update, help = updateHelp, usage = clUse],
|
||||
[output, help = sharedHelp],
|
||||
[update, help = updateHelp],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -94,10 +94,10 @@ method log*(logger: FancyConsoleLogger, level: Level, args: varargs[string, `$`]
|
|||
|
||||
if level >= logger.levelThreshold:
|
||||
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:
|
||||
let handle =
|
||||
if logger.useStderr: stderr
|
||||
if logger.useStderr: stderr
|
||||
else: stdout
|
||||
writeLine(handle, ln)
|
||||
if level >= logger.flushThreshold: flushFile(handle)
|
||||
|
|
@ -112,6 +112,6 @@ template errorQuit*(args: varargs[string, `$`]) =
|
|||
quit QuitFailure
|
||||
|
||||
template fatalQuit*(args: varargs[string, `$`]) =
|
||||
fatal args
|
||||
error args
|
||||
quit QuitFailure
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue