Merge branch 'main' into dagger-env

flox · Feb 12, 2025 · 88ff7f9 · 88ff7f9
2 parents 1b8f057 + 040d147
commit 88ff7f9
Show file tree

Hide file tree

Showing 81 changed files with 8,192 additions and 6,891 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - "main"
+      - "preview"
   pull_request:
   schedule:
     - cron: "0 0 * * *"
@@ -137,6 +138,10 @@ jobs:
                 --option access-tokens "github.com=${{ secrets.MANAGED_FLOXBOT_GITHUB_ACCESS_TOKEN_REPO_SCOPE }}" \
                 github:flox/floxenvs/${{ github.sha }}#apps.${{ matrix.system }}.test-${{ matrix.example }} -- ${{ matrix.start_services }}
 
+    outputs:
+      job: "${{ matrix.example }}"
+      system: "${{ matrix.system }}"
+
   containarize:
     name: "Containarize '${{ matrix.example }}'"
     runs-on: "ubuntu-latest"
@@ -256,6 +261,21 @@ jobs:
           $FLOX_BIN push --dir "remote"
           popd
 
+  auto-merge:
+    name: "Auto Merge PRs"
+    runs-on: "ubuntu-latest"
+
+    if: ${{ success() && github.actor == 'floxbot' && github.event_name == 'pull_request'}} # Detect that the PR author is floxbot
+    steps:
+      - name: "Enable auto-merge for Dependabot PRs"
+        run: |
+          echo "${{ github.actor }}"
+          echo "${{ github.event_name }}"
+          gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
 
   report-failure:
     name: "Report Failure"
@@ -267,14 +287,19 @@ jobs:
       - "test"
       - "push"
       - "containarize"
-
+    
     steps:
+      - name: "Prepare message"
+        id: "envs"
+        run: |
+          message="$(echo '${{toJSON(needs)}}' | jq -r 'map(select(.result == "failure")) | .[] | "floxenvs: \(.outputs.job) on \(.outputs.system) had \(.result)"')"
+          echo "message='$message'" >> "$GITHUB_OUTPUT"
       - name: "Slack Notification"
         uses: "rtCamp/action-slack-notify@v2"
         env:
           SLACK_CHANNEL:    "team-content"
-          SLACK_TITLE:      "Something broke CI for floxenvs"
-          SLACK_FOOTER:     "Thank you for caring"
+          SLACK_TITLE:      "${{ steps.envs.outputs.message }}"
+          SLACK_FOOTER:     "Thanks for looking at it."
           SLACK_WEBHOOK:    "${{ secrets.MANAGED_SLACK_WEBHOOK }}"
           SLACK_USERNAME:   "GitHub"
           SLACK_ICON_EMOJI: ":poop:"

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -80,11 +80,11 @@ jobs:
         with:
           token: "${{ secrets.MANAGED_FLOXBOT_GITHUB_ACCESS_TOKEN_REPO_SCOPE }}"
           add-paths: "${{ matrix.example }}/.flox"
-          commit-message: "chore: Update manifest of `${{ matrix.example }}` environment"
+          commit-message: "chore: Update lockfile of `${{ matrix.example }}` environment"
           commiter: "FloxBot <[email protected]>"
           author: "FloxBot <[email protected]>"
           branch: "chore-update-${{ matrix.example }}-environment"
           delete-branch: true
-          title: "chore: Update manifest of `${{ matrix.example }}` flox environment"
+          title: "chore: Update lockfile of `${{ matrix.example }}` flox environment"
           body: "This PR was automatically created by [Update workflow](https://github.com/flox/floxenvs/actions/workflows/update.yml)."
           labels: "team-developer-support"
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 /*/.flox/log
 /*/.flox/run
 go/hello
+.vscode/
diff --git a/1password/.flox/env/manifest.lock b/1password/.flox/env/manifest.lock
@@ -30,17 +30,17 @@
     {
       "attr_path": "_1password",
       "broken": false,
-      "derivation": "/nix/store/f3fa4s218law84ywc2pc9zkvq7qkwjmz-1password-cli-2.30.3.drv",
+      "derivation": "/nix/store/yiqrlpqqnki96j8kh0ydfqk88v0rb42h-1password-cli-2.30.3.drv",
       "description": "1Password command-line tool",
       "install_id": "op",
       "license": "Unfree",
-      "locked_url": "https://github.com/flox/nixpkgs?rev=5df43628fdf08d642be8ba5b3625a6c70731c19c",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=a79cfe0ebd24952b580b1cf08cd906354996d547",
       "name": "1password-cli-2.30.3",
       "pname": "_1password",
-      "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
-      "rev_count": 738982,
-      "rev_date": "2025-01-16T21:27:11Z",
-      "scrape_date": "2025-01-18T00:14:56Z",
+      "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+      "rev_count": 750629,
+      "rev_date": "2025-02-08T13:21:17Z",
+      "scrape_date": "2025-02-09T05:15:18Z",
       "stabilities": [
         "unstable"
       ],
@@ -50,7 +50,7 @@
         "out"
       ],
       "outputs": {
-        "out": "/nix/store/311ibgh3b8zrmmqdjhnxmpm8bm9xmvfc-1password-cli-2.30.3"
+        "out": "/nix/store/vy8syl3dfsqwqxvdg69lzfyzs79kwi4b-1password-cli-2.30.3"
       },
       "system": "aarch64-darwin",
       "group": "toplevel",
@@ -59,17 +59,17 @@
     {
       "attr_path": "_1password",
       "broken": false,
-      "derivation": "/nix/store/1zd43mh5v0mvzdcyyk3msbs7lrs78cxa-1password-cli-2.30.3.drv",
+      "derivation": "/nix/store/9f11c33d7x22r3gq7s86b0nhlvk6mgs2-1password-cli-2.30.3.drv",
       "description": "1Password command-line tool",
       "install_id": "op",
       "license": "Unfree",
-      "locked_url": "https://github.com/flox/nixpkgs?rev=5df43628fdf08d642be8ba5b3625a6c70731c19c",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=a79cfe0ebd24952b580b1cf08cd906354996d547",
       "name": "1password-cli-2.30.3",
       "pname": "_1password",
-      "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
-      "rev_count": 738982,
-      "rev_date": "2025-01-16T21:27:11Z",
-      "scrape_date": "2025-01-18T00:14:56Z",
+      "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+      "rev_count": 750629,
+      "rev_date": "2025-02-08T13:21:17Z",
+      "scrape_date": "2025-02-09T05:15:18Z",
       "stabilities": [
         "unstable"
       ],
@@ -79,7 +79,7 @@
         "out"
       ],
       "outputs": {
-        "out": "/nix/store/0kfw7wfj6x9swrnrm1d90mkmgbg525wf-1password-cli-2.30.3"
+        "out": "/nix/store/blhylg3bvsn17mp07lbdnapdgrx1vmq0-1password-cli-2.30.3"
       },
       "system": "aarch64-linux",
       "group": "toplevel",
@@ -88,17 +88,17 @@
     {
       "attr_path": "_1password",
       "broken": false,
-      "derivation": "/nix/store/a28ry93kqmfjvfqq6ar9386hi6qa3m88-1password-cli-2.30.3.drv",
+      "derivation": "/nix/store/kw5zvnmpyllgghl1w6vlq2rqaqhmqn04-1password-cli-2.30.3.drv",
       "description": "1Password command-line tool",
       "install_id": "op",
       "license": "Unfree",
-      "locked_url": "https://github.com/flox/nixpkgs?rev=5df43628fdf08d642be8ba5b3625a6c70731c19c",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=a79cfe0ebd24952b580b1cf08cd906354996d547",
       "name": "1password-cli-2.30.3",
       "pname": "_1password",
-      "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
-      "rev_count": 738982,
-      "rev_date": "2025-01-16T21:27:11Z",
-      "scrape_date": "2025-01-18T00:14:56Z",
+      "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+      "rev_count": 750629,
+      "rev_date": "2025-02-08T13:21:17Z",
+      "scrape_date": "2025-02-09T05:15:18Z",
       "stabilities": [
         "unstable"
       ],
@@ -108,7 +108,7 @@
         "out"
       ],
       "outputs": {
-        "out": "/nix/store/4yr9dcl6rqnf4hfq9id9llnrwnbxa8p7-1password-cli-2.30.3"
+        "out": "/nix/store/ssfx0980jg7hq8syz47r0x4hnzray4g1-1password-cli-2.30.3"
       },
       "system": "x86_64-darwin",
       "group": "toplevel",
@@ -117,17 +117,17 @@
     {
       "attr_path": "_1password",
       "broken": false,
-      "derivation": "/nix/store/ccd376jlmxqym1wx8qigjg6pr7azz6xb-1password-cli-2.30.3.drv",
+      "derivation": "/nix/store/l2j43wlkp8dpc4m7zd1h5wrqhrd8xkr2-1password-cli-2.30.3.drv",
       "description": "1Password command-line tool",
       "install_id": "op",
       "license": "Unfree",
-      "locked_url": "https://github.com/flox/nixpkgs?rev=5df43628fdf08d642be8ba5b3625a6c70731c19c",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=a79cfe0ebd24952b580b1cf08cd906354996d547",
       "name": "1password-cli-2.30.3",
       "pname": "_1password",
-      "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
-      "rev_count": 738982,
-      "rev_date": "2025-01-16T21:27:11Z",
-      "scrape_date": "2025-01-18T00:14:56Z",
+      "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+      "rev_count": 750629,
+      "rev_date": "2025-02-08T13:21:17Z",
+      "scrape_date": "2025-02-09T05:15:18Z",
       "stabilities": [
         "unstable"
       ],
@@ -137,7 +137,7 @@
         "out"
       ],
       "outputs": {
-        "out": "/nix/store/l2fncs935nlzys9fx8hrbs6kg71402jj-1password-cli-2.30.3"
+        "out": "/nix/store/msk5pvimla1xbksa07x246q5a2y0s5qh-1password-cli-2.30.3"
       },
       "system": "x86_64-linux",
       "group": "toplevel",

diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@
 | `cassandra` | ✅ | ✅ | ✅ | |
 | `elasticsearch` | ✅ | ✅ | ✅ | |
 | `mysql` | ✅ | ✅ | ✅ | |
+| `mongodb` | ✅ | ✅ | | |
 | **Shell:** |
 | `dotenv` | ✅ | ✅ | ✅ | Load .env environment variables |
 | `mkcert` | ✅ | ✅ | ✅ | A tool to make locally trusted development certificates |
@@ -30,18 +31,19 @@
 | `dagger`          | ✅ | ✅ | ✅ | Dagger - write your pipelines in Go/Python/Typescript |
 | `1password` | ✅ | ✅ | ✅ | 1Password + a simple shell helper |
 | `nginx`           | ✅ | ✅ | ✅ | A HTTP web server and much more... |
-| `nb`              | ✅ | ✅ | ✅ | IPython notebook |
+| `jupyterlab`              | ✅ | ✅ | ✅ | Jupyter Lab notebook |
 | `flaim` | ✅ | ✅ | ✅ | A stack of Python modules for Stable Diffusion |
 | `crispy-doom` | ✅ | ✅ | ✅ | The Crispy Doom game engine w/a hook that downloads a Doom game library |
 | `colima` | ✅ | ✅ | ✅ | Turnkey Docker with Containers on Linux Machines |
 | `gource` | ✅ | ✅ | ✅ | Create a video of your Git history, with avatars |
 | `localstack` | ✅ | ✅ | ✅ | Run a local version of AWS services for testing and development |
+| `ollama` | ✅ | ✅ | ✅ | Turnkey local LLMs with a Next.JS UI |
+| `sharing` | ✅ | ✅ | ✅ | Simple file sharing via a built-in webserver |
 | `anthropic`       |  |  |  | |
 | `fooocus`         |  |  |  | |
 | `metabase`        |  |  |  | |
-| `ollama`          |  |  |  | |
 | `openai`          |  |  |  | |
-| `podman`          |  |  |  | |
+| `podman` | ✅ | ✅ | ✅ | |
 | `verba`           |  |  |  | |