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

Compare commits

base: daylin:610d339b5913726addcfedd9e6d99ca9302eb060
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:b32f7e3989da2553603278ac993549fb2aced3f1
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "610d339b5913726addcfedd9e6d99ca9302eb060" and "b32f7e3989da2553603278ac993549fb2aced3f1" have entirely different histories.
610d339b59 ... b32f7e3989

2 changed files with 29 additions and 33 deletions
Show stats Expand all files Collapse all files

50
flake.lock
View file

@ -200,11 +200,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1715088506, "lastModified": 1715012366,
"narHash": "sha256-8KUE4xi+kTgnZtlNf+I7U95NbIlbxK9uR9kKpSA+5Lk=", "narHash": "sha256-+e9u2a92M3CIdnjMxqbJS0ulxkjXaRwHGIJR+fyhZII=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "ec092bd601d9d351ff6ca34bd97f12055b2a4dd9", "rev": "fa69de8ab6cc17bb763a1586c55847c5d5a82a83",
"revCount": 4627, "revCount": 4620,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -297,11 +297,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715088365, "lastModified": 1714755542,
"narHash": "sha256-cVH43+fiiCXqr6F2vUA8KmNI9ytWIQoZGnVz0IpBbZw=", "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "6119dc2a965fd30ffa45c50a8398d5da3150df4c", "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,11 +443,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1715091264, "lastModified": 1715004883,
"narHash": "sha256-EVtWdLNsWmOELUAY/Jvud2gmFIrXiJdy0v/ZtXDWq/I=", "narHash": "sha256-4gtiHlHDC9P7/+cXNYVVTKLNN7v0ltJ1HIgYhX8c1wk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "ccf2fce3be282a544ebe141c6a09103a0fb0d923", "rev": "05dbf637618396834607a9844660e2bf85f3051c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -490,11 +490,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1715037484, "lastModified": 1714912032,
"narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,11 +522,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1714763106,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -573,11 +573,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1714971268, "lastModified": 1714782413,
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "rev": "651b4702e27a388f0f18e1b970534162dec09aff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -731,11 +731,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715041400, "lastModified": 1714133353,
"narHash": "sha256-yI67g+yU2J/tjytr9cTk51feKjLc+f9+BKE1KjlMNLQ=", "narHash": "sha256-oDA4fGiFPxwiLHTJjY2hWn06Dg4yFW+EH/U9FTL8oRY=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "48bcb35d1d59509010af9a3da06af8750ab9593b", "rev": "751dd89e227c60e89c6362fc5cdd5cb814e3f1ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -776,11 +776,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1715076382, "lastModified": 1714726694,
"narHash": "sha256-PK+ML1V5qI2dTU4a/7108RBHYcsZXamQtO+xt7qmT2E=", "narHash": "sha256-EZpShJM2csFe+EBFJyjVWs6/nPvQwiMuuWsmeltEMXg=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "a660910dcb0a12067983de8e230e2a581e6edbbd", "rev": "f6817ed3ca4d70c2181f96fbbf84cb533cd7205e",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
pkgs/oizys/oizys-go/pkg/oizys/oizys.go
View file

@ -67,25 +67,21 @@ func ParseDryRunOutput(nixOutput string) {
} }
func NixDryRun(flake string, host string) { func NixDryRun(flake string, host string) {
output := termenv.NewOutput(os.Stdout)
path := Output(flake, host) path := Output(flake, host)
cmd := exec.Command("nix", "build", path, "--dry-run") cmd := exec.Command("nix", "build", path, "--dry-run")
s := spinner.New( s := spinner.New(
spinner.CharSets[14], spinner.CharSets[14],
100*time.Millisecond, 100*time.Millisecond,
spinner.WithSuffix( spinner.WithSuffix(" evaluating derivation for: "+path),
fmt.Sprintf("%s %s", " evaluating derivation for:",
output.String(host).Bold().Foreground(output.Color("6")),
)),
spinner.WithColor("fgHiMagenta")) spinner.WithColor("fgHiMagenta"))
s.Start() s.Start()
result, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
s.Stop() s.Stop()
if err != nil { if err != nil {
fmt.Println(string(result)) fmt.Println(string(output))
log.Fatal(err) log.Fatal(err)
} }
ParseDryRunOutput(string(result)) ParseDryRunOutput(string(output))
} }
func NixosRebuild(subcmd string, flake string, rest ...string) { func NixosRebuild(subcmd string, flake string, rest ...string) {