From c69533db40d4530be47c595b9098189a87730b38 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 20 Jun 2023 23:22:19 +0800 Subject: [PATCH] =?UTF-8?q?cambalache:=200.10.3=20=E2=86=92=200.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/jpu/cambalache/-/compare/0.10.3...0.12.1 --- pkgs/development/tools/cambalache/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index 43a5778ff95a..d8a851cb5913 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -12,24 +12,27 @@ , glib , gtk3 , gtk4 +, gtksourceview4 , libadwaita , libhandy -, webkitgtk +, webkitgtk_4_1 +, webkitgtk_6_0 , nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.10.3"; + version = "0.12.1"; format = "other"; + # Did not fetch submodule since it is only for tests we don't run. src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jpu"; repo = pname; rev = version; - sha256 = "sha256-Xm8h3BBRibdLCeI/OeprF5dCCiNrfJCg7aE24uleCds="; + sha256 = "sha256-kGCpccWIhaeWrzLlrDI7Vzd0KuAIKxvLrDuSqWtpSLU="; }; nativeBuildInputs = [ @@ -51,7 +54,9 @@ python3.pkgs.buildPythonApplication rec { glib gtk3 gtk4 - webkitgtk + gtksourceview4 + webkitgtk_4_1 + webkitgtk_6_0 # For extra widgets support. libadwaita libhandy @@ -63,7 +68,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' patchShebangs postinstall.py # those programs are used at runtime not build time - # https://gitlab.gnome.org/jpu/cambalache/-/blob/main/meson.build#L79-80 + # https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80 substituteInPlace ./meson.build \ --replace "find_program('broadwayd', required: true)" "" \ --replace "find_program('gtk4-broadwayd', required: true)" ""