From 2265fc29621908704f587b1ec3138e3a10fba702 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 1 Feb 2023 13:16:24 +0800 Subject: [PATCH 1/3] flake.lock: Update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e3f8833..3b21a62 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1674236650, - "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", + "lastModified": 1675153841, + "narHash": "sha256-EWvU3DLq+4dbJiukfhS7r6sWZyJikgXn6kNl7eHljW8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5", + "rev": "ea692c2ad1afd6384e171eabef4f0887d2b882d3", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1674352297, - "narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=", + "lastModified": 1675215157, + "narHash": "sha256-bdEmR5m4usTGPiLMfL56TMLOdig1ARYHlppxMZJ0/V4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "918b760070bb8f48cb511300fcd7e02e13058a2e", + "rev": "af10c1043b37230e8ac58c76d88c08742077e9c3", "type": "github" }, "original": { From a88f9dd22d9e9c17b8f859d44a85744d764750e6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 1 Feb 2023 13:16:38 +0800 Subject: [PATCH 2/3] Fix build of sops-install-secrets after https://github.com/NixOS/nixpkgs/pull/212800 --- pkgs/sops-install-secrets/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/sops-install-secrets/default.nix b/pkgs/sops-install-secrets/default.nix index e7527e2..579d52a 100644 --- a/pkgs/sops-install-secrets/default.nix +++ b/pkgs/sops-install-secrets/default.nix @@ -17,7 +17,7 @@ buildGoModule { outputs = [ "out" "unittest" ]; - postBuild = '' + postInstall = '' go test -c ./pkgs/sops-install-secrets install -D ./sops-install-secrets.test $unittest/bin/sops-install-secrets.test # newer versions of nixpkgs no longer require this step From 3109abd37796004217e83b7e49bae2764d2b9272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Feb 2023 10:37:06 +0100 Subject: [PATCH 3/3] add bors.toml --- bors.toml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 bors.toml diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000..89322da --- /dev/null +++ b/bors.toml @@ -0,0 +1,35 @@ +cut_body_after = "" # don't include text from the PR body in the merge commit message +status = [ + "Evaluate flake.nix", + "check age-keys [x86_64-linux]", + "check age-keys-22_11 [x86_64-linux]", + "check age-ssh-keys [x86_64-linux]", + "check age-ssh-keys-22_11 [x86_64-linux]", + "check cross-build-22_11 [x86_64-linux]", + "check lint-22_11 [x86_64-linux]", + "check pgp-keys [x86_64-linux]", + "check pgp-keys-22_11 [x86_64-linux]", + "check pruning [x86_64-linux]", + "check pruning-22_11 [x86_64-linux]", + "check restart-and-reload [x86_64-linux]", + "check restart-and-reload-22_11 [x86_64-linux]", + "check sops-import-keys-hook-22_11 [x86_64-linux]", + "check sops-init-gpg-key-22_11 [x86_64-linux]", + "check sops-pgp-hook-test-22_11 [x86_64-linux]", + "check ssh-keys-22_11 [x86_64-linux]", + "check ssh-to-pgp-22_11 [x86_64-linux]", + "check unit-tests-22_11 [x86_64-linux]", + "createPullRequest", + "default devShell [x86_64-linux]", + "default package [x86_64-linux]", + "package cross-build [x86_64-linux]", + "package lint [x86_64-linux]", + "package sops-import-keys-hook [x86_64-linux]", + "package sops-init-gpg-key [x86_64-linux]", + "package sops-install-secrets [x86_64-linux]", + "package sops-pgp-hook [x86_64-linux]", + "package sops-pgp-hook-test [x86_64-linux]", + "package ssh-to-pgp [x86_64-linux]", + "package unit-tests [x86_64-linux]", + "tests" +]