gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-01-02 06:07:35 +00:00
committed by GitHub
parent d02ccbc223 f33f2f8133
commit e2e2bd8e41
37 changed files with 347 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+5
View File
@@ -23801,6 +23801,11 @@
githubId = 33031;
name = "Greg Pfeil";
};
sempiternal-aurora = {
github = "sempiternal-aurora";
githubId = 78790545;
name = "Myria Sarvay";
};
semtexerror = {
email = "github@spampert.com";
github = "SemtexError";
nixos/modules/services/backup/syncoid.nix
+2 -2
View File
@@ -27,7 +27,7 @@ let
# Function to build "zfs allow" commands for the filesystems we've delegated
# permissions to. It also checks if the target dataset exists before
# delegating permissions, if it doesn't exist we delegate it to the parent
# dataset (if it exists). This should solve the case of provisoning new
# dataset (if it exists). This should solve the case of provisioning new
# datasets.
buildAllowCommand =
permissions: dataset:
@@ -42,7 +42,7 @@ let
"list"
dataset
]
} 2> /dev/null; then
} 2>&1 >/dev/null; then
${lib.escapeShellArgs [
"/run/booted-system/sw/bin/zfs"
"allow"
pkgs/applications/emulators/libretro/cores/citra.nix
+5
View File
@@ -19,6 +19,11 @@ mkLibretroCore {
fetchSubmodules = true;
};
patches = [
# Fix build with GCC 15. See https://github.com/KhronosGroup/glslang/pull/3684.
./patches/citra-gcc-15.patch
];
makefile = "Makefile";
extraBuildInputs = [
pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+2
View File
@@ -39,6 +39,8 @@ mkLibretroCore {
url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/3c3e7fbc70b8f533c09c964cf468ba5e8d61351c.patch?full_index=1";
hash = "sha256-PCJLNYhhccnWLcnPaHL6tz+5qdjogJRYfzZIh3r+Vlk=";
})
# Fix for GCC 15. See https://github.com/libretro/GLideN64/pull/1.
./patches/mupen64plus-gcc-15.patch
];
extraNativeBuildInputs = [
pkgs/applications/emulators/libretro/cores/patches/citra-gcc-15.patch
+13
View File
@@ -0,0 +1,13 @@
Submodule externals/glslang contains modified content
diff --git a/externals/glslang/SPIRV/SpvBuilder.h b/externals/glslang/SPIRV/SpvBuilder.h
index 02e9cf40..40efd59c 100644
--- a/externals/glslang/SPIRV/SpvBuilder.h
+++ b/externals/glslang/SPIRV/SpvBuilder.h
@@ -56,6 +56,7 @@ namespace spv {
}
#include <algorithm>
+#include <cstdint>
#include <map>
#include <memory>
#include <set>
pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/GLideN64/src/GLideNHQ/TxHiResLoader.h b/GLideN64/src/GLideNHQ/TxHiResLoader.h
index 4c13651..f887c78 100644
--- a/GLideN64/src/GLideNHQ/TxHiResLoader.h
+++ b/GLideN64/src/GLideNHQ/TxHiResLoader.h
@@ -13,6 +13,8 @@
#define CORRECTFILENAME(str)
#endif /* OS_WINDOWS */
+#include <cstdint>
+
#include "TxCache.h"
#include "TxQuantize.h"
#include "TxImage.h"
pkgs/applications/graphics/nufraw/default.nix
+1 -1
View File
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
"--enable-dst-correction"
];
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing -Wno-error=incompatible-pointer-types -std=gnu17";
postInstall = lib.optionalString addThumbnailer ''
mkdir -p $out/share/thumbnailers
pkgs/applications/version-management/monotone/botan2.nix
+4
View File
@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
};
postPatch = ''
sed -e '1i#include <cstdint>' -i src/cli/cli.h
'';
nativeBuildInputs = [
python3
docutils
pkgs/by-name/al/all-the-package-names/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "all-the-package-names";
version = "2.0.2296";
version = "2.0.2309";
src = fetchFromGitHub {
owner = "nice-registry";
repo = "all-the-package-names";
tag = "v${version}";
hash = "sha256-cAB0YF1Qi98yVZgU8Bi/zVB08TebOeQpdxHlVgR9qbg=";
hash = "sha256-DSriCaoMVYoZOIZKGZIximjzPVteAuIwOv2bswinqgc=";
};
npmDepsHash = "sha256-oaaNWLaUV7Hd1x6QEw4p3n7MZQJeXeUqWH2nMNGm+H4=";
npmDepsHash = "sha256-Qz7sbsbeaS2e2OsM6rtTPfzNzUXZOVxK/pi438qzy2o=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "ananicy-rules-cachyos";
version = "0-unstable-2025-12-25";
version = "0-unstable-2025-12-28";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
rev = "410a04d9af9ac9b6bfefa06cf53ae9b91f1294bd";
hash = "sha256-vEwpJ5AQS4Xwdyvm6/jOtG3V32C50qr3W8hkEbq/IJk=";
rev = "3f1f24c3fc1c15444efd00d5562a37e2d4e06995";
hash = "sha256-RXOV8JICxo97T4TPtCr0tfiudHy1Tam7vjP5BDj86bY=";
};
dontConfigure = true;
pkgs/by-name/an/antu-icons/package.nix
+40
View File
@@ -0,0 +1,40 @@
{
lib,
stdenvNoCC,
fetchFromGitLab,
hicolor-icon-theme,
}:
stdenvNoCC.mkDerivation {
pname = "antu-icons";
version = "2.0"; # https://www.opendesktop.org/p/1188266/
src = fetchFromGitLab {
owner = "froodo_alexis";
repo = "Antu-icons";
rev = "a12a9e559b59c8ded47531e299a5516718ef9a28";
hash = "sha256-CLcr+X/b0moVEBV0O/dzCDq4w5G2+KRLUBdqKm0eAKA=";
};
propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/antu-icons
cp -r * $out/share/icons/antu-icons
# Remove broken symlinks
find $out/share/icons/antu-icons -xtype l -delete
runHook postInstall
'';
meta = {
description = "Smooth icon theme designed for Plasma Desktop";
homepage = "https://gitlab.com/froodo_alexis/Antu-icons";
license = lib.licenses.cc-by-nc-sa-30;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ iamanaws ];
};
}
pkgs/by-name/bs/bs-manager/package.nix
+2 -1
View File
@@ -8,6 +8,7 @@
fetchNpmDeps,
fetchFromGitHub,
makeDesktopItem,
nodejs_22,
autoPatchelfHook,
copyDesktopItems,
@@ -17,7 +18,7 @@
steam-run-free,
}:
buildNpmPackage (finalAttrs: {
buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: {
pname = "bs-manager";
version = "1.5.4";
pkgs/by-name/cg/cgns/package.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "cgns";
repo = "cgns";
tag = "v${finalAttrs.version}";
hash = "sha256-9i44GJesbZ2kV+ZSpYPYEhH873W8DxD1/aYzD19eAJ8=";
hash = "sha256-0cZtq8nVAHAubHD6IDofnh8N7xiNHQkbhXR5OpdhPQU=";
};
postPatch = ''
pkgs/by-name/fb/fbida/function-parameters.patch
+16
View File
@@ -0,0 +1,16 @@
diff --git a/jpeg/62/jpeglib.h b/jpeg/62/jpeglib.h
index d1be8dd..38436ef 100644
--- a/jpeg/62/jpeglib.h
+++ b/jpeg/62/jpeglib.h
@@ -814,11 +814,7 @@ typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
* Note JPP requires double parentheses.
*/
-#ifdef HAVE_PROTOTYPES
#define JPP(arglist) arglist
-#else
-#define JPP(arglist) ()
-#endif
/* Short forms of external names for systems with brain-damaged linkers.
pkgs/by-name/fb/fbida/package.nix
+2
View File
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2";
sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi";
})
# Prevents using function declaration without explicit parameters.
./function-parameters.patch
];
nativeBuildInputs = [
pkgs/by-name/in/intel-compute-runtime-legacy1/add-cstdint-include-gcc15.patch
+25
View File
@@ -0,0 +1,25 @@
From 38fdd9d36c5e8a471f38d3f131c2fdf6720e2577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= <lotte@chir.rs>
Date: Wed, 31 Dec 2025 16:32:36 +0100
Subject: [PATCH] fix: Add another missing include for GCC 15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Charlotte Deleńkec <lotte@chir.rs>
---
shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp b/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
index 99f771c98457e..e78c638c35532 100644
--- a/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+++ b/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
@@ -7,6 +7,7 @@
#include "shared/source/os_interface/linux/i915.h"
+#include <cstdint>
#include <memory>
#include <vector>
pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
+7 -2
View File
@@ -17,13 +17,13 @@ in
stdenv.mkDerivation rec {
# https://github.com/intel/compute-runtime/blob/master/LEGACY_PLATFORMS.md
pname = "intel-compute-runtime-legacy1";
version = "24.35.30872.32"; # 24.35.30872.x is the last series to support Gen8, Gen9 and Gen11 GPU support
version = "24.35.30872.41"; # 24.35.30872.x is the last series to support Gen8, Gen9 and Gen11 GPU support
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
hash = "sha256-POImMopbrhVXuSx2MQ9mwPNKQx7BljyikKhu6M4hZME=";
hash = "sha256-CnMIOAPnVhKVQxAcOZAuV5M4HJ2qftzEm9YdCuvkFbI=";
};
nativeBuildInputs = [
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
level-zero
];
patches = [
# https://github.com/intel/compute-runtime/pull/879
./add-cstdint-include-gcc15.patch
];
cmakeFlags = [
"-DSKIP_UNIT_TESTS=1"
"-DIGC_DIR=${intel-graphics-compiler}"
pkgs/by-name/ip/ipopt/package.nix
+24 -18
View File
@@ -6,9 +6,12 @@
blas,
lapack,
gfortran,
mumps,
spral,
enableAMPL ? true,
libamplsolver,
enableMUMPS ? true,
mumps,
enableSPRAL ? true,
spral,
}:
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -25,12 +28,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
};
outputs = [
"bin"
"dev"
"out"
"doc"
];
outputs =
# The solver executables for AMPL modeling environment are only installed
# when AMPL is available.
lib.optional enableAMPL "bin" ++ [
"out"
"dev"
"doc"
];
nativeBuildInputs = [
pkg-config
@@ -40,17 +45,18 @@ stdenv.mkDerivation rec {
buildInputs = [
blas
lapack
mumps
spral
libamplsolver
];
]
++ lib.optional enableMUMPS mumps
++ lib.optional enableSPRAL spral
++ lib.optional enableAMPL libamplsolver;
configureFlags = [
"--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
"--with-mumps-lflags=-ldmumps"
"--with-spral-lflags=-lspral"
"--with-asl-lflags=-lamplsolver"
];
configureFlags =
lib.optionals enableMUMPS [
"--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
"--with-mumps-lflags=-ldmumps"
]
++ lib.optional enableSPRAL "--with-spral-lflags=-lspral"
++ lib.optional enableAMPL "--with-asl-lflags=-lamplsolver";
enableParallelBuilding = true;
pkgs/by-name/ku/kuyen-icons/package.nix
+40
View File
@@ -0,0 +1,40 @@
{
lib,
stdenvNoCC,
fetchFromGitLab,
hicolor-icon-theme,
}:
stdenvNoCC.mkDerivation {
pname = "kuyen-icons";
version = "2.0"; # https://www.opendesktop.org/p/1290492/
src = fetchFromGitLab {
owner = "froodo_alexis";
repo = "kuyen-icons";
rev = "7d4fdecf7121ae6077e5d22501a13ba5eb54a9f6";
hash = "sha256-28AAcjg8f0FWwbYeYOMX5OJX2eYL6/a3dgu1HlkW2ZU=";
};
propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/kuyen-icons
cp -r * $out/share/icons/kuyen-icons
# Remove broken symlinks
find $out/share/icons/kuyen-icons -xtype l -delete
runHook postInstall
'';
meta = {
description = "Colourful flat theme designed for Plasma desktop";
homepage = "https://gitlab.com/froodo_alexis/kuyen-icons";
license = lib.licenses.cc-by-nc-sa-30;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ iamanaws ];
};
}
pkgs/by-name/mo/mongodb-tools/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "mongo-tools";
version = "100.13.0";
version = "100.14.0";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-tools";
tag = version;
hash = "sha256-aQrwJFFdaCIkcnofdGtZ/BMX9KPqr1pHxwm+A04LhXI=";
hash = "sha256-QJ1pew6Lg9KAxMJ2XyVXlnRdatbgXesKKmoHCiXQb0c=";
};
vendorHash = null;
pkgs/by-name/pa/paratype-pt-mono/package.nix
+14 -18
View File
@@ -1,41 +1,37 @@
{
lib,
stdenvNoCC,
fetchzip,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "paratype-pt-mono";
version = "2.005";
version = "1.001";
src = fetchzip {
urls = [
"https://company.paratype.com/system/attachments/631/original/ptmono.zip"
"http://rus.paratype.ru/system/attachments/631/original/ptmono.zip"
];
stripRoot = false;
hash = "sha256-mfDAu/KGelC6wZpUCrUrLVZKo+XiKNBqcpMI8tH2tMw=";
src = fetchFromGitHub {
owner = "google";
repo = "fonts";
rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf";
hash = "sha256-wzm6KzO/arar7VMvm0l0L6gi3CnglmZKSGe7c0i530Q=";
rootDir = "ofl/ptmono";
};
installPhase = ''
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *.txt -t $out/share/doc/paratype
runHook postInstall
'';
meta = {
homepage = "http://www.paratype.ru/public/";
homepage = "https://www.paratype.ru/catalog/font/pt/pt-mono";
description = "Open Paratype font";
license = lib.licenses.paratype;
# no commercial distribution of the font on its own
# must rename on modification
# http://www.paratype.ru/public/pt_openlicense.asp
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ raskin ];
maintainers = with lib.maintainers; [
raskin
pancaek
];
};
}
pkgs/by-name/pa/paratype-pt-sans/package.nix
+14 -18
View File
@@ -1,41 +1,37 @@
{
lib,
stdenvNoCC,
fetchzip,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "paratype-pt-sans";
version = "2.005";
version = "2.003";
src = fetchzip {
urls = [
"https://company.paratype.com/system/attachments/629/original/ptsans.zip"
"http://rus.paratype.ru/system/attachments/629/original/ptsans.zip"
];
stripRoot = false;
hash = "sha256-34TqYXtWzkAstaGQBhJy+/hVk5tg6ZvHZ/kvUroWVLs=";
src = fetchFromGitHub {
owner = "google";
repo = "fonts";
rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf";
hash = "sha256-44G9Pdi4GxeC9hzvCKuE7AmHyjVrjzalr3XZOgl3l6o=";
rootDir = "ofl/ptsans";
};
installPhase = ''
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *.txt -t $out/share/doc/paratype
runHook postInstall
'';
meta = {
homepage = "http://www.paratype.ru/public/";
homepage = "https://www.paratype.ru/catalog/font/pt/pt-sans";
description = "Open Paratype font";
license = lib.licenses.paratype;
# no commercial distribution of the font on its own
# must rename on modification
# http://www.paratype.ru/public/pt_openlicense.asp
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ raskin ];
maintainers = with lib.maintainers; [
raskin
pancaek
];
};
}
pkgs/by-name/pa/paratype-pt-serif/package.nix
+14 -18
View File
@@ -1,41 +1,37 @@
{
lib,
stdenvNoCC,
fetchzip,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "paratype-pt-serif";
version = "2.005";
version = "1.000";
src = fetchzip {
urls = [
"https://company.paratype.com/system/attachments/634/original/ptserif.zip"
"http://rus.paratype.ru/system/attachments/634/original/ptserif.zip"
];
stripRoot = false;
hash = "sha256-4L3t5NEHmj975fn8eBAkRUO1OL0xseNp9g7k7tt/O2c=";
src = fetchFromGitHub {
owner = "google";
repo = "fonts";
rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf";
hash = "sha256-HpA4r5VqAVtPFY9ltRUeZERNfyFRkAvwununoDF+5mk=";
rootDir = "ofl/ptserif";
};
installPhase = ''
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *.txt -t $out/share/doc/paratype
runHook postInstall
'';
meta = {
homepage = "http://www.paratype.ru/public/";
homepage = "https://www.paratype.ru/catalog/font/pt/pt-serif";
description = "Open Paratype font";
license = lib.licenses.paratype;
# no commercial distribution of the font on its own
# must rename on modification
# http://www.paratype.ru/public/pt_openlicense.asp
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ raskin ];
maintainers = with lib.maintainers; [
raskin
pancaek
];
};
}
pkgs/by-name/rs/rstudio/package.nix
+5 -1
View File
@@ -17,7 +17,7 @@
git,
jdk,
makeWrapper,
nodejs,
nodejs_22,
npmHooks,
xcbuild,
yarn,
@@ -44,6 +44,10 @@
}:
let
# nodejs_24 has npm v11, which broke the lockfile
# let's just use nodejs_22 for now
nodejs = nodejs_22;
electron = electron_37;
mathJaxSrc = fetchzip {
pkgs/by-name/sq/sqlboiler/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "sqlboiler";
version = "4.19.5";
version = "4.19.6";
src = fetchFromGitHub {
owner = "volatiletech";
repo = "sqlboiler";
tag = "v${version}";
hash = "sha256-GbQCHScE04nM8QzQzPSpD3efmfYEQRbioNfVcdmfPlc=";
hash = "sha256-A0NHGq5yVlHqKpu/4KIVj/EJYOrN/oFRaCkOBm5h4i8=";
};
vendorHash = "sha256-LMHFDOKZQa0DJLHehRBzGGlb7apppnMDbjnJ4spuZtA=";
vendorHash = "sha256-ULoyMN54RIFST6P91V3MnRrfiC7+o3LmUFdc0pIqj90=";
tags = [
"mysql"
pkgs/by-name/su/surge/package.nix
+3
View File
@@ -70,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
rsync
];
# Fix build with gcc 15
env.NIX_CFLAGS_COMPILE = "-Wno-deprecated";
postPatch = ''
substituteInPlace src/common/SurgeStorage.cpp \
--replace "/usr/share/Surge" "$out/share/surge"
pkgs/by-name/va/validator-nu/package.nix
+27 -11
View File
@@ -1,9 +1,13 @@
{
ant,
cacert,
fetchFromGitHub,
git,
installShellFiles,
jdk_headless,
jre_headless,
makeWrapper,
pandoc,
python3,
stdenvNoCC,
lib,
@@ -12,14 +16,13 @@
let
pname = "validator-nu";
version = "23.4.11-unstable-2023-12-18";
version = "25.12.12";
src = fetchFromGitHub {
owner = "validator";
repo = "validator";
rev = "c3a401feb6555affdc891337f5a40af238f9ac2d";
fetchSubmodules = true;
hash = "sha256-pcA3HXduzFKzoOHhor12qvzbGSSvo3k3Bpy2MvvQlCI=";
rev = "7ed7f67468f7f61975dcc78891ea462fce578828";
hash = "sha256-cdDmhRyXIdoNWhP4oqu7vRb5abuNXRqvt4P4Dzq48xY=";
};
deps = stdenvNoCC.mkDerivation {
@@ -27,23 +30,31 @@ let
inherit version src;
nativeBuildInputs = [
git
ant
cacert
jdk_headless
python3
python3.pkgs.certifi
];
postPatch = ''
substituteInPlace build/build.xml \
--replace-fail \
'src="https://html.spec.whatwg.org/"' \
'src="https://html.spec.whatwg.org/commit-snapshots/0aa021ab4f21a6550f1591a9cc98449aaea9eefa/"'
'';
buildPhase = ''
python checker.py dldeps
'';
installPhase = ''
mkdir "$out"
mkdir "$out" "$out/build"
mv dependencies extras "$out"
mv build/html5spec "$out/build"
'';
outputHashMode = "recursive";
outputHash = "sha256-LPtxpUd7LAYZHJL7elgcZOTaTgHqeqquiB9hiuajA6c=";
outputHash = "sha256-8cMoLeOnKNqisezkVS2UeVW11gtkGmhvQWrbSVuqbb8=";
};
in
@@ -51,21 +62,25 @@ stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname version src;
nativeBuildInputs = [
git
ant
installShellFiles
jdk_headless
makeWrapper
pandoc
python3
];
postPatch = ''
substituteInPlace build/build.py --replace-warn \
substituteInPlace build/build.py --replace-fail \
'validatorVersion = "%s.%s.%s" % (year, month, day)' \
'validatorVersion = "${finalAttrs.version}"'
'';
buildPhase = ''
ln -s '${deps}/dependencies' '${deps}/extras' .
JAVA_HOME='${jdk_headless}' python checker.py build
ln -s '${deps}/build/html5spec' build/
JAVA_HOME='${jdk_headless}' python checker.py --offline build
make -C docs VNU_VERSION='${finalAttrs.version}' DATE='date -d @$(SOURCE_DATE_EPOCH)'
'';
installPhase = ''
@@ -73,6 +88,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
mkdir -p "$out/bin" "$out/share/java"
mv build/dist/vnu.jar "$out/share/java/"
installManPage docs/*.1
makeWrapper "${jre_headless}/bin/java" "$out/bin/vnu" \
--add-flags "-jar '$out/share/java/vnu.jar'"
pkgs/by-name/va/vampire/minisat-fenv.patch
-57
View File
@@ -1,57 +0,0 @@
diff --git a/core/Main.cc b/core/Main.cc
index 2b0d97b..9ba985d 100644
--- a/core/Main.cc
+++ b/core/Main.cc
@@ -77,9 +77,13 @@ int main(int argc, char** argv)
setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
// printf("This is MiniSat 2.0 beta\n");
-#if defined(__linux__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+#if defined(__linux__) && defined(__x86_64__)
+ fenv_t fenv;
+
+ fegetenv(&fenv);
+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
+ fesetenv(&fenv);
printf("WARNING: for repeatability, setting FPU to use double precision\n");
#endif
// Extra options:
diff --git a/simp/Main.cc b/simp/Main.cc
index 2804d7f..7fbdb33 100644
--- a/simp/Main.cc
+++ b/simp/Main.cc
@@ -78,9 +78,13 @@ int main(int argc, char** argv)
setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
// printf("This is MiniSat 2.0 beta\n");
-#if defined(__linux__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+#if defined(__linux__) && defined(__x86_64__)
+ fenv_t fenv;
+
+ fegetenv(&fenv);
+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
+ fesetenv(&fenv);
printf("WARNING: for repeatability, setting FPU to use double precision\n");
#endif
// Extra options:
diff --git a/utils/System.h b/utils/System.h
index 1758192..840bee5 100644
--- a/utils/System.h
+++ b/utils/System.h
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#ifndef Minisat_System_h
#define Minisat_System_h
-#if defined(__linux__)
-#include <fpu_control.h>
+#if defined(__linux__) && defined(__x86_64__)
+#include <fenv.h>
#endif
#include "mtl/IntTypes.h"
pkgs/by-name/va/vampire/package.nix
+30 -24
View File
@@ -2,50 +2,56 @@
lib,
stdenv,
fetchFromGitHub,
cmake,
z3,
zlib,
}:
stdenv.mkDerivation rec {
let
z3_4_14_0 = z3.overrideAttrs rec {
version = "4.14.0";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
rev = "z3-${version}";
hash = "sha256-Bv7+0J7ilJNFM5feYJqDpYsOjj7h7t1Bx/4OIar43EI=";
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "vampire";
version = "4.9";
version = "5.0.0";
src = fetchFromGitHub {
owner = "vprover";
repo = "vampire";
tag = "v${version}casc2024";
hash = "sha256-NHAlPIy33u+TRmTuFoLRlPCvi3g62ilTfJ0wleboMNU=";
tag = "v${finalAttrs.version}";
hash = "sha256-jRzVh1KirWi9GpOkzSGoIBUExDN1rV0b3AGwa6gWb3I=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
buildInputs = [
z3
zlib
z3_4_14_0
];
makeFlags = [
"vampire_z3_rel"
"CC:=$(CC)"
"CXX:=$(CXX)"
];
postPatch = ''
patch -p1 -i ${./minisat-fenv.patch} -d Minisat || true
'';
cmakeFlags = [ (lib.cmakeFeature "Z3_DIR" "${z3_4_14_0.dev}/lib/cmake") ];
enableParallelBuilding = true;
fixupPhase = ''
runHook preFixup
prePatch = ''
rm -rf z3
runHook postFixup
'';
installPhase = ''
runHook preInstall
install -m0755 -D vampire_z3_rel* $out/bin/vampire
# some versions place the binary at ./ while others at bin/
if test -n "$(find . -maxdepth 1 -name 'vampire*' -print -quit)"
then
install -m0755 -D vampire* $out/bin/vampire
else
install -m0755 -D bin/vampire* $out/bin/vampire
fi
runHook postInstall
'';
@@ -56,6 +62,6 @@ stdenv.mkDerivation rec {
mainProgram = "vampire";
platforms = lib.platforms.unix;
license = lib.licenses.bsd3;
maintainers = [ ];
maintainers = with lib.maintainers; [ sempiternal-aurora ];
};
}
})
pkgs/by-name/xe/xenia-canary/package.nix
+3 -3
View File
@@ -19,14 +19,14 @@
}:
llvmPackages_20.stdenv.mkDerivation {
pname = "xenia-canary";
version = "0-unstable-2025-12-25";
version = "0-unstable-2025-12-30";
src = fetchFromGitHub {
owner = "xenia-canary";
repo = "xenia-canary";
fetchSubmodules = true;
rev = "c42aeacf2518b7001d9192b555247503fd314869";
hash = "sha256-ztiqkjFIvMQrm+sRb3MDrjMdkPyYJd6Z5+hAbsc55pg=";
rev = "53c0178766f3370794bd123ee5634702d40f6e44";
hash = "sha256-zZY+490yHHRga1O2VI0Mtc7gS95Nj82Igbh4TrMnf5Q=";
};
dontConfigure = true;
pkgs/by-name/za/zammad/package.nix
+7
View File
@@ -3,6 +3,7 @@
lib,
nixosTests,
fetchFromGitHub,
fetchpatch,
applyPatches,
bundlerEnv,
callPackage,
@@ -28,6 +29,12 @@ let
src = fetchFromGitHub (lib.importJSON ./source.json);
patches = [
./fix-sendmail-location.diff
# Fix mail fetch failing with OpenSSL 3.6
# https://github.com/zammad/zammad/pull/5888
(fetchpatch {
url = "https://github.com/zammad/zammad/commit/01376d45f48df057e4377518e6f7e4a0db7de624.patch";
hash = "sha256-uH1/t0dP5nvh12GsJz6Yf/RXpf8+hkYoVJnLJAXqpuc=";
})
];
postPatch = ''
pkgs/development/python-modules/json-repair/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "json-repair";
version = "0.54.3";
version = "0.55.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mangiucugna";
repo = "json_repair";
tag = "v${version}";
hash = "sha256-mLysH1+kr2PcmRphfcYeZ9K1hSinQXFDCrjTxc/MB0s=";
hash = "sha256-yQ+btSuifrtr0y5GRcLY0SUEp3LQXdpvaxa6ZorA/Q8=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pandas/default.nix
+2 -1
View File
@@ -38,6 +38,7 @@
pymysql,
pyqt5,
pyreadstat,
pyxlsb,
qtpy,
s3fs,
scipy,
@@ -127,7 +128,7 @@ let
excel = [
odfpy
openpyxl
# TODO: pyxlsb
pyxlsb
xlrd
xlsxwriter
];
pkgs/development/python-modules/schemdraw/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "schemdraw";
version = "0.21";
version = "0.22";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "cdelker";
repo = "schemdraw";
tag = version;
hash = "sha256-+pvVt7Of5v17PNdZMj8hHvE5tICiTRMelp4trdUZsz4=";
hash = "sha256-trhpPv9x+S4d9AHT52/uvuCDOX4tJj6EhPzYBxtzyeQ=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/ziafont/checkfonts.nix
+4
View File
@@ -85,4 +85,8 @@
url = "https://github.com/google/fonts/raw/main/ofl/arizonia/Arizonia-Regular.ttf";
hash = "sha256-jfHBC8FdCroUXUWZwlyvrYPbaG0s76QmGfBptvG7zmI=";
}
{
url = "https://mirrors.ctan.org/fonts/cinzel/truetype/CinzelDecorative-Regular.ttf";
hash = "sha256-OKi38GSSsvwkC5pFs/uDyZWpydVIKZ7AIjma8nfJDEY=";
}
]
pkgs/development/python-modules/ziafont/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
}:
buildPythonPackage rec {
pname = "ziafont";
version = "0.10";
version = "0.11";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "cdelker";
repo = "ziafont";
tag = version;
hash = "sha256-tDwl+2EChzBDCFcZW71r4eSKyazlJSv7tRX6soPNSuY=";
hash = "sha256-KjJ+/Yo5mLV6m7Y0eIGHECH0RvdI+eaFTccDmytNTKI=";
};
build-system = [ setuptools ];
pkgs/development/rocm-modules/6/amdsmi/default.nix
+5
View File
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/ROCm/amdsmi/commit/49aa2af045a4bc688e6f3ee0545f12afc45c1efe.patch";
hash = "sha256-5dH9N4m+2mJIGVEB86SvdK3uAYyGFTfbCBJ8e09iQ3w=";
})
(fetchpatch {
name = "fix-build-with-gcc15.patch";
url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch";
hash = "sha256-MoOY5q6tQ7Q+bgm/600Etz+cxRk4L2ujkarnBjnfANw=";
})
];
nativeBuildInputs = [