Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jjk";
|
||||
publisher = "jjk";
|
||||
version = "0.8.1";
|
||||
hash = "sha256-2JUn6wkWgZKZzhitQy6v9R/rCNLrt7DBtt59707hp6c=";
|
||||
version = "0.8.2";
|
||||
hash = "sha256-6Fb6HP0vGxuskg+mox4sKutX0nEX4PSmgF49cuJ5vtI=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/keanemind/jjk/releases";
|
||||
|
||||
@@ -30,17 +30,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deno";
|
||||
version = "2.6.8";
|
||||
version = "2.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true; # required for tests
|
||||
hash = "sha256-RBrBtkDd8lgrnRmFkRwF86xuUr2zTDHUrcNVh5P6gCc=";
|
||||
hash = "sha256-FSm3X+1cTQURF9V/cCYvjJmPx9udcE/s5J6oRhcDWWU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6UTRvrQzuEvrHxleTEEpoTwgDWDG79+9Txjo0SLL3Ns=";
|
||||
cargoHash = "sha256-DgotLiq4xzVH8dhOUA4Fxg0NW0DRnHVCJlxQYVQDaeE=";
|
||||
|
||||
patches = [
|
||||
./patches/0002-tests-replace-hardcoded-paths.patch
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "docfd";
|
||||
version = "12.2.0";
|
||||
version = "12.3.0";
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
@@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec {
|
||||
owner = "darrenldl";
|
||||
repo = "docfd";
|
||||
rev = version;
|
||||
hash = "sha256-0URs7X94/2D0WLpVBXjYZ3zDR3uGXSVG+WLdsAqVKBg=";
|
||||
hash = "sha256-PEeZcSlXkWLo0hZHOsmuvcQoxeAXxqNfTR9sUJQG40g=";
|
||||
};
|
||||
|
||||
# Compatibility with nottui ≥ 0.4
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "faugus-launcher";
|
||||
version = "1.14.1";
|
||||
version = "1.14.3";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Faugus";
|
||||
repo = "faugus-launcher";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1qVHis8Cm8v9+1UyVFyWrSBQsIK0qjEW6Bu61ZJfWbM=";
|
||||
hash = "sha256-etPG5142YMWyHhn2wd/t4fPSW2oonp8qoY7aPAim/LI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashprog";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://review.sourcearcade.org/flashprog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mpSmPZ306DedRi3Dcck/cDqoumgwFYpljiJtma+LZz4=";
|
||||
hash = "sha256-laU2S7SPFCso/HzPSpbEM6hAE5/XYkNoBqFTT4PU8TU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
felixsinger
|
||||
funkeleinhorn
|
||||
jmbaur
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "flashprog";
|
||||
|
||||
@@ -1,51 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
nodejs,
|
||||
makeBinaryWrapper,
|
||||
autoPatchelfHook,
|
||||
fetchurl,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
sources = lib.importJSON ./sources.json;
|
||||
srcConfig =
|
||||
sources.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "github-copilot-cli";
|
||||
version = "0.0.406";
|
||||
inherit (sources) version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-APjQW8YDoIO+Q2D5SkH0KI4u+w5mAF3VfEk/Yda2/54=";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/github/copilot-cli/releases/download/v${finalAttrs.version}/${srcConfig.name}.tar.gz";
|
||||
inherit (srcConfig) hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ];
|
||||
sourceRoot = ".";
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/node_modules/@github/copilot
|
||||
cp -r . $out/lib/node_modules/@github/copilot
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeBinaryWrapper ${nodejs}/bin/node $out/bin/copilot \
|
||||
--add-flags "$out/lib/node_modules/@github/copilot/index.js"
|
||||
|
||||
install -Dm755 copilot $out/bin/copilot
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal";
|
||||
homepage = "https://github.com/github/copilot-cli";
|
||||
changelog = "https://github.com/github/copilot-cli/releases/tag/v${finalAttrs.version}";
|
||||
downloadPage = "https://www.npmjs.com/package/@github/copilot";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
dbreyfogle
|
||||
];
|
||||
mainProgram = "copilot";
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"version": "0.0.410",
|
||||
"x86_64-linux": {
|
||||
"name": "copilot-linux-x64",
|
||||
"hash": "sha256-JSO6ksh9jSzdgfnw+ZVHlLwWm8QqlJafu4f8fp9GGwk="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"name": "copilot-linux-arm64",
|
||||
"hash": "sha256-d9NGwnW059FLaDolYM01RciolbXacwc354lbJr2JOdo="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"name": "copilot-darwin-x64",
|
||||
"hash": "sha256-mm3wQZgIJfx9TywWkqC1FLpxyaE/GO8FP2ev109Pk4o="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"name": "copilot-darwin-arm64",
|
||||
"hash": "sha256-gbsjC8hIzk1kBJq9STxemKOM4b423LNfdyI6/eIuhf4="
|
||||
}
|
||||
}
|
||||
Executable
+46
@@ -0,0 +1,46 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
SOURCES_FILE="$ROOT/sources.json"
|
||||
|
||||
LATEST_TAG=$(curl -s https://api.github.com/repos/github/copilot-cli/releases/latest | jq -r .tag_name)
|
||||
|
||||
if [ -z "$LATEST_TAG" ] || [ "$LATEST_TAG" = "null" ]; then
|
||||
echo "Failed to fetch latest release from GitHub API"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION="${LATEST_TAG#v}"
|
||||
|
||||
echo "Updating to version $VERSION"
|
||||
|
||||
# Create a temporary file for the JSON content
|
||||
TMP_FILE=$(mktemp)
|
||||
|
||||
jq -n --arg v "$VERSION" '{version: $v}' > "$TMP_FILE"
|
||||
|
||||
process_platform() {
|
||||
local system="$1"
|
||||
local name="$2"
|
||||
local url="https://github.com/github/copilot-cli/releases/download/v${VERSION}/${name}.tar.gz"
|
||||
|
||||
echo "Processing $system..."
|
||||
|
||||
hash=$(nix-prefetch-url --type sha256 "$url")
|
||||
sri_hash=$(nix hash convert --to sri --hash-algo sha256 "$hash")
|
||||
|
||||
jq --arg sys "$system" --arg n "$name" --arg h "$sri_hash" '. + {($sys): {name: $n, hash: $h}}' \
|
||||
"$TMP_FILE" > "${TMP_FILE}.tmp" && mv "${TMP_FILE}.tmp" "$TMP_FILE"
|
||||
}
|
||||
|
||||
process_platform "x86_64-linux" "copilot-linux-x64"
|
||||
process_platform "aarch64-linux" "copilot-linux-arm64"
|
||||
process_platform "x86_64-darwin" "copilot-darwin-x64"
|
||||
process_platform "aarch64-darwin" "copilot-darwin-arm64"
|
||||
|
||||
mv "$TMP_FILE" "$SOURCES_FILE"
|
||||
|
||||
echo "Updated sources.json successfully."
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "heynote";
|
||||
version = "2.8.0";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
|
||||
sha256 = "sha256-XZMG7MDNcJqO//PvACczL+ydy729rh860KmtONhrUQE=";
|
||||
sha256 = "sha256-bK79Au/0UoDvgzFPp/xx7ABtGf3vzWzU1XKuOEOKPTI=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -78,7 +78,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "8054";
|
||||
version = "8069";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-gzW/XOfx3dvCb2g1b93CcPNkqtw7VOEAYffd0WRy/6o=";
|
||||
hash = "sha256-/hfczIFTW+VyCCs7oM2a6VmPh24wiZ8P3fQZTfd9jA8=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
ocl-icd,
|
||||
opencl-headers,
|
||||
stdenv,
|
||||
makeBinaryWrapper,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mfakto";
|
||||
version = "0.16.0-beta.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "primesearch";
|
||||
repo = "mfakto";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aQWFvdCWrab8Bz4lRWtdp2pS2Rswi5MS/1Ka5n/iJTU=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ocl-icd
|
||||
opencl-headers
|
||||
];
|
||||
|
||||
# Patch the hardcoded kernel path
|
||||
# Inject opencl-headers for GPU compilation
|
||||
postPatch = ''
|
||||
substituteInPlace src/mfakto.h \
|
||||
--replace-fail '"mfakto_Kernels.cl"' '"'$out'/share/mfakto/mfakto_Kernels.cl"'
|
||||
sed -i "/clBuildProgram/i \ strcat(program_options, \" -I $out/share/mfakto\");" src/mfakto.cpp
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"-C"
|
||||
"src"
|
||||
# Override needed for aarch64 support
|
||||
"CC=${stdenv.cc.targetPrefix}gcc"
|
||||
"CPP=${stdenv.cc.targetPrefix}g++"
|
||||
"LD=${stdenv.cc.targetPrefix}g++"
|
||||
"SHELL=${runtimeShell}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 mfakto $out/bin/mfakto
|
||||
install -Dm644 mfakto.ini -t $out/share/mfakto
|
||||
|
||||
install -Dm444 *.cl $out/share/mfakto
|
||||
install -Dm444 *.h $out/share/mfakto
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Trial Factoring program using OpenCL for GIMPS";
|
||||
longDescription = ''
|
||||
mfakto is an OpenCL port of mfaktc that aims to have the same features and
|
||||
functions. mfaktc is a program that trial factors Mersenne numbers. It stands
|
||||
for "Mersenne faktorisation* with CUDA" and was written for Nvidia GPUs. Both
|
||||
programs are used primarily in the Great Internet Mersenne Prime Search. mfakto
|
||||
can also run on CPUs, although this is not done in practice.
|
||||
'';
|
||||
homepage = "https://github.com/primesearch/mfakto";
|
||||
maintainers = with lib.maintainers; [ dstremur ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "mfakto";
|
||||
};
|
||||
})
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mongodb-ce";
|
||||
version = "8.2.3";
|
||||
version = "8.2.5";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
|
||||
@@ -53,19 +53,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-NjPVLSqm5CPaG9/yOL7wEWW2rwFYcgCqwIZNk/ObYI8=";
|
||||
hash = "sha256-WGLUaJcWx+p4BhYG7h4lH+4o46Lbq6vy0X3UOrB76gw=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-oVgHrXLjbc7XBrBr8QtChGfyfs+hCot4Dt9I/Qf9X3E=";
|
||||
hash = "sha256-pofBBh1An3XzqqLnKNMdmegFa/TPGARav9SPM00BUCE=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-2jjP+vPAct+dcAn6RQLKrDyAsKQxj4kL+3XlDXfT1cQ=";
|
||||
hash = "sha256-pEg5rnQ2tyneA+KCaE+V7LnO7wv33pyyPFPYl9beuDo=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-qUVQIeot2NO0ddrEW5jElu6HVyqiwTbR1S6KM2LJwV8=";
|
||||
hash = "sha256-jdbqCAPstVpjQynkRvKWLXP3j8U3yyvfjBNPN7QGkMU=";
|
||||
};
|
||||
};
|
||||
updateScript =
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ntpd-rs";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pendulum-project";
|
||||
repo = "ntpd-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U6kuE5LdaKlpI48Jhwp5nrE3MSd8ISASufaO8Loz+ok=";
|
||||
hash = "sha256-gOt2X/tqtFrmxkTO/8UFwmyX0vPKHsTu+qe5AfqDtMk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eZ0wmi6StTAeuowJoDCNvr9oIHj8WFhC2ytR3ZosMIo=";
|
||||
cargoHash = "sha256-DXAy/K70sNhVOjDOd6G/juE7JgmewPzGHZDeXAOZ1+s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pandoc
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ruffle";
|
||||
version = "0.2.0-nightly-2026-02-09";
|
||||
version = "0.2.0-nightly-2026-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ruffle-rs";
|
||||
repo = "ruffle";
|
||||
tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
|
||||
hash = "sha256-SvrcnMwv2FAYK+cu67ZuZwVxe48jor1+dxBnciK+OZE=";
|
||||
hash = "sha256-+q+v8ZIuI1hXbOoC39/AtsjXhh83X2ygtRRM2wtPrWo=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"OpenH264Version(${major}, ${minor}, ${patch})"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-Olg8Z2HxfGAuhgHNN7QiFs28pTcqpOnflXeAqerIL+I=";
|
||||
cargoHash = "sha256-DIlFPOMu7XwWtmJGPmF9Gi8jm7YJStOYirCDowo4Mqk=";
|
||||
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
|
||||
|
||||
env =
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
python.pkgs.toPythonModule (
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2026-02-06";
|
||||
version = "0-unstable-2026-02-16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "b5bb27f231e5f24b3985cd7cbd3f371486c21a11";
|
||||
hash = "sha256-y52R+MzPCa0zo52hZ/wnBacLLbF9k6P8UeVFobR+uUQ=";
|
||||
rev = "8e824017dc88cebe5a42ee6ca04315ca9545f717";
|
||||
hash = "sha256-9B6Oel6yfiQS5uY1jjU+BHkP13HgJubCcE2g6YJiNeY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
|
||||
@@ -67,7 +67,7 @@ python.pkgs.toPythonModule (
|
||||
python-dateutil
|
||||
pyyaml
|
||||
sniffio
|
||||
typer-slim
|
||||
typer
|
||||
typing-extensions
|
||||
valkey
|
||||
whitenoise
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
qt6,
|
||||
qt6Packages,
|
||||
@@ -40,6 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "disable-auto-update.patch";
|
||||
url = "https://sources.debian.org/data/main/t/texstudio/4.9.1%2Bds-1/debian/patches/0004-disable-auto-update.patch";
|
||||
hash = "sha256-w4/u8ObJSQqHisZmxMSpJeveE+DJSgLqnfpEnizHsBg=";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out/Applications"
|
||||
mv "$out/bin/texstudio.app" "$out/Applications"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -78,7 +78,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized";
|
||||
# -Wno-incompatible-pointer-types can be removed in 26.02 (https://github.com/NixOS/nixpkgs/pull/479794)
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized -Wno-incompatible-pointer-types";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVPP_PLATFORM=default"
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
Fix type error in fixed-mem-cache for SBCL 2.6.0
|
||||
|
||||
cache starts as nil and may be emptied by the loop, so (last cache)
|
||||
can return nil. (setf (cdr nil) ...) is undefined behavior that
|
||||
SBCL 2.6.0 now catches as a type conflict during compilation,
|
||||
causing COMPILE-FILE-ERROR.
|
||||
|
||||
Use nconc instead, which handles the nil case correctly.
|
||||
|
||||
Upstream issue: https://github.com/ghollisjr/cl-ana/issues/48
|
||||
|
||||
--- a/makeres/makeres.lisp
|
||||
+++ b/makeres/makeres.lisp
|
||||
@@ -936,5 +936,5 @@
|
||||
do (unload-target (pop cache))))
|
||||
(load-target id)
|
||||
- (setf (cdr (last cache))
|
||||
- (list id)))))))))
|
||||
+ (setf cache
|
||||
+ (nconc cache (list id))))))))))
|
||||
|
||||
@@ -12,6 +12,15 @@ let
|
||||
|
||||
overrides = (
|
||||
self: super: {
|
||||
named-readtables = super.named-readtables.overrideLispAttrs (o: {
|
||||
patches = (o.patches or [ ]) ++ [
|
||||
(pkgs.fetchpatch {
|
||||
name = "named-readtables-sbcl-fix.patch";
|
||||
url = "https://github.com/melisgl/named-readtables/commit/6eea56674442b884a4fee6ede4c8aad63541aa5b.patch";
|
||||
hash = "sha256-ZkmBz50tkJutCNhrgVTHyE+sxRjmL8y7YC7yewrmves=";
|
||||
})
|
||||
];
|
||||
});
|
||||
cl_plus_ssl = super.cl_plus_ssl.overrideLispAttrs (o: {
|
||||
nativeLibs = [ pkgs.openssl ];
|
||||
});
|
||||
@@ -182,11 +191,42 @@ let
|
||||
"iolib/pathnames"
|
||||
];
|
||||
});
|
||||
cl-ana_dot_makeres = super.cl-ana_dot_makeres.overrideLispAttrs (o: {
|
||||
patches = (o.patches or [ ]) ++ [ ./patches/cl-ana-fix-type-error.patch ];
|
||||
});
|
||||
cl-ana_dot_hdf-cffi = super.cl-ana_dot_hdf-cffi.overrideLispAttrs (o: {
|
||||
nativeBuildInputs = [ pkgs.hdf5 ];
|
||||
nativeLibs = [ pkgs.hdf5 ];
|
||||
NIX_LDFLAGS = [ "-lhdf5" ];
|
||||
});
|
||||
# The antik source archive contains a broken documentation.pdf symlink
|
||||
# pointing to documentation/build/latex/Antik.pdf which doesn't exist.
|
||||
# All packages built from this archive need the symlink removed.
|
||||
antik = super.antik.overrideLispAttrs (o: {
|
||||
postInstall = (o.postInstall or "") + ''
|
||||
rm -f $out/documentation.pdf
|
||||
'';
|
||||
});
|
||||
antik-base = super.antik-base.overrideLispAttrs (o: {
|
||||
postInstall = (o.postInstall or "") + ''
|
||||
rm -f $out/documentation.pdf
|
||||
'';
|
||||
});
|
||||
foreign-array = super.foreign-array.overrideLispAttrs (o: {
|
||||
postInstall = (o.postInstall or "") + ''
|
||||
rm -f $out/documentation.pdf
|
||||
'';
|
||||
});
|
||||
physical-dimension = super.physical-dimension.overrideLispAttrs (o: {
|
||||
postInstall = (o.postInstall or "") + ''
|
||||
rm -f $out/documentation.pdf
|
||||
'';
|
||||
});
|
||||
science-data = super.science-data.overrideLispAttrs (o: {
|
||||
postInstall = (o.postInstall or "") + ''
|
||||
rm -f $out/documentation.pdf
|
||||
'';
|
||||
});
|
||||
gsll = super.gsll.overrideLispAttrs (o: {
|
||||
nativeBuildInputs = [ pkgs.gsl ];
|
||||
nativeLibs = [ pkgs.gsl ];
|
||||
|
||||
Reference in New Issue
Block a user