From 70a970f5a02b7febec1c3065e10c4155b99ecf86 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 30 Nov 2022 20:56:06 +0100
Subject: [PATCH] Release 22.11
---
.hydra/declarative-jobsets.nix | 1 +
flake.lock | 18 +++++++++---------
flake.nix | 7 ++++++-
tests/clamav.nix | 4 ++--
tests/external.nix | 2 +-
5 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix
index 11b2763..eeb82d2 100644
--- a/.hydra/declarative-jobsets.nix
+++ b/.hydra/declarative-jobsets.nix
@@ -33,6 +33,7 @@ let
desc = prJobsets // {
"master" = mkFlakeJobset "master";
"nixos-22.05" = mkFlakeJobset "nixos-22.05";
+ "nixos-22.11" = mkFlakeJobset "nixos-22.11";
};
log = {
diff --git a/flake.lock b/flake.lock
index e98dc26..0f7f71a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1642635915,
- "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
+ "lastModified": 1669542132,
+ "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f",
+ "rev": "a115bb9bd56831941be3776c8a94005867f316a7",
"type": "github"
},
"original": {
@@ -31,18 +31,18 @@
"type": "indirect"
}
},
- "nixpkgs-22_05": {
+ "nixpkgs-22_11": {
"locked": {
- "lastModified": 1654936503,
- "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
+ "lastModified": 1669558522,
+ "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
+ "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-22.05",
+ "ref": "nixos-22.11",
"type": "indirect"
}
},
@@ -50,7 +50,7 @@
"inputs": {
"blobs": "blobs",
"nixpkgs": "nixpkgs",
- "nixpkgs-22_05": "nixpkgs-22_05",
+ "nixpkgs-22_11": "nixpkgs-22_11",
"utils": "utils"
}
},
diff --git a/flake.nix b/flake.nix
index d9f2fad..4b5c8e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,13 +4,14 @@
inputs = {
utils.url = "github:numtide/flake-utils";
nixpkgs.url = "flake:nixpkgs/nixos-unstable";
+ nixpkgs-22_11.url = "flake:nixpkgs/nixos-22.11";
blobs = {
url = "gitlab:simple-nixos-mailserver/blobs";
flake = false;
};
};
- outputs = { self, utils, blobs, nixpkgs }: let
+ outputs = { self, utils, blobs, nixpkgs, nixpkgs-22_11 }: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
releases = [
@@ -18,6 +19,10 @@
name = "unstable";
pkgs = nixpkgs.legacyPackages.${system};
}
+ {
+ name = "22.11";
+ pkgs = nixpkgs-22_11.legacyPackages.${system};
+ }
];
testNames = [
"internal"
diff --git a/tests/clamav.nix b/tests/clamav.nix
index 4f59d64..7a9f43c 100644
--- a/tests/clamav.nix
+++ b/tests/clamav.nix
@@ -189,10 +189,10 @@ pkgs.nixosTest {
# TODO put this blocking into the systemd units? I am not sure if rspamd already waits for the clamd socket.
server.wait_until_succeeds(
- "set +e; timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
+ "set +e; timeout 1 ${nodes.server.nixpkgs.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
server.wait_until_succeeds(
- "set +e; timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/clamav/clamd.ctl < /dev/null; [ $? -eq 124 ]"
+ "set +e; timeout 1 ${nodes.server.nixpkgs.pkgs.netcat}/bin/nc -U /run/clamav/clamd.ctl < /dev/null; [ $? -eq 124 ]"
)
client.execute("cp -p /etc/root/.* ~/")
diff --git a/tests/external.nix b/tests/external.nix
index c14a345..6c03144 100644
--- a/tests/external.nix
+++ b/tests/external.nix
@@ -350,7 +350,7 @@ pkgs.nixosTest {
# TODO put this blocking into the systemd units?
server.wait_until_succeeds(
- "set +e; timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
+ "set +e; timeout 1 ${nodes.server.nixpkgs.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
client.execute("cp -p /etc/root/.* ~/")