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

Compare commits

base: daylin:98583c468727bd3c339034e0dd480add0f71e023
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:5f175aa4b26982b79c885527debd7c4fc5aacc5d
Branches Tags
daylin:flake-lock
daylin:main

1 commit
98583c4687 ... 5f175aa4b2

Author SHA1 Message Date
daylin-bot
5f175aa4b2 flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=8579066c7a1ceb745499ea4e11d5d420b1387ec0' (2024-09-21)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0a211f29f5952322925b9f982cbf9b0326d45f0f' (2024-09-24)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/73b8c4f1150040644cf678aa8bbf2cec48a433cf' (2024-09-20)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/4adb6c4c41ee5014bfe608123bfeddb26e5f5cea' (2024-09-23)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/c1b0fa0bec5478185eae2fd3f39b9e906fc83995' (2024-09-16)
  → 'github:nix-community/nix-index-database/c7515c2fdaf2e1f3f49856cef6cec95bb2138417' (2024-09-22)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/cc84991d069d1948bb7c2c24a9874c0a835621e6' (2024-09-20)
  → 'github:nix-community/NixOS-WSL/1fcec53c692c15091ca5bb9eaf86a2cac6c53278' (2024-09-23)
• Updated input 'nixos-wsl/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Updated input 'nixos-wsl/nixpkgs':
    'github:NixOS/nixpkgs/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49' (2024-09-14)
  → 'github:NixOS/nixpkgs/944b2aea7f0a2d7c79f72468106bc5510cbf5101' (2024-09-20)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e' (2024-09-19)
  → 'github:nixos/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6' (2024-09-21)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/ff23ca197583acd3874d3fa3b610614ee4d2ab1f' (2024-09-21)
  → 'github:nix-community/nixpkgs-wayland/ddf94f1857eabb72773d268272312a3c217fe2c5' (2024-09-23)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/e0cc0b05b0296fdc52fa683d47a3470dfe4f79ea' (2024-09-17)
  → 'github:nix-community/lib-aggregate/e4bb2b4962e79814c38862dce5eca90af3de6a3c' (2024-09-22)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/9db4db09d82e4b2207bfa7f1e747a4f49d214555' (2024-09-15)
  → 'github:nix-community/nixpkgs.lib/575704ff85d3a41dc5bfef7b55380cbc7b87f3c2' (2024-09-22)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e' (2024-09-19)
  → 'github:nixos/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6' (2024-09-21)
• Updated input 'roc':
    'github:roc-lang/roc/82036e2e2e581d47611f5e34ee6d9ef4961a2e88' (2024-09-21)
  → 'github:roc-lang/roc/5f3a956137c9e9814f304abb44478dc398bde21a' (2024-09-23)
• Updated input 'tsm':
    'github:daylinmorgan/tsm/5991d93bcb216c4cd5345296111fee7027be29cf?dir=nix' (2024-09-16)
  → 'github:daylinmorgan/tsm/e8539740f6faf49404f30225607edbad58c34962?dir=nix' (2024-09-23)
 2024-09-24 00:40:09 +00:00
6 changed files with 37 additions and 45 deletions
Show stats Expand all files Collapse all files

32
flake.lock
View file

@ -356,11 +356,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1727173505, "lastModified": 1727137145,
"narHash": "sha256-DaiWKEntVBrgy1OZEGW3izIfzyIr1jav/Jpo9tqL4EU=", "narHash": "sha256-3HB4Y7YBWItpKBWyzQHXzNH9JXAoYqkNIYpeV4dB7kI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "00c862686354d139a53222d41a1c80d698a50c43", "rev": "0a211f29f5952322925b9f982cbf9b0326d45f0f",
"revCount": 5253, "revCount": 5252,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -819,11 +819,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1727202948, "lastModified": 1727127028,
"narHash": "sha256-qJ6JiwyAD4tsJ6IR8Ake5/sH/jIJGwwrLzJgvy1yzwI=", "narHash": "sha256-hs7sutM2xdq+DhW7xICNSbmF7ZlIgZLeJ2nlJC/tQVc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "988dc351f28deee2781202697bebaf76b8b82014", "rev": "ddf94f1857eabb72773d268272312a3c217fe2c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -975,11 +975,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1727199359, "lastModified": 1727074224,
"narHash": "sha256-wS8T3zKv1liHf87Vts2DUzCZTvrZepy7HDgs14WkgvM=", "narHash": "sha256-L2DS4jqALMY1W/NkRu7LoZch+nefBEiKeXD84zWKvZY=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "8c737868aa09c58fe5ef9da587fc3fe3b1c7e43f", "rev": "5f3a956137c9e9814f304abb44478dc398bde21a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1289,11 +1289,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727179839, "lastModified": 1726878449,
"narHash": "sha256-OpO99oyPGvNeWDzuKMb/6tmTLKlmn+8IM4Ehltih68w=", "narHash": "sha256-gchxeelL+IdgL/LoEsg3FnO4Dv5z+lmRVHqIE3tq6NA=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "9b4f376b30a69b4b129e92b2979b92f5b95ed6d3", "rev": "2419eb9f968f451e2c342a69ec44112de5aa36b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1314,11 +1314,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727202282, "lastModified": 1726791560,
"narHash": "sha256-c6fMn99XWXymIaQoMwQfJpZgvE5dU4OzIf+qdHkEFmY=", "narHash": "sha256-0SDGQeb/onI7zVdNOdUhTJ2r4EmSJQJV2bjyXENBgws=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "59d18631e4277dd403ca21cde3a4af419933359a", "rev": "2b613d32696676bcbc257e31542a1dcbfa7f22a8",
"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],
) )

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

@ -94,7 +94,7 @@ 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
@ -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