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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-18 05:47:24 +00:00
committed by GitHub
parent 068be7df1f 036a9242f1
commit 2cc1d40e9c
66 changed files with 909 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+12
View File
@@ -11109,6 +11109,12 @@
githubId = 16307070;
name = "iosmanthus";
};
ipsavitsky = {
email = "ipsavitsky234@gmail.com";
github = "ipsavitsky";
githubId = 33558632;
name = "Ilya Savitsky";
};
iqubic = {
email = "sophia.b.caspe@gmail.com";
github = "iqubic";
@@ -14573,6 +14579,12 @@
githubId = 307589;
name = "Nathaniel Baxter";
};
liam-w = {
email = "liam.weitzel2@gmail.com";
github = "Liam-Weitzel";
githubId = 22010764;
name = "Liam Weitzel";
};
liamdiprose = {
email = "liam@liamdiprose.com";
github = "liamdiprose";
nixos/doc/manual/release-notes/rl-2511.section.md
+2
View File
@@ -278,6 +278,8 @@
- `libvirt` now supports using `nftables` backend.
- The `virtualisation.libvirtd.firewallBackend` option can be used to configure the firewall backend used by libvirtd.
- The third-party `ant-contrib` is no longer included in the `ant` package.
- `systemd.extraConfig` and `boot.initrd.systemd.extraConfig` was converted to RFC42-style `systemd.settings.Manager` and `boot.initrd.systemd.settings.Manager` respectively.
- `systemd.watchdog.runtimeTime` was renamed to `systemd.settings.Manager.RuntimeWatchdogSec`
- `systemd.watchdog.device` was renamed to `systemd.settings.Manager.WatchdogDevice`
nixos/modules/profiles/minimal.nix
-2
View File
@@ -24,8 +24,6 @@ in
};
programs = {
# The lessopen package pulls in Perl.
less.lessopen = mkDefault null;
command-not-found.enable = mkDefault false;
fish.generateCompletions = mkDefault false;
};
nixos/modules/profiles/perlless.nix
-1
View File
@@ -8,7 +8,6 @@
# Random perl remnants
system.tools.nixos-generate-config.enable = lib.mkDefault false;
programs.less.lessopen = lib.mkDefault null;
boot.loader.grub.enable = lib.mkDefault false;
environment.defaultPackages = lib.mkDefault [ ];
documentation.info.enable = lib.mkDefault false;
nixos/modules/services/networking/ax25/axports.nix
+4
View File
@@ -115,6 +115,10 @@ in
config = mkIf (enabledAxports != { }) {
system.requiredKernelConfig = [
(config.lib.kernelConfig.isEnabled "ax25")
];
environment.etc."ax25/axports" = {
text = concatStringsSep "\n" (
mapAttrsToList (
nixos/modules/services/web-apps/peertube.nix
+24 -46
View File
@@ -20,6 +20,7 @@ let
NPM_CONFIG_CACHE = "/var/cache/peertube/.npm";
NPM_CONFIG_PREFIX = cfg.package;
HOME = cfg.package;
XDG_CACHE_HOME = "/var/cache/peertube";
# Used for auto video transcription
HF_HOME = "/var/cache/peertube/huggingface";
};
@@ -443,6 +444,7 @@ in
plugins = lib.mkDefault "/var/lib/peertube/storage/plugins/";
client_overrides = lib.mkDefault "/var/lib/peertube/storage/client-overrides/";
well_known = lib.mkDefault "/var/lib/peertube/storage/well_known/";
uploads = lib.mkDefault "/var/lib/peertube/storage/uploads/";
};
import = {
videos = {
@@ -591,6 +593,7 @@ in
# System Call Filtering
SystemCallFilter = [
("~" + lib.concatStringsSep " " systemCallsList)
"fchown"
"pipe"
"pipe2"
];
@@ -636,7 +639,6 @@ in
locations."~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$" = {
tryFiles = "/dev/null @api";
root = cfg.settings.storage.tmp;
priority = 1140;
extraConfig = ''
@@ -644,18 +646,18 @@ in
client_max_body_size 12G;
add_header X-File-Maximum-Size 8G always;
proxy_request_buffering off;
''
+ nginxCommonHeaders;
};
locations."~ ^/api/v1/runners/jobs/[^/]+/(update|success)$" = {
tryFiles = "/dev/null @api";
root = cfg.settings.storage.tmp;
priority = 1150;
extraConfig = ''
client_max_body_size 12G;
add_header X-File-Maximum-Size 8G always;
client_max_body_size 0;
proxy_request_buffering off;
''
+ nginxCommonHeaders;
};
@@ -665,8 +667,8 @@ in
priority = 1160;
extraConfig = ''
client_max_body_size 6M;
add_header X-File-Maximum-Size 4M always;
client_max_body_size 12M;
add_header X-File-Maximum-Size 8M always;
''
+ nginxCommonHeaders;
};
@@ -728,14 +730,6 @@ in
};
# Bypass PeerTube for performance reasons.
locations."~ ^/client/(assets/images/(icons/icon-36x36\\.png|icons/icon-48x48\\.png|icons/icon-72x72\\.png|icons/icon-96x96\\.png|icons/icon-144x144\\.png|icons/icon-192x192\\.png|icons/icon-512x512\\.png|logo\\.svg|favicon\\.png|default-playlist\\.jpg|default-avatar-account\\.png|default-avatar-account-48x48\\.png|default-avatar-video-channel\\.png|default-avatar-video-channel-48x48\\.png))$" =
{
tryFiles = "/client-overrides/$1 /client/$1 $1";
priority = 1310;
extraConfig = nginxCommonHeaders;
};
locations."~ ^/client/(.*\\.(js|css|png|svg|woff2|otf|ttf|woff|eot))$" = {
alias = "${cfg.package}/client/dist/$1";
priority = 1320;
@@ -745,6 +739,14 @@ in
+ nginxCommonHeaders;
};
locations."~ ^/client/(assets/images/(default-playlist\\.jpg|default-avatar-account\\.png|default-avatar-account-48x48\\.png|default-avatar-video-channel\\.png|default-avatar-video-channel-48x48\\.png))$" =
{
tryFiles = "/client-overrides/$1 /client/$1 $1";
priority = 1320;
extraConfig = nginxCommonHeaders;
};
locations."^~ /download/" = {
proxyPass = "http://peertube";
priority = 1410;
@@ -799,14 +801,10 @@ in
locations."^~ /static/redundancy/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.redundancy;
alias = cfg.settings.storage.redundancy;
priority = 1450;
extraConfig = ''
set $peertube_limit_rate 800k;
if ($request_uri ~ -fragmented.mp4$) {
set $peertube_limit_rate 5M;
}
set $peertube_limit_rate 5M;
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
@@ -827,21 +825,15 @@ in
limit_rate $peertube_limit_rate;
limit_rate_after 5M;
rewrite ^/static/redundancy/(.*)$ /$1 break;
'';
};
locations."^~ /static/streaming-playlists/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.streaming_playlists;
alias = cfg.settings.storage.streaming_playlists;
priority = 1460;
extraConfig = ''
set $peertube_limit_rate 800k;
if ($request_uri ~ -fragmented.mp4$) {
set $peertube_limit_rate 5M;
}
set $peertube_limit_rate 5M;
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
@@ -862,21 +854,15 @@ in
limit_rate $peertube_limit_rate;
limit_rate_after 5M;
rewrite ^/static/streaming-playlists/(.*)$ /$1 break;
'';
};
locations."^~ /static/web-videos/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.web_videos;
alias = cfg.settings.storage.web_videos;
priority = 1470;
extraConfig = ''
set $peertube_limit_rate 800k;
if ($request_uri ~ -fragmented.mp4$) {
set $peertube_limit_rate 5M;
}
set $peertube_limit_rate 5M;
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
@@ -897,21 +883,15 @@ in
limit_rate $peertube_limit_rate;
limit_rate_after 5M;
rewrite ^/static/web-videos/(.*)$ /$1 break;
'';
};
locations."^~ /static/webseed/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.web_videos;
alias = cfg.settings.storage.web_videos;
priority = 1480;
extraConfig = ''
set $peertube_limit_rate 800k;
if ($request_uri ~ -fragmented.mp4$) {
set $peertube_limit_rate 5M;
}
set $peertube_limit_rate 5M;
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
@@ -932,8 +912,6 @@ in
limit_rate $peertube_limit_rate;
limit_rate_after 5M;
rewrite ^/static/webseed/(.*)$ /web-videos/$1 break;
'';
};
};
pkgs/applications/networking/browsers/chromium/info.json
+7 -7
View File
@@ -1,6 +1,6 @@
{
"chromium": {
"version": "140.0.7339.127",
"version": "140.0.7339.185",
"chromedriver": {
"version": "140.0.7339.133",
"hash_darwin": "sha256-Xf2f4AyowRkG7FTd8p3l3CMF3YCpjyprMD0pM+yPOhA=",
@@ -21,8 +21,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "9412745860d8c3dfed9cf38f5daa943b163f8c69",
"hash": "sha256-rAyS5AhWHL9+6N4+2PFYKPJjzErj8LfIm5ptcsTTV8E=",
"rev": "eeea00e459e8b6cd69698eda5b236a0d4cb3234d",
"hash": "sha256-BjjFH7/HhPBw/b7XmRZVNUrJYAUkWgCR0upHBn+Q5Ec=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -132,8 +132,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "8550f9c1ff8859d25cc49bdfacef083cff2c5121",
"hash": "sha256-gDtFhalOMFWR25XLVbYB/GE1lSQd1ClZ8h175qkC6PU="
"rev": "67be7fddacc4f4bcb21d0cf7bf8bb18752d8fb08",
"hash": "sha256-ulw+gDGpUn8uWuNedlfQADwnSYYbPWpHN5Q+pJbwKGc="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -792,8 +792,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "fdb12b460f148895f6af2ff0e0d870ff8889f154",
"hash": "sha256-x8a8VYFrAZ0huj3WRlczrhg0quXx4cztz8nDs9ToWYg="
"rev": "6d56a0bd0840ce46c80ada63f8c962bd1bb336aa",
"hash": "sha256-VtW/nwKo3jCYfLBHvpAVdLJIRNxw27RAP1K+WgaO5Uc="
}
}
},
pkgs/applications/radio/js8call/cmake.patch
-69
View File
@@ -1,69 +0,0 @@
diff --git a/CMake/Modules/Findhamlib.cmake b/CMake/Modules/Findhamlib.cmake
index 1590f05..e797851 100644
--- a/CMake/Modules/Findhamlib.cmake
+++ b/CMake/Modules/Findhamlib.cmake
@@ -47,7 +47,7 @@ if (NOT PC_HAMLIB_FOUND)
# libusb-1.0 has no pkg-config file on Windows so we have to find it
# ourselves
- find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll)
+ find_library (LIBUSB NAMES libusb-1.0 usb-1.0 PATH_SUFFIXES MinGW32/dll)
if (LIBUSB)
set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES})
get_filename_component (hamlib_libusb_path ${LIBUSB} PATH)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75b80b3..7c04265 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -558,7 +558,6 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED)
#
# libhamlib setup
#
-set (hamlib_STATIC 1)
find_package (hamlib 3 REQUIRED)
find_program (RIGCTL_EXE rigctl)
find_program (RIGCTLD_EXE rigctld)
@@ -576,6 +576,7 @@ message (STATUS "hamlib_LIBRARY_DIRS: ${hamlib_LIBRARY_DIRS}")
find_package (Qt5Widgets 5 REQUIRED)
find_package (Qt5Multimedia 5 REQUIRED)
find_package (Qt5PrintSupport 5 REQUIRED)
+find_package (Qt5SerialPort 5 REQUIRED)
if (WIN32)
add_definitions (-DQT_NEEDS_QTMAIN)
@@ -849,7 +850,7 @@ target_link_libraries (qcp Qt5::Widgets Qt5::PrintSupport)
add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS})
# set wsjtx_udp exports to static variants
target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE)
-target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network)
+target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network Qt5::SerialPort)
target_include_directories (wsjt_qt BEFORE PRIVATE ${hamlib_INCLUDE_DIRS})
if (WIN32)
target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase)
@@ -959,7 +960,6 @@ else ()
)
endif ()
endif ()
-qt5_use_modules (js8call SerialPort) # not sure why the interface link library syntax above doesn't work
# if (UNIX)
# if (NOT WSJT_SKIP_MANPAGES)
@@ -1292,3 +1292,5 @@ configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake")
include (CPack)
+
+add_definitions (-DJS8_USE_HAMLIB_THREE)
diff --git a/Configuration.cpp b/Configuration.cpp
index 8258f97..63a29bb 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -160,7 +160,7 @@
#include <QFont>
#include <QFontDialog>
#include <QColorDialog>
-#include <QSerialPortInfo>
+#include <QtSerialPort/QSerialPortInfo>
#include <QScopedPointer>
#include <QDateTimeEdit>
#include <QProcess>
pkgs/applications/radio/js8call/default.nix
+22 -24
View File
@@ -1,46 +1,43 @@
{
lib,
stdenv,
fetchFromBitbucket,
wrapQtAppsHook,
fetchFromGitHub,
pkg-config,
hamlib,
hamlib_4,
libusb1,
cmake,
gfortran,
fftw,
fftwFloat,
qtbase,
qtmultimedia,
qtserialport,
qt6,
boost,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "js8call";
version = "2.2.0";
version = "2.3.1";
src = fetchFromBitbucket {
owner = "widefido";
repo = pname;
rev = "v${version}-ga";
sha256 = "sha256-mFPhiAAibCiAkLrysAmIQalVCGd9ips2lqbAsowYprY=";
src = fetchFromGitHub {
owner = "js8call";
repo = "js8call";
rev = "v${finalAttrs.version}";
sha256 = "sha256-rYXjcmQRRfizJVriZo9yX8x2yYfWpL94Cprx9eFC3ss=";
};
nativeBuildInputs = [
wrapQtAppsHook
gfortran
qt6.wrapQtAppsHook
pkg-config
cmake
];
buildInputs = [
hamlib
hamlib_4
libusb1
fftw
fftwFloat
qtbase
qtmultimedia
qtserialport
qt6.qtbase
qt6.qtmultimedia
qt6.qtserialport
boost
];
prePatch = ''
@@ -50,8 +47,6 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/" "$out/bin"
'';
patches = [ ./cmake.patch ];
meta = with lib; {
description = "Weak-signal keyboard messaging for amateur radio";
longDescription = ''
@@ -61,6 +56,9 @@ stdenv.mkDerivation rec {
homepage = "http://js8call.com/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ melling ];
maintainers = with maintainers; [
melling
sarcasticadmin
];
};
}
})
pkgs/applications/science/logic/why3/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
rubber,
hevea,
emacs,
version ? "1.8.1",
version ? "1.8.2",
ideSupport ? true,
wrapGAppsHook3,
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
hash =
{
"1.8.1" = "sha256-RSj89bP8ZBdTQM7x5cpJTsk55SIXlc2SXMQj6Q1GFW8=";
"1.8.2" = "sha256-t9ES7dW8zmvM4AI9K8g06yrhocQteupE/6Ek1km1C+o=";
"1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ=";
"1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw=";
}
pkgs/applications/video/glaxnimate/default.nix
-103
View File
@@ -1,103 +0,0 @@
{
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
cmake,
zlib,
potrace,
ffmpeg,
libarchive,
python3,
qtbase,
qttools,
wrapQtAppsHook,
testers,
qtsvg,
qtimageformats,
# For the tests
glaxnimate, # Call itself, for the tests
xvfb-run,
}:
let
# TODO: try to add a python library, see toPythonModule in doc/languages-frameworks/python.section.md
python3WithLibs = python3.withPackages (
ps: with ps; [
# In data/lib/python-lottie/requirements.txt
numpy
pillow
cairosvg
fonttools
grapheme
opencv4
pyqt5
qscintilla
# Not sure if needed, but appears in some files
pyyaml
requests
pybind11
]
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "glaxnimate";
version = "0.5.4";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = "glaxnimate";
tag = finalAttrs.version;
hash = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig=";
fetchSubmodules = true;
};
patches = [
# Backport fix for newer ffmpeg
# FIXME: remove in next update
(fetchpatch {
url = "https://invent.kde.org/graphics/glaxnimate/-/commit/4fb2b67a0f0ce2fbffb6fe9f87c3bf7914c8a602.patch";
hash = "sha256-QjCnscGa7n+zwrImA4mbQiTQb9jmDGm8Y/7TK8jZXvM=";
})
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
qttools
];
buildInputs = [
zlib
potrace
# Upstream asks for libav dependency, which is fulfilled by ffmpeg
ffmpeg
libarchive
qtbase
qttools
qtsvg
qtimageformats
python3WithLibs
];
# Translation needs to be separately compiled
# https://gitlab.com/mattbas/glaxnimate/-/issues/648
buildFlags = [ "translations" ];
qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ];
passthru.tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (
testers.testVersion {
package = glaxnimate;
command = "${xvfb-run}/bin/xvfb-run glaxnimate --version";
}
);
meta = {
homepage = "https://gitlab.com/mattbas/glaxnimate";
description = "Simple vector animation program";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ tobiasBora ];
mainProgram = "glaxnimate";
};
})
pkgs/by-name/ad/add-determinism/package.nix
+5 -1
View File
@@ -28,6 +28,10 @@ rustPlatform.buildRustPackage rec {
ln -s ${./Cargo.lock} Cargo.lock
'';
postInstall = ''
ln -s add-det $out/bin/add-determinism
'';
doCheck = !stdenv.hostPlatform.isDarwin; # it seems to be running forever on darwin
nativeBuildInputs = [
@@ -47,6 +51,6 @@ rustPlatform.buildRustPackage rec {
sharzy
];
platforms = lib.platforms.all;
mainProgram = "add-determinism";
mainProgram = "add-det";
};
}
pkgs/by-name/ai/airwin2rack/package.nix
+13 -7
View File
@@ -13,7 +13,7 @@
libGLU,
libjack2,
juce,
webkitgtk_4_0,
webkitgtk_4_1,
libsysprof-capture,
pcre2,
util-linux,
@@ -23,9 +23,12 @@
libxkbcommon,
libdatrie,
libepoxy,
libsoup_2_4,
libsoup_3,
lerc,
sqlite,
libdeflate,
xz,
libwebp,
glib,
gtk3-x11,
curl,
@@ -53,7 +56,7 @@ let
vcvRackSdk = srcOnly vcv-rack;
pname = "airwin2rack";
version = "2.13.0-unstable-2025-04-07";
version = "2.13.0-unstable-2025-09-14";
in
stdenv.mkDerivation {
inherit pname;
@@ -62,8 +65,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "baconpaul";
repo = "airwin2rack";
rev = "595eb7c7ccec5f9e662f8d620579a91dab60c1ff";
hash = "sha256-gBphJ6WSPw6DOQk64w8GmLrtuYSF7NFEf6xK1oxOF3w=";
rev = "fc75563323bd9d8e46b1d58d89830e0bf760f0e8";
hash = "sha256-7jCDNbGMfJBo2xvRsDYdlEKSpAiRDNm6N4jTYCu+kKs=";
fetchSubmodules = true;
};
@@ -107,7 +110,7 @@ stdenv.mkDerivation {
libGLU
libjack2
freetype
webkitgtk_4_0
webkitgtk_4_1
glib
gtk3-x11
curl
@@ -120,9 +123,12 @@ stdenv.mkDerivation {
libxkbcommon
libdatrie
libepoxy
libsoup_2_4
libsoup_3
lerc
sqlite
libdeflate
xz # liblzma
libwebp
]
++ lib.optionals enableVCVRack [
vcv-rack
pkgs/by-name/an/ant/package.nix
-9
View File
@@ -18,11 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-h/SNGLoRwRVojDfvl1g+xv+J6mAz+J2BimckjaRxDEs=";
};
contrib = fetchurl {
url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2";
sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn";
};
installPhase = ''
mkdir -p $out/bin $out/share/ant
mv * $out/share/ant/
@@ -37,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
mkdir $out/share/ant/bin
mv $out/bin/antRun $out/share/ant/bin/
# Install ant-contrib.
unpackFile $contrib
cp -p ant-contrib/ant-contrib-*.jar $out/share/ant/lib/
cat >> $out/bin/ant <<EOF
#! ${stdenv.shell} -e
pkgs/by-name/ax/ax25-apps/package.nix
+4 -1
View File
@@ -11,8 +11,11 @@ stdenv.mkDerivation {
pname = "ax25-apps";
version = "0.0.8-rc5-unstable-2021-05-13";
strictDeps = true;
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
autoreconfHook
libax25
ncurses
];
pkgs/by-name/ax/ax25-tools/package.nix
+15 -8
View File
@@ -1,21 +1,28 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
autoreconfHook,
libax25,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ax25-tools";
version = "0.0.10-rc5";
strictDeps = true;
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libax25 ];
# Due to recent unsolvable administrative domain problems with linux-ax25.org,
# the new domain is linux-ax25.in-berlin.de
src = fetchurl {
url = "https://linux-ax25.in-berlin.de/pub/ax25-tools/ax25-tools-${version}.tar.gz";
sha256 = "sha256-kqnLi1iobcufVWMPxUyaRsWKIPyTvtUkuMERGQs2qgY=";
# src from linux-ax25.in-berlin.de remote has been
# unreliable, pointing to github mirror from the radiocatalog
src = fetchFromGitHub {
owner = "radiocatalog";
repo = "ax25-tools";
tag = "ax25-tools-${finalAttrs.version}";
hash = "sha256-yoFflC3KU3cKQEENj4MF793TvUdf38C2Q9B7nMuLgMg=";
};
configureFlags = [
@@ -30,4 +37,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ sarcasticadmin ];
platforms = platforms.linux;
};
}
})
pkgs/by-name/ci/cirrus-cli/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.153.3";
version = "0.153.5";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = "cirrus-cli";
rev = "v${version}";
hash = "sha256-sv02mwTOn44rwfDX4BTw9YL8UxEvszBb1Sv4EX7bfVw=";
hash = "sha256-VBicOIZD4J2kh5U8c86d1vyDoqsEyQzZ5mc0wmW16WY=";
};
vendorHash = "sha256-2MYQ1VHnnLG4APWR3lJ404QXXKkQMoH5oajfNyE++Y8=";
vendorHash = "sha256-3lqqCzMeesZi1TcEjlQXNCQLLFqybiz3OtrhxprG9Rk=";
ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
pkgs/by-name/co/coordgenlibs/package.nix
+21 -3
View File
@@ -1,5 +1,6 @@
{
fetchFromGitHub,
fetchpatch,
lib,
stdenv,
boost,
@@ -19,6 +20,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-casFPNbPv9mkKpzfBENW7INClypuCO1L7clLGBXvSvI=";
};
patches = [
(fetchpatch {
name = "coordgenlibs-fix-unused-but-set-variable.patch";
url = "https://github.com/schrodinger/coordgenlibs/commit/6a1485643feb71c6d609d263f28751004c733cf7.patch";
hash = "sha256-x34v+XumVip43LYb4bEkdqPFcTRTeC/zsRuQjnrh2zw=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [
boost
@@ -26,12 +35,21 @@ stdenv.mkDerivation (finalAttrs: {
maeparser
];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-unused-but-set-variable";
};
# Fix the build with CMake 4.
#
# See: <https://github.com/schrodinger/coordgenlibs/pull/130>
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail \
'cmake_minimum_required(VERSION 3.2)' \
'cmake_minimum_required(VERSION 3.5)'
'';
doCheck = true;
# Fix the build with Clang 20.
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-literal-operator";
meta = with lib; {
description = "Schrodinger-developed 2D Coordinate Generation";
homepage = "https://github.com/schrodinger/coordgenlibs";
pkgs/by-name/ds/dscanner/dub-lock.json
+32
View File
@@ -0,0 +1,32 @@
{
"dependencies": {
"dcd": {
"version": "0.16.0-beta.2",
"sha256": "0756q02q1jbimrqn814b3j7q042vlxb7vva1rq823jx148r23d4d"
},
"dsymbol": {
"version": "0.13.0",
"sha256": "1lpwdri2bv5avs3hr0j1i00kjwdbs9nkc13wzlmjalfzjhqqqvci"
},
"emsi_containers": {
"version": "0.9.0",
"sha256": "1viz1fjh6jhfvl0d25bb1q7aclm1hrs0d7hhcx1d9c0gg5k6lcpm"
},
"inifiled": {
"version": "1.3.3",
"sha256": "01hw0lb9n6vwmx6vj5nq2awg54l5pvngqhzxfj2kmg99az84dg6d"
},
"libddoc": {
"version": "0.8.0",
"sha256": "0vxhkd92rxrkrz0svapdnkzh1bdqhws6wakhjj7szmkvykjgwksc"
},
"libdparse": {
"version": "0.23.2",
"sha256": "0bcaasam3iiqisilyx4ysxahjmgifn7i8ny155nwg64bjjibd8dk"
},
"stdx-allocator": {
"version": "2.77.5",
"sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj"
}
}
}
pkgs/by-name/ds/dscanner/fix_version.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/dub.json b/dub.json
index 72cb269..1ea3903 100644
--- a/dub.json
+++ b/dub.json
@@ -21,7 +21,4 @@
"stringImportPaths" : [
"bin"
],
- "preBuildCommands" : [
- "\"$DC\" -run \"$PACKAGE_DIR/dubhash.d\""
- ]
}
pkgs/by-name/ds/dscanner/package.nix
+52
View File
@@ -0,0 +1,52 @@
{
lib,
buildDubPackage,
fetchFromGitHub,
versionCheckHook,
}:
buildDubPackage rec {
pname = "dscanner";
version = "0.15.2";
src = fetchFromGitHub {
owner = "dlang-community";
repo = "D-Scanner";
tag = "v${version}";
hash = "sha256-7lZhYlK07VWpSRnzawJ2RL69/U/AH/qPyQY4VfbnVn4=";
};
preBuild = ''
mkdir -p bin/
echo "v${version}" > bin/dubhash.txt
'';
patches = [
./fix_version.patch
];
dubLock = ./dub-lock.json;
doCheck = true;
installPhase = ''
runHook preInstall
install -Dm755 bin/dscanner -t $out/bin
runHook postInstall
'';
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Swiss-army knife for D source code";
changelog = "https://github.com/dlang-community/D-Scanner/releases/tag/v${version}";
homepage = "https://github.com/dlang-community/D-Scanner";
mainProgram = "dscanner";
maintainers = with lib.maintainers; [ ipsavitsky ];
license = lib.licenses.boost;
};
}
pkgs/by-name/fi/filebot/package.nix
+4 -4
View File
@@ -18,17 +18,17 @@
let
lanterna = fetchurl {
url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar";
hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ=";
url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.3/lanterna-3.1.3.jar";
hash = "sha256-4EeBz34i9+7iYwnx2IC74SQMLw6ThgNKJD8Hy6eMUOA=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "filebot";
version = "5.1.7";
version = "5.2.0";
src = fetchurl {
url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz";
hash = "sha256-GpjWo2+AsT0hD3CJJ8Pf/K5TbWtG0ZE2tIpH/UEGTws=";
hash = "sha256-OcXXKaZcBuP584SJWeQB+aaxO0kih6Oiud0Vm8e9kPo=";
};
unpackPhase = "tar xvf $src";
pkgs/by-name/le/levmar/package.nix
+13 -7
View File
@@ -4,19 +4,24 @@
fetchurl,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "levmar";
version = "2.6";
src = fetchurl {
url = "https://www.ics.forth.gr/~lourakis/levmar/${pname}-${version}.tgz";
sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v";
url = "https://www.ics.forth.gr/~lourakis/levmar/levmar-${finalAttrs.version}.tgz";
hash = "sha256-O/TvHqRHXe1TFejY/Jkqcl8ueUCnTKOw+QKdnm6Uutc=";
};
patchPhase = ''
substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK"
postPatch = ''
substituteInPlace levmar.h --replace-fail "define HAVE_LAPACK" "undef HAVE_LAPACK"
sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile
substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc"
''
+ lib.optionalString stdenv.cc.isClang ''
substituteInPlace compiler.h \
--replace-fail "#define LM_FINITE finite // ICC, GCC" \
"#define LM_FINITE isfinite // ICC, GCC"
'';
installPhase = ''
@@ -29,6 +34,7 @@ stdenv.mkDerivation rec {
description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = lib.platforms.all;
};
}
})
pkgs/by-name/li/libax25/package.nix
+18 -9
View File
@@ -1,21 +1,30 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
autoreconfHook,
glibc,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libax25";
version = "0.0.12-rc5";
buildInputs = [ glibc ] ++ lib.optionals stdenv.hostPlatform.isStatic [ glibc.static ];
strictDeps = true;
# Due to recent unsolvable administrative domain problems with linux-ax25.org,
# the new domain is linux-ax25.in-berlin.de
src = fetchurl {
url = "https://linux-ax25.in-berlin.de/pub/ax25-lib/libax25-${version}.tar.gz";
hash = "sha256-vxV5GVDOHr38N/512ArZpnZ+a7FTbXBNpoSJkc9DI98=";
nativeBuildInputs = [
autoreconfHook
glibc
]
++ lib.optionals stdenv.hostPlatform.isStatic [ glibc.static ];
# src from linux-ax25.in-berlin.de remote has been
# unreliable, pointing to github mirror from the radiocatalog
src = fetchFromGitHub {
owner = "radiocatalog";
repo = "libax25";
tag = "libax25-${finalAttrs.version}";
hash = "sha256-MQDrroRZhtWJiu3N7FQVp5/sqe1MDjdwKu4ufnfHTUM=";
};
configureFlags = [ "--sysconfdir=/etc" ];
@@ -32,4 +41,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ sarcasticadmin ];
platforms = platforms.linux;
};
}
})
pkgs/by-name/ma/maccy/package.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "maccy";
version = "2.3.0";
version = "2.5.1";
src = fetchurl {
url = "https://github.com/p0deje/Maccy/releases/download/${finalAttrs.version}/Maccy.app.zip";
hash = "sha256-Prr0t3OvPWUnUQ3cTE3D+jj1ASKKmDvGZInKlT1WsJ0=";
hash = "sha256-pwMiCAS+1uEtEQv2e1UflxYuuh/qqYJbMcp2ZVvZBTA=";
};
dontUnpack = true;
pkgs/by-name/ma/maplestory-cursor/package.nix
+51
View File
@@ -0,0 +1,51 @@
{
fetchFromGitHub,
lib,
stdenvNoCC,
# build deps
clickgen,
python3Packages,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "maplestory-cursor";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Liam-Weitzel";
repo = "maplestory-cursor";
tag = "v${finalAttrs.version}";
hash = "sha256-doUnd0XyA7Nk078eDEIrRltj3zBODHpGn8Rqx2rl5/o=";
};
nativeBuildInputs = [
clickgen
python3Packages.attrs
];
buildPhase = ''
runHook preBuild
ctgen build.toml -p x11 -o $out
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
mv $out/Maple $out/share/icons
runHook postInstall
'';
meta = {
description = "Maplestory cursor theme for x11 & wayland";
homepage = "https://github.com/Liam-Weitzel/maplestory-cursor";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ liam-w ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/me/meshlab-unstable/package.nix
+39 -8
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
llvmPackages,
libsForQt5,
libGLU,
lib3ds,
@@ -29,14 +30,15 @@ let
tinygltf-src = fetchFromGitHub {
owner = "syoyo";
repo = "tinygltf";
rev = "v2.6.3";
tag = "v2.6.3";
hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
};
# requires submodules to build
lib3mf-src = fetchFromGitHub {
owner = "3MFConsortium";
repo = "lib3mf";
rev = "v2.3.2";
tag = "v2.3.2";
fetchSubmodules = true;
hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58=";
};
@@ -50,11 +52,19 @@ stdenv.mkDerivation {
repo = "meshlab";
# note that this is in branch devel
rev = "72142583980b6dbfc5b85c6cca226a72f48497a9";
sha256 = "1q7qga4d82pvpcbsp9pi2i7nzdbflhp6q0d3y31kpch9r3r9pzks";
hash = "sha256-ev6b8sgJsjvD8KMBbC6kbrVvTxTxpqsXu/sK1Ih6+OA=";
# needed for an updated version of vcg in their submodule
fetchSubmodules = true;
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/meshlab/CMakeLists.txt \
--replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
--replace-fail " TARGET meshlab" "# TARGET meshlab" \
--replace-fail " FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
"# FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
'';
buildInputs = [
libGLU
libsForQt5.qtbase
@@ -78,6 +88,9 @@ stdenv.mkDerivation {
corto
openctm
structuresynth
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
];
nativeBuildInputs = [
@@ -106,14 +119,32 @@ stdenv.mkDerivation {
--replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
'';
postFixup = ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
patchelf --add-needed $out/lib/meshlab/lib3mf.so $out/lib/meshlab/plugins/libio_3mf.so
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications,bin,lib}
mv $out/meshlab.app $out/Applications/
ln $out/Applications/meshlab.app/Contents/Frameworks/* $out/lib/
makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
'';
postFixup =
lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
patchelf --add-needed $out/lib/meshlab/lib3mf.so $out/lib/meshlab/plugins/libio_3mf.so
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"
install_name_tool -change libopenctm.dylib "${lib.getOutput "out" openctm}/lib/libopenctm.dylib" \
"$out/Applications/meshlab.app/Contents/PlugIns/libio_ctm.so"
'';
# The hook will wrap all the plugin binaries, make they are not a
# valid plugin. So we have to wrap the main app manually.
# See: https://github.com/NixOS/nixpkgs/pull/396295#issuecomment-3137779781
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
# display a black screen on wayland, so force XWayland for now.
# Might be fixed when upstream will be ready for Qt6.
qtWrapperArgs = [
qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
"--set QT_QPA_PLATFORM xcb"
];
@@ -123,6 +154,6 @@ stdenv.mkDerivation {
homepage = "https://www.meshlab.net/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ pca006132 ];
platforms = with lib.platforms; linux;
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/by-name/me/meshlab/package.nix
+71 -21
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
llvmPackages,
libsForQt5,
libGLU,
lib3ds,
@@ -30,21 +31,47 @@ let
tinygltf-src = fetchFromGitHub {
owner = "syoyo";
repo = "tinygltf";
rev = "v2.6.3";
tag = "v2.6.3";
hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
};
downloads = [
"DLL_EMBREE"
"SOURCE_BOOST"
"SOURCE_CGAL"
"SOURCE_EMBREE"
"SOURCE_LEVMAR"
"SOURCE_LIB3DS"
"SOURCE_LIBE57"
"SOURCE_LIBIGL"
"SOURCE_MUPARSER"
"SOURCE_NEXUS"
"SOURCE_OPENCTM"
"SOURCE_QHULL"
"SOURCE_STRUCTURE_SYNTH"
"SOURCE_TINYGLTF"
"SOURCE_U3D"
"SOURCE_XERCE"
];
cmakeFlagsDisallowDownload = lib.map (x: "-DMESHLAB_ALLOW_DOWNLOAD_${x}=OFF") downloads;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "meshlab";
version = "2023.12";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "meshlab";
rev = "MeshLab-${version}";
sha256 = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y=";
tag = "MeshLab-${finalAttrs.version}";
hash = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y=";
};
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
vcg # templated library
];
buildInputs = [
libGLU
libsForQt5.qtbase
@@ -64,20 +91,16 @@ stdenv.mkDerivation rec {
xercesc
tbb
embree
vcg
libigl
corto
openctm
structuresynth
]
++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
];
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
];
preConfigure = ''
substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
postPatch = ''
substituteInPlace src/external/tinygltf.cmake \
--replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src}
substituteInPlace src/external/libigl.cmake \
@@ -92,28 +115,55 @@ stdenv.mkDerivation rec {
--replace-warn "MD5 ''${SSYNTH_MD5}" ""
substituteInPlace src/common_gui/CMakeLists.txt \
--replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/meshlab/CMakeLists.txt \
--replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
--replace-fail " TARGET meshlab" "# TARGET meshlab" \
--replace-fail " FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
"# FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
'';
cmakeFlags = [
"-DVCGDIR=${vcg.src}"
];
]
++ cmakeFlagsDisallowDownload;
postFixup = ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications,bin,lib}
mv $out/meshlab.app $out/Applications/
ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common.dylib $out/lib/
makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
'';
# The hook will wrap all the plugin binaries, make they are not a
# valid plugin. So we have to wrap the main app manually.
# See: https://github.com/NixOS/nixpkgs/pull/396295#issuecomment-3137779781
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
# display a black screen on wayland, so force XWayland for now.
# Might be fixed when upstream will be ready for Qt6.
qtWrapperArgs = [
"--set QT_QPA_PLATFORM xcb"
];
qtWrapperArgs = lib.optional stdenv.hostPlatform.isLinux "--set QT_QPA_PLATFORM xcb";
postFixup =
lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"
install_name_tool -change libopenctm.dylib "${lib.getOutput "out" openctm}/lib/libopenctm.dylib" \
"$out/Applications/meshlab.app/Contents/PlugIns/libio_ctm.so"
'';
meta = {
description = "System for processing and editing 3D triangular meshes";
mainProgram = "meshlab";
homepage = "https://www.meshlab.net/";
license = lib.licenses.gpl3Only;
maintainers = [ ];
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ yzx9 ];
platforms = with lib.platforms; linux ++ darwin;
};
}
})
pkgs/by-name/mi/microsoft-gsl/package.nix
+4 -14
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
gtest,
pkg-config,
@@ -10,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "microsoft-gsl";
version = "4.0.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "GSL";
rev = "v${version}";
hash = "sha256-cXDFqt2KgMFGfdh6NGE+JmP4R0Wm9LNHM0eIblYe6zU=";
hash = "sha256-NrnYfCCeQ50oHYFbn9vh5Z4mfyxc0kAM3qnzQdq9gyM=";
};
nativeBuildInputs = [
@@ -25,17 +24,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [ gtest ];
# negate the `-Werror` flag as Microsoft doesn't build with clang
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error";
patches = [
# nvcc doesn't recognize the "gsl" attribute namespace (microsoft/onnxruntime#13573)
# only affects nvcc
(fetchpatch {
url = "https://raw.githubusercontent.com/microsoft/onnxruntime/4bfa69def85476b33ccfaf68cf070f3fb65d39f7/cmake/patches/gsl/1064.patch";
hash = "sha256-0jESA+VENWQms9HGE0jRiZZuWLJehBlbArxSaQbYOrM=";
})
];
# C++17 required by latest gtest
env.NIX_CFLAGS_COMPILE = "-std=c++17";
doCheck = true;
pkgs/by-name/on/onnxruntime/package.nix
+8 -25
View File
@@ -8,7 +8,6 @@
cpuinfo,
eigen,
flatbuffers_23,
gbenchmark,
glibcLocales,
gtest,
howard-hinnant-date,
@@ -18,8 +17,9 @@
python3Packages,
re2,
zlib,
microsoft-gsl,
protobuf,
microsoft-gsl,
darwinMinVersionHook,
pythonSupport ? true,
cudaSupport ? config.cudaSupport,
ncclSupport ? config.cudaSupport,
@@ -56,25 +56,6 @@ let
hash = "sha256-pjwjrqq6dfiVsXIhbBtbolhiysiFlFTnx5XcX77f+C0=";
};
pytorch_clog = effectiveStdenv.mkDerivation {
pname = "clog";
version = "3c8b153";
src = "${cpuinfo.src}/deps/clog";
nativeBuildInputs = [
cmake
gbenchmark
gtest
];
cmakeFlags = [
(lib.cmakeBool "USE_SYSTEM_GOOGLEBENCHMARK" true)
(lib.cmakeBool "USE_SYSTEM_GOOGLETEST" true)
(lib.cmakeBool "USE_SYSTEM_LIBS" true)
# 'clog' tests set 'CXX_STANDARD 11'; this conflicts with our 'gtest'.
(lib.cmakeBool "CLOG_BUILD_TESTS" false)
];
};
onnx = fetchFromGitHub {
owner = "onnx";
repo = "onnx";
@@ -92,8 +73,8 @@ let
dlpack = fetchFromGitHub {
owner = "dmlc";
repo = "dlpack";
tag = "v0.6";
hash = "sha256-YJdZ0cMtUncH5Z6TtAWBH0xtAIu2UcbjnVcCM4tfg20=";
rev = "5c210da409e7f1e51ddf445134a4376fdbd70d7d";
hash = "sha256-YqgzCyNywixebpHGx16tUuczmFS5pjCz5WjR89mv9eI=";
};
isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild;
@@ -139,7 +120,6 @@ effectiveStdenv.mkDerivation rec {
libpng
nlohmann_json
microsoft-gsl
pytorch_clog
zlib
]
++ lib.optionals (lib.meta.availableOn effectiveStdenv.hostPlatform cpuinfo) [
@@ -170,7 +150,10 @@ effectiveStdenv.mkDerivation rec {
nccl
]
)
);
)
++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
(darwinMinVersionHook "13.3")
];
nativeCheckInputs = [
gtest
pkgs/by-name/op/openbabel/fix-cmake-4.patch
+77
View File
@@ -0,0 +1,77 @@
From fda825d390af8b5eaf79d7b7c39c19ab5ce317ac Mon Sep 17 00:00:00 2001
From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Date: Wed, 26 Mar 2025 10:24:42 +0000
Subject: [PATCH] cmake4 compat :
* up cmake_minimum_required to 3.10
* delete CMP0042 because OLD behavior is removed in cmake-4 and
is no longer used.
* set ENABLE_EXPORTS for test_runner (OLD behavior for CMP0065 is removed
in cmake4)
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
---
CMakeLists.txt | 7 ++-----
doc/examples/static_executable/CMakeLists.txt | 2 +-
scripts/CMakeLists.txt | 2 +-
test/CMakeLists.txt | 1 +
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d2a9f143e..f8440e412e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Please ensure that any changes remain compliant with 3.1.
+# Please ensure that any changes remain compliant with 3.10.
if(NOT EMBED_OPENBABEL)
- cmake_minimum_required(VERSION 3.1)
+ cmake_minimum_required(VERSION 3.10)
endif()
project(openbabel)
@@ -10,9 +10,6 @@ set (CMAKE_CXX_STANDARD 11)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
- if(POLICY CMP0042)
- cmake_policy(SET CMP0042 OLD)
- endif()
endif()
include (CheckCXXCompilerFlag)
diff --git a/doc/examples/static_executable/CMakeLists.txt b/doc/examples/static_executable/CMakeLists.txt
index 0ed21beaaf..63dae2a468 100644
--- a/doc/examples/static_executable/CMakeLists.txt
+++ b/doc/examples/static_executable/CMakeLists.txt
@@ -25,7 +25,7 @@
#
# This line is required for cmake backwards compatibility.
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.10)
# Name of your project
project(myproject)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 792e4592d0..eafda66c5a 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6.0)
+cmake_minimum_required(VERSION 3.10.0)
# Library versioning (used in Mac Python bindings)x
set(SOVERSION 4)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2ecf0dbe22..280eac471f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -152,6 +152,7 @@ endif()
add_executable(test_runner ${srclist} obtest.cpp)
target_link_libraries(test_runner ${libs})
+set_target_properties(test_runner PROPERTIES ENABLE_EXPORTS TRUE)
if(NOT BUILD_SHARED AND NOT BUILD_MIXED)
set_target_properties(test_runner PROPERTIES LINK_SEARCH_END_STATIC TRUE)
pkgs/by-name/op/openbabel/package.nix
+84
View File
@@ -0,0 +1,84 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
ninja,
perl,
zlib,
libxml2,
eigen,
python3,
cairo,
pkg-config,
swig,
rapidjson,
boost,
maeparser,
coordgenlibs,
ctestCheckHook,
}:
stdenv.mkDerivation {
pname = "openbabel";
version = "3.1.1-unstable-2024-12-21";
src = fetchFromGitHub {
owner = "openbabel";
repo = "openbabel";
rev = "889c350feb179b43aa43985799910149d4eaa2bc";
hash = "sha256-pJbvKBjpvXNjTZRxD2AqEarqmq+Pq08uvGvog/k/a7k=";
};
patches = [
# <https://github.com/openbabel/openbabel/pull/2784>
./fix-cmake-4.patch
];
nativeBuildInputs = [
cmake
ninja
swig
pkg-config
];
buildInputs = [
perl
zlib
libxml2
eigen
python3
cairo
rapidjson
boost
maeparser
coordgenlibs
];
nativeCheckInputs = [
ctestCheckHook
];
cmakeFlags = [
(lib.cmakeBool "RUN_SWIG" true)
(lib.cmakeBool "PYTHON_BINDINGS" true)
(lib.cmakeFeature "PYTHON_INSTDIR" "${placeholder "out"}/${python3.sitePackages}")
];
disabledTests = [
"test_cifspacegroup_11"
"pybindtest_obconv_writers"
];
doCheck = true;
dontUseNinjaCheck = true;
meta = {
description = "Toolbox designed to speak the many languages of chemical data";
homepage = "http://openbabel.org";
platforms = lib.platforms.all;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ danielbarter ];
};
}
pkgs/by-name/or/orca-slicer/package.nix
+4
View File
@@ -212,6 +212,10 @@ stdenv.mkDerivation (finalAttrs: {
)
'';
postInstall = ''
rm $out/LICENSE.txt
'';
meta = {
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
homepage = "https://github.com/SoftFever/OrcaSlicer";
pkgs/by-name/pe/peertube/package.nix
+5 -5
View File
@@ -47,23 +47,23 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "peertube";
version = "7.2.3";
version = "7.3.0";
src = fetchFromGitHub {
owner = "Chocobozzz";
repo = "PeerTube";
tag = "v${finalAttrs.version}";
hash = "sha256-vbjQoysm5ERY6kG3JhG6z/zKxVlmWmRXQyUnCrVgjFk=";
hash = "sha256-WbZFOOvX6WzKB9tszxJl6z+V6cDBH6Y2SjoxF17WvUo=";
};
yarnOfflineCacheServer = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-baQgvzJ3W5lULrdukwM9niovtzAI0yvc2c7mqhtCDxk=";
hash = "sha256-T1stKz8+1ghQBJB8kujwcqmygMdoswjFBL/QWAHSis0=";
};
yarnOfflineCacheClient = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/client/yarn.lock";
hash = "sha256-Y1boUDDegqCRt9fQaP+svIKYFz+gowGyV6sV7vq8vMA=";
hash = "sha256-jeE6Xpi/A1Ldbbp12rkG19auud61AZna/vbVE2mpp/8=";
};
yarnOfflineCacheAppsCli = fetchYarnDeps {
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
yarnOfflineCacheAppsRunner = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/apps/peertube-runner/yarn.lock";
hash = "sha256-t7H0VNLM48sTfctD9V2CFdi/0JRETu5cj/dBy6aNFW8=";
hash = "sha256-OX9em03iqaRCqFuo2QO/r+CBdk7hHk3WY1EBXlFr1cY=";
};
outputs = [
pkgs/by-name/ph/phpunit/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "phpunit";
version = "12.3.8";
version = "12.3.11";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
tag = finalAttrs.version;
hash = "sha256-jSa+gE4TZ4ZTBjsMZN9X40R5r49PR5hbqXkMzk+HLEg=";
hash = "sha256-+vdiBJKdK+Wi12eCyD7MhKcZEhbqx7GoZ4H2CltM3B4=";
};
vendorHash = "sha256-6YnNfJ0tXUHSQyJKo8OY7a90BAhmDnpVe+954WuGoM4=";
vendorHash = "sha256-RmJaxC0tY6/1Z+LLhhMzDcaKHCKNjJug4vRlKwIqzPs=";
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/pi/pixelorama/package.nix
+2 -2
View File
@@ -20,13 +20,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "pixelorama";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "Orama-Interactive";
repo = "Pixelorama";
rev = "v${finalAttrs.version}";
hash = "sha256-REJsaGuPVihQj5+ec10UuyobspwNBEbYslDgAZxPfFE=";
hash = "sha256-5ODSGZM39FO+6tTLoosnrf5ngh+fSHpNsphTgjlux48=";
};
strictDeps = true;
pkgs/by-name/po/poco/package.nix
+2 -2
View File
@@ -19,12 +19,12 @@
stdenv.mkDerivation rec {
pname = "poco";
version = "1.14.1";
version = "1.14.2";
src = fetchFromGitHub {
owner = "pocoproject";
repo = "poco";
hash = "sha256-acq2eja61sH/QHwMPmiDNns2jvXRTk0se/tHj9XRSiU=";
hash = "sha256-koREkrfAHWfpqITN5afiXwZg37Wve2Ftx8sr8t2bSV4=";
rev = "poco-${version}-release";
};
pkgs/by-name/pr/protoc-gen-es/package.nix
+3 -3
View File
@@ -7,20 +7,20 @@
buildNpmPackage rec {
pname = "protoc-gen-es";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "protobuf-es";
tag = "v${version}";
hash = "sha256-7jKvjDrqP+pM1nMfLChZ0M9Hevioc3hS+L2YT1CQx1s=";
hash = "sha256-5vbTOE3ClDDxBc6u08FwIg+bVxykpbedSBk+P0WocDo=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-QXclh75PdMJZTHEQXcMklhP6K61TD9m8GBlravjNsPc=";
npmDepsHash = "sha256-VISefKFVpQ1VwQw5bp5ZPVr9nQuFnFqphW02H/u45U4=";
npmWorkspace = "packages/protoc-gen-es";
pkgs/by-name/sc/scala-next/package.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ scala, fetchurl }:
scala.bare.overrideAttrs (oldAttrs: {
version = "3.7.1";
version = "3.7.3";
pname = "scala-next";
src = fetchurl {
inherit (oldAttrs.src) url;
hash = "sha256-XIeG4T7TXPVAEMteD0BSWrAv7V1f7xrkLpbdpHFuWAw=";
hash = "sha256-KmIgDOX4TtioGvcDJ0+sGxq+fFqlKM/hZNBb0Q+7Z8A=";
};
})
pkgs/by-name/su/subtitlecomposer/package.nix
+2 -2
View File
@@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "subtitlecomposer";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "multimedia";
repo = "subtitlecomposer";
rev = "v${version}";
hash = "sha256-5RBrxOy1EIgDLb21r1y+Pou8d/j05a1YYMRJh1n8vSA=";
hash = "sha256-zGbI960NerlOEUvhOLm+lEJdbhj8VFUfm8pkOYGRcGw=";
};
nativeBuildInputs = [
pkgs/by-name/te/terragrunt/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
}:
buildGo125Module (finalAttrs: {
pname = "terragrunt";
version = "0.86.0";
version = "0.86.3";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = "terragrunt";
tag = "v${finalAttrs.version}";
hash = "sha256-Xmka1391wEGufEEavQNoB5YuzR7npe6ky8MzKJnGQt8=";
hash = "sha256-sa0Jp9Lb6ECboYDySJcFx6eQDtpChnrIxcCo0UYdhuY=";
};
nativeBuildInputs = [
@@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: {
make generate-mocks
'';
vendorHash = "sha256-aQzt7yeNoL1OF+mO6y2axeiuJbfuMBzoEAm0+Y9+Xr8=";
vendorHash = "sha256-X6lF18eIn5PtBH48rgxuSJfj5QiML1Bi1330PUDEsOs=";
doCheck = false;
pkgs/by-name/tl/tldr/package.nix
+2 -2
View File
@@ -45,8 +45,8 @@ python3Packages.buildPythonApplication rec {
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd tldr \
--bash <($out/bin/tldr --print-completion bash) \
--zsh <($out/bin/tldr --print-completion zsh)
--bash <($out/bin/tldr --print-completion bash | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g") \
--zsh <($out/bin/tldr --print-completion zsh | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g") \
'';
meta = {
pkgs/by-name/wa/warp-plus/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "warp-plus";
version = "1.2.6-unstable-2025-08-13";
version = "1.2.6-unstable-2025-09-13";
src = fetchFromGitHub {
owner = "bepass-org";
repo = "warp-plus";
rev = "08d43e9e4c079534e47ba19fb2965c968c9621b2";
hash = "sha256-MHz8b1whSzUJO0YogxMPuXMaQRfR+xxSYhFxq412EmE=";
rev = "4af9b2abfc4e79dceea41ac577f1683f62f57b8c";
hash = "sha256-7i/06Qn+BRH/bWel9OvgVUAZZSwL2Euv179JDJNn2EE=";
};
vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY=";
pkgs/by-name/wi/wivrn/package.nix
+4 -13
View File
@@ -53,13 +53,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wivrn";
version = "25.8";
version = "25.9";
src = fetchFromGitHub {
owner = "wivrn";
repo = "wivrn";
rev = "v${finalAttrs.version}";
hash = "sha256-x9nZyLk0A9eiZ9V700lc4To1cVJ875ZYR0GeqQ7qNpg=";
hash = "sha256-XP0bpXgtira2QIlS0fNEteNP48WnEjBYFM1Xmt2sm5I=";
};
monado = applyPatches {
@@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "monado";
rev = "5c137fe28b232fe460f9b03defa7749adc32ee48";
hash = "sha256-4P/ejRAitrYn8hXZPaDOcx27utfm+aVLjtqL6JxZYAg=";
rev = "7a4018e2d89151e60e562fac79eba90ca7a328d8";
hash = "sha256-DPIvJb23bK7SDjZr9mK0Wt6Zbo3Ari3Ar8TtPe5QgKY=";
};
postPatch = ''
@@ -90,15 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
fi
'';
patches = [
# Needed to allow WiVRn in-stream GUI to launch Steam games
(fetchpatch {
name = "wivrn-allow-launching-steam-games.patch";
url = "https://github.com/WiVRn/WiVRn/commit/30ceab5b3082cbc545acf8bc8ca4a24279e6f738.diff";
hash = "sha256-BD6MhCET7hdjog8rkl7G2l7/zGfVATpNAhNie0efOlA=";
})
];
nativeBuildInputs = [
cmake
git
pkgs/development/compilers/zulu/25.nix
+58
View File
@@ -0,0 +1,58 @@
{
callPackage,
enableJavaFX ? false,
...
}@args:
let
# For Zulu 25, FX and non-FX versions can differ
zuluVersion = if enableJavaFX then "25.28.85" else "25.28.85";
in
callPackage ./common.nix (
{
# Details from https://www.azul.com/downloads/?version=java-24&package=jdk
# Note that the latest build may differ by platform
dists = {
x86_64-linux = {
inherit zuluVersion;
jdkVersion = "25.0.0";
hash =
if enableJavaFX then
"sha256-5Hhob86uCxrrdrFEvNaqPaQEaGrF47jpgUibKkNs1AQ="
else
"sha256-Fk2QHlokC4wYUW9atVvBH8lomrboKQRa6oRnNW3Ns0A=";
};
aarch64-linux = {
inherit zuluVersion;
jdkVersion = "25.0.0";
hash =
if enableJavaFX then
"sha256-HmfKOh0X2jcLrEMmKV81nQebtOOJjzpHWe1Ca+qIFYI="
else
"sha256-tg651UyXukFZVHg0qYzF0BYoHdKz5g50dcukkRMkvLQ=";
};
x86_64-darwin = {
inherit zuluVersion;
jdkVersion = "25.0.0";
hash =
if enableJavaFX then
"sha256-J5Akv28y3XoJgw5q2Rh4xHv1AV1I33jnPslhxDrTc0E="
else
"sha256-ws3h0xPZBLeTw3YCFO76IH7Mp98E58QISr3x9rvrwno=";
};
aarch64-darwin = {
inherit zuluVersion;
jdkVersion = "25.0.0";
hash =
if enableJavaFX then
"sha256-urxxVoayeNW0g0g80eefmG+FMVzVBaBvmMKj+S3URNE="
else
"sha256-c/ZPa618PfMfunQPvLu+98Glzt7/u13zht15vHKrqbY=";
};
};
}
// builtins.removeAttrs args [ "callPackage" ]
)
pkgs/development/libraries/openbabel/2.nix
-62
View File
@@ -1,62 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
zlib,
libxml2,
eigen,
python3,
cairo,
pcre,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "openbabel";
version = "2.4.1";
src = fetchFromGitHub {
owner = "openbabel";
repo = "openbabel";
rev = "openbabel-${lib.replaceStrings [ "." ] [ "-" ] version}";
sha256 = "sha256-+pXsWMzex7rB1mm6dnTHzAcyw9jImgx1OZuLeCvbeJ0=";
};
patches = [
# ARM / AArch64 fixes.
(fetchpatch {
url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch";
sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g";
})
];
postPatch = ''
sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12
'';
buildInputs = [
zlib
libxml2
eigen
python3
cairo
pcre
];
cmakeFlags = [ "-DCMAKE_CXX_STANDARD=14" ];
nativeBuildInputs = [
cmake
pkg-config
];
meta = with lib; {
description = "Toolbox designed to speak the many languages of chemical data";
homepage = "http://openbabel.org";
platforms = platforms.all;
maintainers = with maintainers; [ danielbarter ];
license = licenses.gpl2Plus;
};
}
pkgs/development/libraries/openbabel/default.nix
-84
View File
@@ -1,84 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
perl,
zlib,
libxml2,
eigen,
python3,
cairo,
pkg-config,
swig,
rapidjson,
boost,
maeparser,
coordgenlibs,
}:
stdenv.mkDerivation rec {
pname = "openbabel";
version = "unstable-06-12-23";
src = fetchFromGitHub {
owner = "openbabel";
repo = pname;
rev = "32cf131444c1555c749b356dab44fb9fe275271f";
hash = "sha256-V0wrZVrojCZ9Knc5H6cPzPoYWVosRZ6Sn4PX+UFEfHY=";
};
postPatch = ''
sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12
'';
buildInputs = [
perl
zlib
libxml2
eigen
python3
cairo
rapidjson
boost
maeparser
coordgenlibs
];
nativeBuildInputs = [
cmake
swig
pkg-config
];
preConfigure = ''
cmakeFlagsArray+=(
"-DRUN_SWIG=ON"
"-DPYTHON_BINDINGS=ON"
"-DPYTHON_INSTDIR=$out/${python3.sitePackages}"
)
'';
# Setuptools only accepts PEP 440 version strings. The "unstable" identifier
# can not be used. Instead we pretend to be the 3.2 beta release.
postFixup = ''
cat << EOF > $out/${python3.sitePackages}/setup.py
from setuptools import setup
setup(
name = 'pyopenbabel',
version = '3.2b1',
packages = ['openbabel'],
package_data = {'openbabel' : ['_openbabel.so']}
)
EOF
'';
meta = with lib; {
description = "Toolbox designed to speak the many languages of chemical data";
homepage = "http://openbabel.org";
platforms = platforms.all;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ danielbarter ];
};
}
pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@
let
pythonWP = python3.withPackages (
p: with p; [
openbabel-bindings
openbabel
numpy
]
);
pkgs/development/python-modules/debugpy/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "debugpy";
version = "1.8.16";
version = "1.8.17";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "debugpy";
tag = "v${version}";
hash = "sha256-11P2L3/ePoKrqO2G65XJeDEB6lsC8h7oRyXzGRz18tg=";
hash = "sha256-U9WeWAX0qDusWcMsFaI1ct4YKlGQEHUYlKZfRiYhma0=";
};
patches = [
pkgs/development/python-modules/ingredient-parser-nlp/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
}:
buildPythonPackage rec {
pname = "ingredient-parser-nlp";
version = "2.2.0";
version = "2.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "strangetom";
repo = "ingredient-parser";
tag = version;
hash = "sha256-vv7sNRG2GH1uYy1UMpIx6yGLMIFrFN+dggpoqzhRFRg=";
hash = "sha256-+Hd+NtInG3umo0unCQHw8rBDhuIM55VtkVXiD1tKNVo=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/langchain-aws/default.nix
+2 -2
View File
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "langchain-aws";
version = "0.2.31";
version = "0.2.33";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-aws";
tag = "langchain-aws==${version}";
hash = "sha256-oUCFVVHd35pTc0ViVWRf+h6+cHtx22du/xa0KgnBRtw=";
hash = "sha256-8VRZhwrR5PdLo9FamQClKbYfuHUGVxamku4osyl8Wl4=";
};
postPatch = ''
pkgs/development/python-modules/meshcore/default.nix
+2 -2
View File
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "meshcore";
version = "2.1.6";
version = "2.1.7";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-aEuY4N4QIJTPjonhtAYG97yIXnxKp1I5kt25pCiJjOM=";
sha256 = "sha256-VEkpS6FTs7mCjhqFRL6+AisR0IKYrOWbx6irGfsucEc=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/openbabel-bindings/default.nix
-32
View File
@@ -1,32 +0,0 @@
{
lib,
openbabel,
python,
buildPythonPackage,
}:
buildPythonPackage {
format = "setuptools";
inherit (openbabel) pname version;
src = "${openbabel}/${python.sitePackages}";
buildInputs = [ openbabel ];
# these env variables are used by the bindings to find libraries
# they need to be included explicitly in your nix-shell for
# some functionality to work (inparticular, pybel).
# see https://openbabel.org/docs/dev/Installation/install.html
BABEL_LIBDIR = "${openbabel}/lib/openbabel/3.1.0";
LD_LIBRARY_PATH = "${openbabel}/lib";
doCheck = false;
pythonImportsCheck = [ "openbabel" ];
meta = with lib; {
homepage = "http://openbabel.org/wiki/Main_Page";
description = "Python bindings for openbabel";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ danielbarter ];
};
}
pkgs/development/python-modules/pylibjpeg-rle/default.nix
+3 -3
View File
@@ -13,19 +13,19 @@
buildPythonPackage rec {
pname = "pylibjpeg-rle";
version = "2.1.0";
version = "2.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pydicom";
repo = "pylibjpeg-rle";
tag = "v${version}";
hash = "sha256-S9QBZEYfM9cwhwycF9TDpHv44z6fXTu3wBr4ZZHxXR8=";
hash = "sha256-hAtseH4akBCKhlWsPGXeQRYUK0BiytFrLFCmeg7nUXY=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-ZkaDnG7wXQeaefASdsUFxuDKxjLukczyJeUgfG9uIyo=";
hash = "sha256-QprjrR/AelrC+6n7uWZicO9QH0OAJCR7DSE1JuQOMCI=";
};
build-system = [
pkgs/development/python-modules/rucio/default.nix
+2 -2
View File
@@ -40,13 +40,13 @@
}:
let
version = "38.0.0";
version = "38.2.0";
src = fetchFromGitHub {
owner = "rucio";
repo = "rucio";
tag = version;
hash = "sha256-/uA1PfP5K/Z22QcqQKez70dQJ4lTOLiQHQwEi1mkLPo=";
hash = "sha256-HYHiW/izKSkn08xLY7gJfuYK1C/ArOQ2DAwleSkcZ/I=";
};
in
buildPythonPackage {
pkgs/development/python-modules/scikit-build/default.nix
+3
View File
@@ -41,6 +41,9 @@ buildPythonPackage rec {
url = "https://github.com/scikit-build/scikit-build/commit/3992485c67331097553ec8f54233c4c295943f70.patch";
hash = "sha256-U34UY+m6RE3c3UN/jGHuR+sRUqTGmG7dT52NWCY7nIE=";
})
# <https://github.com/scikit-build/scikit-build/pull/1160>
./fix-cmake-4.patch
];
# This line in the filterwarnings section of the pytest configuration leads to this error:
pkgs/development/python-modules/scikit-build/fix-cmake-4.patch
+47
View File
@@ -0,0 +1,47 @@
From 9efbf7f9baa846867a9c5586e4cc82a8a19e2e84 Mon Sep 17 00:00:00 2001
From: Emily <hello@emily.moe>
Date: Wed, 17 Sep 2025 19:00:01 +0100
Subject: [PATCH 1/2] tests: fix `test_issue335_support_cmake_source_dir` with
CMake 4
---
tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt b/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
index 7e391c46..18bae2bf 100644
--- a/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
+++ b/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.2...3.10)
project(hello NONE)
From 491d7494a3ec6cc181d37d02670c65b74c67cbfe Mon Sep 17 00:00:00 2001
From: Emily <hello@emily.moe>
Date: Wed, 17 Sep 2025 19:00:01 +0100
Subject: [PATCH 2/2] tests: fix `test_make_without_configure_fails` with CMake
4
---
tests/test_cmaker.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
index cf166905..9b6c3758 100644
--- a/tests/test_cmaker.py
+++ b/tests/test_cmaker.py
@@ -82,7 +82,10 @@ def test_make_without_configure_fails(capfd):
CMaker().make()
_, err = capfd.readouterr()
assert "An error occurred while building with CMake." in str(excinfo.value)
- assert "Error: could not load cache" in err
+ # CMake 4 changed the error message.
+ err_message_cmake_3 = "Error: could not load cache"
+ err_message_cmake_4 = "Error: not a CMake build directory (missing CMakeCache.txt)"
+ assert err_message_cmake_3 in err or err_message_cmake_4 in err
@pytest.mark.parametrize("configure_with_cmake_source_dir", [True, False])
pkgs/development/python-modules/tensordict/default.nix
+7 -2
View File
@@ -29,16 +29,21 @@
buildPythonPackage rec {
pname = "tensordict";
version = "0.9.1";
version = "0.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pytorch";
repo = "tensordict";
tag = "v${version}";
hash = "sha256-OdS9dw/BtSLZuY857O2njlFOMQj5IJ6v9c2aRP+H1Hc=";
hash = "sha256-yxyA9BfN2hp1C3s+g2zBM2gVtckH3LV7luWw8DshFUs=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "pybind11[global]" "pybind11"
'';
build-system = [
pybind11
setuptools
pkgs/development/python-modules/torchrl/default.nix
+44 -7
View File
@@ -5,22 +5,29 @@
fetchFromGitHub,
# build-system
cmake,
ninja,
numpy,
pybind11,
setuptools,
which,
torch,
# dependencies
cloudpickle,
numpy,
packaging,
pyvers,
tensordict,
torch,
# optional-dependencies
# atari
gymnasium,
# brax
brax,
jax,
# checkpointing
torchsnapshot,
# dm-control
dm-control,
# gym-continuous
mujoco,
# llm
@@ -36,6 +43,8 @@
sentencepiece,
transformers,
vllm,
# marl
pettingzoo,
# offline-data
h5py,
huggingface-hub,
@@ -64,33 +73,51 @@
buildPythonPackage rec {
pname = "torchrl";
version = "0.9.2";
version = "0.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pytorch";
repo = "rl";
tag = "v${version}";
hash = "sha256-6rU5+J70T0E7+60jihsjwlLls8jJlxKi3nmrL0xm2c0=";
hash = "sha256-DqLB1JnQ96cxVEzcXra1hFVfrN7eXTlTwPtlPClnaBA=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "pybind11[global]" "pybind11"
'';
build-system = [
cmake
ninja
numpy
pybind11
setuptools
which
torch
];
dontUseCmakeConfigure = true;
dependencies = [
cloudpickle
numpy
packaging
tensordict
pyvers
torch
];
optional-dependencies = {
atari = gymnasium.optional-dependencies.atari;
atari = [
gymnasium
]
++ gymnasium.optional-dependencies.atari;
brax = [
brax
jax
];
checkpointing = [ torchsnapshot ];
dm-control = [ dm-control ];
gym-continuous = [
gymnasium
mujoco
@@ -109,6 +136,11 @@ buildPythonPackage rec {
transformers
vllm
];
marl = [
# dm-meltingpot (unpackaged)
pettingzoo
# vmas (unpackaged)
];
offline-data = [
h5py
huggingface-hub
@@ -120,10 +152,15 @@ buildPythonPackage rec {
torchvision
tqdm
];
open-spiel = [
# open-spiel (unpackaged)
];
rendering = [ moviepy ];
replay-buffer = [ torch ];
utils = [
git
hydra-core
# hydra-submitit-launcher (unpackaged)
tensorboard
tqdm
wandb
pkgs/kde/default.nix
+1
View File
@@ -71,6 +71,7 @@ let
selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
alpaka = self.callPackage ./misc/alpaka { };
glaxnimate = self.callPackage ./misc/glaxnimate { };
kdiagram = self.callPackage ./misc/kdiagram { };
kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { };
kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { };
pkgs/kde/misc/glaxnimate/default.nix
+63
View File
@@ -0,0 +1,63 @@
{
lib,
mkKdeDerivation,
fetchFromGitLab,
qttools,
potrace,
ffmpeg,
libarchive,
python3Packages,
testers,
glaxnimate,
xvfb-run,
}:
mkKdeDerivation rec {
pname = "glaxnimate";
version = "0.5.80";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = "glaxnimate";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-+4vvp9nxtpKUOojgQL9T5Eyv9eMCGGwmDAex91XPwyA=";
};
extraBuildInputs = [
qttools
potrace
ffmpeg
libarchive
# Has vendored `qt-color-widgets` and `pybind11`.
];
qtWrapperArgs = [
"--prefix PYTHONPATH : ${
python3Packages.makePythonPath [
python3Packages.pillow
python3Packages.lottie
]
}"
];
passthru.tests.version = testers.testVersion {
package = glaxnimate;
command = "${lib.getExe xvfb-run} glaxnimate --version";
};
meta = {
homepage = "https://glaxnimate.org/";
license = with lib.licenses; [
bsd2
cc-by-sa-40
cc0
gpl2Plus
gpl3Plus
unicodeTOU
];
maintainers = [ lib.maintainers.tobiasBora ];
mainProgram = "glaxnimate";
};
}
pkgs/servers/klipper/default.nix
+3 -3
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "0.13.0-unstable-2025-08-15";
version = "0.13.0-unstable-2025-09-16";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "d34d3b05b89b3bb3d56b61b0029a42af9704b2f2";
sha256 = "sha256-HYE6CX2VOOVxfa791dXX1dthKgXG1ezltDlSqebgmuM=";
rev = "8db5d254e077e10583cfaff0d9e70e08263383e5";
sha256 = "sha256-5lPPWuQVqtFVGmBvZX5rUwnOw9V1SCKfyLDxZ416tMM=";
};
sourceRoot = "${src.name}/klippy";
pkgs/top-level/aliases.nix
+3
View File
@@ -1039,6 +1039,7 @@ mapAliases {
givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22
glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17
glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
glfw-wayland = glfw; # Added 2024-04-19
glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
@@ -1859,6 +1860,8 @@ mapAliases {
onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
openai-triton-llvm = triton-llvm; # added 2024-07-18
openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17
openbabel3 = openbabel; # Added 2025-09-17
opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
openafs_1_8 = openafs; # Added 2022-08-22
pkgs/top-level/all-packages.nix
+28 -14
View File
@@ -1695,8 +1695,6 @@ with pkgs;
glances = python3Packages.callPackage ../applications/system/glances { };
glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { };
go2tv-lite = go2tv.override { withGui = false; };
guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
@@ -5747,12 +5745,24 @@ with pkgs;
yosys-synlig = callPackage ../development/compilers/yosys/plugins/synlig.nix { };
yosys-symbiflow = callPackage ../development/compilers/yosys/plugins/symbiflow.nix { };
zulu8 = callPackage ../development/compilers/zulu/8.nix { };
zulu11 = callPackage ../development/compilers/zulu/11.nix { };
zulu17 = callPackage ../development/compilers/zulu/17.nix { };
zulu21 = callPackage ../development/compilers/zulu/21.nix { };
zulu23 = callPackage ../development/compilers/zulu/23.nix { };
zulu24 = callPackage ../development/compilers/zulu/24.nix { };
inherit
({
zulu8 = callPackage ../development/compilers/zulu/8.nix { };
zulu11 = callPackage ../development/compilers/zulu/11.nix { };
zulu17 = callPackage ../development/compilers/zulu/17.nix { };
zulu21 = callPackage ../development/compilers/zulu/21.nix { };
zulu23 = callPackage ../development/compilers/zulu/23.nix { };
zulu24 = callPackage ../development/compilers/zulu/24.nix { };
zulu25 = callPackage ../development/compilers/zulu/25.nix { };
})
zulu8
zulu11
zulu17
zulu21
zulu23
zulu24
zulu25
;
zulu = zulu21;
### DEVELOPMENT / INTERPRETERS
@@ -8489,12 +8499,6 @@ with pkgs;
openal = openalSoft;
openbabel = openbabel3;
openbabel2 = callPackage ../development/libraries/openbabel/2.nix { };
openbabel3 = callPackage ../development/libraries/openbabel { };
opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec {
pname = "opencascade-occt";
version = "7.6.2";
@@ -12184,6 +12188,16 @@ with pkgs;
mercurialFull = mercurial.override { fullBuild = true; };
meshlab = callPackage ../by-name/me/meshlab/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
llvmPackages = llvmPackages_18;
};
meshlab-unstable = callPackage ../by-name/me/meshlab-unstable/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
llvmPackages = llvmPackages_18;
};
meshcentral = callPackage ../tools/admin/meshcentral { };
michabo = libsForQt5.callPackage ../applications/misc/michabo { };
pkgs/top-level/python-aliases.nix
+1
View File
@@ -494,6 +494,7 @@ mapAliases ({
openai-triton-cuda = triton-cuda; # added 2024-07-18
openai-triton-no-cuda = triton-no-cuda; # added 2024-07-18
openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30
openbabel-bindings = openbabel; # added 2025-09-17
opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12
openllm = throw "openllm has moved to pkgs.openllm"; # added 2021-12-31
openllm-client = throw "openllm-client has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24
pkgs/top-level/python-packages.nix
+1 -3
View File
@@ -10934,9 +10934,7 @@ self: super: with self; {
openapi3 = callPackage ../development/python-modules/openapi3 { };
openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings {
openbabel = pkgs.openbabel.override { python3 = python; };
};
openbabel = toPythonModule (pkgs.openbabel.override { python3 = python; });
opencamlib = callPackage ../development/python-modules/opencamlib { };