Merge pull request #219836 from wegank/leo2-darwin (acdc303e) · Commits · nix / nixpkgs

pkgs/applications/science/logic/leo2/default.nix

+3 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {

		buildFlags = [ "opt" ];

		env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-reserved-user-defined-literal";

		preInstall = "mkdir -p $out/bin";

		postInstall = ''
		@@ -44,7 +46,7 @@ stdenv.mkDerivation rec {
		meta = with lib; {
		description = "A high-performance typed higher order prover";
		maintainers = [ maintainers.raskin ];
		platforms = platforms.linux;
		platforms = platforms.unix;
		license = licenses.bsd3;
		homepage = "http://www.leoprover.org/";
		};

pkgs/tools/games/weidu/default.nix

+1 −3

Original line number	Diff line number	Diff line
		@@ -12,9 +12,7 @@ let
		# 1. Needs ocaml >= 4.04 and <= 4.11 (patched against 4.14)
		# 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with
		# that disabled as weidu is strongly dependent on mutable strings
		ocaml' = ocaml-ng.ocamlPackages_4_14.ocaml.override {
		unsafeStringSupport = true;
		};
		ocaml' = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;

		in
		stdenv.mkDerivation rec {

pkgs/top-level/all-packages.nix

+7 −13

Original line number	Diff line number	Diff line
		@@ -13700,7 +13700,7 @@ with pkgs;
		wvkbd = callPackage ../applications/accessibility/wvkbd { };

		wyrd = callPackage ../tools/misc/wyrd {
		ocamlPackages = ocaml-ng.ocamlPackages_4_05;
		ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
		};

		x86info = callPackage ../os-specific/linux/x86info { };
		@@ -20193,9 +20193,7 @@ with pkgs;
		glpk = callPackage ../development/libraries/glpk { };

		glsurf = callPackage ../applications/science/math/glsurf {
		ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override {
		unsafeStringSupport = true;
		});
		ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
		};

		glui = callPackage ../development/libraries/glui {};
		@@ -31564,9 +31562,7 @@ with pkgs;
		mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };

		mldonkey = callPackage ../applications/networking/p2p/mldonkey {
		ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override {
		unsafeStringSupport = true;
		});
		ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
		};

		mlvwm = callPackage ../applications/window-managers/mlvwm { };
		@@ -31626,7 +31622,7 @@ with pkgs;
		};

		monotoneViz = callPackage ../applications/version-management/monotone-viz {
		ocamlPackages = ocaml-ng.ocamlPackages_4_05;
		ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
		};

		monitor = callPackage ../applications/system/monitor {
		@@ -37104,9 +37100,7 @@ with pkgs;
		drat-trim = callPackage ../applications/science/logic/drat-trim {};

		ekrhyper = callPackage ../applications/science/logic/ekrhyper {
		ocaml = ocaml-ng.ocamlPackages_4_14.ocaml.override {
		unsafeStringSupport = true;
		};
		ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
		};

		eprover = callPackage ../applications/science/logic/eprover { };
		@@ -37174,7 +37168,7 @@ with pkgs;
		mathlibtools = with python3Packages; toPythonApplication mathlibtools;

		leo2 = callPackage ../applications/science/logic/leo2
		{ inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; };
		{ inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4; };

		leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};

		@@ -37221,7 +37215,7 @@ with pkgs;
		};

		statverif = callPackage ../applications/science/logic/statverif {
		inherit (ocaml-ng.ocamlPackages_4_05) ocaml;
		ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
		};

		tptp = callPackage ../applications/science/logic/tptp {};

pkgs/top-level/ocaml-packages.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -1692,4 +1692,10 @@ in let inherit (pkgs) callPackage; in rec
		ocamlPackages_latest = ocamlPackages_5_0;

		ocamlPackages = ocamlPackages_4_14;

		# We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0.
		# Below are aliases for porting them to the latest versions of the OCaml 4 series.
		ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix {
		unsafeStringSupport = true;
		});
		}

Admin message