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

Compare commits

base: daylin:8442447bfd7b3336cb72ac63acafbeda92538de4
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:8eafb2e06b0ac79d9e8319eb74e1d5103902858b
Branches Tags
daylin:flake-lock
daylin:main

2 commits
8442447bfd ... 8eafb2e06b

Author SHA1 Message Date
Daylin Morgan
8eafb2e06b
flake.lock: Update 
Flake lock file updates:

• Updated input 'f1multiviewer':
    'github:daylinmorgan/f1multiviewer-flake/a04a548c5e88933a2aed21544d18812860f14212' (2024-06-18)
  → 'github:daylinmorgan/f1multiviewer-flake/5ef3bb97663a0b179e712300c6bdc0c8919f80b0' (2024-06-23)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=fabc30df52ab5d2c369fc8acd4ff909a6ba3b8ac' (2024-06-19)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=e09addf8dede9a8e7f2dd0e5bb414d3a0d5dc471' (2024-06-23)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/6af2c5e58c20311276f59d247341cafeebfcb6f4' (2024-06-16)
  → 'github:nix-community/nix-index-database/4293f532d0107dfb7e6f8b34a0421dc8111320e6' (2024-06-23)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/98053e7c05285b3079af95e99aef97d9455faef7' (2024-06-19)
  → 'github:nixos/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681' (2024-06-22)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/270d6e790dd9fe003b09bde98925f1648b638a09' (2024-06-20)
  → 'github:nix-community/nixpkgs-wayland/2306a407a29c9358b63723746eeb849215cb6cb6' (2024-06-23)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/17a1c1bfca963a2776969866aaa07744d7ac9135' (2024-06-16)
  → 'github:nix-community/lib-aggregate/7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a' (2024-06-23)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/6fba0c5a27b984914794ffdab8d7bb5c29ab11b6' (2024-06-16)
  → 'github:nix-community/nixpkgs.lib/f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863' (2024-06-23)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/b6169e08e76e10b673d1b54f944cddb1e7cbea97' (2024-06-06)
  → 'github:nix-community/nix-eval-jobs/630134d3ee9f33caef30b658537463053e9cfde2' (2024-06-22)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e' (2024-06-18)
  → 'github:nixos/nixpkgs/a71e967ef3694799d0c418c98332f7ff4cc5f6af' (2024-06-22)
• Updated input 'roc':
    'github:roc-lang/roc/fc81e887bbb6195fec6b6b8f8883a43b52abfdb6' (2024-06-20)
  → 'github:roc-lang/roc/794c20956de5f22019fe1bf1cad6bf7b738add52' (2024-06-23)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/485eba9dbcb055034131d66e33c6a33da7f2d8db' (2024-06-20)
  → 'github:Cloudef/zig2nix/32560c3060464003e122a732d563f4018e860f27' (2024-06-23)
• Updated input 'zls':
    'github:zigtools/zls/6d0eac599352df8eeebd0acab4a51ba05e587cc7' (2024-06-19)
  → 'github:zigtools/zls/2e5a2a5959c0ba645fd6bfbf93dc467c32458465' (2024-06-22)
 2024-06-23 08:51:21 -05:00
Daylin Morgan
a124a77908
add spinner 2024-06-23 08:50:36 -05:00
2 changed files with 41 additions and 38 deletions
Show stats Expand all files Collapse all files

74
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1718728970, "lastModified": 1719147217,
"narHash": "sha256-R8FjmfsIrTUXMPtmjCNKeTR6cBMCY75WMnH5PfGXHFQ=", "narHash": "sha256-h0MkxLXLqyaIa8BsnW2THNoCw2/pPIhgtl2wxTiGvtQ=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "f1multiviewer-flake", "repo": "f1multiviewer-flake",
"rev": "a04a548c5e88933a2aed21544d18812860f14212", "rev": "5ef3bb97663a0b179e712300c6bdc0c8919f80b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1718835324, "lastModified": 1719150233,
"narHash": "sha256-U5eKTPAXppfSIqKqMIgbyuTBy1gr2seSOUl8sUSR8FE=", "narHash": "sha256-HOt6FGQdTRIitp5agm3tnZ/4OYM6RG6KOm3UGMntlrY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "fabc30df52ab5d2c369fc8acd4ff909a6ba3b8ac", "rev": "e09addf8dede9a8e7f2dd0e5bb414d3a0d5dc471",
"revCount": 4870, "revCount": 4878,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -482,11 +482,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1718539824, "lastModified": 1719144654,
"narHash": "sha256-pVGgM3MOOpMMqprkrMkuWwhC1dsw6Xt7aRGaBkMQqG0=", "narHash": "sha256-3eKm5xwc2M4WJ1wQ4POID8jpDARWXEAMcuh1xDItJl8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "17a1c1bfca963a2776969866aaa07744d7ac9135", "rev": "7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,11 +538,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1717698186, "lastModified": 1719073535,
"narHash": "sha256-e3/cvm7bAn0RsTBcPfHwuYOi2lwoO4jpTn4nmMSvHfU=", "narHash": "sha256-G3LQrKVR5J31hpM8iFMHPchj7HRu0hcLarqLAyRALsI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "b6169e08e76e10b673d1b54f944cddb1e7cbea97", "rev": "630134d3ee9f33caef30b658537463053e9cfde2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -580,11 +580,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718507237, "lastModified": 1719111455,
"narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -656,11 +656,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1718499101, "lastModified": 1719103869,
"narHash": "sha256-2oGRKxl3qEyRH2DJRiVtLeJICcybXMkqjWQYODINL9M=", "narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "6fba0c5a27b984914794ffdab8d7bb5c29ab11b6", "rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -677,11 +677,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1718889592, "lastModified": 1719149508,
"narHash": "sha256-P/Nug/w5ODUCiz76m8MRJF0ADcWcPQ54W1fYmwp6w9o=", "narHash": "sha256-Hg8vaExQUf4Lu9CGi1A6Bp3w33Rw4GRna4OQupSPdHs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "270d6e790dd9fe003b09bde98925f1648b638a09", "rev": "2306a407a29c9358b63723746eeb849215cb6cb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,11 +740,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1718837368, "lastModified": 1719082008,
"narHash": "sha256-F43E0ngBhFTRBimq10196O4lyBwK+mPiNk6rxEA0jaQ=", "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "98053e7c05285b3079af95e99aef97d9455faef7", "rev": "9693852a2070b398ee123a329e68f0dab5526681",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -772,11 +772,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1718714799, "lastModified": 1719075281,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -849,11 +849,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1718888430, "lastModified": 1719110062,
"narHash": "sha256-BfvYTGoMGuAaqOVAAx1dQx9NoPUem2GaISkcCzZfPgU=", "narHash": "sha256-G+CRYQHhSP49ZG0mrYdDziFFtBxpNVk7BwI/k14kK8U=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "fc81e887bbb6195fec6b6b8f8883a43b52abfdb6", "rev": "794c20956de5f22019fe1bf1cad6bf7b738add52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1147,11 +1147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718846228, "lastModified": 1719105765,
"narHash": "sha256-Z9VcNVqmLsevPiP0TL8DOscQnRsSvJAQUQnErEBVjUE=", "narHash": "sha256-tzjig1Sw3DsdoDIgPu8UFiPwK9HwUWuTghHT3xF8XN0=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "485eba9dbcb055034131d66e33c6a33da7f2d8db", "rev": "32560c3060464003e122a732d563f4018e860f27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1171,11 +1171,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1718808820, "lastModified": 1719052215,
"narHash": "sha256-uTwU9NxKfP6tbhVuRajLxpVJENaw71FCLvElba7TZ5M=", "narHash": "sha256-kWL4LzPps7U/s5n+mQwA80IdRK0gMFhwyGN7Lvx/DyE=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "6d0eac599352df8eeebd0acab4a51ba05e587cc7", "rev": "2e5a2a5959c0ba645fd6bfbf93dc467c32458465",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
pkgs/oizys/oizys-go/internal/oizys/main.go
View file

@ -64,8 +64,11 @@ func (o *Oizys) getSystemPath() string {
cmd := exec.Command("nix", "derivation", "show", o.nixosConfigAttr()) cmd := exec.Command("nix", "derivation", "show", o.nixosConfigAttr())
logCmd(cmd) logCmd(cmd)
// TODO: add spinner? // TODO: add spinner?
cmd.Stderr = os.Stderr // cmd.Stderr = os.Stderr
s := nixSpinner(o.host)
// result, err := cmd.CombinedOutput()
out, err := cmd.Output() out, err := cmd.Output()
s.Stop()
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }