public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
View File

@@ -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;
};
})

2
pkgs/development/ocaml-modules/lablgtk/default.nix
View File

@@ -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;
};
}

2
pkgs/development/ocaml-modules/lablgtk3/default.nix
View File

@@ -16,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cairo2 ];
meta = {
description = "OCaml interface to gtk+-3";
description = "OCaml interface to GTK 3";
homepage = "http://lablgtk.forge.ocamlcore.org/";
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ];