From 5196cfabda9253c4f02948c4bbbff80911cf1af7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 31 Jan 2024 06:46:53 +0100 Subject: [PATCH 1/2] =?UTF-8?q?ocamlPackages.lablgtk3:=203.1.3=20=E2=86=92?= =?UTF-8?q?=203.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/lablgtk3/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index bd820e8042a7..a6aa522f7c84 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,19 +1,17 @@ -{ lib, fetchFromGitHub, pkg-config, buildDunePackage, dune-configurator +{ lib, fetchurl, pkg-config, buildDunePackage, dune-configurator , gtk3, cairo2 , camlp-streams }: buildDunePackage rec { - version = "3.1.3"; + version = "3.1.4"; pname = "lablgtk3"; minimalOCamlVersion = "4.05"; - src = fetchFromGitHub { - owner = "garrigue"; - repo = "lablgtk"; - rev = version; - sha256 = "sha256-1kXJP+tKudP3qfosTgZAQueNK46H9aLevEj6wxPKDWY="; + src = fetchurl { + url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz"; + hash = "sha256-bxEVMzfnaH5yHVxAmifNYOy8GnSivLLgSE/9+1yxBI4="; }; nativeBuildInputs = [ pkg-config ]; From 16e5d894040dd53752a86bb4431058c8de693600 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 31 Jan 2024 06:59:29 +0100 Subject: [PATCH 2/2] ocamlPackages.lablgtk3-rsvg2: init at 3.1.4 --- .../ocaml-modules/lablgtk3/rsvg2.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix diff --git a/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix b/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix new file mode 100644 index 000000000000..463f50f18e62 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix @@ -0,0 +1,20 @@ +{ buildDunePackage +, dune-configurator +, lablgtk3 +, librsvg +, pkg-config +}: + +buildDunePackage rec { + pname = "lablgtk3-rsvg2"; + + inherit (lablgtk3) version src; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ lablgtk3 librsvg ]; + + meta = lablgtk3.meta // { + description = "OCaml interface to Gnome rsvg2 library"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ea09cd090fb2..8f5004d66c96 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -910,6 +910,8 @@ let lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; + lablgtk3-rsvg2 = callPackage ../development/ocaml-modules/lablgtk3/rsvg2.nix { }; + lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; labltk = callPackage ../development/ocaml-modules/labltk {