From b62ecb140da824fdb2425358ec1ab0b0b80f8e6c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 10 Apr 2024 19:16:57 -0400
Subject: pkgsFrom -> packagesFromDirectoryRecursive

i had no idea this was a thing. thanks aemogie
---
 pkgs/papa/default.nix | 68 ---------------------------------------------------
 pkgs/papa/package.nix | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/papa/default.nix
 create mode 100644 pkgs/papa/package.nix

(limited to 'pkgs/papa')

diff --git a/pkgs/papa/default.nix b/pkgs/papa/default.nix
deleted file mode 100644
index 4659f94..0000000
--- a/pkgs/papa/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  installShellFiles,
-  nix-update-script,
-  testers,
-  papa,
-  openssl,
-  pkg-config,
-}:
-rustPlatform.buildRustPackage {
-  pname = "papa";
-  version = "4.1.0-rc.3";
-
-  src = fetchFromGitHub {
-    owner = "AnActualEmerald";
-    repo = "papa";
-    rev = "v${papa.version}";
-    hash = "sha256-opuBCuc3YCAdwwg6XbTX0HRrV3FsVdJStEACMvtTM1w=";
-  };
-
-  postUnpack = ''
-    rmdir source/thermite
-    ln -sf ${papa.libthermite} source/thermite
-  '';
-
-  postPatch = ''
-    ln -sf ${./Cargo.lock} Cargo.lock
-  '';
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
-
-  nativeBuildInputs = [pkg-config installShellFiles];
-  buildInputs = [openssl];
-
-  postInstall = ''
-    installShellCompletion --cmd papa \
-      --bash <($out/bin/papa complete bash) \
-      --fish <($out/bin/papa complete fish) \
-      --zsh <($out/bin/papa complete zsh)
-  '';
-
-  passthru = {
-    tests.version = testers.testVersion {package = papa;};
-
-    updateScript = nix-update-script {};
-
-    libthermite = fetchFromGitHub {
-      owner = "AnActualEmerald";
-      repo = "thermite";
-      rev = "8e6fc6af20e9bd2af4313fee65dfed05cfa1bbd5";
-      hash = "sha256-7zkXW2G7cwyobYJO22o1QoJRs2O6sD7/S9frZ/+DNIQ=";
-    };
-  };
-
-  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}";
-    license = licenses.mit;
-    maintainers = with maintainers; [getchoo];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/papa/package.nix b/pkgs/papa/package.nix
new file mode 100644
index 0000000..4659f94
--- /dev/null
+++ b/pkgs/papa/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  nix-update-script,
+  testers,
+  papa,
+  openssl,
+  pkg-config,
+}:
+rustPlatform.buildRustPackage {
+  pname = "papa";
+  version = "4.1.0-rc.3";
+
+  src = fetchFromGitHub {
+    owner = "AnActualEmerald";
+    repo = "papa";
+    rev = "v${papa.version}";
+    hash = "sha256-opuBCuc3YCAdwwg6XbTX0HRrV3FsVdJStEACMvtTM1w=";
+  };
+
+  postUnpack = ''
+    rmdir source/thermite
+    ln -sf ${papa.libthermite} source/thermite
+  '';
+
+  postPatch = ''
+    ln -sf ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+  };
+
+  nativeBuildInputs = [pkg-config installShellFiles];
+  buildInputs = [openssl];
+
+  postInstall = ''
+    installShellCompletion --cmd papa \
+      --bash <($out/bin/papa complete bash) \
+      --fish <($out/bin/papa complete fish) \
+      --zsh <($out/bin/papa complete zsh)
+  '';
+
+  passthru = {
+    tests.version = testers.testVersion {package = papa;};
+
+    updateScript = nix-update-script {};
+
+    libthermite = fetchFromGitHub {
+      owner = "AnActualEmerald";
+      repo = "thermite";
+      rev = "8e6fc6af20e9bd2af4313fee65dfed05cfa1bbd5";
+      hash = "sha256-7zkXW2G7cwyobYJO22o1QoJRs2O6sD7/S9frZ/+DNIQ=";
+    };
+  };
+
+  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}";
+    license = licenses.mit;
+    maintainers = with maintainers; [getchoo];
+    platforms = platforms.unix;
+  };
+}
-- 
cgit v1.2.3