From bb28ce2edac595f6c12b4610b31831f4a67fd8ea Mon Sep 17 00:00:00 2001 From: Julien Urraca Date: Mon, 24 Apr 2023 09:12:32 -0500 Subject: [PATCH 1/2] maintainers: add jurraca add githubId to maintainers entry --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 201ba0545980..5db3c085f654 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7809,6 +7809,12 @@ githubId = 2469618; name = "Junji Hashimoto"; }; + jurraca = { + email = "julienu@pm.me"; + github = "jurraca"; + githubId = 5124422; + name = "Julien Urraca"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; From ab7fe9cbd5d8c82694aff14f7449bda4ba6ba5b9 Mon Sep 17 00:00:00 2001 From: Julien Urraca Date: Thu, 20 Apr 2023 18:18:03 -0500 Subject: [PATCH 2/2] nostr-rs-relay: init at 0.8.9 Add to all-packages.nix and add SystemConfiguration add to all-packages, remove unused clauses remove redundant entry in all-packages add meta section, format fix meta use CargoSha instead of explicit cargo.lock path bump to 0.8.9; add changelog, format move from misc to servers folder add line before builder expr remove comma --- pkgs/servers/nostr-rs-relay/default.nix | 43 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/servers/nostr-rs-relay/default.nix diff --git a/pkgs/servers/nostr-rs-relay/default.nix b/pkgs/servers/nostr-rs-relay/default.nix new file mode 100644 index 000000000000..e879b81e5eac --- /dev/null +++ b/pkgs/servers/nostr-rs-relay/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, libiconv +, darwin +, protobuf +}: + +rustPlatform.buildRustPackage rec { + pname = "nostr-rs-relay"; + version = "0.8.9"; + src = fetchFromGitHub { + owner = "scsibug"; + repo = "nostr-rs-relay"; + rev = version; + hash = "sha256-x5y/d76Qel8FMIlUn8NdwihWebJsNIt2it2vs/Xlk0Q="; + }; + + cargoHash = "sha256-1wgBABgcogHCk183AaTwbbSGk8d8FvlZYvw1//5y93I="; + + buildInputs = [ openssl.dev ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + nativeBuildInputs = [ + pkg-config # for openssl + protobuf + ]; + + meta = with lib; { + description = "Nostr relay written in Rust"; + homepage = "https://sr.ht/~gheartsfield/nostr-rs-relay/"; + changelog = "https://github.com/scsibug/nostr-rs-relay/releases/tag/${version}"; + maintainers = with maintainers; [ jurraca ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f07a1c9cd250..31de2a7a75ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5440,6 +5440,8 @@ with pkgs; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; + nostr-rs-relay = callPackage ../servers/nostr-rs-relay { }; + notemap = callPackage ../tools/networking/notemap { }; noteshrink = callPackage ../tools/misc/noteshrink { };