papa: 4.1.0-rc.3 -> 4.1.0-rc.4

1 files changed, 9 insertions, 15 deletions

diff --git a/pkgs/papa/package.nix b/pkgs/papa/package.nix
index 4659f94..e8b5a97 100644
--- a/pkgs/papa/package.nix
+++ b/pkgs/papa/package.nix
@@ -2,36 +2,30 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  papa,
   installShellFiles,
   nix-update-script,
   testers,
-  papa,
   openssl,
   pkg-config,
 }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "papa";
-  version = "4.1.0-rc.3";
+  version = "4.1.0-rc.4";
 
   src = fetchFromGitHub {
     owner = "AnActualEmerald";
     repo = "papa";
-    rev = "v${papa.version}";
-    hash = "sha256-opuBCuc3YCAdwwg6XbTX0HRrV3FsVdJStEACMvtTM1w=";
+    rev = "v${version}";
+    hash = "sha256-XAYenoWLKeNzNozFRPz84WDeU0/y2hd/wgr3UeZLFS0=";
   };
 
   postUnpack = ''
     rmdir source/thermite
-    ln -sf ${papa.libthermite} source/thermite
+    ln -sf ${passthru.libthermite} source/thermite
   '';
 
-  postPatch = ''
-    ln -sf ${./Cargo.lock} Cargo.lock
-  '';
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
+  cargoHash = "sha256-t2c/eaQLEKLzJEvyY35Kithon5K5Bes3OWmQgExigzI=";
 
   nativeBuildInputs = [pkg-config installShellFiles];
   buildInputs = [openssl];
@@ -57,10 +51,10 @@ rustPlatform.buildRustPackage {
   };
 
   meta = with lib; {
-    mainProgram = "papa";
     description = "Mod manager for Northstar clients and servers";
     homepage = "https://github.com/AnActualEmerald/papa";
-    changelog = "https://github.com/AnActualEmerald/papa/releases/tag/v${papa.version}";
+    changelog = "https://github.com/AnActualEmerald/papa/releases/tag/v${src.version}";
+    mainProgram = "papa";
     license = licenses.mit;
     maintainers = with maintainers; [getchoo];
     platforms = platforms.unix;