mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
90a9c80052
80 changed files with 873 additions and 279 deletions
|
|
@ -8523,9 +8523,9 @@
|
|||
email = "evysgarden@protonmail.com";
|
||||
};
|
||||
ewok = {
|
||||
email = "ewok@ewok.ru";
|
||||
github = "ewok-old";
|
||||
githubId = 454695;
|
||||
email = "github@in.ewok.email";
|
||||
github = "ewok";
|
||||
githubId = 125148819;
|
||||
name = "Artur Taranchiev";
|
||||
};
|
||||
ewuuwe = {
|
||||
|
|
@ -13130,6 +13130,13 @@
|
|||
githubId = 168684553;
|
||||
name = "João Marques";
|
||||
};
|
||||
joibel = {
|
||||
email = "alan@clucas.org";
|
||||
github = "Joibel";
|
||||
githubId = 1827156;
|
||||
name = "Alan Clucas";
|
||||
keys = [ { fingerprint = "EBE6 85B9 4904 22E1 EC94 7B17 79C7 9CBD BAF6 4C13"; } ];
|
||||
};
|
||||
joinemm = {
|
||||
email = "joonas@rautiola.co";
|
||||
github = "joinemm";
|
||||
|
|
|
|||
|
|
@ -76,22 +76,23 @@ in
|
|||
default = null;
|
||||
apply = v: if v != null then lib.concatStringsSep "," v else null;
|
||||
description = ''
|
||||
Blob MIME types that can be served.
|
||||
Blob mimetypes that can be served. Wildcards are supported "*/*", "image/*", etc.
|
||||
|
||||
Validation is done loosely via content inference. Further validation can be done by
|
||||
a layer above this proxy, such as an image transformation service. When inference
|
||||
fails, the blob's type falls back to `application/octet-stream`. When that type is
|
||||
allowed, blobs failing inference can still be served.
|
||||
Validation is done loosely via content sniffing. Further validation can be done by a layer
|
||||
above this proxy, such as an image transformation service. When inference fails, the blob's
|
||||
type falls back to `application/octet-stream`. When that type is allowed, blobs failing
|
||||
inference can still be served.
|
||||
'';
|
||||
};
|
||||
PORXIE_BLOB_MAX_SIZE = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Maximum blob size that can be fetched and served.
|
||||
Maximum blob size that can be served.
|
||||
|
||||
Blobs that exceed this limit will return HTTP 413. The minimum value is 512kb
|
||||
and the maximum is the system's total memory.
|
||||
Blobs that exceed this limit will return HTTP 413.
|
||||
|
||||
The minimum value is 512kb and the maximum is the system's total memory.
|
||||
'';
|
||||
};
|
||||
PORXIE_BLOB_CACHE_HEADER = lib.mkOption {
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@ in
|
|||
}
|
||||
];
|
||||
|
||||
warnings = lib.mkIf (cfg.reverseProxy -> cfg.trustedProxyIP == [ ]) [
|
||||
warnings = lib.mkIf (cfg.reverseProxy && cfg.trustedProxyIP == [ ]) [
|
||||
''
|
||||
When config.services.oauth2-proxy.reverseProxy is enabled, configure config.services.oauth2-proxy.trustedProxyIP to the IPs or CIDR range(s) of the reverse proxies that are allowed to send X-Forwarded-* headers.
|
||||
If you leave it unset, OAuth2 Proxy currently trusts all source IPs for backwards compatibility, which means a client that can reach OAuth2 Proxy directly may be able to spoof forwarded headers.
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
position = "start-of-file";
|
||||
}
|
||||
];
|
||||
vendorHash = "sha256-MGgFbglyW/1CMhT1b83ETH70gRkz89s/Gp4seR2g7xI=";
|
||||
vendorHash = "sha256-66WNU+t/frHfbxexYdiXzgXKLxPyLnN6JuKnlG/kSQY=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,18 +13,18 @@
|
|||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
let
|
||||
version = "0.6.4";
|
||||
version = "0.8.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtrKovalenko";
|
||||
repo = "fff.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vu5yqOvVAPXHMi8sZFQuH9rNsFDffh3Ja74Be0Cs64c=";
|
||||
hash = "sha256-JbV2dTQhTyZgDZYvFoR1mz9CeM2IPv59Qmp2iiJC8a0=";
|
||||
};
|
||||
fff-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "fff-nvim-lib";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-w6KwiE0rAT00fiRa1rT8uthVgcMB7EFGoG3+M5MYEBo=";
|
||||
cargoHash = "sha256-L/Ens/wzw/jKaa1T3A2pLIBKs09saPEk/0bRhgRezPQ=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
|
@ -45,8 +45,14 @@ let
|
|||
perl
|
||||
rustPlatform.bindgenHook
|
||||
writableTmpDirAsHomeHook
|
||||
zig
|
||||
];
|
||||
|
||||
dontUseZigConfigure = true;
|
||||
dontUseZigBuild = true;
|
||||
dontUseZigCheck = true;
|
||||
dontUseZigInstall = true;
|
||||
|
||||
# Some tests need git
|
||||
nativeCheckInputs = [ gitMinimal ];
|
||||
|
||||
|
|
@ -69,8 +75,6 @@ let
|
|||
|
||||
# Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
|
||||
RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
|
||||
|
||||
ZIG = lib.getExe zig; # zlob requires zig
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore rec {
|
||||
core = "np2kai";
|
||||
version = "0-unstable-2026-04-01";
|
||||
version = "0-unstable-2026-05-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AZO234";
|
||||
repo = "NP2kai";
|
||||
rev = "cbadd7572e0b13de0c0c011a86758ca4dc4a74ae";
|
||||
hash = "sha256-4p5SpXgGzfj2lc+0yAgwrRLDkYWrIkZi+XREQpNhdKA=";
|
||||
rev = "eebb95c060f82df45a5615be676c3fa4b7bb7ae0";
|
||||
hash = "sha256-KBvxqxCeYyIKCTHdcczwpgHBIZds6xMfHt6LblRRoFc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "pcsx-rearmed";
|
||||
version = "0-unstable-2026-04-25";
|
||||
version = "0-unstable-2026-05-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "pcsx_rearmed";
|
||||
rev = "a97efbb0646dd7766bd66fe9e93118206edec36a";
|
||||
hash = "sha256-2MAj/UdEg/kRZuGZcVQ+hBMe2pRlZWvEQnXeqb+444Y=";
|
||||
rev = "c88070df8e0e84106ecc4b6394860a413a7bc046";
|
||||
hash = "sha256-ZngYExWmL4NlmSfaRbTpSthNY1QRwKXtSiSX8zS/teo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "stella";
|
||||
version = "0-unstable-2026-04-28";
|
||||
version = "0-unstable-2026-05-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stella-emu";
|
||||
repo = "stella";
|
||||
rev = "0c1b944387b5ac2b1bf753c2c4221db4fdc10f79";
|
||||
hash = "sha256-mohkp6oOP8MtRs/WHw4Rxs3FrB6h4X6/ENrRdjiiXlQ=";
|
||||
rev = "03dbb069fd2d6fee0d58c5d96077bdf9c686a1e2";
|
||||
hash = "sha256-BiyicKZsoRXd/w0U2uvCjd0E3gzNvfNPbAt34nGdXdw=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -328,11 +328,11 @@
|
|||
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
|
||||
},
|
||||
"dnsimple_dnsimple": {
|
||||
"hash": "sha256-j3O1gztyDCiq0Rchcx1lYktY2EhaNaa3t1yL+lH7IAg=",
|
||||
"hash": "sha256-8ZanbgHaszFiorzY/ulpVvUesmyx7O3SKXmwOi5WUSU=",
|
||||
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
|
||||
"owner": "dnsimple",
|
||||
"repo": "terraform-provider-dnsimple",
|
||||
"rev": "v2.1.1",
|
||||
"rev": "v2.1.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-1CpswocnTe6aj4TP7fMGy6mv0d/yX8FcYAKkAW5k7kk="
|
||||
},
|
||||
|
|
|
|||
|
|
@ -82,13 +82,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ansel";
|
||||
version = "0-unstable-2026-05-01";
|
||||
version = "0-unstable-2026-05-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aurelienpierreeng";
|
||||
repo = "ansel";
|
||||
rev = "31c4dcb406b26a18e86e0b88232696ee476b5705";
|
||||
hash = "sha256-brbk5/ujjmwbiTLk3gwyIZP9ihupg6dxjVV/eeztg0o=";
|
||||
rev = "6612c07ad1fd9b6411ece87ba49e02b46880c576";
|
||||
hash = "sha256-peAkfXrJPpjwUO1So9HklhqNw+gnVuliphVP3LWob1w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,10 @@ buildGoModule (finalAttrs: {
|
|||
homepage = "https://github.com/argoproj/argo-workflows";
|
||||
changelog = "https://github.com/argoproj/argo-workflows/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ groodt ];
|
||||
maintainers = with lib.maintainers; [
|
||||
groodt
|
||||
joibel
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -14,10 +14,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
pname = "bat";
|
||||
version = "0.26.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "bat";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IbTvFT37BFo0tKOiApDL9sT+/nMD33MO3TXuho+lF2c=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "biome";
|
||||
version = "2.4.14";
|
||||
version = "2.4.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "@biomejs/biome@${finalAttrs.version}";
|
||||
hash = "sha256-kiA6qgW/kWaoLMIrWd7HraK7DOERMwCSvOTk5y7fkmY=";
|
||||
hash = "sha256-Q7yx5ZKIrZdnsG3OS9CZ3jyuv71V7l9crCwYRZDuFpU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sSZEukcCyEdoJ1GD1bNnXJkDYtNX6phiCj2EKJhHJZw=";
|
||||
cargoHash = "sha256-UzTE+Grg6RaTWAYIsaKgluVsSZXbDwIK5HY9rY2oIVo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brewtarget";
|
||||
version = "5.0.4";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Brewtarget";
|
||||
repo = "brewtarget";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lwrs2ZRHEbBXKzszlCE+WyclM7m4iX639tT0aFanFR0=";
|
||||
hash = "sha256-CVFj/tsOOFj/LpkmMy4h9dnCBTOq9WGkXFUr/yJdcK0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "bspwm";
|
||||
version = "0.9.12";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baskerville";
|
||||
repo = "bspwm";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-sEheWAZgKVDCEipQTtDLNfDSA2oho9zU9gK2d6W6WSU=";
|
||||
hash = "sha256-sEheWAZgKVDCEipQTtDLNfDSA2oho9zU9gK2d6W6WSU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -100,14 +100,14 @@ let
|
|||
}
|
||||
];
|
||||
in
|
||||
stdenv'.mkDerivation {
|
||||
version = "4.0.3";
|
||||
stdenv'.mkDerivation rec {
|
||||
version = "4.0.4";
|
||||
pname = "colmap";
|
||||
src = fetchFromGitHub {
|
||||
owner = "colmap";
|
||||
repo = "colmap";
|
||||
rev = "e5b4a3e2276fe0cb81c3643d8ffdf124020c372e";
|
||||
hash = "sha256-VV+ROjhrg7bEMV3QU6r4zCcMzC7tAPwTu6gV6/cmiH0=";
|
||||
tag = version;
|
||||
hash = "sha256-n9YwEqMSIh6vM2MVf7qxxVvDpsTLEsT37xoHiX66bL0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
installShellFiles,
|
||||
nixosTests,
|
||||
externalPlugins ? [ ],
|
||||
vendorHash ? "sha256-qodzzBee+4NeZ+XifMknFPayBcWDmbyYq1R6Xhuras0=",
|
||||
vendorHash ? "sha256-9LLTgIjOOMvYx4nhy+6X9bEBvqlKeTx//39q+YWXeHw=",
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -14,13 +14,13 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coredns";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coredns";
|
||||
repo = "coredns";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c0xXZnc0muXViPqMCJsD8TTGMbVCOKE49ElAHEPnKlw=";
|
||||
hash = "sha256-Uk4oWsUxaGdLQzX5JywYzi7pmQHGo06uQdLeOkP4U/s";
|
||||
};
|
||||
|
||||
inherit vendorHash;
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnscontrol";
|
||||
version = "4.37.1";
|
||||
version = "4.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DNSControl";
|
||||
repo = "dnscontrol";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qpvT1jhFNNmHsiJe3RsbxmgXd4OOX7+uqxjCBKERwkw=";
|
||||
hash = "sha256-lM+9xuNB88csciIC5eu2oRl0IBqZE7CCPCxf8BEZSz0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M+Wx3I2KCKI3fHHw6t5WhCcJkHvxswC3G0Zt8SAQ0ZI=";
|
||||
vendorHash = "sha256-pzdOW+L/w74ANaCKXWQviBMDlSTOfebAVE7Cdd+lZLo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
pkg-config,
|
||||
zlib,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
# once eza upstream gets support for setting up a compatibility symlink for exa, we should change
|
||||
# the handling here from postInstall to passing the required argument to the builder.
|
||||
exaAlias ? true,
|
||||
|
|
@ -17,6 +18,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
pname = "eza";
|
||||
version = "0.23.4";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
|
|
@ -57,6 +60,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
ln -s eza $out/bin/exa
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Modern, maintained replacement for ls";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -65,6 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "fastfetch";
|
||||
version = "2.63.1";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@ buildGoModule (
|
|||
|
||||
vendorHash = "sha256-cFIg9mOSQbrYHW4kg4aTeTaF+gy1jNpAlg8qepb81Jc=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${ui}/${ui.distRoot} web/
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
|
|
@ -74,10 +78,6 @@ buildGoModule (
|
|||
'';
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${ui}/${ui.distRoot} /build/source/web/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Server to communicate with the FindMyDevice app and save the latest (encrypted) location";
|
||||
homepage = "https://fmd-foss.org/";
|
||||
|
|
|
|||
|
|
@ -6,18 +6,19 @@
|
|||
installShellFiles,
|
||||
bc,
|
||||
ncurses,
|
||||
testers,
|
||||
fzf,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fzf";
|
||||
version = "0.72.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "fzf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rUxbC2+VASAEBmL8WOpywk0SD0gyHArisl4pxnqK32I=";
|
||||
};
|
||||
|
||||
|
|
@ -75,9 +76,8 @@ buildGoModule (finalAttrs: {
|
|||
chmod +x $out/bin/fzf-share
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = fzf;
|
||||
};
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/junegunn/fzf/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
|
|
|
|||
|
|
@ -92,6 +92,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
extraPrefix = "subprojects/wlroots/";
|
||||
hash = "sha256-q2zekWNn111lX8N938y8HjREvlNMtdCLJ4RveX9z8u8=";
|
||||
})
|
||||
|
||||
# Pending upstream patch to support stb_image_resize2.h
|
||||
# See: https://github.com/ValveSoftware/gamescope/pull/2130
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ValveSoftware/gamescope/commit/d49a2aded261030e649fee42ad295f1ef56b736b.diff";
|
||||
hash = "sha256-Uh08ZRaV912ZOsl1DMpbVLxIgh4jEXevgihQf2W9KFk=";
|
||||
})
|
||||
];
|
||||
|
||||
# We can't substitute the patch itself because substituteAll is itself a derivation,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
buildGoModule,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
testers,
|
||||
versionCheckHook,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
|
|
@ -12,6 +12,8 @@ buildGoModule (finalAttrs: {
|
|||
pname = "gh";
|
||||
version = "2.92.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
|
|
@ -36,7 +38,7 @@ buildGoModule (finalAttrs: {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 bin/gh -t $out/bin
|
||||
installBin bin/gh
|
||||
wrapProgram $out/bin/gh \
|
||||
--set-default GH_TELEMETRY false
|
||||
''
|
||||
|
|
@ -55,9 +57,8 @@ buildGoModule (finalAttrs: {
|
|||
# most tests require network access
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GitHub CLI tool";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "18.11.2";
|
||||
version = "18.11.3";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UmoMZ55FqEVYTjfgdoZsbJcs/+4x80KKxq6Cfatv4K4=";
|
||||
hash = "sha256-oFQevVXbxu9G4LF3BrC0EUUviypSwB4cKRjipdiO3jU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-123WUtoUaPIyDywcTKEhiZP2SYYHxAQoOPyCebsHYRI=";
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.11.2";
|
||||
version = "18.11.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lxmwTC02WHwlrMgvTs2lkDj4AX8ovFuW73OHB6CIWTo=";
|
||||
hash = "sha256-ozkrU3QF/LK0uqfF52dnm2MCga+vRD8dGsLNnze6E+Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PUW4cgAiM1GTtvja894OZ4pe0SWChf5JsL4/fkns2kI=";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{
|
||||
"version": "18.11.2",
|
||||
"repo_hash": "sha256-TAc3bNFwq/QKR+X/P9BqQHA2T5viD+SAOXXUZ7StDP4=",
|
||||
"version": "18.11.3",
|
||||
"repo_hash": "sha256-QxaLdWErE+b4SpwHtxnCa2tqheWUfEixRcQwYD/A9s8=",
|
||||
"yarn_hash": "sha256-k8JHi0f/XfSV4kICyPW01Erk3YnKw33yeUWYrOaPdTM=",
|
||||
"frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.11.2-ee",
|
||||
"rev": "v18.11.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.11.2",
|
||||
"GITLAB_KAS_VERSION": "18.11.2",
|
||||
"GITLAB_PAGES_VERSION": "18.11.2",
|
||||
"GITALY_SERVER_VERSION": "18.11.3",
|
||||
"GITLAB_KAS_VERSION": "18.11.3",
|
||||
"GITLAB_PAGES_VERSION": "18.11.3",
|
||||
"GITLAB_SHELL_VERSION": "14.49.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.11.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "18.11.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ in
|
|||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.11.2";
|
||||
version = "18.11.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
|
|
|||
|
|
@ -363,6 +363,11 @@ gem 'loofah', '~> 2.25.0', feature_category: :shared # rubocop:todo Gemfile/Miss
|
|||
# Used to provide license templates
|
||||
gem 'licensee', '~> 9.16', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
# Pinned below 1.8 so rugged.so links libgit2's old http-parser instead of
|
||||
# the bundled llhttp, which collides with llhttp-ffi symbols at runtime.
|
||||
# See https://gitlab.com/gitlab-org/gitlab/-/issues/598564
|
||||
gem 'rugged', '~> 1.7.2', require: false, feature_category: :gitaly
|
||||
|
||||
# Detect and convert string character encoding
|
||||
gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
|
||||
|
||||
|
|
|
|||
3
pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
generated
3
pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
generated
|
|
@ -1871,7 +1871,7 @@ GEM
|
|||
rubyntlm (0.6.3)
|
||||
rubypants (0.2.0)
|
||||
rubyzip (2.4.1)
|
||||
rugged (1.9.0)
|
||||
rugged (1.7.2)
|
||||
safe_yaml (1.0.4)
|
||||
safety_net_attestation (0.5.0)
|
||||
jwt (>= 2.0, < 4.0)
|
||||
|
|
@ -2491,6 +2491,7 @@ DEPENDENCIES
|
|||
ruby-progressbar (~> 1.10)
|
||||
ruby-saml (~> 1.18)
|
||||
rubyzip (~> 2.4.0)
|
||||
rugged (~> 1.7.2)
|
||||
sanitize (~> 6.0.2)
|
||||
sd_notify (~> 0.1.0)
|
||||
seed-fu (~> 2.3.7)
|
||||
|
|
|
|||
4
pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
generated
4
pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
generated
|
|
@ -8651,10 +8651,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz";
|
||||
sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.0";
|
||||
version = "1.7.2";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hiredis";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redis";
|
||||
repo = "hiredis";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg=";
|
||||
hash = "sha256-gbCLIz6nOpPbu0xbsxUVvr7XmvGdVWZQJWjpE76NIXY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://github.com/redis/hiredis";
|
||||
description = "Minimalistic C client for Redis >= 1.2";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hittekaart";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dunj3";
|
||||
repo = "hittekaart";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bog00/pkpTaUtLDfuR9d8yEhDt9mn9YDyF17ojZMM38=";
|
||||
hash = "sha256-Pp4biN20NWrTB11Bi14INl9g5VPPP79j9tbgXUe40qQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Izcgxkl7QdNWYRrz9+nKMlCkEDtqiZTIAnJO/b7ZJKs=";
|
||||
cargoHash = "sha256-bo8PnAShrQJ9qPYk/yEhD8E0DZH2uJ427w0Wr34Xz/U=";
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,15 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "i2pd-tools";
|
||||
version = "2.56.0";
|
||||
|
||||
#tries to access the network during the tests, which fails
|
||||
version = "2.58.0-unstable-2026-04-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleI2P";
|
||||
repo = "i2pd-tools";
|
||||
rev = "33fce4b087d92ee90653460bbe7a07cdc0c7b121";
|
||||
hash = "sha256-mmCs8AHHKhx1/rDp/Vc1p2W3pufoTa4FcJyJwD919zw=";
|
||||
rev = "34944bbd5d0bab34694b1f57edba4b5a783f8b7b";
|
||||
hash = "sha256-W0khA1uVHmMBQdUwPMo/q64P9I6t6Eatf/KPaamJg7I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -26,13 +24,15 @@ stdenv.mkDerivation {
|
|||
openssl
|
||||
boost
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
for bin in \
|
||||
routerinfo keygen vain keyinfo regaddr \
|
||||
regaddr_3ld regaddralias x25519 famtool autoconf;
|
||||
regaddr_3ld regaddralias x25519 famtool autoconf_i2pd \
|
||||
verifyhost offlinekeys b33address i2pbase64;
|
||||
do
|
||||
install -Dm755 $bin -t $out/bin
|
||||
done
|
||||
|
|
@ -44,7 +44,10 @@ stdenv.mkDerivation {
|
|||
description = "Toolsuite to work with keys and eepsites";
|
||||
homepage = "https://github.com/PurpleI2P/i2pd-tools";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ MulliganSecurity ];
|
||||
mainProgram = "i2pd-tools";
|
||||
maintainers = with lib.maintainers; [
|
||||
MulliganSecurity
|
||||
ryand56
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
47
pkgs/by-name/kv/kvrocks/hook-test.nix
Normal file
47
pkgs/by-name/kv/kvrocks/hook-test.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{
|
||||
valkey,
|
||||
kvrocks,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kvrocks-test-hook-test";
|
||||
|
||||
nativeCheckInputs = [
|
||||
valkey
|
||||
kvrocks.hook
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
doCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
kvrocksTestPort=6380
|
||||
KVROCKS_SOCKET=/tmp/customkvrocks.sock
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
echo "running test"
|
||||
if redis-cli --scan -p $kvrocksTestPort; then
|
||||
echo "connected to kvrocks via localhost"
|
||||
PORT_TEST_RAN=1
|
||||
fi
|
||||
|
||||
if redis-cli --scan -s $KVROCKS_SOCKET; then
|
||||
echo "connected to kvrocks via domain socket"
|
||||
SOCKET_TEST_RAN=1
|
||||
fi
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
[[ $PORT_TEST_RAN == 1 && $SOCKET_TEST_RAN == 1 ]]
|
||||
echo "test passed"
|
||||
touch $out
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
}
|
||||
15
pkgs/by-name/kv/kvrocks/hook.nix
Normal file
15
pkgs/by-name/kv/kvrocks/hook.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
lib,
|
||||
makeSetupHook,
|
||||
kvrocks,
|
||||
valkey,
|
||||
}:
|
||||
|
||||
makeSetupHook {
|
||||
name = "kvrocks-test-hook";
|
||||
|
||||
substitutions = {
|
||||
cli = lib.getExe' valkey "redis-cli";
|
||||
server = lib.getExe' kvrocks "kvrocks";
|
||||
};
|
||||
} ./hook.sh
|
||||
53
pkgs/by-name/kv/kvrocks/hook.sh
Normal file
53
pkgs/by-name/kv/kvrocks/hook.sh
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
# shellcheck shell=bash
|
||||
|
||||
preCheckHooks+=('kvrocksStart')
|
||||
postCheckHooks+=('kvrocksStop')
|
||||
|
||||
kvrocksStart() {
|
||||
if [[ ${kvrocksTestPort:-} == "" ]]; then
|
||||
kvrocksTestPort=6666
|
||||
fi
|
||||
|
||||
mkdir -p "$NIX_BUILD_TOP/run/kvrocks"
|
||||
|
||||
if [[ "${KVROCKS_SOCKET:-}" == "" ]]; then
|
||||
KVROCKS_SOCKET="$NIX_BUILD_TOP/run/kvrocks.sock"
|
||||
fi
|
||||
export KVROCKS_SOCKET
|
||||
|
||||
KVROCKS_CONF="$NIX_BUILD_TOP/run/kvrocks.conf"
|
||||
export KVROCKS_CONF
|
||||
|
||||
cat <<EOF >"$KVROCKS_CONF"
|
||||
bind 127.0.0.1 ::1
|
||||
unixsocket ${KVROCKS_SOCKET}
|
||||
port ${kvrocksTestPort}
|
||||
dir $NIX_BUILD_TOP/run/kvrocks
|
||||
daemonize no
|
||||
EOF
|
||||
|
||||
echo 'starting kvrocks'
|
||||
|
||||
@server@ -c "$KVROCKS_CONF" &
|
||||
KVROCKS_PID=$!
|
||||
|
||||
echo 'waiting for kvrocks to be ready'
|
||||
kvrocks_start_timeout=60
|
||||
kvrocks_start_deadline=$((SECONDS + kvrocks_start_timeout))
|
||||
while ! @cli@ --scan -s "$KVROCKS_SOCKET"; do
|
||||
if ! kill -0 "$KVROCKS_PID" 2>/dev/null; then
|
||||
echo "kvrocks exited before becoming ready"
|
||||
return 1
|
||||
fi
|
||||
if (( SECONDS >= kvrocks_start_deadline )); then
|
||||
echo "timed out after ${kvrocks_start_timeout}s waiting for kvrocks to be ready"
|
||||
return 1
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
}
|
||||
|
||||
kvrocksStop() {
|
||||
echo 'stopping kvrocks'
|
||||
kill "$KVROCKS_PID"
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
callPackage,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
|
@ -319,6 +320,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
hook = callPackage ./hook.nix { kvrocks = finalAttrs.finalPackage; };
|
||||
tests = {
|
||||
hook = callPackage ./hook-test.nix { kvrocks = finalAttrs.finalPackage; };
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Distributed key value NoSQL database that uses RocksDB as storage engine and is compatible with Redis protocol";
|
||||
homepage = "https://kvrocks.apache.org/";
|
||||
|
|
|
|||
|
|
@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
soyouzpanda
|
||||
ma27
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
soyouzpanda
|
||||
ma27
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -181,6 +181,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
ma27
|
||||
];
|
||||
mainProgram = "docs";
|
||||
platforms = lib.platforms.all;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
python3,
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "1.15.0";
|
||||
|
|
@ -21,7 +20,7 @@ let
|
|||
changelog = "https://github.com/suitenumerique/meet/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ soyouzpanda ];
|
||||
platforms = lib.platforms.all;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
mail = callPackage ./mail.nix { inherit src version meta; };
|
||||
|
|
@ -48,16 +47,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
|||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "uv_build>=0.10.9,<0.11.0" "uv_build"
|
||||
''
|
||||
# Otherwise fails with:
|
||||
# socket.gaierror: [Errno 8] nodename nor servname provided, or not known
|
||||
+ (lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace impress/settings.py \
|
||||
--replace-fail \
|
||||
"gethostname()" \
|
||||
"gethostname() + '.local'"
|
||||
'');
|
||||
__darwinAllowLocalNetworking = true;
|
||||
'';
|
||||
|
||||
build-system = with python.pkgs; [ uv-build ];
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmodsecurity";
|
||||
version = "3.0.14";
|
||||
version = "3.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owasp-modsecurity";
|
||||
repo = "ModSecurity";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-SaeBO3+WvPhHiJoiOmijB0G3/QYxjAdxgeCVqESS+4U=";
|
||||
hash = "sha256-gI874wkqy8VuwxUmIgb8d7fULJUQ+rKBBF492NtuRMY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -81,6 +81,27 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--replace "ssdeep_inc_path=\"\''${path}/include\"" "ssdeep_inc_path=\"${ssdeep}/include\""
|
||||
substituteInPlace modsecurity.conf-recommended \
|
||||
--replace "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127"
|
||||
|
||||
# https://github.com/owasp-modsecurity/ModSecurity/blob/v3.0.15/build.sh#L6-L25
|
||||
cd src
|
||||
echo "noinst_HEADERS = \\" > headers.mk
|
||||
ls -1 \
|
||||
actions/*.h \
|
||||
actions/ctl/*.h \
|
||||
actions/data/*.h \
|
||||
actions/disruptive/*.h \
|
||||
actions/transformations/*.h \
|
||||
debug_log/*.h \
|
||||
audit_log/writer/*.h \
|
||||
collection/backend/*.h \
|
||||
operators/*.h \
|
||||
parser/*.h \
|
||||
request_body_processor/*.h \
|
||||
utils/*.h \
|
||||
variables/*.h \
|
||||
engine/*.h \
|
||||
*.h | tr "\012" " " >> headers.mk
|
||||
cd ../
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "netbird-dashboard";
|
||||
version = "2.37.1";
|
||||
version = "2.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "dashboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/mrDwRj6A2reMYdbBphgx+cFqjKwefbyWcSiyUOuU00=";
|
||||
hash = "sha256-9YtAqfSIpntpXpCNBUE7VwEoy6SNrusPTnH62HeghXY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Ze+1r5Uh+wdm3MuVr93oS2itodx9Zdv+JYO6Uji1saw=";
|
||||
|
|
@ -24,6 +24,7 @@ buildNpmPackage rec {
|
|||
|
||||
env = {
|
||||
CYPRESS_INSTALL_BINARY = 0;
|
||||
NEXT_PUBLIC_DASHBOARD_VERSION = version;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -67,16 +67,16 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.70.5";
|
||||
version = "0.71.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AsM+MEeBqxnwD1jE8ocI93tF3l/7s+s5nF073ZMAi/Y=";
|
||||
hash = "sha256-xU2P4COLufGdFrit8+IRn96FT1IJKGQ97R9eGv5cjqU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ebhjN6o/519ayxWTcscNinKuiL3LSPmE2VNgSitxj5g=";
|
||||
vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
pname = "nixpkgs-track";
|
||||
version = "0.6.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uncenter";
|
||||
repo = "nixpkgs-track";
|
||||
|
|
@ -21,11 +23,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
cargoHash = "sha256-lnv0nCyb2+7Xl+qAAeaHdbk4XOGdq4FINxPOIPchDhg=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
versionCheckHook
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "par-lang";
|
||||
version = "0-unstable-2026-05-06";
|
||||
version = "0-unstable-2026-05-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "par-team";
|
||||
repo = "par-lang";
|
||||
rev = "b045eda333bd7e02ae4f7ad7c6f84b3ba7d58d45";
|
||||
hash = "sha256-jOADgr7d154QskEc772hLP0um9UQzVhG+DYuHDdVdDo=";
|
||||
rev = "c850458a4732bbe7d14551c1b50d8a2055622625";
|
||||
hash = "sha256-1YEtq71chZhPO1q5V+QwRhqJDMUdDw5cFv8s8PRzUHc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+vhmSSzgeC26zq0P53oFKyu+RBg4qQjEvURCkAHNCp8=";
|
||||
cargoHash = "sha256-hg5okkDqOFRkUc4e/cs/C5AB1EROIUtfYpoDatJ0EAo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plantuml";
|
||||
version = "1.2026.2";
|
||||
version = "1.2026.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
|
||||
hash = "sha256-jbQjZrcUh9PTeizylcqb3Q7A4kKZH9ZcaEReymc3lo8=";
|
||||
hash = "sha256-ElMmvC2H8NRYwcEY5oIqo7fsiKAJBZDNqRFXOv2o5IE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
__structuredAttrs = true;
|
||||
|
||||
pname = "porxie";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "Blooym";
|
||||
repo = "porxie";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mClUYDBgOtX0WcCG0rXhgnKFqnvE2UOFH3PABeF+pkI=";
|
||||
hash = "sha256-XtJD9W0eF6jNWk0xyvGlV6h0JCAUUjFnMk/MRiVBv9I=";
|
||||
};
|
||||
cargoHash = "sha256-SImynSnWJ/tiEoSYuFYQ/JncMeierAioZO2Fnx6FHN4=";
|
||||
cargoHash = "sha256-q/Q4h39EzkjdWApfVf2VT1Rac+/2nQxpn+gp3l8tbeQ=";
|
||||
|
||||
buildInputs = [ rust-jemalloc-sys ];
|
||||
|
||||
|
|
|
|||
75
pkgs/by-name/pr/prometheus-kvrocks-exporter/package.nix
Normal file
75
pkgs/by-name/pr/prometheus-kvrocks-exporter/package.nix
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
kvrocks,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "prometheus-kvrocks-exporter";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RocksLabs";
|
||||
repo = "kvrocks_exporter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nyNdQfSXD6mAusO5VCEfvKuyvNawH4C5xDGOZSnTn7A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QVbcHQQr6o3jnF3CWw2NCCeRkGBDdA8OkmDd/GPfHuI=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
ldflags = [
|
||||
"-X main.BuildVersion=${finalAttrs.version}"
|
||||
"-X main.BuildCommitSha=unknown"
|
||||
"-X main.BuildDate=unknown"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ kvrocks.hook ];
|
||||
|
||||
preCheck = ''
|
||||
export TEST_REDIS_URI="redis://127.0.0.1:6666"
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
# The following tests require a real Redis/Kvrocks instance with specific configuration
|
||||
# or multiple instances which are not easily provided by a single kvrocks.hook.
|
||||
"TestPasswordProtectedInstance" # Requires TEST_PWD_REDIS_URI and TEST_USER_PWD_REDIS_URI
|
||||
"TestPasswordInvalid" # Requires TEST_PWD_REDIS_URI
|
||||
"TestHTTPScrapeWithPasswordFile" # Requires specific redis instances from password file
|
||||
"TestSimultaneousMetricsHttpRequests" # Requires multiple redis instances
|
||||
"TestClusterMaster" # Requires TEST_REDIS_CLUSTER_MASTER_URI
|
||||
"TestClusterSlave" # Requires TEST_REDIS_CLUSTER_SLAVE_URI
|
||||
|
||||
# The following tests fail due to "target" parameter requirement in kvrocks_exporter's /scrape endpoint
|
||||
# which is not satisfied in the test's HTTP requests in http_test.go.
|
||||
"TestHTTPScrapeMetricsEndpoints"
|
||||
|
||||
# These tests require a running instance and are sensitive to the environment
|
||||
"TestIncludeSystemMemoryMetric"
|
||||
|
||||
# These tests require valid JSON in password files or valid certs
|
||||
"TestLoadPwdFile"
|
||||
"TestPasswordMap"
|
||||
"TestCreateClientTLSConfig"
|
||||
"TestGetServerCertificateFunc"
|
||||
];
|
||||
in
|
||||
[ "-skip=^(${builtins.concatStringsSep "|" skippedTests})$" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Prometheus exporter for Kvrocks metrics";
|
||||
homepage = "https://github.com/RocksLabs/kvrocks_exporter";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ xyenon ];
|
||||
mainProgram = "kvrocks_exporter";
|
||||
};
|
||||
})
|
||||
|
|
@ -44,9 +44,11 @@ gnuradio.pkgs.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 qradiolink -t $out/bin
|
||||
install -Dm644 qradiolink.desktop -t $out/share/applications
|
||||
install -Dm644 src/res/icon.png $out/share/pixmaps/qradiolink.png
|
||||
install -Dm644 src/res/icon.png $out/share/icons/hicolor/64x64/apps/qradiolink.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
225
pkgs/by-name/re/resonarium/package.nix
Normal file
225
pkgs/by-name/re/resonarium/package.nix
Normal file
|
|
@ -0,0 +1,225 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
python3,
|
||||
writableTmpDirAsHomeHook,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
nix-update-script,
|
||||
alsa-lib,
|
||||
curl,
|
||||
fontconfig,
|
||||
freetype,
|
||||
libGL,
|
||||
libjack2,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxext,
|
||||
libxi,
|
||||
libxinerama,
|
||||
libxrandr,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "resonarium";
|
||||
version = "0.0.11";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrielsoule";
|
||||
repo = "resonarium";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-/ezkq1er/OteoLrqXe60/QmC5BOqoRcoGvtr93wBioE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
# find_package(Python3 COMPONENTS Interpreter Development REQUIRED) is
|
||||
# called unconditionally at the top of CMakeLists.txt, so Python is needed
|
||||
# at configure time even though we don't build the python bindings.
|
||||
python3
|
||||
# JUCE's COPY_PLUGIN_AFTER_BUILD writes into $HOME/.{vst3,lv2}; also
|
||||
# fontconfig wants a writable cache dir at build time.
|
||||
writableTmpDirAsHomeHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
curl
|
||||
fontconfig
|
||||
freetype
|
||||
libGL
|
||||
libjack2
|
||||
libx11
|
||||
libxcursor
|
||||
libxext
|
||||
libxi
|
||||
libxinerama
|
||||
libxrandr
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream forgot to bump the in-source version for v0.0.11; sync it
|
||||
# to the git tag so the About screen and plugin metadata agree.
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "set(PLUGIN_VERSION 0.0.10)" \
|
||||
"set(PLUGIN_VERSION ${finalAttrs.version})"
|
||||
substituteInPlace plugin/Source/PluginProcessor.cpp \
|
||||
--replace-fail '"0.0.10 (INST) ALPHA"' '"${finalAttrs.version} (INST) ALPHA"' \
|
||||
--replace-fail '"0.0.10 (FX) ALPHA"' '"${finalAttrs.version} (FX) ALPHA"'
|
||||
|
||||
# melatonin_perfetto's CMakeLists fetches CPM.cmake and the Perfetto SDK
|
||||
# from the network at configure time, which the Nix sandbox blocks. The
|
||||
# PERFETTO compile-time switch is OFF here, so melatonin_perfetto.h
|
||||
# compiles every tracing macro to a no-op and never includes <perfetto.h>.
|
||||
# Replace the module's CMakeLists with a stub that just registers the
|
||||
# JUCE module and exposes the expected target/alias names.
|
||||
cat > modules/melatonin_perfetto/CMakeLists.txt <<'EOF'
|
||||
juce_add_module("''${CMAKE_CURRENT_LIST_DIR}/melatonin_perfetto")
|
||||
add_library(perfetto INTERFACE)
|
||||
add_library(perfetto::perfetto ALIAS perfetto)
|
||||
target_link_libraries(melatonin_perfetto INTERFACE perfetto::perfetto)
|
||||
add_library(Melatonin::Perfetto ALIAS melatonin_perfetto)
|
||||
EOF
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env = {
|
||||
# JUCE dlopen's these at runtime; standalone executable crashes without them.
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-ljack"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
];
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
};
|
||||
|
||||
# Build only the plugin/standalone targets; skip Resonarium_Python so we
|
||||
# don't have to install a python module as part of an audio-plugin package.
|
||||
ninjaFlags = [
|
||||
"Resonarium_Instrument_All"
|
||||
"Resonarium_Effect_All"
|
||||
];
|
||||
|
||||
# The upstream `install` rules target "Applications" / "Program Files",
|
||||
# which makes no sense on Linux and trips CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.
|
||||
dontUseCmakeInstall = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
instArt="Resonarium_Instrument_artefacts/Release"
|
||||
fxArt="Resonarium_Effect_artefacts/Release"
|
||||
|
||||
# VST3 bundles
|
||||
install -dm755 "$out/lib/vst3"
|
||||
cp -r "$instArt/VST3/Resonarium.vst3" "$out/lib/vst3/"
|
||||
cp -r "$fxArt/VST3/Resonarium Effect.vst3" "$out/lib/vst3/"
|
||||
|
||||
# LV2 bundles
|
||||
install -dm755 "$out/lib/lv2"
|
||||
cp -r "$instArt/LV2/Resonarium.lv2" "$out/lib/lv2/"
|
||||
cp -r "$fxArt/LV2/Resonarium Effect.lv2" "$out/lib/lv2/"
|
||||
|
||||
# Standalone executables (drop the space in the Effect binary name)
|
||||
install -Dm755 "$instArt/Standalone/Resonarium" "$out/bin/Resonarium"
|
||||
install -Dm755 "$fxArt/Standalone/Resonarium Effect" "$out/bin/Resonarium-Effect"
|
||||
|
||||
# Icon for the .desktop entries
|
||||
install -Dm644 "$src/plugin/Resources/resonarium_logo.png" \
|
||||
"$out/share/icons/hicolor/512x512/apps/resonarium.png"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "resonarium";
|
||||
desktopName = "Resonarium";
|
||||
genericName = "Physical Modelling Synthesizer";
|
||||
comment = "MPE-compatible physical modelling synthesizer based on coupled string waveguides";
|
||||
exec = "Resonarium";
|
||||
icon = "resonarium";
|
||||
categories = [
|
||||
"AudioVideo"
|
||||
"Audio"
|
||||
"Music"
|
||||
];
|
||||
keywords = [
|
||||
"synth"
|
||||
"synthesizer"
|
||||
"audio"
|
||||
"MPE"
|
||||
"waveguide"
|
||||
];
|
||||
})
|
||||
(makeDesktopItem {
|
||||
name = "resonarium-effect";
|
||||
desktopName = "Resonarium Effect";
|
||||
genericName = "Physical Modelling Audio Effect";
|
||||
comment = "Resonarium as an audio effect, applying its physical models to external input";
|
||||
exec = "Resonarium-Effect";
|
||||
icon = "resonarium";
|
||||
categories = [
|
||||
"AudioVideo"
|
||||
"Audio"
|
||||
];
|
||||
keywords = [
|
||||
"audio"
|
||||
"effect"
|
||||
"resonator"
|
||||
"waveguide"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "MPE-compatible physical modelling synthesizer based on coupled string waveguides";
|
||||
longDescription = ''
|
||||
Resonarium is a physical-modelling synthesizer plugin and standalone
|
||||
application designed for abstract sound design, exploration and
|
||||
open-ended play. Its voice is a network of coupled waveguide
|
||||
resonators driven by configurable exciters, and it is intended to be
|
||||
played with MPE-capable controllers such as the Ableton Push 3, the
|
||||
Expressive E Osmose or the ROLI Seaboard.
|
||||
|
||||
This package builds the Instrument (synth) and Effect variants and
|
||||
installs VST3 and LV2 bundles as well as the standalone applications.
|
||||
'';
|
||||
homepage = "https://github.com/gabrielsoule/resonarium";
|
||||
changelog = "https://github.com/gabrielsoule/resonarium/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "Resonarium";
|
||||
maintainers = with lib.maintainers; [ magnetophon ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdl3-mixer";
|
||||
version = "3.2.0";
|
||||
version = "3.2.2";
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "libsdl-org";
|
||||
repo = "SDL_mixer";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-+kOxmBX/zPCTq51F9ysSGsZdJSb21uM56U50mEgprbo=";
|
||||
hash = "sha256-J4qyb5zeeDowile8p2qJzBWP0lnBR8nYSF0fuZUshiM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
143
pkgs/by-name/so/sourcegit/deps.json
generated
143
pkgs/by-name/so/sourcegit/deps.json
generated
|
|
@ -1,24 +1,14 @@
|
|||
[
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.0.0",
|
||||
"hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.25547.20250602",
|
||||
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "0.0.28",
|
||||
"hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "11.3.2",
|
||||
|
|
@ -26,48 +16,43 @@
|
|||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-xuAL5FOvonyaY9CwEhjtMnurPcA0lYe0dyLLK0GEzd8="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-uqpRip0O+DUk/zsytLdJhZz103har19xPqMq0hI/Ppg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-NTwCJzVSyUXbobwgsHI3jOwc27eFAIYzQnXXueS86LI="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Fonts.Inter",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-vRrv5uLH3XLGo8FelJz8kYxcp5sdMakkK02k+xjDsaE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.0.0",
|
||||
"hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
|
|
@ -76,28 +61,28 @@
|
|||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Fluent",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-JNQ2kmrjAvwN8pboT66HVi1r28Cc9WG+8cnxL/AYCWs="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
|
||||
"version": "11.3.13",
|
||||
"hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.AI.OpenAI",
|
||||
|
|
@ -116,8 +101,8 @@
|
|||
},
|
||||
{
|
||||
"pname": "CommunityToolkit.Mvvm",
|
||||
"version": "8.4.0",
|
||||
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
|
||||
"version": "8.4.2",
|
||||
"hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
|
|
@ -151,18 +136,18 @@
|
|||
},
|
||||
{
|
||||
"pname": "LiveChartsCore",
|
||||
"version": "2.0.0-rc6.1",
|
||||
"hash": "sha256-bz71i+8phXf8H/MG+DhF0m7RsNw2TLtPjREI55V4Mos="
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-PZDNCp9wx7JjkV4z6FwAxEOzHT21zWqefW+RpVp5tpQ="
|
||||
},
|
||||
{
|
||||
"pname": "LiveChartsCore.SkiaSharpView",
|
||||
"version": "2.0.0-rc6.1",
|
||||
"hash": "sha256-ftkvP9ow2jSxOXQsGSDUDp232iY+cLEcwW4u1Bj+qN8="
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-sZDLxn4hNdEaPyaFcDZwLk7WAJp7Zc6sPCIS70rpz8g="
|
||||
},
|
||||
{
|
||||
"pname": "LiveChartsCore.SkiaSharpView.Avalonia",
|
||||
"version": "2.0.0-rc6.1",
|
||||
"hash": "sha256-OWvyQ72JtajDlN1BDXHyTYP/U0TKnogNDOWCOCqpk6M="
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-LUW2zxJPIGPIdsy4tpofuDD3fUzp7bOC9U2BvZtGaXs="
|
||||
},
|
||||
{
|
||||
"pname": "MicroCom.Runtime",
|
||||
|
|
@ -181,43 +166,43 @@
|
|||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-OfcPeDv7RJvvv7ns+wCMAQCdG/He2KtxV6MRlwvp35I="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-Aob6wq51LdquE7SkkxtCzcuHBKWrJcb3Ebi/dU3aqA4="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-JglKtC6+jfiggRUU5AXC6mR0cW1t3M33wR7WXKyJjBs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-tibCkkT9WliU2E/i0ufx7/Va6H6QZX4hR/1oUp8ecgQ="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-uWAZh/RdMEiwTM2311KlDKK2LBo81tIYXPTUzJXbceA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Hosting.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-mkeKUXepn4bfEdZFXdURmNEFdGiHQdpcxnm6joG+pUA="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-d8zXyTfgVdok+Cgg5EC04DH4iPQtLxlU9CsGy5+dr6s="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-lIStSIPTxaoCRoUBHsBPXZbuVj5io02390Wkyepyflw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-12AfUEDdta/pmZUyEyqSUfOk0YoA7JOfGmIYnZQ//qk="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-KDYaVBSdNEuhs3U164RV0n20cjwrpi7uI71B0j/UFsA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-w0G+IW9kz70ug1BEuJTeS1N7werQhms3gQl6ODzNIpQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.SourceLink.Common",
|
||||
|
|
@ -236,8 +221,8 @@
|
|||
},
|
||||
{
|
||||
"pname": "OpenAI",
|
||||
"version": "2.9.1",
|
||||
"hash": "sha256-gYBNaOe49S0VyZxv8Cb1tOcRAvZEn7SwYMAvq7TrZ0w="
|
||||
"version": "2.10.0",
|
||||
"hash": "sha256-wCgr11NfZ3DdDq870CEL9gh+kbVVyi5qiMh277K076w="
|
||||
},
|
||||
{
|
||||
"pname": "Pfim",
|
||||
|
|
@ -274,21 +259,31 @@
|
|||
"version": "2.88.9",
|
||||
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
|
||||
},
|
||||
{
|
||||
"pname": "StbImageSharp",
|
||||
"version": "2.30.15",
|
||||
"hash": "sha256-Wvc6uAKOsOx3D2/P3PKDs2KdogRNOBzXli/fwNv15E4="
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.10.0",
|
||||
"hash": "sha256-TVrfx/IagmiZHd3HIrkwlIF/9rbbIONUeqOpamI68Vs="
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.9.0",
|
||||
"hash": "sha256-8/feim+EOvZj0MU+ghFz257QzNUN+ila9p7eCAOCpug="
|
||||
},
|
||||
{
|
||||
"pname": "System.ComponentModel.Annotations",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory.Data",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-C4AaCiuS1BLljZq+3VUTJyHRA6IFPIO0gWZKw2hbt5o="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory.Data",
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-HefKyCuNJ7bONOVqGi2WScG6XIoFyfGSwTQM9Ol06+U="
|
||||
},
|
||||
{
|
||||
"pname": "TextMateSharp",
|
||||
"version": "2.0.2",
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "sourcegit";
|
||||
version = "2026.07";
|
||||
version = "2026.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegit-scm";
|
||||
repo = "sourcegit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g7V3EbbI8kIy2CW3sof5sdSPp4u7ZbuawqSp63OlV44=";
|
||||
hash = "sha256-9uVU+m+GZKlBlF3jlhmk+f/afMjhgt9JzzLJoHtPeT4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libxft,
|
||||
imlib2,
|
||||
imlib2Full,
|
||||
giflib,
|
||||
libexif,
|
||||
conf ? null,
|
||||
|
|
@ -13,11 +13,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "sxiv";
|
||||
version = "26";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muennich";
|
||||
repo = "sxiv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jrCEx1o7Go0jgwQ3YJ0L97Q5BCHvVTTqOWId3xzlSnU=";
|
||||
};
|
||||
|
||||
configFile = lib.optionalString (conf != null) (builtins.toFile "config.def.h" conf);
|
||||
|
|
@ -25,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
buildInputs = [
|
||||
libxft
|
||||
imlib2
|
||||
imlib2Full
|
||||
giflib
|
||||
libexif
|
||||
];
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tideways-daemon";
|
||||
version = "1.17.0";
|
||||
version = "1.17.2";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
|
||||
|
|
@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ST1wQs2Z9/3fX95YAQqoHZjKsYtxPjR+VlUv3VJmESA=";
|
||||
hash = "sha256-jD8nPQxMVrr7Ota5l8ILg9Jm8ddzPESORI6/G0Bh/DU=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-TswqlF8Nmc3zyzPnJNg5yMo2Y2gKJWBo7MdUMZfc7Ms=";
|
||||
hash = "sha256-cnH5qJXVJI72MP6Rdffo6KMB1Vltd3FetOf6BKrtZKE=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ePEJIJcG3745RVsXm4rvc6ZXVX2Ugv6fCoqezihV30M=";
|
||||
hash = "sha256-Gw3kGmwTv1eX9N+rOIiyth93xIojJWAPzHa3Ju/Vk6g=";
|
||||
};
|
||||
};
|
||||
updateScript = "${
|
||||
|
|
|
|||
|
|
@ -4,11 +4,13 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
python3,
|
||||
gitMinimal,
|
||||
bison,
|
||||
flex,
|
||||
inih,
|
||||
minio-cpp,
|
||||
arrow-cpp,
|
||||
curl,
|
||||
curlpp,
|
||||
nlohmann_json,
|
||||
|
|
@ -26,18 +28,19 @@ let
|
|||
in
|
||||
turingstdenv.mkDerivation (finalAttrs: {
|
||||
pname = "turingdb";
|
||||
version = "1.30";
|
||||
version = "1.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turing-db";
|
||||
repo = "turingdb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dYggkkuTC+amR/Alz+B1YCNo5kHgmrt/dNLRW5EgaZY=";
|
||||
hash = "sha256-dorRoDWylZo/QRJbqEZOUf+JNHSKCIi/s8wxZ2HwZsI=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out log -1 --format=%H > $out/HEAD_COMMIT_HASH
|
||||
git -C $out log -1 --format=%ct > $out/HEAD_COMMIT_TIMESTAMP
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
|
|
@ -46,6 +49,20 @@ turingstdenv.mkDerivation (finalAttrs: {
|
|||
postPatch = ''
|
||||
substituteInPlace storage/dump/DumpConfig.h \
|
||||
--replace-fail HEAD_COMMIT_TIMESTAMP "$(cat $src/HEAD_COMMIT_TIMESTAMP)"
|
||||
|
||||
substituteInPlace io/parquet/CMakeLists.txt \
|
||||
--replace-fail "Parquet::parquet_static" "Parquet::parquet_shared"
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'COMMAND git rev-parse HEAD' 'COMMAND cat HEAD_COMMIT_HASH' \
|
||||
--replace-fail 'COMMAND git show --no-patch --format=%at' 'COMMAND cat HEAD_COMMIT_TIMESTAMP'
|
||||
|
||||
substituteInPlace tools/turingdb/TuringDBTool.cpp \
|
||||
--replace-fail '"turingdb", "1.0"' '"turingdb", "${finalAttrs.version}"'
|
||||
|
||||
for dir in test samples regress fuzz examples; do
|
||||
substituteInPlace CMakeLists.txt --replace-fail "add_subdirectory($dir)" ""
|
||||
done
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -56,9 +73,11 @@ turingstdenv.mkDerivation (finalAttrs: {
|
|||
flex
|
||||
gitMinimal
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
arrow-cpp
|
||||
curl
|
||||
curlpp
|
||||
faiss
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "typos";
|
||||
version = "1.46.0";
|
||||
version = "1.46.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "typos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lABMjUOopauvfMF86SWO8YYIxNimzuFC2FnrOYT7Tfk=";
|
||||
hash = "sha256-PEN9RA/8YdcjJcRTpT8i5D/HweLBEE162/WLWCEizZQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WQeprJvfvH50Wmh7m8WThGE8T4ewbIYicfacQghd2ao=";
|
||||
cargoHash = "sha256-uHfKSS0Qlo3dU8w1h2ia4D8JYxIPq1ZLTsTFPBIuwc0=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
diff --git a/UnixBench/Run b/UnixBench/Run
|
||||
index 34d2c72..130b56e 100755
|
||||
index 41637be..0b71c0b 100755
|
||||
--- a/UnixBench/Run
|
||||
+++ b/UnixBench/Run
|
||||
@@ -81,23 +81,23 @@ my $longIterCount = 10;
|
||||
@@ -86,23 +86,23 @@ my $longIterCount = 10;
|
||||
my $shortIterCount = 3;
|
||||
|
||||
# C compiler to use in compilation tests.
|
||||
-my $cCompiler = 'gcc';
|
||||
+my $cCompiler = 'cc -w';
|
||||
+my $cCompiler = 'cc -w -std=gnu89';
|
||||
|
||||
# Establish full paths to directories. These need to be full pathnames
|
||||
# (or do they, any more?). They can be set in env.
|
||||
|
|
@ -29,9 +29,9 @@ index 34d2c72..130b56e 100755
|
|||
-my $TESTDIR = getDir('UB_TESTDIR', $FindBin::Bin . "/testdir");
|
||||
+my $TESTDIR = getDir('UB_TESTDIR', '@out@/share/testdir');
|
||||
|
||||
|
||||
############################################################################
|
||||
@@ -330,19 +330,19 @@ my $testParams = {
|
||||
my $quietMode = 0;
|
||||
my $notQuietMode = 1;
|
||||
@@ -339,19 +339,19 @@ my $testParams = {
|
||||
"logmsg" => "Shell Scripts (1 concurrent)",
|
||||
"cat" => 'system',
|
||||
"prog" => "${BINDIR}/looper",
|
||||
|
|
@ -54,7 +54,7 @@ index 34d2c72..130b56e 100755
|
|||
},
|
||||
|
||||
##########################
|
||||
@@ -434,7 +434,7 @@ my $testParams = {
|
||||
@@ -443,7 +443,7 @@ my $testParams = {
|
||||
"logmsg" => "C Compiler Throughput ($cCompiler)",
|
||||
"cat" => 'misc',
|
||||
"prog" => "${BINDIR}/looper",
|
||||
|
|
@ -63,7 +63,7 @@ index 34d2c72..130b56e 100755
|
|||
},
|
||||
"arithoh" => {
|
||||
"logmsg" => "Arithoh",
|
||||
@@ -873,16 +873,6 @@ sub preChecks {
|
||||
@@ -1037,16 +1037,6 @@ sub preChecks {
|
||||
# Set the language.
|
||||
$ENV{'LANG'} = $language;
|
||||
|
||||
|
|
@ -80,29 +80,43 @@ index 34d2c72..130b56e 100755
|
|||
# Create a script to kill this run.
|
||||
system("echo \"kill -9 $$\" > \"${TMPDIR}/kill_run\"");
|
||||
chmod(0755, $TMPDIR . "/kill_run");
|
||||
@@ -923,7 +913,10 @@ sub parseArgs {
|
||||
@@ -1089,6 +1079,9 @@ sub parseArgs {
|
||||
$params->{'copies'} = [ ];
|
||||
}
|
||||
push(@{$params->{'copies'}}, shift(@words));
|
||||
- } else {
|
||||
+ } elsif ($word eq "--help" || $word eq "-h") {
|
||||
+ print "Run: please see ubench(1) for available options\n";
|
||||
+ exit 0;
|
||||
+ }else {
|
||||
+ print "Run: please see ubench(1) for available options\n";
|
||||
+ exit 0;
|
||||
} else {
|
||||
die("Run: unknown option $word\n");
|
||||
}
|
||||
}
|
||||
diff --git a/UnixBench/pgms/multi.sh b/UnixBench/pgms/multi.sh
|
||||
index 72e8716..d2f5f48 100755
|
||||
index 72e8716..b5c5847 100755
|
||||
--- a/UnixBench/pgms/multi.sh
|
||||
+++ b/UnixBench/pgms/multi.sh
|
||||
@@ -15,7 +15,8 @@
|
||||
@@ -15,8 +15,11 @@
|
||||
###############################################################################
|
||||
ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24";
|
||||
instance=1
|
||||
-sort_src=sort.src
|
||||
+sort_src=$3/sort.src
|
||||
+cd $2
|
||||
work_factor=${MULTI_SH_WORK_FACTOR:-1}
|
||||
+
|
||||
+cd $2
|
||||
+
|
||||
if [ $work_factor -gt 1 ]; then
|
||||
inputs=
|
||||
for i in $(seq $work_factor); do inputs="$inputs $sort_src"; done
|
||||
diff --git a/UnixBench/src/syscall.c b/UnixBench/src/syscall.c
|
||||
index 97a22e8..f0e5fac 100644
|
||||
--- a/UnixBench/src/syscall.c
|
||||
+++ b/UnixBench/src/syscall.c
|
||||
@@ -105,7 +105,7 @@ char *argv[];
|
||||
fprintf(stderr,"%s: fork failed\n", argv[0]);
|
||||
exit(1);
|
||||
} else if (pid == 0) {
|
||||
- execl("/bin/true", "/bin/true", (char *) 0);
|
||||
+ execl("@coreutils@/bin/true", "@coreutils@/bin/true", (char *) 0);
|
||||
fprintf(stderr,"%s: exec /bin/true failed\n", argv[0]);
|
||||
exit(1);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -19,16 +19,15 @@
|
|||
withGL ? true,
|
||||
withX11perf ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unixbench";
|
||||
version = "unstable-2023-02-27";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdlucas";
|
||||
repo = "byte-unixbench";
|
||||
rev = "a07fcc03264915c624f0e4818993c5b4df3fa703";
|
||||
hash = "sha256-gmRWAqE9/HBb0S9rK0DXoaCoiGbtat0gmdeozhbv0NI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GQYejkIf7g2abHafJJQTl0nWqRGsg9VDtYQgyBY/jOg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -41,7 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "-Wa,-q" ""
|
||||
--replace-fail "-Wa,-q" ""
|
||||
|
||||
substituteInPlace src/syscall.c \
|
||||
--replace-fail @coreutils@ "${coreutils}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -78,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"GRAPHIC_TESTS=defined"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu89";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{bin,libexec,share}
|
||||
|
|
@ -89,16 +93,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
postInstall = ''
|
||||
substituteInPlace USAGE \
|
||||
--replace 'Run"' 'ubench"' \
|
||||
--replace './Run' 'ubench' \
|
||||
--replace 'Run ' 'ubench '
|
||||
--replace-fail 'Run"' 'ubench"' \
|
||||
--replace-fail './Run' 'ubench' \
|
||||
--replace-fail 'Run ' 'ubench '
|
||||
pandoc -f rst -t man USAGE -o ubench.1
|
||||
installManPage ubench.1
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
substituteInPlace $out/libexec/pgms/multi.sh \
|
||||
--replace '/bin/sh "$' '${runtimeShell} "$'
|
||||
--replace-fail '/bin/sh "$' '${runtimeShell} "$'
|
||||
|
||||
substituteInPlace $out/bin/ubench \
|
||||
--subst-var out
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
|
||||
let
|
||||
executableName = "vikunja-desktop";
|
||||
version = "2.2.2";
|
||||
version = "2.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-vikunja";
|
||||
repo = "vikunja";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+Tqo9z+QXzcYNWZl+DoHaClkMokTa6a2S1FlazZBDyI=";
|
||||
hash = "sha256-bdHiSFaN0vNQMhy6GPlpoFeYrk2CLvO7E30d8J/9GC0=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-/dPjUxD01G1H3nRZfW8x046x33OaiChYuiLhZYOPrTo=";
|
||||
hash = "sha256-phvNUUYh858CDt0O8GCWkgO402C0wiYtzEorOIV789M=";
|
||||
};
|
||||
|
||||
env = {
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "woodpecker-plugin-git";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodpecker-ci";
|
||||
repo = "plugin-git";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Ib4Jdo8KT1DUncWi2oCJRBeEwqCNi98D9eXHrhYVo64=";
|
||||
hash = "sha256-Au+eaJzcjARQsWThIK3N1SNkBl39mb3xx0d8D3VyXOU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IPqtAwre3Fs6TvWdmuDkvD/abzZwtE5OKEGEkCtdCI8=";
|
||||
vendorHash = "sha256-zCcYAWO0hn6iLxTxOsjn2bS0+sHuzpq3K24N9jd+qPY=";
|
||||
|
||||
env.CGO_ENABLED = "0";
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sha256 = "sha256-aPO5T8iYNkGtF8j12YxNJyUPJJPKrXje1DmfCPt317A=";
|
||||
})
|
||||
];
|
||||
# jsoncpp 1.9.7 rejects std::sub_match in Json::Value::operator[].
|
||||
postPatch = ''
|
||||
substituteInPlace cyacas/yacas-kernel/src/yacas_kernel.cpp \
|
||||
--replace-fail 'content_data[m[2]] = base64_encode(img);' \
|
||||
'content_data[m[2].str()] = base64_encode(img);'
|
||||
'';
|
||||
preCheck = ''
|
||||
patchShebangs ../tests/test-yacas
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simpleitk";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimpleITK";
|
||||
repo = "SimpleITK";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9EJwdF0ja1GuMJ7HU3Xg2IHyz/zWSsS1JdWrvla61HI=";
|
||||
hash = "sha256-biCrtfewxptDGHlN6xGmsv+m4RGgWDIBu7zMfa8XIRg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -83,6 +83,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
internalDeps = [ php.extensions.session ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# Temporary patch as relay isn't compatible with the latest version of hiredis out of
|
||||
# the box.
|
||||
patchelf \
|
||||
--replace-needed libhiredis.so.1.1.0 libhiredis.so.1 \
|
||||
--replace-needed libhiredis_ssl.so.1.1.0 libhiredis_ssl.so.1 \
|
||||
relay.so
|
||||
''
|
||||
+ ''
|
||||
install -Dm755 relay.so -t $out/lib/php/extensions
|
||||
''
|
||||
+ (
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mkdocs-callouts";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sondregronas";
|
||||
repo = "mkdocs-callouts";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CffhtU5ur/QleVOk2twh+7kbHUB6HWEXt+E1YbI5I94=";
|
||||
hash = "sha256-I7KHZgUV67Ff9Nt1z1LVjia9eQ5V+7y24ZepkpooT2w=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "stanza";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stanfordnlp";
|
||||
repo = "stanza";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rq+2DutK46Mc9HeMRsGt26raZiC7zjE9M4A6hLbTINk=";
|
||||
hash = "sha256-uarx5HY6sxm2Fr12Vti4IluqOhFosf8QYIP2WMxdFfI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
pytestCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "9.8.0";
|
||||
version = "9.9.0";
|
||||
agent = [
|
||||
mcpadapt
|
||||
smolagents
|
||||
|
|
@ -241,7 +241,7 @@ let
|
|||
owner = "neuml";
|
||||
repo = "txtai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AcNx6pdaZpfCMwjTMu2OTod3ISii4Qq28ZV0yIqNXbA=";
|
||||
hash = "sha256-lbNWDHSZDZt8V5OEyVxvOoX6se4/GXG13BeqAeU+FHc=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ let
|
|||
hash = "sha256-jnDdxmSbGLw9iVzzqQjAKR6kw4A5rYcixH4Bja8enPw=";
|
||||
};
|
||||
"11" = {
|
||||
version = "11.1.1";
|
||||
hash = "sha256-BbKC0GMyKVxzbwsgyL3xhTJb8bymgske2BFUo8aFHMA=";
|
||||
version = "11.1.2";
|
||||
hash = "sha256-v+TSssejIQVlu6YpKfnv5JPrXyRicgGhAupFFOroz4A=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ let
|
|||
ln -s $out/lib/yquake2/quake2 $out/bin/yquake2
|
||||
ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded
|
||||
cp $src/stuff/yq2.cfg $out/share/games/quake2/baseq2
|
||||
install -Dm644 stuff/icon/Quake2.png $out/share/pixmaps/yamagi-quake2.png;
|
||||
install -Dm644 stuff/icon/Quake2.png $out/share/icons/hicolor/512x512/apps/yamagi-quake2.png;
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ let
|
|||
rev = "${lib.toUpper id}_${builtins.replaceStrings [ "." ] [ "_" ] version}";
|
||||
};
|
||||
|
||||
env =
|
||||
# Uses `false` and `true` as enum constants, which are keywords in C23 (GCC 15 default)
|
||||
lib.optionalAttrs stdenv.cc.isGNU {
|
||||
NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib/yquake2/${id}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
|||
--add-flags "+set game ${game.id}"
|
||||
'') games
|
||||
+ ''
|
||||
install -Dm644 ${yquake2}/share/pixmaps/yamagi-quake2.png $out/share/pixmaps/yamagi-quake2.png;
|
||||
install -Dm644 ${yquake2}/share/icons/hicolor/512x512/apps/yamagi-quake2.png $out/share/icons/hicolor/512x512/apps/yamagi-quake2.png;
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
mkKdeDerivation,
|
||||
fetchpatch,
|
||||
qtdeclarative,
|
||||
qtmultimedia,
|
||||
qtsvg,
|
||||
|
|
@ -25,6 +26,16 @@ in
|
|||
mkKdeDerivation {
|
||||
pname = "audiotube";
|
||||
|
||||
patches = [
|
||||
# https://bugs.kde.org/show_bug.cgi?id=520142
|
||||
# https://github.com/NixOS/nixpkgs/issues/520685
|
||||
(fetchpatch {
|
||||
name = "pybind11-ecm-6.26.patch";
|
||||
url = "https://invent.kde.org/multimedia/audiotube/-/commit/273d9b926dfadb1b85a4a0d21c352bd5968ffa1f.patch";
|
||||
hash = "sha256-V5HghJxKYMRZP4vqIhQZeRveOcfpGXwMMEgSM3ZDbUE=";
|
||||
})
|
||||
];
|
||||
|
||||
extraNativeBuildInputs = [
|
||||
ps.pybind11
|
||||
];
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ let
|
|||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.30";
|
||||
hash = "sha256-INIvc/mSio+yRwyQPMaypUbk/0NqPijhC5s+W2gWAYE=";
|
||||
version = "6.18.31";
|
||||
hash = "sha256-AvsMS5Za+k+b08Nz4UOey9Uzg0Z9hT5lkwMN5cf5ZG8=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "7.0.7";
|
||||
hash = "sha256-HlmUAGhwI0NciwTO/WBirk8oVCsw0qcX/YBKfPcLbWY=";
|
||||
version = "7.0.8";
|
||||
hash = "sha256-bB/qCLw3m+g3Z/JcYl7XNYT313jBbQdcMzvZaK8Fw4Q=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
buildHomeAssistantComponent rec {
|
||||
owner = "ekutner";
|
||||
domain = "home_connect_alt";
|
||||
version = "1.3.6";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ekutner";
|
||||
repo = "home-connect-hass";
|
||||
tag = version;
|
||||
hash = "sha256-Zi3l4bRS8O+jyrxaY8BB1XCbU9FEQSDMNE9b5DH8oCs=";
|
||||
hash = "sha256-y4IzSRJrqOeKAZN1kibmsV/l23hjSQIuOoeEdYmbmBo=";
|
||||
};
|
||||
|
||||
dependencies = [ home-connect-async ];
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
buildHomeAssistantComponent rec {
|
||||
owner = "mampfes";
|
||||
domain = "waste_collection_schedule";
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "hacs_waste_collection_schedule";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eUpfeWfMHsBBlDJpq0lBo1aQ7VF3THTXQTXDaXL5+tQ=";
|
||||
hash = "sha256-YZBIh828kYhRxoRe5uIUJY4ZPJuJYZKCfA6BF/Fx2nk=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "sankey-chart";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MindFreeze";
|
||||
repo = "ha-sankey-chart";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E7tljTa/DTo5+V6ahc94B+26QfazcItCxYvF3OOvGL0=";
|
||||
hash = "sha256-KpdxXZDNdUfV/h4D9Ucx8cTtPt0dbG5iBvJ6TVUulqY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-cOOq+dYO87LxuerXhLehlpwngj/Ok2+tAqkv8YPVuis=";
|
||||
npmDepsHash = "sha256-8gHH4C54l2JiGTGpSiRtRHd8Sg6F9B0SCwvXz9zioO0=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lovelace-xiaomi-vacuum-map-card";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PiotrMachowski";
|
||||
repo = "lovelace-xiaomi-vacuum-map-card";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3329L+2Su2XvrKQIKa5btJz3CQWgS+c8qHD/9vxuEbM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-vLxmzqDSmB+6VKjiwG5WH9FUvn0NlVHo9TBmbx5UkG0=";
|
||||
|
||||
# rollup-plugin-typescript2 tries to require tslib/package.json, but the
|
||||
# bundled tslib 2.1.0 uses the legacy "./": "./" exports subpath pattern that
|
||||
# newer Node no longer honours. Rewrite it to the supported wildcard form.
|
||||
preBuild = ''
|
||||
substituteInPlace node_modules/rollup-plugin-typescript2/node_modules/tslib/package.json \
|
||||
--replace-fail '"./": "./"' '"./*": "./*"'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp dist/xiaomi-vacuum-map-card.js $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.entrypoint = "xiaomi-vacuum-map-card.js";
|
||||
|
||||
meta = {
|
||||
description = "Interactive map card for map-based vacuums in Home Assistant";
|
||||
homepage = "https://github.com/PiotrMachowski/lovelace-xiaomi-vacuum-map-card";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -10082,10 +10082,6 @@ with pkgs;
|
|||
})
|
||||
);
|
||||
|
||||
sxiv = callPackage ../applications/graphics/sxiv {
|
||||
imlib2 = imlib2Full;
|
||||
};
|
||||
|
||||
dropbox = callPackage ../applications/networking/dropbox { };
|
||||
|
||||
dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue