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

Compare commits

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

5 commits
5f175aa4b2 ... 98583c4687

Author SHA1 Message Date
daylin-bot
98583c4687 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=00c862686354d139a53222d41a1c80d698a50c43' (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/988dc351f28deee2781202697bebaf76b8b82014' (2024-09-24)
• 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/8c737868aa09c58fe5ef9da587fc3fe3b1c7e43f' (2024-09-24)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/2419eb9f968f451e2c342a69ec44112de5aa36b9' (2024-09-21)
  → 'github:mitchellh/zig-overlay/9b4f376b30a69b4b129e92b2979b92f5b95ed6d3' (2024-09-24)
• Updated input 'zls':
    'github:zigtools/zls/2b613d32696676bcbc257e31542a1dcbfa7f22a8' (2024-09-20)
  → 'github:zigtools/zls/59d18631e4277dd403ca21cde3a4af419933359a' (2024-09-24)
 2024-09-24 19:29:37 +00:00
Daylin Morgan
2d6d8fb9a1
upgrade nimlangserver to v1.6.0 2024-09-24 11:20:17 -05:00
Daylin Morgan
b7cb67a907
add back usage strings 2024-09-23 15:43:16 -05:00
Daylin Morgan
9ed82c1ae6
make fatalquit actually use fatal 2024-09-23 12:33:05 -05:00
Daylin Morgan
42e9583808
fix nph version 2024-09-23 10:47:33 -05:00
6 changed files with 75 additions and 67 deletions
Show stats Expand all files Collapse all files

92
flake.lock
View file

@ -194,11 +194,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@ -356,11 +356,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1726918033,
"narHash": "sha256-I0U4OLssUlNd6/KXHwErmgmYZURTJYJNHbeoKaMH4iI=",
"lastModified": 1727173505,
"narHash": "sha256-DaiWKEntVBrgy1OZEGW3izIfzyIr1jav/Jpo9tqL4EU=",
"ref": "refs/heads/main",
"rev": "8579066c7a1ceb745499ea4e11d5d420b1387ec0",
"revCount": 5246,
"rev": "00c862686354d139a53222d41a1c80d698a50c43",
"revCount": 5253,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -521,11 +521,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1726600542,
"narHash": "sha256-4ZP8rYtad1Z0LY3vZ1eYSRUzqPd3x7K0j7SpP3vReWc=",
"lastModified": 1727007123,
"narHash": "sha256-B2WqDa4Sd7EVrGfxnVSCL39yOKWqn14vhhTGlbtd+48=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "e0cc0b05b0296fdc52fa683d47a3470dfe4f79ea",
"rev": "e4bb2b4962e79814c38862dce5eca90af3de6a3c",
"type": "github"
},
"original": {
@ -680,11 +680,11 @@
]
},
"locked": {
"lastModified": 1726449931,
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
"lastModified": 1726975622,
"narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
"rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417",
"type": "github"
},
"original": {
@ -749,11 +749,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1726868415,
"narHash": "sha256-alIPV2Da8TQPFs3j+yrnGGDcIrSes1n1WgTEHIr48kk=",
"lastModified": 1727091786,
"narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "cc84991d069d1948bb7c2c24a9874c0a835621e6",
"rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278",
"type": "github"
},
"original": {
@ -798,11 +798,11 @@
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1726362065,
"narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=",
"lastModified": 1726966855,
"narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555",
"rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2",
"type": "github"
},
"original": {
@ -819,11 +819,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1726957911,
"narHash": "sha256-5IvPhLClfuWfMkb+xBPbTT1IDlF2XG2P5BgvDnwUkLI=",
"lastModified": 1727202948,
"narHash": "sha256-qJ6JiwyAD4tsJ6IR8Ake5/sH/jIJGwwrLzJgvy1yzwI=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "ff23ca197583acd3874d3fa3b610614ee4d2ab1f",
"rev": "988dc351f28deee2781202697bebaf76b8b82014",
"type": "github"
},
"original": {
@ -850,11 +850,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1726320982,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"lastModified": 1726838390,
"narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
"type": "github"
},
"original": {
@ -866,11 +866,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1726755586,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github"
},
"original": {
@ -898,11 +898,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1726755586,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github"
},
"original": {
@ -975,11 +975,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1726946978,
"narHash": "sha256-xcr2thODE700PbF3rHoZhu7iUYdlwGNW6wzetD6Uo2A=",
"lastModified": 1727199359,
"narHash": "sha256-wS8T3zKv1liHf87Vts2DUzCZTvrZepy7HDgs14WkgvM=",
"owner": "roc-lang",
"repo": "roc",
"rev": "82036e2e2e581d47611f5e34ee6d9ef4961a2e88",
"rev": "8c737868aa09c58fe5ef9da587fc3fe3b1c7e43f",
"type": "github"
},
"original": {
@ -1209,11 +1209,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1726527644,
"narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=",
"lastModified": 1727122609,
"narHash": "sha256-M6tkMDvt4zOoYAhBOCFxFQGjORhhjZbWMC+0tPnHkxU=",
"owner": "daylinmorgan",
"repo": "tsm",
"rev": "5991d93bcb216c4cd5345296111fee7027be29cf",
"rev": "e8539740f6faf49404f30225607edbad58c34962",
"type": "github"
},
"original": {
@ -1267,11 +1267,11 @@
]
},
"locked": {
"lastModified": 1726851729,
"narHash": "sha256-1z0esr5lBeUMlrPZ9gZmqZT8oTQekxJi53HAW4cH0Ms=",
"lastModified": 1727109343,
"narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "73b8c4f1150040644cf678aa8bbf2cec48a433cf",
"rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea",
"type": "github"
},
"original": {
@ -1289,11 +1289,11 @@
]
},
"locked": {
"lastModified": 1726878449,
"narHash": "sha256-gchxeelL+IdgL/LoEsg3FnO4Dv5z+lmRVHqIE3tq6NA=",
"lastModified": 1727179839,
"narHash": "sha256-OpO99oyPGvNeWDzuKMb/6tmTLKlmn+8IM4Ehltih68w=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "2419eb9f968f451e2c342a69ec44112de5aa36b9",
"rev": "9b4f376b30a69b4b129e92b2979b92f5b95ed6d3",
"type": "github"
},
"original": {
@ -1314,11 +1314,11 @@
]
},
"locked": {
"lastModified": 1726791560,
"narHash": "sha256-0SDGQeb/onI7zVdNOdUhTJ2r4EmSJQJV2bjyXENBgws=",
"lastModified": 1727202282,
"narHash": "sha256-c6fMn99XWXymIaQoMwQfJpZgvE5dU4OzIf+qdHkEFmY=",
"owner": "zigtools",
"repo": "zls",
"rev": "2b613d32696676bcbc257e31542a1dcbfa7f22a8",
"rev": "59d18631e4277dd403ca21cde3a4af419933359a",
"type": "github"
},
"original": {

3
lib/default.nix
View file

@ -6,7 +6,6 @@ let
inherit (lib)
genAttrs
pkgFromSystem
pkgsFromSystem
loadOverlays
;
@ -46,7 +45,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;
}

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

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

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

@ -1,4 +1,7 @@
{ fetchFromGitHub, buildNimPackage }:
{
fetchFromGitHub,
buildNimPackage,
}:
buildNimPackage (finalAttrs: {
pname = "nph";
version = "0.6.0";
@ -8,7 +11,11 @@ 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;
}
)
})

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

@ -117,13 +117,14 @@ 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],
[cache, help = cacheHelp ],
[ci, help = ciHelp ],
[dry, help = sharedHelp],
[build, help = sharedHelp, usage = clUse ],
[cache, help = cacheHelp , usage = clUse ],
[ci, help = ciHelp , usage = clUse ],
[dry, help = sharedHelp, usage = clUse ],
[osCmd, help = sharedHelp, usage = osUsage, cmdName = "os"],
[output, help = sharedHelp],
[update, help = updateHelp],
[output, help = sharedHelp, usage = clUse],
[update, help = updateHelp, usage = clUse],
)

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:
let ln = substituteLog(logger.fmtStrs[level], level, args)
when defined(js): {.fatal: "handler does note support JS".}
when defined(js): {.fatal: "handler does not support JS".}
try:
let handle =
if logger.useStderr: stderr
@ -112,6 +112,6 @@ template errorQuit*(args: varargs[string, `$`]) =
quit QuitFailure
template fatalQuit*(args: varargs[string, `$`]) =
error args
fatal args
quit QuitFailure