nushell: nicer output, better err handling

README.md

@@ -190,9 +190,7 @@ nix-env -iA neatvnc
 
 ## Packages
 
-These packages were mostly recently built (and cached) against:
-
-<!--pkgs-->
+<!--pkgs-start-->
 | Package | Description |
 | --- | --- |
 | [aml](https://github.com/any1/aml) | Another main loop |
@@ -219,11 +217,11 @@ These packages were mostly recently built (and cached) against:
 | [shotman](https://git.sr.ht/~whynothugo/shotman) | Uncompromising screenshot GUI for Wayland |
 | [sirula](https://github.com/DorianRudolph/sirula) | Sirula (simple rust launcher) is an app launcher for wayland |
 | [slurp](https://github.com/emersion/slurp) | Select a region in a Wayland compositor |
+| [sway-unwrapped](https://github.com/swaywm/sway) | An i3-compatible tiling Wayland compositor |
 | [swaybg](https://github.com/swaywm/swaybg) | Wallpaper tool for Wayland compositors |
 | [swayidle](https://github.com/swaywm/swayidle) | Idle management daemon for Wayland |
-| [swaylock-effects](https://github.com/mortie/swaylock-effects) | Screen locker for Wayland |
 | [swaylock](https://github.com/swaywm/swaylock) | Screen locker for Wayland |
-| [sway-unwrapped](https://github.com/swaywm/sway) | An i3-compatible tiling Wayland compositor |
+| [swaylock-effects](https://github.com/mortie/swaylock-effects) | Screen locker for Wayland |
 | [waybar](https://github.com/Alexays/Waybar) | Highly customizable Wayland bar for Sway and Wlroots based compositors |
 | [wayfire-unstable](https://wayfire.org/) | 3D wayland compositor |
 | [waypipe](https://gitlab.freedesktop.org/mstoeckl/waypipe/) | A network proxy for Wayland clients (applications) |
@@ -232,21 +230,21 @@ These packages were mostly recently built (and cached) against:
 | [wdisplays](https://github.com/artizirk/wdisplays) | A graphical application for configuring displays in Wayland compositors |
 | [wev](https://git.sr.ht/~sircmpwn/wev) | Wayland event viewer |
 | [wf-recorder](https://github.com/ammen99/wf-recorder) | Utility program for screen recording of wlroots-based compositors |
+| [wl-clipboard](https://github.com/bugaevc/wl-clipboard) | Command-line copy/paste utilities for Wayland |
+| [wl-gammactl](https://github.com/mischw/wl-gammactl) | Contrast, brightness, and gamma adjustments for Wayland |
 | [wlay](https://github.com/atx/wlay) | Graphical output management for Wayland |
 | [wldash](https://wldash.org) | Wayland launcher/dashboard |
 | [wlfreerdp](https://github.com/FreeRDP/FreeRDP) | A Remote Desktop Protocol Client |
 | [wlogout](https://github.com/ArtsyMacaw/wlogout) | A wayland based logout menu |
-| [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots/) | A modular Wayland compositor library |
 | [wlr-randr](https://github.com/emersion/wlr-randr) | An xrandr clone for wlroots compositors |
+| [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots/) | A modular Wayland compositor library |
 | [wlsunset](https://git.sr.ht/~kennylevinsen/wlsunset) | Day/night gamma adjustments for Wayland |
 | [wlvncc](https://github.com/any1/wlvncc) | A Wayland Native VNC Client |
-| [wl-clipboard](https://github.com/bugaevc/wl-clipboard) | Command-line copy/paste utilities for Wayland |
-| [wl-gammactl](https://github.com/mischw/wl-gammactl) | Contrast, brightness, and gamma adjustments for Wayland |
 | [wofi](https://hg.sr.ht/~scoopta/wofi) | A launcher/menu program for wlroots based wayland compositors such as sway |
 | [wshowkeys](https://github.com/ammgws/wshowkeys) | Displays keys being pressed on a Wayland session |
 | [wtype](https://github.com/atx/wtype) | xdotool type for wayland |
 | [xdg-desktop-portal-wlr](https://github.com/emersion/xdg-desktop-portal-wlr) | xdg-desktop-portal backend for wlroots |
-<!--end-pkgs-->
+<!--pkgs-end-->
 
 </details>
 

main.nu

@@ -1,57 +1,142 @@
 #!/usr/bin/env nu
 
 let system = "x86_64-linux";
+let forceCheck = false; # use for development to re-update all pkgs
+
 let-env CACHIX_CACHE = (
   if "CACHIX_CACHE" in ($env | transpose | get column0) { $env.CACHIX_CACHE }
   else "nixpkgs-wayland"
 )
 
+def header [ color: string text: string spacer=" ": string ] {
+  let text = $"($text) "
+  let header = $" ($text | str rpad -c $spacer -l 80)"
+  print -e $"(ansi $color)($header)(ansi reset)"
+}
+
+def getBadHash [ attrName: string ] {
+  let val = ((do -i { ^nix build --no-link $attrName }| complete)
+      | get stderr
+      | split row "\n"
+      | where ($it | str contains "got:")
+      | str replace '\s+got:(.*)(sha256-.*)' '$2'
+      | get 0
+  )
+  $val
+}
+
+def replaceHash [ packageName: string, position: string, hashName: string, oldHash: string ] {
+  let fakeSha256 = "0000000000000000000000000000000000000000000000000000";
+
+  do -c { ^sd -s $"($oldHash)" $"($fakeSha256)" $"($position)" }
+  let newHash = (getBadHash $".#($packageName)")
+  do -c { ^sd -s $"($fakeSha256)" $"($newHash)" $"($position)" }
+
+  print -e {packageName: $packageName, hashName: $hashName, oldHash: $oldHash, newHash: $newHash}
+}
+
+def updatePkgs [] {
+  header "light_yellow_reverse" "update packages"
+  let pkgs = (^nix eval --json $".#packages.($system)" --apply 'x: builtins.attrNames x' | str trim | from json)
+  let pkgs = ($pkgs | where ($it != "default"))
+  $pkgs | each { |packageName|
+    let position = $"pkgs/($packageName)/metadata.nix"
+    let verinfo = (^nix eval --json -f $position | str trim | from json)
+
+    let skip = (("skip" in ($verinfo | transpose | get column0)) && $verinfo.skip)
+    if $skip {
+      header "light_yellow" $"update ($packageName) - (ansi light_cyan_underline)skipped(ansi reset)"
+    } else {
+
+    # Try update rev
+    let newrev = (
+      if ("repo_git" in ($verinfo | transpose | get column0)) {
+        (do -c {
+          ^git ls-remote $verinfo.repo_git $"refs/heads/($verinfo.branch)"
+        } | complete | get stdout | str trim | str replace '(\s+)(.*)$' "")
+      } else if ( "repo_hg" in ($verinfo | transpose | get column0) ) {
+        (do -c {
+          ^hg identify $verinfo.repo_hg -r $verinfo.branch
+        } | complete | get stdout | str trim)
+      } else {
+        error make { msg: "unknown repo type" }
+      }
+    )
+
+    let shouldUpdate = (if ($forceCheck) {
+      print -e $"(ansi light_yellow) update ($packageName) - (ansi light_yellow_underline)forced(ansi reset)"
+      true
+    } else if ($newrev != $verinfo.rev) {
+      print -e $"(ansi light_yellow) update ($packageName) - (ansi light_yellow_underline)update to ($newrev)(ansi reset)"
+      true
+    } else {
+      print -e $"(ansi dark_gray) update ($packageName) - noop(ansi reset)"
+      false
+    })
+
+    if ($shouldUpdate) { 
+      do -c { ^sd -s $"($verinfo.rev)" $"($newrev)" $"($position)" }
+      print -e {packageName: $packageName, oldrev: $verinfo.rev, newrev: $newrev}
+
+      replaceHash $packageName $position "sha256" $verinfo.sha256
+      if "vendorSha256" in ($verinfo | transpose | get column0) {
+        replaceHash $packageName $position "vendorSha256" $verinfo.vendorSha256
+      }
+      if "cargoSha256" in ($verinfo | transpose | get column0) {
+        replaceHash $packageName $position "cargoSha256" $verinfo.cargoSha256
+      }
+
+      do -c {
+        ^git commit $position -m $"auto-update: ($packageName): ($verinfo.rev) => ($newrev)"
+      } | complete
+    }
+
+    null
+  }
+  }
+}
+
 def buildDrv [ drvRef: string ] {
-  print -e $"(ansi yellow) :: eval ($drvRef)(ansi reset)"
+  header "blue_reverse" $"eval ($drvRef)"
   let evalJobs = (
     ^nix-eval-jobs
       --flake $".#($drvRef)"
       --check-cache-status
         | each { |it| ( $it | from json ) }
   )
-  print -e $evalJobs
 
-  print -e $"(ansi blue) :: build ($drvRef)(ansi reset)"
+  header "green_reverse" $"build ($drvRef)"
   print -e ($evalJobs
     | where isCached == false
-    | select name drvPath outputs)
+    | select name isCached)
 
   $evalJobs
     | where isCached == false
-    | each { |drv|
-      do -c { ^nix build $drv.drvPath }
-      null
-    }
+    | each { |drv| (do -c {^nix build $drv.drvPath} | complete )}
 
-  print -e $"(ansi green) :: cache ($drvRef)(ansi reset)"
+  header "purple_reverse" $"cache: calculate paths: ($drvRef)"
   let pushPaths = ($evalJobs | each { |drv|
     $drv.outputs | each { |outPath|
       if ($outPath.out | path exists) {
         $outPath.out
       }
     }
   })
+  print -e $pushPaths
+  let cachePathsStr = ($pushPaths | each {|it| $"($it)(char nl)"} | str collect)
 
-  # collect paths to push
-  # call cachix push once
-  let arg = ($pushPaths | each {|it| $"($it)(char nl)"} | str collect)
-  $arg | ^cachix push $env.CACHIX_CACHE | complete
+  let cacheResults = ($cachePathsStr | ^cachix push $env.CACHIX_CACHE | complete)
+  header "purple_reverse" $"cache/push ($drvRef)"
+  print -e $cacheResults
 }
 
 def "main rereadme" [] {
+  header "red_reverse" $"readme"
   let packageNames = (nix eval --json $".#packages.($system)" --apply 'x: builtins.attrNames x' | str trim | from json)
   let pkgList = ($packageNames | where ($it != "default"))
-  let rows = [
-    "| Package | Description |"
-    "| --- | --- |"
-  ]
+  let delimStart = "<!--pkgs-start-->"
+  let delimEnd = "<!--pkgs-end-->"
   let pkgrows = ($pkgList | each { |packageName|
-    print -e $packageName
     let meta = (do -c {
       nix eval --json $".#packages.($system).($packageName).meta" | str trim | from json
     })
@@ -60,40 +145,49 @@ def "main rereadme" [] {
     } else { "__missing__" })
     ($"| [($packageName)]\(($home)\) | ($meta.description) |")
   })
-  let tableText = ([ $rows $pkgrows ] | flatten | str join "\n")
-
-  print -e $tableText
-
-  ^rg --multiline '(?s)(.*)<!--pkgs-->(.*)<!--end-pkgs-->(.*)' "README.md" --replace $"\$1($tableText)\$3" | save --raw README2.md
+  let rows = [
+    $delimStart
+    "| Package | Description |"
+    "| --- | --- |"
+    $pkgrows
+    $delimEnd
+  ]
+  let tableText = ($rows | str join "\n")
+
+  let regexString = ([ '(?s)(.*)' $delimStart '(.*)' $delimEnd '(.*)' ] | str join '')
+  let replaceText = $"\$1($tableText)\$3"
+  ^rg --multiline $regexString "README.md" --replace $replaceText | save --raw README2.md
   mv README2.md README.md
 
-  (do -c {
-    ^git commit -m "auto-update: updated readme" "./README.md"
-  })
+  # ^git commit -m "auto-update: updated readme" "./README.md"
 }
 
 def "main build" [] {
   buildDrv $"packages.($system)"
 }
 
-def "main advance" [] {
+def flakeAdvance [] {
+  header "purple_reverse" "advance flake inputs"
   ^nix flake lock --recreate-lock-file --commit-lock-file
-  (do -c {
-    main build
-  })
+}
+
+def gitPush [] {
+  header "purple_reverse" "git push origin HEAD"
   ^git push origin HEAD
 }
 
+def "main advance" [] {
+  flakeAdvance
+  main build
+  gitPush
+}
+
 def "main update" [] {
-  (do -c {
-    do {
-      cd pkgs
-      ./pkgs-update.nu
-    }
-    main build
-    main rereadme
-    ^git push origin HEAD
-  })
+  flakeAdvance
+  updatePkgs
+  main build
+  main rereadme
+  gitPush
 }
 
 def main [] {