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

Compare commits

base: daylin:c01c5309f591fc69d0bd4372eb1d575e3a0e6eee
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:a85dfde3d571ffc71868cd9aec54f2378a4440a4
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "c01c5309f591fc69d0bd4372eb1d575e3a0e6eee" and "a85dfde3d571ffc71868cd9aec54f2378a4440a4" have entirely different histories.
c01c5309f5 ... a85dfde3d5

3 changed files with 34 additions and 29 deletions
Show stats Expand all files Collapse all files

54
flake.lock
View file

@ -357,11 +357,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1727714556, "lastModified": 1727679999,
"narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=", "narHash": "sha256-NWF3SKLMFjM0M93PDWM9+wKbc5XcnJEmojiZdNdPpUw=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765", "rev": "f6387536f62454f82039b42f641cd8c44153ad47",
"revCount": 5285, "revCount": 5281,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -547,11 +547,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1727710043, "lastModified": 1727611937,
"narHash": "sha256-NpTnTg8oOVvntlTi/t8BUe5msrMmkiZFiOW22fc7B+g=", "narHash": "sha256-VTtaGRJGFWQzQd7u7iHUJiUUyMbJ3Jcv/ZsXlBXw0Ok=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "d03a5f88a345d26ca13918071d42dcc960233183", "rev": "74c775886c8f89a0af4743a9144c5bbd04125725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,11 +563,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727783747, "lastModified": 1727623796,
"narHash": "sha256-fLiDo55WLgikMaaZcFEpkCkL4fQiV7RNEjRn+LxiYao=", "narHash": "sha256-IsdPqCIc7eZwU9I1mO2huN0t1wUxgDKgmV4UeLv3elA=",
"rev": "775292766025380d04004e42fefbdb8ca40b3fa3", "rev": "aa33c34c9be074c9452976aa96d71091325c83ea",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/775292766025380d04004e42fefbdb8ca40b3fa3.tar.gz?rev=775292766025380d04004e42fefbdb8ca40b3fa3" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/aa33c34c9be074c9452976aa96d71091325c83ea.tar.gz?rev=aa33c34c9be074c9452976aa96d71091325c83ea"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -586,11 +586,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727752861, "lastModified": 1726631249,
"narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", "narHash": "sha256-b2rMO8+jKjY55d8uynX7FjV4NIPu/WzPux0kWOAzwoo=",
"rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "rev": "b0e6f359500d66670cc16f521e4f62d6a0a4864e",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b0e6f359500d66670cc16f521e4f62d6a0a4864e.tar.gz?rev=b0e6f359500d66670cc16f521e4f62d6a0a4864e"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -845,11 +845,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1727710797, "lastModified": 1727614831,
"narHash": "sha256-2Xr8tAZoLrMkvD0Sil6053x2Lbsy8cvmlk8sApSWdD0=", "narHash": "sha256-ffvX/qhMqol1E7Rv+oRSVXxYgYvKy5bfZAyjYdq/9RI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "50e4446e6dce9e1e52455f5b87bb91e83a538468", "rev": "206b2a2a8505b9e8afb5d1b5ffea2b574b7983b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -892,11 +892,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1727634051, "lastModified": 1727348695,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1001,11 +1001,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1727785014, "lastModified": 1727705464,
"narHash": "sha256-u9R0Atlcy1Y+r63zk66rjOwMij30ZLwoo6l1k7+OI08=", "narHash": "sha256-AN+lqsNz64FXmi1bXwR4zj2Yl0j6ktGHQeE3VJsE1Ic=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "aaeefc09b60313a28597372d3fdec041c1b96a22", "rev": "775bce294b732dbdbeefed6d8d94516f13422210",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1231,11 +1231,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1727738646, "lastModified": 1727369985,
"narHash": "sha256-OlKbUvhtdgMBW/BvmA7TSAzbvR2AD+tGo9oaEXoS2MY=", "narHash": "sha256-ywfXk25Z0dYDzxa+wlwcPlBIS+XusuQhZKcKdWsP+bw=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "tsm", "repo": "tsm",
"rev": "07dd5a5238e0ddc67b24772be7b1f742693b4535", "rev": "bd94042d38826754e9ac8e35b15d22c64121039a",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -5,6 +5,7 @@ import oizys/[context, github, nix, overlay]# 3, logging
addHandler( addHandler(
newFancyConsoleLogger( newFancyConsoleLogger(
levelThreshold = lvlAll,
fmtPrefix = $bb"[b magenta]oizys" fmtPrefix = $bb"[b magenta]oizys"
) )
) )
@ -36,7 +37,7 @@ overlay:
nixBuildHostDry(minimal, rest) nixBuildHostDry(minimal, rest)
proc output(yes: bool = false) = proc output(yes: bool = false) =
## nixos config attr ## output
echo nixosConfigAttrs().join(" ") echo nixosConfigAttrs().join(" ")
proc update( proc update(

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

@ -186,7 +186,7 @@ proc writeDervationsToStepSummary(drvs: seq[string]) =
let rows = collect( let rows = collect(
for drv in drvs: for drv in drvs:
let (name,hash) = splitDrv(drv) let (name,hash) = splitDrv(drv)
fmt"| {name} | `{hash}` |" fmt"| {name} | {hash} |"
) )
let summaryFilePath = getEnv("GITHUB_STEP_SUMMARY") let summaryFilePath = getEnv("GITHUB_STEP_SUMMARY")
if summaryFilePath == "": fatalQuit "no github step summary found" if summaryFilePath == "": fatalQuit "no github step summary found"
@ -233,6 +233,10 @@ proc nixBuildHostDry*(minimal: bool, rest: seq[string]) =
let output = parseDryRunOutput err let output = parseDryRunOutput err
display output display output
# TODO: Add to bbansi
template `bbfmt`(pattern: static string): untyped =
bb(fmt(pattern))
proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) = proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) =
if findExe("cachix") == "": fatalQuit "is cachix installed?" if findExe("cachix") == "": fatalQuit "is cachix installed?"
info bbfmt"building and pushing to cache: [b]{name}" info bbfmt"building and pushing to cache: [b]{name}"