Use ADD command for pulling git repos.

This is to fix buildkit caching.

.webhook_bridge/pipeline-build-hash.yaml

@@ -2,8 +2,6 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: build
-  labels:
-    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -64,7 +62,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
+              value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
             - name: pathInRepo
               value: task/git-clone/0.1/git-clone.yaml
           resolver: git
@@ -103,7 +101,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
+              value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:

.webhook_bridge/pipeline-foreign-document-test.yaml

@@ -2,8 +2,6 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: foreign-document-test
-  labels:
-    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -64,7 +62,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
+              value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
             - name: pathInRepo
               value: task/git-clone/0.1/git-clone.yaml
           resolver: git
@@ -103,7 +101,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
+              value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:

.webhook_bridge/pipeline-format.yaml

@@ -2,8 +2,6 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-format
-  labels:
-    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -64,7 +62,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
+              value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
             - name: pathInRepo
               value: task/git-clone/0.1/git-clone.yaml
           resolver: git
@@ -103,7 +101,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
+              value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:

.webhook_bridge/pipeline-rust-clippy.yaml

@@ -2,8 +2,6 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-clippy
-  labels:
-    pdb: protect
 spec:
   taskRunTemplate:
     serviceAccountName: build-bot
@@ -64,7 +62,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
+              value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
             - name: pathInRepo
               value: task/git-clone/0.1/git-clone.yaml
           resolver: git
@@ -103,7 +101,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
+              value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:

.webhook_bridge/pipeline-rust-test.yaml

@@ -2,8 +2,6 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-test
-  labels:
-    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -64,7 +62,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
+              value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
             - name: pathInRepo
               value: task/git-clone/0.1/git-clone.yaml
           resolver: git
@@ -103,7 +101,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
+              value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:

docker/organic_test/Dockerfile

@@ -17,17 +17,13 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev
 
 
 FROM build AS build-emacs
-ARG EMACS_REPO
+ADD https://code.fizz.buzz/mirror/emacs.git#emacs-29.1 /root/emacs
-ARG EMACS_VERSION
-ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs
 WORKDIR /root/emacs
-RUN <<EOF
+RUN mkdir /root/dist
-mkdir /root/dist
+RUN ./autogen.sh
-./autogen.sh
+RUN ./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
-./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
+RUN make
-make
+RUN make DESTDIR="/root/dist" install
-make DESTDIR="/root/dist" install
-EOF
 
 
 FROM build AS build-org-mode
@@ -39,10 +35,8 @@ RUN mkdir /root/dist
 RUN git clone $ORG_MODE_REPO /root/org-mode && git -C /root/org-mode checkout $ORG_VERSION
 # RUN mkdir /root/org-mode && git -C /root/org-mode init --initial-branch=main && git -C /root/org-mode remote add origin $ORG_REPO && git -C /root/org-mode fetch origin $ORG_VERSION && git -C /root/org-mode checkout FETCH_HEAD
 WORKDIR /root/org-mode
-RUN <<EOF
+RUN make compile
-make compile
+RUN make DESTDIR="/root/dist" install
-make DESTDIR="/root/dist" install
-EOF
 
 
 FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS tester
@@ -122,10 +116,8 @@ RUN mkdir -p $LITERATE_BUILD_EMACS_PATH && git -C $LITERATE_BUILD_EMACS_PATH ini
 RUN rm $LITERATE_BUILD_EMACS_PATH/unused/aws.org
 
 FROM tester as foreign-document
-RUN <<EOF
+RUN apk add --no-cache bash coreutils
-apk add --no-cache bash coreutils
+RUN mkdir /foreign_documents
-mkdir /foreign_documents
-EOF
 COPY --link --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams
 COPY --link --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs
 COPY --link --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg

flake.nix

@@ -35,9 +35,9 @@
           pkgs = import nixpkgs {
             inherit system overlays;
           };
-          rustToolchain = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
+          rustToolchain =
-            targets = [ "wasm32-unknown-unknown" ];
+            (pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override
-          };
+              { targets = [ "wasm32-unknown-unknown" ]; };
         in
         {
           default = pkgs.mkShell {
@@ -57,46 +57,11 @@
           pkgs = import nixpkgs {
             inherit system overlays;
           };
-          appliedOverlay = self.overlays.default pkgs pkgs;
-        in
-        rec {
-          default = all;
-          all = pkgs.symlinkJoin {
-            name = "all";
-            paths = [
-              library
-              devTools
-              wasm_bundler
-              wasm_web
-            ];
-          };
-          inherit (appliedOverlay.organic)
-            library
-            devTools
-            wasm_bundler
-            wasm_web
-            ;
-          docker_env = pkgs.buildEnv {
-            name = "organic";
-            paths = with pkgs; [
-              appliedOverlay.organic.devTools
-              bash
-              uutils-coreutils-noprefix
-              # toybox # Smaller than uutils-coreutils?
-            ];
-          };
-        }
-      );
-      overlays.default = final: prev: {
-        organic = final.lib.makeScope final.newScope (
-          organicScope:
-          let
           build_wasm =
             {
               bindgenTarget ? null,
             }:
-              (organicScope.callPackage ./nix/package.nix {
+            (pkgs.callPackage ./nix/package.nix {
-                inherit rust-overlay;
               targetBins = [
                 "wasm"
               ];
@@ -108,7 +73,7 @@
                 old:
                 let
                   bindgen_command = [
-                      "${final.wasm-bindgen-cli}/bin/wasm-bindgen"
+                    "${pkgs.wasm-bindgen-cli}/bin/wasm-bindgen"
                     "--target"
                     bindgenTarget
                     "--out-dir"
@@ -118,7 +83,7 @@
                 in
                 {
                   postBuild = ''
-                      ${final.lib.escapeShellArgs bindgen_command}
+                    ${pkgs.lib.escapeShellArgs bindgen_command}
                   '';
 
                   installPhase = ''
@@ -128,13 +93,17 @@
                 }
               );
         in
-          {
+        rec {
-            library =
+          all = pkgs.symlinkJoin {
-              (organicScope.callPackage ./nix/package.nix {
+            name = "all";
-                inherit rust-overlay;
+            paths = [
-                buildLib = true;
+              library
-              }).overrideAttrs
+              devTools
-                (
+              wasm_bundler
+              wasm_web
+            ];
+          };
+          library = (pkgs.callPackage ./nix/package.nix { buildLib = true; }).overrideAttrs (
             old:
             let
             in
@@ -145,8 +114,7 @@
               '';
             }
           );
-            devTools = organicScope.callPackage ./nix/package.nix {
+          devTools = pkgs.callPackage ./nix/package.nix {
-              inherit rust-overlay;
             targetBins = [
               "parse"
               "compare"
@@ -155,8 +123,17 @@
           };
           wasm_bundler = build_wasm { bindgenTarget = "bundler"; };
           wasm_web = build_wasm { bindgenTarget = "web"; };
+          docker_env = pkgs.buildEnv {
+            name = "organic";
+            paths = with pkgs; [
+              devTools
+              bash
+              uutils-coreutils-noprefix
+              # toybox # Smaller than uutils-coreutils?
+            ];
+          };
+          default = all;
         }
       );
     };
-    };
 }

nix/package.nix

@@ -1,8 +1,8 @@
 {
   hello,
   lib,
-  pkgs,
+  makeRustPlatform,
-  rust-overlay,
+  pkgsBuildHost,
 
   targetBins ? [ ],
   features ? [ ],
@@ -12,11 +12,7 @@
 }:
 let
   cargoToml = (lib.importTOML ../Cargo.toml);
-  rustPlatformFor =
+  rustToolchain = (pkgsBuildHost.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
-    pkgs:
-    let
-      rust-bin = rust-overlay.lib.mkRustBin { } pkgs;
-      rustToolchain = (rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
     if cargoBuildTarget != null then
       {
         targets = [ cargoBuildTarget ];
@@ -25,7 +21,7 @@ let
       { }
   );
   baseRustPlatform = (
-        pkgs.makeRustPlatform {
+    makeRustPlatform {
       cargo = rustToolchain;
       rustc = rustToolchain;
     }
@@ -43,10 +39,7 @@ let
     else
       baseRustPlatform;
 in
-    rustPlatform;
+rustPlatform.buildRustPackage (
-in
-(rustPlatformFor pkgs).buildRustPackage (
-  # rustPlatform.buildRustPackage (
   {
     pname = "organic";
     version = cargoToml.package.version;

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2026-05-23"
+channel = "nightly"
 profile = "default"
 components = ["clippy", "rustfmt"]