From f5a460434b2a02ecc3c03ced6ee91df800824695 Mon Sep 17 00:00:00 2001
From: Rutger Broekhoff
Date: Tue, 23 Jan 2024 23:36:19 +0100
Subject: Fix S3 env, set pname and version in package attribute set

---
 flake.nix             | 2 ++
 rs/server/src/main.rs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index ebcc991..db5fc93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,8 @@
         {
           packages.gitolfs3 = gitolfs3;
           packages.gitolfs3-rs = craneLib.buildPackage {
+            pname = "gitolfs3";
+            version = "0.1.0";
             src = craneLib.cleanCargoSource (craneLib.path ./rs);
           };
           packages.default = self.packages.${system}.gitolfs3;
diff --git a/rs/server/src/main.rs b/rs/server/src/main.rs
index 99805a4..880cb46 100644
--- a/rs/server/src/main.rs
+++ b/rs/server/src/main.rs
@@ -122,7 +122,7 @@ fn require_env(name: &str) -> Result<String, String> {
 impl Env {
     fn load() -> Result<Env, String> {
         Ok(Env {
-            s3_secret_access_key: require_env("GITOLFS3_S3_ACCESS_KEY_FILE")?,
+            s3_secret_access_key: require_env("GITOLFS3_S3_SECRET_ACCESS_KEY_FILE")?,
             s3_access_key_id: require_env("GITOLFS3_S3_ACCESS_KEY_ID_FILE")?,
             s3_endpoint: require_env("GITOLFS3_S3_ENDPOINT")?,
             s3_bucket: require_env("GITOLFS3_S3_BUCKET")?,
-- 
cgit v1.2.3