From 51ba5aa59048071a830d72429d2b50ca294efd34 Mon Sep 17 00:00:00 2001 From: Kho-Dialga Date: Sat, 1 May 2021 22:49:34 -0600 Subject: [PATCH 1/2] proton-caller 2.2.3 fixed Changed license to gpl3Only and removed stdenv Removed doCheck = true in proton-caller Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> version fixed fixed maintainers on proton-caller --- pkgs/misc/emulators/proton-caller/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/misc/emulators/proton-caller/default.nix diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/misc/emulators/proton-caller/default.nix new file mode 100644 index 000000000000..f1770ba89060 --- /dev/null +++ b/pkgs/misc/emulators/proton-caller/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "proton-caller"; + version = "2.2.3"; + + src = fetchFromGitHub { + owner = "caverym"; + repo = pname; + rev = "version"; + sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z"; + }; + + cargoSha256 = "1vp2vvgy8z350a59k1c3s5ww6w2wikiha4s7jkkz9khl0spn19a8"; + + nativeBuildInputs = [ installShellFiles ]; + + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage manual/proton-call.6 + ''; + + meta = with lib; { + description = "Run Windows programs with Proton"; + changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}"; + homepage = "https://github.com/caverym/proton-caller"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kho-dialga ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b485168c6ecd..30bc72ac217b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -275,6 +275,8 @@ in protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; + proton-caller = callPackage ../misc/emulators/proton-caller { }; + ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; From f6266050735e2939f350ae51675f9a89776b58ec Mon Sep 17 00:00:00 2001 From: Kho-Dialga Date: Tue, 18 May 2021 09:13:40 -0600 Subject: [PATCH 2/2] maintainers: add kho-dialga --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60c6f093f3b2..2da61c45cdfe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5164,6 +5164,12 @@ githubId = 546087; name = "Kristoffer K. Føllesdal"; }; + kho-dialga = { + email = "ivandashenyou@gmail.com"; + github = "kho-dialga"; + githubId = 55767703; + name = "Iván Brito"; + }; khumba = { email = "bog@khumba.net"; github = "khumba";