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

Compare commits

base: daylin:6704f2ae45f677c1840beeb8b361aabd73ea47ef
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:74affb8e4cf48f5079e0a1cf0590e9f57af4bfd9
Branches Tags
daylin:flake-lock
daylin:main

3 commits
6704f2ae45 ... 74affb8e4c

Author SHA1 Message Date
daylin-bot
74affb8e4c flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=00c862686354d139a53222d41a1c80d698a50c43' (2024-09-24)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=d73c14751ad40fd54d93baac2226f550142b0e74' (2024-09-28)
• Updated input 'hyprland/aquamarine':
    'github:hyprwm/aquamarine/752d0fbd141fabb5a1e7f865199b80e6e76f8d8e' (2024-09-18)
  → 'github:hyprwm/aquamarine/b82fdaff917582a9d568969e15e61b398c71e990' (2024-09-25)
• Added input 'hyprland/hyprland-protocols':
    'github:hyprwm/hyprland-protocols/6b3261ee13a6d2b99de79a31d352f6996e35bde3' (2024-09-27)
• Added input 'hyprland/hyprland-protocols/nixpkgs':
    follows 'hyprland/nixpkgs'
• Added input 'hyprland/hyprland-protocols/systems':
    follows 'hyprland/systems'
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/d97af4f6bd068c03a518b597675e598f57ea2291' (2024-09-20)
  → 'github:hyprwm/hyprutils/3f5293432b6dc6a99f26aca2eba3876d2660665c' (2024-09-25)
• Updated input 'hyprland/hyprwayland-scanner':
    'github:hyprwm/hyprwayland-scanner/b68dab23fc922eae99306988133ee80a40b39ca5' (2024-09-20)
  → 'github:hyprwm/hyprwayland-scanner/500c81a9e1a76760371049a8d99e008ea77aa59e' (2024-09-20)
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e' (2024-09-19)
  → 'github:NixOS/nixpkgs/30439d93eb8b19861ccbe3e581abf97bdc91b093' (2024-09-23)
• Updated input 'lix':
    '5f298f74c9.tar.gz?narHash=sha256-jsOyXonevsNaKxM9burYc2S4JVle%2BVMCJ8%2BAAp0MDCc%3D&rev=5f298f74c92402a8390b01c736463b17b36277e3' (2024-09-21)
  → 'f12b60273b.tar.gz?narHash=sha256-GpuJEnpqHfgpMKeQQo%2BuhEPjG7/4ye7PCdjupQhjc3g%3D&rev=f12b60273b7e93184dd175ef9daa75ec490cbd5e' (2024-09-28)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/1fcec53c692c15091ca5bb9eaf86a2cac6c53278' (2024-09-23)
  → 'github:nix-community/NixOS-WSL/4aef94d5afb4a791e5e9a3ee844c68ad01f54a14' (2024-09-27)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6' (2024-09-21)
  → 'github:nixos/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784' (2024-09-26)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/8183313748d1961a5c5991c0b54dbf65e32f8161' (2024-09-24)
  → 'github:nix-community/nixpkgs-wayland/811af6abf4990f27919f39319f8950a4f2f57aab' (2024-09-27)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6' (2024-09-21)
  → 'github:nixos/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784' (2024-09-26)
• Updated input 'pixi':
    'github:daylinmorgan/pixi-flake/820ce16a1a39c469628d8ccea077827779496bda' (2024-09-04)
  → 'github:daylinmorgan/pixi-flake/935278026a29a12589bb594533905d329bd16a9d' (2024-09-26)
• Updated input 'roc':
    'github:roc-lang/roc/8c737868aa09c58fe5ef9da587fc3fe3b1c7e43f' (2024-09-24)
  → 'github:roc-lang/roc/587d0afd462994edc15fcceb8514bc0d2662b12b' (2024-09-28)
• Updated input 'roc/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Updated input 'roc/nixgl':
    'github:guibou/nixGL/d709a8abcde5b01db76ca794280745a43c8662be' (2024-03-19)
  → 'github:guibou/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a' (2024-04-19)
• Updated input 'roc/rust-overlay':
    'github:oxalica/rust-overlay/b186d85e747e2b7bee220ec95839fb66c868dc47' (2024-04-15)
  → 'github:oxalica/rust-overlay/11a13e50debafae4ae802f1d6b8585101516dd93' (2024-09-28)
• Removed input 'roc/rust-overlay/flake-utils'
• Updated input 'tsm':
    'github:daylinmorgan/tsm/e8539740f6faf49404f30225607edbad58c34962?dir=nix' (2024-09-23)
  → 'github:daylinmorgan/tsm/bd94042d38826754e9ac8e35b15d22c64121039a?dir=nix' (2024-09-26)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/054c1c69aeb8a54fadde4f97dc09c80e75f6ef72' (2024-09-25)
  → 'github:mitchellh/zig-overlay/93b14ef3d7f496ae49c79ba392eb3351cb92b57a' (2024-09-27)
• Updated input 'zls':
    'github:zigtools/zls/59d18631e4277dd403ca21cde3a4af419933359a' (2024-09-24)
  → 'github:zigtools/zls/db05a1ce337fa53927e0635cc4ec5145723584a4' (2024-09-26)
 2024-09-29 00:41:03 +00:00
Daylin Morgan
57e99e8f27
add more convience combiner procs 2024-09-28 18:02:04 -05:00
Daylin Morgan
b3d07dcc84
update hwylterm 2024-09-26 16:50:43 -05:00
6 changed files with 104 additions and 79 deletions
Show stats Expand all files Collapse all files

144
flake.lock
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726665257, "lastModified": 1727261104,
"narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=", "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e", "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,11 +230,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,6 +348,7 @@
"inputs": { "inputs": {
"aquamarine": "aquamarine", "aquamarine": "aquamarine",
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
@ -356,11 +357,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1727173505, "lastModified": 1727549598,
"narHash": "sha256-DaiWKEntVBrgy1OZEGW3izIfzyIr1jav/Jpo9tqL4EU=", "narHash": "sha256-esywx7x3PvsLepRNTP1hYL96oJAWe0lUE9u5u9TAyfI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "00c862686354d139a53222d41a1c80d698a50c43", "rev": "d73c14751ad40fd54d93baac2226f550142b0e74",
"revCount": 5253, "revCount": 5275,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -390,6 +391,31 @@
} }
}, },
"hyprland-protocols": { "hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1727451107,
"narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-protocols_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
@ -477,11 +503,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726874949, "lastModified": 1727300645,
"narHash": "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80=", "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "d97af4f6bd068c03a518b597675e598f57ea2291", "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +528,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726840673, "lastModified": 1726874836,
"narHash": "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=", "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "b68dab23fc922eae99306988133ee80a40b39ca5", "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +563,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726905313, "lastModified": 1727566890,
"narHash": "sha256-jsOyXonevsNaKxM9burYc2S4JVle+VMCJ8+AAp0MDCc=", "narHash": "sha256-GpuJEnpqHfgpMKeQQo+uhEPjG7/4ye7PCdjupQhjc3g=",
"rev": "5f298f74c92402a8390b01c736463b17b36277e3", "rev": "f12b60273b7e93184dd175ef9daa75ec490cbd5e",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5f298f74c92402a8390b01c736463b17b36277e3.tar.gz?rev=5f298f74c92402a8390b01c736463b17b36277e3" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f12b60273b7e93184dd175ef9daa75ec490cbd5e.tar.gz?rev=f12b60273b7e93184dd175ef9daa75ec490cbd5e"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -729,11 +755,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710868679, "lastModified": 1713543440,
"narHash": "sha256-V1o2bCZdeYKP/0zgVp4EN0KUjMItAMk6J7SvCXUI5IU=", "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
"owner": "guibou", "owner": "guibou",
"repo": "nixGL", "repo": "nixGL",
"rev": "d709a8abcde5b01db76ca794280745a43c8662be", "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -749,11 +775,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1727091786, "lastModified": 1727464323,
"narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=", "narHash": "sha256-XhiLvnM95aNpRm3qJ9hsVV/prin4GVapn4snMN4Ol6k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278", "rev": "4aef94d5afb4a791e5e9a3ee844c68ad01f54a14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -764,11 +790,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726755586, "lastModified": 1727122398,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -819,11 +845,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1727220978, "lastModified": 1727472280,
"narHash": "sha256-uh9ThJGjv8Z+lMGh+blj3xZU3x5zkI9pB1LZWS8acNU=", "narHash": "sha256-SKMFwHkYYldzzZQbquB7FUyfrB43D/BGH3xeZ8hfFCc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "8183313748d1961a5c5991c0b54dbf65e32f8161", "rev": "811af6abf4990f27919f39319f8950a4f2f57aab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -866,11 +892,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1726937504, "lastModified": 1727348695,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -898,11 +924,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1726937504, "lastModified": 1727348695,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -951,11 +977,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725471169, "lastModified": 1727382008,
"narHash": "sha256-PF5uVWJ9SDviht5rugMp2I8U8D0KTtPVO5TIC+XxWc0=", "narHash": "sha256-t9SNSBXzECHI5KdWbJXsN2ATpXqq7JBGag/1BgY3yfE=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "pixi-flake", "repo": "pixi-flake",
"rev": "820ce16a1a39c469628d8ccea077827779496bda", "rev": "935278026a29a12589bb594533905d329bd16a9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -975,11 +1001,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1727199359, "lastModified": 1727542371,
"narHash": "sha256-wS8T3zKv1liHf87Vts2DUzCZTvrZepy7HDgs14WkgvM=", "narHash": "sha256-McimLk3cGSp5ZL0bPPDvw4QttZ/oNgbZKqKAuP7vj1A=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "8c737868aa09c58fe5ef9da587fc3fe3b1c7e43f", "rev": "587d0afd462994edc15fcceb8514bc0d2662b12b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1013,21 +1039,17 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": [
"roc",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"roc", "roc",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1713150335, "lastModified": 1727490462,
"narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=", "narHash": "sha256-OrrPiNBiikv9BR464XTT75FzOq7tKAvMbMi7YOKVIeg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b186d85e747e2b7bee220ec95839fb66c868dc47", "rev": "11a13e50debafae4ae802f1d6b8585101516dd93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1209,11 +1231,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1727122609, "lastModified": 1727369985,
"narHash": "sha256-M6tkMDvt4zOoYAhBOCFxFQGjORhhjZbWMC+0tPnHkxU=", "narHash": "sha256-ywfXk25Z0dYDzxa+wlwcPlBIS+XusuQhZKcKdWsP+bw=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "tsm", "repo": "tsm",
"rev": "e8539740f6faf49404f30225607edbad58c34962", "rev": "bd94042d38826754e9ac8e35b15d22c64121039a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1244,7 +1266,7 @@
}, },
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols_2",
"hyprlang": [ "hyprlang": [
"hyprland", "hyprland",
"hyprlang" "hyprlang"
@ -1289,11 +1311,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727224156, "lastModified": 1727439069,
"narHash": "sha256-jzTcjmj7tzv5/5NqTEeSQpoBSze/jcIIM1d3n5c7SoM=", "narHash": "sha256-qonN+4DQtubTpV5VluIX57aq6J0UurtW2IGz8dtIzJE=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "054c1c69aeb8a54fadde4f97dc09c80e75f6ef72", "rev": "93b14ef3d7f496ae49c79ba392eb3351cb92b57a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1314,11 +1336,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727202282, "lastModified": 1727377763,
"narHash": "sha256-c6fMn99XWXymIaQoMwQfJpZgvE5dU4OzIf+qdHkEFmY=", "narHash": "sha256-ZTd8BEmMvSSUiC32WBuSwvakdZ8PGNJ1naCZQh5zS8A=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "59d18631e4277dd403ca21cde3a4af419933359a", "rev": "db05a1ce337fa53927e0635cc4ec5145723584a4",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
pkgs/oizys-nim/config.nims
View file

@ -6,5 +6,3 @@ task build, "build oizys":
when withDir(thisDir(), system.fileExists("nimble.paths")): when withDir(thisDir(), system.fileExists("nimble.paths")):
include "nimble.paths" include "nimble.paths"
# end Nimble config # end Nimble config
#
--path:"../../../dev/github/daylinmorgan/hwylterm/src"

2
pkgs/oizys-nim/default.nix
View file

@ -8,5 +8,5 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-o+CN0LlVOcgjLpDfjItW/5GCXTWcPSx9GfwQn+u2ST4="; nimbleDepsHash = "sha256-A2sQy4x+QyqltV7B1rRh7uRPvv7pDtVNOXZZl5LrHCY=";
} }

4
pkgs/oizys-nim/nimble.lock
View file

@ -13,12 +13,12 @@
}, },
"hwylterm": { "hwylterm": {
"version": "0.1.0", "version": "0.1.0",
"vcsRevision": "9afc339a9791f25010ea89a4f52204ad8eeda858", "vcsRevision": "c2bcfd1f73dda97bd3e209c89e2abfe588f0977c",
"url": "https://github.com/daylinmorgan/hwylterm", "url": "https://github.com/daylinmorgan/hwylterm",
"downloadMethod": "git", "downloadMethod": "git",
"dependencies": [], "dependencies": [],
"checksums": { "checksums": {
"sha1": "853c67ee7f789d825ec6f46c9fbae68e03e43cdb" "sha1": "1932229840c893c39acca0b50def19913678f5f0"
} }
}, },
"jsony": { "jsony": {

2
pkgs/oizys-nim/oizys.nimble
View file

@ -14,5 +14,5 @@ requires "nim >= 2.0.8"
requires "cligen" requires "cligen"
requires "jsony" requires "jsony"
requires "zippy" requires "zippy"
requires "https://github.com/daylinmorgan/hwylterm#9afc339" requires "https://github.com/daylinmorgan/hwylterm#HEAD"

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

@ -86,10 +86,15 @@ proc checkExes() =
if findExe("nix") == "": if findExe("nix") == "":
fatalQuit "oizys requires nix" fatalQuit "oizys requires nix"
proc `//`(t1: Table[string, string], t2: Table[string, string]): Table[string, string] = func `//`[A, B](pairs: openArray[(A, B)]): Table[A, B] =
# nix style shallow table merge pairs.toTable()
for k, v in t1.pairs(): result[k] = v func `//`[A, B](t1: var Table[A,B], t2: Table[A,B]) =
for k, v in t2.pairs(): result[k] = v for k, v in t2.pairs(): t1[k] = v
func `//`[A, B](t1: Table[A, B], t2: Table[A, B]): Table[A, B] =
result // t1; result // t2
func `//`[A, B](pairs: openArray[(A,B)], t2: Table[A,B]): Table[A,B] =
// pairs // t2
when isMainModule: when isMainModule:
@ -98,21 +103,21 @@ when isMainModule:
hwylCli(clCfg) hwylCli(clCfg)
const const
sharedHelp = { sharedHelp = //{
"flake" : "path/to/flake", "flake" : "path/to/flake",
"host" : "host(s) to build", "host" : "host(s) to build",
"debug" : "enable debug mode", "debug" : "enable debug mode",
"resetCache" : "set cache timeout to 0" "resetCache" : "set cache timeout to 0"
}.toTable() }
updateHelp = { updateHelp = //{
"yes" : "skip all confirmation prompts" "yes" : "skip all confirmation prompts"
}.toTable() // sharedHelp } // sharedHelp
ciHelp = { ciHelp = //{
"ref" : "git ref/branch/tag to trigger workflow on" "ref" : "git ref/branch/tag to trigger workflow on"
}.toTable() }
cacheHelp = { cacheHelp = //{
"name" : "name of cachix binary cache" "name" : "name of cachix binary cache"
}.toTable() // sharedHelp } // sharedHelp
let let
# 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")