flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/cbe4866388730d63d98743cc884062b6374beb41' (2024-09-16)
  → 'github:nix-community/nixpkgs-wayland/6002e05eb85219d1018b3d3f6c8692ac26e2642a' (2024-09-16)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/8802412b8747633e9d80639897e4d58fa6290909' (2024-08-11)
  → 'github:nix-community/nix-eval-jobs/a7cdbbbd9a7755489267dfd1297c613c824a5920' (2024-09-16)
• Updated input 'roc':
    'github:roc-lang/roc/7df11424550bb7955a178190a3b341e34d184a19' (2024-09-15)
  → 'github:roc-lang/roc/38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf' (2024-09-16)
• Updated input 'tsm':
    'github:daylinmorgan/tsm/8c866db5f020cbdbe9ea9123ce4b92478b41ede5?dir=nix' (2024-09-14)
  → 'github:daylinmorgan/tsm/5991d93bcb216c4cd5345296111fee7027be29cf?dir=nix' (2024-09-16)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/ff9255e02181bad3562f5f24fa27a26036a5f112' (2024-09-16)
  → 'github:mitchellh/zig-overlay/42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a' (2024-09-17)
• Updated input 'zls':
    'github:zigtools/zls/956b436a3f302d5dbc7fecfa565da666c1b2df77' (2024-09-15)
  → 'github:zigtools/zls/cf9b49a67b15693d62926ea11d17f53efc60be50' (2024-09-16)

.github/workflows/build.yml

@@ -32,14 +32,14 @@ jobs:
 
       # - uses: ./.github/actions/clean-disk
 
-      - uses: DeterminateSystems/nix-installer-action@v13
+      - uses: DeterminateSystems/nix-installer-action@v14
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
             experimental-features = pipe-operator
             accept-flake-config = true
 
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
 
       - uses: cachix/cachix-action@v15
         with:

.github/workflows/checks.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           extra-conf: |
             accept-flake-config = true
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
 
       - uses: cachix/cachix-action@v15
         with:

.github/workflows/update.yml

@@ -24,7 +24,7 @@ jobs:
 
       - run: git checkout -B flake-lock
 
-      - uses: DeterminateSystems/nix-installer-action@v13
+      - uses: DeterminateSystems/nix-installer-action@v14
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
@@ -80,7 +80,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: DeterminateSystems/nix-installer-action@v13
+      - uses: DeterminateSystems/nix-installer-action@v14
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |

README.md

@@ -55,30 +55,18 @@ nix run "github:daylinmorgan/oizys"
 
 ```
 nix begat oizys
-
 Usage:
-  oizys [command]
+  oizys {SUBCMD} [sub-command options & parameters]
 
-Available Commands:
+subcommands:
+  help   print comprehensive or per-cmd help
   build  nix build
   cache  build and push to cachix
-  checks                  nix build checks
+  ci     trigger GHA update flow
-  ci                      offload build to GHA
+  dry    dry run build
-  dry                     poor man's nix flake check
+  os     nixos-rebuild
-  help                    Help about any command
+  output output
-  os                      nixos-rebuild wrapper
+  update update and run nixos-rebuild
-  output                  show nixosConfiguration attr
-  update                  update and run nixos rebuild
-
-Flags:
-      --debug          show debug output
-      --flake string   path to flake ($OIZYS_DIR or $HOME/oizys)
-  -h, --help           help for oizys
-      --host string    host(s) to build (current host)
-      --reset-cache    set narinfo-cache-negative-ttl to 0
-  -v, --verbose        show verbose output
-
-Use "oizys [command] --help" for more information about a command.
 ```
 
 ## oizys?

flake.lock

@@ -605,11 +605,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1723372011,
+        "lastModified": 1726529941,
-        "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
+        "narHash": "sha256-jj7gvddyUQ3xnZxApiGv5xQaa75f1hYKFdtOfvtkcZ0=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "8802412b8747633e9d80639897e4d58fa6290909",
+        "rev": "a7cdbbbd9a7755489267dfd1297c613c824a5920",
         "type": "github"
       },
       "original": {
@@ -744,11 +744,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1726496380,
+        "lastModified": 1726530502,
-        "narHash": "sha256-0SPQYespqgqODDBDpdryqWDcwUOObk0NxIMUjRQ7ydY=",
+        "narHash": "sha256-ls3VME2/LC1beE63N4KFGCjmUyzMY13evwX9Xi5kJ7A=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "cbe4866388730d63d98743cc884062b6374beb41",
+        "rev": "6002e05eb85219d1018b3d3f6c8692ac26e2642a",
         "type": "github"
       },
       "original": {
@@ -900,11 +900,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1726359326,
+        "lastModified": 1726501651,
-        "narHash": "sha256-Nt7Ywk1lO6S4jLv9CYg7HN9nOhmgV79uUiSLWXA4fPE=",
+        "narHash": "sha256-W2az8KESGyK1PZtJ1SIriu0VRzlCmyVfmnHwa0exMK8=",
         "owner": "roc-lang",
         "repo": "roc",
-        "rev": "7df11424550bb7955a178190a3b341e34d184a19",
+        "rev": "38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf",
         "type": "github"
       },
       "original": {
@@ -1112,11 +1112,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1726326914,
+        "lastModified": 1726527644,
-        "narHash": "sha256-QMOS1KxI1tY3Rxtpc8UkG5vLBonybjJTiNT89ENOvo0=",
+        "narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=",
         "owner": "daylinmorgan",
         "repo": "tsm",
-        "rev": "8c866db5f020cbdbe9ea9123ce4b92478b41ede5",
+        "rev": "5991d93bcb216c4cd5345296111fee7027be29cf",
         "type": "github"
       },
       "original": {
@@ -1184,11 +1184,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726488713,
+        "lastModified": 1726532622,
-        "narHash": "sha256-af/hZxM6+AVuap2g0sshCbIr4jr2D734JwMI+RdoVrQ=",
+        "narHash": "sha256-BGaIY1UMGkHbtwlGixSiuzM+g8Nnkvec9fmas3jie/I=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "ff9255e02181bad3562f5f24fa27a26036a5f112",
+        "rev": "42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a",
         "type": "github"
       },
       "original": {
@@ -1209,11 +1209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726435403,
+        "lastModified": 1726516447,
-        "narHash": "sha256-KB95mT5hMppNqV4uX7det1D1m5Y0rTQotjmGXYnnps0=",
+        "narHash": "sha256-CV6Mr2zm5ZmtW4RnC3taJqA0tZ0U0ERzLBoO6GfzGWA=",
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "956b436a3f302d5dbc7fecfa565da666c1b2df77",
+        "rev": "cf9b49a67b15693d62926ea11d17f53efc60be50",
         "type": "github"
       },
       "original": {

pkgs/oizys-nim/src/oizys.nim

@@ -95,10 +95,9 @@ proc setupCligen() =
   let isColor = getEnv("NO_COLOR") == ""
   if clCfg.useMulti == "":
     clCfg.useMulti =
-      if isColor:
+      if isColor: "${doc}\e[1mUsage\e[m:\n  $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds"
-        "${doc}\e[1mUsage\e[m:\n  $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds"
+      else: "${doc}Usage:\n  $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
-      else:
+
-        "${doc}Usage:\n  $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
   if not isColor: return
   if clCfg.helpAttr.len == 0:
     clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m",

pkgs/oizys-nim/src/oizys/nix.nim

@@ -162,7 +162,7 @@ proc systemPathDrvsToBuild(): seq[string] =
   result = inputDrvs.filterIt(it in toBuild)
   let nToBuild = result.len
   result = result.filterIt(not it.isIgnored)
-  let nIgnored = result.len - nToBuild
+  let nIgnored = nToBuild - result.len
   debug fmt"ignored {nIgnored} derivations"
   result = result.mapIt(it & "^*")