From 7be05df0b143bd7bf25a6cc3a489d0af913b48cf Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Wed, 3 May 2023 15:40:10 +0100
Subject: [PATCH] Switch back to upstream devenv flake (#15533)

---
 changelog.d/15533.misc |  1 +
 flake.lock             | 12 ++++++------
 flake.nix              |  6 +-----
 3 files changed, 8 insertions(+), 11 deletions(-)
 create mode 100644 changelog.d/15533.misc

diff --git a/changelog.d/15533.misc b/changelog.d/15533.misc
new file mode 100644
index 0000000000..8ed23526ef
--- /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
diff --git a/flake.lock b/flake.lock
index 85886b730f..d1c933e9aa 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 91916d9abb..3e24a6691e 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";