From 0de0739447888d1afe405d21d34156fd4a4453cd Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 3 May 2023 14:26:43 +0100 Subject: [PATCH 1/3] Add xmlsec package to flake.nix This is needed to run some unit tests. --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 91916d9abb51..0afc4b22292c 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,7 @@ # Native dependencies for unit tests (SyTest also requires OpenSSL). openssl + xmlsec # Native dependencies for running Complement. olm From b2cc989f23cb80c86746fa1417711e7e117a6fbb Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 3 May 2023 14:32:08 +0100 Subject: [PATCH 2/3] changelog --- changelog.d/15532.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15532.misc diff --git a/changelog.d/15532.misc b/changelog.d/15532.misc new file mode 100644 index 000000000000..78a21c73ff5f --- /dev/null +++ b/changelog.d/15532.misc @@ -0,0 +1 @@ +Install the `xmlsec` package in the nix development environment. \ No newline at end of file From 96027e0313dccfd94c496a96e6f3de5a1de18af8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 3 May 2023 14:52:16 +0100 Subject: [PATCH 3/3] Update the changelog to match that of #15533 --- changelog.d/15532.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/15532.misc b/changelog.d/15532.misc index 78a21c73ff5f..e58273f2977d 100644 --- a/changelog.d/15532.misc +++ b/changelog.d/15532.misc @@ -1 +1 @@ -Install the `xmlsec` package in the nix development environment. \ No newline at end of file +Install the `xmlsec` package and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment.