diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
| commit | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (patch) | |
| tree | 3fdd8ed1c086fb0ddf93941114bb1cbbb4659af9 /pkgs/development/ocaml-modules/lablgtk | |
| parent | e7cccdbb139ccf2f9f170500f40c04a6237a2da1 (diff) | |
| parent | ed54a5b51dc9542df94f70b25a13d86d1f494e64 (diff) | |
| download | nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.gz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.bz2 nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.lz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.xz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.zst nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.zip | |
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
Diffstat (limited to 'pkgs/development/ocaml-modules/lablgtk')
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 55a4a02f7ff..581319a0edf 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (rec { stdenv.lib.maintainers.roconnor ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; - description = "LablGTK is is an Objective Caml interface to gtk+"; + description = "LablGTK is is an Objective Caml interface to GTK"; license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 3c799d3d1c0..1b1869f991e 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { z77z roconnor vbgl ]; homepage = http://lablgtk.forge.ocamlcore.org/; - description = "An OCaml interface to gtk+"; + description = "An OCaml interface to GTK"; license = licenses.lgpl21Plus; }; } |