Merge branch 'main' into dependabot/cargo/crates/cli/nix-0.30.1

jhheider · web-flow · commit 1e4d724a69b5 · 2026-02-02T15:34:26.000-05:00
diff --git a/.github/workflows/cd.crates.yml b/.github/workflows/cd.crates.yml
@@ -18,7 +18,7 @@ jobs:
     if: startsWith(github.event.release.tag_name || github.event.inputs.tag, 'v2')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.release.tag_name || github.event.inputs.tag }}
       - uses: dtolnay/rust-toolchain@stable
diff --git a/.github/workflows/cd.docker.yml b/.github/workflows/cd.docker.yml
@@ -72,7 +72,7 @@ jobs:
 
           curl -o products/pkgm https://pkgxdev.github.io/pkgm/pkgm.ts
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           path: src
 
diff --git a/.github/workflows/cd.vx.yml b/.github/workflows/cd.vx.yml
@@ -16,7 +16,7 @@ jobs:
   retag:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.release.tag_name }}
       - uses: fischerscode/tagger@v0
diff --git a/.github/workflows/cd.www.yml b/.github/workflows/cd.www.yml
@@ -20,7 +20,7 @@ jobs:
     if: startsWith(github.event.release.tag_name || github.event.inputs.tag, 'v2')
     runs-on: ubuntu-latest
     steps:
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -20,7 +20,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo test --all-features
         env:
@@ -32,7 +32,7 @@ jobs:
     env:
       FILENAME: pkgx-${{ github.event.inputs.version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           path: ${{ env.FILENAME }}
       - name: clean
@@ -52,7 +52,7 @@ jobs:
           # using this token rather than github.token due to `release not found` bug
           # https://github.com/pkgxdev/cli/issues/5252
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: srcs
           path: ${{ env.FILENAME }}.tar.gz
@@ -86,7 +86,7 @@ jobs:
     env:
       BASENAME: pkgx-${{ github.event.inputs.version }}+${{ matrix.platform.build-id }}
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: srcs
 
diff --git a/.github/workflows/ci.ca-cert.yml b/.github/workflows/ci.ca-cert.yml
@@ -18,11 +18,11 @@ jobs:
     runs-on: ubuntu-latest
     container: debian:buster-slim
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: apt-get update && apt-get install -y curl gcc perl make
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo build --release
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           path: ./target/release/pkgx
           name: pkgx
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     container: debian:buster-slim
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: pkgx
 
diff --git a/.github/workflows/ci.docker.yml b/.github/workflows/ci.docker.yml
@@ -25,7 +25,7 @@ jobs:
           - debian
           - ubuntu
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: robinraju/release-downloader@v1.12
         with:
diff --git a/.github/workflows/ci.md.yml b/.github/workflows/ci.md.yml
@@ -14,7 +14,7 @@ jobs:
   markdownlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: nosborn/github-action-markdown-cli@v3.4.0
         with:
           config_file: .github/markdownlint.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
@@ -38,7 +38,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
@@ -53,7 +53,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo test --all-features
         env:
@@ -66,7 +66,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@v2
         with:
@@ -87,7 +87,7 @@ jobs:
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: dtolnay/rust-toolchain@stable
 
@@ -232,7 +232,7 @@ jobs:
     runs-on: ubuntu-latest
     container: debian:buster-slim
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: apt-get update && apt-get install -y curl make gcc perl
       - uses: dtolnay/rust-toolchain@stable
       - run: apt-get remove curl ca-certificates openssl --yes
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -196,9 +196,9 @@ used to build a whole ecosystem of tools.
 
 ## `dev`
 
-`dev` uses `pkgx` and shellcode to create “virtual environments” consisting of
-the specific versions of tools and their dependencies you need for your
-projects.
+`dev` uses `pkgx` and `pkgm` (or shellcode) to create “virtual environments”
+consisting of the specific versions of tools and their dependencies you need
+for your projects.
 
 ```sh
 $ cd my-rust-proj && ls
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -9,14 +9,14 @@ repository = "https://github.com/pkgxdev/pkgx"
 
 [dependencies]
 tokio = { version = "1.43", features = ["full", "rt-multi-thread"] }
-rusqlite = "0.33.0"
+rusqlite = "0.37.0"
 regex = "1.11.1"
-indicatif = "0.17.9"
+indicatif = "0.18.3"
 nix = { version = "0.30.1", features = ["process"] }
 serde_json = "1.0.135"
 serde = { version = "1.0", features = ["derive"] }
 libpkgx = { version = "0.7.0", path = "../lib" }
-console = { version = "0.15", default-features = false, features = [
+console = { version = "0.16", default-features = false, features = [
   "ansi-parsing",
 ] }
 
diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml
@@ -20,15 +20,15 @@ tokio = { version = "1.43", features = ["full", "rt-multi-thread"] }
 tokio-stream = "0.1"
 strum = "0.27"
 strum_macros = "0.27"
-rusqlite = "0.33.0"
+rusqlite = "0.37.0"
 regex = "1.11.1"
 reqwest = { version = "0.12", features = ["stream", "blocking"] }
 async-compression = { version = "0.4", features = ["tokio", "gzip", "xz"] }
 tokio-tar = "0.3.1"
 tokio-util = { version = "0.7.13", features = ["compat"] }
 futures = "0.3.31"
 lazy_static = "1.5.0"
-nix = { version = "0.29.0", features = ["process"] }
+nix = { version = "0.30.1", features = ["process"] }
 fs2 = "0.4.3"
 tempfile = "3.16.0"
 
diff --git a/crates/lib/src/config.rs b/crates/lib/src/config.rs
@@ -69,6 +69,14 @@ fn get_pkgx_dir() -> io::Result<PathBuf> {
         }
     }
 
+    // Use sudoer home directory if it is set.
+    if let Ok(path) = env::var("SUDO_HOME") {
+        let path = PathBuf::from(path).join(".pkgx");
+        if path.is_absolute() {
+            return Ok(path);
+        }
+    }
+
     let default = dirs_next::home_dir().map(|x| x.join(".pkgx"));
 
     if default.clone().is_some_and(|x| x.exists()) {
diff --git a/docs/scripting.md b/docs/scripting.md
@@ -90,14 +90,40 @@ Use [Deno](https://deno.land):
 import fs from "npm:fs";
 ```
 
-### Rust, Go, C, C++, etc
+### Rust
+
+```rust
+#!/usr/bin/env -S pkgx rust-script
+
+//! ```cargo
+//! [dependencies]
+//! time = "0.1.25"
+//! ```
+```
+
+> [!TIP]
+> Probably you should specify a more precise Rust version as a plus-pkg arg.
+
+### Go, C, C++, etc
 
 Use [Scriptisto]:
 
-```sh
-#!/usr/bin/env -S pkgx +cargo scriptisto
+```c
+#!/usr/bin/env pkgx +clang +pkg-config scriptisto
+
+#include <stdio.h>
+#include <glib.h>
+
+// scriptisto-begin
+// script_src: main.c
+// build_cmd: clang -O2 main.c `pkg-config --libs --cflags glib-2.0` -o ./script
+// scriptisto-end
 
-# snip… type `pkgx scriptisto new cargo` for the rest.
+int main(int argc, char *argv[]) {
+  gchar* user = g_getenv("USER");
+  printf("Hello, C! Current user: %s\n", user);
+  return 0;
+}
 ```
 
 ## Mash
@@ -111,5 +137,19 @@ show it off.
 
 We make use of `pkgx` scripting all over our repositories. Check them out!
 
+## Ultra Portable Scripts
+
+Requiring a `pkgx` shebang is somewhat limiting. Instead you can use our `cURL`
+one-liner coupled with `+pkg` syntax to temporarily install pkgs and utilize
+them in your scripts:
+
+```sh
+#!/bin/bash
+
+eval "$(sh <(curl https://pkgx.sh) +git)"
+
+which git  # prints soemthing like /tmp/pkgx/git-scm.org/v2.46.3/bin/git
+```
+
 [shebang]: https://en.wikipedia.org/wiki/Shebang_(Unix)
 [Scriptisto]: https://github.com/igor-petruk/scriptisto
diff --git a/tea.yaml b/tea.yaml
@@ -1,8 +1,19 @@
 # https://tea.xyz/what-is-this-file
+#
+# DO NOT REMOVE OR EDIT THIS WARNING:
+#
+# This file is auto-generated by the TEA app. It is intended to validate ownership of your repository.
+# DO NOT commit this file or accept any PR if you don't know what this is.
+# We are aware that spammers will try to use this file to try to profit off others' work.
+# We take this very seriously and will take action against any malicious actors.
+#
+# If you are not the owner of this repository, and someone maliciously opens a commit with this file
+# please report it to us at support@tea.xyz.
+#
+# A constitution without this header is invalid.
 ---
-version: 1.0.0
+version: 2.0.0
 codeOwners:
-  - "0x5E2DE4A68df811AAAD32d71fb065e6946fA5C8d9" #mxcl
-  - "0x2faad60792b0594fB37592BA25Bd7387Fbd35191" #thomas-borrel
-  - "0xAb9A89fA4Bbd04Fc37116F0d7766866D001EA704" #jhheider
+  - '0x060F08FE34282a3783D2544A1f0804d9FEaAb283'
+  - '0x2e20f31d47Fe7Aa111dCC67Cb0eC6A411254Ae6e'
 quorum: 1
