daylin
/
oizys
mirror of https://github.com/daylinmorgan/oizys.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: daylin:b32f7e3989da2553603278ac993549fb2aced3f1
Branches Tags
daylin:main
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
...
compare: daylin:610d339b5913726addcfedd9e6d99ca9302eb060
Branches Tags
daylin:main
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

2 Commits
b32f7e3989 ... 610d339b59

Author SHA1 Message Date
Daylin Morgan 610d339b59
use "host" instead path 2024-05-07 09:51:15 -05:00
Daylin Morgan 4171629934
flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=fa69de8ab6cc17bb763a1586c55847c5d5a82a83' (2024-05-06)
  → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=ec092bd601d9d351ff6ca34bd97f12055b2a4dd9' (2024-05-07)
• Updated input 'hyprland/hyprwayland-scanner':
    'github:hyprwm/hyprwayland-scanner/1270ebaa539e56d61b708c24b072b09cbbd3a828' (2024-05-03)
  → 'github:hyprwm/hyprwayland-scanner/6119dc2a965fd30ffa45c50a8398d5da3150df4c' (2024-05-07)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d' (2024-05-05)
  → 'github:nixos/nixpkgs/ad7efee13e0d216bf29992311536fce1d3eefbef' (2024-05-06)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/05dbf637618396834607a9844660e2bf85f3051c' (2024-05-06)
  → 'github:nix-community/nixpkgs-wayland/ccf2fce3be282a544ebe141c6a09103a0fb0d923' (2024-05-07)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/e9be42459999a253a9f92559b1f5b72e1b44c13d' (2024-05-03)
  → 'github:nixos/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05)
• Updated input 'stable':
    'github:nixos/nixpkgs/651b4702e27a388f0f18e1b970534162dec09aff' (2024-05-04)
  → 'github:nixos/nixpkgs/27c13997bf450a01219899f5a83bd6ffbfc70d3c' (2024-05-06)
• Updated input 'zls':
    'github:zigtools/zls/f6817ed3ca4d70c2181f96fbbf84cb533cd7205e' (2024-05-03)
  → 'github:zigtools/zls/a660910dcb0a12067983de8e230e2a581e6edbbd' (2024-05-07)
• Updated input 'zls/zig-overlay':
    'github:mitchellh/zig-overlay/751dd89e227c60e89c6362fc5cdd5cb814e3f1ba' (2024-04-26)
  → 'github:mitchellh/zig-overlay/48bcb35d1d59509010af9a3da06af8750ab9593b' (2024-05-07)
 2024-05-07 09:39:11 -05:00
2 changed files with 33 additions and 29 deletions
Show Stats Expand all files Collapse all files

50
flake.lock
View File

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

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

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