mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
@@ -502,7 +502,7 @@ pkgs/by-name/oc/octodns/ @anthonyroussel
|
||||
pkgs/by-name/te/teleport* @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger
|
||||
|
||||
# Warp-terminal
|
||||
pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor
|
||||
pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @4evy @johnrtitor
|
||||
|
||||
# Nim
|
||||
/doc/languages-frameworks/nim.section.md @NixOS/nim
|
||||
|
||||
@@ -257,6 +257,12 @@
|
||||
githubId = 3417013;
|
||||
name = "Eske Nielsen";
|
||||
};
|
||||
_4evy = {
|
||||
name = "4evy";
|
||||
email = "git@evy.pink";
|
||||
github = "4evy";
|
||||
githubId = 57304299;
|
||||
};
|
||||
_4r7if3x = {
|
||||
email = "the.artifex@proton.me";
|
||||
matrix = "@4r7if3x:matrix.org";
|
||||
@@ -9028,13 +9034,6 @@
|
||||
name = "Sebastian Neubauer";
|
||||
keys = [ { fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; } ];
|
||||
};
|
||||
FlameFlag = {
|
||||
name = "FlameFlag";
|
||||
email = "github@flameflag.dev";
|
||||
github = "FlameFlag";
|
||||
githubId = 57304299;
|
||||
matrix = "@donteatoreo:matrix.org";
|
||||
};
|
||||
Flameopathic = {
|
||||
email = "flameopathic@gmail.com";
|
||||
github = "Flameopathic";
|
||||
|
||||
@@ -74,7 +74,7 @@ let
|
||||
mainProgram = "discord";
|
||||
maintainers = with lib.maintainers; [
|
||||
artturin
|
||||
FlameFlag
|
||||
_4evy
|
||||
infinidoge
|
||||
jopejoe1
|
||||
Scrumplex
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -91,8 +91,8 @@ rec {
|
||||
thunderbird-153 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "153.0.1esr";
|
||||
sha512 = "3773b49b69341aea108a627faa0dd5b7cfb52cdb4c37e625fbb8cbaef7f9166f925ecbc199173302d5bef7994e6bff3b56cd56a3a4c38a9d702cc3e5aeafcf7c";
|
||||
version = "153.1.0esr";
|
||||
sha512 = "3d6c82e1489b906e6cf73c3eeb7d7e23de6901a75c704176b996d183a889f24275214999155992789a57a713e6cd073e2752120c3b281136ed34f36f289fbcb4";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-153";
|
||||
|
||||
@@ -72,9 +72,9 @@ let
|
||||
buildType = "release";
|
||||
# Use maintainers/scripts/update.nix to update the version and all related hashes or
|
||||
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
|
||||
virtualboxVersion = "7.2.14";
|
||||
virtualboxVersion = "7.2.16";
|
||||
virtualboxSubVersion = "";
|
||||
virtualboxSha256 = "384f293184c52fd51bc941c17d753b4019446f53a6b07c828adfb3e61fe0a500";
|
||||
virtualboxSha256 = "50356ccdaefe8f03537600ec31898b506e3a85ce79b94f26fb6cc1920c9e18eb";
|
||||
|
||||
kvmPatchVboxVersion = "7.2.6";
|
||||
kvmPatchVersion = "20260201";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
fetchurl rec {
|
||||
pname = "virtualbox-extpack";
|
||||
version = "7.2.14";
|
||||
version = "7.2.16";
|
||||
name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack";
|
||||
url = "https://download.virtualbox.org/virtualbox/${version}/${name}";
|
||||
sha256 =
|
||||
@@ -13,7 +13,7 @@ fetchurl rec {
|
||||
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
|
||||
# Checksums can also be found at https://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
|
||||
let
|
||||
value = "ce4461de974f041435660751b382f987fece831028a8c98572d668eda2eee96d";
|
||||
value = "d1e268cfa05223fd651703043af09f39dfb90da259ce9ec093d9d9b022f19689";
|
||||
in
|
||||
assert (builtins.stringLength value) == 64;
|
||||
value;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
|
||||
sha256 = "4f51a073296de31cce53924860549149be5dc339f65dcd1dbf34fd7accefe8fb";
|
||||
sha256 = "c9349c0231d81c821fc1de7b9592bf07bb7c3f111c3f942ddddc211496ef7a3e";
|
||||
meta = {
|
||||
description = "Guest additions ISO for VirtualBox";
|
||||
longDescription = ''
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
libx11,
|
||||
}:
|
||||
let
|
||||
virtualboxVersion = "7.2.14";
|
||||
virtualboxVersion = "7.2.16";
|
||||
virtualboxSubVersion = "";
|
||||
virtualboxSha256 = "384f293184c52fd51bc941c17d753b4019446f53a6b07c828adfb3e61fe0a500";
|
||||
virtualboxSha256 = "50356ccdaefe8f03537600ec31898b506e3a85ce79b94f26fb6cc1920c9e18eb";
|
||||
|
||||
platform =
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
@@ -96,6 +96,11 @@ stdenv.mkDerivation {
|
||||
]
|
||||
++ kernel.moduleBuildDependencies;
|
||||
|
||||
# https://github.com/VirtualBox/virtualbox/issues/812
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/vboxguest-${virtualboxVersion}_NixOS/vboxvideo/vbox_fb.c --replace-fail "RTLNX_VER_MIN(6,19,0)" "RTLNX_VER_RANGE(6,6,152, 6,6,999) || RTLNX_VER_RANGE(6,12,103, 6,12,999) || RTLNX_VER_RANGE(6,18,44, 6,18,999) || RTLNX_VER_MIN(6,19,0)"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.3.23-stable",
|
||||
"version": "1.3.29-stable",
|
||||
"sources": {
|
||||
"aarch64-darwin": {
|
||||
"url": "https://acli.atlassian.com/darwin/1.3.23-stable/acli_1.3.23-stable_darwin_arm64.tar.gz",
|
||||
"sha256": "af78f7bb06b137ddab785257fb74367ac3304629c7d240af0117a700c7b56b64"
|
||||
"url": "https://acli.atlassian.com/darwin/1.3.29-stable/acli_1.3.29-stable_darwin_arm64.tar.gz",
|
||||
"sha256": "b2f6343d13ac8f3c32ea1043aba8317876d845662967793eb00016a2e5b5cf79"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://acli.atlassian.com/linux/1.3.23-stable/acli_1.3.23-stable_linux_arm64.tar.gz",
|
||||
"sha256": "5d4e8580cf2aae681bc02bb4f61c8a62f3efa8fa2b051b3a5f4f560a90279a60"
|
||||
"url": "https://acli.atlassian.com/linux/1.3.29-stable/acli_1.3.29-stable_linux_arm64.tar.gz",
|
||||
"sha256": "cea39c4eb90c65d8d0cafc869a75fa3b6afaaf4573f8da650f4ae73801f8ec46"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_amd64.tar.gz",
|
||||
"sha256": "993fd692700d602fd1e3cff7f1d29f70e44a2ebb8056fbb93bdc8aed1e5cbbd4"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://acli.atlassian.com/linux/1.3.23-stable/acli_1.3.23-stable_linux_amd64.tar.gz",
|
||||
"sha256": "1678a6d0ac36904b1b7788191b5740962a3dc8694aa6f3eee9ccd8f4774996e5"
|
||||
"url": "https://acli.atlassian.com/linux/1.3.29-stable/acli_1.3.29-stable_linux_amd64.tar.gz",
|
||||
"sha256": "8dcfc7bcf9dc788e7143e93d74445310094977ba1bad2513c6c613460851d34e"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
homepage = "https://alt-tab-macos.netlify.app";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
FlameFlag
|
||||
_4evy
|
||||
emilytrau
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
copyDesktopItems,
|
||||
electron_41,
|
||||
electron_43,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
@@ -14,22 +14,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_41;
|
||||
version = "2026.5.1";
|
||||
electron = electron_43;
|
||||
in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "appium-inspector";
|
||||
inherit version;
|
||||
version = "2026.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "appium";
|
||||
repo = "appium-inspector";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SJlTTVTZ/zGIK7Nf35cZ62tdhevXC95MsbiQJCLiVtk=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7pxXlY/aifrg4cuGZSgxONF+RPL8P7JcZ6Gobqv2nz4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-2rjgKS1mIrjOg+YXuMaqKyEQt0utLA4DGxOs0oI4BaQ=";
|
||||
npmDepsHash = "sha256-W9FWIHhtS2d9xBpIEGB8sWmDfcdyphL+0eCk1+8pu2s=";
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -102,7 +101,7 @@ buildNpmPackage (finalAttrs: {
|
||||
meta = {
|
||||
description = "GUI inspector for the appium UI automation tool";
|
||||
homepage = "https://appium.github.io/appium-inspector";
|
||||
changelog = "https://github.com/appium/appium-inspector/releases/tag/v${version}";
|
||||
changelog = "https://github.com/appium/appium-inspector/releases/tag/v${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "appium-inspector";
|
||||
maintainers = with lib.maintainers; [ marie ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atlantis";
|
||||
version = "0.44.0";
|
||||
version = "0.47.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZHd/RSzFXbcZ7324Bbgtx681zwdHi5xYgqVlTR4glHY=";
|
||||
hash = "sha256-GNHu6nZijSd+kluqWTYrmUZubGmicXQdzChXnJbXCyw=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-hxgujZGbcEelOpoy7eCnbrypXraN7aPe8Ox81kkg3gs=";
|
||||
vendorHash = "sha256-TmKoUcX4nbrJtSpuzI7uTEzcpRo3K3xM8QjyjogklO0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
requireFile,
|
||||
src ? null,
|
||||
overriddenSrc ? null,
|
||||
withMods ? true,
|
||||
withBridgePatch ? true,
|
||||
withLinuxPatch ? true,
|
||||
@@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.0.1o";
|
||||
|
||||
src =
|
||||
if src != null then
|
||||
src
|
||||
if overriddenSrc != null then
|
||||
overriddenSrc
|
||||
else
|
||||
requireFile {
|
||||
name = "Balatro-${finalAttrs.version}.exe";
|
||||
name = "Balatro.exe";
|
||||
url = "https://store.steampowered.com/app/2379780/Balatro/";
|
||||
message = ''
|
||||
You must own Balatro in order to install it with Nix. The Steam,
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pass the resulting path to override:
|
||||
|
||||
balatro.override {
|
||||
src = /nix/store/g44bp7ymc7qlkfv5f03b55cgs1wdmkzl-com.playstack.balatro.android.apk;
|
||||
overriddenSrc = /nix/store/g44bp7ymc7qlkfv5f03b55cgs1wdmkzl-com.playstack.balatro.android.apk;
|
||||
}
|
||||
'';
|
||||
# Use `nix --extra-experimental-features nix-command hash file --sri --type sha256` to get the correct hash
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "complgen";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0oC/jpCKM2Y1yag+qIUu+b3sCIPmHs/GUBSPHi7KaVI=";
|
||||
hash = "sha256-zH16qv1d2D0txa9Y/v9kcS1/dxS9GeIqjPp/HUViulA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-skdtXxNUuC7xLtZSol3b1prdN1YT62uvwo+F7rtFVVQ=";
|
||||
cargoHash = "sha256-cM8YBlukZQ+646L5FyUL3ln01sCXNOGh3frWNCtY3YI=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "croaring";
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RoaringBitmap";
|
||||
repo = "CRoaring";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DLVIEFXQCmfSkFIRd6s9VbpdsypuyYgaI+ZwmV55YVs=";
|
||||
hash = "sha256-CyjXE4cDPp8pmVqjgJFzLiVgR1I0lv2PEusS659KKP4=";
|
||||
};
|
||||
|
||||
# roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor
|
||||
|
||||
@@ -21,7 +21,7 @@ buildDotnetGlobalTool {
|
||||
changelog = "https://github.com/waf/CSharpRepl/blob/main/CHANGELOG.md";
|
||||
license = lib.licenses.mpl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
mainProgram = "csharprepl";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -198,7 +198,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/TwilitRealm/dusklight/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.cc0;
|
||||
mainProgram = "dusklight";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ liberodark ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -19,7 +19,7 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -28,10 +28,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "foks-proj";
|
||||
repo = "go-foks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JY0ec+LNRQf0S8gTeazvQhvQ7LRM3zz1qvopGPaKM1k=";
|
||||
hash = "sha256-HnxMcYGb0fyGkZd1hRhQvb0eInay+/t8/cgI/SDlR24=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W0lyLy7k3xin8VSdxNgeh1FpHprOKIDduHIW3Oqk1LY=";
|
||||
vendorHash = "sha256-vI4MzpjCCtNnd0pv3MgDpttslUUk6JU/wcp+QTcZqgw=";
|
||||
|
||||
postPatch = ''
|
||||
cd ./server/web/templates
|
||||
|
||||
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
mainProgram = "gallery-dl";
|
||||
maintainers = with lib.maintainers; [
|
||||
dawidsowa
|
||||
FlameFlag
|
||||
_4evy
|
||||
lucasew
|
||||
];
|
||||
};
|
||||
|
||||
@@ -115,7 +115,7 @@ buildNpmPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
brantes
|
||||
xiaoxiangmoe
|
||||
FlameFlag
|
||||
_4evy
|
||||
taranarmo
|
||||
caverav
|
||||
];
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From bdf4159dd5c1cf925512c0eb8490846c084e3c8c Mon Sep 17 00:00:00 2001
|
||||
From: Reepca Russelstein
|
||||
Date: Tue, 24 Jun 2025 22:35:04 -0500
|
||||
Subject: [PATCH] nix: libutil: add <cstdint> include to seccomp.hh.
|
||||
|
||||
* nix/libutil/seccomp.hh (<cstdint>): add include of header.
|
||||
|
||||
Change-Id: I0a0b2892d81dbab662eda1ba80f4736178d70c65
|
||||
---
|
||||
nix/libutil/seccomp.hh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/nix/libutil/seccomp.hh b/nix/libutil/seccomp.hh
|
||||
index 634dfad5f8..a4b449fc66 100644
|
||||
--- a/nix/libutil/seccomp.hh
|
||||
+++ b/nix/libutil/seccomp.hh
|
||||
@@ -4,6 +4,7 @@
|
||||
#include <linux/audit.h> /* For AUDIT_ARCH_* */
|
||||
#include <linux/seccomp.h>
|
||||
#include <linux/filter.h>
|
||||
+#include <cstdint>
|
||||
|
||||
|
||||
/* This file provides two preprocessor macros (among other things):
|
||||
@@ -40,18 +40,14 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "guix";
|
||||
version = "1.5.0";
|
||||
version = "1.5.0-unstable-2026-08-23";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/guix/guix.git";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/g8JMUGM5GaZjtPLnl4vlrBNYMxSTjsHUDdhKLtHaQA=";
|
||||
rev = "bf8a5bce1bdbddc2a0097e153ef06210d637e398";
|
||||
hash = "sha256-Emd26l9buF1P7Dj14ulT6W6lrNC3PSTY4steU1I7T84=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./missing-cstdint-include.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed nix/local.mk -i -E \
|
||||
-e "s|^sysvinitservicedir = .*$|sysvinitservicedir = $out/etc/init.d|" \
|
||||
@@ -161,7 +157,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
Guix is based on the Nix package manager.
|
||||
'';
|
||||
homepage = "https://guix.gnu.org/";
|
||||
changelog = "https://codeberg.org/guix/guix/raw/tag/v${finalAttrs.version}/NEWS";
|
||||
donationPage = "https://guix.gnu.org/donate/";
|
||||
changelog = "https://codeberg.org/guix/guix/raw/commit/${finalAttrs.src.rev}/NEWS";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "guix";
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "Ultra-light MacOS utility that helps hide menu bar icons";
|
||||
homepage = "https://github.com/dwarvesf/hidden";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Powerful menu bar manager for macOS";
|
||||
homepage = "https://icemenubar.app/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
arkivm
|
||||
FlameFlag
|
||||
_4evy
|
||||
stepbrobd
|
||||
];
|
||||
mainProgram = "iina";
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
libjpeg,
|
||||
makeDesktopItem,
|
||||
freetype,
|
||||
mumble,
|
||||
unstableGitUpdater,
|
||||
bc,
|
||||
buildPackages,
|
||||
@@ -49,16 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
libGL
|
||||
openal
|
||||
curl
|
||||
speex
|
||||
opusfile
|
||||
freetype
|
||||
libGL
|
||||
libjpeg
|
||||
libogg
|
||||
libvorbis
|
||||
libjpeg
|
||||
freetype
|
||||
mumble
|
||||
openal
|
||||
opusfile
|
||||
speex
|
||||
];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Set of nine separate and highly configurable menu items that let you know exactly what's going on inside your Mac";
|
||||
homepage = "https://bjango.com/mac/istatmenus/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
eclairevoyant
|
||||
FlameFlag
|
||||
_4evy
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
|
||||
@@ -39,13 +39,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "koboldcpp";
|
||||
version = "1.110";
|
||||
version = "1.119";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LostRuins";
|
||||
repo = "koboldcpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wizg/XkNjWUeF0heK1sQQhfKRlIYBKwJmQ8fIaZ2zdE=";
|
||||
hash = "sha256-WJVbzh4BGLiQdd/rzqSe2Q9PGqMpsqmQNQf33INJkd8=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -131,7 +131,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "koboldcpp";
|
||||
maintainers = with lib.maintainers; [
|
||||
maxstrid
|
||||
FlameFlag
|
||||
_4evy
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
version = "1.30.7";
|
||||
hash = "sha256-d5JNwHLSwY2AbOgTkV+2dSwHAK1JDYG0I7Pet4zzM7Q=";
|
||||
npmDepsHash = "sha256-Imj09aydZBtOpECIkU6oWoxRjTxDyuY3+jBrhL0VtNM=";
|
||||
vendorHash = "sha256-xbajtiWFfXDz430SgJ+C9rqMEl+UcHp6TJj7obKDQH0=";
|
||||
version = "1.31.0";
|
||||
hash = "sha256-2sKrFUFIQEnbov91iBN/ZyG3OR2hbf+drRBXyf32w7w=";
|
||||
npmDepsHash = "sha256-0vU4FtGS5EzSffdgzGSYuz+biR+tqmI30knjczSTGQA=";
|
||||
vendorHash = "sha256-lrPoaVMxClfS2RNQED60QB/2YoxJmmv+sn8timTZ3SU=";
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
nixosTests,
|
||||
writeTextFile,
|
||||
rustc-unwrapped,
|
||||
cacert,
|
||||
}:
|
||||
let
|
||||
rust-jemalloc-sys' = rust-jemalloc-sys.override {
|
||||
@@ -43,8 +44,8 @@ let
|
||||
# The commit on the rocksdb fork, tuwunel-changes branch referenced by the upstream
|
||||
# tuwunel flake.lock:
|
||||
# https://github.com/matrix-construct/tuwunel/blob/main/flake.lock#L557C17-L557C57
|
||||
rev = "0bd7e6d6438d318d66e8374ec1fe24126204f3b3";
|
||||
hash = "sha256-THAHov40punmqm3J9kNYwFXfdRZ2VwjR/+lmFhun/xk=";
|
||||
rev = "eb79ddeff0ea32ebb8f8b69dd1df95c557328e85";
|
||||
hash = "sha256-7hiKaIssPpqB8UTAR4ZE19pZTp09sVGOMht7sAitZAs=";
|
||||
};
|
||||
version = "tuwunel-changes";
|
||||
patches = [ ];
|
||||
@@ -88,16 +89,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-tuwunel";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-construct";
|
||||
repo = "tuwunel";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Csq8eHV2r28POX+Ce1lZ0ybIw5Wt3ABUbWg2W8p2lOw=";
|
||||
hash = "sha256-F9zmYanxCZjXBCh3GvSBiPQC6OFyugThq88MLvhLOyA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mShVBCwd8cwF7K1ILf1gn7ImaxwF73KP2YiDiAJV0f0=";
|
||||
cargoHash = "sha256-TT+dGr3DD9aPWYDxLTYPK0aZpQu64Ja8z+dJJmZQho8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -148,6 +149,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
libredirect.hook
|
||||
cacert
|
||||
];
|
||||
|
||||
# Make sure tuwunel doesn't try to write to arbitrary
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "New, fresh visuals for changing your volume, brightness and now playing media";
|
||||
homepage = "https://wouter01.github.io/MediaMate/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -31,13 +31,13 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "modrinth-app-unwrapped";
|
||||
version = "0.17.5";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modrinth";
|
||||
repo = "code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HNy+3Pmq3TzyC+APMjbRnkHNGkLmAo9gwlhA98rEoTI=";
|
||||
hash = "sha256-epBnuViu9wJR7BkbjhatJhgDUrAFPkj2MyvfSRMw84E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '1.0.0-local' '${finalAttrs.version}'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-xxENtlRwBvizNAlyKk+DdyqZN5YMJmm4CTGv8G6SXA8=";
|
||||
cargoHash = "sha256-7Kl3sQe+A/68yjzX5F9o60x2JehETn7blMScKIr/f9U=";
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
inherit (finalAttrs) pname;
|
||||
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-N4bNjls36V9H5gq4vEBFrjhanMXTGGiTl2Z04YTEUx4=";
|
||||
hash = "sha256-jggr8RPEdBS0s5mNF4rGk+G0jeOWhLU0O7+SUIuNRrA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
ilys
|
||||
FlameFlag
|
||||
_4evy
|
||||
isabelroses
|
||||
];
|
||||
};
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Cursor manager for macOS built using private, nonintrusive CoreGraphics APIs";
|
||||
homepage = "https://github.com/alexzielenski/Mousecape";
|
||||
license = lib.licenses.free;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Beautiful calculator app for macOS";
|
||||
homepage = "https://numi.app/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
homepage = "https://raycast.app/";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "raycast-beta";
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = [ "aarch64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -80,7 +80,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
lovesegfault
|
||||
stepbrobd
|
||||
FlameFlag
|
||||
_4evy
|
||||
jakecleary
|
||||
];
|
||||
platforms = [
|
||||
|
||||
@@ -306,7 +306,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://rectangleapp.com/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
FlameFlag
|
||||
_4evy
|
||||
Intuinewin
|
||||
wegank
|
||||
];
|
||||
|
||||
@@ -80,6 +80,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/rsyslog/rsyslog/commit/f7f774228273730ba1075f4cd457ae78303a8f08.patch";
|
||||
hash = "sha256-ww8Ade2eKrQygJduLMPFjxd/fmBnpQ4ePLEzHffPy90=";
|
||||
})
|
||||
|
||||
# Fix imjournal invalidation reopen busy-loop.
|
||||
# Remove with rsyslog 8.2608.0 or newer.
|
||||
# https://github.com/rsyslog/rsyslog/pull/7384
|
||||
(fetchpatch {
|
||||
name = "imjournal-invalidation-reopen-busy-loop.patch";
|
||||
url = "https://github.com/rsyslog/rsyslog/commit/383f80f21f16c3c94e7d7a57b0a5af12cdac9d75.patch";
|
||||
excludes = [ "ChangeLog" ];
|
||||
hash = "sha256-RlhXoK+dAPBN2wu4V7GoFw/d+uWQzO7+nUkW5+z7QJY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
homepage = "https://shottr.cc/";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "shottr";
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -15,23 +15,23 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsignal-node";
|
||||
version = "0.97.3";
|
||||
version = "0.99.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mRhArmrrbnAfj4JS4OqWA+FEC57Sf/BEqb95KL3JXp0=";
|
||||
hash = "sha256-/DoQZv5tB1q1Zah/sr/pv5bBvM5PQsZH/OWzgkjP0Z4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-obv5XcGD4kkgTPShszxJRTFsOeig9UWyxdE8cyjbsCY=";
|
||||
cargoHash = "sha256-WRHlUnQSrJ5VHfeqzTp6x3fKIFlOPtusAkRJRKvdYb8=";
|
||||
|
||||
npmRoot = "node";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-jTyEnJBEuL8RXT29VYsRW797FPgINm8BvVBmt3m13EA=";
|
||||
hash = "sha256-K/iINhZBBGtquEchcwOniYNz5fNcAux6/eOY8RJUrqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -45,13 +45,13 @@ let
|
||||
webrtc = callPackage ./webrtc.nix { };
|
||||
ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };
|
||||
|
||||
version = "8.21.0";
|
||||
version = "8.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RuGq8ygiZewKqtKQattlqU0pcMMlgdFOJAhmN4J/8Tw=";
|
||||
hash = "sha256-z5Z0ujG2AQvmrrdmJxOAnhi56ISSlGoI4kdMcZMpZzY=";
|
||||
# Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They
|
||||
# are fetched separately below.
|
||||
postFetch = ''
|
||||
@@ -81,7 +81,7 @@ let
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-1n+u0mcZJwjkdKmNY6KE6tk6/UPYuya5WqLrKRJimGw=";
|
||||
hash = "sha256-3hwxTcxVzD5as6WcI3batU1DBKNeEDvGRn+lfSjrJBM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -185,13 +185,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-1n+u0mcZJwjkdKmNY6KE6tk6/UPYuya5WqLrKRJimGw=";
|
||||
hash = "sha256-3hwxTcxVzD5as6WcI3batU1DBKNeEDvGRn+lfSjrJBM=";
|
||||
};
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1785418091;
|
||||
SOURCE_DATE_EPOCH = 1787172744;
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -19,16 +19,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ringrtc";
|
||||
version = "2.70.0";
|
||||
version = "2.70.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "ringrtc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5RPX1SZhVJaSIDjdY2IvInwSI4YHs0y7TK1b9ixaeZc=";
|
||||
hash = "sha256-mHve5E7i9uwx4cZbgRWm8J7+zJbgB6KIw2JqAhjxgoE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tztNtAGYHp+Kh98efwtt51yhRwhqDKeT06Q4B/HrHfQ=";
|
||||
cargoHash = "sha256-Yz8CXMvKunM8u940vWK1M7X6DrPXCGWV9gQ+cv/81LY=";
|
||||
|
||||
preConfigure = ''
|
||||
# Check for matching webrtc version
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "node-sqlcipher";
|
||||
version = "3.3.9";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "node-sqlcipher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eddDeNK8UA6CW1qXZtgS8QpuXVjFO6tVwpFDyYDnX+U=";
|
||||
hash = "sha256-pqb/MhDZxkQDUgs/eP+cRL8b3dfN8VLJo+H8Td9mWoc=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
name = "sqlcipher-signal-exentsion";
|
||||
inherit (finalAttrs) src cargoRoot;
|
||||
hash = "sha256-NtJPwRvjU1WsOxgb2vpokes9eL4DkEcbDaEmML7zsqQ=";
|
||||
hash = "sha256-ChIzjkjIl663lNnOd5oLM1mc5CpLBZS/l82ikyXe/Ac=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-icy7lsgHBofHMJg6Eo2jxkuo9vHVw6P8TXsti2416bg=",
|
||||
"hash": "sha256-UbMIbMpzNmZ1VsCjyGD1SRuBJQEH56peH1GhivHZroM=",
|
||||
"owner": "signalapp",
|
||||
"repo": "webrtc",
|
||||
"tag": "7871d"
|
||||
"tag": "7871e"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -26,10 +26,10 @@
|
||||
},
|
||||
"src/ringrtc/opus/src": {
|
||||
"args": {
|
||||
"hash": "sha256-I1f+J//ZJBMj88+PQhsYBjz3fm4Ll3ckZD+fYa6/3Y0=",
|
||||
"hash": "sha256-VdJhdy9ZwWP0oxoz6OfjCpgYaEkrEH2Y78/TT2VNPYU=",
|
||||
"owner": "xiph",
|
||||
"repo": "opus",
|
||||
"rev": "22244de5a79bd1d6d623c32e72bf1954b56235be"
|
||||
"rev": "3da9f7a6db1c05c3996cb363a9d1931a978bf1be"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
emilytrau
|
||||
FlameFlag
|
||||
_4evy
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
|
||||
@@ -341,7 +341,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/exelban/stats";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
FlameFlag
|
||||
_4evy
|
||||
emilytrau
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
|
||||
@@ -1,28 +1,29 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
libgit2,
|
||||
neovim,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "teamtype";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "teamtype";
|
||||
repo = "teamtype";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-74MufpLTACkPevzOyaXw2Rr7S7VvaFEYHEyTQYwKVT8=";
|
||||
hash = "sha256-FsT1ako/3EIPynWuBqCSiwaZtMnsd7ypJnrh+4EDRwM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/daemon";
|
||||
|
||||
cargoHash = "sha256-OIOffnCC9PlT/SXPOuTnKx3feZnkHP+jzbQIJWX0tzk=";
|
||||
cargoHash = "sha256-gphTpVKbmfYJSUasOCtNgyMKI9JU/if8KcH7Lu3Svjs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -52,6 +53,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
neovim
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace .cargo/config.toml \
|
||||
--replace-fail 'target/debug/teamtype' 'target/${stdenv.hostPlatform.rust.rustcTarget}/release/teamtype'
|
||||
'';
|
||||
|
||||
# watcher tests use FSEvents which hangs in the macOS sandbox
|
||||
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"--skip=watcher::"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
pname = "trezor-suite";
|
||||
version = "26.4.2";
|
||||
version = "26.8.2";
|
||||
|
||||
suffix =
|
||||
{
|
||||
@@ -24,8 +24,8 @@ let
|
||||
hash =
|
||||
{
|
||||
# curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-mE+mzMKAD0NrP2QI5Zc9yEH9vjC6e2cQjzK/CW5Q5FXUg6bGC+uy5fJhxM7Q00YPcNwnoD/vP/qltIa+Y5F8wg==";
|
||||
x86_64-linux = "sha512-DBitrg6RwUUaj3tFv2wVJ2ssuU/QedYILCGkCZQmTHVT1Y/kVs/SCXEm/fX2Ni/aPbMmB6JecslbxGgU5Tftjg==";
|
||||
aarch64-linux = "sha512-vbMku80aY5zTa6ObmkuZNkCeONZYsLxnjVxL7QBv14OcDE+vENQ3lyQzVe+spqufMRhCe3hy2ehpA8CewFQKBA==";
|
||||
x86_64-linux = "sha512-bnosz6dtKFaUXaFHXtJSSChSHbW2bj9CK2Dn5X6btB/Xpcsm9Rbnm3If4qh9w1yQYwTlIDBPTRrh8Mh0BGgcag==";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Vendicated/Vencord";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
FlameFlag
|
||||
_4evy
|
||||
FlafyDev
|
||||
Gliczy
|
||||
NotAShelf
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
makeself,
|
||||
yasm,
|
||||
fuse,
|
||||
fuse3,
|
||||
wxwidgets_3_2,
|
||||
lvm2,
|
||||
replaceVars,
|
||||
@@ -21,9 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "veracrypt";
|
||||
version = "1.26.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2";
|
||||
hash = "sha256-YIJnMeKYK0vSMeOTDoWkQ5EWljhnGhsgDFGPjItGyyo=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "veracrypt";
|
||||
repo = "VeraCrypt";
|
||||
tag = "VeraCrypt_${finalAttrs.version}";
|
||||
hash = "sha256-Q+WUz8F63cP9/KlZUn9xLu2V9wO4FeY7AtErE1T9Km4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -40,7 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./nix-system-paths.patch
|
||||
];
|
||||
|
||||
sourceRoot = "src";
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
buildFlags = [ "WITHFUSE3=1" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeself
|
||||
@@ -49,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
fuse
|
||||
fuse3
|
||||
lvm2
|
||||
wxwidgets_3_2
|
||||
pcsclite
|
||||
@@ -70,10 +74,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Free Open-Source filesystem on-the-fly encryption";
|
||||
homepage = "https://www.veracrypt.fr/";
|
||||
license = with lib.licenses; [
|
||||
asl20 # and
|
||||
unfree # TrueCrypt License version 3.0
|
||||
];
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
asl20 # and
|
||||
unfree # TrueCrypt License version 3.0
|
||||
];
|
||||
maintainers = [ lib.maintainers.ryand56 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "8.1.4087.66";
|
||||
version = "8.1.4087.70";
|
||||
|
||||
suffix =
|
||||
{
|
||||
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
|
||||
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-7cTCzyIb0e+y0Pa6Im0QGBp7J5KhbYWsYEAgTtcNZIw=";
|
||||
x86_64-linux = "sha256-fwwJ07JmPT+6st8aYgvmkQtn6Pc8aP4GcSf1jAnRBAg=";
|
||||
aarch64-linux = "sha256-Px6gpOjM9uRqwNSnluIKdYJV7MaFWxyf/6gns6G94QA=";
|
||||
x86_64-linux = "sha256-8abo9bxEphuM+AK+vFSBLyFCLi26U6D6YlyL9yFnRlk=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -126,7 +126,7 @@ let
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
imadnyc
|
||||
FlameFlag
|
||||
_4evy
|
||||
johnrtitor
|
||||
logger
|
||||
];
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Windows Bootable USB creator for macOS";
|
||||
homepage = "https://github.com/TechUnRestricted/WinDiskWriter";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -171,7 +171,7 @@ python3Packages.buildPythonApplication rec {
|
||||
mainProgram = "yt-dlp";
|
||||
maintainers = with lib.maintainers; [
|
||||
SuperSandro2000
|
||||
FlameFlag
|
||||
_4evy
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 7dcb837f5f953206eead3d28144c3d0e2af85c2c Mon Sep 17 00:00:00 2001
|
||||
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||
Date: Mon, 20 Jul 2026 22:48:38 -0400
|
||||
Subject: [PATCH] Select PKCS#1 padding for XML signatures
|
||||
|
||||
The rsa-sha* XML Signature algorithms require RSASSA-PKCS1-v1_5.
|
||||
Select that padding explicitly instead of relying on the RSA module's
|
||||
signing default, which is PSS in recent releases.
|
||||
|
||||
Require Crypt::OpenSSL::RSA 0.38, the first release whose signing path
|
||||
honors the explicit padding choice.
|
||||
|
||||
Assisted-by: Codex
|
||||
---
|
||||
cpanfile | 2 +-
|
||||
lib/Mojo/XMLSig.pm | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cpanfile b/cpanfile
|
||||
index 6c56caf..149f4a6 100644
|
||||
--- a/cpanfile
|
||||
+++ b/cpanfile
|
||||
@@ -1,5 +1,5 @@
|
||||
requires 'Mojolicious', '7.78'; # tag_to_html
|
||||
-requires 'Crypt::OpenSSL::RSA';
|
||||
+requires 'Crypt::OpenSSL::RSA', '0.38';
|
||||
requires 'Crypt::OpenSSL::X509';
|
||||
requires 'Data::GUID';
|
||||
requires 'Digest::SHA';
|
||||
diff --git a/lib/Mojo/XMLSig.pm b/lib/Mojo/XMLSig.pm
|
||||
index 3ee9db3..2498bbe 100644
|
||||
--- a/lib/Mojo/XMLSig.pm
|
||||
+++ b/lib/Mojo/XMLSig.pm
|
||||
@@ -91,6 +91,7 @@ my $set_algo = sub {
|
||||
unless $key->$isa('Crypt::OpenSSL::RSA');
|
||||
Carp::croak 'Unsupported RSA algorithm'
|
||||
unless my $method = $key->can("use_${algo}_hash");
|
||||
+ $key->use_pkcs1_padding;
|
||||
$key->$method;
|
||||
return $key;
|
||||
};
|
||||
--
|
||||
2.54.0
|
||||
|
||||
@@ -53,6 +53,6 @@ buildPythonPackage {
|
||||
a consistent and modern look across all desktop platforms
|
||||
(Windows, macOS, Linux).
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ FlameFlag ];
|
||||
maintainers = with lib.maintainers; [ _4evy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
SuperSandro2000
|
||||
FlameFlag
|
||||
_4evy
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ in
|
||||
buildLinux (
|
||||
args
|
||||
// rec {
|
||||
version = "7.1.9";
|
||||
version = "7.1.10";
|
||||
pname = "linux-zen";
|
||||
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
|
||||
isZen = true;
|
||||
@@ -27,7 +27,7 @@ buildLinux (
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "0r1c6qpmcdhqdzx27v1wrk6mzwyvwb0ff98bjhf2f1qk9cjk701q";
|
||||
sha256 = "0c01cnamvl3mdc1rm7pjpcy5s6s9yamfkg413zn7k2xwkjig8b08";
|
||||
};
|
||||
|
||||
# This is based on the following source:
|
||||
|
||||
@@ -7702,17 +7702,21 @@ with self;
|
||||
|
||||
CryptOpenSSLRSA = buildPerlPackage {
|
||||
pname = "Crypt-OpenSSL-RSA";
|
||||
version = "0.35";
|
||||
version = "0.41";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.35.tar.gz";
|
||||
hash = "sha256-XuvVWsBxY0yGSo549c+vuq9Dz4TAQyOgm3Hddr8CXMI=";
|
||||
url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Crypt-OpenSSL-RSA-0.41.tar.gz";
|
||||
hash = "sha256-gvqDmJe4jpwkW2Jl874m07yHnK5MeoFR+tSjB8M2aCI=";
|
||||
};
|
||||
propagatedBuildInputs = [ CryptOpenSSLRandom ];
|
||||
propagatedBuildInputs = [
|
||||
CryptOpenSSLBignum
|
||||
CryptOpenSSLRandom
|
||||
];
|
||||
env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
|
||||
env.NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto";
|
||||
env.OPENSSL_PREFIX = pkgs.openssl;
|
||||
buildInputs = [ CryptOpenSSLGuess ];
|
||||
meta = {
|
||||
homepage = "https://github.com/cpan-authors/Crypt-OpenSSL-RSA";
|
||||
description = "RSA encoding and decoding, using the openSSL libraries";
|
||||
license = with lib.licenses; [
|
||||
artistic1
|
||||
@@ -22941,6 +22945,9 @@ with self;
|
||||
url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-SAML-0.07.tar.gz";
|
||||
hash = "sha256-csJMrNtvHXp14uqgBDfHFKv1eafSENSqTT8g8e/0cQ0=";
|
||||
};
|
||||
patches = [
|
||||
../development/perl-modules/MojoSAML-select-PKCS-1-padding.patch
|
||||
];
|
||||
buildInputs = [ ModuleBuildTiny ];
|
||||
propagatedBuildInputs = [
|
||||
CryptOpenSSLRSA
|
||||
|
||||
Reference in New Issue
Block a user