Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot] 2025-10-24 06:06:21 +00:00 committed by GitHub
commit adb3e647b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 756 additions and 545 deletions

View file

@ -301,6 +301,10 @@
- `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables. - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables.
If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`. If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`.
- `jellyfin` was updated to `10.11.x`, which includes heavy backend changes.
Make sure to backup your data and configuration directories
and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/).
- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option. - A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.
- `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail. - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail.

View file

@ -23091,6 +23091,11 @@
githubId = 99875823; githubId = 99875823;
name = "Michael Savedra"; name = "Michael Savedra";
}; };
savtrip = {
github = "savtrip";
githubId = 42227195;
name = "Sav Tripodi";
};
savyajha = { savyajha = {
email = "savya.jha@hawkradius.com"; email = "savya.jha@hawkradius.com";
github = "savyajha"; github = "savyajha";

View file

@ -115,6 +115,7 @@ with lib.maintainers;
happysalada happysalada
minijackson minijackson
yurrriq yurrriq
savtrip
]; ];
github = "beam"; github = "beam";
scope = "Maintain BEAM-related packages and modules."; scope = "Maintain BEAM-related packages and modules.";

View file

@ -64,7 +64,7 @@ in
]; ];
# Needs to verify the user of the processes. # Needs to verify the user of the processes.
PrivateUsers = "full"; PrivateUsers = false;
# Needs to access other processes to modify their scheduling modes. # Needs to access other processes to modify their scheduling modes.
ProcSubset = "all"; ProcSubset = "all";
ProtectProc = "default"; ProtectProc = "default";

View file

@ -4,11 +4,11 @@
name = "jellyfin"; name = "jellyfin";
meta.maintainers = with lib.maintainers; [ minijackson ]; meta.maintainers = with lib.maintainers; [ minijackson ];
nodes.machine = nodes.machine = {
{ ... }:
{
services.jellyfin.enable = true; services.jellyfin.enable = true;
environment.systemPackages = with pkgs; [ ffmpeg ]; environment.systemPackages = with pkgs; [ ffmpeg ];
# Jellyfin fails to start if the data dir doesn't have at least 2GiB of free space
virtualisation.diskSize = 3 * 1024;
}; };
# Documentation of the Jellyfin API: https://api.jellyfin.org/ # Documentation of the Jellyfin API: https://api.jellyfin.org/
@ -30,6 +30,7 @@
machine.wait_for_unit("jellyfin.service") machine.wait_for_unit("jellyfin.service")
machine.wait_for_open_port(8096) machine.wait_for_open_port(8096)
machine.wait_until_succeeds("journalctl --since -1m --unit jellyfin --grep 'Startup complete'")
machine.succeed("curl --fail http://localhost:8096/") machine.succeed("curl --fail http://localhost:8096/")
machine.wait_until_succeeds("curl --fail http://localhost:8096/health | grep Healthy") machine.wait_until_succeeds("curl --fail http://localhost:8096/health | grep Healthy")
@ -105,7 +106,7 @@
folders_str = machine.succeed(api_get("/Library/VirtualFolders")) folders_str = machine.succeed(api_get("/Library/VirtualFolders"))
folders = json.loads(folders_str) folders = json.loads(folders_str)
print(folders) print(folders)
return all(folder["RefreshStatus"] == "Idle" for folder in folders) return all(folder.get("RefreshStatus") == "Idle" for folder in folders)
retry(is_refreshed) retry(is_refreshed)

View file

@ -1,28 +1,28 @@
{ {
"stable": { "stable": {
"linux": { "linux": {
"version": "8.11.12", "version": "8.11.14",
"sources": { "sources": {
"x86_64": { "x86_64": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.12.x64.tar.gz", "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz",
"hash": "sha256-znzmaEYOLVw6nUBk20oMdSngkO8iiSTHvM1y/t3Z55Y=" "hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc="
}, },
"aarch64": { "aarch64": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.12.arm64.tar.gz", "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz",
"hash": "sha256-ENuvB8GExhHWjJ97JV0qc2cIn9HqXb202dzIxu1fz2A=" "hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY="
} }
} }
}, },
"darwin": { "darwin": {
"version": "8.11.12", "version": "8.11.14",
"sources": { "sources": {
"x86_64": { "x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.12-x86_64.zip", "url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip",
"hash": "sha256-mr7DsYIEh21pHQX0cq9JlTZ4lHhkyYHCmwMaxEiK+5g=" "hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0="
}, },
"aarch64": { "aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.12-aarch64.zip", "url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip",
"hash": "sha256-34ylS5Xq9By6nuUkEmLoi0wR5hAQx1vBhrYFq4mjSDs=" "hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY="
} }
} }
} }

View file

@ -20,6 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20";
}; };
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail \
'cmake_minimum_required(VERSION 2.8)' \
'cmake_minimum_required(VERSION 3.5)'
'';
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config

View file

@ -28,7 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
# TODO: check with other distros and report upstream # TODO: check with other distros and report upstream
postPatch = '' postPatch = ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace "-m64" "" --replace-fail "-m64" "" \
--replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' \
'cmake_minimum_required(VERSION 3.5 FATAL_ERROR)'
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ]; buildInputs = [ zlib ];
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail \
'cmake_minimum_required(VERSION 2.8.12)' \
'cmake_minimum_required(VERSION 3.5)'
'';
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
package = bustools; package = bustools;
command = "bustools version"; command = "bustools version";

View file

@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
sed -i '/-m64/d;/-m32/d' CMakeLists.txt sed -i '/-m64/d;/-m32/d' CMakeLists.txt
substituteInPlace CMakeLists.txt --replace-fail \
'cmake_minimum_required( VERSION 2.6 )' \
'cmake_minimum_required( VERSION 3.5 ) '
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -5,7 +5,7 @@
"packages": { "packages": {
"": { "": {
"dependencies": { "dependencies": {
"codebuff": "^1.0.501" "codebuff": "^1.0.502"
} }
}, },
"node_modules/chownr": { "node_modules/chownr": {
@ -18,9 +18,9 @@
} }
}, },
"node_modules/codebuff": { "node_modules/codebuff": {
"version": "1.0.501", "version": "1.0.502",
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.501.tgz", "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.502.tgz",
"integrity": "sha512-ZTvQce7Qj5tjWt63AJujjGkCDLLWAXm3vrKOKlfUKXPXJQfbM8TYljB2+fnMEkjgShZ3Fg+nSEIb1q7hcuBTbQ==", "integrity": "sha512-gI1e7Hf+gnZux9O+NjhkGrR9kXltycLEvwMmULJ+2t72mk1bvDrCjRuzIZ5AFWxUeZsCj/rVtBpoJail9Qz7Og==",
"cpu": [ "cpu": [
"x64", "x64",
"arm64" "arm64"

View file

@ -6,14 +6,14 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "codebuff"; pname = "codebuff";
version = "1.0.501"; version = "1.0.502";
src = fetchzip { src = fetchzip {
url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
hash = "sha256-WW599dxu7LdL2pU0nb4zZb3ek67MlTpJ/H9aa7SWhi8="; hash = "sha256-2bskaDG7T/27Re1X4ZXsUrcu1WBb1+iuVcAOqWBRw8w=";
}; };
npmDepsHash = "sha256-M8BD9XMnn6ETifLl0j4fe2+UDaAGOA9mN2SsmXSfMPM="; npmDepsHash = "sha256-zqtV6AB2N8M9WqVc1JpfEOIoAyxoVEY3zO7WQiwwpQc=";
postPatch = '' postPatch = ''
cp ${./package-lock.json} package-lock.json cp ${./package-lock.json} package-lock.json

View file

@ -8,13 +8,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "crystal-dock"; pname = "crystal-dock";
version = "2.14"; version = "2.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dangvd"; owner = "dangvd";
repo = "crystal-dock"; repo = "crystal-dock";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE="; hash = "sha256-XFq4T39El5MjaWRSnaimonjdj+HGOAydNmEOehgGWX4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchpatch2,
# nativeBuildInputs # nativeBuildInputs
cmake, cmake,
@ -71,6 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
}; };
patches = [
(fetchpatch2 {
url = "https://github.com/dolphin-emu/dolphin/commit/8edef722ce1aae65d5a39faf58753044de48b6e0.patch?full_index=1";
hash = "sha256-QEG0p+AzrExWrOxL0qRPa+60GlL0DlLyVBrbG6pGuog=";
})
];
strictDeps = true; strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,7 +1,7 @@
{ mkDprintPlugin }: { mkDprintPlugin }:
mkDprintPlugin { mkDprintPlugin {
description = "Biome (JS/TS) wrapper plugin"; description = "Biome (JS/TS) wrapper plugin";
hash = "sha256-GHl8Uo2U6K1yirfjwuD43ixkVtGdbZ2qxk0cySRLXys="; hash = "sha256-Ht63tW4FqykpuNlWtyw3cHD2HXs0b6U6Zo9Rd9AXqD8=";
initConfig = { initConfig = {
configExcludes = [ "**/node_modules" ]; configExcludes = [ "**/node_modules" ];
configKey = "biome"; configKey = "biome";
@ -16,6 +16,6 @@ mkDprintPlugin {
}; };
pname = "dprint-plugin-biome"; pname = "dprint-plugin-biome";
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
url = "https://plugins.dprint.dev/biome-0.10.5.wasm"; url = "https://plugins.dprint.dev/biome-0.10.6.wasm";
version = "0.10.5"; version = "0.10.6";
} }

View file

@ -8,15 +8,15 @@
let let
pname = "everest"; pname = "everest";
version = "5806"; version = "5935";
phome = "$out/lib/Celeste"; phome = "$out/lib/Celeste";
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
inherit pname version; inherit pname version;
src = fetchzip { src = fetchzip {
url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5806.0/main.zip"; url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5935.0/main.zip";
extension = "zip"; extension = "zip";
hash = "sha256-Hw/BNvWfhdO7bvYrY/Px12BRG1SYcCBeAXBH4QnKyeY="; hash = "sha256-XYvXrfHSjSShAg3r2qikt1CPXldYvsU1EvRJNzJoGTU=";
}; };
buildInputs = [ buildInputs = [
icu icu

View file

@ -1,4 +1,14 @@
[ [
{
"pname": "DotNet.ReproducibleBuilds",
"version": "1.2.25",
"hash": "sha256-Vl9RPq9vCO4bjulPZiOr3gDVKlr9vnuKIIX3KWlRxvw="
},
{
"pname": "DotNet.ReproducibleBuilds.Isolated",
"version": "1.2.25",
"hash": "sha256-NpGbG9rnKKN6ejz1xqUa2AYx8mGSv+ZHbducFGhhrwA="
},
{ {
"pname": "DotNetZip", "pname": "DotNetZip",
"version": "1.16.0", "version": "1.16.0",
@ -24,16 +34,6 @@
"version": "3.0.2", "version": "3.0.2",
"hash": "sha256-iAX3oCX2092oKXEASUhMkh2A1kh1cBRSkkMJ6BmszRA=" "hash": "sha256-iAX3oCX2092oKXEASUhMkh2A1kh1cBRSkkMJ6BmszRA="
}, },
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "3.0.1",
"hash": "sha256-y4VQ8teCZOnCJyg0rh3s1SbbqfoEclB5T6lCfMrxWUw="
},
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "3.1.10",
"hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY="
},
{ {
"pname": "Microsoft.AspNetCore.App.Ref", "pname": "Microsoft.AspNetCore.App.Ref",
"version": "5.0.0", "version": "5.0.0",
@ -49,21 +49,6 @@
"version": "7.0.20", "version": "7.0.20",
"hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI=" "hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="
}, },
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "8.0.20",
"hash": "sha256-A6300qL9iP7iuY4wF9QkmOcuvoJFB0H64BAM5oGZF/4="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "3.0.3",
"hash": "sha256-CbtnZSF+lvyeIfEUC8a0Jf4EMvYAxa9mvWF9lyLymMk="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "3.1.32",
"hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s="
},
{ {
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "5.0.17", "version": "5.0.17",
@ -79,11 +64,6 @@
"version": "7.0.20", "version": "7.0.20",
"hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA=" "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="
}, },
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "8.0.20",
"hash": "sha256-rToqTSs66gvIi2I69+0/qjhKAXk5/rRQUh0KetP3ZxE="
},
{ {
"pname": "Microsoft.Build.Tasks.Git", "pname": "Microsoft.Build.Tasks.Git",
"version": "1.1.0", "version": "1.1.0",
@ -129,26 +109,6 @@
"version": "3.1.16", "version": "3.1.16",
"hash": "sha256-42cFtaZFzM93I0gZjuDbcEYWM5Pld+kx2MkWu0J66ww=" "hash": "sha256-42cFtaZFzM93I0gZjuDbcEYWM5Pld+kx2MkWu0J66ww="
}, },
{
"pname": "Microsoft.NET.Sdk.IL",
"version": "8.0.0",
"hash": "sha256-guQcVwSaVwJ0uJvUYZqk1bZ9ATLBk3zWHZmTW7EV1KM="
},
{
"pname": "Microsoft.NETCore.App",
"version": "2.1.0",
"hash": "sha256-RJksv5W7LhWJYGmkwYHfiU0s9XLCvT05KxSMz6U1/OE="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "3.0.3",
"hash": "sha256-hIdA8ncOXoDM6/ryKCTVz/vZrqFLffxAgpN/qfl2L6Y="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "3.1.32",
"hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM="
},
{ {
"pname": "Microsoft.NETCore.App.Host.linux-x64", "pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "5.0.17", "version": "5.0.17",
@ -164,21 +124,6 @@
"version": "7.0.20", "version": "7.0.20",
"hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc=" "hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="
}, },
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "8.0.20",
"hash": "sha256-NlwDtSJmxP+9oIqWEMKU12o96g9TzQAEt//votxI2PU="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "3.0.0",
"hash": "sha256-PHovvd+mPN9HoCF0rFEnS015p7Yj76+e9cfSU4JAI+I="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "3.1.0",
"hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM="
},
{ {
"pname": "Microsoft.NETCore.App.Ref", "pname": "Microsoft.NETCore.App.Ref",
"version": "5.0.0", "version": "5.0.0",
@ -194,21 +139,6 @@
"version": "7.0.20", "version": "7.0.20",
"hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs=" "hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="
}, },
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "8.0.20",
"hash": "sha256-1YXXJaiMZOIbLduuWyFGSWt6hOxKa3URNsPDfiMrnDM="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "3.0.3",
"hash": "sha256-mxA9JF2WyEDV8yahdwhe4qfCTbIFroUfmMzPBa91b/o="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "3.1.32",
"hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY="
},
{ {
"pname": "Microsoft.NETCore.App.Runtime.linux-x64", "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "5.0.17", "version": "5.0.17",
@ -224,36 +154,11 @@
"version": "7.0.20", "version": "7.0.20",
"hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ=" "hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="
}, },
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "8.0.20",
"hash": "sha256-BkV2ZjBpQvLhijWFSwWDpr5m2ffNlCtYJA5TUTro6no="
},
{
"pname": "Microsoft.NETCore.DotNetAppHost",
"version": "2.1.0",
"hash": "sha256-LV8pnNFsKGFONyCTGsd8qB5A+EUIiyvbYWAr0eOEFoI="
},
{
"pname": "Microsoft.NETCore.DotNetHostPolicy",
"version": "2.1.0",
"hash": "sha256-FqQm4BLznzRmF1nhk3nEwrdeAdCY35eBmHk6/4+MCPY="
},
{
"pname": "Microsoft.NETCore.DotNetHostResolver",
"version": "2.1.0",
"hash": "sha256-5nQTmMhaEvbuT+1f7u0t0tEK3SCVUeXhsExq8tiYBI0="
},
{ {
"pname": "Microsoft.NETCore.Platforms", "pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0", "version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
}, },
{
"pname": "Microsoft.NETCore.Platforms",
"version": "2.1.0",
"hash": "sha256-v09ltBAKTX8iAKuU2nCl+Op/ilVJQ0POZUh2z+u0rVo="
},
{ {
"pname": "Microsoft.NETCore.Platforms", "pname": "Microsoft.NETCore.Platforms",
"version": "3.1.0", "version": "3.1.0",
@ -269,11 +174,6 @@
"version": "1.1.0", "version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
}, },
{
"pname": "Microsoft.NETCore.Targets",
"version": "2.1.0",
"hash": "sha256-+KdWdA9I392SRqMb9KaiiRZatfvJ9RcdbtyGUkpHW7U="
},
{ {
"pname": "Microsoft.NETFramework.ReferenceAssemblies", "pname": "Microsoft.NETFramework.ReferenceAssemblies",
"version": "1.0.3", "version": "1.0.3",
@ -331,33 +231,28 @@
}, },
{ {
"pname": "Mono.Cecil", "pname": "Mono.Cecil",
"version": "0.11.5", "version": "0.11.6",
"hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" "hash": "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU="
}, },
{ {
"pname": "MonoMod.Backports", "pname": "MonoMod.Backports",
"version": "1.1.0", "version": "1.1.2",
"hash": "sha256-ruRX10/u+lRfMKr0UMbCVYS/nUK5fzV4+8ujJXBnles=" "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38="
}, },
{ {
"pname": "MonoMod.Core", "pname": "MonoMod.Core",
"version": "1.0.0", "version": "1.3.0",
"hash": "sha256-Y55fgMd0d35qztqqC0drzn3NdSMYLiWie8IL9LbmFnc=" "hash": "sha256-B/pb8hor4npd3YSkvEF8FEO7xbbcHIfLapTUcrd5qRY="
}, },
{ {
"pname": "MonoMod.ILHelpers", "pname": "MonoMod.ILHelpers",
"version": "1.0.0", "version": "1.1.0",
"hash": "sha256-N6ybnOMkEtxXy/PdJAEkqHggHYSLETbCMF+mgNGXAvo=" "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw="
},
{
"pname": "MonoMod.Patcher",
"version": "25.0.0-prerelease.1",
"hash": "sha256-+5kddzc3FheDIRNoTPWQREc1ufVFjfPFiiKrXTPCTWQ="
}, },
{ {
"pname": "MonoMod.RuntimeDetour", "pname": "MonoMod.RuntimeDetour",
"version": "25.0.0", "version": "25.3.0",
"hash": "sha256-yyP3kTN+OcOoO8xmHZfebKB/EtWNi7V6aJnXUTjVU/8=" "hash": "sha256-ZDS2MYHwL+cGuGycqivqfS/i+Uglx203SGtFx3vCSOA="
}, },
{ {
"pname": "MonoMod.RuntimeDetour.HookGen", "pname": "MonoMod.RuntimeDetour.HookGen",
@ -366,8 +261,8 @@
}, },
{ {
"pname": "MonoMod.Utils", "pname": "MonoMod.Utils",
"version": "25.0.0", "version": "25.0.8",
"hash": "sha256-PL7/F0zXnLRb5icD5zl/QCeMyTEsJZKOvSBvM1t8BEY=" "hash": "sha256-k2Nh8btGmOhKCEmCnO7t5pQszrzH0Lok5mgwWBRXviE="
}, },
{ {
"pname": "NETStandard.Library", "pname": "NETStandard.Library",
@ -499,36 +394,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
}, },
{
"pname": "runtime.linux-x64.Microsoft.NETCore.App",
"version": "2.1.0",
"hash": "sha256-qFtPLe3t/V9DZTaYhAO6MbVsyzH4hcQQUvyIJ6ywbEw="
},
{
"pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost",
"version": "2.1.0",
"hash": "sha256-NMuEFKc68Vn4bVoX6kdGSQeyDpktUYliUg6Lbj4E8FU="
},
{
"pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy",
"version": "2.1.0",
"hash": "sha256-U/WlbUpImqPjZf075WgBOb1o1i1H3VOL4QbzHfQ9Itk="
},
{
"pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver",
"version": "2.1.0",
"hash": "sha256-vcB6FY1GDP+kTsmp9OXpPg50sXKqOSJzWUSuNlN1+rs="
},
{
"pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
"version": "6.0.0",
"hash": "sha256-i/UcSf9HhYBtscSZKsaPReL/ntN8EQhmEpFIkEfoGhQ="
},
{
"pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
"version": "6.0.0",
"hash": "sha256-flN7eEFoqIUmbuGHgVu/R1F7trwjOXwxmBVw/+Jv2Hg="
},
{ {
"pname": "runtime.native.System", "pname": "runtime.native.System",
"version": "4.3.0", "version": "4.3.0",
@ -659,11 +524,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
}, },
{
"pname": "System.Collections.Immutable",
"version": "6.0.0",
"hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
},
{ {
"pname": "System.Collections.Immutable", "pname": "System.Collections.Immutable",
"version": "8.0.0", "version": "8.0.0",
@ -774,11 +634,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
}, },
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{ {
"pname": "System.Numerics.Vectors", "pname": "System.Numerics.Vectors",
"version": "4.5.0", "version": "4.5.0",
@ -864,11 +719,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
}, },
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.3",
"hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
},
{ {
"pname": "System.Runtime.CompilerServices.Unsafe", "pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0", "version": "6.0.0",
@ -1029,6 +879,11 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
}, },
{
"pname": "Vezel.Zig.Toolsets.linux-x64",
"version": "0.14.1.1",
"hash": "sha256-H32XG4157eWqa6qcVtd4t6Ef35MzYnXqr62FcwMAxSo="
},
{ {
"pname": "YamlDotNet", "pname": "YamlDotNet",
"version": "16.1.3", "version": "16.1.3",

View file

@ -11,7 +11,7 @@
let let
pname = "everest"; pname = "everest";
version = "5806"; version = "5935";
phome = "$out/lib/Celeste"; phome = "$out/lib/Celeste";
in in
buildDotnetModule { buildDotnetModule {
@ -20,11 +20,11 @@ buildDotnetModule {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EverestAPI"; owner = "EverestAPI";
repo = "Everest"; repo = "Everest";
rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040"; rev = "6a6da718227b357f5b997499e454d5dc5c3e2788";
fetchSubmodules = true; fetchSubmodules = true;
# TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
# Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
hash = "sha256-scizz5U9DQaeJsh0dg7Lllycd/D3Ezu8QNYPPZFGJhY="; hash = "sha256-qSDcwqjJeb2pNbyriZ/9Gk72DyR5KdIoncXol7JZvFg=";
}; };
nativeBuildInputs = [ autoPatchelfHook ]; nativeBuildInputs = [ autoPatchelfHook ];
@ -44,9 +44,25 @@ buildDotnetModule {
autoPatchelf lib-ext/piton/piton-linux_x64 autoPatchelf lib-ext/piton/piton-linux_x64
''; '';
dotnet-sdk = dotnetCorePackages.sdk_9_0; dotnet-sdk =
with dotnetCorePackages;
sdk_9_0
// {
inherit
(combinePackages [
sdk_9_0
sdk_8_0
])
packages
targetPackages
;
};
nugetDeps = ./deps.json; nugetDeps = ./deps.json;
# Workaround from https://github.com/NixOS/nixpkgs/issues/454432
# Necessitated by https://github.com/MonoMod/MonoMod/pull/246
dotnetRestoreFlags = [ "--force-evaluate" ];
# Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814 # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814
linkNugetPackages = true; linkNugetPackages = true;

View file

@ -19,6 +19,5 @@ version=$(echo "$latest" | jq -r .version)
url=$(echo "$latest" | jq -r .mainDownload) url=$(echo "$latest" | jq -r .mainDownload)
update-source-version everest $version --rev=$commit update-source-version everest $version --rev=$commit
echo > "$(dirname "$(nix-instantiate --eval --strict -A everest.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/')")/deps.json"
"$(nix-build --attr everest.fetch-deps --no-out-link)" "$(nix-build --attr everest.fetch-deps --no-out-link)"
update-source-version everest-bin $version "" $url update-source-version everest-bin $version "" $url

View file

@ -48,7 +48,10 @@ buildGoModule rec {
homepage = "https://github.com/charmbracelet/gum"; homepage = "https://github.com/charmbracelet/gum";
changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}"; changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ maaslalani ]; maintainers = with lib.maintainers; [
maaslalani
savtrip
];
mainProgram = "gum"; mainProgram = "gum";
}; };
} }

View file

@ -83,6 +83,7 @@ buildGoModule (finalAttrs: {
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
Br1ght0ne Br1ght0ne
Frostman Frostman
savtrip
]; ];
}; };
}) })

View file

@ -0,0 +1,96 @@
diff --git a/src/operation/iPNP/CMakeLists.txt b/src/operation/iPNP/CMakeLists.txt
index b8f308a6e..4749d5024 100644
--- a/src/operation/iPNP/CMakeLists.txt
+++ b/src/operation/iPNP/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
set (CMAKE_CXX_STANDARD 20)
add_subdirectory(api)
diff --git a/src/third_party/pybind11/CMakeLists.txt b/src/third_party/pybind11/CMakeLists.txt
index 0d9320388..5b5967713 100644
--- a/src/third_party/pybind11/CMakeLists.txt
+++ b/src/third_party/pybind11/CMakeLists.txt
@@ -5,7 +5,7 @@
# All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
# The `cmake_minimum_required(VERSION 3.4...3.22)` syntax does not work with
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/src/third_party/pybind11/tests/CMakeLists.txt b/src/third_party/pybind11/tests/CMakeLists.txt
index 9beb268ed..417cd04d0 100644
--- a/src/third_party/pybind11/tests/CMakeLists.txt
+++ b/src/third_party/pybind11/tests/CMakeLists.txt
@@ -5,7 +5,7 @@
# All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
index f7d693998..2847142a4 100644
--- a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
+++ b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
index d7ca4db55..74322f598 100644
--- a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
+++ b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
project(test_installed_module CXX)
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
index bc5e101f1..2d21a21de 100644
--- a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
+++ b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
index 58cdd7cfd..f9835f31e 100644
--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
index 01557c439..6d96cc3b3 100644
--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
index ba82fdee2..6f8e04429 100644
--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
# some versions of VS that have a patched CMake 3.11. This forces us to emulate

View file

@ -21,38 +21,38 @@
gmp, gmp,
python3, python3,
onnxruntime, onnxruntime,
pkg-config,
curl,
onetbb,
}: }:
let let
rootSrc = stdenv.mkDerivation { rootSrc = stdenv.mkDerivation {
pname = "iEDA-src"; pname = "iEDA-src";
version = "2025-06-30"; version = "2025-09-10";
src = fetchgit { src = fetchgit {
url = "https://gitee.com/oscc-project/iEDA"; url = "https://gitee.com/oscc-project/iEDA";
rev = "689f172c726c3934d49577f09adb5b09804f11e5"; rev = "614a91b4d18ba7dc561315f2d5fdae4a5451f486";
sha256 = "sha256-JJePIn+NUScb+3o67vT31BoKHcfBuE9osV4SrcicFds="; sha256 = "sha256-xn1hpnSyO+jauYYhlsKjBkkD3RJ1GqbHtnWRe/My1R0=";
}; };
patches = [ patches = [
# This patch is to fix the build error caused by the missing of the header file, # This patch is to fix the build error caused by the missing of the header file,
# and remove some libs or path that they hard-coded in the source code. # and remove some libs or path that they hard-coded in the source code.
# Should be removed after we upstream these changes. # Due to the way they organized the source code, it's hard to upstream this patch.
# So we have to maintain this patch locally.
(fetchpatch { (fetchpatch {
url = "https://github.com/Emin017/iEDA/commit/c17e42a3673afd9c7ace9374f85290a85354bb78.patch"; url = "https://github.com/Emin017/iEDA/commit/c6b642f3db6c156eaf4f1203612592c86e49e1b5.patch";
hash = "sha256-xa1oSy3OZ5r0TigGywzpVPvpPnA7L6RIcNktfFen4AA="; hash = "sha256-L0bmW7kadmLLng9rZOT1NpvniBpuD8SUqCfeH2cCrdg=";
}) })
# This patch is to fix the compile error on the newer version of gcc/g++
# We remove some forward declarations which are not allowed in newer versions of gcc/g++
# Should be removed after we upstream these changes.
(fetchpatch {
url = "https://github.com/Emin017/iEDA/commit/f5464cc40a2c671c5d405f16b509e2fa8d54f7f1.patch";
hash = "sha256-uVMV/CjkX9oLexHJbQvnEDOET/ZqsEPreI6EQb3Z79s=";
})
];
postPatch = ''
# Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux # Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux
sed -i '17,28s/^/# /' src/operation/iCTS/test/CMakeLists.txt (fetchpatch {
''; url = "https://github.com/Emin017/iEDA/commit/87c5dded74bc452249e8e69f4a77dd1bed7445c2.patch";
hash = "sha256-1Hd0DYnB5lVAoAcB1la5tDlox4cuQqApWDiiWtqWN0Q=";
})
# Fix CMake version requirement to support newer CMake versions,
# Should be removed once upstream fixed it.
./fix-cmake-require.patch
];
dontBuild = true; dontBuild = true;
dontFixup = true; dontFixup = true;
@ -66,7 +66,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "iEDA"; pname = "iEDA";
version = "0-unstable-2025-06-30"; version = "0.1.0-unstable-2025-09-10";
src = rootSrc; src = rootSrc;
@ -77,6 +77,7 @@ stdenv.mkDerivation {
bison bison
python3 python3
tcl tcl
pkg-config
]; ];
cmakeFlags = [ cmakeFlags = [
@ -108,6 +109,8 @@ stdenv.mkDerivation {
gmp gmp
tcl tcl
zlib zlib
curl
onetbb
]; ];
postInstall = '' postInstall = ''
@ -128,7 +131,7 @@ stdenv.mkDerivation {
runHook postInstallCheck runHook postInstallCheck
''; '';
doInstallCheck = true; doInstallCheck = !stdenv.hostPlatform.isAarch64; # Tests will fail on aarch64-linux, wait for upstream fix: https://github.com/microsoft/onnxruntime/issues/10038
enableParallelBuild = true; enableParallelBuild = true;

View file

@ -4,6 +4,8 @@
fetchFromGitHub, fetchFromGitHub,
fetchpatch, fetchpatch,
cmake, cmake,
libpng,
stb,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,10 +27,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/MCredstoner2004/ImageLOL/commit/013fb1f901d88f5fd21a896bfab47c7fff0737d7.patch"; url = "https://github.com/MCredstoner2004/ImageLOL/commit/013fb1f901d88f5fd21a896bfab47c7fff0737d7.patch";
hash = "sha256-RVaG2xbUqE4CxqI2lhvug2qihT6A8vN+pIfK58CXLDw="; hash = "sha256-RVaG2xbUqE4CxqI2lhvug2qihT6A8vN+pIfK58CXLDw=";
includes = [ "imagelol/ImageLOL.inl" ]; includes = [ "imagelol/ImageLOL.inl" ];
# change lib/ for imagelol
stripLen = 2; stripLen = 2;
extraPrefix = "imagelol/"; extraPrefix = "imagelol/";
}) })
# use system libraries instead of bundled versions
./use-system-libs.patch
]; ];
# fix for case-sensitive filesystems # fix for case-sensitive filesystems
@ -36,28 +39,28 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
mv imagelol src mv imagelol src
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")' --replace-fail 'add_subdirectory("imagelol")' 'add_subdirectory("src")'
substituteInPlace External/zlib-no-examples/CMakeLists.txt \ # use system stb headers
--replace-fail "cmake_minimum_required(VERSION 2.4.4)" "cmake_minimum_required(VERSION 3.10)" substituteInPlace External/stb_image-cmake/CMakeLists.txt \
substituteInPlace External/libpng/CMakeLists.txt \ --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/../stb"' '"${stb}/include/stb"'
--replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \
--replace-fail "cmake_policy(VERSION 3.1)" "cmake_policy(VERSION 3.10)" # remove bundled libraries
rm -r External/zlib External/zlib-no-examples External/libpng External/stb
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
installPhase = '' buildInputs = [
mkdir -p $out/bin libpng
cp ./ImageLOL $out/bin stb
''; ];
cmakeFlags = [ installPhase = ''
(lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90") runHook preInstall
] install -Dm755 ImageLOL -t $out/bin
++ lib.optional ( runHook postInstall
stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 '';
) "-DPNG_ARM_NEON=off";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/MCredstoner2004/ImageLOL"; homepage = "https://github.com/MCredstoner2004/ImageLOL";
@ -65,7 +68,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = [ ]; maintainers = [ ];
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "ImageLOL"; mainProgram = "ImageLOL";
}; };
} }

View file

@ -0,0 +1,32 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,26 +3,12 @@
project(ImageLOL VERSION 0.0)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED True)
-include_directories("External/zlib" "External/libpng")
add_subdirectory("External/stb_image-cmake")
-set(SKIP_INSTALL_ALL ON CACHE BOOL "")
-add_subdirectory("External/zlib-no-examples")
-
-set(PNG_BUILD_ZLIB ON CACHE BOOL "")
-link_libraries(zlibstatic)
-get_target_property(ZLIB_INCLUDE_DIRECTORIES zlibstatic INCLUDE_DIRECTORIES)
-include_directories(${ZLIB_INCLUDE_DIRECTORIES})
-set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRECTORIES} CACHE PATH "")
-set(PNG_SHARED OFF CACHE BOOL "")
-set(PNG_EXECUTABLES OFF CACHE BOOL "")
-add_subdirectory("External/libpng")
-add_dependencies(png_static zlibstatic zlib)
-add_dependencies(genfiles zlibstatic)
-unset(SKIP_INSTALL_ALL CACHE)
-get_target_property(LIBPNG_INCLUDE_DIRECTORIES png_static INCLUDE_DIRECTORIES)
+find_package(PNG REQUIRED)
+set(LIBPNG_INCLUDE_DIRECTORIES ${PNG_INCLUDE_DIRS})
add_subdirectory("imagelol")
add_executable(ImageLOL main.cpp)
target_include_directories(ImageLOL PRIVATE ${LIBPNG_INCLUDE_DIRECTORIES})
-target_link_libraries(ImageLOL PRIVATE stb_image png_static zlibstatic libimagelol)
+target_link_libraries(ImageLOL PRIVATE stb_image PNG::PNG libimagelol)

View file

@ -13,7 +13,7 @@
}: }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "jellyfin-web"; pname = "jellyfin-web";
version = "10.10.7"; version = "10.11.0";
src = src =
assert version == jellyfin.version; assert version == jellyfin.version;
@ -21,7 +21,7 @@ buildNpmPackage rec {
owner = "jellyfin"; owner = "jellyfin";
repo = "jellyfin-web"; repo = "jellyfin-web";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-jX9Qut8YsJRyKI2L7Aww4+6G8z741WzN37CUx3KWQfY="; hash = "sha256-LcZNfFXM2dFHeUheSnri1t4eBYvlCfF2wlaqWlh+U7A=";
}; };
nodejs = nodejs_20; # does not build with 22 nodejs = nodejs_20; # does not build with 22
@ -31,7 +31,7 @@ buildNpmPackage rec {
--replace-fail "git describe --always --dirty" "echo ${src.rev}" \ --replace-fail "git describe --always --dirty" "echo ${src.rev}" \
''; '';
npmDepsHash = "sha256-nfvqVByD3Kweq+nFJQY4R2uRX3mx/qJvGFiKiOyMUdw="; npmDepsHash = "sha256-w3xMbkxNGFEBR2K1PhJW6pr943DfJvyQvILiF0VuLlw=";
preBuild = '' preBuild = ''
# using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

File diff suppressed because it is too large Load diff

View file

@ -13,13 +13,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jellyfin"; pname = "jellyfin";
version = "10.10.7"; # ensure that jellyfin-web has matching version version = "10.11.0"; # ensure that jellyfin-web has matching version
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jellyfin"; owner = "jellyfin";
repo = "jellyfin"; repo = "jellyfin";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GWpzX8DvCafHb5V9it0ZPTXKm+NbLS7Oepe/CcMiFuI="; hash = "sha256-8kvN2ZugmjjgSMepDdP9tc48362b6w+RpIsp/IXaivM=";
}; };
propagatedBuildInputs = [ sqlite ]; propagatedBuildInputs = [ sqlite ];
@ -32,8 +32,8 @@ buildDotnetModule rec {
fontconfig fontconfig
freetype freetype
]; ];
dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
dotnetBuildFlags = [ "--no-self-contained" ]; dotnetBuildFlags = [ "--no-self-contained" ];
makeWrapperArgs = [ makeWrapperArgs = [

View file

@ -22,6 +22,13 @@ let
|| (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets)) || (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets))
|| enableAll; || enableAll;
missingZerocallusedregs =
(
if targets == [ ] then stdenv.hostPlatform.isLoongArch64 else (builtins.elem "loongarch64" targets)
)
|| (if targets == [ ] then stdenv.hostPlatform.isRiscV64 else (builtins.elem "riscv64" targets))
|| enableAll;
biosSupport' = biosSupport && hasX86; biosSupport' = biosSupport && hasX86;
pxeSupport' = pxeSupport && hasX86; pxeSupport' = pxeSupport && hasX86;
@ -52,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningDisable = lib.optionals missingZerocallusedregs [
"zerocallusedregs"
];
nativeBuildInputs = [ nativeBuildInputs = [
llvmPackages.libllvm llvmPackages.libllvm
llvmPackages.lld llvmPackages.lld

View file

@ -75,13 +75,13 @@ let
in in
effectiveStdenv.mkDerivation (finalAttrs: { effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp"; pname = "llama-cpp";
version = "6782"; version = "6821";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ggml-org"; owner = "ggml-org";
repo = "llama.cpp"; repo = "llama.cpp";
tag = "b${finalAttrs.version}"; tag = "b${finalAttrs.version}";
hash = "sha256-9cFuYkEcgUHsC4jg8qzKvHA8xI8Bp0w4AQKEt/TACUI="; hash = "sha256-HqrX7xOYsF0UUF12c8KgIM2HMeTm1XxiFPuz/PaToI0=";
leaveDotGit = true; leaveDotGit = true;
postFetch = '' postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT git -C "$out" rev-parse --short HEAD > $out/COMMIT

View file

@ -0,0 +1,15 @@
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index 1afa856f..dcd36f84 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -65,6 +65,10 @@ option(USE_QT6 "Use Qt 6 instead of Qt 5" ON)
if (USE_QT6)
find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED)
set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets)
+ if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10")
+ find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
+ list(APPEND QT_LINK_LIBS Qt6::GuiPrivate)
+ endif()
else()
find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED)
set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia)

View file

@ -5,6 +5,7 @@
enet, enet,
extra-cmake-modules, extra-cmake-modules,
fetchFromGitHub, fetchFromGitHub,
faad2,
libGL, libGL,
libarchive, libarchive,
libpcap, libpcap,
@ -28,15 +29,17 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "melonDS"; pname = "melonDS";
version = "1.0-unstable-2025-08-10"; version = "1.0-unstable-2025-10-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "melonDS-emu"; owner = "melonDS-emu";
repo = "melonDS"; repo = "melonDS";
rev = "f9e46fdc29f8e55aca6bc121c424890faee2e51d"; rev = "91ab68090c0aa588aabaeaa5e2c62564fd661ccc";
hash = "sha256-g5TVvnCoWQej9v2aii5klx7gRzUrokiwy0By0G3LkiI="; hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY=";
}; };
patches = [ ./fix-build-qt-6.10.patch ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
extra-cmake-modules extra-cmake-modules
@ -47,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
SDL2 SDL2
enet enet
faad2
libarchive libarchive
libslirp libslirp
libGL libGL

View file

@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8.0)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = with lib; { meta = with lib; {
homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg"; homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg";
description = "Medical image registration software"; description = "Medical image registration software";

View file

@ -9,13 +9,13 @@
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "okteto"; pname = "okteto";
version = "3.12.0"; version = "3.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "okteto"; owner = "okteto";
repo = "okteto"; repo = "okteto";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-EL1xWrxI7W2iXb0syb/53BgW22kqOSJCHyzBHGdQOm4="; hash = "sha256-TtRLTZ/CnhJZYFrMUYAvRksSbQywP5P0dlYhT74yju8=";
}; };
vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8="; vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8=";

View file

@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
cmake cmake
]; ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = with lib; { meta = with lib; {
description = "Adhoc wireless mesh routing daemon"; description = "Adhoc wireless mesh routing daemon";
license = licenses.bsd3; license = licenses.bsd3;

View file

@ -222,7 +222,10 @@ python3Packages.buildPythonApplication rec {
homepage = "https://pre-commit.com/"; homepage = "https://pre-commit.com/";
changelog = "https://github.com/pre-commit/pre-commit/blob/${src.tag}/CHANGELOG.md"; changelog = "https://github.com/pre-commit/pre-commit/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ borisbabic ]; maintainers = with lib.maintainers; [
borisbabic
savtrip
];
mainProgram = "pre-commit"; mainProgram = "pre-commit";
}; };
} }

View file

@ -67,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace-fail \ --replace-fail \
"find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \
"find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" \
--replace-fail \
"cmake_minimum_required(VERSION 3.0.2)" \
"cmake_minimum_required(VERSION 3.5)"
grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g' grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
''; '';

View file

@ -85,6 +85,11 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall runHook postInstall
''; '';
postPatch = ''
substituteInPlace src/acs/vm/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = with lib; { meta = with lib; {
description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy"; description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy";
homepage = "https://kartkrew.org"; homepage = "https://kartkrew.org";

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "rumdl"; pname = "rumdl";
version = "0.0.162"; version = "0.0.166";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rvben"; owner = "rvben";
repo = "rumdl"; repo = "rumdl";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-aCduiCO49YWeqET3nezI1EYkz+IbTR+uIy7FXHbkYCo="; hash = "sha256-I63/GJa0bqJY2BHDmjcNDKSiglCygvpN4XBp/kQ6mEg=";
}; };
cargoHash = "sha256-o9NqTdMEoYFZC69Raf0v6fHUKnbN2K+rV3LK6rtjG/k="; cargoHash = "sha256-Uh28HFWQhbJtYpKjUI0TuM0NRLpWnu+zQvt3gkGqKyU=";
cargoBuildFlags = [ cargoBuildFlags = [
"--bin=rumdl" "--bin=rumdl"

View file

@ -116,6 +116,11 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch"; url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch";
hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk="; hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk=";
}) })
(fetchpatch {
name = "fix-qt6.10-build.patch";
url = "https://github.com/scribusproject/scribus/commit/13fc4f874354511e05bf91a48703b57b4c489715.patch";
hash = "sha256-+pbQ77SaTh04QX55wmS6WeuZf3IGe5nq3pmrhk68tb8=";
})
]; ];
meta = { meta = {

View file

@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ maintainers = with maintainers; [
marcweber marcweber
oxalica oxalica
Necior
]; ];
mainProgram = "task"; mainProgram = "task";
platforms = platforms.unix; platforms = platforms.unix;

View file

@ -5,16 +5,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "tfswitch"; pname = "tfswitch";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "warrensbox"; owner = "warrensbox";
repo = "terraform-switcher"; repo = "terraform-switcher";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Lxczo2zlBqDyHAcGPR1UM1s8tR4+F80YeNI0JJXLN30="; sha256 = "sha256-9N6C2y+lGyWSJgDiPsMKo03ji6lhq+0OI1idi1VcrAA=";
}; };
vendorHash = "sha256-JnfRdircsabRP1O8dSs8/OGwTSvv4xmIXeFQsnbpb5o="; vendorHash = "sha256-4qZ5egtNN0O+ESkvavprNd6Xtxh/eyD5INolqKXo674=";
# Disable tests since it requires network access and relies on the # Disable tests since it requires network access and relies on the
# presence of release.hashicorp.com # presence of release.hashicorp.com

View file

@ -24,13 +24,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "vcpkg-tool"; pname = "vcpkg-tool";
version = "2025-10-10"; version = "2025-10-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "microsoft"; owner = "microsoft";
repo = "vcpkg-tool"; repo = "vcpkg-tool";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-u88yjYhBKo8uX/jVQypYzOqWeE6PSM+GJD5v5qZyjC4="; hash = "sha256-Qu7e2cb4fDAiJ4PXRzgdsvTMM8eo6dwRCNpd/w3vWLw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vcpkg"; pname = "vcpkg";
version = "2025.09.17"; version = "2025.10.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "microsoft"; owner = "microsoft";
repo = "vcpkg"; repo = "vcpkg";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-DySLGZrsUwXEW3NbcG6hEvcJZyPHub+oI9HWiKvYIpM="; hash = "sha256-prWpMtvXWZ53y2gzr7IIqL/5kQZRfErnynEHMqi15/A=";
leaveDotGit = true; leaveDotGit = true;
postFetch = '' postFetch = ''
cd "$out" cd "$out"

View file

@ -14,12 +14,12 @@
let let
pname = "ex_doc"; pname = "ex_doc";
version = "0.38.4"; version = "0.39.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elixir-lang"; owner = "elixir-lang";
repo = "${pname}"; repo = "${pname}";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-/gZczKm/IF5QQemrdcda9oKVIGDFSqdiu8YrBwT6Mtk="; hash = "sha256-7f4TQgQIeWb+SRMYLsqnOWnPHY7Pqi8qtruVe8OaZRY=";
}; };
in in
mixRelease { mixRelease {

View file

@ -9,7 +9,7 @@
beamPackages.mixRelease rec { beamPackages.mixRelease rec {
pname = "livebook"; pname = "livebook";
version = "0.17.2"; version = "0.17.3";
inherit (beamPackages) elixir; inherit (beamPackages) elixir;
@ -21,7 +21,7 @@ beamPackages.mixRelease rec {
owner = "livebook-dev"; owner = "livebook-dev";
repo = "livebook"; repo = "livebook";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-9AlvEqyQJvcRbAuuxF5Q5S9hG96vaQYVBYwPYp4lGQM="; hash = "sha256-WElJgW2TxjeUgv6GZwq+hcgl6n4xr8mmCBPqoOGc1+w=";
}; };
mixFodDeps = beamPackages.fetchMixDeps { mixFodDeps = beamPackages.fetchMixDeps {

View file

@ -161,8 +161,8 @@ in
}; };
wlroots_0_18 = generic { wlroots_0_18 = generic {
version = "0.18.2"; version = "0.18.3";
hash = "sha256-vKvMWRPPJ4PRKWVjmKKCdNSiqsQm+uQBoBnBUFElLNA="; hash = "sha256-D8RapSeH+5JpTtq+OU8PyVZubLhjcebbCBPuSO5Q7kU=";
extraBuildInputs = [ extraBuildInputs = [
lcms2 lcms2
]; ];

View file

@ -14,7 +14,7 @@
}: }:
let let
pname = "brotli-asgi"; pname = "brotli-asgi";
version = "1.4.0"; version = "1.5.0";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -26,7 +26,7 @@ buildPythonPackage {
owner = "fullonic"; owner = "fullonic";
repo = "brotli-asgi"; repo = "brotli-asgi";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y="; hash = "sha256-jOow5xrRvuBdg/dVEzAUgs1SxNLZqEItyW9OcvniTSY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -79,7 +79,10 @@ buildPythonPackage rec {
homepage = "https://copier.readthedocs.io"; homepage = "https://copier.readthedocs.io";
changelog = "https://github.com/copier-org/copier/blob/${src.tag}/CHANGELOG.md"; changelog = "https://github.com/copier-org/copier/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ greg ]; maintainers = with lib.maintainers; [
greg
savtrip
];
mainProgram = "copier"; mainProgram = "copier";
}; };
} }

View file

@ -33,6 +33,12 @@ mkDerivation rec {
pkg-config pkg-config
]; ];
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail \
'cmake_minimum_required(VERSION 3.2)' \
'cmake_minimum_required(VERSION 3.5)'
'';
buildInputs = [ buildInputs = [
ffmpeg ffmpeg
libopus libopus

View file

@ -3197,6 +3197,8 @@ with pkgs;
gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;
}; };
limine-full = limine.override { enableAll = true; };
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg_6-full; ffmpeg = ffmpeg_6-full;
ocamlPackages = ocaml-ng.ocamlPackages_4_14; ocamlPackages = ocaml-ng.ocamlPackages_4_14;