nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 11:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

unison: move out of ocamlPackages

Browse Source 
(cherry picked from commit 4adfbe6c7b)
This commit is contained in:
Vincent Laporte
2020-03-08 16:58:51 +01:00
parent 70d505b900
commit 748e8893e3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/sync/unison/default.nix
View File

@@ -1,6 +1,8 @@
{stdenv, fetchFromGitHub, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses
, enableX11 ? true}:
let inherit (ocamlPackages) ocaml lablgtk; in
stdenv.mkDerivation (rec {
pname = "unison";

5
pkgs/top-level/all-packages.nix
View File

@@ -21818,7 +21818,10 @@ in
unigine-valley = callPackage ../applications/graphics/unigine-valley { };
inherit (ocaml-ng.ocamlPackages_4_05) unison;
unison = callPackage ../applications/networking/sync/unison {
enableX11 = config.unison.enableX11 or true;
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
};
unpaper = callPackage ../tools/graphics/unpaper { };

4
pkgs/top-level/ocaml-packages.nix
View File

@@ -1194,10 +1194,6 @@ let
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
unison = callPackage ../applications/networking/sync/unison {
enableX11 = config.unison.enableX11 or true;
};
hol_light = callPackage ../applications/science/logic/hol_light { };
})).overrideScope' liftJaneStreet;