Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -143,6 +143,8 @@
|
||||
|
||||
- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
|
||||
|
||||
- `nomad` has been updated to v1.11. Refer to the [release note](https://developer.hashicorp.com/nomad/docs/release-notes/nomad/v1-11-x) for more details. Once a new Nomad version has started and upgraded it's data directory, it generally cannot be downgraded to the previous version.
|
||||
|
||||
- The default NVIDIA drivers no longer support Maxwell (GTX 1xxx) or older GPUs. Pin the nvidia package to ` config.boot.kernelPackages.nvidiaPackages.legacy_580` for continued support.
|
||||
|
||||
- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).
|
||||
|
||||
@@ -3635,6 +3635,11 @@
|
||||
githubId = 114744388;
|
||||
name = "bloominstrong";
|
||||
};
|
||||
blooym = {
|
||||
name = "Lyna";
|
||||
github = "Blooym";
|
||||
githubId = 19539165;
|
||||
};
|
||||
bloveless = {
|
||||
email = "brennon.loveless@gmail.com";
|
||||
github = "bloveless";
|
||||
@@ -27993,6 +27998,13 @@
|
||||
githubId = 2130305;
|
||||
name = "Marek Fajkus";
|
||||
};
|
||||
turebentzin = {
|
||||
name = "Ture Bentzin";
|
||||
email = "ture.bentzin@alumni.fh-aachen.de";
|
||||
github = "turebentzin";
|
||||
githubId = 38729194;
|
||||
keys = [ { fingerprint = "4868 4B0F D531 473E C82A 641E F1E6 70A1 ED8E 92CE"; } ];
|
||||
};
|
||||
turion = {
|
||||
email = "programming@manuelbaerenz.de";
|
||||
github = "turion";
|
||||
@@ -29382,6 +29394,12 @@
|
||||
githubId = 9132420;
|
||||
keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ];
|
||||
};
|
||||
wolfram444 = {
|
||||
name = "Xabibulloh To'xtayev";
|
||||
email = "kamiltox2006@gmail.com";
|
||||
github = "woolfram444";
|
||||
githubId = 109225370;
|
||||
};
|
||||
womeier = {
|
||||
name = "Wolfgang Meier";
|
||||
email = "womeier@posteo.de";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-augment";
|
||||
publisher = "augment";
|
||||
version = "0.789.1";
|
||||
hash = "sha256-RQg4XnFJhTttphjhR+arfRibCs0Y9ITvryrsq+hvFhQ=";
|
||||
version = "0.825.5";
|
||||
hash = "sha256-UKkrdxHlbcdpd3RQxNpZVBINZlncPv7e5RETnj/19Ts=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,19 +14,19 @@ let
|
||||
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "roo-code-${finalAttrs.version}.vsix";
|
||||
pname = "roo-code-vsix";
|
||||
version = "3.51.1";
|
||||
version = "3.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RooCodeInc";
|
||||
repo = "Roo-Code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HpLL466mzDvNf7twW0a3dDUvgveRm0tbCOXGymTW+tA=";
|
||||
hash = "sha256-DvuL1WByEJER+v73pCvwNdRNfM8j+c1VQGGjAyV79p8=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-Q97MDHl22lIF84/J3UW53dCD7oaN3Y6R32xhjRDBmpw=";
|
||||
hash = "sha256-kQjxcqHEClQtG6x2QM1/zixN6rvcEivX8vicNydDdOw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -80,7 +80,7 @@ rec {
|
||||
# Upstream partially documents used Go versions here
|
||||
# https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
|
||||
|
||||
nomad = nomad_1_10;
|
||||
nomad = nomad_1_11;
|
||||
|
||||
nomad_1_11 = generic {
|
||||
buildGoModule = buildGo125Module;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-color-monitor";
|
||||
version = "0.9.3";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norihiro";
|
||||
repo = "obs-color-monitor";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TwsEIOgQjj1wza7i8nne63oBM3FB6GmMjCq8/PuiWHs=";
|
||||
hash = "sha256-2TjkPsudGwB2TNdfVnRqMiUQquAnCdBEmG9N9JLfewo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From 815bf49134f9dc049080b0ec4eb2fd807c23086b Mon Sep 17 00:00:00 2001
|
||||
From: azban <me@azban.net>
|
||||
Date: Mon, 6 Apr 2026 19:49:19 -0600
|
||||
Subject: [PATCH 1/2] remove hard-coded vendor paths
|
||||
|
||||
Hard-coded vendored sources is not compatible with fetchCargoVendor.
|
||||
|
||||
Signed-off-by: azban <me@azban.net>
|
||||
---
|
||||
.cargo/config.toml.in | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
|
||||
index d7d8ff4d4..e69de29bb 100644
|
||||
--- a/.cargo/config.toml.in
|
||||
+++ b/.cargo/config.toml.in
|
||||
@@ -1,6 +0,0 @@
|
||||
-[source.crates-io]
|
||||
-registry = "https://github.com/rust-lang/crates.io-index"
|
||||
-@rust_vendor_sources@
|
||||
-
|
||||
-[source.vendored-sources]
|
||||
-directory = "./vendor"
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -57,11 +57,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/389ds/389-ds-base/commit/1701419551c246e9dc21778b118220eeb2258125.patch";
|
||||
hash = "sha256-trzY/fDH3rs66DWbWI+PY46tIC9ShuVqspMHqEEKZYA=";
|
||||
})
|
||||
./0001-remove-hard-coded-vendor-paths.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/389ds/389-ds-base/security/advisories/GHSA-4qwg-c5j2-q4hp
|
||||
name = "CVE-2025-14905.patch";
|
||||
url = "https://github.com/389ds/389-ds-base/commit/2e424110def2e3998f6045e136fb0d43f47b7f5a.patch";
|
||||
hash = "sha256-ItxG0bnuNPWLClL677rChTDvDWXxJ2L6ygx4VY2v80w=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoRoot = "src";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
inherit (finalAttrs) src cargoRoot;
|
||||
name = "389-ds-base-${finalAttrs.version}";
|
||||
hash = "sha256-pNzMQjeBpmzFg6oWCxhLDmKGUKIW6jGmZQWai5Yunjc=";
|
||||
};
|
||||
@@ -74,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
cargo
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
]
|
||||
++ lib.optional withCockpit rsync;
|
||||
|
||||
@@ -106,10 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./autogen.sh --prefix="$out"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
ln -s ${finalAttrs.cargoDeps} ./vendor
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-rust-offline"
|
||||
"--enable-autobind"
|
||||
|
||||
@@ -69,6 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"MSYSTEM=1"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
@@ -103,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preBuild
|
||||
|
||||
for component in Bundles/{Alone,Alone2,Alone7z,Format7zF,SFXCon} UI/Console; do
|
||||
make -j $NIX_BUILD_CORES -C CPP/7zip/$component -f ${makefile} $makeFlags
|
||||
make -j $NIX_BUILD_CORES -C CPP/7zip/$component -f ${makefile} "''${makeFlags[@]}"
|
||||
done
|
||||
|
||||
runHook postBuild
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"url": "https://web.archive.org/web/20251201151010/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
|
||||
"sha256": "12l1ghjcaxqi80bpxqwvsy3krz7qkdcg3zcvvif3g3hvqz5wc31s",
|
||||
"version": "3.45.0"
|
||||
"url": "https://web.archive.org/web/20260401131728/https://nav.gov.hu/pfile/programFile?path=%2Fnyomtatvanyok%2Fletoltesek%2Fnyomtatvanykitolto_programok%2Fnyomtatvany_apeh%2Fkeretprogramok%2FAbevJava",
|
||||
"sha256": "1y6p2h7y7a376k2y02sx77gxm1jndfg9ikmz1z5nikk1klp5sdmw",
|
||||
"version": "3.48.0"
|
||||
}
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ashell";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MalpenZibo";
|
||||
repo = "ashell";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nQrBW2pfsExHERGZzJqMG7MskzsJ3zwVyoX6wJZBils=";
|
||||
hash = "sha256-X9TU866PAzaf52qKsCpeJvwE0suu1lJndHNQdPg51HM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F8oh8uQFthx5gex/ovKADO+ukqzIbmlBM5+shej/OTA=";
|
||||
cargoHash = "sha256-nhYbehlgB8pzMoj39G0BHRca9mIT+0QjUaebCx+DDE0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "asn";
|
||||
version = "0.80.5";
|
||||
version = "0.81.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nitefood";
|
||||
repo = "asn";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o+qyNxEV2lPRsCNkkcZbj07hKw4eV45qhB8G34OWmgg=";
|
||||
hash = "sha256-HPLdi5Eok06jnToWPn1bGnnAGirGV8zGFoDsKsMvrI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "assemblyscript";
|
||||
version = "0.28.2";
|
||||
version = "0.28.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssemblyScript";
|
||||
repo = "assemblyscript";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8nY3Rst6i+RGW+kfjn/QSbYkaZf67k/KwuyIp40fCSM=";
|
||||
hash = "sha256-AN9W6IYmMFFiD1Au3uW+7jr2xOwVcOGd5e61cqVNnbs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-wj/PMoqUBjXqz8/KOFAH5P5eFty3pztpQ8inGIy+ve4=";
|
||||
npmDepsHash = "sha256-5s420YWTc4bZ5oZRBjinw4lAfMTPrnrIWx4IM3Ysuqo=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/AssemblyScript/assemblyscript";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atlantis";
|
||||
version = "0.39.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/p8NfggweRHz8+BBrD/d166HJmDLkDzWloWearfqwVg=";
|
||||
hash = "sha256-OnZ+rygG6TpPkZzU4UBmfnxkRrSyFWEn/rEqwpXhMio=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-d137hKsd1GrVW2fXZJTUCQmOayolSjNiJNmoOtj3ZkE=";
|
||||
vendorHash = "sha256-aAIiDFiaWRTYfmC4yqVRXtNRLrvdtLbUAV6lC3QYhdc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "az-pim-cli";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netr0m";
|
||||
repo = "az-pim-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xc8DHsb+cwXQYlffP/n/ejP/qcvnmMrgVnEeWo4Wih8=";
|
||||
hash = "sha256-3SC3iYW5TN5ljUr1g7aBXJsdAD03C4M+99Wtue8Sm7Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.BazeliskVersion=${finalAttrs.version}"
|
||||
"-X github.com/bazelbuild/bazelisk/core.BazeliskVersion=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
bison,
|
||||
flex,
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -27,9 +28,13 @@ stdenv.mkDerivation {
|
||||
|
||||
postPatch = ''
|
||||
# Drop blanket -Werror to avoid build failure on fresh toolchains
|
||||
# and libraries. Without the cnage build fails on gcc-13 and on
|
||||
# and libraries. Without the change build fails on gcc-13 and on
|
||||
# openssl-3.
|
||||
substituteInPlace src/Makefile.am --replace-fail ' -Werror ' ' '
|
||||
# Fix incompatible function pointer type for cmp in list_t
|
||||
# The cmp function pointer is declared as taking no arguments but is
|
||||
# used with qsort-style callback signature (const void *, const void *)
|
||||
substituteInPlace src/util.h --replace-fail 'int (*cmp)()' 'int (*cmp)(const void *, const void *)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -44,6 +49,10 @@ stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "-v";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "IRC proxy (bouncer)";
|
||||
homepage = "http://bip.milkypond.org/";
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.9";
|
||||
version = "2.1.10";
|
||||
|
||||
jdk = zulu25.override { enableJavaFX = true; };
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
|
||||
hash = "sha256-E7GV4YGbF0Nj6aWVqJNUUpwLH1G5v5bEQamHP7OUzQY=";
|
||||
hash = "sha256-e1b2F4JKm7i7iMEqi+OTBryScWWhdvLJW3iKecQgqvg=";
|
||||
|
||||
# Verify the upstream Debian package prior to extraction.
|
||||
# See https://bisq.wiki/Bisq_2#Installation
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
signature = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
|
||||
hash = "sha256-bNZNRbm9uNGfLzGvshXNaRLUNX38Uz58GGy6WqJwV1E=";
|
||||
hash = "sha256-2B8rmNwCcJ/cSv7P0FYi2DlRcWkG0o0lMFPsr5zaoIk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
@@ -14,19 +15,13 @@ stdenvNoCC.mkDerivation {
|
||||
hash = "sha256-nn7TGeVm45t7QI8+eEREBTFg9aShYYKtdEYEwQwO2fQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
description = "Droid Sans Mono Slashed + Hasklig-style ligatures";
|
||||
homepage = "https://github.com/marnen/borg-sans-mono";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ pancaek ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@ stdenv.mkDerivation {
|
||||
patches = [
|
||||
./work-around-API-borkage.patch
|
||||
./libapp-include-ctype.diff
|
||||
./use-stdbool.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/tmp/orig_base.h b/libapp/libapp/base.h
|
||||
index 7d8abdb..2f42b03 100644
|
||||
--- a/tmp/orig_base.h
|
||||
+++ b/libapp/libapp/base.h
|
||||
@@ -1,12 +1,7 @@
|
||||
#ifndef APP_BASE_H
|
||||
#define APP_BASE_H
|
||||
|
||||
-#ifndef __cplusplus
|
||||
-typedef enum {
|
||||
- false = 0,
|
||||
- true = 1
|
||||
-} bool;
|
||||
-#endif
|
||||
+#include <stdbool.h>
|
||||
|
||||
#define ASSERT(clause) if( !clause) { fprintf(stderr, "Assertion '%s' failed at %s:%d\n", #clause, __FILE__, __LINE__ ); exit(-1); }
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.88.138";
|
||||
version = "1.89.132";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-8qsWJeHsSPukHbsYIssELvr5Sq6TIxnDzXak/eQrwYk=";
|
||||
hash = "sha256-mYY8eyMWcwx6RuMNP5ucf6xd1NXfYO4nqXEkiTUtX0o=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-Z1cXDihjzrVTj9XsG9ral8NMZSdPqL4q8VIZ2Ee05Qc=";
|
||||
hash = "sha256-/SmzRSgmXM567D1YQdD/IfDaIe3RPLtgJMYvcOCwvZo=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-yDBGo/J2b5iu9e4NvXN3EgYEDYaMq1V9MVb9xeGHpHo=";
|
||||
hash = "sha256-3f29ehqJNQjYJ+vh15ZI2UJEB1VdBfLL3VWv8CRasCw=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-RzLlDoyqPdL51aDD4/3r+f8sO4Tz8Osso50fsFR3iBc=";
|
||||
hash = "sha256-KIod2FbWck1OUATr/vKK+vgwIih3Lha48MAdt5qNIAk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "buffrs";
|
||||
version = "0.12.2";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helsing-ai";
|
||||
repo = "buffrs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xwIJeXbXBotx/1ZsvCSaUlttkTYi2Ceq6MvFPwp2bj8=";
|
||||
hash = "sha256-DTA30wVgThUu76AHWcpxAiOQZf92N6hMDPUHOUjg1vA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-d8eCd6WKRX4RJKA9Z5D2Or9MgxU0VMqt/FoF1GnryAI=";
|
||||
cargoHash = "sha256-c8Y81+IUpOWWlCsnltFWgbWW9I2ZkardzT94wGTKMVo=";
|
||||
|
||||
# Disabling tests meant to work over the network, as they will fail
|
||||
# inside the builder.
|
||||
|
||||
@@ -12,11 +12,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "c2000-cgt";
|
||||
version = "22.6.1.LTS";
|
||||
version = "25.11.0.LTS";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-xqxJ05PLfM/${finalAttrs.version}/ti_cgt_c2000_${finalAttrs.version}_linux-x64_installer.bin";
|
||||
hash = "sha256-h+exdlyD7Bj3LZTDVME8jHesInaUUUUmFiIKJR+rM9o=";
|
||||
hash = "sha256-vkxV7/D3I4Uf7q3KBwdjEq9rn4DTPNMUm1NSuMYQEbM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -40,11 +40,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "9.6.0";
|
||||
version = "9.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xNdA1QoMLjisM68Q6BU2bL0tCEagba/KMAjqr+Lwm+o=";
|
||||
hash = "sha256-FmEflROGdI6DSBlCPgk4k1dV5AIwHvB6pY+E9ItpQgE=";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
libx11,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -17,10 +16,9 @@ buildGoModule (finalAttrs: {
|
||||
sha256 = "sha256-2Feb2+7UJ+39waO9rFyT3ZDlEdS5s3uLuxUiDh4iuJE=";
|
||||
};
|
||||
|
||||
# clipboard functionality not working on Darwin
|
||||
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
|
||||
ldflags = [
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
diff --git a/src/path.h b/src/path.h
|
||||
--- a/src/path.h
|
||||
+++ b/src/path.h
|
||||
@@ -232,7 +232,7 @@
|
||||
*/
|
||||
path operator+(std::string const & str) const {
|
||||
path p(*this);
|
||||
- p.append(str);
|
||||
+ p.push_back(str);
|
||||
return p;
|
||||
}
|
||||
@@ -18,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
# fix compile error in configure.ac
|
||||
./fix-big-endian-config-check.diff
|
||||
# Fix GCC 15 build: path::operator+ calls a nonexistent append() member.
|
||||
./fix-path-operator-plus.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "container";
|
||||
version = "0.9.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-installer-signed.pkg";
|
||||
hash = "sha256-6KQysR85bVzlDkTqFPAvffkP/O9EHJFrL6krY+lfWAE=";
|
||||
url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg";
|
||||
hash = "sha256-kGNqRgOmaeurQZuuHh2dMijAFWxJAiY8ksGdBQMPQEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "copilot-language-server";
|
||||
version = "1.463.0";
|
||||
version = "1.467.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
|
||||
hash = "sha256-mxmHXLxWGb+cHrRgctX2PHGAVy4ZTY1+7C9gzeh0vdc=";
|
||||
hash = "sha256-JSxuYBeMKTiBOSQk4IGcst0YYcXGi4V0D4EkJfEbPzo=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
which,
|
||||
sqlite,
|
||||
lua5_1,
|
||||
lua5_4,
|
||||
perl,
|
||||
python3,
|
||||
zlib,
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crawl${lib.optionalString tileMode "-tiles"}";
|
||||
version = "0.33.1";
|
||||
version = "0.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crawl";
|
||||
repo = "crawl";
|
||||
rev = version;
|
||||
hash = "sha256-GXrYLGoQ1UwDHs+kLLcaBNpJ2BVMv4NhmpyfNFxPmg8=";
|
||||
hash = "sha256-exntfZbGEDBwFA8AHhOoBPIXw/MDrHx5oxrxPDixpCc=";
|
||||
};
|
||||
|
||||
# Patch hard-coded paths and remove force library builds
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Still unstable with luajit
|
||||
buildInputs = [
|
||||
lua5_1
|
||||
lua5_4
|
||||
zlib
|
||||
sqlite
|
||||
ncurses
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.55.0";
|
||||
version = "0.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7rndFGEeRiCd9wSu/TSjbvMVSIb2JMmLEqaIFdR0av4=";
|
||||
hash = "sha256-JtqgEI09kRg/uW/2fxMQL5+cmODO2y6aW1e5OXTH2LY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-leQHNLt3WebIvV/2nY+Lo+SVOV2SQ8EL9Mopu4lro9s=";
|
||||
vendorHash = "sha256-n5pqIxN2TwiEWd3ZzFHqYSIKYPsMYAip3kDRx4ajuck=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,19 +6,19 @@
|
||||
pkg-config,
|
||||
imagemagick,
|
||||
libimagequant,
|
||||
lua,
|
||||
luajit,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cwal";
|
||||
version = "0.8.2";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nitinbhat972";
|
||||
repo = "cwal";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CvC7I0/Obn/IEXmbr8Hs7YqUk6NPgduJpDCNCHwU8lA=";
|
||||
hash = "sha256-/5l/Wc85ElB0V1j2tCW5CXKJKvhz6vb6V696d8UPM0c=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
imagemagick
|
||||
libimagequant
|
||||
lua
|
||||
luajit
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dcp";
|
||||
version = "0.22.11";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "dcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pf3vUmdUHUuPts7bwzjxGF3RXpWXz3HaHujz8UKSPbs=";
|
||||
hash = "sha256-gpMH6oeFbfRuRiIoLXTeqCSyaGr6aS9Y1zq5x1bEiZw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n+F7YPU6/UfxN1nZ+K5UvIR7vav/trRPWdLc1izpNAU=";
|
||||
vendorHash = "sha256-JO8++V4LyzX6aDdZNdzDD3EqdUdVvT4Jsjh/e6nqVgs=";
|
||||
|
||||
# This is required so we:
|
||||
# - Delete an inconsistent vendor directory from upstream
|
||||
|
||||
@@ -27,19 +27,19 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deadlock-mod-manager";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadlock-mod-manager";
|
||||
repo = "deadlock-mod-manager";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Z2w/92P/3PpFDcT1rhO3X4gyoV+l9uLb4jZ4Ixz6ck=";
|
||||
hash = "sha256-+64Y6BFwgQIQhmFzZXOeJ/IGFn+OXV58I/ZdARVFt4w=";
|
||||
};
|
||||
|
||||
cargoRoot = "apps/desktop";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-MQog4ro5NWXmyS5aPZBb7K4LwfIDzxdhGZjWlh5LelE=";
|
||||
cargoHash = "sha256-6ljyPdobcoBaYyarc7Iin5N24y1YXPafrYAk2xvBtvY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
sourceRoot = "source";
|
||||
hash = "sha256-vZvQrKiuKlwY2+QCpsG2nm8uA0hmX0MOk603EcKbyOg=";
|
||||
hash = "sha256-fFcKyqAo/HpGBaEJMk6Lq0FafNXrGu9z9nHnav5d6Hg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
|
||||
substituteInPlace Makefile --replace "-Werror" ""
|
||||
# avoid host-specific options
|
||||
substituteInPlace Makefile --replace "-march=native" ""
|
||||
# fix signal handler signature
|
||||
substituteInPlace src/main.c --replace-fail "void handle_signal()" "void handle_signal(int sig)"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@@ -17,16 +17,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dovi-tool";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quietvoid";
|
||||
repo = "dovi_tool";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4C9d8Rt1meV6Pcdnf2SaiWGA97sRj2WmvKsf1rC01Bs=";
|
||||
hash = "sha256-8UG3p84wjuPpnwcz65dyDbLDaoFXtokxNvnldBZHqwc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Dg6IDcYm3qTSyE5kVgZ8Yka8538KDFyBN+weUyAfQT8=";
|
||||
cargoHash = "sha256-nr2F+QZurNN/iCFW62LZaheZkuCGId4TSRuYd1yYH88=";
|
||||
|
||||
nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
pkg-config
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "e-imzo";
|
||||
version = "5.00";
|
||||
version = "6.3.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.xinux.uz/e-imzo/E-IMZO-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-jPAZu98prkC4NQlfA8/kJuw9qdCrSSSyzySSWPlIXpY=";
|
||||
hash = "sha256-XjS9FAIqMc9tV1aeO8D6dP9hg7ppPE/iRHX/pmzfZmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
install -m 755 -d $out/lib/e-imzo
|
||||
install -m 644 ./E-IMZO.jar $out/lib/e-imzo/
|
||||
install -m 644 ./E-IMZO.pem $out/lib/e-imzo/
|
||||
install -m 644 ./truststore.jks $out/lib/e-imzo/
|
||||
cp -r ./lib $out/lib/e-imzo/
|
||||
|
||||
makeWrapper ${jre8}/bin/java $out/bin/e-imzo \
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
@@ -13,14 +14,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
hash = "sha256-F6BzwnrsaELegdo6Bdju1OG+RI9zKnn4tIASR3q6zYk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
install *.otf $out/share/fonts/opentype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
description = "Text font for musical scores";
|
||||
|
||||
@@ -10,23 +10,20 @@
|
||||
libsndfile,
|
||||
libzip,
|
||||
pkg-config,
|
||||
rubberband,
|
||||
stdenv,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.2.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit version;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "elektroid";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagargo";
|
||||
repo = "elektroid";
|
||||
rev = version;
|
||||
hash = "sha256-gK6WQA0KenyksLLFHejCXDTpBm2uhJwn6/E4TXUdeJ8=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ozpc2+sXOedmYYXdIH6HibGszLyKsT8QYS0Trhem6kI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -42,6 +39,7 @@ stdenv.mkDerivation {
|
||||
libsamplerate
|
||||
libsndfile
|
||||
libzip
|
||||
rubberband
|
||||
zlib
|
||||
];
|
||||
|
||||
@@ -51,4 +49,4 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ camelpunch ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -24,13 +24,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "faas-cli";
|
||||
version = "0.18.7";
|
||||
version = "0.18.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfaas";
|
||||
repo = "faas-cli";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-K1VKMlf6B+o0UEmuCtBlVpsUEMJ2d0GiFAmL4zmFuWY=";
|
||||
sha256 = "sha256-JiIKCrNH6aWiCqw1ji5RwNrHwLHuSbw/iwqzrumfQQQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fastly";
|
||||
version = "14.2.0";
|
||||
version = "14.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Pz1lK/A4PK41SNZgXLh041a8KQMH8zDuQevWQReffYU=";
|
||||
hash = "sha256-lUhBSx6iPKk4j4jkSaSM4UrJkX84XJVgziayRlZ7bcg=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-/pLaVfP/qnfcGNClhkhYB3Au8tEz1Tiw2HM7IiKfhPs=";
|
||||
vendorHash = "sha256-XzfsPSG0gEXhlAF9O3VGNn8FGXlvXFxqX7kffQDdsRA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"balanced_text": "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=",
|
||||
"flutter_user_certificates_android": "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=",
|
||||
"isar": "sha256-Wg1m/HM7UnK+aC1DOyY41Bo4HuLrEaAxCtQw12ZrnN0=",
|
||||
"isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=",
|
||||
"isar_generator": "sha256-fM8ygT6il7TdjmeTdmk8o4exc3Z/F1tYF878eoDK37E=",
|
||||
"just_audio": "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=",
|
||||
"just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=",
|
||||
"media_kit_libs_windows_audio": "sha256-XAObjn7wcN4qA7MW+hKqjNZv/L2Ec8t/cTF+d2ZoZ+k=",
|
||||
"palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=",
|
||||
"smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=",
|
||||
"split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="
|
||||
}
|
||||
@@ -1,46 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
flutter338,
|
||||
flutter341,
|
||||
mpv-unwrapped,
|
||||
patchelf,
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
runCommand,
|
||||
yq,
|
||||
finamp,
|
||||
_experimental-update-script-combinators,
|
||||
nix-update-script,
|
||||
dart,
|
||||
}:
|
||||
let
|
||||
version = "0.9.22-beta";
|
||||
version = "0.9.23-beta";
|
||||
in
|
||||
flutter338.buildFlutterApplication {
|
||||
flutter341.buildFlutterApplication {
|
||||
inherit version;
|
||||
pname = "finamp";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmshrv";
|
||||
owner = "UnicornsOnLSD";
|
||||
repo = "finamp";
|
||||
rev = version;
|
||||
hash = "sha256-SPt1p9+uyvfSry8Ry2BJyLC7HyWZe43wfAPK9BVkcnc=";
|
||||
hash = "sha256-N1+6rB16geFMYMbfiF7eppnXfXC/pqv90I9aY/57lKI=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = lib.importJSON ./git-hashes.json;
|
||||
|
||||
nativeBuildInputs = [
|
||||
patchelf
|
||||
copyDesktopItems
|
||||
];
|
||||
buildInputs = [ mpv-unwrapped ];
|
||||
|
||||
gitHashes = {
|
||||
balanced_text = "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=";
|
||||
isar_generator = "sha256-EthUFM+YI3bnM0U0sECoNOCRXpo4qjP71VXYBuO/u+I=";
|
||||
isar_flutter_libs = "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=";
|
||||
media_kit_libs_windows_audio = "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs=";
|
||||
palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=";
|
||||
split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=";
|
||||
flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=";
|
||||
smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=";
|
||||
just_audio = "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=";
|
||||
just_audio_media_kit = "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
patchelf $out/app/$pname/finamp --add-needed libisar.so --add-needed libmpv.so --add-needed libflutter_discord_rpc.so --add-rpath ${
|
||||
lib.makeLibraryPath [ mpv-unwrapped ]
|
||||
@@ -70,11 +66,42 @@ flutter338.buildFlutterApplication {
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
nativeBuildInputs = [ yq ];
|
||||
inherit (finamp) src;
|
||||
}
|
||||
''
|
||||
cat $src/pubspec.lock | yq > $out
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script { extraArgs = [ "--version=unstable" ]; })
|
||||
(
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "finamp.pubspecSource" ./pubspec.lock.json)
|
||||
// {
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
)
|
||||
{
|
||||
command = [
|
||||
dart.fetchGitHashesScript
|
||||
"--input"
|
||||
./pubspec.lock.json
|
||||
"--output"
|
||||
./git-hashes.json
|
||||
];
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
# Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/jmshrv/finamp/issues/766
|
||||
# Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/UnicornsOnLSD/finamp/issues/766
|
||||
broken = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64;
|
||||
description = "Open source Jellyfin music player";
|
||||
homepage = "https://github.com/jmshrv/finamp";
|
||||
homepage = "https://github.com/UnicornsOnLSD/finamp";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ dseelp ];
|
||||
mainProgram = "finamp";
|
||||
|
||||
@@ -30,6 +30,16 @@
|
||||
"source": "hosted",
|
||||
"version": "0.13.0"
|
||||
},
|
||||
"ansicolor": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "ansicolor",
|
||||
"sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.3"
|
||||
},
|
||||
"app_links": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -325,11 +335,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "characters",
|
||||
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
|
||||
"sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"checked_yaml": {
|
||||
"dependency": "transitive",
|
||||
@@ -491,6 +501,16 @@
|
||||
"source": "hosted",
|
||||
"version": "3.0.7"
|
||||
},
|
||||
"csslib": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "csslib",
|
||||
"sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.2"
|
||||
},
|
||||
"custom_lint": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
@@ -773,6 +793,16 @@
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"flutter_native_splash": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "flutter_native_splash",
|
||||
"sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.7"
|
||||
},
|
||||
"flutter_plugin_android_lifecycle": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1006,6 +1036,16 @@
|
||||
"source": "hosted",
|
||||
"version": "4.3.0"
|
||||
},
|
||||
"html": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "html",
|
||||
"sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.15.6"
|
||||
},
|
||||
"http": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1089,18 +1129,19 @@
|
||||
"isar": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "isar",
|
||||
"sha256": "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea",
|
||||
"url": "https://pub.dev"
|
||||
"path": "packages/isar",
|
||||
"ref": "a602cd8999048faba043f7e1ce7ba92f4d812762",
|
||||
"resolved-ref": "a602cd8999048faba043f7e1ce7ba92f4d812762",
|
||||
"url": "https://github.com/Komodo5197/isar-community.git"
|
||||
},
|
||||
"source": "hosted",
|
||||
"source": "git",
|
||||
"version": "3.1.0+1"
|
||||
},
|
||||
"isar_flutter_libs": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "HEAD",
|
||||
"ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
|
||||
"resolved-ref": "59103190aa2ac03041d61ad6d127b540be079ec8",
|
||||
"url": "https://github.com/MrLittleWhite/isar_flutter_libs.git"
|
||||
},
|
||||
@@ -1284,21 +1325,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "matcher",
|
||||
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
|
||||
"sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.17"
|
||||
"version": "0.12.18"
|
||||
},
|
||||
"material_color_utilities": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "material_color_utilities",
|
||||
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
|
||||
"sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.11.1"
|
||||
"version": "0.13.0"
|
||||
},
|
||||
"media_kit": {
|
||||
"dependency": "transitive",
|
||||
@@ -2114,11 +2155,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
|
||||
"sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.7"
|
||||
"version": "0.7.9"
|
||||
},
|
||||
"threshold": {
|
||||
"dependency": "transitive",
|
||||
|
||||
Generated
-3145
File diff suppressed because it is too large
Load Diff
@@ -1,35 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchCrate,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fontc";
|
||||
version = "0.3.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "fontc";
|
||||
tag = "fontc-v${finalAttrs.version}";
|
||||
hash = "sha256-Zr2nJRNY1vLGhVOGC3KSWbd4cQReO/F8Wgzx3y/qPFc=";
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-TjbhVkhoIoyp6A33v/QVaNLoHxB5whT/gOlehQTUKxM=";
|
||||
};
|
||||
buildAndTestSubdir = "fontc";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tidy-sys-0.8.2" = "sha256-Okt+mqakdwm0OlD4UXBtQIbO+Wmlk6jTMWi9Q5Y1M2o=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-FLvEgIFgLE++59j5LeCRC4ptgRhAiDF7hani4Yh8kn0=";
|
||||
|
||||
# skip `cargo test` because source code from crates.io doesn't include necessary resources for testing
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Wherein we pursue oxidizing fontmake";
|
||||
homepage = "https://github.com/googlefonts/fontc";
|
||||
changelog = "https://github.com/googlefonts/fontc/releases/tag/${finalAttrs.src.tag}";
|
||||
changelog = "https://github.com/googlefonts/fontc/releases/tag/fontc-v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ shiphan ];
|
||||
mainProgram = "fontc";
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/runtime/splitter/batch.rs b/src/runtime/splitter/batch.rs
|
||||
index 9b1bc21..d7eeaa0 100644
|
||||
--- a/src/runtime/splitter/batch.rs
|
||||
+++ b/src/runtime/splitter/batch.rs
|
||||
@@ -1137,7 +1137,7 @@ mod generic {
|
||||
macro_rules! iterate {
|
||||
($buf:expr) => {{
|
||||
#[cfg(feature = "unstable")]
|
||||
- std::intrinsics::prefetch_read_data($buf.offset(128), 3);
|
||||
+ std::intrinsics::prefetch_read_data::<_, 3>($buf.offset(128));
|
||||
let (s, mask, nl) = f(state, $buf);
|
||||
state = s;
|
||||
(mask, nl)
|
||||
@@ -27,8 +27,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoHash = "sha256-VraFR3Mp4mPh+39hw88R0q1p5iNkcQzvhRVNPwSxzU0=";
|
||||
|
||||
patches = [
|
||||
# This patch comes from https://github.com/ezrosent/frawk/pull/120, which was squash-merged.
|
||||
# Remove these two patches after frawk is updated to a version including this fix
|
||||
# This patch comes from https://github.com/ezrosent/frawk/pull/120
|
||||
./fix-some-compiler-warnings-errors.patch
|
||||
# From https://github.com/ezrosent/frawk/commit/35a79dc04933f38f98a7c8f6fc89ca09724702ab
|
||||
./fix-prefetch-read-data.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gate";
|
||||
version = "0.63.0";
|
||||
version = "0.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minekube";
|
||||
repo = "gate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xHzXJgMNoubjaGD/cr9syIxlJKzxjWm13g6fQtFI3Sc=";
|
||||
hash = "sha256-C+XKDFzsCgZpTS2fEpAKOExPyO9WOjdmHKvVpmNyDRo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7tDEtZyV4upFG/DGg1rbJbO8XV7MSAzFSs/3NmH4qI4=";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "0.17.12";
|
||||
version = "0.17.13";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "heimdall-proxy";
|
||||
@@ -15,10 +15,10 @@ buildGoModule {
|
||||
owner = "dadrus";
|
||||
repo = "heimdall";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LwvizSMmMzcKl3BbPZAXLJkpxyLkz75uSL12PxgrrCM=";
|
||||
hash = "sha256-BJgrY3UNBPLssUh4HrWShO9BF2jW5D5q+A66y4fK5+k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W0XhE9wcnLT9pVe5hNuDbkX1egsuS7x6ueBscVDztsA=";
|
||||
vendorHash = "sha256-n7q49RU59AHVqrBidZ+kxgqybyiyncJm6mfNtR7lGEg=";
|
||||
|
||||
tags = [ "sqlite" ];
|
||||
|
||||
|
||||
@@ -10,14 +10,16 @@
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "homer";
|
||||
version = "25.11.1";
|
||||
version = "26.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bastienwirtz";
|
||||
repo = "homer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6shFVaCtPQeZCeeswAQHgcXOwVwABNa3ljsdUG63QGo=";
|
||||
hash = "sha256-zb6A0h0OuSUxh43tO/ksKXvkjrJMwNCsRJwgIy7eXpk=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -27,8 +29,8 @@ stdenvNoCC.mkDerivation rec {
|
||||
src
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-TtazfRhcniA1H//C95AMH8/Pw+Rbtinlfg7dDAmSk1w=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-7BLQHmnw+FfUm9R5//8kEBusM2O+wbTF5joHo60zKfQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -115,20 +115,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "immich";
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z3Z2/X9LT0iZtFVHUuVbWPZIPJUMbJGn5NmHCDxNVj0=";
|
||||
hash = "sha256-cN5MM8lk2UY2gCG4RMryJc4SwbJNYm8IbTcqEmdaNF4=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-k8ZG1SKRKymG4fau46SrGjkIPM3JK+xIUPMFaE2CXVg=";
|
||||
hash = "sha256-FEesjbhxP7ydFfNshF3iFIk9N3Z53jrEZ9DRBjgEfs0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ipatool";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "majd";
|
||||
repo = "ipatool";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-z6f5PNxAH+8mS2kWjhST0LFhwTR01m7rR5O95ee+p2E=";
|
||||
hash = "sha256-ME3fvYziI3fjlQ0KBPMJJXsCG3hW0z2iz1gKoBh0grk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-f6mXTePiM5kZUdrYqvbN5pyNp1OGNMeJZMUJ3pvaRrc=";
|
||||
vendorHash = "sha256-TmP7NjDrxTcsnVU9Hi4S1wXSzQNCJOVH02j5QpjvMgw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
let
|
||||
pname = "Jan";
|
||||
version = "0.7.5";
|
||||
version = "0.7.9";
|
||||
|
||||
darwin-src = fetchzip {
|
||||
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip";
|
||||
hash = "sha256-stTsLKE+2gUKAVwJ2/gOckoL6Nygwr0rkugD1jGj1w4=";
|
||||
hash = "sha256-3SN/yZr40Zp6Oa3rDUnum1m7dwK8jbe6Bxx9iSHDM9U=";
|
||||
};
|
||||
|
||||
linux-src = fetchurl {
|
||||
url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
|
||||
hash = "sha256-RIEBpeogNIDPMpoY5Gk8q4+t7jxcWJEZLPqJHWyaVk4=";
|
||||
hash = "sha256-SMcjig6J/HCpLthT8dHC6yED6uuHyaTG/xLnUIlZHP8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
|
||||
index 280a94c..b147679 100644
|
||||
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
|
||||
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
|
||||
@@ -36,12 +36,12 @@
|
||||
/**
|
||||
* Day names
|
||||
*/
|
||||
-const char day_names_p[7][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
|
||||
+const char day_names_p[7][3] __attribute__((nonstring)) = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
|
||||
|
||||
/**
|
||||
* Month names
|
||||
*/
|
||||
-const char month_names_p[12][3] = {
|
||||
+const char month_names_p[12][3] __attribute__((nonstring)) = {
|
||||
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
|
||||
};
|
||||
|
||||
@@ -30,6 +30,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-Evu4qLlwg3Sf9w/ojtZMNxGJEtopHgKnwqlpf115zD4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/jerryscript-project/jerryscript/issues/5263
|
||||
./fix-gcc15.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# get rid of bundled CMake toolchain files
|
||||
rm cmake/toolchain_*
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
@@ -41,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-enum-enum-conversion -Wno-enum-float-conversion -Wno-literal-range";
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3
|
||||
];
|
||||
@@ -57,8 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Uses a custom lib variable that ignores what nixpkgs's cmake setupHook specifies.
|
||||
postInstall = ''
|
||||
mkdir -p "$lib/lib"
|
||||
mv "$out/lib/"*.so "$lib/lib"
|
||||
mkdir $lib
|
||||
mv "$out/lib" "$lib/"
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
@@ -92,6 +104,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"libjerry-ext"
|
||||
"libjerry-port"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ RossSmyth ];
|
||||
maintainers = with lib.maintainers; [
|
||||
RossSmyth
|
||||
wishstudio
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
||||
"--enable-termidx"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.mirbsd.org/jupp.htm";
|
||||
downloadPage = "https://www.mirbsd.org/MirOS/dist/jupp/";
|
||||
|
||||
@@ -25,23 +25,23 @@
|
||||
};
|
||||
"kicad-testing" = {
|
||||
kicadVersion = {
|
||||
version = "9.0-2026-03-19";
|
||||
version = "10.0-2026-04-06";
|
||||
src = {
|
||||
rev = "ca86c82f9b4787c37626225f0b847be5ad3b4763";
|
||||
sha256 = "10bsfnyspvgnffvy3yfm6f3bsd34lm0bk17bwkdm1bnjg2bndv1s";
|
||||
rev = "d9de30af310c4fd84257b48ae6808ef5e3cfe70f";
|
||||
sha256 = "0bxiyhvpncmrakfmx6kdx7jdlssbm90v5li3km558yas5pkzppgx";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "9.0-2026-03-19";
|
||||
version = "10.0-2026-04-06";
|
||||
libSources = {
|
||||
symbols.rev = "83b87ce54ef7c17da4cefe45ad99a5f8d375abe6";
|
||||
symbols.sha256 = "08qb4rqxsyhrcvj1k200m2c06jjy7jwjmf9n1qkcm0biqqc5dba4";
|
||||
templates.rev = "319c71222af4205673e0cab9d772a02bbb34c597";
|
||||
symbols.rev = "dc72a484664c0470407113a174f2b5435debbcaf";
|
||||
symbols.sha256 = "0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2";
|
||||
templates.rev = "e703d1e2ab3eb98a209ff402d2b6bf6d02dc1930";
|
||||
templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id";
|
||||
footprints.rev = "384ecd066fcaef6aacdd099ca0bb7c47499a9a4b";
|
||||
footprints.sha256 = "1w7dkb93s84ymi1syxpzacbmkxlnlh0k4z1c62nabspb901nn524";
|
||||
packages3d.rev = "6b3a47da075011b33b6de17aa499690f8c5be4a7";
|
||||
packages3d.sha256 = "1j26dmgz7xfixlqrzclb1wpc6zkd10n1fq7rmdrgwwx083p3c7a8";
|
||||
footprints.rev = "4899503b69ff037ed102ab0fe5a0564ef3d61726";
|
||||
footprints.sha256 = "0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm";
|
||||
packages3d.rev = "bc82151111e9edddf4295228e6ceb5e0584c9c3e";
|
||||
packages3d.sha256 = "0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -5,8 +5,9 @@
|
||||
fetchpatch2,
|
||||
cfitsio,
|
||||
cmake,
|
||||
pkg-config,
|
||||
curl,
|
||||
eigen_3_4_0,
|
||||
eigen,
|
||||
gsl,
|
||||
indi-full,
|
||||
kdePackages,
|
||||
@@ -35,13 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
kdoctools
|
||||
wrapQtAppsHook
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = with kdePackages; [
|
||||
breeze-icons
|
||||
cfitsio
|
||||
curl
|
||||
eigen_3_4_0
|
||||
eigen
|
||||
gsl
|
||||
indi-full
|
||||
kconfig
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubedock";
|
||||
version = "0.20.3";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joyrex2001";
|
||||
repo = "kubedock";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qQkg/SJukZU/efQoEY7PK646UScdM9wb7nOeCn1flJ8=";
|
||||
hash = "sha256-ohriv6Lw5c+XvsENysplZ9FSbbVigjOILfOi3VpaGjI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PN9Ao8IDrcE7XnHeEDdwP4AMAgd/A11+X7irkhEE4ok=";
|
||||
vendorHash = "sha256-EwFNwJ/JTyt+Ua1qvKMEHMbgnMaLCWN7xphV2Q3xnLU=";
|
||||
|
||||
# config.Build not defined as it would break r-ryantm
|
||||
ldflags = [
|
||||
|
||||
@@ -56,6 +56,9 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://kyverno.io/";
|
||||
changelog = "https://github.com/kyverno/kyverno/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
LorenzBischof
|
||||
Scrumplex
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lightning-loop";
|
||||
version = "0.32.1-beta";
|
||||
version = "0.33.0-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "loop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gITl33H7fxF1YbJZJJBQk/V4wgbV5BtzBkLRvzVelmU=";
|
||||
hash = "sha256-LfVC/s7VNc3LvypjdSFo0s2Ssmhk1Lzm9ojWGqaNCmI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZFh21v8X/Bdrumpt2+u8lJgbQgNSX+PWRRsjr++C4/U=";
|
||||
vendorHash = "sha256-pzcOKYw2kXfGUOBZmuUYuEfRUY8f1PSj30tvhttEwAk=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/loop"
|
||||
|
||||
@@ -1,398 +0,0 @@
|
||||
From 9228741450f627da1dba800b44da03db8df44b32 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Tam <samuel.tam@expressvpn.com>
|
||||
Date: Fri, 9 Jan 2026 18:12:12 +0800
|
||||
Subject: [PATCH] ARM64 ASM: Darwin specific address calc fix
|
||||
|
||||
Don't use ':lo12:' in Darwin specific address calculation code.
|
||||
@PAGEOFF is indicating this.
|
||||
---
|
||||
wolfcrypt/src/port/arm/armv8-mlkem-asm.S | 74 +++++++++++------------
|
||||
wolfcrypt/src/port/arm/armv8-sha3-asm.S | 4 +-
|
||||
wolfcrypt/src/port/arm/armv8-sha512-asm.S | 8 +--
|
||||
3 files changed, 43 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
|
||||
index a45475c..1ded4af 100644
|
||||
--- a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
|
||||
+++ b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
|
||||
@@ -168,21 +168,21 @@ _mlkem_ntt:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q4, [x4]
|
||||
@@ -1562,21 +1562,21 @@ _mlkem_invntt:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q8, [x4]
|
||||
@@ -3013,21 +3013,21 @@ _mlkem_ntt_sqrdmlsh:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q4, [x4]
|
||||
@@ -4195,21 +4195,21 @@ _mlkem_invntt_sqrdmlsh:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q8, [x4]
|
||||
@@ -5532,14 +5532,14 @@ _mlkem_basemul_mont:
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q1, [x4]
|
||||
ldp q2, q3, [x1]
|
||||
@@ -6230,14 +6230,14 @@ _mlkem_basemul_mont_add:
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q1, [x4]
|
||||
ldp q2, q3, [x1]
|
||||
@@ -6991,7 +6991,7 @@ _mlkem_csubq_neon:
|
||||
add x1, x1, :lo12:L_mlkem_aarch64_q
|
||||
#else
|
||||
adrp x1, L_mlkem_aarch64_q@PAGE
|
||||
- add x1, x1, :lo12:L_mlkem_aarch64_q@PAGEOFF
|
||||
+ add x1, x1, L_mlkem_aarch64_q@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q20, [x1]
|
||||
ld4 {v0.8h, v1.8h, v2.8h, v3.8h}, [x0], #0x40
|
||||
@@ -7172,7 +7172,7 @@ _mlkem_add_reduce:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_consts@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x2]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7363,7 +7363,7 @@ _mlkem_add3_reduce:
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_consts@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x3]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7594,7 +7594,7 @@ _mlkem_rsub_reduce:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_consts@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x2]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7785,7 +7785,7 @@ _mlkem_to_mont:
|
||||
add x1, x1, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x1, L_mlkem_aarch64_consts@PAGE
|
||||
- add x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x1, x1, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x1]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7999,7 +7999,7 @@ _mlkem_to_mont_sqrdmlsh:
|
||||
add x1, x1, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x1, L_mlkem_aarch64_consts@PAGE
|
||||
- add x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x1, x1, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x1]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -8226,21 +8226,21 @@ _mlkem_to_msg_neon:
|
||||
add x2, x2, :lo12:L_mlkem_to_msg_low
|
||||
#else
|
||||
adrp x2, L_mlkem_to_msg_low@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_to_msg_low@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_to_msg_low@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_to_msg_high
|
||||
add x3, x3, :lo12:L_mlkem_to_msg_high
|
||||
#else
|
||||
adrp x3, L_mlkem_to_msg_high@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_to_msg_high@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_to_msg_high@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_to_msg_bits
|
||||
add x4, x4, :lo12:L_mlkem_to_msg_bits
|
||||
#else
|
||||
adrp x4, L_mlkem_to_msg_bits@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_to_msg_bits@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_to_msg_bits@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x2]
|
||||
ldr q1, [x3]
|
||||
@@ -8506,14 +8506,14 @@ _mlkem_from_msg_neon:
|
||||
add x2, x2, :lo12:L_mlkem_from_msg_q1half
|
||||
#else
|
||||
adrp x2, L_mlkem_from_msg_q1half@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_from_msg_q1half@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_from_msg_q1half@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_from_msg_bits
|
||||
add x3, x3, :lo12:L_mlkem_from_msg_bits
|
||||
#else
|
||||
adrp x3, L_mlkem_from_msg_bits@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_from_msg_bits@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_from_msg_bits@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ld1 {v2.16b, v3.16b}, [x1]
|
||||
ldr q1, [x2]
|
||||
@@ -9517,28 +9517,28 @@ _mlkem_rej_uniform_neon:
|
||||
add x4, x4, :lo12:L_mlkem_rej_uniform_mask
|
||||
#else
|
||||
adrp x4, L_mlkem_rej_uniform_mask@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_rej_uniform_mask@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_rej_uniform_mask@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x5, L_mlkem_aarch64_q
|
||||
add x5, x5, :lo12:L_mlkem_aarch64_q
|
||||
#else
|
||||
adrp x5, L_mlkem_aarch64_q@PAGE
|
||||
- add x5, x5, :lo12:L_mlkem_aarch64_q@PAGEOFF
|
||||
+ add x5, x5, L_mlkem_aarch64_q@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x6, L_mlkem_rej_uniform_bits
|
||||
add x6, x6, :lo12:L_mlkem_rej_uniform_bits
|
||||
#else
|
||||
adrp x6, L_mlkem_rej_uniform_bits@PAGE
|
||||
- add x6, x6, :lo12:L_mlkem_rej_uniform_bits@PAGEOFF
|
||||
+ add x6, x6, L_mlkem_rej_uniform_bits@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x7, L_mlkem_rej_uniform_indices
|
||||
add x7, x7, :lo12:L_mlkem_rej_uniform_indices
|
||||
#else
|
||||
adrp x7, L_mlkem_rej_uniform_indices@PAGE
|
||||
- add x7, x7, :lo12:L_mlkem_rej_uniform_indices@PAGEOFF
|
||||
+ add x7, x7, L_mlkem_rej_uniform_indices@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
eor v1.16b, v1.16b, v1.16b
|
||||
eor v12.16b, v12.16b, v12.16b
|
||||
@@ -9754,7 +9754,7 @@ _mlkem_sha3_blocksx3_neon:
|
||||
add x27, x27, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x27, L_sha3_aarch64_r@PAGE
|
||||
- add x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x27, x27, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
|
||||
@@ -10079,7 +10079,7 @@ _mlkem_shake128_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
@@ -10426,7 +10426,7 @@ _mlkem_shake256_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
@@ -10774,7 +10774,7 @@ _mlkem_sha3_blocksx3_neon:
|
||||
add x27, x27, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x27, L_sha3_aarch64_r@PAGE
|
||||
- add x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x27, x27, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
|
||||
@@ -11184,7 +11184,7 @@ _mlkem_shake128_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
@@ -11616,7 +11616,7 @@ _mlkem_shake256_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
diff --git a/wolfcrypt/src/port/arm/armv8-sha3-asm.S b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
|
||||
index 411349f..6089f8c 100644
|
||||
--- a/wolfcrypt/src/port/arm/armv8-sha3-asm.S
|
||||
+++ b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
|
||||
@@ -95,7 +95,7 @@ _BlockSha3_crypto:
|
||||
add x1, x1, :lo12:L_SHA3_transform_crypto_r
|
||||
#else
|
||||
adrp x1, L_SHA3_transform_crypto_r@PAGE
|
||||
- add x1, x1, :lo12:L_SHA3_transform_crypto_r@PAGEOFF
|
||||
+ add x1, x1, L_SHA3_transform_crypto_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
|
||||
ld4 {v4.d, v5.d, v6.d, v7.d}[0], [x0], #32
|
||||
@@ -268,7 +268,7 @@ _BlockSha3_base:
|
||||
add x27, x27, :lo12:L_SHA3_transform_base_r
|
||||
#else
|
||||
adrp x27, L_SHA3_transform_base_r@PAGE
|
||||
- add x27, x27, :lo12:L_SHA3_transform_base_r@PAGEOFF
|
||||
+ add x27, x27, L_SHA3_transform_base_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldp x1, x2, [x0]
|
||||
ldp x3, x4, [x0, #16]
|
||||
diff --git a/wolfcrypt/src/port/arm/armv8-sha512-asm.S b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
|
||||
index 514e5de..ee64e6e 100644
|
||||
--- a/wolfcrypt/src/port/arm/armv8-sha512-asm.S
|
||||
+++ b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
|
||||
@@ -165,14 +165,14 @@ _Transform_Sha512_Len_neon:
|
||||
add x3, x3, :lo12:L_SHA512_transform_neon_len_k
|
||||
#else
|
||||
adrp x3, L_SHA512_transform_neon_len_k@PAGE
|
||||
- add x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
+ add x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x27, L_SHA512_transform_neon_len_r8
|
||||
add x27, x27, :lo12:L_SHA512_transform_neon_len_r8
|
||||
#else
|
||||
adrp x27, L_SHA512_transform_neon_len_r8@PAGE
|
||||
- add x27, x27, :lo12:L_SHA512_transform_neon_len_r8@PAGEOFF
|
||||
+ add x27, x27, L_SHA512_transform_neon_len_r8@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ld1 {v11.16b}, [x27]
|
||||
# Load digest into working vars
|
||||
@@ -1070,7 +1070,7 @@ L_sha512_len_neon_start:
|
||||
add x3, x3, :lo12:L_SHA512_transform_neon_len_k
|
||||
#else
|
||||
adrp x3, L_SHA512_transform_neon_len_k@PAGE
|
||||
- add x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
+ add x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
subs w2, w2, #0x80
|
||||
bne L_sha512_len_neon_begin
|
||||
@@ -1211,7 +1211,7 @@ _Transform_Sha512_Len_crypto:
|
||||
add x4, x4, :lo12:L_SHA512_trans_crypto_len_k
|
||||
#else
|
||||
adrp x4, L_SHA512_trans_crypto_len_k@PAGE
|
||||
- add x4, x4, :lo12:L_SHA512_trans_crypto_len_k@PAGEOFF
|
||||
+ add x4, x4, L_SHA512_trans_crypto_len_k@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
# Load first 16 64-bit words of K permanently
|
||||
ld1 {v8.2d, v9.2d, v10.2d, v11.2d}, [x4], #0x40
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -10,25 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "lightway";
|
||||
version = "0-unstable-2026-01-02";
|
||||
version = "0-unstable-2026-04-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "expressvpn";
|
||||
repo = "lightway";
|
||||
rev = "8e21da7ab3a97ab75235264e85fa8615f7b0f33b";
|
||||
hash = "sha256-1YpXaxPm1BMALhRU25FH5PLJ1IIRfcYA3W6e4c8Si+w=";
|
||||
rev = "72a924935df9db641e7f4fe28cbeafaead59014f";
|
||||
hash = "sha256-tygK2CQmbbynJiwGkMvYzt2dHoE17DCJeqD+jlai/m8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4SIE/kGRd2I3sqO+IgItO1PBQHeFv9N4erfVe/9re7A=";
|
||||
|
||||
# Backport fix for Darwin address calculation to vendored wolfSSL 5.8.2.
|
||||
# https://github.com/wolfSSL/wolfssl/pull/9537
|
||||
# Drop when Lightway bumps wolfSSL past commit 5c2c459, or > 5.8.4.
|
||||
postPatch = ''
|
||||
patch -Np1 \
|
||||
-d $cargoDepsCopy/*/wolfssl-sys-2.0.0/wolfssl-src \
|
||||
-i ${./backport-darwin-address-calc-fix.patch}
|
||||
'';
|
||||
cargoHash = "sha256-NdVOphyBW5sflv5jZPV/ShfAJXb3ZOyDRctmn/2JY38=";
|
||||
|
||||
cargoBuildFlags = lib.cli.toCommandLineGNU { } {
|
||||
package = [
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "linux-firmware";
|
||||
version = "20260309";
|
||||
version = "20260410";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kernel-firmware";
|
||||
repo = "linux-firmware";
|
||||
tag = version;
|
||||
hash = "sha256-IG7RN7m+VwFkdGRNv2FZSLumlo0FT47PBE16o8Xahxg=";
|
||||
hash = "sha256-nceQEGm6+Cj6KCeUNwmYsUdArRULfLXysXjzOXdCBQw=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunarclient";
|
||||
version = "3.6.3";
|
||||
version = "3.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
|
||||
hash = "sha512-hsH6xgTVQFrUVM4DF06+WBNbr3X2TlN8gKO2J0m7OUrOO2LDBLR2jweuajN9C0d5EiosdiXHPjxmiv+7JXeCFQ==";
|
||||
hash = "sha512-JpFYTBAewvxmJLvhHPLNyUw74EmcflThK5qjADZhfJR+buZgpbbLCOho00auRWTIg0+xoyNM9ZGGYWfjxfIe9Q==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "magika-cli";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "magika";
|
||||
tag = "cli/v${finalAttrs.version}";
|
||||
hash = "sha256-g/fnSdh2jpOHOLTuR4DUPB1kbC0eKADHLKcfB1q08XI=";
|
||||
hash = "sha256-1WJRkqFQqlSFzr4wkEbRwj1WoxDKTG/1OCtC+914ryY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uqnTyedry9nWyO2518r0D3hk6oWb4wQE/Ku0cOkSjBA=";
|
||||
cargoHash = "sha256-rA+GYCWuinwRVWf3VuFbPgmAwl3vDsaxLjCtsKMtpiU=";
|
||||
|
||||
cargoRoot = "rust/cli";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
@@ -41,13 +41,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = "true";
|
||||
ORT_STRATEGY = "system";
|
||||
ORT_LIB_LOCATION = "${lib.getLib onnxruntime}/lib";
|
||||
|
||||
# Required to prevent "ort-sys could not link to the ONNX Runtime build":
|
||||
# https://github.com/pykeio/ort/issues/517#issuecomment-3761926178
|
||||
ORT_PREFER_DYNAMIC_LINK = "true";
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
|
||||
'';
|
||||
},
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -194,6 +195,7 @@ buildMattermost rec {
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--use-github-releases"
|
||||
"--version-regex"
|
||||
versionInfo.regex
|
||||
]
|
||||
|
||||
@@ -1,23 +1,27 @@
|
||||
{
|
||||
mattermost,
|
||||
}:
|
||||
...
|
||||
}@args:
|
||||
|
||||
mattermost.override {
|
||||
versionInfo = {
|
||||
# Latest, non-RC releases only.
|
||||
# If the latest is an ESR (Extended Support Release),
|
||||
# duplicate it here to facilitate the update script.
|
||||
# See https://docs.mattermost.com/about/mattermost-server-releases.html
|
||||
# and make sure the version regex is up to date here.
|
||||
# Ensure you also check ../mattermost/package.nix for ESR releases.
|
||||
regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
|
||||
version = "11.5.1";
|
||||
srcHash = "sha256-3ij6JYGectkAYc2z6caD3L0NUP1UJJ6QaR2qLcTWXoI=";
|
||||
vendorHash = "sha256-ao8jWfrzMTs9JJokaGH0kuoZ0d3VnIDGc5uDN2hCrhk=";
|
||||
npmDepsHash = "sha256-r7iq1pCAJjFyspZBdeNWe00W7A3l73PGC6rrsZ7O6Uw=";
|
||||
lockfileOverlay = ''
|
||||
unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
|
||||
'';
|
||||
autoUpdate = ./package.nix;
|
||||
};
|
||||
}
|
||||
mattermost.override (
|
||||
{
|
||||
versionInfo = {
|
||||
# Latest, non-RC releases only.
|
||||
# If the latest is an ESR (Extended Support Release),
|
||||
# duplicate it here to facilitate the update script.
|
||||
# See https://docs.mattermost.com/about/mattermost-server-releases.html
|
||||
# and make sure the version regex is up to date here.
|
||||
# Ensure you also check ../mattermost/package.nix for ESR releases.
|
||||
regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
|
||||
version = "11.5.1";
|
||||
srcHash = "sha256-3ij6JYGectkAYc2z6caD3L0NUP1UJJ6QaR2qLcTWXoI=";
|
||||
vendorHash = "sha256-ao8jWfrzMTs9JJokaGH0kuoZ0d3VnIDGc5uDN2hCrhk=";
|
||||
npmDepsHash = "sha256-r7iq1pCAJjFyspZBdeNWe00W7A3l73PGC6rrsZ7O6Uw=";
|
||||
lockfileOverlay = ''
|
||||
unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
|
||||
'';
|
||||
autoUpdate = ./package.nix;
|
||||
};
|
||||
}
|
||||
// args
|
||||
)
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
libGL,
|
||||
qt6,
|
||||
boost,
|
||||
ninja,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -19,18 +21,46 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-Ur7GGXbYvVmrEUq/CTRyuVNLDHKfFrYHJibo0JvYhyM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
postInstall = lib.optional stdenv.hostPlatform.isDarwin ''
|
||||
mkdir $out/Applications
|
||||
mv $out/mCRL2.app $out/Applications
|
||||
mkdir $out/bin
|
||||
makeWrapper "$out/Applications/mCRL2.app/Contents/MacOS/mCRL2" "$out/bin/mcrl2ide"
|
||||
'';
|
||||
|
||||
postFixup = lib.optional stdenv.hostPlatform.isDarwin ''
|
||||
APP_DIR="$out/Applications/mCRL2.app/Contents"
|
||||
find "$APP_DIR/lib" -name "*.dylib" | while read lib; do
|
||||
install_name_tool -id "@rpath/$(basename "$lib")" "$lib" || true
|
||||
otool -L "$lib" | grep "$out" | awk '{print $1}' | while read old_path; do
|
||||
install_name_tool -change "$old_path" "@rpath/$(basename "$old_path")" "$lib" || true
|
||||
done
|
||||
done
|
||||
find "$APP_DIR/bin" -type f | while read bin; do
|
||||
install_name_tool -add_rpath "@loader_path/../lib" "$bin" || true
|
||||
otool -L "$bin" | grep "$out" | awk '{print $1}' | while read old_path; do
|
||||
libname=$(basename "$old_path")
|
||||
install_name_tool -change "$old_path" "@rpath/$libname" "$bin" || true
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGLU
|
||||
libGL
|
||||
qt6.qtbase
|
||||
boost
|
||||
];
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin [ makeWrapper ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "Toolset for model-checking concurrent systems and protocols";
|
||||
longDescription = ''
|
||||
A formal specification language with an associated toolset,
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mieru";
|
||||
version = "3.30.0";
|
||||
version = "3.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "enfein";
|
||||
repo = "mieru";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-frSW7qLKhRTJLE2rAaZekoaJUmQWqVECQhCSCsmub/U=";
|
||||
hash = "sha256-kS7da5cO/g0FD5cs1zqz2RRhTExzv3ohnxMfAaDbhHc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
mattermost,
|
||||
}:
|
||||
...
|
||||
}@args:
|
||||
|
||||
mattermost.withoutTests.server.overrideAttrs (o: {
|
||||
(mattermost.override args).withoutTests.server.overrideAttrs (prev: {
|
||||
pname = "mmctl";
|
||||
subPackages = [ "cmd/mmctl" ];
|
||||
|
||||
meta = o.meta // {
|
||||
# `mattermost` or `mattermostLatest` handle it
|
||||
passthru = lib.removeAttrs prev.passthru [ "updateScript" ];
|
||||
|
||||
meta = prev.meta // {
|
||||
description = "Remote CLI tool for Mattermost";
|
||||
mainProgram = "mmctl";
|
||||
};
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.1-21292486";
|
||||
version = "1.2.0-22728942";
|
||||
urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
|
||||
|
||||
in
|
||||
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
|
||||
hash = "sha256-KPm11k4wLRraB0u3BwOUofC6dQO2yRra+Rk6M0UKG7U=";
|
||||
hash = "sha256-kSBql3oHG368DczSM7FkWeAZcfTrNP1x31LX7HRrgTE=";
|
||||
};
|
||||
|
||||
# removing packaged jre since we use our own
|
||||
|
||||
@@ -30,17 +30,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
# autoreconf will not succeed without libgcrypt, maybe due to leftover checks from ntfs-3g?
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
# We don't need GnuTLS despite the configure warning about its absence,
|
||||
# because ntfsdecrypt from ntfs-3g is not used in ntfsprogs-plus and is not built.
|
||||
# See: https://github.com/search?q=repo%3Antfsprogs-plus%2Fntfsprogs-plus%20gnutls&type=code
|
||||
buildInputs = [
|
||||
# autoreconf will not succeed without libgcrypt, maybe due to leftover checks from ntfs-3g?
|
||||
libgcrypt
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isGnu) [ gettext ];
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [ libuuid ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isGnu) [ gettext ];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
configureFlags = [ "--exec-prefix=\${prefix}" ];
|
||||
|
||||
|
||||
@@ -25,12 +25,16 @@
|
||||
libpthread-stubs,
|
||||
libvorbis,
|
||||
libzip,
|
||||
makeWrapper,
|
||||
nlohmann_json,
|
||||
openssl,
|
||||
pkg-config,
|
||||
speexdsp,
|
||||
zlib,
|
||||
withDiscordRpc ? false,
|
||||
# Paths to RCT1 and RCT2 installs can be specified to have them added as a wrapped argument
|
||||
rct1Path ? null,
|
||||
rct2Path ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -75,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
pkg-config
|
||||
unzip
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -140,6 +145,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ (versionCheck "TITLE_SEQUENCE" title-sequences-version)
|
||||
);
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/openrct2 \
|
||||
${lib.optionalString (rct1Path != null) "--add-flags '--rct1-data-path=\"${rct1Path}\"'"} \
|
||||
${lib.optionalString (rct2Path != null) "--add-flags '--rct2-data-path=\"${rct2Path}\"'"}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
|
||||
homepage = "https://openrct2.io/";
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmium";
|
||||
version = "0.0.16";
|
||||
version = "0.0.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updater.osmium.chat/Osmium-${version}-alpha-x64.tar.gz";
|
||||
hash = "sha256-dMOyZ9oPVnLt6MHeQwsMJ03wgvaKzalynwAL/PRfI28=";
|
||||
hash = "sha256-Qwh6K2QlJJapqR0BkaA0LvwLEsqktnLzOnyJg+7sMFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,18 +11,31 @@
|
||||
vips,
|
||||
pkg-config,
|
||||
python3,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "papra";
|
||||
version = "26.2.2";
|
||||
version = "26.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "papra-hq";
|
||||
repo = "papra";
|
||||
tag = "@papra/app@${finalAttrs.version}";
|
||||
hash = "sha256-0MIar+fBwXRE8LlVLZDx/C0GOYVpobDTqFwkMs2k06Y=";
|
||||
hash = "sha256-wQdDBS+QRarZhEIRmLQ4VRtq73I5YFIN2P3ZtAZWvxw=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-8k8hzpyOQuHAPF+zzIhW+5vo6lHSyZeKAY+tYIf6jKU=";
|
||||
pnpmWorkspaces = [
|
||||
"@papra/app-client..."
|
||||
"@papra/app-server..."
|
||||
];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -80,22 +93,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-NQakyRlL6deG13yt+FlmVcVvEkNWHW0Lhf/3NecfwaE=";
|
||||
pnpmWorkspaces = [
|
||||
"@papra/app-client..."
|
||||
"@papra/app-server..."
|
||||
];
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Open-source document management platform designed to help you organize, secure, and archive your files effortlessly.";
|
||||
homepage = "https://papra.app/";
|
||||
changelog = "https://github.com/papra-hq/papra/releases";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ wariuccio ];
|
||||
maintainers = with lib.maintainers; [
|
||||
wariuccio
|
||||
miniharinn
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
diff --git a/prpr/src/core.rs b/prpr/src/core.rs
|
||||
index 7f9d4db..33c44bb 100644
|
||||
index 24589df..7101fde 100644
|
||||
--- a/prpr/src/core.rs
|
||||
+++ b/prpr/src/core.rs
|
||||
@@ -68,6 +68,14 @@ thread_local! {
|
||||
}
|
||||
@@ -72,6 +72,14 @@ thread_local! {
|
||||
|
||||
pub fn init_assets() {
|
||||
#[cfg(not(target_env = "ohos"))]
|
||||
+ if let Ok(root_path) = std::env::var("PHIRA_ROOT") {
|
||||
+ let path = std::path::Path::new(&root_path);
|
||||
+ if path.exists() {
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
diff --git a/prpr-avc/Cargo.toml b/prpr-avc/Cargo.toml
|
||||
index 257c575..bf35b10 100644
|
||||
index eea4b7b..134e02b 100644
|
||||
--- a/prpr-avc/Cargo.toml
|
||||
+++ b/prpr-avc/Cargo.toml
|
||||
@@ -9,3 +9,6 @@ edition = "2021"
|
||||
sasa = { git = "https://github.com/Mivik/sasa", default-features = false }
|
||||
thiserror = "1.0.56"
|
||||
tracing = "0.1.37"
|
||||
+
|
||||
@@ -9,6 +9,9 @@ edition = "2021"
|
||||
thiserror = "2.0.18"
|
||||
tracing = { workspace = true }
|
||||
|
||||
+[build-dependencies]
|
||||
+pkg-config = "0.3"
|
||||
+
|
||||
[target.'cfg(target_env = "ohos")'.dependencies]
|
||||
sasa = { workspace = true, default-features = false, features = ["ohos"] }
|
||||
|
||||
diff --git a/prpr-avc/build.rs b/prpr-avc/build.rs
|
||||
index 961b032..6d0b714 100644
|
||||
index 961b032..eb2c684 100644
|
||||
--- a/prpr-avc/build.rs
|
||||
+++ b/prpr-avc/build.rs
|
||||
@@ -1,10 +1,7 @@
|
||||
@@ -28,26 +31,26 @@ index 961b032..6d0b714 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/prpr-avc/src/ffi.rs b/prpr-avc/src/ffi.rs
|
||||
index 8218ef3..a2c7f6a 100644
|
||||
index c1060be..5dfcb6c 100644
|
||||
--- a/prpr-avc/src/ffi.rs
|
||||
+++ b/prpr-avc/src/ffi.rs
|
||||
@@ -6,7 +6,6 @@ pub const AV_SAMPLE_FMT_FLT: AVSampleFormat = 3;
|
||||
@@ -10,7 +10,6 @@ pub const AV_ROUND_UP: AVRounding = 0;
|
||||
|
||||
pub const AV_ROUND_UP: AVRounding = 0;
|
||||
pub const AVSEEK_FLAG_BACKWARD: i32 = 1;
|
||||
|
||||
-#[link(name = "avformat", kind = "static")]
|
||||
extern "C" {
|
||||
pub fn avformat_alloc_context() -> *mut AVFormatContext;
|
||||
pub fn avformat_free_context(s: *mut AVFormatContext);
|
||||
@@ -20,7 +19,6 @@ extern "C" {
|
||||
pub fn av_read_frame(s: *mut AVFormatContext, pkt: *mut AVPacket) -> ::std::os::raw::c_int;
|
||||
@@ -30,7 +29,6 @@ extern "C" {
|
||||
) -> ::std::os::raw::c_int;
|
||||
}
|
||||
|
||||
-#[link(name = "avutil", kind = "static")]
|
||||
extern "C" {
|
||||
pub fn av_strerror(errnum: ::std::os::raw::c_int, errbuf: *mut ::std::os::raw::c_char, errbuf_size: usize) -> ::std::os::raw::c_int;
|
||||
pub fn av_frame_alloc() -> *mut AVFrame;
|
||||
@@ -29,7 +27,6 @@ extern "C" {
|
||||
@@ -39,7 +37,6 @@ extern "C" {
|
||||
pub fn av_rescale_rnd(a: i64, b: i64, c: i64, r: AVRounding) -> i64;
|
||||
}
|
||||
|
||||
@@ -55,15 +58,15 @@ index 8218ef3..a2c7f6a 100644
|
||||
extern "C" {
|
||||
pub fn avcodec_find_decoder(id: AVCodecID) -> *mut AVCodec;
|
||||
pub fn avcodec_alloc_context3(codec: *const AVCodec) -> *mut AVCodecContext;
|
||||
@@ -43,7 +40,6 @@ extern "C" {
|
||||
pub fn avcodec_default_get_format(s: *mut AVCodecContext, fmt: *const AVPixelFormat) -> AVPixelFormat;
|
||||
@@ -54,7 +51,6 @@ extern "C" {
|
||||
pub fn avcodec_flush_buffers(avctx: *mut AVCodecContext);
|
||||
}
|
||||
|
||||
-#[link(name = "swscale", kind = "static")]
|
||||
extern "C" {
|
||||
pub fn sws_getContext(
|
||||
srcW: ::std::os::raw::c_int,
|
||||
@@ -68,10 +64,9 @@ extern "C" {
|
||||
@@ -79,10 +75,9 @@ extern "C" {
|
||||
) -> ::std::os::raw::c_int;
|
||||
}
|
||||
|
||||
@@ -76,7 +79,7 @@ index 8218ef3..a2c7f6a 100644
|
||||
out_ch_layout: i64,
|
||||
out_sample_fmt: AVSampleFormat,
|
||||
out_sample_rate: ::std::os::raw::c_int,
|
||||
@@ -80,7 +75,7 @@ extern "C" {
|
||||
@@ -91,7 +86,7 @@ extern "C" {
|
||||
in_sample_rate: ::std::os::raw::c_int,
|
||||
log_offset: ::std::os::raw::c_int,
|
||||
log_ctx: *mut ::std::os::raw::c_void,
|
||||
@@ -86,7 +89,7 @@ index 8218ef3..a2c7f6a 100644
|
||||
pub fn swr_get_delay(s: *const SwrContext, base: ::std::os::raw::c_int) -> i64;
|
||||
pub fn swr_convert(
|
||||
diff --git a/prpr-avc/src/swr.rs b/prpr-avc/src/swr.rs
|
||||
index 7288a51..c00b874 100644
|
||||
index f2a18f8..9128ef6 100644
|
||||
--- a/prpr-avc/src/swr.rs
|
||||
+++ b/prpr-avc/src/swr.rs
|
||||
@@ -5,8 +5,9 @@ pub struct SwrContext(OwnedPtr<ffi::SwrContext>);
|
||||
@@ -106,7 +109,7 @@ index 7288a51..c00b874 100644
|
||||
0,
|
||||
null_mut(),
|
||||
- ))
|
||||
- .map(|ctx| Self(ctx))
|
||||
- .map(Self)
|
||||
- .ok_or(Error::AllocationFailed)
|
||||
+ );
|
||||
+ if ret < 0 || raw.is_null() {
|
||||
|
||||
@@ -14,13 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "phira-unwrapped";
|
||||
version = "0.6.7";
|
||||
version = "0.7.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TeamFlos";
|
||||
repo = "phira";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4WIvLfKeh+quu7dHKMlUKt+NQnui2/txlFYZoU3voPA=";
|
||||
hash = "sha256-bn1vRxL4O32Txna3RqafOzXISziDiL//S8NwiIK5c4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -44,9 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# use dynamically linked ffmpeg instead of expecting static lib
|
||||
./ffmpeg.patch
|
||||
|
||||
# error[E0554]: `#![feature]` may not be used on the stable release channel
|
||||
./stable-features.patch
|
||||
|
||||
# missing macro from tracing crate
|
||||
./tracing.patch
|
||||
|
||||
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
./assets.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI=";
|
||||
cargoHash = "sha256-a+bQ5d9n18jrsgnqygBlMKWlu7KPU5tbQQSXRXE5zWY=";
|
||||
|
||||
# The developer put assets necessary for this test in gitignore, so it cannot run.
|
||||
checkFlags = [ "--skip=test_parse_chart" ];
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
diff --git a/prpr/src/lib.rs b/prpr/src/lib.rs
|
||||
index 15a139f..6b4e469 100644
|
||||
--- a/prpr/src/lib.rs
|
||||
+++ b/prpr/src/lib.rs
|
||||
@@ -1,5 +1,3 @@
|
||||
-#![feature(local_key_cell_methods)]
|
||||
-
|
||||
pub mod bin;
|
||||
pub mod config;
|
||||
pub mod core;
|
||||
@@ -1,17 +1,17 @@
|
||||
diff --git a/phira-monitor/Cargo.toml b/phira-monitor/Cargo.toml
|
||||
index 722a022..899b7db 100644
|
||||
index f706fb1..1af4ff4 100644
|
||||
--- a/phira-monitor/Cargo.toml
|
||||
+++ b/phira-monitor/Cargo.toml
|
||||
@@ -15,6 +15,7 @@ serde = { version = "*", features = ["derive"] }
|
||||
serde_yaml = "*"
|
||||
@@ -24,6 +24,7 @@ serde_json = { workspace = true }
|
||||
serde_yaml = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
uuid = { version = "1.4.0", features = ["v4"] }
|
||||
uuid = { workspace = true, features = ["v4"] }
|
||||
+tracing = "0.1"
|
||||
|
||||
phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" }
|
||||
phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" }
|
||||
phira-mp-client = { workspace = true }
|
||||
phira-mp-common = { workspace = true }
|
||||
diff --git a/phira-monitor/src/main.rs b/phira-monitor/src/main.rs
|
||||
index 61bcfba..a4bf8af 100644
|
||||
index 809a7c4..e780566 100644
|
||||
--- a/phira-monitor/src/main.rs
|
||||
+++ b/phira-monitor/src/main.rs
|
||||
@@ -14,6 +14,7 @@ use prpr::{
|
||||
|
||||
@@ -6,10 +6,13 @@
|
||||
phira-unwrapped,
|
||||
makeWrapper,
|
||||
libGL,
|
||||
libx11,
|
||||
libxi,
|
||||
libxcursor,
|
||||
# A derivation or a path that contains a dir `assets`.
|
||||
overrideAssets ? fetchzip {
|
||||
url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-v${phira-unwrapped.version}.zip";
|
||||
hash = "sha256-kgmIIIzg+wxyspQTyW1GucW0RVPfBhIRlK5DEGXK1Qs=";
|
||||
url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-x86_64-v${phira-unwrapped.version}.zip";
|
||||
hash = "sha256-p0+o7q42caHqVWnHtgknYaCIJemG/9fNKF7pqTnRGE4=";
|
||||
stripRoot = false;
|
||||
meta.license = lib.licenses.unfree;
|
||||
},
|
||||
@@ -29,14 +32,19 @@ symlinkJoin {
|
||||
cp -r ${overrideAssets}/assets $phira_root
|
||||
|
||||
wrapper_options=(
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"}
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
libx11
|
||||
libxi
|
||||
libxcursor
|
||||
]
|
||||
}"}
|
||||
--run '
|
||||
export PHIRA_ROOT=''${PHIRA_ROOT-"''${XDG_DATA_HOME-"$HOME/.local/share"}/phira"}
|
||||
if [[ ! -d "$PHIRA_ROOT/assets" ]]; then
|
||||
mkdir -p "$PHIRA_ROOT"
|
||||
cp -r "'$phira_root/assets'" "$PHIRA_ROOT"
|
||||
chmod -R +w "$PHIRA_ROOT/assets"
|
||||
fi
|
||||
mkdir -p "$PHIRA_ROOT"
|
||||
cp -L -r --update=none "'$phira_root/assets'" "$PHIRA_ROOT"
|
||||
chmod -R +w "$PHIRA_ROOT/assets"
|
||||
'
|
||||
)
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From aba8b1570051e17e9568cfcc2a2b0ed316e90075 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Bunk <bunk@debian.org>
|
||||
Date: Sat, 11 Oct 2025 15:39:08 +0300
|
||||
Subject: [PATCH] Bump cmake_minimum_required to support CMake 4
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/CMakeLists.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8432a843..c4bbe56e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.4)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
if(COMMAND cmake_policy)
|
||||
cmake_policy(SET CMP0003 NEW)
|
||||
endif(COMMAND cmake_policy)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 02867c8f..23bc9eff 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -10,7 +10,7 @@ else()
|
||||
option(USE_BUNDLED_RTMIDI "Build with bundled rtmidi" ON)
|
||||
endif()
|
||||
|
||||
-cmake_minimum_required(VERSION 2.4)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
if(COMMAND cmake_policy)
|
||||
cmake_policy(SET CMP0003 NEW)
|
||||
endif(COMMAND cmake_policy)
|
||||
@@ -1,79 +1,100 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
replaceVars,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
ftgl,
|
||||
freetype,
|
||||
libGLU,
|
||||
rtmidi,
|
||||
libjack2,
|
||||
fluidsynth,
|
||||
soundfont-fluid,
|
||||
soundFonts ? [ soundfont-fluid ],
|
||||
dejavu_fonts,
|
||||
unzip,
|
||||
libsForQt5,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pianobooster";
|
||||
version = "1.0.0";
|
||||
version = "1.0.0-unstable-2023-01-22"; # use unstable version for Qt 6 support
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pianobooster";
|
||||
repo = "PianoBooster";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA=";
|
||||
rev = "6dafdcbdfc5d35d12cecb051c30632d0f5be5806";
|
||||
hash = "sha256-ZOgTgN1CWiPHe9of8NjgoPP5xzAY1k2v9xSAY1m2Bu0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Bump cmake_minimum_required to support CMake 4
|
||||
# https://github.com/pianobooster/PianoBooster/pull/349
|
||||
./bump-cmake-minimum-required-version.patch
|
||||
# more sensible soundfont discovery
|
||||
(replaceVars ./soundfont.patch {
|
||||
possibleSoundFontFolders = lib.concatMapStringsSep ", " (
|
||||
p: "\"${p}/share/soundfonts\", \"${p}/share/sounds/sf2\""
|
||||
) soundFonts;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/Settings.cpp src/GuiMidiSetupDialog.cpp \
|
||||
--replace "/usr/share/soundfonts" "${soundfont-fluid}/share/soundfonts" \
|
||||
--replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2"
|
||||
substituteInPlace src/CMakeLists.txt --replace-fail "ADD_DEFINITIONS(-std=c++11)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
]
|
||||
++ (with libsForQt5; [
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
]);
|
||||
qt6.qttools
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
ftgl
|
||||
freetype # required by ftgl; somehow qt provides freetype on linux but not on darwin
|
||||
libGLU
|
||||
libsForQt5.qtbase
|
||||
qt6.qtbase
|
||||
qt6.qt5compat
|
||||
rtmidi
|
||||
libjack2
|
||||
fluidsynth
|
||||
];
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
"-DUSE_JACK=ON"
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
|
||||
(lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND")
|
||||
(lib.cmakeFeature "QT_PACKAGE_NAME" "Qt6")
|
||||
(lib.cmakeBool "WITH_MAN" true)
|
||||
(lib.cmakeBool "USE_BUNDLED_RTMIDI" false)
|
||||
(lib.cmakeBool "USE_JACK" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_FONT" true)
|
||||
(lib.cmakeFeature "MACOSX_BUNDLE_GUI_IDENTIFIER" "pianobooster")
|
||||
(lib.cmakeFeature "MACOSX_BUNDLE_SHORT_VERSION_STRING" finalAttrs.version)
|
||||
(lib.cmakeFeature "MACOSX_BUNDLE_BUNDLE_VERSION" finalAttrs.version)
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
qtWrapperArgs+=(
|
||||
--prefix PATH : "${lib.makeBinPath [ unzip ]}"
|
||||
)
|
||||
qtWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ unzip ]}")
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
mkdir -p $out/share/games/pianobooster/fonts
|
||||
# use readlink to avoid referencing dejavu-fonts but dejavu-fonts-minimal instead
|
||||
ln -s $(readlink -f ${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf) $out/share/games/pianobooster/fonts/DejaVuSans.ttf
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
cp -r build/pianobooster.app $out/Applications
|
||||
ln -s $out/Applications/pianobooster.app/Contents/MacOS/pianobooster $out/bin/pianobooster
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "MIDI file player that teaches you how to play the piano";
|
||||
mainProgram = "pianobooster";
|
||||
homepage = "https://github.com/pianobooster/PianoBooster";
|
||||
homepage = "https://www.pianobooster.org";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
diff --git a/src/GuiMidiSetupDialog.cpp b/src/GuiMidiSetupDialog.cpp
|
||||
index 64d6538..2756611 100644
|
||||
--- a/src/GuiMidiSetupDialog.cpp
|
||||
+++ b/src/GuiMidiSetupDialog.cpp
|
||||
@@ -286,12 +286,7 @@ void GuiMidiSetupDialog::on_fluidLoadButton_clicked ( bool checked )
|
||||
|
||||
lastSoundFont = QDir::homePath();
|
||||
|
||||
- QStringList possibleSoundFontFolders;
|
||||
-#if defined (Q_OS_LINUX) || defined (Q_OS_UNIX)
|
||||
- possibleSoundFontFolders.push_back("/usr/share/soundfonts");
|
||||
- possibleSoundFontFolders.push_back("/usr/share/sounds/sf2");
|
||||
-#endif
|
||||
- for (const QString &soundFontFolder : possibleSoundFontFolders){
|
||||
+ for (const QString &soundFontFolder : {@possibleSoundFontFolders@}){
|
||||
if (QDir(soundFontFolder).exists()){
|
||||
lastSoundFont=soundFontFolder;
|
||||
break;
|
||||
diff --git a/src/Settings.cpp b/src/Settings.cpp
|
||||
index 0bfc649..9b9ea3b 100644
|
||||
--- a/src/Settings.cpp
|
||||
+++ b/src/Settings.cpp
|
||||
@@ -568,7 +568,7 @@ void CSettings::setupDefaultSoundFont(){
|
||||
#if defined (Q_OS_LINUX) || defined (Q_OS_UNIX)
|
||||
if (!defaultSoundFont.isFile())
|
||||
{
|
||||
- QStringList possibleSoundFontFolders = {"/usr/share/soundfonts","/usr/share/sounds/sf2"};
|
||||
+ QStringList possibleSoundFontFolders = {@possibleSoundFontFolders@};
|
||||
for (QString soundFontFolder:possibleSoundFontFolders)
|
||||
{
|
||||
// fluid-soundfont-gm Fluid (R3) General MIDI SoundFont (GM) package
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "powershell-editor-services";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip";
|
||||
hash = "sha256-tmz6xkcF44xnG5VwSeHNWzjRQK6wxQ7Ii6mDNisCMb8=";
|
||||
hash = "sha256-25nKcJ0Q9Kk2LEVutqxPPQvG+/hmeHsmUG01vmOsFqg=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "proto";
|
||||
version = "0.55.4";
|
||||
version = "0.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = "proto";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-roaCQ2hPcYR6TFTVhfz7D5l9++UEB1blMCwB/dXb3hE=";
|
||||
hash = "sha256-QVqtESS2c4gr8rDqw1WL6ai+Szo24aBSmGzwQEuRhG4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zBwuimKV2D78zJXOMxcRqWRdJW1GbZH56OEYHccZM3I=";
|
||||
cargoHash = "sha256-/rUuQSrOn8jkbeqF9aOAYTjkyKrcKRznP9snUWZsvbU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
|
||||
@@ -3,14 +3,15 @@
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
asar,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
pname = "proxyman";
|
||||
version = "3.9.0";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
|
||||
hash = "sha256-hv0TYlCHoiWrMRLcPrruI09SC24Pafo9B5kkUpFDyKI=";
|
||||
hash = "sha256-kprkRi50/GASHZ/NiP6tuYiVp0019W4wIjUXL9H4aBg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
@@ -42,6 +43,11 @@ appimageTools.wrapAppImage {
|
||||
--replace-fail "Exec=AppRun" "Exec=proxyman --"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
inherit src; # needed for nix-update to find the GitHub URL
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Capture, inspect, and manipulate HTTP(s) requests/responses with ease";
|
||||
homepage = "https://proxyman.com";
|
||||
|
||||
@@ -89,7 +89,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pulsar";
|
||||
version = "1.131.1";
|
||||
version = "1.131.2";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.srcs.${stdenv.hostPlatform.system}
|
||||
@@ -98,11 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/pulsar-edit/pulsar/releases/download/v${finalAttrs.version}/Linux.pulsar-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Is+KAnPuHUrj87KFTjB/v/LMDflq4LbX3VP8Cv7/CNQ=";
|
||||
hash = "sha256-9KziiAKvfzh1yERPRakMCuQmW0ZlUQiaNFI2plWgb/c=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/pulsar-edit/pulsar/releases/download/v${finalAttrs.version}/ARM.Linux.pulsar-${finalAttrs.version}-arm64.tar.gz";
|
||||
hash = "sha256-P2ZBV9Al6xw347yUs3BOWnwJGWegRh52oygLFgjoBcw=";
|
||||
hash = "sha256-0AG87yQfg/osTtCBV10/X/4MXkWxD7lkDXcyFIGKvEs=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -259,10 +259,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.updateScript = writeShellScript "update-pulsar" ''
|
||||
set -euo pipefail
|
||||
PATH="${lib.getBin curl}:$PATH"
|
||||
PATH="${lib.getBin jq}:$PATH"
|
||||
PATH="${lib.getBin coreutils}:$PATH"
|
||||
PATH="${lib.getBin nix-update}:$PATH"
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
curl
|
||||
jq
|
||||
nix-update
|
||||
]
|
||||
}"
|
||||
version="$(curl https://api.github.com/repos/pulsar-edit/pulsar/releases/latest | jq ".tag_name" -r | tr -d 'v')"
|
||||
nix-update pkgsCross.gnu64.pulsar --version "$version"
|
||||
nix-update pkgsCross.aarch64-multiplatform.pulsar --version skip
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qdl";
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-msm";
|
||||
repo = "qdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-k6PMiKPwdV3eOFm9FEQPMbyN73DypAZ/UgwOR6aigHA=";
|
||||
hash = "sha256-/lvKMC0bJdfqhPCuBYChX/6Aybpu+cPg0Vjl2HDbOeE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -42,13 +42,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rapidraw";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CyberTimon";
|
||||
repo = "RapidRAW";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-C6U3xU/rL+Og6DgJTnPESf+LPlm+svTNS5bSGhrn7dQ=";
|
||||
hash = "sha256-GCmaPNgPn6xTdvRTkXlrSasULlxWFTwuBlbqmMD4O8s=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
# darwin/linux hash mismatch in rawler submodule
|
||||
@@ -58,11 +58,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cgqNGft6LK5XNGv1CDLw5v+m8a9xmu7albfoGJnkE34=";
|
||||
cargoHash = "sha256-IIl4BSEMpyLiiZQGRlQaIPpXNQKGg6GrGQmnHDzDAdc=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-YpM/EQ4eFqziwEpSXpBNEO8A5fCmjVtCrgr11YxLKxY=";
|
||||
hash = "sha256-PLwefGi6p6rJLvLonHXszA74wqySyoE3xxRPDlrfgUQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -148,8 +148,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Add rpath for onnxruntime so the binary can find libonnxruntime.dylib at runtime
|
||||
# The binary links against @rpath/libonnxruntime.*.dylib but has no LC_RPATH entries
|
||||
install_name_tool -add_rpath "${onnxruntime}/lib" "$out/Applications/RapidRAW.app/Contents/MacOS/rapidraw"
|
||||
# The app also dlopen()s libonnxruntime.dylib at a hardcoded path inside the bundle
|
||||
mkdir -p "$out/Applications/RapidRAW.app/Contents/Resources/resources"
|
||||
ln -sf ${onnxruntime}/lib/libonnxruntime.dylib "$out/Applications/RapidRAW.app/Contents/Resources/resources/libonnxruntime.dylib"
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
|
||||
@@ -1,22 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
pkgsStatic,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rcp";
|
||||
version = "0.21.1";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wykurz";
|
||||
repo = "rcp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ayT8lp8XqkvtUaff2Iy+5IVyJ/ukKl0qruEWjBlgAvo=";
|
||||
hash = "sha256-ghFVGbud3aKJPvjNchsgPUSioNAxg4TJlUIYMp9+cJo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AcH5V5hapVQgGrwWAEN6Xpj00RRNqZiCSn+/onpmd50=";
|
||||
cargoHash = "sha256-eyIO8lxmGdZKEDW+GSVARm5u3X0vx1RJLG8Ljbk0Zb8=";
|
||||
|
||||
env.RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
@@ -25,8 +24,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=copy::copy_tests::check_default_mode"
|
||||
"--skip=test_weird_permissions"
|
||||
"--skip=test_edge_case_special_permissions"
|
||||
"--skip=test_default_strips_special_bits_on_directories"
|
||||
"--skip=test_default_strips_special_bits_on_files"
|
||||
"--skip=test_default_preserves_special_bits_on_directories"
|
||||
"--skip=test_preserve_all_preserves_special_bits_on_directories"
|
||||
"--skip=test_preserve_all_preserves_special_bits_on_files"
|
||||
"--skip=test_preserve_settings_dir_gid_time_7777"
|
||||
"--skip=test_preserve_settings_dir_7777_preserves_special_bits"
|
||||
"--skip=test_preserve_settings_file_7777_preserves_special_bits"
|
||||
"--skip=test_preserve_settings_none_strips_special_bits_on_directories"
|
||||
# this test expects overwrite behavior that doesn't work in a sandbox
|
||||
"--skip=test_overwrite_behavior"
|
||||
# these tests require network access to determine local IP address
|
||||
"--skip=test_remote"
|
||||
# these tests expect to find version/git info from Cargo.toml, which isn't available in the sandbox
|
||||
"--skip=version::tests::test_current_version"
|
||||
"--skip=test_protocol_version_has_git_info"
|
||||
"--skip=test_rcpd_protocol_version_has_git_info"
|
||||
];
|
||||
|
||||
meta = {
|
||||
@@ -36,8 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = with lib.licenses; [ mit ];
|
||||
mainProgram = "rcp";
|
||||
maintainers = with lib.maintainers; [ wykurz ];
|
||||
# Building procfs on an for a unsupported platform. Currently only linux and android are supported
|
||||
# (Your current target_os is macos)
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
# procfs only supports Linux and Android
|
||||
broken = pkgsStatic.stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
diff --git a/src/rendercv/cli/create_theme_command/create_theme_command.py b/src/rendercv/cli/create_theme_command/create_theme_command_fixed.py
|
||||
index 3812d5b..42a69db 100644
|
||||
--- a/src/rendercv/cli/create_theme_command/create_theme_command.py
|
||||
+++ b/src/rendercv/cli/create_theme_command/create_theme_command_fixed.py
|
||||
@@ -1,3 +1,4 @@
|
||||
+import os
|
||||
import pathlib
|
||||
import textwrap
|
||||
from typing import Annotated
|
||||
@@ -35,11 +36,21 @@ def cli_command_create_theme(
|
||||
|
||||
copy_templates("typst", new_theme_folder)
|
||||
|
||||
+ # Explicit directory permissions
|
||||
+ pathlib.Path.chmod(new_theme_folder, 0o755)
|
||||
+ # Explicit files and sub-directories permissions recursively
|
||||
+ for root, directories, files in os.walk(new_theme_folder):
|
||||
+ for directory in directories:
|
||||
+ pathlib.Path.chmod(pathlib.Path(root) / directory, 0o755)
|
||||
+ for file in files:
|
||||
+ pathlib.Path.chmod(pathlib.Path(root) / file, 0o644)
|
||||
+
|
||||
# Create the __init__.py file for the new theme:
|
||||
create_init_file_for_theme(theme_name, new_theme_folder / "__init__.py")
|
||||
|
||||
# Build the panel
|
||||
- message = textwrap.dedent(f"""
|
||||
+ message = textwrap.dedent(
|
||||
+ f"""
|
||||
[green]✓[/green] Created your custom theme: [purple]./{theme_name}[/purple]
|
||||
|
||||
What you can do with this theme:
|
||||
@@ -52,7 +63,8 @@ def cli_command_create_theme(
|
||||
To use your theme, set in your YAML input file:
|
||||
[cyan] design:
|
||||
[cyan] theme: {theme_name}
|
||||
- """).strip("\n")
|
||||
+ """
|
||||
+ ).strip("\n")
|
||||
|
||||
print(
|
||||
rich.panel.Panel(
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "rendercv";
|
||||
version = "2.7";
|
||||
version = "2.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rendercv";
|
||||
repo = "rendercv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2ClS/RwfAhjo+bh1fTiir1YCVelDJPOjp+Z3GHVzF4E=";
|
||||
hash = "sha256-iYfUoSN5HiDsAwkx44KbmHPN+vcYAra1zyfxTwziYkI=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ uv-build ];
|
||||
@@ -37,11 +37,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"phonenumbers"
|
||||
"markdown"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix_theme_directory_permissions.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -61,6 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
"tests/renderer/test_pdf_png.py"
|
||||
"tests/cli/render_command/test_render_command.py"
|
||||
"tests/test_pyodide.py"
|
||||
"tests/test_generated_files.py"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
@@ -68,7 +64,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
meta = {
|
||||
description = "Typst-based CV/resume generator";
|
||||
homepage = "https://rendercv.com";
|
||||
changelog = "https://docs.rendercv.com/changelog/#27-march-6-2026";
|
||||
changelog = "https://docs.rendercv.com/changelog/#28-march-21-2026";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ theobori ];
|
||||
mainProgram = "rendercv";
|
||||
|
||||
@@ -2,20 +2,25 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pcre2,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rgx";
|
||||
version = "0.9.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevity1swos";
|
||||
repo = "rgx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-04bnNHpIRMyqvRmXDjzGpeEHgwVDSoBtyunlt03nB5Q=";
|
||||
hash = "sha256-H566bgnf4bNPXS7rPtOFTlqmkwoXKbB1fBmFDZQUjac=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-v7dO2TSCKb+E/jLYPw8Q499qFXmSnbv3/WoS+dZhyBM=";
|
||||
cargoHash = "sha256-hTR4eZKUOxvib5lAV/l76GZQPQ6s+Hgl3DT2kaGlaGg=";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
buildFeatures = [ "pcre2-engine" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/brevity1swos/rgx";
|
||||
|
||||
@@ -2,22 +2,23 @@
|
||||
lib,
|
||||
fetchFromCodeberg,
|
||||
buildGoModule,
|
||||
tailwindcss_3,
|
||||
tailwindcss_4,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rimgo";
|
||||
version = "1.2.6";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "rimgo";
|
||||
repo = "rimgo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PBzbCiRIDrtKH3j6jxmylPpwafR5qgRYDHgYP1m/+Ok=";
|
||||
hash = "sha256-0P2+U4wXiFybpGzV7IB1DXZWC+qIdeQtR6mtiYrrih0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU=";
|
||||
vendorHash = "sha256-unqml6T50BTBzYXXGcL4cc+q9qJJ9W2b2flPBPheBpk=";
|
||||
|
||||
nativeBuildInputs = [ tailwindcss_3 ];
|
||||
nativeBuildInputs = [ tailwindcss_4 ];
|
||||
|
||||
preBuild = ''
|
||||
tailwindcss -i static/tailwind.css -o static/app.css -m
|
||||
@@ -29,6 +30,8 @@ buildGoModule (finalAttrs: {
|
||||
"-X codeberg.org/rimgo/rimgo/pages.VersionInfo=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Alternative frontend for Imgur";
|
||||
homepage = "https://codeberg.org/rimgo/rimgo";
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "rimsort";
|
||||
version = "1.0.47";
|
||||
version = "1.0.73";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RimSort";
|
||||
repo = "RimSort";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1wn3WIflrhH3IMBeGFwcHi0zOREakuk/5gqwPY720eA=";
|
||||
hash = "sha256-xNmJ1XvnLTKhicVchzG9CQtRVoZjRkBEvfn/WWesDRU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -111,10 +111,14 @@ stdenv.mkDerivation {
|
||||
dontBuild = true;
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
pytest-mock
|
||||
pytest-qt
|
||||
pytest-xvfb
|
||||
rapidfuzz
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
@@ -126,7 +130,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires network
|
||||
# requires network (clones GitHub: Community-Rules-Database, Steam-Workshop-Database)
|
||||
"tests/models/metadata/test_metadata_factory.py"
|
||||
];
|
||||
|
||||
|
||||
@@ -2,17 +2,17 @@ diff --git a/app/utils/generic.py b/app/utils/generic.py
|
||||
index f23aa5c..9ff4a04 100644
|
||||
--- a/app/utils/generic.py
|
||||
+++ b/app/utils/generic.py
|
||||
@@ -260,6 +260,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:
|
||||
+ str(args)
|
||||
+ "`"
|
||||
)
|
||||
+
|
||||
+ args = [executable_path, *args]
|
||||
+ executable_path = "@steam-run@/bin/steam-run"
|
||||
+
|
||||
pid, popen_args = launch_process(
|
||||
executable_path, args, str(game_install_path)
|
||||
)
|
||||
@@ -299,7 +299,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:
|
||||
logger.info(
|
||||
f"Launching the game with subprocess.Popen(): `{executable_path}` "
|
||||
f"with env_vars: {list(env_vars.keys())}, wrappers: {wrapper_commands}, args: {game_args}"
|
||||
)
|
||||
+ if sys.platform == "linux":
|
||||
+ game_args = [executable_path] + game_args
|
||||
+ executable_path = "@steam-run@/bin/steam-run"
|
||||
pid, popen_args = launch_process(
|
||||
executable_path,
|
||||
game_args,
|
||||
diff --git a/app/utils/steam/steamcmd/wrapper.py b/app/utils/steam/steamcmd/wrapper.py
|
||||
index 398e0fd..79bb162 100644
|
||||
--- a/app/utils/steam/steamcmd/wrapper.py
|
||||
@@ -24,7 +24,7 @@ index 398e0fd..79bb162 100644
|
||||
- self.steamcmd,
|
||||
- [f'+runscript "{script_path}"'],
|
||||
+ "@steam-run@/bin/steam-run",
|
||||
+ [self.steamcmd, f'+runscript "{script_path}"'],
|
||||
+ [self.steamcmd, f'+runscript "{script_path}"'],
|
||||
len(publishedfileids),
|
||||
)
|
||||
else:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user