From d474f8888421150b506d813851f557f579d8346b Mon Sep 17 00:00:00 2001 From: Benedikt Broich Date: Tue, 13 Dec 2022 19:21:25 +0100 Subject: [PATCH 1/2] maintainers: add benediktbroich --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 21e53a2ecc94..37b49abc075a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1677,6 +1677,15 @@ githubId = 214787; name = "Herwig Hochleitner"; }; + benediktbroich = { + name = "Benedikt Broich"; + email = "b.broich@posteo.de"; + github = "BenediktBroich"; + githubId = 32903896; + keys = [{ + fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; + }]; + }; benesim = { name = "Benjamin Isbarn"; email = "benjamin.isbarn@gmail.com"; From 9cea14567fc63dc38c2cf9e3318e85b3adaee1e1 Mon Sep 17 00:00:00 2001 From: Benedikt Broich Date: Tue, 13 Dec 2022 19:37:27 +0100 Subject: [PATCH 2/2] citations: init at 0.5.1 --- pkgs/applications/misc/citations/default.nix | 74 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/applications/misc/citations/default.nix diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/applications/misc/citations/default.nix new file mode 100644 index 000000000000..928978ef47f4 --- /dev/null +++ b/pkgs/applications/misc/citations/default.nix @@ -0,0 +1,74 @@ +{ darwin +, desktop-file-utils +, fetchFromGitLab +, gettext +, glib +, gtk4 +, gtksourceview5 +, lib +, libadwaita +, meson +, ninja +, pkg-config +, poppler +, rustPlatform +, stdenv +, testers +, wrapGAppsHook4 +}: +stdenv.mkDerivation (finalAttrs: { + pname = "citations"; + version = "0.5.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-QPK6Nw0tDdttUDFKMgThTYMTxGXsn5OReqf1LNAai7g="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + src = finalAttrs.src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-Kounxi4JxoU4+rWMWNB8rzTyG3MDKYD0OzYfAHwm6bY="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + glib + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + gtksourceview5 + libadwaita + poppler + ] ++ lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + doCheck = true; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "citations --help"; + }; + + meta = with lib; { + description = "Manage your bibliographies using the BibTeX format"; + homepage = "https://apps.gnome.org/app/org.gnome.World.Citations"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ benediktbroich ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 439d7e9e9c7a..c944c4422b53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1943,6 +1943,8 @@ with pkgs; cen64 = callPackage ../applications/emulators/cen64 { }; + citations = callPackage ../applications/misc/citations { }; + citra-canary = callPackage ../applications/emulators/citra { branch = "canary"; };