Assorted improvements

.ci/scripts/build-all-dev-envs.sh

@@ -5,7 +5,7 @@ PROJECT_FLAKES_DIR="project-flakes"
 set -ex
 
 # Loop through each sub-directory in 'project-flakes'
-for project in "$PROJECT_FLAKES_DIR"/*/ ; do  
+for project in "$PROJECT_FLAKES_DIR"/*/ ; do
   # Remove the trailing '/'
   project=${project%*/}
   # Extract the project name
@@ -24,12 +24,12 @@ for project in "$PROJECT_FLAKES_DIR"/*/ ; do
   # Enter the project directory.
   cd "$project"
   # Show the generated outputs of the flake.
-  nix flake show ..
+  nix flake show --impure ..
   # Attempt to build and enter the development environment,
   # then run the specified test command.
   nix develop --impure ..#"$project" -c bash -c "$cmd"
   # Leave the project directory.
   cd ..
   # Delete the project directory.
   rm -rf "$project"
-done
+done

README.md

@@ -40,7 +40,7 @@ installer](https://github.com/DeterminateSystems/nix-installer?tab=readme-ov-fil
 Then at the root of your local Synapse checkout, run the following command:
 
 ```shell
-nix develop impure github:element-hq/nix-flakes#synapse
+nix develop --impure github:element-hq/nix-flakes#synapse
 ```
 
 Dependencies will be downloaded and installed for you, and you'll be dropped
@@ -59,7 +59,7 @@ If typing `nix develop --impure ...` gets tiring, you can automatically enter
 the desired project development environment by installing `direnv` and creating
 a `.envrc` file with the following contents:
 
-```
+```shell
 use flake --impure github:element-hq/nix-flakes#synapse
 ```
 
@@ -145,15 +145,15 @@ language that returns a devenv module. A basic example of a `module.nix`:
 To test a development environment locally without pushing it to git, you can
 use the following to reference a development environment in a local directory:
 
-```
+```shell
 nix develop path:///home/work/code/nix-flakes#synapse --impure
 ```
 
-...which would drop you into a new `synapse` development environment shell.
+... which would drop you into a new `synapse` development environment shell.
 
 The same can be done when using `direnv`. Just set your `.envrc` file to:
 
-```
+```shell
 use flake path:///home/work/code/nix-flakes#synapse --impure
 ```
 
@@ -168,4 +168,4 @@ is where all that happens.
 available options you can specify.
 
 The [Nix Language basics](https://zero-to-nix.com/concepts/nix-language) is a
-recommended read.
+recommended read.

flake.nix

@@ -1,5 +1,7 @@
 {
   inputs = {
+    # Aim for the latest versions of packages by default.
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     # A development environment manager built on Nix. See https://devenv.sh.
     devenv.url = "github:cachix/devenv/v1.0.7";
     # Output a development shell for x86_64/aarch64 Linux/Darwin (MacOS).
@@ -111,4 +113,4 @@
         }
       );
     };
-}
+}

project-flakes/matrix-hyper-federation-client/module.nix

@@ -7,10 +7,10 @@
   # Search for package names at https://search.nixos.org/packages?channel=unstable
   packages = with pkgs; [
     # The rust toolchain and related tools.
-    (rust-bin.stable."1.66.0".default.override {
+    (rust-bin.stable."1.70.0".default.override {
       extensions = [ "rust-src" ];
     })
-    
+
     # For enabling faster Rust compile times. See the `env` option below.
     clang
     mold
@@ -27,4 +27,4 @@
     # TODO: The lld flags may be Linux-only?
     "RUSTFLAGS" = "-Clinker=clang -Clink-arg=-fuse-ld=${pkgs.mold}/bin/mold";
   };
-}
+}

project-flakes/synapse/module.nix

@@ -54,7 +54,7 @@
   # Automatically activate the poetry virtualenv upon entering the shell.
   languages.python.poetry.activate.enable = true;
   # Install all extra Python dependencies; this is needed to run the unit
-  # tests and utilitise all Synapse features.
+  # tests and utilise all Synapse features.
   languages.python.poetry.install.arguments = ["--extras all"];
   # Install the 'matrix-synapse' package from the local checkout.
   languages.python.poetry.install.installRootPackage = true;
@@ -81,8 +81,8 @@
   # Create a postgres user called 'synapse_user' which has ownership
   # over the 'synapse' database.
   services.postgres.initialScript = ''
-  CREATE USER synapse_user;
-  ALTER DATABASE synapse OWNER TO synapse_user;
+    CREATE USER synapse_user;
+    ALTER DATABASE synapse OWNER TO synapse_user;
   '';
 
   # Redis is needed in order to run Synapse in worker mode.
@@ -130,4 +130,4 @@
   enterShell = ''
     unset LD_LIBRARY_PATH
   '';
-}
+}

project-flakes/sytest/module.nix

@@ -43,7 +43,7 @@
   # corresponding Nix packages on https://search.nixos.org/packages.
   #
   # This was done until `./install-deps.pl --dryrun` produced no output.
-  env.PERL5LIB = "${with pkgs.perl536Packages; makePerlPath [
+  env.PERL5LIB = "${with pkgs.perl538Packages; makePerlPath [
     DBI
     ClassMethodModifiers
     CryptEd25519
@@ -79,4 +79,4 @@
     URI
     YAMLLibYAML
   ]}";
-}
+}