From 8aabd8e85d37c278c2e73bfb8d4173edd3a106f0 Mon Sep 17 00:00:00 2001 From: Will Ruggiano Date: Mon, 20 May 2024 14:21:12 -0600 Subject: [PATCH] Revert "feat: hercules-ci" This reverts commit 8f1902b02c60b6f3381929a16e4d8e461a02027b. --- flake.lock | 124 +++++++++++++++-------------------------------------- flake.nix | 13 ------ 2 files changed, 34 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index c952a90..17db289 100644 --- a/flake.lock +++ b/flake.lock @@ -163,7 +163,7 @@ }, "dream2nix_2": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "purescript-overlay": "purescript-overlay", "pyproject-nix": "pyproject-nix" }, @@ -295,26 +295,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -577,25 +557,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "langref": { "flake": false, "locked": { @@ -645,7 +606,7 @@ "crane": "crane", "dream2nix": "dream2nix", "mk-naked-shell": "mk-naked-shell", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "parts": "parts", "rust-overlay": "rust-overlay_2", "treefmt": "treefmt" @@ -687,7 +648,7 @@ "flake-parts" ], "lazy-nvim": "lazy-nvim", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "pre-commit-nix": "pre-commit-nix" }, "locked": { @@ -707,7 +668,7 @@ "nil": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { @@ -962,22 +923,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -993,7 +938,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -1009,7 +954,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1702272962, "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", @@ -1025,7 +970,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1715668745, "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", @@ -1074,22 +1019,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1706683685, "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", @@ -1105,7 +1034,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -1121,7 +1050,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1714314149, "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", @@ -1137,7 +1066,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1716190602, "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", @@ -1153,7 +1082,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1696193975, "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", @@ -1169,6 +1098,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1696419054, + "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -1221,7 +1166,7 @@ "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -1243,7 +1188,7 @@ "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_4", "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { @@ -1305,12 +1250,11 @@ "devenv": "devenv", "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", "neovim": "neovim", "neovim-nix": "neovim-nix", "nil": "nil", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "sg-nvim": "sg-nvim", "vscode-js-debug": "vscode-js-debug", "zls": "zls" @@ -1360,7 +1304,7 @@ "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1696558324, @@ -1378,9 +1322,9 @@ }, "sg-nvim": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nci": "nci", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "pre-commit-nix": "pre-commit-nix_2", "rust-overlay": "rust-overlay_3" }, @@ -1585,7 +1529,7 @@ "flake-utils": "flake-utils_7", "gitignore": "gitignore_4", "langref": "langref", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 3d1df12..35b25ad 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ inputs = { devenv.url = "github:cachix/devenv"; git-hooks.url = "github:cachix/git-hooks.nix"; - hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects"; neovim-nix = { url = "github:willruggiano/neovim.nix"; inputs.flake-parts.follows = "flake-parts"; @@ -37,7 +36,6 @@ flake-parts.lib.mkFlake {inherit inputs;} { imports = [ inputs.devenv.flakeModule - inputs.hercules-ci-effects.flakeModule inputs.neovim-nix.flakeModule ./modules ]; @@ -123,16 +121,5 @@ nvim-treesitter = pkgs.callPackage ./pkgs/nvim-treesitter {}; }; }; - - hercules-ci.flake-update = { - enable = true; - baseMerge.enable = true; - baseMerge.method = "rebase"; - autoMergeMethod = "rebase"; - when = { - dayOfWeek = ["Mon"]; - hour = [0]; - }; - }; }; }