doctave: fix build (#351161)

pkgs/applications/misc/doctave/cargo-lock.patch

@@ -1,11 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -295,7 +295,7 @@ dependencies = [
- 
- [[package]]
- name = "doctave"
--version = "0.4.0"
-+version = "0.4.2"
- dependencies = [
-  "alphanumeric-sort",
-  "ascii",

pkgs/applications/misc/doctave/default.nix

@@ -1,31 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "doctave";
-  version = "0.4.2";
-
-  src = fetchFromGitHub {
-    owner = "doctave";
-    repo = pname;
-    rev = version;
-    sha256 = "1780pqvnlbxxhm7rynnysqr0vihdkwmc6rmgp43bmj1k18ar4qgj";
-  };
-
-  # Cargo.lock is outdated
-  cargoPatches = [ ./cargo-lock.patch ];
-
-  cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreServices
-  ];
-
-  meta = with lib; {
-    description = "Batteries-included developer documentation site generator";
-    homepage = "https://github.com/doctave/doctave";
-    changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
-    mainProgram = "doctave";
-  };
-}

pkgs/by-name/do/doctave/package.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "doctave";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "doctave";
+    repo = "doctave";
+    rev = version;
+    hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
+  };
+
+  postPatch = ''
+    ln -sf ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "doctave-markdown-0.9.0" = "sha256-DDeb91DgLx7vOYHwoDy6+/532q/3/myJUZDqjq7ejJ0=";
+    };
+  };
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.apple_sdk.frameworks.CoreServices
+  ];
+
+  meta = {
+    description = "Batteries-included developer documentation site generator";
+    homepage = "https://github.com/doctave/doctave";
+    changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
+    mainProgram = "doctave";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -6970,10 +6970,6 @@ with pkgs;
 
   dockbarx = callPackage ../applications/misc/dockbarx { };
 
-  doctave = callPackage ../applications/misc/doctave {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
-
   dog = callPackage ../tools/system/dog { };
 
   dogdns = callPackage ../tools/networking/dogdns {