mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-28 10:50:15 +00:00
Merge staging-next into staging
This commit is contained in:
@@ -14823,6 +14823,12 @@
|
||||
githubId = 32649612;
|
||||
keys = [ { fingerprint = "65DF D21C 22A9 E4CD FD1A 0804 C3D7 16E7 29B3 C86A"; } ];
|
||||
};
|
||||
keksnino = {
|
||||
name = "KeksNino";
|
||||
email = "KeksNino@proton.me";
|
||||
github = "KeksNino";
|
||||
githubId = 87879013;
|
||||
};
|
||||
keldu = {
|
||||
email = "mail@keldu.de";
|
||||
github = "keldu";
|
||||
|
||||
@@ -109,6 +109,7 @@ let
|
||||
"btrfs" = [ btrfs-progs ];
|
||||
"xfs" = [ xfsprogs ];
|
||||
"swap" = [ util-linux ];
|
||||
"empty" = [ ];
|
||||
};
|
||||
|
||||
fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems;
|
||||
|
||||
@@ -298,7 +298,7 @@ in
|
||||
popd
|
||||
'';
|
||||
|
||||
restartTriggers = lib.optional (!cfg.mutableConfig) [ printerConfig ];
|
||||
restartTriggers = lib.optionals (!cfg.mutableConfig) [ printerConfig ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/klippy ${klippyArgs} ${cfg.configDir}/printer.cfg";
|
||||
|
||||
@@ -16,6 +16,7 @@ let
|
||||
getExe
|
||||
literalExpression
|
||||
optional
|
||||
optionals
|
||||
attrValues
|
||||
mapAttrs
|
||||
;
|
||||
@@ -158,7 +159,7 @@ in
|
||||
"LOG_LEVEL=${cfg.logLevel}"
|
||||
"PHX_SERVER=true"
|
||||
]
|
||||
++ optional cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ]
|
||||
++ optionals cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ]
|
||||
++ optional (!isNull config.time.timeZone) "TZ=${config.time.timeZone}"
|
||||
++ attrValues (mapAttrs (name: value: name + "=" + toString value) cfg.extraConfig);
|
||||
EnvironmentFile = optional (cfg.secretsFile != null) cfg.secretsFile;
|
||||
|
||||
@@ -16,7 +16,7 @@ let
|
||||
mapAttrs'
|
||||
splitString
|
||||
toUpper
|
||||
optional
|
||||
optionals
|
||||
optionalAttrs
|
||||
nameValuePair
|
||||
;
|
||||
@@ -145,7 +145,7 @@ in
|
||||
LoadCredential = [
|
||||
"RESTIC_PASSWORD_FILE:${cfg.passwordFile}"
|
||||
]
|
||||
++ optional (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ];
|
||||
++ optionals (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ];
|
||||
};
|
||||
environment =
|
||||
let
|
||||
|
||||
@@ -152,7 +152,7 @@ in
|
||||
startCLIList
|
||||
++ lib.optionals (cfg.prometheusConfig != { }) [ "-promscrape.config=${prometheusConfigYml}" ]
|
||||
);
|
||||
LoadCredential = lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) [
|
||||
LoadCredential = lib.optionals (cfg.remoteWrite.basicAuthPasswordFile != null) [
|
||||
"remote_write_basic_auth_password:${cfg.remoteWrite.basicAuthPasswordFile}"
|
||||
];
|
||||
};
|
||||
|
||||
@@ -133,7 +133,7 @@ in
|
||||
# if data_dir is a list, the actual path will in in the `path` attribute of each item
|
||||
# see https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir
|
||||
++ lib.optional (lib.isList data_dir) (map (item: item.path) data_dir)
|
||||
++ lib.optional (lib.isString data_dir) [ data_dir ]
|
||||
++ lib.optionals (lib.isString data_dir) [ data_dir ]
|
||||
);
|
||||
isDefault = lib.hasPrefix "/var/lib/garage";
|
||||
isDefaultStateDirectory = lib.any isDefault paths;
|
||||
|
||||
@@ -1647,7 +1647,7 @@ in
|
||||
SystemCallFilter = [
|
||||
"~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid"
|
||||
]
|
||||
++ optional cfg.enableQuicBPF [ "bpf" ];
|
||||
++ optionals cfg.enableQuicBPF [ "bpf" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -271,7 +271,7 @@ in
|
||||
"~CAP_SYS_BOOT"
|
||||
"~CAP_NET_ADMIN"
|
||||
]
|
||||
++ lib.lists.optional (!cfg.allowCgiUser) [
|
||||
++ lib.lists.optionals (!cfg.allowCgiUser) [
|
||||
"~CAP_SETGID"
|
||||
"~CAP_SETUID"
|
||||
];
|
||||
@@ -279,7 +279,7 @@ in
|
||||
SystemCallFilter = [
|
||||
"~@cpu-emulation @debug @keyring @mount @obsolete"
|
||||
]
|
||||
++ lib.lists.optional (!cfg.allowCgiUser) [ "@privileged @setuid" ];
|
||||
++ lib.lists.optionals (!cfg.allowCgiUser) [ "@privileged @setuid" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -90,7 +90,16 @@ in
|
||||
Minimize = "guess";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
// (lib.genAttrs [ "squashfs" "erofs" "btrfs" "xfs" "swap" "empty" ] (fsType: {
|
||||
repartConfig = {
|
||||
Type = "linux-generic";
|
||||
Format = fsType;
|
||||
|
||||
SizeMinBytes = "10M";
|
||||
SizeMaxBytes = "10M";
|
||||
};
|
||||
}));
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
name = "kimai";
|
||||
meta.maintainers = with lib.maintainers; [ peat-psuwit ];
|
||||
|
||||
nodes.machine =
|
||||
containers.machine =
|
||||
{ ... }:
|
||||
{
|
||||
services.kimai.sites."localhost" = {
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "windows-ai-studio";
|
||||
publisher = "ms-windows-ai-studio";
|
||||
version = "1.6.10";
|
||||
hash = "sha256-ztzf1mrQT6/C89R5DkSNlxSXwyWgRi8uzawXAV7ZhSo=";
|
||||
version = "1.6.11";
|
||||
hash = "sha256-J1hoK2yPkjl0NBy+7dzn3FJO54PQiBO52xt83N5B1QE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -185,7 +185,7 @@ mkDerivation rec {
|
||||
"-DQGIS_MACAPP_BUNDLE=0" # Don't copy Qt into bundle; we fix paths in postFixup
|
||||
"-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" # FindSqlite3.cmake incorrectly assumes framework
|
||||
]
|
||||
++ lib.optional withServer [
|
||||
++ lib.optionals withServer [
|
||||
"-DWITH_SERVER=True"
|
||||
"-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
|
||||
]
|
||||
|
||||
@@ -189,7 +189,7 @@ stdenv.mkDerivation rec {
|
||||
"-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include"
|
||||
"-DUSE_OPENCL=OFF"
|
||||
]
|
||||
++ lib.optional withServer [
|
||||
++ lib.optionals withServer [
|
||||
"-DWITH_SERVER=True"
|
||||
"-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
|
||||
]
|
||||
|
||||
@@ -162,10 +162,10 @@ buildGoModule (finalAttrs: {
|
||||
++ [
|
||||
./rdpclient.patch
|
||||
]
|
||||
++ lib.optional (lib.versionOlder version "18.8.0") [
|
||||
++ lib.optionals (lib.versionOlder version "18.8.0") [
|
||||
./0001-fix-add-nix-path-to-exec-env.patch
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast version "18.8.0") [
|
||||
++ lib.optionals (lib.versionAtLeast version "18.8.0") [
|
||||
./0001-fix-add-nix-path-to-exec-env-reexec.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -192,7 +192,7 @@ stdenv.mkDerivation {
|
||||
license =
|
||||
with lib.licenses;
|
||||
[ mit ]
|
||||
++ lib.optional enableVCVRack [
|
||||
++ lib.optionals enableVCVRack [
|
||||
gpl3Plus
|
||||
cc-by-nc-40
|
||||
unfreeRedistributable
|
||||
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "STOP_BUILD_ON_WARNING" false)
|
||||
(lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
|
||||
]
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# Fix (RiscV) cross-compilation
|
||||
# See https://github.com/apache/orc/issues/2334
|
||||
(lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0")
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "argo-workflows";
|
||||
version = "3.6.10";
|
||||
version = "4.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-workflows";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TM/eK8biMxKV4SFJ1Lys+NPPeaHVjbBo83k2RH1Xi40=";
|
||||
hash = "sha256-UmkUFuYFeuyqgdf/ByZkkulkVRregp53bvcyyEKgZQo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y/2+ykzcJdA5uwP1v9Z1wZtF3hBV2x7XZc7+FhPJP64=";
|
||||
vendorHash = "sha256-UTBM1zd+HrC5bUadn0VSsO52HhqdPGzZwipQv7WOrNU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -30,14 +30,23 @@ buildGoModule (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p ui/dist/app
|
||||
# This build target could act as a web server, but this is just
|
||||
# acting as a CLI.
|
||||
# Provide a dummy UI file to allow the build to embed something
|
||||
# without actually building the web content
|
||||
echo "Built without static files" > ui/dist/app/index.html
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/argoproj/argo-workflows/v3.buildDate=unknown"
|
||||
"-X github.com/argoproj/argo-workflows/v3.gitCommit=${finalAttrs.src.rev}"
|
||||
"-X github.com/argoproj/argo-workflows/v3.gitTag=${finalAttrs.src.rev}"
|
||||
"-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean"
|
||||
"-X github.com/argoproj/argo-workflows/v3.version=${finalAttrs.version}"
|
||||
"-X github.com/argoproj/argo-workflows/v4.buildDate=unknown"
|
||||
"-X github.com/argoproj/argo-workflows/v4.gitCommit=${finalAttrs.src.rev}"
|
||||
"-X github.com/argoproj/argo-workflows/v4.gitTag=${finalAttrs.src.rev}"
|
||||
"-X github.com/argoproj/argo-workflows/v4.gitTreeState=clean"
|
||||
"-X github.com/argoproj/argo-workflows/v4.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
module bou.ke/staticfiles
|
||||
|
||||
go 1.18
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "arti";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@@ -21,18 +21,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "core";
|
||||
repo = "arti";
|
||||
tag = "arti-v${finalAttrs.version}";
|
||||
hash = "sha256-fPobYu2ADTeIwpeXyxQKh5yr1zw+yMQfqTkiZMMd8YY=";
|
||||
hash = "sha256-ukGplnZz1O1Djh12COKk8FL/3rLmmWGyl0b816wRWBE=";
|
||||
};
|
||||
|
||||
# Working around a bug in cargo that appears with cargo-auditable, see
|
||||
# https://github.com/rust-secure-code/cargo-auditable/issues/124.
|
||||
postPatch = ''
|
||||
substituteInPlace crates/arti/Cargo.toml \
|
||||
--replace-fail '"http"' '"dep:http"' \
|
||||
--replace-fail '"tokio-util"' '"dep:tokio-util"'
|
||||
'';
|
||||
|
||||
buildAndTestSubdir = "crates/arti";
|
||||
cargoHash = "sha256-+JQ+SkRLyLl4RUq69nIUn1zJ/DmYpVEICQO5o85FsNw=";
|
||||
cargoHash = "sha256-/7sWTLeVolqliggn1Qw+kxqAeWENHgbCR6hK5Th2z+g=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# upstream repo includes a build/ directory
|
||||
cmakeBuildDir = "_build";
|
||||
|
||||
cmakeFlags = lib.optional asLibrary [
|
||||
cmakeFlags = lib.optionals asLibrary [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
];
|
||||
|
||||
|
||||
@@ -115,11 +115,9 @@ llvmPackages_21.stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
|
||||
installBin BanjoRecompiled
|
||||
install -Dm644 -t $out/share ../recompcontrollerdb.txt
|
||||
install -Dm644 -t $out/share/banjorecomp ../recompcontrollerdb.txt
|
||||
install -Dm644 ../icons/app.png $out/share/icons/hicolor/512x512/apps/BanjoRecompiled.png
|
||||
cp -r ../assets $out/share/
|
||||
ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt
|
||||
ln -s $out/share/assets $out/bin/assets
|
||||
cp -r ../assets $out/share/banjorecomp/
|
||||
|
||||
install -Dm644 -t $out/share/licenses/banjorecomp ../COPYING
|
||||
install -Dm644 -t $out/share/licenses/banjorecomp/N64ModernRuntime ../lib/N64ModernRuntime/COPYING
|
||||
@@ -134,9 +132,8 @@ llvmPackages_21.stdenv.mkDerivation (finalAttrs: {
|
||||
)
|
||||
'';
|
||||
|
||||
# The game will segfault when not run from the same directory as the binary.
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/BanjoRecompiled --chdir "$out/bin/"
|
||||
wrapProgram $out/bin/BanjoRecompiled --chdir "$out/share/banjorecomp"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bbedit";
|
||||
version = "15.5.5";
|
||||
version = "16.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/BBSW-download/BBEdit_${finalAttrs.version}.dmg";
|
||||
hash = "sha256-DsrGj2id9XUf3n55s0OHoJnX4AQY5AqiP9skaXysghk=";
|
||||
hash = "sha256-rPKunlxovqzf11NIYfqMmS4b3VORpxs8CLPth5wrNXI=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -35,16 +35,16 @@ in
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "berglas";
|
||||
version = "2.0.16";
|
||||
version = "2.0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "berglas";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-I69p9xEWjIZAh5/1sk3G7ARuk0N5DCPTy2cnAA/9QB8=";
|
||||
sha256 = "sha256-TRx152Xw26FpS6GcKjlC0hNsh/XAUp87h7QfhkYZr5M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LOIQTUYippMd5P3m0mORJaTKhN89g9D6wksNPteG/NI=";
|
||||
vendorHash = "sha256-gSa5ryDPhE0Sk4UXnaxWPdusIX8xeVykiH4lItfCFEs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
perl
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86) [
|
||||
cmakeFlags = lib.optionals (!stdenv.hostPlatform.isx86) [
|
||||
"-DCMAKE_CXX_FLAGS=-I${finalAttrs.src}/third_party"
|
||||
];
|
||||
|
||||
|
||||
@@ -6,23 +6,23 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "butane";
|
||||
version = "0.29.0";
|
||||
version = "2.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "butane";
|
||||
repo = "ignition";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lijMfxhUBopwbfEP4fEgszXh7zaRz7Xy1Y8PmatXXTE=";
|
||||
hash = "sha256-CjYiBcUdbfrQWpMzvKjFG53SPVkQyxbQ/8coQt7BuH8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "internal" ];
|
||||
subPackages = [ "butane/internal" ];
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/coreos/butane/internal/version.Raw=v${finalAttrs.version}"
|
||||
"-X github.com/coreos/ignition/v2/butane/internal/version.Raw=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
|
||||
description = "Translates human-readable Butane configs into machine-readable Ignition configs";
|
||||
mainProgram = "butane";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = "https://github.com/coreos/butane";
|
||||
homepage = "https://github.com/coreos/ignition";
|
||||
maintainers = with lib.maintainers; [
|
||||
elijahcaine
|
||||
ruuda
|
||||
|
||||
@@ -1,16 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
versionCheckHook,
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "catt";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-hlCB06l4nzafvcnBNCXWiJsJNmP8n731bQgq5xvUZvM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skorokithakis";
|
||||
repo = "catt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VjwYfaBoQ7HMKG6BztAB3mmQps42MoHSAiC2jHbRS/Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -25,18 +30,33 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
python3Packages.yt-dlp
|
||||
];
|
||||
|
||||
doCheck = false; # attempts to access various URLs
|
||||
nativeCheckInputs = [
|
||||
python3Packages.pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Require network access.
|
||||
"test_stream_info_youtube_video"
|
||||
"test_stream_info_youtube_playlist"
|
||||
"test_stream_info_other_video"
|
||||
"test_stream_info_direct_link"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"catt"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Send media from online sources to Chromecast devices";
|
||||
description = "Allows you to send videos from many, many online sources to your Chromecast";
|
||||
homepage = "https://github.com/skorokithakis/catt";
|
||||
changelog = "https://github.com/skorokithakis/catt/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.aaravrav ];
|
||||
mainProgram = "catt";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./freebsd.patch
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) [
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h";
|
||||
hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0=";
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cnspec";
|
||||
version = "13.37.0";
|
||||
version = "13.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/LV74WKk3UJeRJwtpCUEpDz5bnSVLZB7+nuALVvpR4g=";
|
||||
hash = "sha256-I05Ud0aYvWmKsBq68G0jze0rqxYPnZUunLGEUHVQThQ=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-NvBJPHd86zIIipTUApiKYmXFLwNt1ZQrP+f2UEWTL9Q=";
|
||||
vendorHash = "sha256-4ZhjlQqgf2k9KQ8GA4ZoFFl7KyH/zgGYTQwPJhKRsoo=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -116,11 +116,11 @@ stdenv.mkDerivation rec {
|
||||
);
|
||||
NIX_CFLAGS_COMPILE = toString (
|
||||
[ ]
|
||||
++ lib.optional stdenv.cc.isGNU [
|
||||
++ lib.optionals stdenv.cc.isGNU [
|
||||
# Fix build with gcc15
|
||||
"-std=gnu17"
|
||||
]
|
||||
++ lib.optional stdenv.cc.isClang [
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
]
|
||||
);
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
nixosTests,
|
||||
writeText,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "7.3.0";
|
||||
@@ -93,7 +94,16 @@ maven.buildMavenPackage {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.commafeed;
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"frontend"
|
||||
];
|
||||
};
|
||||
tests = nixosTests.commafeed;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Google Reader inspired self-hosted RSS reader";
|
||||
|
||||
@@ -15,24 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-ext-calculator";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "calculator";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-qPo+Qi6P0m3rNA6Qo6iNsgzGyirPqzXk4nj3OG6IuZ0=";
|
||||
hash = "sha256-t8xuM0B2eh2AbAhDgSOGapTwmmm9eC+wHsqwq4Jn5yU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Pq1E4O6lZMe+wKJgQKDBmgdsJJsJTyK0FDXU53n+Di4=";
|
||||
|
||||
# TODO: Remove in the next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cosmic-utils/calculator/commit/fc176a8d5d8af7fd808d450a78635432db6b64e6.patch";
|
||||
hash = "sha256-amSB+67rwCUqfqOTFGCkInvoZmA//wAR0viuvNdPkuc=";
|
||||
})
|
||||
];
|
||||
cargoHash = "sha256-a4WckNyKXS71dT0uYbO7tUUmD0Dw8vSzrPp29O4aiAk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libcosmicAppHook
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done
|
||||
'';
|
||||
|
||||
configureFlags = lib.optional enableTruecolor [ "--enable-truecolor" ];
|
||||
configureFlags = lib.optionals enableTruecolor [ "--enable-truecolor" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
|
||||
@@ -11,17 +11,18 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ctags-lsp";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
vendorHash = null;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netmute";
|
||||
repo = "ctags-lsp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8cknVcXIuV7mmRMm87jn2l3qrfaY3CGzCZ0VW5Vb9xk=";
|
||||
hash = "sha256-9VKXdffK46gl7MLN1kpSpQRIoJzu4nTS9C1r//qsOuo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeCheckInputs = [ universal-ctags ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.1.310";
|
||||
version = "7.1.320";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
|
||||
hash = "sha256-G1nrkyQR3pduZulFE30DTCTfVMmZe7X6nl6bcDfSf8E=";
|
||||
hash = "sha256-qCi7Yi2phMtN4IWo8eR0SFIe90TpOk2jqJKj3URSeNQ=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
|
||||
hash = "sha256-fMShKodtD8/icEcpRIVZZ9H3KlF/GEpMyuihcDkviWk=";
|
||||
hash = "sha256-xgpdmrM3+v9o0sKyYv09MxdD6xoTNff3hPgD+loyhNE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
strictDeps = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optional stdenv.cc.isGNU [
|
||||
lib.optionals stdenv.cc.isGNU [
|
||||
# Required with newer GCC
|
||||
"-Wno-error=stringop-overflow"
|
||||
]
|
||||
|
||||
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diesel-cli";
|
||||
version = "2.3.12";
|
||||
version = "2.3.13";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
crateName = "diesel_cli";
|
||||
hash = "sha256-cWroMSZqNMTH1+Pbiu8WiU4by2OHnXTgBHKSKaM3NYI=";
|
||||
hash = "sha256-qi8L8NDdVmvRR4b9Pgey6jJm2KrGwqJxgp2qXi+lTrQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0JZcDAWsZ1ojZbUhghQt4rDmm+I/naQ5tllFRnTWCnM=";
|
||||
cargoHash = "sha256-DIjkEMwnKB/cOOsxXY6Jy4hIxxwJ4mkdZcllAGi+8M0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -2,20 +2,35 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dipc";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doprz";
|
||||
repo = "dipc";
|
||||
rev = "b111b8cb997e3337974f861f44a73b557fb3c294";
|
||||
hash = "sha256-qP7LRwNIM92p5xQeuvQ03kwBM/HnRH+BniiKeYoihKw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sK4wyrEr1RCdug6uDjFQvMlZzrhPAcXi6yTiiWiPQcc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F6EYnkquvTsw4C7rl28Y1h9i9ChGccwZGkYSVrsEhVk=";
|
||||
cargoHash = "sha256-BCJXROjsaztzv6HWi1+i2GYCoeEgdXbYrEjpEdUvGFg=";
|
||||
|
||||
patches = [
|
||||
# TODO: Remove it once it goes to the next version (>1.2.0)
|
||||
# feat(theme): add Kanagawa theme (#45)
|
||||
(fetchpatch {
|
||||
name = "kanagawa-theme";
|
||||
url = "https://github.com/doprz/dipc/commit/e5a7d851117ccef1250f2a7999ab05dfd9538c53.patch";
|
||||
hash = "sha256-OteBFaRT+HdDtWNe5nLaoIgNjapzNOdZfAttOA7G+2E=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Convert your favorite images and wallpapers with your favorite color palettes/themes";
|
||||
@@ -30,4 +45,4 @@ rustPlatform.buildRustPackage {
|
||||
];
|
||||
mainProgram = "dipc";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-anthy";
|
||||
version = "5.1.10";
|
||||
version = "5.1.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst";
|
||||
hash = "sha256-t4ZdPAPvUbd2iQvfUlFlpUTjC+RG4nYuDFPIfpBZB4Y=";
|
||||
hash = "sha256-nlmhUat8OmE/zhN+09vSeKVu+H9ptsHsKVyDWxl381Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.17";
|
||||
version = "5.0.18";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-lua";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uEWa1wprWT8vDSHKXHUHEmXBtNHgj94hFuKvBm5GXqc=";
|
||||
hash = "sha256-YelfFE9RNQbsZm81TauleQxyiR3qOquLRHpQa9kyqEU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-m17n";
|
||||
version = "5.1.6";
|
||||
version = "5.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-+sQu/P28XV2nkS7rxy+pTXijY1mLvmwbePaJLUtLaBg=";
|
||||
hash = "sha256-3OhOLmJW5LwnFv1ZJVDdPSaktp14PkMGnwjvM7cZ9iA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-extra";
|
||||
version = "5.1.12";
|
||||
version = "5.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-PNljzjvT5WWoEPH7HbOcO9lDRkZHqiNXbaCifBKw5LI=";
|
||||
hash = "sha256-xEWLzLzhsK+nuHJ+qDs5AENqMMV2IyyHA/giQTmQgro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-other";
|
||||
version = "5.1.7";
|
||||
version = "5.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-PoYDy0p/vflwVr5yCox2uSvr4ir6k2Yn1AQHmTw03Zk=";
|
||||
hash = "sha256-WkofkNwT4qtcztspLXY/ysC03Y4PltoNpvvoYtuC2E4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc=";
|
||||
};
|
||||
|
||||
makeFlags = lib.optional stdenv.hostPlatform.isDarwin [ "CC=cc" ];
|
||||
makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CC=cc" ];
|
||||
|
||||
meta = {
|
||||
description = "Cozy fireplace in your terminal";
|
||||
|
||||
@@ -80,7 +80,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${finalAttrs.version} PHP ${phpUnwrapped.version} Caddy'"
|
||||
# pie mode is only available with pkgsMusl, it also automatically add -buildmode=pie to $GOFLAGS
|
||||
]
|
||||
++ (lib.optional pieBuild [ "-static-pie" ]);
|
||||
++ (lib.optionals pieBuild [ "-static-pie" ]);
|
||||
|
||||
preBuild = ''
|
||||
export CGO_CFLAGS="$(${phpConfig} --includes)"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fzf-zsh-plugin";
|
||||
version = "1.0.0-unstable-2026-08-01";
|
||||
version = "1.0.0-unstable-2026-09-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unixorn";
|
||||
repo = "fzf-zsh-plugin";
|
||||
rev = "82c08aa8ed8d3cc2173d8b820af246634519b21d";
|
||||
hash = "sha256-rEd3c2KjmF9TY2jzDV1CI1ku6Hy+zQ8Z41TaYsS+uYc=";
|
||||
rev = "e3894e83a3e8a3e8751456d56c51bb49b34e8d2b";
|
||||
hash = "sha256-MN5CbwzTT7G0zZIkXcZNrmcey7g85ODG28/fQq9+wbQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-U1qcF7HMlD9VS/Fw3yDjNOhtvNrtPhjYFLIAb/0/AW0=";
|
||||
hash = "sha256-I63Pdgyyck3x47Lb+p+92OfeKISxLI0Y8yVw4Hhor+A=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-67tg09jIs2z2atI9i6W8jhMGhbjpHsfpgKklAkuXJEw=";
|
||||
hash = "sha256-U5MW8NDJLDEcxFxYpRViv22YzRrdAlekE/JWUQIwzYQ=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.6.280";
|
||||
version = "5.6.281";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gelly";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fingel";
|
||||
repo = "gelly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uCUuFypeJKyJ726Y+xXlYGIxm8q/UCHzwNogE1Y+d8E=";
|
||||
hash = "sha256-Won8IYaDbd6NljLZU+Ih/7gnUmXnhdpoCanwBbloVFU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F05I8BvXXsLF8ApHBCHLxtY3KbBP6Nf+XG/LKvnFXiE=";
|
||||
cargoHash = "sha256-yCJydR4BGd7HcKnOl4bquoD3QzI4l5WBrOeXiF5IdHI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildGo127Module (finalAttrs: {
|
||||
pname = "go-arch-lint";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fe3dback";
|
||||
repo = "go-arch-lint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Pmtp1pbRKmV6TK8oQV01OG/YPovU2Ch86EBwb7WWi4U=";
|
||||
hash = "sha256-eA+xM7WSOyzj3uhVUT/6dHGoHx1tsBCCKXPLOintimE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-USP8gFDd4ii8yO/dch3OHVrDsVUy4HgRxBvnFwAbHeU=";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-grip";
|
||||
version = "0.9.2";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrishrb";
|
||||
repo = "go-grip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O3f7kLlcWfpxZb2mw+nNjmsGX4YiuzIfN5e6KE+CJDs=";
|
||||
hash = "sha256-xi9h9sykuhL2Wh08zhwE1ZT1ncd6GCmQF6uuLU0vpCI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU=";
|
||||
|
||||
@@ -70,6 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/google/googletest";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ stephen-huan ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -55,7 +55,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "handy";
|
||||
version = "0.9.1";
|
||||
version = "0.9.6";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -63,11 +63,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "cjpais";
|
||||
repo = "Handy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GuHMK98wmqv2ryrMF243CjRGMbjZ0ykX89RJbjwaP6U=";
|
||||
hash = "sha256-6eNa9iNjwKgLL8t72GeMHTxjyHaeVl+9VF/QWjlHzts=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
cargoHash = "sha256-CNHWa70nAYbdgXO62s1iaW6nBacorgEVZIgkMZx/CNs=";
|
||||
cargoHash = "sha256-fzTklIGMCE2ugLc6KIj3XDqxB4qjhtm14LKBUb8kBWE=";
|
||||
|
||||
nativeInstallInputs = [ jq ];
|
||||
|
||||
@@ -246,9 +246,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
outputHash =
|
||||
{
|
||||
"x86_64-linux" = "sha256-1jZBFvX9Ch3jNGPgSnOE8yNCXlHru7tcMJZ5uNZtE1g=";
|
||||
"aarch64-linux" = "sha256-MsY2tOdBg11OMyQLRkLoVKxyrcqa0yVddfcYuIVWSxw=";
|
||||
"aarch64-darwin" = "sha256-Fw0va7mq0F36qa15bDFVL01Q5pEprWhza78CzurLoLg=";
|
||||
"x86_64-linux" = "sha256-huOC2smHU0sGIxeyvWmzdewUEpKHfdSGNhf9xWpH9Jk=";
|
||||
"aarch64-linux" = "sha256-UDn8nIgIx23ampe43Qr0j9h+hlU9g1QzzlIlbRH2CKs=";
|
||||
"aarch64-darwin" = "sha256-8Rw4iNvqeq/sRvZpbtZo0f0iPAwu1TeB8Y+ut4kb9uw=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libhdhomerun,
|
||||
pkg-config,
|
||||
gtk2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hdhomerun-config-gui";
|
||||
version = "20250506";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${finalAttrs.version}.tgz";
|
||||
sha256 = "sha256-bmAdPR5r2mKCncQSSHZ6GYtAk3scHpatnmXGy+a/654=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
gtk2
|
||||
libhdhomerun
|
||||
];
|
||||
|
||||
configureFlags = [ "CPPFLAGS=-I${libhdhomerun}/include/hdhomerun" ];
|
||||
makeFlags = [ "SUBDIRS=src" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -vDm 755 src/hdhomerun_config_gui $out/bin/hdhomerun_config_gui
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GUI for configuring Silicondust HDHomeRun TV tuners";
|
||||
homepage = "https://www.silicondust.com/support/linux";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.louisdk1 ];
|
||||
mainProgram = "hdhomerun_config_gui";
|
||||
};
|
||||
})
|
||||
@@ -81,6 +81,7 @@ let
|
||||
changelog = "https://gitlab.com/saalen/highlight/-/blob/${finalAttrs.src.tag}/ChangeLog.adoc?ref_type=tags#user-content-highlight-${lib.versions.major finalAttrs.version}-${lib.versions.minor finalAttrs.version}";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hjson-go";
|
||||
version = "4.7.0";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hjson";
|
||||
repo = "hjson-go";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tQ4KvDS3f/EbCoONUWJpGqLOC9pMm1HO7eZXZ7xpVB8=";
|
||||
hash = "sha256-PCDTXpTClOw9n8xiW5uKp7OhuG5uO9PeL70PR3I5/HM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "incus-compose";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "incus-compose";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2mKWKFcWxWFqJx2N8+dhhes1AxjfmGLPEQzgKW2Bo04=";
|
||||
hash = "sha256-pti1Zj9a4IdySKQGF7buajz1JzFwer1Rl4gzPG+k42I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ji1QGBQWDpHJ+kMS/TK7cNFyqeEcBQK9fn1F5zenIBc=";
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ivpn-service";
|
||||
version = "3.15.13";
|
||||
version = "3.15.15";
|
||||
|
||||
buildInputs = [
|
||||
wirelesstools
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "ivpn";
|
||||
repo = "desktop-app";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F5MhJ09ioqL4Xf4r2cdXUKmkK8ebj/qRFWfxKuodH3k=";
|
||||
hash = "sha256-CQOmVVTegOZVwWjGzSek6BehdJCQ5ddOR6M9seWqZRw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "ivpn-ui";
|
||||
version = "3.15.13";
|
||||
version = "3.15.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ivpn";
|
||||
repo = "desktop-app";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F5MhJ09ioqL4Xf4r2cdXUKmkK8ebj/qRFWfxKuodH3k=";
|
||||
hash = "sha256-CQOmVVTegOZVwWjGzSek6BehdJCQ5ddOR6M9seWqZRw=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/ui";
|
||||
|
||||
npmDepsHash = "sha256-Q8qrAo7+GrbUUx33t89/N4WHnJLbdpMSpBm5rLclJC0=";
|
||||
npmDepsHash = "sha256-n6O8yNGeYApew694jA26EGil9qdnwSd2ymfo2fIIrxU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ivpn";
|
||||
version = "3.15.13";
|
||||
version = "3.15.15";
|
||||
|
||||
buildInputs = [ wirelesstools ];
|
||||
|
||||
@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "ivpn";
|
||||
repo = "desktop-app";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F5MhJ09ioqL4Xf4r2cdXUKmkK8ebj/qRFWfxKuodH3k=";
|
||||
hash = "sha256-CQOmVVTegOZVwWjGzSek6BehdJCQ5ddOR6M9seWqZRw=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -65,5 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
];
|
||||
maintainers = [ lib.maintainers.bjornfor ];
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.31.1";
|
||||
version = "0.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = "k0sctl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AbSHyc+Orclm2Cun9QTBqC5AxN1+QOveNzBqzX62vBA=";
|
||||
hash = "sha256-HD2jH9hQQBblewS57dYw8IBnumE2sbslHyX52fTn/tQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zc/6fC6VQJp7g2URWivaGW0APVHMa+uyHlBPM4b0bf8=";
|
||||
vendorHash = "sha256-NHPFBlDtSA43OWnp7uWNIw6B7G1/EHuO8fwShg1Q9fI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -28,6 +28,11 @@ buildGoModule rec {
|
||||
"-X=github.com/carlmjohnson/versioninfo.Revision=v${version}"
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# requires sudo
|
||||
"-skip=^TestLocalBinaryProviderCreatesParentDir$"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "k8sgpt";
|
||||
version = "0.4.37";
|
||||
version = "0.4.38";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yXTLDMk9A+urFrjvgZQu6zdojuXUo3Vl49JalMveTr0=";
|
||||
hash = "sha256-9u8cf/hmaOhYWjxOX5GLsz5sTXvAkTLhf1xO5OoQ1yg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OSpu+04r2Pn9D8TAKMIhAy5A4qbJQneoMQ19mr8RbRQ=";
|
||||
|
||||
@@ -121,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(cmakeBool "KICAD_SANITIZE_ADDRESS" sanitizeAddress)
|
||||
(cmakeBool "KICAD_SANITIZE_THREADS" sanitizeThreads)
|
||||
(cmakeBool "KICAD_SPICE" (!(stable && !withNgspice)))
|
||||
(cmakeBool "KICAD_UPDATE_CHECK" false)
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
(cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'qa_spice|qa_cli'")
|
||||
|
||||
@@ -42,9 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"man"
|
||||
];
|
||||
|
||||
configureFlags = lib.optional withSystemd [ "--with-systemd" ];
|
||||
configureFlags = lib.optionals withSystemd [ "--with-systemd" ];
|
||||
|
||||
makeFlags = lib.optional withSystemd [ "unitdir=$(out)/lib/systemd/system" ];
|
||||
makeFlags = lib.optionals withSystemd [ "unitdir=$(out)/lib/systemd/system" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -2,20 +2,21 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubeseal";
|
||||
version = "0.38.4";
|
||||
version = "0.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitnami";
|
||||
repo = "sealed-secrets";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-cg9YEY78miw8BRX9CCIeWqdAeJDsFSr6VvgRJFYzREU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vmvKD6Rk/xCw0hpGmus9JOG2JBStqzTSl09QGYMcOjQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1RATVZIeWZFceLttnqnDgXHyUsjRvkHAnsypABW/WDE=";
|
||||
vendorHash = "sha256-JzBl9jOGYstoimv8bdy2t1DSvchFMl73zdxeY1Vagog=";
|
||||
|
||||
subPackages = [ "cmd/kubeseal" ];
|
||||
|
||||
@@ -25,6 +26,9 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.VERSION=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Kubernetes controller and tool for one-way encrypted Secrets";
|
||||
mainProgram = "kubeseal";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox";
|
||||
version = "0-unstable-2026-04-20";
|
||||
version = "0-unstable-2026-09-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "dosbox-libretro";
|
||||
rev = "4024bf0048c261db58ef98cb5e16de291c429f4e";
|
||||
hash = "sha256-sHq4xObXvgpaEnqtjJikN8g/io6FQdZWztifzSGPdH4=";
|
||||
rev = "988aa330d10b1423873ebfd8dcb6106df2538c44";
|
||||
hash = "sha256-yRipBvCzDyceBI35iHFMZPpl7md5fImRAQ8Azr7z9Rs=";
|
||||
};
|
||||
|
||||
env.CXXFLAGS = "-std=gnu++11";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "opera";
|
||||
version = "0-unstable-2026-08-04";
|
||||
version = "0-unstable-2026-08-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "opera-libretro";
|
||||
rev = "636a8dd6340bce7073168ddefd29841fc5e2d213";
|
||||
hash = "sha256-s2pZ66rLt5aRPpl3J5ZeoGP2sibW7/PYO/ZnjeLjHV8=";
|
||||
rev = "a501a278d057b952d1ad6165549c59ab178ca497";
|
||||
hash = "sha256-eDZ11SD6ZMeXfRZk24uIM/96t7bXVnSTzHmjRiSwuU0=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mado";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akiomik";
|
||||
repo = "mado";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UpkzUeFSLpTjTcf5yEpQDJVDZXL9DEuvw0Hx4r0hG7o=";
|
||||
hash = "sha256-lmgIvdGH+vO/fVPow1yATDn+SzOX7aatG8F6ZKZyZiU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3Wtr+o59SqAjDPLZxTcjK92FF/+O0eXwehnJIRfV2zQ=";
|
||||
cargoHash = "sha256-5qlpKlI/oJR/AzTrVNnIYFJb46k1YHVjRarqF6vUp6w=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -115,12 +115,10 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
|
||||
installBin MarioKart64Recompiled
|
||||
install -Dm644 -t $out/share ../recompcontrollerdb.txt
|
||||
install -Dm644 -t $out/share/mariokart64recomp ../recompcontrollerdb.txt
|
||||
install -Dm644 ../icons/512.png $out/share/icons/hicolor/512x512/apps/MarioKart64Recompiled.png
|
||||
install -Dm644 ../flatpak/io.github.mariokart64recomp.mariokart64recomp.desktop $out/share/applications/MarioKart64Recompiled.desktop
|
||||
cp -r ../assets $out/share/
|
||||
ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt
|
||||
ln -s $out/share/assets $out/bin/assets
|
||||
cp -r ../assets $out/share/mariokart64recomp/
|
||||
|
||||
install -Dm644 -t $out/share/licenses/mariokart64recompiled ../COPYING
|
||||
install -Dm644 -t $out/share/licenses/mariokart64recompiled/N64ModernRuntime ../lib/N64ModernRuntime/COPYING
|
||||
@@ -137,9 +135,8 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
|
||||
)
|
||||
'';
|
||||
|
||||
# The game will segfault when not run from the same directory as the binary.
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/bin/"
|
||||
wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/share/mariokart64recomp"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,10 +14,9 @@
|
||||
nix-update,
|
||||
writeShellScript,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "masterpdfeditor";
|
||||
version = "5.9.98";
|
||||
version = "5.9.99";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -29,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-KNAssyWLeMqtMyZQIF6Qr1K/9tioC4cD84lL9c1iMgM=";
|
||||
aarch64-linux = "sha256-+jNXO4fbbkh9Uea0N+0fJbHRMu9zS/d7o8W4D2+7kMI=";
|
||||
x86_64-linux = "sha256-ksVuJyuImstESVwHUmOUv6aERosg6g5bSsRvPSf5EVM=";
|
||||
aarch64-linux = "sha256-IxWYzb1assCMBNjj5VZbfuhkzVrMpU5Oz/N+kd4CxHw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"url_preview"
|
||||
"zstd_compression"
|
||||
]
|
||||
++ lib.optional enableJemalloc [
|
||||
++ lib.optionals enableJemalloc [
|
||||
"jemalloc"
|
||||
"jemalloc_conf"
|
||||
]
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.0.18";
|
||||
version = "1.0.19";
|
||||
pname = "mdp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "visit1985";
|
||||
repo = "mdp";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-7ltqnvNzdr+sJiiiCQpp25dzhOrcUCOAgMTt1RIgVTw=";
|
||||
sha256 = "sha256-qMxuhq6LqS1o5TqQAbmGYgISWzmcocaHEYTASUN6S2c=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "meowlnir";
|
||||
version = "26.06";
|
||||
tag = "v0.2606.0";
|
||||
version = "26.08";
|
||||
tag = "v0.2608.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maunium";
|
||||
repo = "meowlnir";
|
||||
inherit tag;
|
||||
hash = "sha256-mhm/CznhaQCgx0ZQ/GArmWrhDS0sPkIkJrP3cAOIFME=";
|
||||
hash = "sha256-q9/pdKmJOav41P8Rm4ZzNgeEPJqui22HUbH4UBoa3tY=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorHash = "sha256-0PgI0m2EsfiZjpOQ9lTfVavHNzKWKFdlmkIz2gqUXM0=";
|
||||
vendorHash = "sha256-HXXAQaBaWUjnBnoiyNZB51BnPuQg9BhlDU5x2CyCW1Y=";
|
||||
|
||||
doCheck = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "11.16.0";
|
||||
version = "11.17.0";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "mermaid-cli";
|
||||
@@ -17,14 +17,14 @@ buildNpmPackage {
|
||||
owner = "mermaid-js";
|
||||
repo = "mermaid-cli";
|
||||
rev = version;
|
||||
hash = "sha256-jK87Ffsv9qeh0UPJaLTuIJYbnR9HVqjm7hWrwUaP5zA=";
|
||||
hash = "sha256-Dujs0HNHVWOWlOhPkbAzooWrUqR1kNOdPUfe2f7rVLo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-sOEDz8ZT2zF+TH+ZJhb+LSyyUF1HWVVLzCqtYtg7A0E=";
|
||||
npmDepsHash = "sha256-6s1q+d6V/5hyjXZaAOzoLMFmQ1flKDH+YH5oOYTaoCo=";
|
||||
|
||||
env = {
|
||||
PUPPETEER_SKIP_DOWNLOAD = true;
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
strictDeps = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optional stdenv.cc.isGNU [
|
||||
lib.optionals stdenv.cc.isGNU [
|
||||
# Required with newer GCC
|
||||
"-Wstringop-overflow=0"
|
||||
]
|
||||
|
||||
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
|
||||
"-Wno-dev"
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF"
|
||||
++ lib.optional trezorSupport [
|
||||
++ lib.optionals trezorSupport [
|
||||
"-DUSE_DEVICE_TREZOR=ON"
|
||||
];
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DARCH=default"
|
||||
]
|
||||
++ lib.optional trezorSupport [
|
||||
++ lib.optionals trezorSupport [
|
||||
# fix build on recent gcc versions
|
||||
"-DCMAKE_CXX_FLAGS=-fpermissive"
|
||||
];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "mozhi";
|
||||
version = "0-unstable-2026-06-11";
|
||||
version = "0-unstable-2026-08-30";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "aryak";
|
||||
repo = "mozhi";
|
||||
rev = "095c73f04bc24f51dcb4a0155a5f10f87f768a8c";
|
||||
hash = "sha256-c792IEMToojcLgsCpMizsszVwymZldvRVP9eWuEO5sY=";
|
||||
rev = "ad53459f38e995eabdb5fd10352b0a2f57c278a2";
|
||||
hash = "sha256-Zn+3McD+uGO+Vk88gbq7sqU7OahWZmtwuHxwvMIM/gw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZFbgq/zeBTK6wb5VHHyTNrq8RuNhWTy8PyA1mZcbKYc=";
|
||||
|
||||
@@ -2,29 +2,26 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.91.12";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "open-dyslexic";
|
||||
inherit version;
|
||||
version = "0.91.12";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"webfont"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antijingoist";
|
||||
repo = "opendyslexic";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-a8hh8NGt5djj9EC7ChO3SnnjuYMOryzbHWTK4gC/vIw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 compiled/*.otf -t $out/share/fonts/opentype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://opendyslexic.org/";
|
||||
@@ -33,4 +30,4 @@ stdenvNoCC.mkDerivation {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.rycee ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "open-scq30";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Oppzippy";
|
||||
repo = "OpenSCQ30";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jvmgHAp4Et3VrUhZfNuFAA9r8n215kNB6Ux04HYC+KI=";
|
||||
hash = "sha256-5/b71nZrvN7Q/56FM/orMz6vb+FKf6k/qqYgusirTyI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
libxi
|
||||
];
|
||||
|
||||
cargoHash = "sha256-/dj2LBNcYcewt3Rhz82lZuoyCzaa/QC49CxfKoGfF6w=";
|
||||
cargoHash = "sha256-mLKK2J3CJ6qSM5EDjB6LkrFWKxijFl6jjcjrCgXVg8c=";
|
||||
|
||||
# Requires headphones
|
||||
doCheck = false;
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/common/slp_xmalloc.c
|
||||
+++ b/common/slp_xmalloc.c
|
||||
@@ -206,7 +206,7 @@ void * _xrealloc(const char * file, int line, void * ptr, size_t size)
|
||||
if (newptr == 0)
|
||||
return 0;
|
||||
memcpy(newptr, ptr, x->size);
|
||||
- _xfree(file, line, x);
|
||||
+ _xfree(file, line, ptr);
|
||||
}
|
||||
return newptr;
|
||||
}
|
||||
@@ -1,165 +0,0 @@
|
||||
diff -ur openslp-2.0.0.orig/common/slp_buffer.c openslp-2.0.0/common/slp_buffer.c
|
||||
--- openslp-2.0.0.orig/common/slp_buffer.c 2012-12-10 15:31:53.000000000 -0800
|
||||
+++ openslp-2.0.0/common/slp_buffer.c 2019-11-26 21:54:20.000000000 -0800
|
||||
@@ -30,6 +30,13 @@
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
+/* Copyright (c) 2019 VMware, Inc.
|
||||
+ * SPDX-License-Identifier: BSD-3-Clause
|
||||
+ * This file is provided under the BSD-3-Clause license.
|
||||
+ * See COPYING file for more details and other copyrights
|
||||
+ * that may apply.
|
||||
+ */
|
||||
+
|
||||
/** Functions for managing SLP message buffers.
|
||||
*
|
||||
* This file provides a higher level abstraction over malloc and free that
|
||||
@@ -153,4 +160,20 @@
|
||||
xfree(buf);
|
||||
}
|
||||
|
||||
+/** Report remaining free buffer size in bytes.
|
||||
+ *
|
||||
+ * Check if buffer is allocated and if so return bytes left in a
|
||||
+ * @c SLPBuffer object.
|
||||
+ *
|
||||
+ * @param[in] buf The SLPBuffer to be freed.
|
||||
+ */
|
||||
+size_t
|
||||
+RemainingBufferSpace(SLPBuffer buf)
|
||||
+{
|
||||
+ if (buf->allocated == 0) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return buf->end - buf->curpos;
|
||||
+}
|
||||
+
|
||||
/*=========================================================================*/
|
||||
diff -ur openslp-2.0.0.orig/common/slp_buffer.h openslp-2.0.0/common/slp_buffer.h
|
||||
--- openslp-2.0.0.orig/common/slp_buffer.h 2012-11-28 09:07:04.000000000 -0800
|
||||
+++ openslp-2.0.0/common/slp_buffer.h 2019-11-26 21:54:32.000000000 -0800
|
||||
@@ -30,6 +30,13 @@
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
+/* Copyright (c) 2019 VMware, Inc.
|
||||
+ * SPDX-License-Identifier: BSD-3-Clause
|
||||
+ * This file is provided under the BSD-3-Clause license.
|
||||
+ * See COPYING file for more details and other copyrights
|
||||
+ * that may apply.
|
||||
+ */
|
||||
+
|
||||
/** Header file that defines SLP message buffer management routines.
|
||||
*
|
||||
* Includes structures, constants and functions that used to handle memory
|
||||
@@ -78,6 +85,8 @@
|
||||
|
||||
SLPBuffer SLPBufferListAdd(SLPBuffer * list, SLPBuffer buf);
|
||||
|
||||
+size_t RemainingBufferSpace(SLPBuffer buf);
|
||||
+
|
||||
/*! @} */
|
||||
|
||||
#endif /* SLP_BUFFER_H_INCLUDED */
|
||||
diff -ur openslp-2.0.0.orig/slpd/slpd_process.c openslp-2.0.0/slpd/slpd_process.c
|
||||
--- openslp-2.0.0.orig/slpd/slpd_process.c 2012-12-12 09:38:54.000000000 -0800
|
||||
+++ openslp-2.0.0/slpd/slpd_process.c 2019-11-26 21:55:10.000000000 -0800
|
||||
@@ -30,6 +30,13 @@
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
+/* Copyright (c) 2019 VMware, Inc.
|
||||
+ * SPDX-License-Identifier: BSD-3-Clause
|
||||
+ * This file is provided under the BSD-3-Clause license.
|
||||
+ * See COPYING file for more details and other copyrights
|
||||
+ * that may apply.
|
||||
+ */
|
||||
+
|
||||
/** Processes incoming SLP messages.
|
||||
*
|
||||
* @file slpd_process.c
|
||||
@@ -514,13 +521,27 @@
|
||||
{
|
||||
for (i = 0; i < db->urlcount; i++)
|
||||
{
|
||||
- /* urlentry is the url from the db result */
|
||||
urlentry = db->urlarray[i];
|
||||
+ if (urlentry->opaque != NULL) {
|
||||
+ const int64_t newsize = size + urlentry->opaquelen;
|
||||
+ if (urlentry->opaquelen <= 0 || newsize > INT_MAX)
|
||||
+ {
|
||||
+ SLPDLog("Invalid opaquelen %d or sizeo of opaque url is too big, size=%d\n",
|
||||
+ urlentry->opaquelen, size);
|
||||
+ errorcode = SLP_ERROR_PARSE_ERROR;
|
||||
+ goto FINISHED;
|
||||
+ }
|
||||
+ size += urlentry->opaquelen;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ /* urlentry is the url from the db result */
|
||||
+ size += urlentry->urllen + 6; /* 1 byte for reserved */
|
||||
+ /* 2 bytes for lifetime */
|
||||
+ /* 2 bytes for urllen */
|
||||
+ /* 1 byte for authcount */
|
||||
+ }
|
||||
|
||||
- size += urlentry->urllen + 6; /* 1 byte for reserved */
|
||||
- /* 2 bytes for lifetime */
|
||||
- /* 2 bytes for urllen */
|
||||
- /* 1 byte for authcount */
|
||||
#ifdef ENABLE_SLPv2_SECURITY
|
||||
/* make room to include the authblock that was asked for */
|
||||
if (G_SlpdProperty.securityEnabled
|
||||
@@ -594,7 +615,7 @@
|
||||
urlentry = db->urlarray[i];
|
||||
|
||||
#ifdef ENABLE_SLPv1
|
||||
- if (urlentry->opaque == 0)
|
||||
+ if (urlentry->opaque == NULL)
|
||||
{
|
||||
/* url-entry reserved */
|
||||
*result->curpos++ = 0;
|
||||
@@ -606,8 +627,18 @@
|
||||
PutUINT16(&result->curpos, urlentry->urllen);
|
||||
|
||||
/* url-entry url */
|
||||
- memcpy(result->curpos, urlentry->url, urlentry->urllen);
|
||||
- result->curpos += urlentry->urllen;
|
||||
+ if (RemainingBufferSpace(result) >= urlentry->urllen)
|
||||
+ {
|
||||
+ memcpy(result->curpos, urlentry->url, urlentry->urllen);
|
||||
+ result->curpos = result->curpos + urlentry->urllen;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ SLPDLog("Url too big (ask: %d have %" PRId64 "), failing request\n",
|
||||
+ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result));
|
||||
+ errorcode = SLP_ERROR_PARSE_ERROR;
|
||||
+ goto FINISHED;
|
||||
+ }
|
||||
|
||||
/* url-entry auths */
|
||||
*result->curpos++ = 0;
|
||||
@@ -621,8 +652,18 @@
|
||||
|
||||
/* TRICKY: Fix up the lifetime. */
|
||||
TO_UINT16(urlentry->opaque + 1, urlentry->lifetime);
|
||||
- memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen);
|
||||
- result->curpos += urlentry->opaquelen;
|
||||
+ if (RemainingBufferSpace(result) >= urlentry->opaquelen)
|
||||
+ {
|
||||
+ memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen);
|
||||
+ result->curpos = result->curpos + urlentry->opaquelen;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ SLPDLog("Opaque Url too big (ask: %d have %" PRId64 "), failing request\n",
|
||||
+ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result));
|
||||
+ errorcode = SLP_ERROR_PARSE_ERROR;
|
||||
+ goto FINISHED;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openslp";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/openslp/${version}/${version}/openslp-${version}.tar.gz";
|
||||
sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "openslp-2.0.0-null-pointer-deref.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/openslp/raw/696fd55ae4fcea7beda0a25131dca8bfb14bbdf9/f/openslp-2.0.0-null-pointer-deref.patch";
|
||||
sha256 = "186f3rj3z2lf5h1lpbhqk0szj2a9far1p3mjqg6422f29yjfnz6a";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "openslp-2.0.0-CVE-2016-7567.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/openslp/raw/696fd55ae4fcea7beda0a25131dca8bfb14bbdf9/f/openslp-2.0.0-cve-2016-7567.patch";
|
||||
sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9";
|
||||
})
|
||||
./CVE-2016-4912.patch
|
||||
./CVE-2019-5544.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.openslp.org/";
|
||||
description = "Open-source implementation of the IETF Service Location Protocol";
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2023-29552: UDP Reflection Attack with ampliciation factor of up to 2200"
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opentofu-mcp-server";
|
||||
version = "1.0.0-unstable-2026-07-15";
|
||||
version = "1.0.0-unstable-2026-09-04";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu-mcp-server";
|
||||
rev = "ad9e50780d8ae56ee9a71ddea5f3f8c8f2da1020";
|
||||
hash = "sha256-bp1tY4ggHVSVFcU+b/TlWBHhjmrf32Q3a86GWgvkFOk=";
|
||||
rev = "2ab816e75f0176fc764b67b12c9fd61cadd45d3b";
|
||||
hash = "sha256-sar4OB4FS47zzfF2zn5sWsSDWavWCDRzCAnCQnRtpzI=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@@ -17,6 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installFonts
|
||||
(python3.withPackages (
|
||||
pp: with pp; [
|
||||
fontforge
|
||||
@@ -42,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m444 -Dt $out/share/fonts/truetype */*.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonPackage (finalAttrs: {
|
||||
pname = "overturemaps";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-yKl13Y9kRCGHzoqeZIQEac/PrByTCtCQFaz8sUgeVIs=";
|
||||
hash = "sha256-6SNV3MKWHaDOlauYN6WfLRW8w1e+UdDEFc6rPYEvyX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -2,32 +2,32 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "parastoo-fonts";
|
||||
version = "2.0.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"webfont"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rastikerdar";
|
||||
repo = "parastoo-font";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \;
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rastikerdar/parastoo-font";
|
||||
description = "Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو";
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ pancaek ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "pferd";
|
||||
version = "3.9.3";
|
||||
version = "3.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Garmelon";
|
||||
repo = "PFERD";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-wzBWDpnftDantDDAjb1k5ukSeTUpXAvaETIQSrjpt8U=";
|
||||
sha256 = "sha256-nkMo3RuzqJ1ukArzB4BBjTsTAsLbxZQvhHpHiyJkves=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pioasm";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "pico-sdk";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QFKeOSYDuoSuVQsZ68fyQgVnGxZdBl8sehbQf665suM=";
|
||||
hash = "sha256-UWWrZT7Mg2yei/LlDxgei3yXWaP9ETMlgiVOFFAEMZ8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/tools/pioasm";
|
||||
|
||||
@@ -46,13 +46,13 @@ let
|
||||
in
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "pixieditor";
|
||||
version = "2.1.2.2";
|
||||
version = "2.1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PixiEditor";
|
||||
repo = "PixiEditor";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-k2dwz1VcXGs0Sh/6nc8Q3bs/dpsHiTnqRbXaGJojBz4=";
|
||||
hash = "sha256-40oOf9dgHBsHd9fUhHctvmB1//aGD++snd+VwsgOxIU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "powerstation";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "PowerStation";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vKRuO9IS01fwtAR81QGsnqzsggfzJWURc/l+QX6AkQM=";
|
||||
hash = "sha256-/8NpEPHGqqx8Xkibfx8aZUzPfCXBC2JgLWaHmGuG8FU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GOAD8Tu1WcZF1VhiRbBzGMAEowQIPT0sBZcI9EvJk/8=";
|
||||
cargoHash = "sha256-qEOcXAHgYw/5HEPFHjILYcTuxVXjBMegiAajEGTUPSM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
}:
|
||||
let
|
||||
mainProgram = "proton-mail";
|
||||
version = "1.13.4";
|
||||
linuxHash = "sha256-m6l2I/Lqr16+bAEEiAS//etsJeRFrr3J3K4E6xu3d1k=";
|
||||
darwinHash = "sha256-4yEfNT89sOoAAhjjZVaY1yg6AFuYp6tM/ArnFX+1WZw=";
|
||||
version = "1.14.0";
|
||||
linuxHash = "sha256-yB5eKXhW9bmGxHsjOKZlNI2JfN8CXFz1Pz2+77DPYog=";
|
||||
darwinHash = "sha256-NDgCvgM0CM6RNklo2VuMRZb/oT5yaiW7QqyJVAr6hHo=";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "protonmail-desktop";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "protonplus";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vysp3r";
|
||||
repo = "protonplus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9KHtPG/gTtNjYCuStpb4tO3BiB09cSsTk7PpnX8o7qI=";
|
||||
hash = "sha256-A7HsEeGPX0pdNdk9beZw+vqwS/WTHLHpeLp9X7Cz/nI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
The vendored copy of Google's cpp-btree relies on <cstdint> being pulled in
|
||||
transitively. libstdc++ 15 no longer does so, which makes uint8_t/uint16_t
|
||||
undeclared, and the resulting fallback to int trips the kNodeValues
|
||||
COMPILE_ASSERT with a "1 << 32" shift.
|
||||
|
||||
diff --git a/include/btree.h b/include/btree.h
|
||||
--- a/include/btree.h
|
||||
+++ b/include/btree.h
|
||||
@@ -104,6 +104,7 @@
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
+#include <cstdint>
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 382b4236..4e1ecc62 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -201,6 +201,7 @@ static char * main_check_latest_version() {
|
||||
* @return NULL.
|
||||
*/
|
||||
void * main_check_latest_version_thread(void *arg) {
|
||||
+ return NULL;
|
||||
set_thread_name("CheckLatestVers");
|
||||
// Fetch the latest version information
|
||||
char * latest_version = main_check_latest_version();
|
||||
@@ -1,199 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 01aa5730..6c71b3a5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -81,10 +81,7 @@ endif
|
||||
export MAKEOPT := -j${NPROCS}
|
||||
|
||||
### systemd
|
||||
-SYSTEMD := 0
|
||||
-ifeq ($(wildcard /usr/lib/systemd/system), /usr/lib/systemd/system)
|
||||
- SYSTEMD := 1
|
||||
-endif
|
||||
+SYSTEMD := 1
|
||||
|
||||
### check user/group
|
||||
USERCHECK := $(shell getent passwd proxysql)
|
||||
@@ -415,16 +412,10 @@ cleanbuild:
|
||||
|
||||
.PHONY: install
|
||||
install: src/proxysql
|
||||
- install -m 0755 src/proxysql /usr/bin
|
||||
- install -m 0600 etc/proxysql.cnf /etc
|
||||
- if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi
|
||||
-ifeq ($(findstring proxysql,$(USERCHECK)),)
|
||||
- @echo "Creating proxysql user and group"
|
||||
- useradd -r -U -s /bin/false proxysql
|
||||
-endif
|
||||
+ install -m 0755 src/proxysql $(out)/bin
|
||||
+ install -m 0600 etc/proxysql.cnf $(out)/etc
|
||||
ifeq ($(SYSTEMD), 1)
|
||||
- install -m 0644 systemd/system/proxysql.service /usr/lib/systemd/system/
|
||||
- systemctl enable proxysql.service
|
||||
+ install -m 0644 systemd/system/proxysql.service $(out)/lib/systemd/system/
|
||||
else
|
||||
install -m 0755 etc/init.d/proxysql /etc/init.d
|
||||
ifeq ($(DISTRO),"CentOS Linux")
|
||||
diff --git a/deps/Makefile b/deps/Makefile
|
||||
index 87d2a20e..505e069a 100644
|
||||
--- a/deps/Makefile
|
||||
+++ b/deps/Makefile
|
||||
@@ -61,27 +61,22 @@ default: $(targets)
|
||||
### deps targets
|
||||
|
||||
libinjection/libinjection/src/libinjection.a:
|
||||
- cd libinjection && rm -rf libinjection-*/ || true
|
||||
- cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
|
||||
ifneq ($(CENTOSVER),6)
|
||||
- cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
|
||||
cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
|
||||
endif
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
sed -i '' 's/CC=/CC?=/' libinjection/libinjection/src/Makefile
|
||||
else
|
||||
sed -i -e 's/CC=/CC?=/' libinjection/libinjection/src/Makefile
|
||||
endif
|
||||
cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
libinjection: libinjection/libinjection/src/libinjection.a
|
||||
|
||||
include ../common_mk/openssl_flags.mk
|
||||
include ../common_mk/openssl_version_check.mk
|
||||
|
||||
libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
|
||||
- cd libhttpserver && rm -rf libhttpserver-*/ || true
|
||||
- cd libhttpserver && tar -zxf libhttpserver-*.tar.gz
|
||||
cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch
|
||||
cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch
|
||||
cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch
|
||||
@@ -99,77 +94,66 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
|
||||
|
||||
|
||||
libev/libev/.libs/libev.a:
|
||||
- cd libev && rm -rf libev-*/ || true
|
||||
- cd libev && tar -zxf libev-*.tar.gz
|
||||
cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch
|
||||
cd libev/libev && ./configure
|
||||
cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
ev: libev/libev/.libs/libev.a
|
||||
|
||||
|
||||
coredumper/coredumper/src/libcoredumper.a:
|
||||
cd coredumper && rm -rf coredumper-*/ || true
|
||||
cd coredumper && tar -zxf coredumper-*.tar.gz
|
||||
cd coredumper/coredumper && patch -p1 < ../includes.patch
|
||||
- cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug
|
||||
+ cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
coredumper: coredumper/coredumper/src/libcoredumper.a
|
||||
|
||||
curl/curl/lib/.libs/libcurl.a:
|
||||
- cd curl && rm -rf curl-*/ || true
|
||||
- cd curl && tar -zxf curl-*.tar.gz
|
||||
# cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
cd curl/curl && autoreconf -fi
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
cd curl/curl && patch configure < ../configure.patch
|
||||
endif
|
||||
cd curl/curl && CPPFLAGS="-I$(SSL_IDIR)" LDFLAGS="$(LIB_SSL_PATH) $(LIB_CRYPTO_PATH)" ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl --enable-shared=yes
|
||||
cd curl/curl && CFLAGS=-fPIC CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
curl: curl/curl/lib/.libs/libcurl.a
|
||||
|
||||
|
||||
libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a:
|
||||
- cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true
|
||||
- cd libmicrohttpd && tar -zxf libmicrohttpd-*.tar.gz
|
||||
-# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch
|
||||
cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
|
||||
|
||||
|
||||
cityhash/cityhash/src/.libs/libcityhash.a:
|
||||
cd cityhash && rm -rf cityhash-*/ || true
|
||||
cd cityhash && tar -zxf cityhash-*.tar.gz
|
||||
cd cityhash/cityhash && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub
|
||||
cd cityhash/cityhash && ./configure && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
cityhash: cityhash/cityhash/src/.libs/libcityhash.a
|
||||
|
||||
|
||||
lz4/lz4/lib/liblz4.a:
|
||||
- cd lz4 && rm -rf lz4-*/ || true
|
||||
- cd lz4 && tar -zxf lz4-*.tar.gz
|
||||
cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
lz4: lz4/lz4/lib/liblz4.a
|
||||
|
||||
|
||||
clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
|
||||
cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true
|
||||
cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz
|
||||
cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp
|
||||
cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
|
||||
- cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
|
||||
+ cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
|
||||
cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a
|
||||
|
||||
|
||||
libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
|
||||
- cd libdaemon && rm -rf libdaemon-*/ || true
|
||||
- cd libdaemon && tar -zxf libdaemon-0.14.tar.gz
|
||||
cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch
|
||||
cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
|
||||
cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
@@ -194,7 +178,7 @@ mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a:
|
||||
cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true
|
||||
cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
|
||||
cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
|
||||
- cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
|
||||
+ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_C_FLAGS=-std=gnu17 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
|
||||
ifeq ($(PROXYDEBUG),1)
|
||||
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
|
||||
else ifeq ($(USEVALGRIND),1)
|
||||
@@ -253,18 +237,13 @@ sqlite3/sqlite3/sqlite3.o:
|
||||
sqlite3: sqlite3/sqlite3/sqlite3.o
|
||||
|
||||
libconfig/libconfig/lib/.libs/libconfig++.a:
|
||||
- cd libconfig && rm -rf libconfig-*/ || true
|
||||
- cd libconfig && tar -zxf libconfig-*.tar.gz
|
||||
cd libconfig/libconfig && ./configure --disable-examples
|
||||
cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
|
||||
|
||||
|
||||
prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
|
||||
- cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true
|
||||
- cd prometheus-cpp && tar -zxf prometheus-cpp-*.tar.gz
|
||||
- cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-*.tar.gz -C prometheus-cpp/3rdparty/civetweb
|
||||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
|
||||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch
|
||||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch
|
||||
@@ -293,17 +272,13 @@ re2: re2/re2/obj/libre2.a
|
||||
|
||||
|
||||
pcre/pcre/.libs/libpcre.a:
|
||||
- cd pcre && rm -rf pcre-*/ || true
|
||||
- cd pcre && tar -zxf pcre-*.tar.gz
|
||||
cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch
|
||||
cd pcre/pcre && ./configure
|
||||
cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
pcre: pcre/pcre/.libs/libpcre.a
|
||||
|
||||
postgresql/postgresql/src/interfaces/libpq/libpq.a:
|
||||
- cd postgresql && rm -rf postgresql-*/ || true
|
||||
- cd postgresql && tar -zxf postgresql-*.tar.gz
|
||||
cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch
|
||||
cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch
|
||||
cd postgresql/postgresql && patch -p0 < ../fmt_err_msg.patch
|
||||
@@ -361,4 +336,3 @@ cleanall:
|
||||
cd libusual && rm -rf libusual-*/ || true
|
||||
cd libscram && rm -rf lib/* obj/* || true
|
||||
.PHONY: cleanall
|
||||
-
|
||||
@@ -1,233 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
applyPatches,
|
||||
fetchFromGitHub,
|
||||
autoconf,
|
||||
automake,
|
||||
bison,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libtool,
|
||||
civetweb,
|
||||
coreutils,
|
||||
curl,
|
||||
flex,
|
||||
gnutls,
|
||||
libconfig,
|
||||
libdaemon,
|
||||
libev,
|
||||
libgcrypt,
|
||||
libinjection,
|
||||
libmicrohttpd,
|
||||
libuuid,
|
||||
lz4,
|
||||
nlohmann_json,
|
||||
openssl,
|
||||
pcre,
|
||||
perl,
|
||||
python3,
|
||||
prometheus-cpp,
|
||||
zlib,
|
||||
texinfo,
|
||||
postgresql_16,
|
||||
icu,
|
||||
libevent,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proxysql";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysown";
|
||||
repo = "proxysql";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kbfuUulEDPx/5tpp7uOkIXQuyaFYzos3crCvkWHSmHg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./makefiles.patch
|
||||
./dont-phone-home.patch
|
||||
./btree-cstdint.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
cmake
|
||||
libtool
|
||||
perl
|
||||
pkg-config
|
||||
python3
|
||||
texinfo # for makeinfo
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bison
|
||||
curl
|
||||
flex
|
||||
gnutls
|
||||
icu
|
||||
libevent
|
||||
libgcrypt
|
||||
libuuid
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env.GIT_VERSION = finalAttrs.version;
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
# replace and fix some vendored dependencies
|
||||
preBuild = # sh
|
||||
''
|
||||
pushd deps
|
||||
|
||||
function replace_dep() {
|
||||
local folder="$1"
|
||||
local src="$2"
|
||||
local symlink="$3"
|
||||
local name="$4"
|
||||
|
||||
pushd "$folder"
|
||||
|
||||
rm -rf "$symlink"
|
||||
if [ -d "$src" ]; then
|
||||
cp -R "$src"/. "$symlink"
|
||||
chmod -R u+w "$symlink"
|
||||
else
|
||||
tar xf "$src"
|
||||
ln -s "$name" "$symlink"
|
||||
fi
|
||||
|
||||
popd
|
||||
}
|
||||
|
||||
${lib.concatMapStringsSep "\n"
|
||||
(
|
||||
x:
|
||||
''replace_dep "${x.f}" "${x.p.src}" "${
|
||||
x.p.pname or (builtins.parseDrvName x.p.name).name
|
||||
}" "${x.p.name}"''
|
||||
)
|
||||
(
|
||||
map
|
||||
(x: {
|
||||
inherit (x) f;
|
||||
p = x.p // {
|
||||
src = applyPatches {
|
||||
inherit (x.p) src patches;
|
||||
};
|
||||
};
|
||||
})
|
||||
[
|
||||
{
|
||||
f = "curl";
|
||||
p = curl;
|
||||
}
|
||||
{
|
||||
f = "libconfig";
|
||||
p = libconfig;
|
||||
}
|
||||
{
|
||||
f = "libdaemon";
|
||||
p = libdaemon;
|
||||
}
|
||||
{
|
||||
f = "libev";
|
||||
p = libev;
|
||||
}
|
||||
{
|
||||
f = "libinjection";
|
||||
p = libinjection;
|
||||
}
|
||||
{
|
||||
f = "libmicrohttpd";
|
||||
p = libmicrohttpd;
|
||||
}
|
||||
{
|
||||
f = "lz4";
|
||||
p = lz4;
|
||||
}
|
||||
{
|
||||
f = "pcre";
|
||||
p = pcre;
|
||||
}
|
||||
{
|
||||
f = "prometheus-cpp";
|
||||
p = prometheus-cpp.overrideAttrs (
|
||||
finalAttrs: _: {
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupp0r";
|
||||
repo = "prometheus-cpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8=";
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
{
|
||||
f = "postgresql";
|
||||
p = postgresql_16;
|
||||
}
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
pushd libhttpserver
|
||||
tar xf libhttpserver-*.tar.gz
|
||||
sed -i s_/bin/pwd_${coreutils}/bin/pwd_g libhttpserver/configure.ac
|
||||
popd
|
||||
|
||||
pushd json
|
||||
rm json.hpp
|
||||
ln -s ${nlohmann_json.src}/single_include/nlohmann/json.hpp .
|
||||
popd
|
||||
|
||||
pushd prometheus-cpp/prometheus-cpp/3rdparty
|
||||
replace_dep . "${civetweb.src}" civetweb
|
||||
popd
|
||||
|
||||
pushd libmicrohttpd/libmicrohttpd
|
||||
autoreconf
|
||||
popd
|
||||
|
||||
pushd libconfig/libconfig
|
||||
autoreconf
|
||||
popd
|
||||
|
||||
pushd libdaemon/libdaemon
|
||||
autoreconf
|
||||
popd
|
||||
|
||||
pushd pcre/pcre
|
||||
autoreconf
|
||||
popd
|
||||
|
||||
popd
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/{etc,bin,lib/systemd/system}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
sed -i s_/usr/bin/proxysql_$out/bin/proxysql_ $out/lib/systemd/system/*.service
|
||||
'';
|
||||
|
||||
meta = {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "High-performance MySQL proxy";
|
||||
mainProgram = "proxysql";
|
||||
homepage = "https://proxysql.com/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optional stdenv.cc.isGNU [
|
||||
lib.optionals stdenv.cc.isGNU [
|
||||
# Required with newer GCC
|
||||
"-Wno-error=stringop-overflow"
|
||||
]
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user