From c749d3a90dd12d35acf33727586ed456dfc9ef7c Mon Sep 17 00:00:00 2001 From: Elliot Xu Date: Tue, 28 Dec 2021 10:05:56 +0800 Subject: [PATCH 1/2] maintainers: add elliot --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 531ef4bdc2b7..aabf601e3c0c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3395,6 +3395,12 @@ githubId = 103082; name = "Ed Brindley"; }; + elliot = { + email = "hack00mind@gmail.com"; + github = "Eliot00"; + githubId = 18375468; + name = "Elliot Xu"; + }; elliottvillars = { email = "elliottvillars@gmail.com"; github = "elliottvillars"; From 4a578ce6595a744527cf0cae9a16223ce4022a54 Mon Sep 17 00:00:00 2001 From: Elliot Xu Date: Tue, 28 Dec 2021 17:06:04 +0800 Subject: [PATCH 2/2] quake: init at 0.3.0 Update pkgs/applications/misc/inherd-quake/default.nix Co-authored-by: Bobby Rong Update pkgs/applications/misc/inherd-quake/default.nix Co-authored-by: Bobby Rong Update pkgs/applications/misc/inherd-quake/default.nix Co-authored-by: Bobby Rong Update pkgs/applications/misc/inherd-quake/default.nix Co-authored-by: Bobby Rong --- .../misc/inherd-quake/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/inherd-quake/default.nix diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix new file mode 100644 index 000000000000..2a8d04daa0c3 --- /dev/null +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, stdenv +, CoreServices +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "quake"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "phodal"; + repo = pname; + rev = "v${version}"; + sha256 = "1f7k68g18g3dpnrsmhgmz753bly1i3f4lmsljiyp9ap0c6w8ahgg"; + }; + + cargoSha256 = "1yqj9rq770j116138bqn4ycggy13vvym1cz50myfddb9rjjzafrl"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + Security + ]; + + meta = with lib; { + description = "A knowledge management meta-framework for geeks"; + homepage = "https://github.com/phodal/quake"; + license = licenses.mit; + maintainers = [ maintainers.elliot ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04b976989d40..7282bc941e64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1915,6 +1915,10 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + inherd-quake = callPackage ../applications/misc/inherd-quake { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + xjadeo = callPackage ../tools/video/xjadeo { }; asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { };