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

Compare commits

base: daylin:a459ea2ad154d68ca70eeaca44bdd7a08e81d1c5
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:0340586ec7ecb2ddb7979e4ee05946392490e3da
Branches Tags
daylin:flake-lock
daylin:main

3 commits
a459ea2ad1 ... 0340586ec7

Author SHA1 Message Date
daylin-bot
0340586ec7 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/50e4446e6dce9e1e52455f5b87bb91e83a538468' (2024-09-30)
  → 'github:nix-community/nixpkgs-wayland/a40e6b047b6166aed5fab801e99a8d6b980d4680' (2024-10-01)
 2024-10-01 22:52:08 +00:00
Daylin Morgan
c01c5309f5
use backticks for hash 2024-10-01 11:05:30 -05:00
Daylin Morgan
d3a9286723
modify logging defaults 2024-10-01 11:05:30 -05:00
3 changed files with 5 additions and 10 deletions
Show stats Expand all files Collapse all files

6
flake.lock
View file

@ -845,11 +845,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1727710797, "lastModified": 1727812556,
"narHash": "sha256-2Xr8tAZoLrMkvD0Sil6053x2Lbsy8cvmlk8sApSWdD0=", "narHash": "sha256-U9cEs2W0eLvIS0kEMBGP8eZMdrpoHqynByth/mu2Nvc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "50e4446e6dce9e1e52455f5b87bb91e83a538468", "rev": "a40e6b047b6166aed5fab801e99a8d6b980d4680",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -5,7 +5,6 @@ import oizys/[context, github, nix, overlay]# 3, logging
addHandler( addHandler(
newFancyConsoleLogger( newFancyConsoleLogger(
levelThreshold = lvlAll,
fmtPrefix = $bb"[b magenta]oizys" fmtPrefix = $bb"[b magenta]oizys"
) )
) )
@ -37,7 +36,7 @@ overlay:
nixBuildHostDry(minimal, rest) nixBuildHostDry(minimal, rest)
proc output(yes: bool = false) = proc output(yes: bool = false) =
## output ## nixos config attr
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,10 +233,6 @@ 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}"