diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-10-27 16:32:42 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-11-06 09:45:13 +0100 |
| commit | 163a3544a85894795befeca22531456635966dd0 (patch) | |
| tree | 569a36e4c8629a4c223af94f6d9858a9a5ece6a2 | |
| parent | 589445ea6f777b7b6c72259c44234a5d2c8bb8ec (diff) | |
| download | nixpkgs-163a3544a85894795befeca22531456635966dd0.tar nixpkgs-163a3544a85894795befeca22531456635966dd0.tar.gz nixpkgs-163a3544a85894795befeca22531456635966dd0.tar.bz2 nixpkgs-163a3544a85894795befeca22531456635966dd0.tar.lz nixpkgs-163a3544a85894795befeca22531456635966dd0.tar.xz nixpkgs-163a3544a85894795befeca22531456635966dd0.tar.zst nixpkgs-163a3544a85894795befeca22531456635966dd0.zip | |
ocamlPackages.lablgtk3: 3.1.2 → 3.1.3
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk3/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 81fb51d1f1e..bd820e8042a 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,27 +1,23 @@ -{ lib, fetchFromGitHub, fetchpatch, pkg-config, buildDunePackage, dune-configurator, gtk3, cairo2 }: +{ lib, fetchFromGitHub, pkg-config, buildDunePackage, dune-configurator +, gtk3, cairo2 +, camlp-streams +}: buildDunePackage rec { - version = "3.1.2"; + version = "3.1.3"; pname = "lablgtk3"; - useDune2 = true; - minimalOCamlVersion = "4.05"; src = fetchFromGitHub { owner = "garrigue"; repo = "lablgtk"; rev = version; - sha256 = "sha256:0b17w9qb1f02h3313cm62mrqlhwxficppzm72n7sf8mmwrylxbm7"; + sha256 = "sha256-1kXJP+tKudP3qfosTgZAQueNK46H9aLevEj6wxPKDWY="; }; - patches = [ (fetchpatch { - name = "dune-project.patch"; - url = "https://raw.githubusercontent.com/ocaml/opam-repository/10a48cb9fab88f67f6cb70280e0fec035c32d41c/packages/lablgtk3/lablgtk3.3.1.2/files/dune-project.patch"; - sha256 = "03jf5hclqdq7iq84djaqcnfnnnd7z3hb48rr8n1gyxzjyx86b3fh"; - }) ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator camlp-streams ]; propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix index b037f7d989f..be57c7e7146 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -4,5 +4,5 @@ buildDunePackage { pname = "lablgtk3-gtkspell3"; buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version useDune2 meta nativeBuildInputs; + inherit (lablgtk3) src version meta nativeBuildInputs; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index a0560029880..0e8ba3ef3ff 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -4,5 +4,5 @@ buildDunePackage { pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version useDune2 meta nativeBuildInputs; + inherit (lablgtk3) src version meta nativeBuildInputs; } |