Merge branch 'master' into staging-next

nixos/modules/installer/cd-dvd/iso-image.nix

@@ -832,7 +832,7 @@ in
         { source = config.isoImage.splashImage;
           target = "/isolinux/background.png";
         }
-        { source = isolinuxCfg;
+        { source = pkgs.writeText "isolinux.cfg" isolinuxCfg;
           target = "/isolinux/isolinux.cfg";
         }
         { source = "${pkgs.syslinux}/share/syslinux";

pkgs/by-name/bi/bitrise/package.nix

@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "bitrise";
-  version = "2.27.0";
+  version = "2.29.1";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = version;
-    hash = "sha256-qkKGkUY5d4EWTjz6IfWhjYOSpXISE4Z98P0laRKe5wo=";
+    hash = "sha256-pBaXOGFDmweyJaF+Wp4qAil8yAtUYO6UoKTLAPrq7F8=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access

pkgs/by-name/ec/ecapture/package.nix

@@ -22,13 +22,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-nqNFbZrmCleWcRM2HsbgmCHqsar3KmiGYxt55ZqhY+U=";
+    hash = "sha256-94aZBsQG7xVX3mnE3z3bmTM9NUIG0/huov2OVZJmOe4=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/lu/ludtwig/package.nix

@@ -6,19 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ludtwig";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "MalteJanz";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-J5UTVXUExVApA8VVTyhkO2JhpVCK45li9VBN+oM9TBI=";
+    hash = "sha256-3E1W6AlGQ9AhMzLvTV5KBjlKiWXyi7rFwHOdU3CIp60=";
   };
 
   checkType = "debug";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-oS4YepJWqmbjAhitHOCBUrLEyVo3UpZ8UNOESuG4C2M=";
+  cargoHash = "sha256-00JHtrDffFl3h3IOH+h491qGOSfXIJH9NBmaqqUtQ6k=";
 
   meta = with lib; {
     description = "Linter / Formatter for Twig template files which respects HTML and your time";

pkgs/by-name/se/ser2net/package.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ser2net";
-  version = "4.6.3";
+  version = "4.6.4";
 
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-rxFCACCfnPV5Lbd3k/zk9JbFAXJJTNGQzpOpD2M9zhg=";
+    hash = "sha256-acj9D23J5FvcCasBq5GrPgtsStJrzanTpbKINuy/sqI=";
   };
 
   passthru = {

pkgs/development/ocaml-modules/asai/default.nix

@@ -9,6 +9,9 @@
 buildDunePackage rec {
   pname = "asai";
   version = "0.3.1";
+
+  minimalOCamlVersion = "5.2";
+
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;

pkgs/development/ocaml-modules/janestreet/0.14.nix

@@ -163,6 +163,7 @@ with self;
     pname = "async_ssl";
     hash = "0ykys3ckpsx5crfgj26v2q3gy6wf684aq0bfb4q8p92ivwznvlzy";
     meta.description = "Async wrappers for SSL";
+    meta.broken = true;
     buildInputs = [ dune-configurator ];
     propagatedBuildInputs = [
       async
@@ -909,6 +910,7 @@ with self;
     ];
     patches = ./sexp.patch;
     meta.description = "S-expression swiss knife";
+    meta.broken = true; # Does not build with GCC 14
   };
 
   sexp_diff_kernel = janePackage {
@@ -976,6 +978,7 @@ with self;
     buildInputs = [ jst-config ];
     propagatedBuildInputs = [ textutils ];
     checkInputs = [ ounit ];
+    doCheck = false; # Does not build with GCC 14
   };
 
   shexp = janePackage {

pkgs/development/ocaml-modules/janestreet/0.15.nix

@@ -1216,6 +1216,7 @@ with self;
       sexp_select
     ];
     meta.description = "S-expression swiss knife";
+    meta.broken = true; # Does not build with GCC 14
   };
 
   sexp_diff = janePackage {