mirrors/sops-nix
1
0
Fork 0
mirror of https://github.com/Mic92/sops-nix.git synced 2024-12-14 11:57:52 +00:00
Code Activity

Remove the 21.11 version

Browse source
This commit is contained in:
Janne Heß 2022-07-04 20:23:46 +02:00
parent 85907ae738
commit a94c4a7d40
No known key found for this signature in database
GPG key ID: 69165158F05265DF
4 changed files with 7 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -550,7 +550,7 @@ the service needs a token and a SSH private key to function.</summary>
## Restarting/reloading systemd units on secret change
**With NixOS 22.05**, it is possible to restart or reload units when a secret changes or is newly initialized.
It is possible to restart or reload units when a secret changes or is newly initialized.
This behavior can be configured per-secret:
```nix

29
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1656755932,
"narHash": "sha256-TGThfOxr+HjFK464+UoUE6rClp2cwxjiKvHcBVdIGSQ=",
"lastModified": 1656817495,
"narHash": "sha256-QEWkUBH4gu6ntNkF+9xIqDM22bto4PB+LSHIL6oWFpM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "660ac43ff9ab1f12e28bfb31d4719795777fe152",
"rev": "db43c2a1ac04fdb1879f2fdca037fcd027a92dd5",
"type": "github"
},
"original": {
@ -16,29 +16,13 @@
"type": "github"
}
},
"nixpkgs-21_11": {
"locked": {
"lastModified": 1656782578,
"narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-22_05": {
"locked": {
"lastModified": 1656782561,
"narHash": "sha256-sZVLNNKIcELllTHqydsckz8HBfVqxeAt51acaaQWLCw=",
"lastModified": 1656955776,
"narHash": "sha256-1aMu67m+orlGxVwfiX3RxTEVFoq/RmKa/L5u9zU3UNQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "18038cee44aa0c3c99a2319c3c1c4d16d6612d81",
"rev": "cc16da2c92041cbe817c40f62aac87c99104e9c2",
"type": "github"
},
"original": {
@ -51,7 +35,6 @@
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"nixpkgs-21_11": "nixpkgs-21_11",
"nixpkgs-22_05": "nixpkgs-22_05"
}
}

9
flake.nix
View file

@ -1,14 +1,12 @@
{
description = "Integrates sops into nixos";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.nixpkgs-21_11.url = "github:NixOS/nixpkgs/release-21.11";
inputs.nixpkgs-22_05.url = "github:NixOS/nixpkgs/release-22.05";
nixConfig.extra-substituters = ["https://cache.garnix.io"];
nixConfig.extra-trusted-public-keys = ["cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="];
outputs = {
self,
nixpkgs,
nixpkgs-21_11,
nixpkgs-22_05
}: let
systems = [
@ -20,7 +18,6 @@
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
suffix-version = version: attrs: nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair (name + version) value) attrs;
suffix-22_05 = suffix-version "-22_05";
suffix-21_11 = suffix-version "-21_11";
in {
overlay = final: prev: let
localPkgs = import ./default.nix {pkgs = final;};
@ -38,17 +35,11 @@
checks = nixpkgs.lib.genAttrs ["x86_64-linux" "aarch64-linux"]
(system: let
tests = self.packages.${system}.sops-install-secrets.tests;
packages-21_11 = import ./default.nix {
pkgs = import nixpkgs-21_11 {inherit system;};
};
packages-22_05 = import ./default.nix {
pkgs = import nixpkgs-22_05 {inherit system;};
};
tests-21_11 = packages-21_11.sops-install-secrets.tests;
tests-22_05 = packages-22_05.sops-install-secrets.tests;
in tests //
(suffix-21_11 tests-21_11) //
(suffix-21_11 packages-21_11) //
(suffix-22_05 tests-22_05) //
(suffix-22_05 packages-22_05));

1
pkgs/sops-install-secrets/nixos-test.nix
View file

@ -204,7 +204,6 @@
inherit (pkgs) system;
};
} // pkgs.lib.optionalAttrs (pkgs.lib.versionAtLeast (pkgs.lib.versions.majorMinor pkgs.lib.version) "22.05") {
restart-and-reload = makeTest {
name = "sops-restart-and-reload";
nodes.machine = { pkgs, lib, config, ... }: {