Compare commits

...

10 commits

Author SHA1 Message Date
nixpkgs-ci[bot] 82dbe9ee4f
Merge 9e62835af1 into 0445f3133d 2025-11-09 05:15:14 +00:00
Aleksana 0445f3133d
[Backport release-25.05] mangojuice: 0.8.6 -> 0.8.8 (#459943) 2025-11-09 02:35:04 +00:00
Aleksana bcb8016852
[Backport release-25.05] biblioteca: 1.6 -> 1.7 (#459942) 2025-11-09 02:34:58 +00:00
Aleksana 67ca06296a
[Backport release-25.05] lima: add meta.knownVulnerabilities (#459225) 2025-11-09 02:31:17 +00:00
Seth Flynn 55ac7778f2 mangojuice: 0.8.6 -> 0.8.8
Diff: https://github.com/radiolamp/mangojuice/compare/0.8.6...0.8.8
Changelog: https://github.com/radiolamp/mangojuice/releases/tag/0.8.8
(cherry picked from commit b4634379d3)
2025-11-09 02:19:00 +00:00
Seth Flynn 842fd77d2f biblioteca: 1.6 -> 1.7
Diff: https://github.com/workbenchdev/Biblioteca/compare/v1.6...v1.7
(cherry picked from commit 15986ca7ea)
2025-11-09 02:13:33 +00:00
tomberek c80553beb9
[Backport 25.05] teleport_16: 16.5.16 -> 16.5.18; teleport_17: 17.7.5 -> 17.7.8; teleport_18: 18.2.2 -> 18.3.1 (#459275) 2025-11-09 01:05:26 +00:00
Yongun Seong 9e62835af1 perlPackages.FinanceQuote: 1.66 -> 1.67
(cherry picked from commit 19751496f4)
2025-11-08 22:38:45 +00:00
JuliusFreudenberger 4346d33a0f teleport_16: 16.5.16 -> 16.5.18; teleport_17: 17.7.5 -> 17.7.8; teleport_18: 18.2.2 -> 18.3.1
This makes one of the applied patches obsolete for all major versions.

Diffs:
https://github.com/gravitational/teleport/compare/v16.5.16...v16.5.18
https://github.com/gravitational/teleport/compare/v17.7.5...v17.7.8
https://github.com/gravitational/teleport/compare/v18.2.2...v18.3.1
(cherry picked from commit af8ff991c2)
2025-11-06 22:04:18 +01:00
Kenichi Kamiya 2ddbda9467
lima: add meta.knownVulnerabilities
The current version 1.0.7 (in release-25.05) is related to these CVEs.

refs:
  * 1.0.7 -> 1.1.1: 97c0a198aa
  * 1.2.1 -> 1.2.2: d0beb16463

Not-cherry-picked-because: Updating to 1.2.2 is not suitable for stable channels. This is because version 1.1.1 is not compatible, especially on the package manager side.
2025-11-07 03:38:02 +09:00
10 changed files with 28 additions and 40 deletions

View file

@ -91,5 +91,13 @@ buildGoModule rec {
changelog = "https://github.com/lima-vm/lima/releases/tag/v${version}"; changelog = "https://github.com/lima-vm/lima/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ anhduy ]; maintainers = with maintainers; [ anhduy ];
knownVulnerabilities = [
"There are some CVEs in the nerdctl dependency. Has been fixed in Nixpkgs unstable."
"CVE-2024-25621"
"CVE-2025-64329"
"CVE-2025-31133"
"CVE-2025-52565"
"CVE-2025-52881"
];
}; };
} }

View file

@ -152,7 +152,6 @@ buildGoModule (finalAttrs: {
patches = extPatches ++ [ patches = extPatches ++ [
./0001-fix-add-nix-path-to-exec-env.patch ./0001-fix-add-nix-path-to-exec-env.patch
./rdpclient.patch ./rdpclient.patch
./tsh.patch
]; ];
# Reduce closure size for client machines # Reduce closure size for client machines

View file

@ -1,17 +0,0 @@
diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
index 5de21c69d0..3995c19e3c 100644
--- a/tool/tsh/common/tsh.go
+++ b/tool/tsh/common/tsh.go
@@ -1231,10 +1231,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
}
var err error
- cf.executablePath, err = os.Executable()
+ tempBinaryPath, err := os.Executable()
if err != nil {
return trace.Wrap(err)
}
+ cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"
// configs
setEnvFlags(&cf)

View file

@ -24,14 +24,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "biblioteca"; pname = "biblioteca";
version = "1.6"; version = "1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "workbenchdev"; owner = "workbenchdev";
repo = "Biblioteca"; repo = "Biblioteca";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-9AL8obvXB/bgqhTw8VE30OytNFQmxvJ6TYGN8ir+NfI="; hash = "sha256-PRm/4t0f8AExOFXCcV7S+JIKkJgYP1gego2xTUbj7FY=";
}; };
patches = [ patches = [
@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
blueprint-compiler
desktop-file-utils desktop-file-utils
makeShellWrapper makeShellWrapper
gjs gjs
@ -70,9 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
}; };
postPatch = '' postPatch = ''
substituteInPlace src/meson.build \
--replace-fail "/app/bin/blueprint-compiler" "${lib.getExe blueprint-compiler}" \
patchShebangs . patchShebangs .
substituteInPlace build-aux/build-index.js \ substituteInPlace build-aux/build-index.js \

View file

@ -6,7 +6,7 @@ index 8c2cbef..46e7f73 100644
} }
async bool check_vkbasalt_installed_async () { async bool check_vkbasalt_installed_async () {
- string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so" }; - string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so", "/usr/lib64/vkbasalt/libvkbasalt.so" };
+ string[] paths = { "@vkbasalt@" }; + string[] paths = { "@vkbasalt@" };
foreach (var path in paths) { foreach (var path in paths) {
if (FileUtils.test (path, FileTest.EXISTS)) { if (FileUtils.test (path, FileTest.EXISTS)) {

View file

@ -25,13 +25,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mangojuice"; pname = "mangojuice";
version = "0.8.6"; version = "0.8.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "radiolamp"; owner = "radiolamp";
repo = "mangojuice"; repo = "mangojuice";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-EVjKO+03o8es2t2/K1QuUIhXey7+2VNF37yXiMrv4o4="; hash = "sha256-M8aKS360AsgoSKCyZXdtD7SbMDvK6OgAuNoGa68NZRQ=";
}; };
patches = [ patches = [

View file

@ -6,10 +6,10 @@
extPatches ? [ ], extPatches ? [ ],
}: }:
buildTeleport { buildTeleport {
version = "16.5.15"; version = "16.5.18";
hash = "sha256-DqNG6gl+KdjSbkE9Bwum8az8cLCSOmZwo9xpuWafHCA="; hash = "sha256-Dikw4y62V7S62K+8EqltXM4RRYPgE2Ad/kZrSS2TEDo=";
vendorHash = "sha256-sZvRKLF2iZ3UpgGNUPuWMT7VTpnDa2uU0d1XjDKSmdo="; vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8=";
pnpmHash = "sha256-8xnH9PkKz77whtq/LVYUjyG1Z1reRtW03Gv8sZ/1vww="; pnpmHash = "sha256-V0R/i+oENGxlmq2Q6iwnikgBFVMWXph9WMStp3HTW34=";
cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;

View file

@ -7,11 +7,11 @@
}: }:
buildTeleport { buildTeleport {
version = "17.7.3"; version = "17.7.8";
hash = "sha256-YSYkJRAeu7iPOs/gFnozZbks0Fx5srNH0VjrKvFmHZo="; hash = "sha256-z520UT17nFLBwyVLjdfx9aTbkMv1fljsN88G6WRPvZE=";
vendorHash = "sha256-7Rb94ERtp3H1Jwyh9d7AFT06d4xXdnfe5tpdvJQrbUQ="; vendorHash = "sha256-mtOCLAcVIxaEhGzdsVWxnKQ4FRTXZ5vVAF+NVMdFItk=";
cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs="; cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
pnpmHash = "sha256-ZONs8z8mgBBQBmqaDGJKqhmtUKBrxE8BGYppbAqpQmg="; pnpmHash = "sha256-4xLbPQwmI0nAUNAgDHwkx1uSbjHPe8LNmEFQfoaj6bY=";
wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
buildGoModule = buildGo124Module; buildGoModule = buildGo124Module;

View file

@ -7,10 +7,10 @@
}: }:
buildTeleport { buildTeleport {
version = "18.2.0"; version = "18.3.1";
hash = "sha256-JWgGRv9pK76u7IxwqnBcuAI93XIKfIVvme7l+a/3J7c="; hash = "sha256-HM0pu+3O7zoClH15YC0naxxmKJC9ngamnvraTosRqG0=";
vendorHash = "sha256-oPi/rIuwze2ZlyHfZ2MdDHHvdIaF2IZ2aklEVNRgoLo="; vendorHash = "sha256-HyS0KKW7lyn3NzedxM4+UxFV9OnxgtFDMW5jkj3ir/8=";
pnpmHash = "sha256-wW4RT1uqOTpy8wKIsAOfIlxoOamTzPqEbFQRAub+sn4="; pnpmHash = "sha256-/G6WYC3YGk8ma4hAI6sZhQ6KAh+u4CxQ7891fYj5bJg=";
cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA="; cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";
wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;

View file

@ -14194,10 +14194,10 @@ with self;
FinanceQuote = buildPerlPackage rec { FinanceQuote = buildPerlPackage rec {
pname = "Finance-Quote"; pname = "Finance-Quote";
version = "1.66"; version = "1.67";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
hash = "sha256-GOkdcI+Ah6JvvL+zsKYe0UcdKks855jecwTzBIGkZ+k="; hash = "sha256-uqip/AS5o4+nh77gAWvNTMMwHMmi8KbDeBGaNdre6zA=";
}; };
buildInputs = [ buildInputs = [
DateManip DateManip