cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

treewide: use ocaml-ng.ocamlPackages_4_14_unsafe_string

Browse source
This commit is contained in:
Weijia Wang 2023-03-07 00:03:36 +02:00
parent 6b52f88815
commit da3dacd0e6
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/games/weidu/default.nix
View file

@ -12,9 +12,7 @@ let
# 1. Needs ocaml >= 4.04 and <= 4.11 (patched against 4.14) # 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 # 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 # that disabled as weidu is strongly dependent on mutable strings
ocaml' = ocaml-ng.ocamlPackages_4_14.ocaml.override { ocaml' = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
unsafeStringSupport = true;
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

12
pkgs/top-level/all-packages.nix
View file

@ -20193,9 +20193,7 @@ with pkgs;
glpk = callPackage ../development/libraries/glpk { }; glpk = callPackage ../development/libraries/glpk { };
glsurf = callPackage ../applications/science/math/glsurf { glsurf = callPackage ../applications/science/math/glsurf {
ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
unsafeStringSupport = true;
});
}; };
glui = callPackage ../development/libraries/glui {}; glui = callPackage ../development/libraries/glui {};
@ -31564,9 +31562,7 @@ with pkgs;
mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey { mldonkey = callPackage ../applications/networking/p2p/mldonkey {
ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
unsafeStringSupport = true;
});
}; };
mlvwm = callPackage ../applications/window-managers/mlvwm { }; mlvwm = callPackage ../applications/window-managers/mlvwm { };
@ -37104,9 +37100,7 @@ with pkgs;
drat-trim = callPackage ../applications/science/logic/drat-trim {}; drat-trim = callPackage ../applications/science/logic/drat-trim {};
ekrhyper = callPackage ../applications/science/logic/ekrhyper { ekrhyper = callPackage ../applications/science/logic/ekrhyper {
ocaml = ocaml-ng.ocamlPackages_4_14.ocaml.override { ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
unsafeStringSupport = true;
};
}; };
eprover = callPackage ../applications/science/logic/eprover { }; eprover = callPackage ../applications/science/logic/eprover { };