amp: fix build due to rust 1.80 update; refactor

pkgs/by-name/am/amp/package.nix

@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  openssl,
+  pkg-config,
+  python3,
+  xorg,
+  cmake,
+  libgit2,
+  darwin,
+  curl,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "amp";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "jmacdonald";
+    repo = "amp";
+    rev = version;
+    hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M=";
+  };
+
+  cargoPatches = [ ./update_time_crate.patch ];
+
+  cargoHash = "sha256-EYD1gQgkHemT/3VewdsU5kOGQKY3OjIHRiTSqSRNwtU=";
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3
+  ];
+  buildInputs =
+    [
+      openssl
+      xorg.libxcb
+      libgit2
+    ]
+    ++ lib.optionals stdenv.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        curl
+        Security
+        AppKit
+      ]
+    );
+
+  # Tests need to write to the theme directory in HOME.
+  preCheck = "export HOME=`mktemp -d`";
+
+  meta = {
+    description = "Modern text editor inspired by Vim";
+    homepage = "https://amp.rs";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      sb0
+      aleksana
+    ];
+    mainProgram = "amp";
+  };
+}

pkgs/by-name/am/amp/update_time_crate.patch

@@ -0,0 +1,56 @@
+From 4ce866de7a2e1613951002ff61563a80e19a5c0c Mon Sep 17 00:00:00 2001
+From: Drewry Pope <[email protected]>
+Date: Wed, 28 Aug 2024 18:45:41 -0500
+Subject: [PATCH] update time
+
+---
+ Cargo.lock | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 0e1b8ff6..bd8b5814 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -864,6 +864,12 @@ dependencies = [
+  "minimal-lexical",
+ ]
+
++[[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
+ [[package]]
+ name = "num-traits"
+ version = "0.2.16"
+@@ -1372,12 +1378,13 @@ dependencies = [
+
+ [[package]]
+ name = "time"
+-version = "0.3.31"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
++ "num-conv",
+  "powerfmt",
+  "serde",
+  "time-core",
+@@ -1392,10 +1399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+ [[package]]
+ name = "time-macros"
+-version = "0.2.16"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+  "time-core",
+ ]
+

pkgs/top-level/all-packages.nix

@@ -3048,8 +3048,6 @@ with pkgs;
     ammonite_2_13;
   ammonite = ammonite_2_13;
 
-  amp = callPackage ../applications/editors/amp { };
-
   ams = callPackage ../applications/audio/ams { };
 
   amtterm = callPackage ../tools/system/amtterm { };