diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-03-08 16:58:51 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-03-13 22:31:01 +0100 |
commit | 4adfbe6c7be299b8be09ae04b2b18c33c1b2261b (patch) | |
tree | d007c9800ee3f98800e8d052dd80d70be7948925 /pkgs | |
parent | e73a9e6b9526fe3ba2f1fae755fbe120e1c5240f (diff) | |
download | nixpkgs-4adfbe6c7be299b8be09ae04b2b18c33c1b2261b.tar nixpkgs-4adfbe6c7be299b8be09ae04b2b18c33c1b2261b.tar.gz nixpkgs-4adfbe6c7be299b8be09ae04b2b18c33c1b2261b.tar.bz2 nixpkgs-4adfbe6c7be299b8be09ae04b2b18c33c1b2261b.tar.lz nixpkgs-4adfbe6c7be299b8be09ae04b2b18c33c1b2261b.tar.xz nixpkgs-4adfbe6c7be299b8be09ae04b2b18c33c1b2261b.tar.zst nixpkgs-4adfbe6c7be299b8be09ae04b2b18c33c1b2261b.zip |
unison: move out of ocamlPackages
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/sync/unison/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index cada3f93f55..c29bd3a486c 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57830fcea6f..db737c3e2a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22045,7 +22045,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 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 002e3bebbb2..0a3cbc6f1c3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1198,10 +1198,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; |