christian
/
nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop 21.05 branch

This commit is contained in:
Naïm Favier 2022-01-21 13:02:15 +01:00
parent ef03562eba
commit f4c14572fc
4 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hydra/declarative-jobsets.nix
View File

@ -17,7 +17,7 @@ let
flake = "gitlab:simple-nixos-mailserver/nixos-mailserver/merge-requests/${info.iid}/head"; flake = "gitlab:simple-nixos-mailserver/nixos-mailserver/merge-requests/${info.iid}/head";
} }
) prs; ) prs;
# This could be removed once branch 20.09 and 21.05 would have been # This could be removed once branch 21.11 would have been
# removed. # removed.
mkJobset = branch: { mkJobset = branch: {
description = "Build ${branch} branch of Simple NixOS MailServer"; description = "Build ${branch} branch of Simple NixOS MailServer";
@ -61,7 +61,6 @@ let
desc = prJobsets // { desc = prJobsets // {
"master" = mkFlakeJobset "master"; "master" = mkFlakeJobset "master";
"nixos-21.05" = mkJobset "nixos-21.05";
"nixos-21.11" = mkFlakeJobset "nixos-21.11"; "nixos-21.11" = mkFlakeJobset "nixos-21.11";
}; };

2
README.md
View File

@ -83,7 +83,7 @@ D9FE 4119 F082 6F15 93BD BD36 6162 DBA5 635E A16A
```nix ```nix
{ config, pkgs, ... }: { config, pkgs, ... }:
let release = "nixos-21.05"; let release = "nixos-21.11";
in { in {
imports = [ imports = [
(builtins.fetchTarball { (builtins.fetchTarball {

16
flake.lock
View File

@ -31,21 +31,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-21_05": {
"locked": {
"lastModified": 1625692408,
"narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c06613c25df3fe1dd26243847a3c105cf6770627",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-21.05",
"type": "indirect"
}
},
"nixpkgs-21_11": { "nixpkgs-21_11": {
"locked": { "locked": {
"lastModified": 1638371214, "lastModified": 1638371214,
@ -65,7 +50,6 @@
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-21_05": "nixpkgs-21_05",
"nixpkgs-21_11": "nixpkgs-21_11", "nixpkgs-21_11": "nixpkgs-21_11",
"utils": "utils" "utils": "utils"
} }

11
flake.nix
View File

@ -4,7 +4,6 @@
inputs = { inputs = {
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixpkgs.url = "flake:nixpkgs/nixos-unstable"; nixpkgs.url = "flake:nixpkgs/nixos-unstable";
nixpkgs-21_05.url = "flake:nixpkgs/nixos-21.05";
nixpkgs-21_11.url = "flake:nixpkgs/nixos-21.11"; nixpkgs-21_11.url = "flake:nixpkgs/nixos-21.11";
blobs = { blobs = {
url = "gitlab:simple-nixos-mailserver/blobs"; url = "gitlab:simple-nixos-mailserver/blobs";
@ -12,7 +11,7 @@
}; };
}; };
outputs = { self, utils, blobs, nixpkgs, nixpkgs-21_05, nixpkgs-21_11 }: let outputs = { self, utils, blobs, nixpkgs, nixpkgs-21_11 }: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
# We want to test nixos-mailserver on several nixos releases # We want to test nixos-mailserver on several nixos releases
@ -21,10 +20,6 @@
name = "unstable"; name = "unstable";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
} }
{
name = "21_05";
pkgs = nixpkgs-21_05.legacyPackages.${system};
}
{ {
name = "21_11"; name = "21_11";
pkgs = nixpkgs-21_11.legacyPackages.${system}; pkgs = nixpkgs-21_11.legacyPackages.${system};
@ -54,7 +49,7 @@
mailserverModule = import ./.; mailserverModule = import ./.;
# Generate a rst file describing options of the NixOS mailserver module # Generate a rst file describing options of the NixOS mailserver module
generateRstOptions = let generateRstOptions = let
eval = import (pkgs.path + "/nixos/lib/eval-config.nix") { eval = import (pkgs.path + "/nixos/lib/eval-config.nix") {
inherit system; inherit system;
@ -68,7 +63,7 @@
mailserver.fqdn = "mx.example.com"; mailserver.fqdn = "mx.example.com";
} }
]; ];
}; };
options = pkgs.nixosOptionsDoc { options = pkgs.nixosOptionsDoc {
options = eval.options; options = eval.options;