diff options
| -rw-r--r-- | default.nix | 24 | ||||
| -rw-r--r-- | flake.lock | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/default.nix b/default.nix index f97d645..d092a22 100644 --- a/default.nix +++ b/default.nix @@ -14,16 +14,11 @@ rustPlatform.buildRustPackage rec { version = "0.1.0"; src = lib.cleanSource ./.; + cargoLock.lockFile = ./Cargo.lock; nativeBuildInputs = [ pkg-config ]; - checkInputs = [ - openssl - postgresql - postgresqlTestHook - (python3.withPackages (p: [ p.pytest p.pyfxa p.requests p.http-ece p.aiosmtpd ])) - ]; buildInputs = [ openssl ]; @@ -32,6 +27,17 @@ rustPlatform.buildRustPackage rec { patchShebangs ./tests/run.sh ''; + nativeCheckInputs = [ + openssl + postgresql + postgresqlTestHook + (python3.withPackages (p: [ p.pytest p.pyfxa p.requests p.http-ece p.aiosmtpd ])) + ]; + + preCheck = '' + openssl ecparam -genkey -name prime256v1 -out private_key.pem + ''; + # test config for postgres hook and integration tests PGDATABASE = "testdb"; PGUSER = "testuser"; @@ -41,10 +47,4 @@ rustPlatform.buildRustPackage rec { ROCKET_VAPID_KEY = "private_key.pem"; ROCKET_VAPID_SUBJECT = "undefined"; # not needed for tests ROCKET_MAIL_FROM = "minor skulk <noreply@localhost>"; - - preCheck = '' - openssl ecparam -genkey -name prime256v1 -out private_key.pem - ''; - - cargoLock.lockFile = ./Cargo.lock; } @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1653704018, - "narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=", + "lastModified": 1675446098, + "narHash": "sha256-xB4doWLd849LKDKqYnTdmteX5TVEfZIH6WiGvj8wMi4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13f08d71ceff5101321e0291854495a1ec153a5e", + "rev": "a59fe7abba1be9e515e7333005ff8a36f86876b2", "type": "github" }, "original": { |