From f1f8a3c908b709fe610cf3cb4083ce7f5233f67a Mon Sep 17 00:00:00 2001 From: ahtlon Date: Thu, 19 Feb 2026 00:13:50 +0100 Subject: [PATCH 01/11] fix? --- .gitea/workflows/autoupdate.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/autoupdate.yml b/.gitea/workflows/autoupdate.yml index dc9e06df..90eda224 100644 --- a/.gitea/workflows/autoupdate.yml +++ b/.gitea/workflows/autoupdate.yml @@ -31,11 +31,10 @@ jobs: run: nix flake check --all-systems --verbose - name: Create Gitea PR - uses: https://github.com/Mai0313/create-pull-request@main + uses: https://github.com/arifer612/Gitea-PR-action@v1 with: - github-server-url: https://git.dynamicdiscord.de + url: https://git.dynamicdiscord.de token: ${{ secrets.AHTLONS_GITEA_TOKEN }} - commit-message: 'Update flake.lock' - committer: 'malobot ' - title: 'Update flake.lock' - assignees: 'ahtlon' + tea-version: 0.9.2 + pr-label: bump + assignee: ${{ github.actor }} -- 2.51.2 From a07c47846e184e39d0b42d2ce558a45a6cb28da6 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Thu, 19 Feb 2026 02:25:58 +0100 Subject: [PATCH 02/11] wehhhh --- .gitea/workflows/autoupdate.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/autoupdate.yml b/.gitea/workflows/autoupdate.yml index 90eda224..53993238 100644 --- a/.gitea/workflows/autoupdate.yml +++ b/.gitea/workflows/autoupdate.yml @@ -27,8 +27,17 @@ jobs: - name: Run nix flake update run: nix flake update - - name: Run nix flake check - run: nix flake check --all-systems --verbose + + - name: Commit and Push flake.lock + run: | + git config user.name "malobot" + git config user.email "malobot@systemli.org" + git stash push + git branch nixpkgs_bump_$(date +%Y%m%d) + git checkout nixpkgs_bump_$(date +%Y%m%d) + git stash pop + git add flake.lock + git diff --staged --quiet || git commit -m "Update flake.lock" - name: Create Gitea PR uses: https://github.com/arifer612/Gitea-PR-action@v1 -- 2.51.2 From 80a9fdb880226c55ed577aa05904a02452419955 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Thu, 19 Feb 2026 02:31:46 +0100 Subject: [PATCH 03/11] bleh --- .gitea/workflows/autoupdate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/autoupdate.yml b/.gitea/workflows/autoupdate.yml index 53993238..22694c1a 100644 --- a/.gitea/workflows/autoupdate.yml +++ b/.gitea/workflows/autoupdate.yml @@ -38,6 +38,7 @@ jobs: git stash pop git add flake.lock git diff --staged --quiet || git commit -m "Update flake.lock" + git push -u origin nixpkgs_bump_$(date +%Y%m%d) - name: Create Gitea PR uses: https://github.com/arifer612/Gitea-PR-action@v1 -- 2.51.2 From 9641ed68e286e29ad107e41d388a41b24da6cda0 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Thu, 19 Feb 2026 12:32:41 +0100 Subject: [PATCH 04/11] gwah! --- .gitea/workflows/autoupdate.yml | 75 +++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/autoupdate.yml b/.gitea/workflows/autoupdate.yml index 22694c1a..4eea9b65 100644 --- a/.gitea/workflows/autoupdate.yml +++ b/.gitea/workflows/autoupdate.yml @@ -40,11 +40,70 @@ jobs: git diff --staged --quiet || git commit -m "Update flake.lock" git push -u origin nixpkgs_bump_$(date +%Y%m%d) - - name: Create Gitea PR - uses: https://github.com/arifer612/Gitea-PR-action@v1 - with: - url: https://git.dynamicdiscord.de - token: ${{ secrets.AHTLONS_GITEA_TOKEN }} - tea-version: 0.9.2 - pr-label: bump - assignee: ${{ github.actor }} + - name: Check for eval warnings + id: commit + shell: bash + run: | + { + echo "COMMIT_DESC<&1 | grep evaluation | awk '!seen[$0]++' || echo "None :)" + echo EOF + } >> "$GITHUB_OUTPUT" + + - name: Install Tea + env: + TEA_DL_URL: "https://dl.gitea.com/tea/0.9.2\tea-0.9.2-linux-amd64" + shell: bash + run: | + TEA_DIR=$(mktemp -d -t tmp.XXXX) + pushd $TEA_DIR + wget "$TEA_DL_URL" + wget "${TEA_DL_URL}.sha256" + if $(sha256sum --quiet -c "tea-0.9.2-linux-amd64.sha256"); then + mv "tea-0.9.2-linux-amd64" /usr/bin/tea + chmod +x /usr/bin/tea + popd + rm -rf $TEA_DIR + else + popd + rm -rf $TEA_DIR + echo "::error title=⛔ error hint::Tea v0.9.2 Checksum Failed" + exit 1 + fi + - name: Login to Gitea + shell: bash + env: + GIT_SERVER_URL: https://git.dynamicdiscord.de + GIT_SERVER_TOKEN: ${{ secrets.AHTLONS_GITEA_TOKEN }} + run: >- + tea login add + -u "$GIT_SERVER_URL" + -t "$GIT_SERVER_TOKEN" + - name: Check for existing pull request + id: no-pr + continue-on-error: true + shell: bash + run: >- + tea pr -f head -o simple | + grep -q ${{ github.ref_name }} && + exit 1 || + exit 0 + - name: Create pull request + if: steps.no-pr.outcome == 'success' + env: + COMMIT_MSG: Automatic Nixpkgs update + COMMIT_DESC: ${{ steps.commit.outputs.COMMIT_DESC }} + shell: bash + run: >- + tea pr create + -L "bump" + -t "$COMMIT_MSG" + -d "$COMMIT_DESC" + - name: Skip pull request + if: steps.no-pr.outcome == 'failure' + shell: bash + run: > + echo "::error title=⛔ error hint:: + A PR already exists for this branch: ${{ github.ref_name }}" \ No newline at end of file -- 2.51.2 From a2b49bb36e71f7b0ae73a2a01c4e53e46a6abab6 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Thu, 19 Feb 2026 12:42:29 +0100 Subject: [PATCH 05/11] bugh --- .gitea/workflows/autoupdate.yml | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/autoupdate.yml b/.gitea/workflows/autoupdate.yml index 4eea9b65..b137b7c3 100644 --- a/.gitea/workflows/autoupdate.yml +++ b/.gitea/workflows/autoupdate.yml @@ -18,8 +18,27 @@ jobs: run: | apt-get update apt-get install -y sudo + - name: Install Tea + env: + TEA_DL_URL: "https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-amd64" + shell: bash + run: | + TEA_DIR=$(mktemp -d -t tmp.XXXX) + pushd $TEA_DIR + wget "$TEA_DL_URL" + wget "${TEA_DL_URL}.sha256" + if $(sha256sum --quiet -c "tea-0.9.2-linux-amd64.sha256"); then + mv "tea-0.9.2-linux-amd64" /usr/bin/tea + chmod +x /usr/bin/tea + popd + rm -rf $TEA_DIR + else + popd + rm -rf $TEA_DIR + echo "::error title=⛔ error hint::Tea v0.9.2 Checksum Failed" + exit 1 + fi - uses: https://code.forgejo.org/actions/checkout@v6 - - name: Set up Nix uses: https://github.com/cachix/install-nix-action@v31 with: @@ -52,26 +71,7 @@ jobs: echo EOF } >> "$GITHUB_OUTPUT" - - name: Install Tea - env: - TEA_DL_URL: "https://dl.gitea.com/tea/0.9.2\tea-0.9.2-linux-amd64" - shell: bash - run: | - TEA_DIR=$(mktemp -d -t tmp.XXXX) - pushd $TEA_DIR - wget "$TEA_DL_URL" - wget "${TEA_DL_URL}.sha256" - if $(sha256sum --quiet -c "tea-0.9.2-linux-amd64.sha256"); then - mv "tea-0.9.2-linux-amd64" /usr/bin/tea - chmod +x /usr/bin/tea - popd - rm -rf $TEA_DIR - else - popd - rm -rf $TEA_DIR - echo "::error title=⛔ error hint::Tea v0.9.2 Checksum Failed" - exit 1 - fi + - name: Login to Gitea shell: bash env: -- 2.51.2 From 4b222ac4b014cb65986fab31b928d1ebce105dac Mon Sep 17 00:00:00 2001 From: ahtlon Date: Thu, 19 Feb 2026 12:49:34 +0100 Subject: [PATCH 06/11] miaou --- .gitea/workflows/autoupdate.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/autoupdate.yml b/.gitea/workflows/autoupdate.yml index b137b7c3..afcaa153 100644 --- a/.gitea/workflows/autoupdate.yml +++ b/.gitea/workflows/autoupdate.yml @@ -47,7 +47,7 @@ jobs: - name: Run nix flake update run: nix flake update - - name: Commit and Push flake.lock + - name: Commit flake.lock run: | git config user.name "malobot" git config user.email "malobot@systemli.org" @@ -57,7 +57,6 @@ jobs: git stash pop git add flake.lock git diff --staged --quiet || git commit -m "Update flake.lock" - git push -u origin nixpkgs_bump_$(date +%Y%m%d) - name: Check for eval warnings id: commit @@ -90,6 +89,8 @@ jobs: grep -q ${{ github.ref_name }} && exit 1 || exit 0 + - name: Force push branch + run: git push --force -u origin nixpkgs_bump_$(date +%Y%m%d) - name: Create pull request if: steps.no-pr.outcome == 'success' env: -- 2.51.2 From a85f9cacde40e02a4847e63984c87ac365018ead Mon Sep 17 00:00:00 2001 From: ahtlon Date: Wed, 11 Mar 2026 21:19:24 +0100 Subject: [PATCH 07/11] Add hydra files --- .hydra/declaritive-jobsets.nix | 53 ++++++++++++++++++++++++++++++++++ .hydra/spec.json | 30 +++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 .hydra/declaritive-jobsets.nix create mode 100644 .hydra/spec.json diff --git a/.hydra/declaritive-jobsets.nix b/.hydra/declaritive-jobsets.nix new file mode 100644 index 00000000..df246815 --- /dev/null +++ b/.hydra/declaritive-jobsets.nix @@ -0,0 +1,53 @@ +{ nixpkgs, pulls, ... }: + +let + pkgs = import nixpkgs { }; + + prs = builtins.fromJSON (builtins.readFile pulls); + prJobsets = pkgs.lib.mapAttrs (num: info: { + enabled = 1; + hidden = false; + description = "PR ${num}: ${info.title}"; + checkinterval = 300; + schedulingshares = 20; + enableemail = false; + emailoverride = ""; + keepnr = 1; + type = 1; + flake = "gitea:git.dynamicdiscord.de/ahtlon/infrastructure/pulls/${num}"; + }) prs; + mkFlakeJobset = branch: { + description = "Build ${branch} branch of Simple NixOS MailServer"; + checkinterval = 300; + enabled = "1"; + schedulingshares = 100; + enableemail = false; + emailoverride = ""; + keepnr = 3; + hidden = false; + type = 1; + flake = "git:simple-nixos-mailserver/nixos-mailserver/${branch}"; + }; + + desc = prJobsets // { + "master" = mkFlakeJobset "master"; + }; + + log = { + pulls = prs; + jobsets = desc; + }; + +in +{ + jobsets = pkgs.runCommand "spec-jobsets.json" { } '' + cat >$out <<'EOF' + ${builtins.toJSON desc} + EOF + # This is to get nice .jobsets build logs on Hydra + cat >tmp <<'EOF' + ${builtins.toJSON log} + EOF + ${pkgs.jq}/bin/jq . tmp + ''; +} diff --git a/.hydra/spec.json b/.hydra/spec.json new file mode 100644 index 00000000..469bb334 --- /dev/null +++ b/.hydra/spec.json @@ -0,0 +1,30 @@ +{ + "enabled": 1, + "hidden": false, + "description": "Simple NixOS Mailserver", + "nixexprinput": "nixexpr", + "nixexprpath": ".hydra/declarative-jobsets.nix", + "checkinterval": 60, + "schedulingshares": 100, + "enableemail": false, + "emailoverride": "", + "keepnr": 3, + "type": 0, + "inputs": { + "nixexpr": { + "value": "https://git.dynamicdiscord.de/ahtlon/infrastructure master", + "type": "git", + "emailresponsible": false + }, + "nixpkgs": { + "value": "https://github.com/NixOS/nixpkgs nixos-25.11", + "type": "git", + "emailresponsible": false + }, + "pulls": { + "type": "path", + "value": "http://127.0.0.1:27364/gitea-pulls-sorted.json", + "emailresponsible": false + } + } +} -- 2.51.2 From 20781b3b731ee22efb7870adedfc724bb84b7b7f Mon Sep 17 00:00:00 2001 From: ahtlon Date: Wed, 11 Mar 2026 21:36:51 +0100 Subject: [PATCH 08/11] ups --- .hydra/spec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hydra/spec.json b/.hydra/spec.json index 469bb334..9a7f5f77 100644 --- a/.hydra/spec.json +++ b/.hydra/spec.json @@ -23,7 +23,7 @@ }, "pulls": { "type": "path", - "value": "http://127.0.0.1:27364/gitea-pulls-sorted.json", + "value": "http://127.0.0.1:27364", "emailresponsible": false } } -- 2.51.2 From b6e635d9e31672e3ee068d58ed98bdeeaf427f7d Mon Sep 17 00:00:00 2001 From: ahtlon Date: Wed, 11 Mar 2026 21:39:11 +0100 Subject: [PATCH 09/11] Revert "ups" This reverts commit 20781b3b731ee22efb7870adedfc724bb84b7b7f. --- .hydra/spec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hydra/spec.json b/.hydra/spec.json index 9a7f5f77..469bb334 100644 --- a/.hydra/spec.json +++ b/.hydra/spec.json @@ -23,7 +23,7 @@ }, "pulls": { "type": "path", - "value": "http://127.0.0.1:27364", + "value": "http://127.0.0.1:27364/gitea-pulls-sorted.json", "emailresponsible": false } } -- 2.51.2 From dacdb2214ea6ff645c444ce0eaab68c317f0a616 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Wed, 11 Mar 2026 21:41:47 +0100 Subject: [PATCH 10/11] doppelups --- .hydra/{declaritive-jobsets.nix => declarative-jobsets.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .hydra/{declaritive-jobsets.nix => declarative-jobsets.nix} (100%) diff --git a/.hydra/declaritive-jobsets.nix b/.hydra/declarative-jobsets.nix similarity index 100% rename from .hydra/declaritive-jobsets.nix rename to .hydra/declarative-jobsets.nix -- 2.51.2 From aaf7af6457ed77e135b6dbe4323095be5692bb39 Mon Sep 17 00:00:00 2001 From: malobot Date: Thu, 12 Mar 2026 00:02:54 +0000 Subject: [PATCH 11/11] Update flake.lock --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 6b277103..673769c7 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1772055583, - "narHash": "sha256-iPIm1orqkhsxqju6EVODOrV1BmyA5HNTZ8a1o812bFM=", + "lastModified": 1773018425, + "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", "owner": "astro", "repo": "microvm.nix", - "rev": "f6dcfb7c16cc3775536c825dc0698d4ede13d063", + "rev": "25ebda3c558e923720c965832dc9a04f559a055c", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771969195, - "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", + "lastModified": 1772972630, + "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", + "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771903837, - "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", + "lastModified": 1773068389, + "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", + "rev": "44bae273f9f82d480273bab26f5c50de3724f52f", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1772048434, - "narHash": "sha256-/wA0OaH6kZ/pFA+nXR/tvg5oupOmEDmMS5us79JT60o=", + "lastModified": 1773096132, + "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", "owner": "Mic92", "repo": "sops-nix", - "rev": "334daa7c273dd8bf7a0cd370e4e16022b64e55e9", + "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1759482047, - "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", + "lastModified": 1772189877, + "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=", "ref": "refs/heads/main", - "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", - "revCount": 996, + "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358", + "revCount": 1255, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, -- 2.51.2