From 3925fa19434f2d3677e579d334b829be8aeaa630 Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Mon, 11 Mar 2024 12:47:51 +0200 Subject: [PATCH 1/2] maintainer: add getreu --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f174f302c323..28752cb19511 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7048,6 +7048,12 @@ github = "getpsyched"; githubId = 43472218; }; + getreu = { + email = "getreu@web.de"; + github = "getreu"; + githubId = 579082; + name = "Jens Getreu"; + }; gfrascadorio = { email = "gfrascadorio@tutanota.com"; github = "gfrascadorio"; From 9b5f5844404fd895ffb4e5a0d5410757c005d159 Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Mon, 11 Mar 2024 12:48:13 +0200 Subject: [PATCH 2/2] tpnote: init at 1.23.9 --- pkgs/by-name/tp/tpnote/package.nix | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/tp/tpnote/package.nix diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix new file mode 100644 index 000000000000..5b4bc6642f33 --- /dev/null +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, rustPlatform +, cmake +, pkg-config +, oniguruma +, darwin +, installShellFiles +, tpnote +, testers +}: + + +rustPlatform.buildRustPackage rec { + pname = "tpnote"; + version = "1.23.9"; + + src = fetchFromGitHub { + owner = "getreu"; + repo = "tp-note"; + rev = "v${version}"; + hash = "sha256-HOCd5N8oS8N+9alR3cG7IEghvhvcc8A+O24L6FD1F38="; + }; + + cargoHash = "sha256-T1AYiwGPolYUhJQzTyR7v5dqqNFUCSfSBzU3CithZPw="; + + nativeBuildInputs = [ + cmake + pkg-config + installShellFiles + ]; + buildInputs = [ + oniguruma + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit + CoreServices + SystemConfiguration + ]); + + RUSTONIG_SYSTEM_LIBONIG = true; + + passthru.tests.version = testers.testVersion { package = tpnote; }; + + # The `tpnote` crate has no unit tests. All tests are in `tpnote-lib`. + checkType = "debug"; + cargoTestFlags = "--package tpnote-lib"; + doCheck = true; + + meta = { + changelog = "https://github.com/getreu/tp-note/releases/tag/v${version}"; + description = "Markup enhanced granular note-taking"; + homepage = "https://blog.getreu.net/projects/tp-note/"; + license = lib.licenses.mit; + mainProgram = "tpnote"; + maintainers = with lib.maintainers; [ getreu ]; + }; +}