From 140939daca7439f7ecb2d698dbd4b81f2865fce7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Nov 2024 08:35:14 +0000 Subject: [PATCH 1/9] emacsPackages.lspce: 1.1.0-unstable-2024-09-07 -> 1.1.0-unstable-2024-10-07 --- .../emacs/elisp-packages/manual-packages/lspce/module.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index ce748881824c..5a049c441d17 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/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"; - hash = "sha256-OeDUQXqVBUfKjYt5oSmfl2N/19PFYIbPXfFqloai0LQ="; + rev = "2a06232033478757dc5770dc7ba658848073de42"; + hash = "sha256-iCge/m1z4Tl3dDvbN4FGsINWE5GEtLxTlvBBu8Zxhzs="; }; - cargoHash = "sha256-VMGdB4dF3Ccxl6DifdXFH4+XVT7RoeqI/l/AR/epg4o="; + cargoHash = "sha256-I3NxV0uIwQ/Vg9Txfx+ouA6FXOYyLQ2kKdhnAdkNfdE="; checkFlags = [ # flaky test From 18ad5961d2b8ad5ac71ab8ad200a873d12f4b8bb Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:57:52 +0800 Subject: [PATCH 2/9] ibm-plex: 6.4.0 -> 1.1.0 --- pkgs/by-name/ib/ibm-plex/hashes.nix | 15 ++++++++++ pkgs/by-name/ib/ibm-plex/package.nix | 40 +++++++++++++++++++------- pkgs/by-name/ib/ibm-plex/update.sh | 42 ++++++++++++++++++++++++++++ pkgs/by-name/ib/ibm-plex/version.nix | 1 + 4 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/ib/ibm-plex/hashes.nix create mode 100755 pkgs/by-name/ib/ibm-plex/update.sh create mode 100644 pkgs/by-name/ib/ibm-plex/version.nix diff --git a/pkgs/by-name/ib/ibm-plex/hashes.nix b/pkgs/by-name/ib/ibm-plex/hashes.nix new file mode 100644 index 000000000000..d22fdab47244 --- /dev/null +++ b/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="; +} diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix index a6c7b4d29535..95d0e89dbff4 100644 --- a/pkgs/by-name/ib/ibm-plex/package.nix +++ b/pkgs/by-name/ib/ibm-plex/package.nix @@ -1,22 +1,42 @@ -{ 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 { - url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; - hash = "sha256-/aR3bu03VxenSPed6EqrGoPjWCcKT//MVtb9OC8tSRs="; - }; + srcs = builtins.map ( + family: + 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 - - install -Dm644 */*.otf IBM-Plex-Sans-JP/unhinted/* -t $out/share/fonts/opentype - + find $srcs -type f -name '*.otf' -exec install -Dm644 {} -t $out/share/fonts/opentype \; runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "IBM Plex Typeface"; homepage = "https://www.ibm.com/plex/"; diff --git a/pkgs/by-name/ib/ibm-plex/update.sh b/pkgs/by-name/ib/ibm-plex/update.sh new file mode 100755 index 000000000000..e974a306b50d --- /dev/null +++ b/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" diff --git a/pkgs/by-name/ib/ibm-plex/version.nix b/pkgs/by-name/ib/ibm-plex/version.nix new file mode 100644 index 000000000000..f0947f091566 --- /dev/null +++ b/pkgs/by-name/ib/ibm-plex/version.nix @@ -0,0 +1 @@ +"1.1.0" From da4a805906b506ae37643945a476ec1480770edb Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:58:08 +0800 Subject: [PATCH 3/9] ibm-plex: add @ryanccn as maintainer --- pkgs/by-name/ib/ibm-plex/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix index 95d0e89dbff4..734d5344c6d8 100644 --- a/pkgs/by-name/ib/ibm-plex/package.nix +++ b/pkgs/by-name/ib/ibm-plex/package.nix @@ -43,6 +43,9 @@ stdenvNoCC.mkDerivation { 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 + ]; }; } From a8b18d5ecda06da9d68e34a9878a95a4d908e97b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 19 Nov 2024 00:40:51 +0000 Subject: [PATCH 4/9] fzf: 0.56.2 -> 0.56.3 Diff: https://github.com/junegunn/fzf/compare/v0.56.2...v0.56.3 Changelog: https://github.com/junegunn/fzf/blob/v0.56.3/CHANGELOG.md --- pkgs/by-name/fz/fzf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 5a2e8d0bdfdc..db71f7c02d57 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/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="; From 98c41eed0656f044855f8ddd71c33289985fd559 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:53:08 +1000 Subject: [PATCH 5/9] codon: mark as broken --- pkgs/development/compilers/codon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/codon/default.nix b/pkgs/development/compilers/codon/default.nix index 88d3c01d713a..f274011a910e 100644 --- a/pkgs/development/compilers/codon/default.nix +++ b/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 }; } From fcebbc872934e0b81ca67ef0a440e9f183313a15 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:59:53 +1000 Subject: [PATCH 6/9] vagrant: mark as broken --- pkgs/by-name/va/vagrant/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix index 6eb3ceca77aa..60d28318930a 100644 --- a/pkgs/by-name/va/vagrant/package.nix +++ b/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 }; } From c6ee5d0b579d798a68cb71a451dfcc80d9ae6ac1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:56:26 +1000 Subject: [PATCH 7/9] acl2: mark as broken on darwin --- pkgs/development/interpreters/acl2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 20a34aef75d4..e3c17855e65d 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/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; }; } From e34e6cb189779da709d0d2e4c702b417ed5b61f0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:58:14 +1000 Subject: [PATCH 8/9] gitbutler: mark as broken --- pkgs/by-name/gi/gitbutler/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 0ecbc073e3ea..c3ee127b2bd9 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/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 }; } From 76d723ce4fffad9765a190491e67b7f1c3683e70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 19 Nov 2024 00:39:06 +0000 Subject: [PATCH 9/9] telegraf: 1.32.3 -> 1.32.3 Diff: https://github.com/influxdata/telegraf/compare/v1.32.3...v1.32.3 Changelog: https://github.com/influxdata/telegraf/blob/v1.32.3/CHANGELOG.md --- pkgs/by-name/te/telegraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index ae2f74c44773..bd8d708aae1e 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/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 = [