diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index 779144322f25..d26ce03f12da 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -24,17 +24,18 @@ sigtool, nixosTests, installShellFiles, + reflection-cpp, }: -stdenv.mkDerivation (final: { +stdenv.mkDerivation (finalAttrs: { pname = "contour"; - version = "0.5.1.7247"; + version = "0.6.1.7494"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "contour"; - rev = "v${final.version}"; - hash = "sha256-/vpbyaULemyM3elwaoofvbeeID7jNrmu8X8HlZxWGCk"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jgasZhdcJ+UF3VIl8HLcxBayvbA/dkaOG8UtANRgeP4="; }; patches = [ ./dont-fix-app-bundle.diff ]; @@ -69,6 +70,7 @@ stdenv.mkDerivation (final: { microsoft-gsl range-v3 yaml-cpp + reflection-cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -100,13 +102,13 @@ stdenv.mkDerivation (final: { passthru.tests.test = nixosTests.terminal-emulators.contour; - meta = with lib; { + meta = { description = "Modern C++ Terminal Emulator"; homepage = "https://github.com/contour-terminal/contour"; - changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; - license = licenses.asl20; - maintainers = with maintainers; [ moni ]; - platforms = platforms.unix; + changelog = "https://github.com/contour-terminal/contour/raw/v${finalAttrs.version}/Changelog.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ moni ]; + platforms = lib.platforms.unix; mainProgram = "contour"; }; }) diff --git a/pkgs/by-name/re/reflection-cpp/package.nix b/pkgs/by-name/re/reflection-cpp/package.nix new file mode 100644 index 000000000000..6c0ed16764d9 --- /dev/null +++ b/pkgs/by-name/re/reflection-cpp/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "reflection-cpp"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "reflection-cpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-q0h8p6xJ1UectRe656B6mT5+QokxR9N8rqzvgwUBugg="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "C++ static reflection support library"; + homepage = "https://github.com/contour-terminal/reflection-cpp"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ emaryn ]; + }; +})