From a4295c3cdbce5212ea74186126911c424885f6b8 Mon Sep 17 00:00:00 2001 From: technofab Date: Fri, 19 Dec 2025 15:03:08 +0100 Subject: [PATCH] chore: add renovate and update repo flake --- .gitignore | 1 - .gitlab-ci.yml | 4 ++-- .gitlab/renovate.json5 | 23 +++++++++++++++++++++++ flake.nix | 2 ++ nix/repo/devShells.nix | 10 +++++++--- nix/repo/flake.lock | 38 +++++++++++++++++++------------------- nix/repo/flake.nix | 2 +- nix/repo/soonix.nix | 36 ++++++++++++++++++++++++++++++++++++ 8 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 .gitlab/renovate.json5 create mode 100644 nix/repo/soonix.nix diff --git a/.gitignore b/.gitignore index 8c4f190..b2be92b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -.ren result diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a415272..7d70f67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # Generated by soonix, DO NOT EDIT include: -- component: gitlab.com/TECHNOFAB/nix-gitlab-ci/nix-gitlab-ci@3.0.0-alpha.2 +- component: gitlab.com/TECHNOFAB/nix-gitlab-ci/nix-gitlab-ci@3.1.2 inputs: - version: 3.0.0-alpha.2 + version: 3.1.2 diff --git a/.gitlab/renovate.json5 b/.gitlab/renovate.json5 new file mode 100644 index 0000000..8813966 --- /dev/null +++ b/.gitlab/renovate.json5 @@ -0,0 +1,23 @@ +{ + "extends": [ + "config:recommended" + ], + "gitlabci": { + "enabled": false + }, + "lockFileMaintenance": { + "enabled": true, + "extends": [ + "schedule:monthly" + ] + }, + "nix": { + "enabled": true + }, + "postUpgradeTasks": { + "commands": [ + "nix-portable nix run .#soonix:update" + ], + "updateMode": "branch" + } +} diff --git a/flake.nix b/flake.nix index 88fdf2e..6361f65 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ (simple "tests") (simple "docs") (simple "ci") + (simple "soonix") ]; } { @@ -30,6 +31,7 @@ ["repo" "tests"] ["repo" "docs"] ["repo" "ci" "packages"] + ["repo" "soonix" "packages"] ]; }; } diff --git a/nix/repo/devShells.nix b/nix/repo/devShells.nix index b509fd3..9680320 100644 --- a/nix/repo/devShells.nix +++ b/nix/repo/devShells.nix @@ -3,8 +3,8 @@ cell, ... }: let - inherit (inputs) self pkgs devshell soonix treefmt; - inherit (cell) ci; + inherit (inputs) self pkgs devshell treefmt; + inherit (cell) soonix; treefmtWrapper = treefmt.mkWrapper pkgs { programs = { @@ -20,7 +20,6 @@ in { "${self}/lib/modules" soonix.devshellModule ]; - soonix.hooks.ci = ci.soonix; packages = [ pkgs.hello treefmtWrapper @@ -46,6 +45,11 @@ in { run = "${treefmtWrapper}/bin/treefmt"; env.TERM = "dumb"; } + { + name = "soonix"; + stage_fixed = true; + run = "${soonix.shellHookFile}"; + } ]; }; }; diff --git a/nix/repo/flake.lock b/nix/repo/flake.lock index b7e7b14..9ec9f2d 100644 --- a/nix/repo/flake.lock +++ b/nix/repo/flake.lock @@ -3,11 +3,11 @@ "devshell": { "locked": { "dir": "lib", - "lastModified": 1758101464, - "narHash": "sha256-ahYofFaZeEkpsF6Rrkjh43Sp9miA2yHJ3dMsOVgO8sw=", + "lastModified": 1758204313, + "narHash": "sha256-ainbY0Oajb1HMdvy+A8QxF/P5qwcbEzJGEY5pzKdDdc=", "owner": "rensa-nix", "repo": "devshell", - "rev": "bfdd94e38fdede5aaa2d6ef6dac3d7d8617201eb", + "rev": "7d0c4bc78d9f017a739b0c7eb2f4e563118353e6", "type": "gitlab" }, "original": { @@ -20,17 +20,17 @@ "nix-gitlab-ci-lib": { "locked": { "dir": "lib", - "lastModified": 1756974596, - "narHash": "sha256-KxQj76sUqvPNtrqzNWMZeOWqTitc0aFCYj7UZzToiEA=", + "lastModified": 1765444672, + "narHash": "sha256-B0cMjRs9P50ym9Le0VUcRN69Yy6tbV13MXq81tTTEus=", "owner": "TECHNOFAB", "repo": "nix-gitlab-ci", - "rev": "00cf5b83c6c46698fba12a54b9cc15c6d4e5a4dd", + "rev": "8f88a53b5479773cd626420362631bc1da99e677", "type": "gitlab" }, "original": { "dir": "lib", "owner": "TECHNOFAB", - "ref": "3.0.0-alpha.2", + "ref": "3.1.2", "repo": "nix-gitlab-ci", "type": "gitlab" } @@ -38,11 +38,11 @@ "nixmkdocs": { "locked": { "dir": "lib", - "lastModified": 1757055638, - "narHash": "sha256-KHYSkEreFe4meXzSdEbknC/HwaQSNClQkc8vzHlAsMM=", + "lastModified": 1766062227, + "narHash": "sha256-jhr5CUi9eDeMIAJn7ayXP8Wr+Y2loV5EhdDIKDkRIdw=", "owner": "TECHNOFAB", "repo": "nixmkdocs", - "rev": "7840a5febdbeaf2da90babf6c94b3d0929d2bf74", + "rev": "cb0bb5dc3382e8ba5d81324a2f1fd94ccd5a5df4", "type": "gitlab" }, "original": { @@ -55,11 +55,11 @@ "nixtest-lib": { "locked": { "dir": "lib", - "lastModified": 1756812148, - "narHash": "sha256-0g8KNk4zoLApA51PBHOWqPLRYpprjrQuSzNCjfBQgu8=", + "lastModified": 1765788390, + "narHash": "sha256-CwICjxGzu43jLaF+Ez6veRW1rEOvkT9zm46X0YrqdYc=", "owner": "TECHNOFAB", "repo": "nixtest", - "rev": "5741109cc9ec2b6d41b56abd3f5bc51ed7a9a228", + "rev": "fc2b64839c97bca96d4b03d0c1d6ea6ec847c84b", "type": "gitlab" }, "original": { @@ -82,11 +82,11 @@ "soonix-lib": { "locked": { "dir": "lib", - "lastModified": 1757424411, - "narHash": "sha256-x99obZwqDAhUB+VUhAV9sKH00NnsVi481n/8bdvZCUY=", + "lastModified": 1766044966, + "narHash": "sha256-VB8PgA5QYmehFCGGz8YmlmuhCG43ab9rK9ufdKmfjao=", "owner": "TECHNOFAB", "repo": "soonix", - "rev": "add807ef8980197bbd06652a36d937b93b2a31c7", + "rev": "e9860d65a0123af948c1a2da65664a6d481efe05", "type": "gitlab" }, "original": { @@ -99,11 +99,11 @@ "treefmt-nix": { "flake": false, "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { diff --git a/nix/repo/flake.nix b/nix/repo/flake.nix index 333ab5f..97d81ac 100644 --- a/nix/repo/flake.nix +++ b/nix/repo/flake.nix @@ -4,7 +4,7 @@ nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs?dir=lib"; devshell.url = "gitlab:rensa-nix/devshell?dir=lib"; soonix-lib.url = "gitlab:TECHNOFAB/soonix?dir=lib"; - nix-gitlab-ci-lib.url = "gitlab:TECHNOFAB/nix-gitlab-ci/3.0.0-alpha.2?dir=lib"; + nix-gitlab-ci-lib.url = "gitlab:TECHNOFAB/nix-gitlab-ci/3.1.2?dir=lib"; treefmt-nix = { url = "github:numtide/treefmt-nix"; flake = false; diff --git a/nix/repo/soonix.nix b/nix/repo/soonix.nix new file mode 100644 index 0000000..c78c4b6 --- /dev/null +++ b/nix/repo/soonix.nix @@ -0,0 +1,36 @@ +{ + inputs, + cell, + ... +}: let + inherit (inputs) soonix; + inherit (cell) ci; +in + (soonix.make { + hooks = { + ci = ci.soonix; + renovate = { + output = ".gitlab/renovate.json5"; + data = { + extends = ["config:recommended"]; + postUpgradeTasks = { + commands = [ + "nix-portable nix run .#soonix:update" + ]; + updateMode = "branch"; + }; + lockFileMaintenance = { + enabled = true; + extends = ["schedule:monthly"]; + }; + nix.enabled = true; + gitlabci.enabled = false; + }; + hook = { + mode = "copy"; + gitignore = false; + }; + opts.format = "json"; + }; + }; + }).config