From 6fe329180f2e7fd38b061308b63dcf7bd5a852c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Feb 2025 21:20:26 +0000 Subject: [PATCH 1/9] bitrise: 2.27.0 -> 2.29.1 --- pkgs/by-name/bi/bitrise/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index b389c5b06430..93dbf6826633 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/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 From 4a84f6a2ca65291e5dd38c0f9b4dde2df2142999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Feb 2025 23:13:57 +0000 Subject: [PATCH 2/9] ser2net: 4.6.3 -> 4.6.4 --- pkgs/by-name/se/ser2net/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/ser2net/package.nix b/pkgs/by-name/se/ser2net/package.nix index cb821998d2e3..0914c9cf27e4 100644 --- a/pkgs/by-name/se/ser2net/package.nix +++ b/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 = { From 6cafdc6a56d3856e830363c8078c1aa26c897636 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Feb 2025 01:40:32 +0000 Subject: [PATCH 3/9] ludtwig: 0.9.0 -> 0.10.0 --- pkgs/by-name/lu/ludtwig/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 9e035452c1f0..b3ebe3f092e0 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/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"; From e8dd8f96aaf4a763d3a45c1dffd5d01aecc05708 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Feb 2025 05:03:06 +0000 Subject: [PATCH 4/9] ecapture: 0.9.3 -> 0.9.4 --- pkgs/by-name/ec/ecapture/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index c28ba718d735..81df23482d79 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/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; }; From 22c572eb22247517ff2838e9b1ad06a7784cefdb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 11:04:40 +0100 Subject: [PATCH 5/9] ocamlPackages.asai: disable for OCaml < 5.2 --- pkgs/development/ocaml-modules/asai/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/asai/default.nix b/pkgs/development/ocaml-modules/asai/default.nix index 2f58276684ab..2a5a59895b6e 100644 --- a/pkgs/development/ocaml-modules/asai/default.nix +++ b/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; From 35bd105dc889fd509dbb2645dde733bc537e0849 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 11:14:15 +0100 Subject: [PATCH 6/9] ocamlPackages.async_ssl: mark broken at version 0.14 --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index c6210a966312..b8bb5e560167 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/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 From 5e281f0f6eba6fba658f2785973dd7c3ca9649fd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Feb 2025 10:55:47 +0100 Subject: [PATCH 7/9] ocamlPackages.shell: disable tests of version 0.14 --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index b8bb5e560167..733cd27f0a3b 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -977,6 +977,7 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; checkInputs = [ ounit ]; + doCheck = false; # Does not build with GCC 14 }; shexp = janePackage { From 0c3729a9d60c1442fff160b23cd67aa9b46776ab Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Feb 2025 05:28:14 +0100 Subject: [PATCH 8/9] ocamlPackages.sexp: mark broken at versions 0.15 & 0.14 --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 1 + pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 733cd27f0a3b..df1fdaaaf74f 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -910,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 { diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index a56a58865cfa..871277c72b51 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/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 { From 31aa4c5fefd7b53bbfb4ba52f25edb6da47bdf3f Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 21 Feb 2025 11:19:14 +0300 Subject: [PATCH 9/9] nixos/iso-image: fix build --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 665b968c9d1d..442e82d76916 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/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";