push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
gettext,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dfc";
version = "3.1.1";
src = fetchFromGitHub {
owner = "rolinh";
repo = "dfc";
tag = "v${finalAttrs.version}";
hash = "sha256-k15q04dNWmHVeUabaCogkESQ+k63ZV7Xph2SMNpV/N8=";
};
# Fix for CMake v4
# ref. https://github.com/rolinh/dfc/pull/35
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail \
"cmake_minimum_required(VERSION 2.8.4)" \
"cmake_minimum_required(VERSION 3.10)"
'';
nativeBuildInputs = [
cmake
gettext
];
meta = {
homepage = "https://github.com/rolinh/dfc";
changelog = "https://github.com/rolinh/dfc/releases/tag/${finalAttrs.src.tag}";
description = "Displays file system space usage using graphs and colors";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ qknight ];
platforms = lib.platforms.all;
mainProgram = "dfc";
};
})

View File

@@ -0,0 +1,49 @@
{
lib,
stdenv,
fetchFromGitLab,
meson,
ninja,
pkg-config,
qt6,
dfl-ipc,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dfl-applications";
version = "0.3.0";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "applications";
rev = "v${finalAttrs.version}";
hash = "sha256-VDkJkrkhjWi61YD7qNQSF9/ctXtvVf+nh/zUVxAAE4Q=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
qt6.qtbase
dfl-ipc
];
dontWrapQtApps = true;
outputs = [
"out"
"dev"
];
meta = {
description = "Thin wrapper around QApplication, QGuiApplication and QCoreApplication";
homepage = "https://gitlab.com/desktop-frameworks/applications";
changelog = "https://gitlab.com/desktop-frameworks/applications/-/blob/${finalAttrs.src.rev}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ arthsmn ];
platforms = lib.platforms.linux;
};
})

View File

@@ -0,0 +1,45 @@
{
lib,
stdenv,
fetchFromGitLab,
meson,
ninja,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dfl-ipc";
version = "0.3.0";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "ipc";
rev = "v${finalAttrs.version}";
hash = "sha256-GjQg7Fq7fWal1vh/jR5qqm+qs+D/McCoQfktOvO86eA=";
};
nativeBuildInputs = [
meson
ninja
];
buildInputs = [
qt6.qtbase
];
dontWrapQtApps = true;
outputs = [
"out"
"dev"
];
meta = {
description = "Very simple set of IPC classes for inter-process communication";
homepage = "https://gitlab.com/desktop-frameworks/ipc";
changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ arthsmn ];
platforms = lib.platforms.linux;
};
})

View File

@@ -0,0 +1,49 @@
{
lib,
stdenv,
fetchFromGitLab,
meson,
ninja,
pkg-config,
qt6,
systemd,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dfl-login1";
version = "0.3.0";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "login1";
rev = "v${finalAttrs.version}";
hash = "sha256-Aw2yg5KH618/lG+BQU8JZhQ/8qr6L3vWiEgUNu7aGYY=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
qt6.qtbase
systemd
];
dontWrapQtApps = true;
outputs = [
"out"
"dev"
];
meta = {
description = "Implementation of systemd/elogind for DFL";
homepage = "https://gitlab.com/desktop-frameworks/login1";
changelog = "https://gitlab.com/desktop-frameworks/login1/-/blob/${finalAttrs.src.rev}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ arthsmn ];
platforms = lib.platforms.linux;
};
})

View File

@@ -0,0 +1,45 @@
{
lib,
stdenv,
fetchFromGitLab,
meson,
ninja,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dfl-utils";
version = "0.3.0";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "utils";
rev = "v${finalAttrs.version}";
hash = "sha256-XiOLVx9X2i+IWORde05P2cFulQRU/EQErbyr5fgZDY4=";
};
nativeBuildInputs = [
meson
ninja
];
buildInputs = [
qt6.qtbase
];
dontWrapQtApps = true;
outputs = [
"out"
"dev"
];
meta = {
description = "Some utilities for DFL";
homepage = "https://gitlab.com/desktop-frameworks/utils";
changelog = "https://gitlab.com/desktop-frameworks/utils/-/blob/${finalAttrs.src.rev}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ arthsmn ];
platforms = lib.platforms.linux;
};
})

View File

@@ -0,0 +1,31 @@
{
lib,
python3,
fetchPypi,
}:
let
inherit (python3.pkgs)
buildPythonApplication
pythonOlder
;
in
buildPythonApplication rec {
pname = "dfmt";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "7af6360ca8d556f1cfe82b97f03b8d1ea5a9d6de1fa3018290c844b6566d9d6e";
};
meta = with lib; {
description = "Format paragraphs, comments and doc strings";
mainProgram = "dfmt";
homepage = "https://github.com/dmerejkowsky/dfmt";
license = licenses.bsd3;
maintainers = with maintainers; [ cole-h ];
};
}

View File

@@ -0,0 +1,27 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "dfrs";
version = "0.0.7";
src = fetchFromGitHub {
owner = "anthraxx";
repo = "dfrs";
rev = version;
sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk";
};
cargoHash = "sha256-U6z0YMHRmjGobLYdyBaMWJam9mDrHUQEOv5MjOpNfHU=";
meta = with lib; {
description = "Display file system space usage using graphs and colors";
homepage = "https://github.com/anthraxx/dfrs";
license = licenses.mit;
maintainers = with maintainers; [ wamserma ];
mainProgram = "dfrs";
};
}

View File

@@ -0,0 +1,13 @@
diff --git a/config/template.pc b/config/template.pc
index 3d6efbb..e338a42 100644
--- a/config/template.pc
+++ b/config/template.pc
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: @PROJECT_NAME@
Description: @PROJECT_DESCRIPTION@

View File

@@ -0,0 +1,56 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f222aab..262b505 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,6 @@ target_include_directories(
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}>
)
target_include_directories(
"${PROJECT_NAME}-lib"
@@ -132,7 +131,7 @@ install(
install(
DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}/include/"
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}"
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/"
)
if(WITH_API)
enable_language("C")
diff --git a/config/template.cmake b/config/template.cmake
index 8b5141d..8f94d66 100644
--- a/config/template.cmake
+++ b/config/template.cmake
@@ -6,7 +6,6 @@ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@)
set(
"@PROJECT_NAME@_INCLUDE_DIRS"
"@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
- "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@module-dir@"
)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
diff --git a/config/template.pc b/config/template.pc
index 3d6efbb..fea69e4 100644
--- a/config/template.pc
+++ b/config/template.pc
@@ -6,4 +6,4 @@ Name: @PROJECT_NAME@
Description: @PROJECT_DESCRIPTION@
Version: @PROJECT_VERSION@
Libs: -L${libdir} -l@PROJECT_NAME@
-Cflags: -I${includedir} -I${includedir}/@module-dir@
+Cflags: -I${includedir} -I${includedir}/
diff --git a/meson.build b/meson.build
index c9e9c58..ac8f0bd 100644
--- a/meson.build
+++ b/meson.build
@@ -83,7 +83,7 @@ if install
)
endif
- module_id = meson.project_name() / fc_id + '-' + fc.version()
+ module_id = meson.project_name()
meson.add_install_script(
find_program(files('config'/'install-mod.py')),
get_option('includedir') / module_id,

View File

@@ -0,0 +1,100 @@
{
stdenv,
lib,
fetchFromGitHub,
gfortran,
buildType ? "meson",
cmake,
meson,
ninja,
pkg-config,
python3,
blas,
lapack,
mctc-lib,
mstore,
multicharge,
}:
assert !blas.isILP64 && !lapack.isILP64;
assert (
builtins.elem buildType [
"meson"
"cmake"
]
);
stdenv.mkDerivation rec {
pname = "dftd4";
version = "3.7.0";
src = fetchFromGitHub {
owner = "dftd4";
repo = "dftd4";
rev = "v${version}";
hash = "sha256-dixPCLH5dWkE2/7ghGEXJmX2/g1DN30dB4jX2d7fmio=";
};
patches = [
# Make sure fortran headers are installed directly in /include
./fortran-module-dir.patch
# Fix wrong generation of package config include paths
./cmake.patch
];
nativeBuildInputs = [
gfortran
pkg-config
python3
]
++ lib.optionals (buildType == "meson") [
meson
ninja
]
++ lib.optional (buildType == "cmake") cmake;
buildInputs = [
blas
lapack
];
propagatedBuildInputs = [
mctc-lib
mstore
multicharge
];
cmakeFlags = [
(lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
];
outputs = [
"out"
"dev"
];
doCheck = true;
postPatch = ''
patchShebangs --build \
config/install-mod.py \
app/tester.py
'';
preCheck = ''
export OMP_NUM_THREADS=2
'';
meta = with lib; {
description = "Generally Applicable Atomic-Charge Dependent London Dispersion Correction";
mainProgram = "dftd4";
license = with licenses; [
lgpl3Plus
gpl3Plus
];
homepage = "https://github.com/grimme-lab/dftd4";
platforms = platforms.linux;
maintainers = [ maintainers.sheepforce ];
};
}

View File

@@ -0,0 +1,45 @@
{
buildPythonPackage,
meson-python,
ninja,
setuptools,
pkg-config,
dftd4,
cffi,
numpy,
}:
buildPythonPackage {
inherit (dftd4)
pname
version
src
meta
;
pyproject = true;
buildInputs = [ dftd4 ];
nativeBuildInputs = [
pkg-config
ninja
];
build-system = [
meson-python
setuptools
];
dependencies = [
cffi
numpy
];
preConfigure = ''
cd python
'';
pythonImportsCheck = [ "dftd4" ];
doCheck = true;
}

View File

@@ -0,0 +1,27 @@
{
lib,
stdenv,
fetchurl,
libusb-compat-0_1,
}:
stdenv.mkDerivation rec {
pname = "dfu-programmer";
version = "0.7.2";
buildInputs = [ libusb-compat-0_1 ];
src = fetchurl {
url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
};
configureFlags = [ "--disable-libusb_1_0" ];
meta = with lib; {
license = licenses.gpl2;
description = "Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
mainProgram = "dfu-programmer";
homepage = "http://dfu-programmer.sourceforge.net/";
platforms = platforms.unix;
};
}

View File

@@ -0,0 +1,37 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
libusb1,
}:
stdenv.mkDerivation rec {
pname = "dfu-util";
version = "0.11";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
src = fetchurl {
url = "https://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4=";
};
meta = with lib; {
description = "Device firmware update (DFU) USB programmer";
longDescription = ''
dfu-util is a program that implements the host (PC) side of the USB
DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol.
DFU is intended to download and upload firmware to devices connected over
USB. It ranges from small devices like micro-controller boards up to mobile
phones. With dfu-util you are able to download firmware to your device or
upload firmware from it.
'';
homepage = "https://dfu-util.sourceforge.net";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.fpletz ];
};
}