gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages: fixes after GCC update to version 14

Browse Source
This commit is contained in:
Vincent Laporte
2025-01-11 11:17:14 +01:00
parent ba4ea7e965
commit d036ecdd71
5 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/lablgtk3/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ buildDunePackage rec {
version = "3.1.5";
pname = "lablgtk3";
minimalOCamlVersion = "4.05";
minimalOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz";
pkgs/development/ocaml-modules/labltk/default.nix
+8 -2
View File
@@ -1,5 +1,6 @@
{
stdenv,
gcc13Stdenv,
lib,
makeWrapper,
fetchzip,
@@ -11,6 +12,7 @@
}:
let
defaultStdenv = stdenv;
params =
let
mkNewParam =
@@ -18,9 +20,10 @@ let
version,
sha256,
rev ? version,
stdenv ? defaultStdenv,
}:
{
inherit version;
inherit stdenv version;
src = fetchzip {
url = "https://github.com/garrigue/labltk/archive/${rev}.tar.gz";
inherit sha256;
@@ -32,15 +35,18 @@ let
version = "8.06.4";
rev = "labltk-8.06.4";
sha256 = "03xwnnnahb2rf4siymzqyqy8zgrx3h26qxjgbp5dh1wdl7n02c7g";
stdenv = gcc13Stdenv;
};
"4.07" = mkNewParam {
version = "8.06.5";
rev = "1b71e2c6f3ae6847d3d5e79bf099deb7330fb419";
sha256 = "02vchmrm3izrk7daldd22harhgrjhmbw6i1pqw6hmfmrmrypypg2";
stdenv = gcc13Stdenv;
};
_8_06_7 = mkNewParam {
version = "8.06.7";
sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h";
stdenv = gcc13Stdenv;
};
"4.08" = _8_06_7;
"4.09" = _8_06_7;
@@ -78,7 +84,7 @@ let
or (throw "labltk is not available for OCaml ${ocaml.version}");
in
stdenv.mkDerivation rec {
param.stdenv.mkDerivation rec {
inherit (param) version src;
pname = "ocaml${ocaml.version}-labltk";
pkgs/development/ocaml-modules/linenoise/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ buildDunePackage rec {
pname = "linenoise";
version = "1.5.1";
minimalOCamlVersion = "4.03";
minimalOCamlVersion = "4.06";
src = fetchFromGitHub {
owner = "fxfactorial";
pkgs/development/ocaml-modules/stdcompat/default.nix
+2
View File
@@ -13,6 +13,8 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
pname = "stdcompat";
version = "19";
minimalOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz";
sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";
pkgs/top-level/ocaml-packages.nix
+27 -9
View File
@@ -452,7 +452,9 @@ let
either = callPackage ../development/ocaml-modules/either { };
elina = callPackage ../development/ocaml-modules/elina { };
elina = callPackage ../development/ocaml-modules/elina {
stdenv = pkgs.gcc13Stdenv;
};
eliom = callPackage ../development/ocaml-modules/eliom { };
@@ -2063,21 +2065,37 @@ in let inherit (pkgs) callPackage; in rec
{
inherit mkOcamlPackages;
ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { });
ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { });
ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { });
ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { });
ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { });
ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { });
ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { });
ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { });
ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { });