From 91893141fa57bd8c3fafd848ac8549a82e6c5aa8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 3 May 2023 14:41:14 +0100 Subject: [PATCH 1/2] Switch back to upstream devenv flake We can switch back to upstream devenv now as needed fix in https://github.com/cachix/devenv/pull/559 has been merged. --- flake.lock | 12 ++++++------ flake.nix | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 85886b730f54..d1c933e9aa01 100644 --- a/flake.lock +++ b/flake.lock @@ -8,16 +8,16 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1682534083, - "narHash": "sha256-lBgFaLNHRQtD3InZbBXzIS8HgZUgcPJ6jiqGa4FJPrk=", - "owner": "anoadragon453", + "lastModified": 1683102061, + "narHash": "sha256-kOphT6V0uQUlFNBP3GBjs7DAU7fyZGGqCs9ue1gNY6E=", + "owner": "cachix", "repo": "devenv", - "rev": "9694bd0a845dd184d4468cc3d3461089aace787a", + "rev": "ff1f29e41756553174d596cafe3a9fa77595100b", "type": "github" }, "original": { - "owner": "anoadragon453", - "ref": "anoa/fix_languages_python", + "owner": "cachix", + "ref": "main", "repo": "devenv", "type": "github" } diff --git a/flake.nix b/flake.nix index 91916d9abb51..3e24a6691e27 100644 --- a/flake.nix +++ b/flake.nix @@ -50,11 +50,7 @@ # Output a development shell for x86_64/aarch64 Linux/Darwin (MacOS). systems.url = "github:nix-systems/default"; # A development environment manager built on Nix. See https://devenv.sh. - # This is temporarily overridden to a fork that fixes a quirk between - # devenv's service and python language features. This can be removed - # when https://github.com/cachix/devenv/pull/559 is merged upstream. - devenv.url = "github:anoadragon453/devenv/anoa/fix_languages_python"; - #devenv.url = "github:cachix/devenv/main"; + devenv.url = "github:cachix/devenv/main"; # Rust toolchains and rust-analyzer nightly. fenix = { url = "github:nix-community/fenix"; From 35b492e4645f1853df2e29db00614a021a89e3c2 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 3 May 2023 14:49:58 +0100 Subject: [PATCH 2/2] changelog --- changelog.d/15533.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15533.misc diff --git a/changelog.d/15533.misc b/changelog.d/15533.misc new file mode 100644 index 000000000000..8ed23526ef01 --- /dev/null +++ b/changelog.d/15533.misc @@ -0,0 +1 @@ +Install the `xmlsec` package and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment. \ No newline at end of file