swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

ocaml: minor refactoring

Browse source
This commit is contained in:
Vincent Laporte 2020-11-18 08:10:35 +01:00 committed by Vincent Laporte
parent 342ec6fce6
commit e40f4acb27
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/compilers/ocaml/generic.nix
View file

@ -1,12 +1,8 @@
{ minor_version, major_version, patch_version
, url ? null
, sha256, ...}@args:
, ...}@args:
let
versionNoPatch = "${toString major_version}.${toString minor_version}";
version = "${versionNoPatch}.${toString patch_version}";
real_url = if url == null then
"http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz"
else url;
safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
in
@ -22,6 +18,13 @@ assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04";
let
src = args.src or (fetchurl {
url = args.url or "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz";
inherit (args) sha256;
});
in
let
useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optional optionals optionalString;
@ -39,10 +42,7 @@ stdenv.mkDerivation (args // {
inherit name;
inherit version;
src = fetchurl {
url = real_url;
inherit sha256;
};
inherit src;
prefixKey = "-prefix ";
configureFlags =