OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch back to upstream devenv flake (#15533)

pull/14626/merge
Andrew Morgan 2023-05-03 15:40:10 +01:00 committed by GitHub
parent 8aee823393
commit 7be05df0b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/15533.misc Normal file
View File

@ -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.

12
flake.lock
View File

@ -8,16 +8,16 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1682534083, "lastModified": 1683102061,
"narHash": "sha256-lBgFaLNHRQtD3InZbBXzIS8HgZUgcPJ6jiqGa4FJPrk=", "narHash": "sha256-kOphT6V0uQUlFNBP3GBjs7DAU7fyZGGqCs9ue1gNY6E=",
"owner": "anoadragon453", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "9694bd0a845dd184d4468cc3d3461089aace787a", "rev": "ff1f29e41756553174d596cafe3a9fa77595100b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "anoadragon453", "owner": "cachix",
"ref": "anoa/fix_languages_python", "ref": "main",
"repo": "devenv", "repo": "devenv",
"type": "github" "type": "github"
} }

6
flake.nix
View File

@ -50,11 +50,7 @@
# Output a development shell for x86_64/aarch64 Linux/Darwin (MacOS). # Output a development shell for x86_64/aarch64 Linux/Darwin (MacOS).
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
# A development environment manager built on Nix. See https://devenv.sh. # A development environment manager built on Nix. See https://devenv.sh.
# This is temporarily overridden to a fork that fixes a quirk between devenv.url = "github:cachix/devenv/main";
# 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";
# Rust toolchains and rust-analyzer nightly. # Rust toolchains and rust-analyzer nightly.
fenix = { fenix = {
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";