Merge staging-next into staging
This commit is contained in:
@@ -9,10 +9,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "4.2.770";
|
||||
version = "4.2.785";
|
||||
src = fetchurl {
|
||||
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
|
||||
hash = "sha256-0x1p61zIkAGpBG0dyRwLqoKbhqI3EGTtqpdYr5sxhog=";
|
||||
hash = "sha256-KUFFuiZY2nopzhSendRXAR4O9G71J/WeHkQmuvi+rsE=";
|
||||
};
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
|
||||
@@ -57,5 +57,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
matthiasbeyer
|
||||
];
|
||||
broken = stdenv.hostPlatform.isLinux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-show-asm";
|
||||
version = "0.2.58";
|
||||
version = "0.2.59";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-WC6bAmvAYK0erGbzQ20uoezmbwkUxAMByeoHuYqJxsU=";
|
||||
hash = "sha256-5RNfokTD86OFGzWRUyY29+d5P3sWWHmzGCGdIkzIK/g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IDCTjuTBxjzIh9M9k9I+DRO+zOMtkKwi6FbTiXFXMJo=";
|
||||
cargoHash = "sha256-EcnxozYMjxFHwLpeYwh5dP18+1tiPsY6uQBie3SCg18=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "3.2.11",
|
||||
"version": "3.2.21",
|
||||
"vscodeVersion": "1.105.1",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/linux/x64/Cursor-3.2.11-x86_64.AppImage",
|
||||
"hash": "sha256-xRtrBvyhG97qHzZTufiEdfRIFyIWSvodIgX5J9ToNWo="
|
||||
"url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/linux/x64/Cursor-3.2.21-x86_64.AppImage",
|
||||
"hash": "sha256-1OtumCvJbLIoNflh1hrMz2at3k/FrqK+Qvhn/XGI2dU="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/linux/arm64/Cursor-3.2.11-aarch64.AppImage",
|
||||
"hash": "sha256-T16gRDEGGahpvHsewPv5EBoGJeu6bONuYOenK6frDkg="
|
||||
"url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/linux/arm64/Cursor-3.2.21-aarch64.AppImage",
|
||||
"hash": "sha256-R51osvw7sP19FbAhPIhHsZYOvEgSW/NhAgyg2N35wAM="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-zPLh24QI76ORzpCQUV30oB5RtRo7rVcOPY6oK05LngI="
|
||||
"url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-Tvty+mDr4q7wRVJacuCxb6HO1QqsFdwm0U7dUY/sPu0="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-XeA1/kyZiKAS7op3QXm76clOB+UYTNj4mWIwRV1ISYY="
|
||||
"url": "https://downloads.cursor.com/production/806df57ed3b6f1ee0175140d38039a38574ec722/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-oewHIhqvWJgJzZJ81uBp6zNDOLCXBXcK10MEUSyRDRQ="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "copacetic";
|
||||
version = "0.11.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-copacetic";
|
||||
repo = "copacetic";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kgFT+IK6zCGoGK8L/lwXyiUXCWYG7ElziPs0Q1cq+fw=";
|
||||
hash = "sha256-FTldgBYOmJt3VIC3vwp415oPNRCAiR1cxEF8lJr5TSU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qe2VJHXSYtZJlMd5R2J1NXWcXb8+cbTiDBQeN20fbEE=";
|
||||
vendorHash = "sha256-nkVAHqe61AR0GBK5upsk650kl8UDp1ppFWhyi3erpr4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -41,6 +41,8 @@ buildGoModule (finalAttrs: {
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
# Skip tests that require network access and container services
|
||||
@@ -52,6 +54,16 @@ buildGoModule (finalAttrs: {
|
||||
"TestPushToRegistry"
|
||||
"TestMultiPlatformPluginPatch"
|
||||
"TestPodmanLoader_Load_Success"
|
||||
"TestMultiArchBulkPatching"
|
||||
"TestComprehensiveBulkPatching"
|
||||
"TestTrivyParserParseWithNodeJS/OS_and_Node.js_packages"
|
||||
"TestLocalImageDescriptor"
|
||||
"TestGetImageDescriptor"
|
||||
"TestDotNetSDKImagePatching"
|
||||
"TestGenerateWithoutReport"
|
||||
"TestGenerateToStdout"
|
||||
"TestCustomBuildPatching"
|
||||
"TestNodeJSPatching"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
@@ -78,6 +90,6 @@ buildGoModule (finalAttrs: {
|
||||
changelog = "https://github.com/project-copacetic/copacetic/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "copa";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cwal";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nitinbhat972";
|
||||
repo = "cwal";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/5l/Wc85ElB0V1j2tCW5CXKJKvhz6vb6V696d8UPM0c=";
|
||||
hash = "sha256-xsfSx0ctDR1uep+SPyfFU/aOvN8l0uGzVPsNL3+4vT8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,50 +1,21 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused jq
|
||||
#!nix-shell -i bash -p gnused nix-update
|
||||
|
||||
set -x -eu -o pipefail
|
||||
set -eu -o pipefail
|
||||
set -x
|
||||
|
||||
NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
|
||||
FLUXCD_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
|
||||
# Compute the relative dir of the update script
|
||||
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
|
||||
|
||||
OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; fluxcd.version or (builtins.parseDrvName fluxcd.name).version" | tr -d '"')"
|
||||
LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
|
||||
LATEST_VERSION=$(echo "${LATEST_TAG}" | sed 's/^v//')
|
||||
# Update version, src hash, and vendor hash
|
||||
nix-update fluxcd
|
||||
|
||||
if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
|
||||
SRC_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz")
|
||||
SRC_HASH=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$SRC_SHA256")
|
||||
MANIFESTS_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz")
|
||||
MANIFESTS_HASH=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$MANIFESTS_SHA256")
|
||||
# Read the potentially updated version from `nix-update fluxcd` using SCRIPT_DIR
|
||||
VERSION=$(sed -n 's/.*version = "\(.*\)".*/\1/p' "${SCRIPT_DIR}/package.nix" | head -1)
|
||||
|
||||
setKV () {
|
||||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/package.nix"
|
||||
}
|
||||
|
||||
setKV version "${LATEST_VERSION}"
|
||||
setKV srcHash "${SRC_HASH}"
|
||||
setKV manifestsHash "${MANIFESTS_HASH}"
|
||||
setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash
|
||||
|
||||
set +e
|
||||
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd "$NIXPKGS_PATH" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
|
||||
VENDOR_HASH=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$VENDOR_SHA256")
|
||||
set -e
|
||||
|
||||
if [ -n "${VENDOR_HASH:-}" ]; then
|
||||
setKV vendorHash "${VENDOR_HASH}"
|
||||
else
|
||||
echo "Update failed. VENDOR_HASH is empty."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# `git` flag here is to be used by local maintainers to speed up the bump process
|
||||
if [ $# -eq 1 ] && [ "$1" = "git" ]; then
|
||||
git switch -c "package-fluxcd-${LATEST_VERSION}"
|
||||
git add "$FLUXCD_PATH"/package.nix
|
||||
git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}
|
||||
|
||||
Release: https://github.com/fluxcd/flux2/releases/tag/v${LATEST_VERSION}"
|
||||
fi
|
||||
else
|
||||
echo "fluxcd is already up-to-date at $OLD_VERSION"
|
||||
fi
|
||||
# Update the additional fluxcd manifests hash
|
||||
# This is idempotent and will run regardless of whether nix-update changes the package.nix version
|
||||
# note: tag format is assumed to be v${VERSION} which matches the fetchZip in package.nix
|
||||
MANIFESTS_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/releases/download/v${VERSION}/manifests.tar.gz")
|
||||
MANIFESTS_HASH=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$MANIFESTS_SHA256")
|
||||
sed -i "s|manifestsHash = \".*\"|manifestsHash = \"${MANIFESTS_HASH}\"|" "${SCRIPT_DIR}/package.nix"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "json-sort";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "drupol";
|
||||
repo = "json-sort";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-H6IjedwKVMUI8na7RbJjWRjNppq3j3+g63sUKsQ5BYQ=";
|
||||
hash = "sha256-yojMXJiP87l5B7D74V6z9FNvSYebtn71GnB0d+Q7/UI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LBMExTj855F+PpFpqcpxTyBR3eEEF235kTbd5CmSQWo=";
|
||||
cargoHash = "sha256-LpZIVWWb8HI1HM3m8Vhfk27bWFpU37GYssmsfEJQAVg=";
|
||||
|
||||
dontUseCargoParallelTests = true;
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "High-performance event loop/event model with lots of features";
|
||||
homepage = "https://software.schmorp.de/pkg/libev.html";
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.bsd2; # or GPL2+
|
||||
|
||||
@@ -9,24 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mikmod";
|
||||
version = "3.2.8";
|
||||
version = "3.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mikmod/mikmod-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v";
|
||||
sha256 = "sha256-IUwQqjAZgHoesmsscJWS9j28wAtymFqoak+3rDzYuQE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix player startup crash due to stack overflow check:
|
||||
# https://sourceforge.net/p/mikmod/patches/17/
|
||||
(fetchpatch {
|
||||
name = "fortify-source-3.patch";
|
||||
url = "https://sourceforge.net/p/mikmod/patches/17/attachment/0001-mikmod-fix-startup-crash-on-_FROTIFY_SOURCE-3-system.patch";
|
||||
stripLen = 1;
|
||||
hash = "sha256-YtbnLTsW3oYPo4r3fh3DUd3DD5ogWrCNlrDcneY03U0=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libmikmod
|
||||
ncurses
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -15,6 +16,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-6O7qSrR6EFr7k9lHQHGs/scZxJJ5DBNDxlSL5hzlRf4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/microsoft/ntttcp-for-linux/commit/e18597c05e3d4b439849ce0e149cb701ff5a36c2.patch";
|
||||
hash = "sha256-FOgjKseMDL1O1f+lgmmreGus4YRTZMwIJinh/7MT2Xk=";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = "cd src";
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchDebianPatch,
|
||||
libintl,
|
||||
}:
|
||||
|
||||
@@ -14,6 +15,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchDebianPatch {
|
||||
pname = "numdiff";
|
||||
version = "5.9.0";
|
||||
debianRevision = "2";
|
||||
patch = "0005-gcc-15.patch";
|
||||
hash = "sha256-+8pNiEfGuh/03LRCY6kuoIcPZ4fQOhNrD93ZW/mXxJw=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libintl ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
@@ -10,28 +9,21 @@
|
||||
libusb1,
|
||||
libzip,
|
||||
openssl,
|
||||
tinyxml-2,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nxpmicro-mfgtools";
|
||||
version = "1.5.139";
|
||||
version = "1.5.243";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxp-imx";
|
||||
repo = "mfgtools";
|
||||
rev = "uuu_${finalAttrs.version}";
|
||||
sha256 = "sha256-t5usUGbcdLQlqPpZkNDeGncka9VfkpO7U933Kw/Sm7U=";
|
||||
sha256 = "sha256-+m3r/QxOnTjemqIaZ/2cxDHtHlw7qxu9PbTsQYyMaEY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# build: support cmake 4.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nxp-imx/mfgtools/commit/311ee9b3cca0275fbb5eb5228c56edbb518afd67.patch?full_index=1";
|
||||
hash = "sha256-o4cPfXsPxk88zy5lARX8rcmQncsAkZegOxlAIyoFUpQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -43,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libusb1
|
||||
libzip
|
||||
openssl
|
||||
tinyxml-2
|
||||
zstd
|
||||
];
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchDebianPatch,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
libxml2,
|
||||
@@ -24,6 +25,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "19h3dnjgqbawnvgnycyp4n5b6mjsp5zghn3b69b6f3xa3fyi32qy";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchDebianPatch {
|
||||
pname = "osmo";
|
||||
version = "0.4.4";
|
||||
debianRevision = "3";
|
||||
patch = "gcc-15.patch";
|
||||
hash = "sha256-2T34wYczOTc57tjt3w91q8TDtQZqLpwYOsr8JKpYs0c=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
coreutils,
|
||||
fetchDebianPatch,
|
||||
fetchurl,
|
||||
libxcrypt,
|
||||
pam,
|
||||
@@ -20,7 +21,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-mKyjimHHcTZ3uW8kQmynBTSAwP0HfZGx6ZvJ+SzLgyo=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
patches = [
|
||||
(fetchDebianPatch {
|
||||
pname = "otpw";
|
||||
version = "1.5";
|
||||
debianRevision = "6";
|
||||
patch = "gcc15.patch";
|
||||
hash = "sha256-lR/FZannn9YVCTj+DWZvIyu99lmkaUxG48TGzckyolU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/^CFLAGS.*/CFLAGS=-O2 -fPIC/' Makefile
|
||||
substituteInPlace otpw-gen.c \
|
||||
--replace "head -c 20 /dev/urandom 2>&1" "${coreutils}/bin/head -c 20 /dev/urandom 2>&1" \
|
||||
|
||||
@@ -14,16 +14,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "pgdog";
|
||||
version = "0.1.38";
|
||||
version = "0.1.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgdogdev";
|
||||
repo = "pgdog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dSZzzgGyegr5NPRrCIe8ZS2StR4PXsTLbZ//Y3TpMrM=";
|
||||
hash = "sha256-E12+K9AW5yUuklnCN4v2fK6e1+O7zkThkrHMmTxqsJk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-td/zsfK77Wd/8FhJenJE3SEK55vZPIsW/nztR/XbCKs=";
|
||||
cargoHash = "sha256-Qnjh9u0DGzA44fIjuNGT7UONNCx+2j3z389tvllbQxM=";
|
||||
|
||||
# Hardcoded paths for C compiler and linker
|
||||
postPatch = ''
|
||||
|
||||
@@ -24,21 +24,15 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sayonara";
|
||||
version = "1.10.0-stable1";
|
||||
version = "1.11.0-stable1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "luciocarreras";
|
||||
repo = "sayonara-player";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI=";
|
||||
hash = "sha256-MvL5czJkvHNQkuoPtGq+q7fkJIX75IXmQCWmpgisqNI=";
|
||||
};
|
||||
|
||||
# error: no matching function for call to 'max'
|
||||
postPatch = ''
|
||||
substituteInPlace src/Components/Playlist/PlaylistModifiers.cpp \
|
||||
--replace-fail "std::max" "std::max<MilliSeconds>"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
fftwFloat,
|
||||
libfishsound,
|
||||
libid3tag,
|
||||
libjack2,
|
||||
liblo,
|
||||
libmad,
|
||||
liboggz,
|
||||
@@ -23,9 +24,8 @@
|
||||
serd,
|
||||
sord,
|
||||
capnproto,
|
||||
pkg-config,
|
||||
libjack2,
|
||||
libsForQt5,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -39,22 +39,32 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch";
|
||||
url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
extraPrefix = "svcore/";
|
||||
sha256 = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
|
||||
hash = "sha256-ReFOGRyM7IXKOUuzNoGIVX+C+zMz3/fftQN7k5BHp0k=";
|
||||
})
|
||||
./match-vamp.patch
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/piper-audio/piper-vamp-cpp/commit/6f16a09b78b995b3cf2844f00033bde90e5e0936.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
extraPrefix = "piper-vamp-cpp/";
|
||||
hash = "sha256-G9O9t1Niesffj4bDFO0q8KMgygTdYJUVHkq/7nkGSRk=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
boost
|
||||
bzip2
|
||||
capnproto
|
||||
fftw
|
||||
fftwFloat
|
||||
libfishsound
|
||||
libid3tag
|
||||
libjack2
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
liblo
|
||||
libmad
|
||||
liboggz
|
||||
@@ -67,14 +77,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rubberband
|
||||
serd
|
||||
sord
|
||||
capnproto
|
||||
libjack2
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
capnproto # capnp
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
diff --git a/siod/editline.c b/siod/editline.c
|
||||
index 6a1b847..964fe5e 100644
|
||||
--- a/siod/editline.c
|
||||
+++ b/siod/editline.c
|
||||
@@ -176,7 +176,7 @@ STATIC STATUS h_next();
|
||||
STATIC STATUS h_prev();
|
||||
STATIC STATUS h_first();
|
||||
STATIC STATUS h_last();
|
||||
-STATIC int substrcmp(char *text, char *pat, int len);
|
||||
+STATIC int substrcmp(const char *text, const char *pat, size_t len);
|
||||
STATIC ECHAR *search_hist(ECHAR *search, ECHAR *(*move)());
|
||||
STATIC STATUS h_search();
|
||||
STATIC STATUS fd_char();
|
||||
@@ -224,10 +224,10 @@ int rl_meta_chars = 0;
|
||||
*/
|
||||
STATIC ECHAR *editinput();
|
||||
#if defined(USE_TERMCAP)
|
||||
-extern char *getenv();
|
||||
-extern char *tgetstr();
|
||||
-extern int tgetent();
|
||||
-extern int tgetnum();
|
||||
+extern char *getenv(const char *);
|
||||
+extern char *tgetstr(char *, char **);
|
||||
+extern int tgetent(char *, const char *);
|
||||
+extern int tgetnum(char *);
|
||||
#endif /* defined(USE_TERMCAP) */
|
||||
|
||||
/*
|
||||
@@ -806,7 +806,7 @@ STATIC STATUS h_last()
|
||||
/*
|
||||
** Return zero if pat appears as a substring in text.
|
||||
*/
|
||||
-STATIC int substrcmp(char *text, char *pat, int len)
|
||||
+STATIC int substrcmp(const char *text, const char *pat, size_t len)
|
||||
{
|
||||
ECHAR c;
|
||||
|
||||
@@ -823,7 +823,7 @@ STATIC ECHAR *search_hist(ECHAR *search, ECHAR *(*move)())
|
||||
static ECHAR *old_search;
|
||||
int len;
|
||||
int pos;
|
||||
- int (*match)();
|
||||
+ int (*match)(const char *, const char *, size_t);
|
||||
char *pat;
|
||||
|
||||
/* Save or get remembered search pattern. */
|
||||
@@ -0,0 +1,39 @@
|
||||
diff --git a/scripts/est_examples.sh b/scripts/est_examples.sh
|
||||
index 5e6f38c..b931fda 100755
|
||||
--- a/scripts/est_examples.sh
|
||||
+++ b/scripts/est_examples.sh
|
||||
@@ -64,7 +64,7 @@ EOF
|
||||
prepend() {
|
||||
var="$1"
|
||||
extra="$2"
|
||||
- eval "val=\$$var"
|
||||
+ eval "val=\${$var:-}"
|
||||
|
||||
if [ -n "$val" ]
|
||||
then
|
||||
diff --git a/scripts/shared_script b/scripts/shared_script
|
||||
index b159134..2732699 100644
|
||||
--- a/scripts/shared_script
|
||||
+++ b/scripts/shared_script
|
||||
@@ -5,7 +5,7 @@
|
||||
extend() {
|
||||
var="$1"
|
||||
extra="$2"
|
||||
- eval "val=\$$var"
|
||||
+ eval "val=\${$var:-}"
|
||||
|
||||
if [ -n "$val" ]
|
||||
then
|
||||
diff --git a/scripts/shared_setup_sh b/scripts/shared_setup_sh
|
||||
index 64f0ba9..e0488f4 100644
|
||||
--- a/scripts/shared_setup_sh
|
||||
+++ b/scripts/shared_setup_sh
|
||||
@@ -4,7 +4,7 @@
|
||||
extend() {
|
||||
var="$1"
|
||||
extra="$2"
|
||||
- eval "val=\$$var"
|
||||
+ eval "val=\${$var:-}"
|
||||
|
||||
if [ -n "$val" ]
|
||||
then
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchpatch,
|
||||
ncurses,
|
||||
alsa-lib,
|
||||
perl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -22,10 +23,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/festvox/speech_tools/commit/06141f69d21bf507a9becb5405265dc362edb0df.patch";
|
||||
hash = "sha256-tRestCBuRhak+2ccsB6mvDxGm/TIYX4eZ3oppCOEP9s=";
|
||||
})
|
||||
# Fix C23 compatibility: https://github.com/festvox/speech_tools/pull/58
|
||||
./fix-c23.patch
|
||||
# Fix "unbonded variable" error in some scripts
|
||||
./fix-unbonded-variable.patch
|
||||
# Fix "ISO C++17 does not allow 'register' storage class specifier
|
||||
./remove-register-specifier.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
perl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
@@ -48,11 +56,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# c99 makes isnan valid for float and double
|
||||
substituteInPlace include/EST_math.h \
|
||||
--replace '__isnanf(X)' 'isnan(X)'
|
||||
|
||||
# fix script referenced paths
|
||||
substituteInPlace config/rules/script_process.awk \
|
||||
--replace-fail "topdir" "\"$out\"" \
|
||||
--replace-fail "est" "\"$out\""
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{bin,lib}
|
||||
for d in bin lib; do
|
||||
mkdir -p "$out"/{bin,include,lib}
|
||||
for d in bin include lib; do
|
||||
for i in ./$d/*; do
|
||||
test "$(basename "$i")" = "Makefile" ||
|
||||
cp -r "$(readlink -f $i)" "$out/$d"
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
diff --git a/base_class/string/EST_strcasecmp.c b/base_class/string/EST_strcasecmp.c
|
||||
index 72a9b7c..e196c3a 100755
|
||||
--- a/base_class/string/EST_strcasecmp.c
|
||||
+++ b/base_class/string/EST_strcasecmp.c
|
||||
@@ -86,7 +86,7 @@ static const unsigned char def_charmap[] = {
|
||||
int
|
||||
EST_strcasecmp(const char *s1, const char *s2, const unsigned char *charmap)
|
||||
{
|
||||
- register const unsigned char *cm = charmap?charmap:def_charmap,
|
||||
+ const unsigned char *cm = charmap?charmap:def_charmap,
|
||||
*us1 = (const unsigned char *)s1,
|
||||
*us2 = (const unsigned char *)s2;
|
||||
int r;
|
||||
@@ -102,7 +102,7 @@ int
|
||||
EST_strncasecmp(const char *s1, const char *s2, size_t n, const unsigned char *charmap)
|
||||
{
|
||||
if (n != 0) {
|
||||
- register const unsigned char *cm = charmap?charmap:def_charmap,
|
||||
+ const unsigned char *cm = charmap?charmap:def_charmap,
|
||||
*us1 = (const unsigned char *)s1,
|
||||
*us2 = (const unsigned char *)s2;
|
||||
|
||||
diff --git a/base_class/string/regexp.cc b/base_class/string/regexp.cc
|
||||
index 8b8f15f..c6211fa 100644
|
||||
--- a/base_class/string/regexp.cc
|
||||
+++ b/base_class/string/regexp.cc
|
||||
@@ -175,7 +175,7 @@ STATIC char *regbranch(int *flagp);
|
||||
STATIC char *regpiece(int *flagp);
|
||||
STATIC char *regatom(int *flagp);
|
||||
STATIC char *regnode(char op);
|
||||
-STATIC char *regnext(register char *p);
|
||||
+STATIC char *regnext(char *p);
|
||||
STATIC void regc(char b);
|
||||
STATIC void reginsert(char op, char *opnd);
|
||||
STATIC void regtail(char *p, char *val);
|
||||
diff --git a/base_class/string/regsub.c b/base_class/string/regsub.c
|
||||
index 017cea2..ed7cc9b 100644
|
||||
--- a/base_class/string/regsub.c
|
||||
+++ b/base_class/string/regsub.c
|
||||
@@ -38,11 +38,11 @@ const hs_regexp *prog;
|
||||
const char *source;
|
||||
char *dest;
|
||||
{
|
||||
- register char *src;
|
||||
- register char *dst;
|
||||
- register char c;
|
||||
- register int no;
|
||||
- register int len;
|
||||
+ char *src;
|
||||
+ char *dst;
|
||||
+ char c;
|
||||
+ int no;
|
||||
+ int len;
|
||||
|
||||
if (prog == NULL || source == NULL || dest == NULL) {
|
||||
hs_regerror("NULL parm to regsub");
|
||||
@@ -20,6 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ncurses
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types";
|
||||
|
||||
makeFlags = [ "BIN=$(out)/bin" ];
|
||||
|
||||
preInstall = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "storrent";
|
||||
version = "0-unstable-2023-01-14";
|
||||
version = "0-unstable-2026-01-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jech";
|
||||
repo = "storrent";
|
||||
rev = "86270ee777a19a521f8898a179485e0347f90ce0";
|
||||
hash = "sha256-JYNtuyk4hhe1jZgY/5Bz91Ropdw/U7n1VKHYkdUjZ0I=";
|
||||
rev = "7d7d956c3b7bc1c51a2a4ed5b6925d717fc280ff";
|
||||
hash = "sha256-yAWKz85EqIJis+K4qP+5aOnx2YrhRx0+LPAAEawUUsU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iPKZPXsa6ya29N/u9QYd5LAm42+FtHZLGStRDxsAxe4=";
|
||||
vendorHash = "sha256-/m+U4UsofU0vOFMh+omRzn/DWqr3ghgIl+a4v1foGjY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
diff --git a/src/popmac.c b/src/popmac.c
|
||||
index 91329da..46ccdea 100644
|
||||
--- a/src/popmac.c
|
||||
+++ b/src/popmac.c
|
||||
@@ -38,7 +38,7 @@ DEFAULT PopMac() /* restore environment after macro exit */
|
||||
ZFree((voidptr)QRp->Start);
|
||||
}
|
||||
}
|
||||
- ZFree(MSp->QRgstr);
|
||||
+ ZFree((voidptr)MSp->QRgstr);
|
||||
}
|
||||
--MStTop;
|
||||
#if DEBUGGING
|
||||
diff --git a/src/readcs.c b/src/readcs.c
|
||||
index 9dd4458..135f240 100644
|
||||
--- a/src/readcs.c
|
||||
+++ b/src/readcs.c
|
||||
@@ -488,7 +488,7 @@ VVOID ReadCS()
|
||||
}
|
||||
#if CURSES
|
||||
if (ScroLn > 0 || skiprefresh)
|
||||
- dolf(HowFar);
|
||||
+ dolf();
|
||||
if (ScroLn == 0 || skiprefresh)
|
||||
#endif
|
||||
ZDspCh('*');
|
||||
@@ -537,7 +537,7 @@ VVOID ReadCS()
|
||||
}
|
||||
#if CURSES
|
||||
if (ScroLn > 0 && !skiprefresh)
|
||||
- dobs(HowFar);
|
||||
+ dobs();
|
||||
if (ScroLn == 0 || skiprefresh)
|
||||
#endif
|
||||
ZDspCh('*');
|
||||
diff --git a/src/tecoc.h b/src/tecoc.h
|
||||
index 0debaa7..25a028b 100644
|
||||
--- a/src/tecoc.h
|
||||
+++ b/src/tecoc.h
|
||||
@@ -684,7 +684,7 @@ VVOID ZVrbos(); /* display verbose form of an error message */
|
||||
DEFAULT ZWrBfr(); /* write line to file */
|
||||
#endif
|
||||
#if CURSES
|
||||
-void Scope();
|
||||
+void Scope(int bot);
|
||||
void centre();
|
||||
void dolf();
|
||||
void dobs();
|
||||
diff --git a/src/zlinux.c b/src/zlinux.c
|
||||
index c2c120c..62eb0d4 100644
|
||||
--- a/src/zlinux.c
|
||||
+++ b/src/zlinux.c
|
||||
@@ -103,7 +103,7 @@ static char tbuf[1024]; /* store TERMCAP entry here */
|
||||
int tputs(); /* send termcap string to a given function */
|
||||
int tgetent(); /* load a terminal capability buffer */
|
||||
char *tgetstr(); /* get str value of a terminal capability */
|
||||
-static int vernum(); /* see bottom of this file */
|
||||
+static int vernum(char *target); /* see bottom of this file */
|
||||
static int SupGotCtC = 0;
|
||||
static glob_t pglob;
|
||||
static int globindex = 0;
|
||||
@@ -1479,7 +1479,7 @@ character is received when it is struck, and no echoing is performed. Save
|
||||
the terminal characteristics so when we exit we can reset them (in ZClnUp)
|
||||
to what they were before we changed them.
|
||||
*****************************************************************************/
|
||||
-static VVOID CntrlC()
|
||||
+static VVOID CntrlC(int sig)
|
||||
{
|
||||
signal(SIGINT, SIG_IGN);
|
||||
SupGotCtC = 0;
|
||||
@@ -1497,7 +1497,7 @@ static VVOID CntrlC()
|
||||
/*
|
||||
* sighup - what we do if we get a hang up?
|
||||
*/
|
||||
-static void sighup()
|
||||
+static void sighup(int sig)
|
||||
{
|
||||
TAbort(EXIT_FAILURE);
|
||||
}
|
||||
diff --git a/src/zport.h b/src/zport.h
|
||||
index f842ae2..eeb5315 100644
|
||||
--- a/src/zport.h
|
||||
+++ b/src/zport.h
|
||||
@@ -192,7 +192,7 @@ just don't use prototypes in GNU C.
|
||||
#if defined(VAX11C) || defined(__TURBOC__) || defined(__POWERC) || defined(ULTRIX)
|
||||
#define USE_PROTOTYPES TRUE
|
||||
#else
|
||||
-#define USE_PROTOTYPES FALSE
|
||||
+#define USE_PROTOTYPES TRUE
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
@@ -533,7 +533,7 @@ EXTERN VVOID bcopy();
|
||||
|
||||
#elif defined(unix) || defined(AMIGA) || (defined(UNKNOWN) && !defined(__STDC__))
|
||||
|
||||
-EXTERN VVOID ZCpyBl();
|
||||
+EXTERN VVOID ZCpyBl(charptr dest, charptr source, SIZE_T len);
|
||||
#define MEMMOVE(dest,source,len) ZCpyBl((dest),(source),(len))
|
||||
|
||||
#elif defined(__TURBOC__) || defined(__POWERC)
|
||||
@@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-KTOGsTtxJh2sneU2VoDNUHcL3m8zt+3rBZTDvK1n02A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-gcc15.patch
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
makefile =
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- tla-1.3.5/src/build-tools/auto-conf-lib/gnu-patch-test 2006-07-20 08:34:28.000000000 +0200
|
||||
+++ tla-1.3.5/src/build-tools/auto-conf-lib/gnu-patch-test 2008-02-17 13:00:07.000000000 +0100
|
||||
@@ -27,7 +27,7 @@ else
|
||||
fi
|
||||
|
||||
CMP='cmp' # we require a working 'cmp' utility
|
||||
-TMPDIR="/tmp/,patch-test.$$"
|
||||
+TMPDIR="${TMPDIR:-/tmp}/,patch-test.$$"
|
||||
|
||||
ORIG_A="$TMPDIR/to-patch_a"
|
||||
ORIG_PRISTINE_A="$TMPDIR/to-patch_a.the-original"
|
||||
@@ -1,388 +0,0 @@
|
||||
diff --git a/src/hackerlab/machine/endian.sh b/src/hackerlab/machine/endian.sh
|
||||
index 2a1c562..92bc81e 100644
|
||||
--- a/src/hackerlab/machine/endian.sh
|
||||
+++ b/src/hackerlab/machine/endian.sh
|
||||
@@ -5,8 +5,9 @@
|
||||
CC="$1"
|
||||
|
||||
cat > endian-test.c << EOF
|
||||
-
|
||||
-main()
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+int main()
|
||||
{
|
||||
unsigned int x = 1;
|
||||
|
||||
diff --git a/src/hackerlab/tests/rx-posix-tests/test-dbug.c b/src/hackerlab/tests/rx-posix-tests/test-dbug.c
|
||||
index 4620c31..3b7d35c 100644
|
||||
--- a/src/hackerlab/tests/rx-posix-tests/test-dbug.c
|
||||
+++ b/src/hackerlab/tests/rx-posix-tests/test-dbug.c
|
||||
@@ -124,7 +124,7 @@ main (int argc, char * argv[])
|
||||
{
|
||||
subexps = 0;
|
||||
nsub = 1;
|
||||
- rx_analyze_rexp (&subexps, &nsub, exp);
|
||||
+ rx_analyze_rexp (&subexps, (size_t *)&nsub, exp);
|
||||
rx_print_rexp (1, 256, 0, exp);
|
||||
if (nfa)
|
||||
{
|
||||
diff --git a/src/hackerlab/vu/vu-pathcompress.c b/src/hackerlab/vu/vu-pathcompress.c
|
||||
index 711acbe..3ea10d5 100644
|
||||
--- a/src/hackerlab/vu/vu-pathcompress.c
|
||||
+++ b/src/hackerlab/vu/vu-pathcompress.c
|
||||
@@ -86,7 +86,7 @@ void pathcompress_free_closure(void * closure)
|
||||
vu_sys_free_closure(closure);
|
||||
}
|
||||
|
||||
-int pathcompress_access(int* errn, char* path, int mode, void* closure)
|
||||
+int pathcompress_access(int* errn, const char* path, int mode, void* closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -97,7 +97,7 @@ int pathcompress_access(int* errn, char* path, int mode, void* closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_chdir(int * errn, char * path, void * closure)
|
||||
+int pathcompress_chdir(int * errn, const char * path, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -108,7 +108,7 @@ int pathcompress_chdir(int * errn, char * path, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_chmod(int * errn, char * path, int mode, void * closure)
|
||||
+int pathcompress_chmod(int * errn, const char * path, int mode, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -119,7 +119,7 @@ int pathcompress_chmod(int * errn, char * path, int mode, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_chown(int * errn, char * path, int owner, int group, void * closure)
|
||||
+int pathcompress_chown(int * errn, const char * path, int owner, int group, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -130,7 +130,7 @@ int pathcompress_chown(int * errn, char * path, int owner, int group, void * clo
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_chroot(int * errn, char * path, void * closure)
|
||||
+int pathcompress_chroot(int * errn, const char * path, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -254,7 +254,7 @@ int pathcompress_getcwd(char* cwd, size_t size)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_link(int * errn, char * from, char * to, void * closure)
|
||||
+int pathcompress_link(int * errn, const char * from, const char * to, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_from[PATH_LEN]="";
|
||||
@@ -276,7 +276,7 @@ off_t pathcompress_lseek(int * errn, int fd, off_t offset, int whence, void * cl
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closure)
|
||||
+int pathcompress_lstat(int * errn, const char * path, struct stat * buf, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -293,7 +293,7 @@ int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closur
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_mkdir(int * errn, char * path, int mode, void * closure)
|
||||
+int pathcompress_mkdir(int * errn, const char * path, int mode, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char abspath[PATH_LEN]="";
|
||||
@@ -315,7 +315,7 @@ int pathcompress_mkdir(int * errn, char * path, int mode, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_open(int * errn, char * path, int flags, int mode, void * closure)
|
||||
+int pathcompress_open(int * errn, const char * path, int flags, int mode, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char* p;
|
||||
@@ -368,7 +368,7 @@ int pathcompress_open(int * errn, char * path, int flags, int mode, void * closu
|
||||
return 0;
|
||||
}
|
||||
|
||||
-int pathcompress_opendir(int * errn, DIR ** retv, char * path, void * closure)
|
||||
+int pathcompress_opendir(int * errn, DIR ** retv, const char * path, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -453,7 +453,7 @@ int pathcompress_readdir(int * errn, struct alloc_limits * limits, char ** file_
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void * closure)
|
||||
+int pathcompress_readlink(int * errn, const char * path, char * buf, int bufsize, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -467,7 +467,7 @@ int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_rename(int * errn, char * from, char * to, void * closure)
|
||||
+int pathcompress_rename(int * errn, const char * from, const char * to, void * closure)
|
||||
{
|
||||
struct stat stat;
|
||||
int err;
|
||||
@@ -502,7 +502,7 @@ int pathcompress_rename(int * errn, char * from, char * to, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_rmdir(int * errn, char * path, void * closure)
|
||||
+int pathcompress_rmdir(int * errn, const char * path, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char dirnames[PATH_LEN]="";
|
||||
@@ -517,7 +517,7 @@ int pathcompress_rmdir(int * errn, char * path, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure)
|
||||
+int pathcompress_stat(int * errn, const char * path, struct stat * buf, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -537,7 +537,7 @@ int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_symlink(int * errn, char * from, char * to, void * closure)
|
||||
+int pathcompress_symlink(int * errn, const char * from, const char * to, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_from[PATH_LEN]="";
|
||||
@@ -553,7 +553,7 @@ int pathcompress_symlink(int * errn, char * from, char * to, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_truncate(int * errn, char * path, off_t where, void * closure)
|
||||
+int pathcompress_truncate(int * errn, const char * path, off_t where, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -566,7 +566,7 @@ int pathcompress_truncate(int * errn, char * path, off_t where, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_unlink(int * errn, char * path, void * closure)
|
||||
+int pathcompress_unlink(int * errn, const char * path, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -578,7 +578,7 @@ int pathcompress_unlink(int * errn, char * path, void * closure)
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * closure)
|
||||
+int pathcompress_utime(int * errn, const char * path, struct utimbuf * times, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
char compressed_path[PATH_LEN]="";
|
||||
@@ -590,7 +590,7 @@ int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * c
|
||||
return rvl;
|
||||
}
|
||||
|
||||
-ssize_t pathcompress_write(int * errn, int fd, char * buf, size_t count, void * closure)
|
||||
+ssize_t pathcompress_write(int * errn, int fd, const char * buf, size_t count, void * closure)
|
||||
{
|
||||
int rvl;
|
||||
Dprintf("pathcompress_write(%d,%p,%d)", fd, buf, count);
|
||||
diff --git a/src/tla/libarch/changeset-report.c b/src/tla/libarch/changeset-report.c
|
||||
index d3539b3..1672c2f 100644
|
||||
--- a/src/tla/libarch/changeset-report.c
|
||||
+++ b/src/tla/libarch/changeset-report.c
|
||||
@@ -630,7 +630,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar *
|
||||
orig_path = file_name_in_vicinity(0, orig_dir, orig_part_path);
|
||||
mod_path = file_name_in_vicinity(0, mod_dir, id2 /*report->patched_regular_files[x][0]*/);
|
||||
|
||||
- arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (char **)opts);
|
||||
+ arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (const char **)opts);
|
||||
|
||||
rel_field_unref(key);
|
||||
lim_free(0, mod_path);
|
||||
@@ -650,7 +650,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar *
|
||||
{
|
||||
t_uchar *id = str_save(0, rel_peek_str(report->added_files, x, 2));
|
||||
t_uchar *id2 = str_save(0, rel_peek_str(report->added_files, x, 0));
|
||||
- arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (char**)opts);
|
||||
+ arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (const char**)opts);
|
||||
lim_free(0, id);
|
||||
lim_free(0, id2);
|
||||
}
|
||||
@@ -680,7 +680,7 @@ print_removed_file_diffs (int out_fd, struct arch_changeset_report * report, t_u
|
||||
{
|
||||
t_uchar *id = str_save(0, rel_peek_str(report->removed_files, x, 2));
|
||||
t_uchar *id2 = str_save(0, rel_peek_str(report->removed_files, x, 0));
|
||||
- arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (char**)opts);
|
||||
+ arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (const char**)opts);
|
||||
lim_free(0, id);
|
||||
lim_free(0, id2);
|
||||
}
|
||||
diff --git a/src/tla/libarch/cmd-apply-delta.c b/src/tla/libarch/cmd-apply-delta.c
|
||||
index 8aebd8b..5a8615e 100644
|
||||
--- a/src/tla/libarch/cmd-apply-delta.c
|
||||
+++ b/src/tla/libarch/cmd-apply-delta.c
|
||||
@@ -31,6 +31,8 @@
|
||||
#include "tla/libarch/cmd-get.h"
|
||||
#include "tla/libarch/cmd-delta.h"
|
||||
#include "tla/libarch/cmd-apply-delta.h"
|
||||
+#include "tla/libarch/cmdutils.h"
|
||||
+#include "tla/libarch/star-merge.h"
|
||||
|
||||
|
||||
/* __STDC__ prototypes for static functions */
|
||||
diff --git a/src/tla/libarch/cmd-branch.c b/src/tla/libarch/cmd-branch.c
|
||||
index 6308fef..d63c75c 100644
|
||||
--- a/src/tla/libarch/cmd-branch.c
|
||||
+++ b/src/tla/libarch/cmd-branch.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "tla/libarch/cmd-switch.h"
|
||||
#include "tla/libarch/cmdutils.h"
|
||||
#include "tla/libarch/archive-setup.h"
|
||||
+#include "tla/libarch/cmd.h"
|
||||
|
||||
|
||||
|
||||
diff --git a/src/tla/libarch/cmd-diff.c b/src/tla/libarch/cmd-diff.c
|
||||
index 98dbe19..4b678b0 100644
|
||||
--- a/src/tla/libarch/cmd-diff.c
|
||||
+++ b/src/tla/libarch/cmd-diff.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "tla/libarch/cmd-diff.h"
|
||||
#include "tla/libarch/cmd-versions.h"
|
||||
#include "tla/libarch/invent.h"
|
||||
+#include "tla/libarch/make-changeset-files.h"
|
||||
|
||||
|
||||
/* gettext support not yet incorporated into tla, reserve the gettext notation for later */
|
||||
@@ -38,7 +39,7 @@
|
||||
|
||||
|
||||
/* __STDC__ prototypes for static functions */
|
||||
-static void make_changeset_callback (void * ign, char * fmt, va_list ap);
|
||||
+static void make_changeset_callback (void * ign, const char * fmt, va_list ap);
|
||||
|
||||
|
||||
|
||||
@@ -527,7 +528,7 @@ arch_cmd_diff (t_uchar * program_name, int argc, char * argv[])
|
||||
|
||||
|
||||
static void
|
||||
-make_changeset_callback (void * ign, char * fmt, va_list ap)
|
||||
+make_changeset_callback (void * ign, const char * fmt, va_list ap)
|
||||
{
|
||||
safe_printfmt_va_list (1, fmt, ap);
|
||||
safe_flush (1);
|
||||
diff --git a/src/tla/libarch/cmd-export.c b/src/tla/libarch/cmd-export.c
|
||||
index bfed694..24e5d6a 100644
|
||||
--- a/src/tla/libarch/cmd-export.c
|
||||
+++ b/src/tla/libarch/cmd-export.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "tla/libarch/cmd.h"
|
||||
#include "tla/libarch/cmdutils.h"
|
||||
#include "tla/libarch/cmd-export.h"
|
||||
+#include "tla/libarch/chatter.h"
|
||||
|
||||
|
||||
|
||||
diff --git a/src/tla/libarch/cmdutils.c b/src/tla/libarch/cmdutils.c
|
||||
index 3aafd13..195d636 100644
|
||||
--- a/src/tla/libarch/cmdutils.c
|
||||
+++ b/src/tla/libarch/cmdutils.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "tla/libarch/patch-logs.h"
|
||||
#include "tla/libarch/pfs.h"
|
||||
#include "tla/libfsutils/dir-as-cwd.h"
|
||||
+#include "tla/libarch/local-cache.h"
|
||||
|
||||
|
||||
/* __STDC__ prototypes for static functions */
|
||||
diff --git a/src/tla/libarch/diffs.c b/src/tla/libarch/diffs.c
|
||||
index dcae932..5f935ae 100644
|
||||
--- a/src/tla/libarch/diffs.c
|
||||
+++ b/src/tla/libarch/diffs.c
|
||||
@@ -230,7 +230,7 @@ arch_really_invoke_diff (int output_fd,
|
||||
if (extraopts != NULL)
|
||||
{
|
||||
t_uchar ** opt;
|
||||
- for (opt = extraopts; *opt != NULL; ++opt)
|
||||
+ for (opt = (t_uchar**)extraopts; *opt != NULL; ++opt)
|
||||
{
|
||||
*(t_uchar **) ar_push ((void*) &argv, 0, sizeof(t_uchar*)) = *opt;
|
||||
|
||||
diff --git a/src/tla/libarch/invent.c b/src/tla/libarch/invent.c
|
||||
index 077d776..defd2da 100644
|
||||
--- a/src/tla/libarch/invent.c
|
||||
+++ b/src/tla/libarch/invent.c
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "tla/libarch/inode-sig.h"
|
||||
#include "tla/libarch/inv-ids.h"
|
||||
#include "tla/libarch/invent.h"
|
||||
+#include "cmdutils.h"
|
||||
|
||||
|
||||
|
||||
diff --git a/src/tla/libarch/local-cache.c b/src/tla/libarch/local-cache.c
|
||||
index 0cade1b..945cd8b 100644
|
||||
--- a/src/tla/libarch/local-cache.c
|
||||
+++ b/src/tla/libarch/local-cache.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "tla/libarch/library-txn.h"
|
||||
#include "tla/libarch/local-cache.h"
|
||||
#include "tla/libarch/namespace.h"
|
||||
+#include "project-tree.h"
|
||||
|
||||
|
||||
|
||||
diff --git a/src/tla/libarch/pfs-ftp.c b/src/tla/libarch/pfs-ftp.c
|
||||
index 546c702..c457837 100644
|
||||
--- a/src/tla/libarch/pfs-ftp.c
|
||||
+++ b/src/tla/libarch/pfs-ftp.c
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
+#include <ctype.h>
|
||||
#include "config-options.h"
|
||||
#include "hackerlab/bugs/panic.h"
|
||||
#include "hackerlab/os/errno-to-string.h"
|
||||
diff --git a/src/tla/libarch/undo.c b/src/tla/libarch/undo.c
|
||||
index abc40e9..dc8e6ed 100644
|
||||
--- a/src/tla/libarch/undo.c
|
||||
+++ b/src/tla/libarch/undo.c
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "tla/libarch/apply-changeset.h"
|
||||
#include "tla/libarch/chatter.h"
|
||||
#include "tla/libarch/undo.h"
|
||||
+#include "tla/libarch/make-changeset-files.h"
|
||||
|
||||
|
||||
/* __STDC__ prototypes for static functions */
|
||||
diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c
|
||||
index 164acdb..1188627 100644
|
||||
--- a/src/tla/libfsutils/tmp-files.c
|
||||
+++ b/src/tla/libfsutils/tmp-files.c
|
||||
@@ -18,6 +18,8 @@
|
||||
#include "hackerlab/fs/file-names.h"
|
||||
#include "hackerlab/vu/safe.h"
|
||||
#include "tla/libfsutils/tmp-files.h"
|
||||
+#include "hackerlab/fs/tmp-files.h"
|
||||
+#include "tla/libarch/cmdutils.h"
|
||||
|
||||
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
which,
|
||||
diffutils,
|
||||
gnupatch,
|
||||
gnutar,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tla";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./configure-tmpdir.patch
|
||||
./fix-gcc14.patch
|
||||
];
|
||||
|
||||
buildInputs = [ which ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
diffutils
|
||||
gnupatch
|
||||
gnutar
|
||||
];
|
||||
|
||||
# Instead of GNU Autoconf, tla uses Tom Lord's now
|
||||
# defunct `package-framework'.
|
||||
buildPhase = ''
|
||||
mkdir +build && cd +build && \
|
||||
../src/configure --prefix="$out" && \
|
||||
make install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GNU Arch (aka. `tla'), a distributed revision control system";
|
||||
mainProgram = "tla";
|
||||
homepage = "https://www.gnu.org/software/gnu-arch/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
})
|
||||
@@ -9,53 +9,58 @@
|
||||
pkg-config,
|
||||
glib,
|
||||
perl,
|
||||
python3Packages,
|
||||
ncurses5,
|
||||
hamlib,
|
||||
xmlrpc_c,
|
||||
pythonPluginSupport ? true,
|
||||
python3,
|
||||
cmocka,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tlf";
|
||||
version = "1.4.1";
|
||||
version = "1.4.1-unstable-2026-03-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlf";
|
||||
owner = "Tlf";
|
||||
repo = "tlf";
|
||||
rev = "tlf-${finalAttrs.version}";
|
||||
sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj";
|
||||
rev = "e6385f88ad793043d874b89d56d29bea5dac4e26";
|
||||
hash = "sha256-XYj0vUqxnc6SuH+fV0EWgVBV3W1W2yhMCK/zcEWrMQ4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for ncurses-6.3:
|
||||
# https://github.com/Tlf/tlf/pull/282
|
||||
# We use Debian's patch as upstream fixes don't apply as is due to
|
||||
# related code changes. The change will be a part of 1.4.2 release.
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://salsa.debian.org/debian-hamradio-team/tlf/-/raw/5a2d79fc35bde97f653b1373fd970d41fe01a3ec/debian/patches/warnings-as-errors.patch?inline=false";
|
||||
sha256 = "1zi1dd4vqkgl2pg29lnhj91ralqg58gmkzq9fkcx0dyakbjm6070";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
autoconf
|
||||
automake
|
||||
pkg-config
|
||||
perl
|
||||
python3Packages.pexpect
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
ncurses5
|
||||
hamlib
|
||||
xmlrpc_c
|
||||
]
|
||||
++ lib.optionals pythonPluginSupport [
|
||||
python3
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-hamlib"
|
||||
"--enable-fldigi-xmlrpc"
|
||||
]
|
||||
++ lib.optionals pythonPluginSupport [
|
||||
"--enable-python-plugin"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
cmocka
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
diff --git a/vowpalwabbit/config/include/vw/config/option.h b/vowpalwabbit/config/include/vw/config/option.h
|
||||
index fa584b15..97d7d92f 100644
|
||||
--- a/vowpalwabbit/config/include/vw/config/option.h
|
||||
+++ b/vowpalwabbit/config/include/vw/config/option.h
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "vw/common/vw_exception.h"
|
||||
#include "vw/common/vw_throw.h"
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
diff --git a/vowpalwabbit/core/include/vw/core/feature_group.h b/vowpalwabbit/core/include/vw/core/feature_group.h
|
||||
index 569c54ca..6e390565 100644
|
||||
--- a/vowpalwabbit/core/include/vw/core/feature_group.h
|
||||
+++ b/vowpalwabbit/core/include/vw/core/feature_group.h
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <iterator>
|
||||
#include <memory>
|
||||
#include <numeric>
|
||||
diff --git a/vowpalwabbit/io/include/vw/io/io_adapter.h b/vowpalwabbit/io/include/vw/io/io_adapter.h
|
||||
index f5131085..9c57a449 100644
|
||||
--- a/vowpalwabbit/io/include/vw/io/io_adapter.h
|
||||
+++ b/vowpalwabbit/io/include/vw/io/io_adapter.h
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@@ -5,6 +5,8 @@
|
||||
cmake,
|
||||
boost,
|
||||
eigen,
|
||||
gtest,
|
||||
help2man,
|
||||
rapidjson,
|
||||
spdlog,
|
||||
zlib,
|
||||
@@ -12,25 +14,31 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vowpal-wabbit";
|
||||
version = "9.10.0";
|
||||
version = "9.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VowpalWabbit";
|
||||
repo = "vowpal_wabbit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HKxhEB4ph2tOWgvYngYTcv0OCMISj3KqZpP2zsEUPs0=";
|
||||
hash = "sha256-A1Eqj843QidqVlADi6qEKFuw+T0h1FxkRwJ9oRTZgeU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/VowpalWabbit/vowpal_wabbit/pull/4916
|
||||
./add-missing-includes.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "set(VW_CXX_STANDARD 11)" "set(VW_CXX_STANDARD 14)"
|
||||
# Avoid duplicate add RapidJSON
|
||||
substituteInPlace ext_libs/ext_libs.cmake \
|
||||
--replace-fail "add_library(RapidJSON INTERFACE)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
help2man
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
@@ -41,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_LATEST_STD=ON"
|
||||
"-DVW_INSTALL=ON"
|
||||
"-DBUILD_JAVA=OFF"
|
||||
"-DBUILD_PYTHON=OFF"
|
||||
@@ -49,8 +58,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DSPDLOG_SYS_DEP=ON"
|
||||
"-DVW_BOOST_MATH_SYS_DEP=ON"
|
||||
"-DVW_EIGEN_SYS_DEP=ON"
|
||||
"-DVW_GTEST_SYS_DEP=ON"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_CTEST_ARGUMENTS=-E;SpanningTreeTest"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Machine learning system focused on online reinforcement learning";
|
||||
homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wimboot";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipxe";
|
||||
repo = "wimboot";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-JqdOgcwOXIJDl8O7k/pHdd4MNC/rJ0fWTowtEVpJyx8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eS+Vcrwxws8p5j+U3Hg0G2psYYgPR1XP7QXyPelpxyg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
@@ -27,11 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
makeFlags = [ "wimboot.x86_64.efi" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/wimboot/
|
||||
cp wimboot.x86_64.efi $out/share/wimboot
|
||||
|
||||
@@ -31,23 +31,17 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wml";
|
||||
version = "2.32.0";
|
||||
version = "2.32.0-unstable-2025-12-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thewml";
|
||||
repo = "website-meta-language";
|
||||
tag = "releases/wml-${finalAttrs.version}";
|
||||
hash = "sha256-9ZiMGm0W2qS/7nL8NsmGBsuB5sNJvWuJaxE7CTdWo6s=";
|
||||
rev = "de200ecef0b2a64553799b1d83dfa65580d0bc16";
|
||||
hash = "sha256-okeDaCX4Pp5qVFfHmaz+keagX6vgzFTtGoiim/pW6IA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
# https://github.com/thewml/website-meta-language/commit/727806494dcb9d334ffb324aedbf6076e4796299
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'CMAKE_MINIMUM_REQUIRED(VERSION 3.0)' 'CMAKE_MINIMUM_REQUIRED(VERSION 3.15)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lynx
|
||||
@@ -77,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Offline HTML preprocessor";
|
||||
homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/";
|
||||
downloadPage = "https://github.com/thewml/website-meta-language/releases";
|
||||
changelog = "https://github.com/thewml/website-meta-language/blob/${finalAttrs.src.tag}/src/ChangeLog";
|
||||
changelog = "https://github.com/thewml/website-meta-language/blob/${finalAttrs.src.rev}/src/ChangeLog";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ prince213 ];
|
||||
mainProgram = "wml";
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zerofs";
|
||||
version = "1.0.8";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Barre";
|
||||
repo = "ZeroFS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iMLms2UY4Ko2JMgkYEF8SlES4wYSWBiRQtKXUzi9iiQ=";
|
||||
hash = "sha256-XTug8FytzAL1L9wNPlyKQBx/LnszLCFCfW9U5S0tark=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/zerofs";
|
||||
|
||||
cargoHash = "sha256-9rR3Za3pnlh/t/5tBbIbhwSGvPpQ9VA4Z0vG7HNIPu8=";
|
||||
cargoHash = "sha256-X2Sd1N4BLRhbInownKsXXvZX39gtBy3CaKbW+xRx5UE=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiousbwatcher";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "aiousbwatcher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-M9MUaB3oHELHdtgaWri9nILnVQpF2FJvHrL68jXeOqg=";
|
||||
hash = "sha256-kCuY4+pdfnO8BuYSQjZEyGxSaCwVYXRHWYhnbzxlDzM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "apify-fingerprint-datapoints";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "apify_fingerprint_datapoints";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-p0jWzyzuhT8CdkIeZh05jPcl5/RToagijhGjso2x2CU=";
|
||||
hash = "sha256-JjFBwZ6byQqCHmtOK4RZJfF+C4+9U6iX/HFUa9UN9/E=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncinotify";
|
||||
version = "4.4.0";
|
||||
version = "4.4.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "absperf";
|
||||
repo = "asyncinotify";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-u83k/Wu6WA6lZxLpdPpp6Hi6gmJIgXAXh7q8OJvW2vk=";
|
||||
hash = "sha256-NncqHS6JK9OYv/155PXYi0Sg4oX7p0WAGZ9wnvoYlgE=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
sanic-testing,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cloudevents";
|
||||
version = "1.12.0";
|
||||
pyproject = true;
|
||||
@@ -20,17 +20,13 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudevents";
|
||||
repo = "sdk-python";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0WdCBwYz3XJWjUP0gf+IWdF4ZgPHFvUZFoQp9taqNz8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
deprecation
|
||||
];
|
||||
dependencies = [ deprecation ];
|
||||
|
||||
pythonImportsCheck = [ "cloudevents" ];
|
||||
|
||||
@@ -50,8 +46,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python SDK for CloudEvents";
|
||||
homepage = "https://github.com/cloudevents/sdk-python";
|
||||
changelog = "https://github.com/cloudevents/sdk-python/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/cloudevents/sdk-python/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.3.24";
|
||||
version = "0.3.25";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-MIjqkn6oYYQWp6AezsXG0GGURCVavOJYzBpqJNPSEyo=";
|
||||
hash = "sha256-DvPJICj9toecYaU4mCkvOuYrXGsNFvpm5NKZ1uQfqLU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pylitterbot";
|
||||
version = "2025.3.2";
|
||||
version = "2025.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natekspencer";
|
||||
repo = "pylitterbot";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bFJ6v27yfzMPqZijWCOlgdVS19IKIMqZcq2FjAyMnqo=";
|
||||
hash = "sha256-k10QYIdV8EFGR/366IZ6OaXbK+kEcaz3Awdwu116zHA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvista";
|
||||
version = "0.47.3";
|
||||
version = "0.48.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyvista";
|
||||
repo = "pyvista";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-r2kBAHKaRmcTchF8/5mGz6OYJ0wNLN+e+aitxWvGbXM=";
|
||||
hash = "sha256-mdqngUVcZFB15FdzkVv38X4gz46hyORuJda2k0Dw30w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rctclient";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svalouch";
|
||||
repo = "python-rctclient";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-f85ETzuZpOgnWpiLipLtAjOPn63yniCffWdPLyCEC3w=";
|
||||
hash = "sha256-r8PUzAtFT8L7RteKpfnacmeIbG15brO8G6cPcvIo178=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -30,6 +30,9 @@ buildPythonPackage rec {
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
# https://github.com/bmcage/odes/pull/204
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
meta = scikits-odes-core.meta // {
|
||||
description = "Wrapper around daepack";
|
||||
homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes-daepack";
|
||||
|
||||
@@ -17,6 +17,19 @@ buildPythonPackage rec {
|
||||
|
||||
sourceRoot = "${src.name}/packages/scikits-odes";
|
||||
|
||||
patches = [
|
||||
# https://github.com/bmcage/odes/pull/205
|
||||
./numpy24-compat.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# scipy 1.17.x's rewritten VODE integrator have bugs such as:
|
||||
# https://github.com/scipy/scipy/issues/24933
|
||||
# revisit after new scipy release
|
||||
substituteInPlace src/scikits/odes/tests/test_dae.py \
|
||||
--replace-fail "StiffVODECompare," ""
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
diff --git a/src/scikits/odes/tests/test_user_return_vals_cvode.py b/src/scikits/odes/tests/test_user_return_vals_cvode.py
|
||||
index 58fae63..8866fe3 100644
|
||||
--- a/src/scikits/odes/tests/test_user_return_vals_cvode.py
|
||||
+++ b/src/scikits/odes/tests/test_user_return_vals_cvode.py
|
||||
@@ -8,7 +8,7 @@ def normal_rhs(t, y, ydot):
|
||||
ydot[0] = t
|
||||
|
||||
def complex_rhs(t, y, ydot):
|
||||
- ydot[0] = t - y
|
||||
+ ydot[0] = t - y[0]
|
||||
|
||||
def rhs_with_return(t, y, ydot):
|
||||
ydot[0] = t
|
||||
diff --git a/src/scikits/odes/tests/test_user_return_vals_ida.py b/src/scikits/odes/tests/test_user_return_vals_ida.py
|
||||
index 0c38035..4ae4e70 100644
|
||||
--- a/src/scikits/odes/tests/test_user_return_vals_ida.py
|
||||
+++ b/src/scikits/odes/tests/test_user_return_vals_ida.py
|
||||
@@ -5,17 +5,17 @@ from .. import dae
|
||||
from ..sundials.ida import StatusEnumIDA
|
||||
|
||||
def normal_rhs(t, y, ydot, res):
|
||||
- res[0] = ydot - t
|
||||
+ res[0] = ydot[0] - t
|
||||
|
||||
def complex_rhs(t, y, ydot, res):
|
||||
- res[0] = ydot - t + y
|
||||
+ res[0] = ydot[0] - t + y[0]
|
||||
|
||||
def rhs_with_return(t, y, ydot, res):
|
||||
- res[0] = ydot - t
|
||||
+ res[0] = ydot[0] - t
|
||||
return 0
|
||||
|
||||
def rhs_problem_late(t, y, ydot, res):
|
||||
- res[0] = ydot - t
|
||||
+ res[0] = ydot[0] - t
|
||||
if t > 0.5:
|
||||
return 1
|
||||
|
||||
@@ -23,7 +23,7 @@ def rhs_problem_immediate(t, y, ydot, res):
|
||||
return 1
|
||||
|
||||
def rhs_error_late(t, y, ydot, res):
|
||||
- res[0] = ydot - t
|
||||
+ res[0] = ydot[0] - t
|
||||
if t > 0.5:
|
||||
return -1
|
||||
|
||||
@@ -27,14 +27,15 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "uproot";
|
||||
version = "5.7.3";
|
||||
version = "5.7.4";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "uproot5";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-16+AIHjGN/XbpyXLYATLzzBxl7kN9/XNyV5uz4LIZ2k=";
|
||||
hash = "sha256-OUvU54mgQl8SjgxwGHXr5/w+X9hbTL3vzflsP7UlxlA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -72,5 +72,6 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/waymo-research/waymax";
|
||||
changelog = "https://github.com/waymo-research/waymax/blob/main/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [ samuela ];
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/threerings/openvpn-auth-ldap/pull/92.patch";
|
||||
hash = "sha256-SXuo1D/WywKO5hCsmoeDdTsR7EelxFxJAKmlAQJ6vuE=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "gcc-15-fix";
|
||||
url = "https://sources.debian.org/data/main/o/openvpn-auth-ldap/2.0.4-5/debian/patches/gcc-15.patch";
|
||||
hash = "sha256-VwUwRBBfxgxEO4PKC/97vEN4e6XcUG6esc0Khu+iDxM=";
|
||||
})
|
||||
];
|
||||
|
||||
# clang > 17 dropped support for `-export-dynamic` but `-rdynamic` does the
|
||||
|
||||
@@ -2049,6 +2049,7 @@ mapAliases {
|
||||
tkcvs = throw "'tkcvs' has been renamed to/replaced by 'tkrev'"; # Converted to throw 2025-10-27
|
||||
tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
|
||||
tkimg = throw "'tkimg' has been renamed to/replaced by 'tclPackages.tkimg'"; # Converted to throw 2025-10-27
|
||||
tla = throw "'tla' has been removed as it is broken and unmaintained. Please use 'breezy' instead"; # Added 2026-04-23
|
||||
tlaplusToolbox = tlaplus-toolbox; # Added 2025-08-21
|
||||
tokyo-night-gtk = throw "'tokyo-night-gtk' has been renamed to/replaced by 'tokyonight-gtk-theme'"; # Converted to throw 2025-10-27
|
||||
tomcat_connectors = throw "'tomcat_connectors' has been renamed to/replaced by 'apacheHttpdPackages.mod_jk'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user