Merge master into staging-next

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix

@@ -10,16 +10,16 @@ let
 in
 rustPlatform.buildRustPackage {
   pname = "lspce-module";
-  version = "1.1.0-unstable-2024-09-07";
+  version = "1.1.0-unstable-2024-10-07";
 
   src = fetchFromGitHub {
     owner = "zbelial";
     repo = "lspce";
-    rev = "4bf1fa9d3d8b17eb6ae628e93018ee8f020565ba";
+    rev = "2a06232033478757dc5770dc7ba658848073de42";
-    hash = "sha256-OeDUQXqVBUfKjYt5oSmfl2N/19PFYIbPXfFqloai0LQ=";
+    hash = "sha256-iCge/m1z4Tl3dDvbN4FGsINWE5GEtLxTlvBBu8Zxhzs=";
   };
 
-  cargoHash = "sha256-VMGdB4dF3Ccxl6DifdXFH4+XVT7RoeqI/l/AR/epg4o=";
+  cargoHash = "sha256-I3NxV0uIwQ/Vg9Txfx+ouA6FXOYyLQ2kKdhnAdkNfdE=";
 
   checkFlags = [
     # flaky test

pkgs/by-name/fz/fzf/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.56.2";
+  version = "0.56.3";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${version}";
-    hash = "sha256-POSploJmwMA3ZTYtQh3k45gaumG1dsuyyGn4CRO4qfY=";
+    hash = "sha256-m/RtAjqB6YTwmzCUdKQx/e7vxqJOu1Y1N0u28i8gwEs=";
   };
 
   vendorHash = "sha256-4VAAka9FvKuoDZ1E1v9Es3r00GZeG8Jp4pJONYpB/t8=";

pkgs/by-name/gi/gitbutler/package.nix

@@ -173,5 +173,6 @@ rustPlatform.buildRustPackage rec {
       techknowlogick
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    broken = true; # build fails on darwin and linux
   };
 }

pkgs/by-name/ib/ibm-plex/hashes.nix

@@ -0,0 +1,15 @@
+{
+  "serif" = "sha256-8ygaAeMKygYS4GCub4YUQmkh87pYHfi3s0PQ6AbaeGw=";
+  "sans" = "sha256-mK+8GGl2ugF2+fS6yd3p5NWPHHcKEJWiShDS3lihOlI=";
+  "sans-condensed" = "sha256-/aJTXmrHuoPSrtCKNodBY7I0CriayNTx5LCXw+/MFvE=";
+  "sans-arabic" = "sha256-qi4k7kMLftIuq87idyxq46FOD6QYycdG6j3zJmu8mhI=";
+  "sans-devanagari" = "sha256-K57OVqcH5r9tZx8NFEoz1P3xpUooqpF7xxJzNmnObwE=";
+  "sans-thai" = "sha256-JZVbvZdj+IfBthiqivOXHrvAUe392M9ECGsiJkm0saE=";
+  "sans-thai-looped" = "sha256-cry/Ctwt1bsrdbvWkJIYWLjsvV6a1lLFsT85znqERnw=";
+  "sans-tc" = "sha256-kZvzSK6fEjfVMR4kxC4lxtD7GskqvJZx8BBJVT4T9MU=";
+  "sans-kr" = "sha256-FsHxMvLlI4yylgG96DOZIdW2DYpk7I+c5QgkVIkNZIE=";
+  "sans-jp" = "sha256-hUl/SSkN6q3pDTtrY2mJepw3ljhhLJskGbxfsTl9TuI=";
+  "sans-hebrew" = "sha256-rTuBQYLI+6gEFTumCdaWpeoLzRoyFSmqWbXziq+UG6I=";
+  "mono" = "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=";
+  "math" = "sha256-dJA6uqxa/yb3eLY4l39NeP0yIl2NfrbaRpf6h0/F7Xc=";
+}

pkgs/by-name/ib/ibm-plex/package.nix

@@ -1,28 +1,51 @@
-{ lib, stdenvNoCC, fetchzip }:
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  families ? [ ],
+}:
+let
+  version = import ./version.nix;
+  availableFamilies = import ./hashes.nix;
 
-stdenvNoCC.mkDerivation rec {
+  availableFamilyNames = builtins.attrNames availableFamilies;
+  selectedFamilies = if (families == [ ]) then availableFamilyNames else families;
+
+  unknownFamilies = lib.subtractLists availableFamilyNames families;
+in
+assert lib.assertMsg (unknownFamilies == [ ]) "Unknown font(s): ${toString unknownFamilies}";
+stdenvNoCC.mkDerivation {
   pname = "ibm-plex";
-  version = "6.4.0";
+  inherit version;
 
-  src = fetchzip {
+  srcs = builtins.map (
-    url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
+    family:
-    hash = "sha256-/aR3bu03VxenSPed6EqrGoPjWCcKT//MVtb9OC8tSRs=";
+    fetchzip {
-  };
+      url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip";
+      hash = availableFamilies.${family};
+    }
+  ) selectedFamilies;
+
+  dontUnpack = true;
+  sourceRoot = ".";
 
   installPhase = ''
     runHook preInstall
-
+    find $srcs -type f -name '*.otf' -exec install -Dm644 {} -t $out/share/fonts/opentype \;
-    install -Dm644 */*.otf IBM-Plex-Sans-JP/unhinted/* -t $out/share/fonts/opentype
-
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = with lib; {
     description = "IBM Plex Typeface";
     homepage = "https://www.ibm.com/plex/";
     changelog = "https://github.com/IBM/plex/raw/v${version}/CHANGELOG.md";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
+    maintainers = with maintainers; [
+      romildo
+      ryanccn
+    ];
   };
 }

pkgs/by-name/ib/ibm-plex/update.sh

@@ -0,0 +1,42 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p nix nix-prefetch jq
+#  shellcheck shell=bash
+set -eo pipefail
+
+families=(
+    "serif"
+    "sans"
+    "sans-condensed"
+    "sans-arabic"
+    "sans-devanagari"
+    "sans-thai"
+    "sans-thai-looped"
+    "sans-tc"
+    "sans-kr"
+    "sans-jp"
+    "sans-hebrew"
+    "mono"
+    "math"
+)
+
+version=$(curl --silent 'https://api.github.com/repos/IBM/plex/releases/latest' | jq -r '.tag_name | sub("^@ibm/[\\w-]+@"; "")')
+
+dirname="$(dirname "$0")"
+echo \""${version}"\" >"$dirname/version-new.nix"
+if diff -q "$dirname/version-new.nix" "$dirname/version.nix"; then
+    echo No new version available, current: "$version"
+    rm "$dirname/version-new.nix"
+    exit 0
+else
+    echo Updated to version "$version"
+    mv "$dirname/version-new.nix" "$dirname/version.nix"
+fi
+
+printf '{\n' > "$dirname/hashes.nix"
+
+for family in "${families[@]}"; do
+    url="https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip"
+    printf '  "%s" = "%s";\n' "$family" "$(nix-prefetch-url --unpack "$url" | xargs nix hash convert --hash-algo sha256)" >>"$dirname/hashes.nix"
+done
+
+printf '}\n' >> "$dirname/hashes.nix"

pkgs/by-name/ib/ibm-plex/version.nix

@@ -0,0 +1 @@
+"1.1.0"

pkgs/by-name/te/telegraf/package.nix

@@ -9,7 +9,7 @@
 
 buildGo123Module rec {
   pname = "telegraf";
-  version = "1.32.2";
+  version = "1.32.3";
 
   subPackages = [ "cmd/telegraf" ];
 
@@ -17,10 +17,10 @@ buildGo123Module rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    hash = "sha256-hqYBoaklrdCkTwnkwqkZAvGLyWkUB3CVu4cg3Ujbyto=";
+    hash = "sha256-H/thJ88cfl75rRByLYIjpPx6lfBSSryhYii8jBl/PBA=";
   };
 
-  vendorHash = "sha256-KRZ5Rrdp69DTHtNu8vXuD7QKy2n6Sx7myNpB5TSZpRk=";
+  vendorHash = "sha256-3Wcbl4DM4SHvctVvQTsqQNRkB3z+273kvM/KwypmB70=";
   proxyVendor = true;
 
   ldflags = [

pkgs/by-name/va/vagrant/package.nix

@@ -118,5 +118,6 @@ in buildRubyGem rec {
     license = licenses.bsl11;
     maintainers = with maintainers; [ tylerjl ];
     platforms = with platforms; linux ++ darwin;
+    broken = true; # build fails on darwin and linux
   };
 }

pkgs/development/compilers/codon/default.nix

@@ -137,5 +137,6 @@ stdenv.mkDerivation {
     maintainers = [ ];
     license = lib.licenses.bsl11;
     platforms = lib.platforms.all;
+    broken = true; # `codon-llvm` build fails on darwin and linux
   };
 }

pkgs/development/interpreters/acl2/default.nix

@@ -158,5 +158,6 @@ in stdenv.mkDerivation rec {
     ];
     maintainers = with maintainers; [ kini raskin ];
     platforms = platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }