Merge master into staging-nixos
This commit is contained in:
@@ -371,7 +371,8 @@ in
|
||||
AmbientCapabilities = [
|
||||
# Needed to be able to manipulate the rulesets
|
||||
"CAP_NET_ADMIN"
|
||||
];
|
||||
]
|
||||
++ lib.optional ((cfg.settings.mode == "iptables") || (cfg.settings.mode == "ipset")) "CAP_NET_RAW";
|
||||
CapabilityBoundingSet = AmbientCapabilities;
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
|
||||
@@ -18,6 +18,11 @@ in
|
||||
|
||||
system.fsPackages = [ pkgs.xfsprogs.bin ];
|
||||
|
||||
systemd = {
|
||||
packages = [ pkgs.xfsprogs.out ];
|
||||
services.xfs_scrub_all.path = [ pkgs.util-linux.bin ]; # lsblk
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules = mkIf inInitrd [
|
||||
"xfs"
|
||||
"crc32c"
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
From fc4baf7cbb71ba7a47b174870dacf0e4ec93b6bf Mon Sep 17 00:00:00 2001
|
||||
From: Sandro <devel@penguinpee.nl>
|
||||
Date: Sat, 19 Apr 2025 14:10:45 +0200
|
||||
Subject: [PATCH] Set CMake policy version lower bound to 3.5
|
||||
|
||||
Also specify upper bound as 4.0.
|
||||
|
||||
With CMake 4.0 policies before 3.5 will be dropped. CMake 4.0 also
|
||||
requires the upper bound to be specified.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
android/app/CMakeLists.txt | 2 +-
|
||||
android/app/thirdparty_libs/fribidi/CMakeLists.txt | 2 +-
|
||||
android/app/thirdparty_libs/libunibreak/CMakeLists.txt | 2 +-
|
||||
crengine/Tools/blend-algo-test/CMakeLists.txt | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 254b8cd6f..ab952eccf 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
PROJECT(cr3)
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
|
||||
|
||||
diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
|
||||
index a0a7a42a1..66578ab59 100644
|
||||
--- a/android/app/CMakeLists.txt
|
||||
+++ b/android/app/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
# Sets the minimum version of CMake required to build the native library.
|
||||
|
||||
-cmake_minimum_required(VERSION 3.4.1)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
project(cr3engine)
|
||||
|
||||
diff --git a/android/app/thirdparty_libs/fribidi/CMakeLists.txt b/android/app/thirdparty_libs/fribidi/CMakeLists.txt
|
||||
index 9ccbb7ed5..db31dcc4d 100644
|
||||
--- a/android/app/thirdparty_libs/fribidi/CMakeLists.txt
|
||||
+++ b/android/app/thirdparty_libs/fribidi/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
project(local_fribidi C)
|
||||
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
set(FRIBIDI_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_FRIBIDI_SRCDIR}")
|
||||
set(FRIBIDI_CONFIG_DIR "${PROJECT_SOURCE_DIR}")
|
||||
diff --git a/android/app/thirdparty_libs/libunibreak/CMakeLists.txt b/android/app/thirdparty_libs/libunibreak/CMakeLists.txt
|
||||
index 728fcda7c..2265d6b9b 100644
|
||||
--- a/android/app/thirdparty_libs/libunibreak/CMakeLists.txt
|
||||
+++ b/android/app/thirdparty_libs/libunibreak/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
project(local_unibreak C)
|
||||
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
set(LIBUNIBREAK_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../../../thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src")
|
||||
|
||||
diff --git a/crengine/Tools/blend-algo-test/CMakeLists.txt b/crengine/Tools/blend-algo-test/CMakeLists.txt
|
||||
index 29157ca61..1e35279a5 100644
|
||||
--- a/crengine/Tools/blend-algo-test/CMakeLists.txt
|
||||
+++ b/crengine/Tools/blend-algo-test/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
project(blend-algo-test C)
|
||||
|
||||
-cmake_minimum_required(VERSION 2.6.2)
|
||||
+cmake_minimum_required(VERSION 3.5..4.0)
|
||||
|
||||
include_directories(${CMAKE_BINARY_DIR})
|
||||
@@ -8,19 +8,22 @@
|
||||
qttools,
|
||||
fribidi,
|
||||
libunibreak,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "coolreader";
|
||||
version = "3.2.57";
|
||||
version = "3.2.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buggins";
|
||||
repo = "coolreader";
|
||||
rev = "cr${version}";
|
||||
sha256 = "sha256-ZfgaLCLvBU6xP7nx7YJTsJSpvpdQgLpSMWH+BsG8E1g=";
|
||||
sha256 = "sha256-DUcYUFxPPSPvoEUEbKYEAGxFeFGQCfOFA0+SegoC4oI=";
|
||||
};
|
||||
|
||||
patches = [ ./cmake_policy_version_3_5.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -30,6 +33,7 @@ mkDerivation rec {
|
||||
qttools
|
||||
fribidi
|
||||
libunibreak
|
||||
zstd
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -45,13 +45,13 @@
|
||||
"vendorHash": "sha256-weHY7ZV3HaFBYlDNhwAYN9vDItkI+wtk9UNlM0uuwfY="
|
||||
},
|
||||
"aliyun_alicloud": {
|
||||
"hash": "sha256-i53+JvEr5K4/RCsk5Kfa1Nbox1/KfsgXjX5wCa4zd7o=",
|
||||
"hash": "sha256-WDFoyj4DxHiS1xIu8bPKUzHaVsGn88rIBzx3KoE8lA0=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.266.0",
|
||||
"rev": "v1.267.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-xRoj0X06lhoVXFLfrV8ganqsyzc4PFk+6R2Jx67VIpE="
|
||||
"vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-G6eQeoxIeuUJK7LF8gByOrNP27i3p0OccZNxL2DxDw0=",
|
||||
|
||||
@@ -43,9 +43,13 @@ stdenv.mkDerivation rec {
|
||||
"--with-c-client-target=slx"
|
||||
];
|
||||
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/372699
|
||||
# See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074804
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/372699
|
||||
# See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074804
|
||||
"-Wno-incompatible-pointer-types"
|
||||
# Opt out of C23 (and its stricter prototype rules) in GCC15
|
||||
"-std=gnu17"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
callPackage,
|
||||
cmake,
|
||||
espeak-ng,
|
||||
fetchpatch2,
|
||||
ffmpeg,
|
||||
file,
|
||||
freetype,
|
||||
@@ -164,17 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
popd
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Upstream patch to support ffmpeg 8
|
||||
(fetchpatch2 {
|
||||
name = "0001-build-fix-build-with-latest-ffmpeg.patch";
|
||||
url = "https://chiselapp.com/user/letoram/repository/arcan/vpatch?from=cc6f24de2134282a&to=25bbde5eec7033d3";
|
||||
hash = "sha256-i8d/X/xmEGWpO9fG6BerW//JnosPwDolXvMFsuv39IM=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/platform/posix/paths.c \
|
||||
--replace-fail "/usr/bin" "$out/bin" \
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
|
||||
{
|
||||
@@ -7,13 +8,14 @@
|
||||
let
|
||||
self = {
|
||||
pname = "arcan";
|
||||
version = "0.7.0.1";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
tag = self.version;
|
||||
hash = "sha256-AbIMZOyEvRQzlmNetImLnBBoSaFUsy4k1NNSO0mI8FI=";
|
||||
hash = "sha256-rADO6xLkUa3iIOSOR96fr1mR7wAUJpsSPoVn+CTNyOo=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cat9";
|
||||
version = "0-unstable-2024-06-17";
|
||||
version = "0-unstable-2025-12-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "letoram";
|
||||
repo = "cat9";
|
||||
rev = "f00e8791c1826065d4a93ace12e55ab5732d17a7";
|
||||
hash = "sha256-xFw6r7SQK0T5j7hVK3U39U2Q/qZow6Ad/R0Cl6nqUQw=";
|
||||
rev = "8d2b30545c3e87c8f2e161d755b53c23a48bcf05";
|
||||
hash = "sha256-KSXfa7K8SxnyPmSNCXZs8C+gGYxkLRu0MFbJ3cotSEQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "coroot";
|
||||
version = "1.11.4";
|
||||
version = "1.17.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m8rh969hac6D5KaSH5BvIQGJ+0qTAfyoK/cKCidt4N8=";
|
||||
hash = "sha256-MeHRWrRGvp5oOSiMXtXNMZtKA6Q2577ty47HOxtBGJk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1yKb8CuNcwpHWC0eDIs2Ml3H7xGYaTCGxyrtuyLvd8c=";
|
||||
vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/front";
|
||||
hash = "sha256-inZV+iv837+7ntBae/oLSNLxpzoqEcJNPNdBE+osJHQ=";
|
||||
hash = "sha256-6a8eOPgAdpZpdXmrHVw/twfikjjWHSy/BdYdlyRQkjc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "durden";
|
||||
version = "0-unstable-2024-06-23";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "letoram";
|
||||
repo = "durden";
|
||||
rev = "dffb94b69355ffa9cda074c1d0a48af74b78c220";
|
||||
hash = "sha256-sBhlBk4vAYwedw4VerUfY80SXbVoEDid54si6qwDeXs=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dWLOLOICcVjqYTw8KAPM2/xgB9mTSEdGGIHD1WSrIvA=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatus";
|
||||
version = "5.33.1";
|
||||
version = "5.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TwiN";
|
||||
repo = "gatus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m7dOgxk1EuyqIuVK4ZDimqZX015Osk5FF+0/SFAkp90=";
|
||||
hash = "sha256-+Ulttz13SzPnB+EFsyK2H/bv2vXn+uA/zv6UY9HKrgY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T4BPCDYR/f2rInLNytaVibE2hKWsIYqpJw9asY0TbvY=";
|
||||
vendorHash = "sha256-xN38oaMcErkq4FtWi/Kzp9fhC5dk8CeJYehlwtVgf0M=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ let
|
||||
owner = "videostreaming";
|
||||
repo = "Grayjay.Desktop";
|
||||
tag = version;
|
||||
hash = "sha256-AKFPPfz5Cbk6fI0H6E3Q+KUvPW4YbVSKcQZUrJCyHeE=";
|
||||
hash = "sha256-cnOhyaeoDXPaeRJnJpx1HcegWitcfMJe/vezxZ/zpFQ=";
|
||||
fetchSubmodules = true;
|
||||
fetchLFS = true;
|
||||
};
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildNpmPackage,
|
||||
fetchNpmDeps,
|
||||
fetchFromGitHub,
|
||||
nodejs_22,
|
||||
pkg-config,
|
||||
node-gyp,
|
||||
vips,
|
||||
@@ -52,6 +53,9 @@ buildNpmPackage rec {
|
||||
patches = [ ./0004-fix-deps-v080.patch ];
|
||||
};
|
||||
|
||||
# npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
|
||||
nodejs = nodejs_22;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
node-gyp
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From f1e35d1102a87eb576ce3f09da5cdf1d4b09722c Mon Sep 17 00:00:00 2001
|
||||
From: Anders Kaseorg <andersk@mit.edu>
|
||||
Date: Thu, 1 Jan 2026 21:50:52 -0800
|
||||
Subject: [PATCH] Fix incompatible pointer type errors from GCC 15
|
||||
|
||||
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
|
||||
---
|
||||
treengeling.c | 16 +++++++++++++---
|
||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/treengeling.c b/treengeling.c
|
||||
index 1fcafc8..c26c5b5 100644
|
||||
--- a/treengeling.c
|
||||
+++ b/treengeling.c
|
||||
@@ -292,6 +292,16 @@ UNLOCK (simplified)
|
||||
UNLOCK (stats)
|
||||
UNLOCK (workers)
|
||||
|
||||
+static void lockmsg_callback (void * voidptr) {
|
||||
+ lockmsg();
|
||||
+ (void) voidptr;
|
||||
+}
|
||||
+
|
||||
+static void unlockmsg_callback (void * voidptr) {
|
||||
+ unlockmsg();
|
||||
+ (void) voidptr;
|
||||
+}
|
||||
+
|
||||
/*------------------------------------------------------------------------*/
|
||||
|
||||
static void err (const char * fmt, ...) {
|
||||
@@ -818,7 +828,7 @@ static void initroot () {
|
||||
lglsetopt (root, "bca", 0);
|
||||
lglseterm (root, term, 0);
|
||||
lglsetconsumeunits (root, consumeunits, &rootconsumed);
|
||||
- lglsetmsglock (root, lockmsg, unlockmsg, 0);
|
||||
+ lglsetmsglock (root, lockmsg_callback, unlockmsg_callback, 0);
|
||||
}
|
||||
lglsetime (root, getime);
|
||||
lglsetprefix (root, "c (root) ");
|
||||
@@ -857,7 +867,7 @@ static Node * newnode (Node * parent, int decision) {
|
||||
sprintf (prefix, "c (%d %lld) ", res->depth, (LL) res->id);
|
||||
lglsetprefix (res->lgl, prefix);
|
||||
lglseterm (res->lgl, term, 0);
|
||||
- lglsetmsglock (res->lgl, lockmsg, unlockmsg, 0);
|
||||
+ lglsetmsglock (res->lgl, lockmsg_callback, unlockmsg_callback, 0);
|
||||
if (!noparallel) lglsetconsumeunits (res->lgl, consumeunits, &res->consumed);
|
||||
cubemsg (res, "opened cube");
|
||||
added++;
|
||||
@@ -1040,7 +1050,7 @@ static void startparallel (LGL * lgl) {
|
||||
lglseterm (parallel.lgl, term, 0);
|
||||
lglsetproduceunit (parallel.lgl, produceunit, 0);
|
||||
lglsetconsumecls (parallel.lgl, consumecls, 0);
|
||||
- lglsetmsglock (parallel.lgl, lockmsg, unlockmsg, 0);
|
||||
+ lglsetmsglock (parallel.lgl, lockmsg_callback, unlockmsg_callback, 0);
|
||||
parallel.decisions = lglgetdecs (parallel.lgl);
|
||||
parallel.conflicts = lglgetconfs (parallel.lgl);
|
||||
parallel.propagations = lglgetprops (parallel.lgl);
|
||||
@@ -17,6 +17,12 @@ stdenv.mkDerivation {
|
||||
sha256 = "1lb2g37nd8qq5hw5g6l691nx5095336yb2zlbaw43mg56hkj8357";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix incompatible pointer type errors from GCC 15
|
||||
# https://github.com/arminbiere/lingeling/pull/11
|
||||
./gcc-15.patch
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nohang";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hakavlad";
|
||||
repo = "nohang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aRiBGnJHdtQ5euvJ4DSuCZO5i5OJVRiCesaatrIARmg=";
|
||||
hash = "sha256-gCGjQoSxY/MprrcpdFrJ4VrsNyruqsUSPrHoy+R07Io=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "resterm";
|
||||
version = "0.13.2";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unkn0wn-root";
|
||||
repo = "resterm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-CA1+Sa9fqeTaz37FCJGErShinMP6cSNoCtuifdyLUpk=";
|
||||
sha256 = "sha256-ip/0QKMK+/wbc9O3yTP2AEUgV2DJN92LmCq47YFYrhk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Kj60MkxqRYORANalbJnjgtHMDgxOUOeaF1opqcYnVww=";
|
||||
vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc=";
|
||||
|
||||
subPackages = [ "cmd/resterm" ];
|
||||
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "slade";
|
||||
version = "3.2.9-unstable-2025-12-26";
|
||||
version = "3.2.9-unstable-2026-01-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = "23c0c881780316304e4441e3f910f9db2b1ea2f9";
|
||||
hash = "sha256-egzcc1rqlZdUAjyumHXqmL6XP3G6YzkS2iaX48ZBJiA=";
|
||||
rev = "2f67a4aed53fdd97aabfafa103ff120df5f73b3c";
|
||||
hash = "sha256-eb9UBHws9VFcYIc5ONcbjoM56zHKwETUyaSIZBAgRHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
arcan,
|
||||
audit,
|
||||
dbus,
|
||||
@@ -40,15 +40,16 @@
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalPackages: {
|
||||
stdenv.mkDerivation (finalPackages: rec {
|
||||
pname = "xarcan";
|
||||
version = "0-unstable-2024-08-26";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "letoram";
|
||||
repo = "xarcan";
|
||||
rev = "5672116f627de492fb4df0b33d36b78041cd3931";
|
||||
hash = "sha256-xZX6uLs/H/wONKrUnYxSynHK7CL7FDfzWvSjtXxT8es=";
|
||||
tag = version;
|
||||
hash = "sha256-j20Wz/Ae4QTincAPgMoj19EfKAPxIGm0Jgmi4sUR88o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -114,7 +115,7 @@ stdenv.mkDerivation (finalPackages: {
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/letoram/letoram";
|
||||
homepage = "https://codeberg.org/letoram/xarcan";
|
||||
description = "Patched Xserver that bridges connections to Arcan";
|
||||
mainProgram = "Xarcan";
|
||||
longDescription = ''
|
||||
|
||||
@@ -65,7 +65,8 @@ stdenv.mkDerivation rec {
|
||||
for file in scrub/*.in; do
|
||||
substituteInPlace "$file" \
|
||||
--replace-quiet '@sbindir@' '/run/current-system/sw/bin' \
|
||||
--replace-quiet '@pkg_state_dir@' '/var'
|
||||
--replace-quiet '@stampfile@' '@pkg_state_dir@/xfs_scrub_all_media.stamp' \
|
||||
--replace-quiet '@pkg_state_dir@' '/var/lib/xfsprogs'
|
||||
done
|
||||
patchShebangs ./install-sh
|
||||
'';
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gitMinimal,
|
||||
pkg-config,
|
||||
lcms2,
|
||||
tinyxml,
|
||||
boost,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAtts: {
|
||||
pname = "opencolorio";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
repo = "OpenColorIO";
|
||||
tag = "v${finalAtts.version}";
|
||||
hash = "sha256-S6N0WK0CQ1wOL77viA6vBNkkW7xLPUClu5+FoljfWYs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
# TODO: Investigate whether git can be dropped: It's only used to apply patches
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gitMinimal
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
lcms2
|
||||
tinyxml
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin boost;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/core/CMakeLists.txt --replace "-Werror" ""
|
||||
substituteInPlace src/pyglue/CMakeLists.txt --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_LCMS=ON"
|
||||
"-DUSE_EXTERNAL_TINYXML=ON"
|
||||
# External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
|
||||
"-DUSE_EXTERNAL_YAML=OFF"
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
|
||||
++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"
|
||||
++ lib.optional (
|
||||
stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
|
||||
) "-DCMAKE_OSX_ARCHITECTURES=arm64";
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
# yaml-cpp uses std::auto_ptr and std::binary_function which has
|
||||
# been disabled in clang with libcxx. These flags re-enables these
|
||||
# features
|
||||
NIX_CXXSTDLIB_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR=1 -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION=1";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput bin "$bin"
|
||||
moveToOutput cmake "$dev"
|
||||
mv $out/OpenColorIOConfig.cmake $dev/cmake/
|
||||
|
||||
substituteInPlace "$dev/cmake/OpenColorIO-release.cmake" \
|
||||
--replace "$out/bin" "$bin/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://opencolorio.org";
|
||||
description = "Color management framework for visual effects and animation";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ yzx9 ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -1241,6 +1241,7 @@ mapAliases {
|
||||
openbabel3 = openbabel; # Added 2025-09-17
|
||||
openbsdCross = throw "'openbsdCross' has been renamed to/replaced by 'openbsd'"; # Converted to throw 2025-10-27
|
||||
opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
|
||||
opencolorio_1 = throw "'opencolorio_1' has been removed. Use opencolorio instead"; # Added 2026-01-03
|
||||
openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27
|
||||
openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27
|
||||
openhmd = throw "'openhmd' has been removed due to being unmaintained upstream"; # Added 2025-11-05
|
||||
|
||||
@@ -7884,7 +7884,6 @@ with pkgs;
|
||||
openexr_2 = callPackage ../development/libraries/openexr/2.nix { };
|
||||
|
||||
opencolorio = callPackage ../development/libraries/opencolorio { };
|
||||
opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
|
||||
|
||||
openstackclient = with python313Packages; toPythonApplication python-openstackclient;
|
||||
openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: {
|
||||
|
||||
Reference in New Issue
Block a user